From 681f31895f47227e1ed676ebd1d29ede01493084 Mon Sep 17 00:00:00 2001
From: varunnvs92 <varunkn@amazon.com>
Date: Fri, 1 Jun 2018 14:41:39 -0700
Subject: [PATCH 001/490] Add Automatic-Module-Name in manifest so Java9
 modular applications can depend on this library (#142)

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index b962bd298b..d13b85b9cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,7 @@
             <!-- Add these properties to the manifest so they may be retrieved at runtime. -->
             <Ion-Java-Build-Time>${build.time}</Ion-Java-Build-Time>
             <Ion-Java-Project-Version>${project.version}</Ion-Java-Project-Version>
+            <Automatic-Module-Name>software.amazon.ion</Automatic-Module-Name>
           </instructions>
         </configuration>
       </plugin>

From 3748ed1558616b4e1258949567b709a68ac73c5b Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Wed, 20 Jun 2018 18:39:43 -0700
Subject: [PATCH 002/490]  Decouples IonReader from IonSystem and adds
 IonReaderBuilder. (#143)

---
 .../ion/impl/IonReaderBinarySystemX.java      |   9 +-
 .../amazon/ion/impl/IonReaderBinaryUserX.java |  32 +-
 .../amazon/ion/impl/IonReaderTextSystemX.java |  14 +-
 .../amazon/ion/impl/IonReaderTextUserX.java   |  56 +--
 .../amazon/ion/impl/IonReaderTreeSystem.java  |  26 +-
 .../amazon/ion/impl/IonReaderTreeUserX.java   |  38 +-
 .../amazon/ion/impl/IonWriterSystem.java      |   3 +-
 .../amazon/ion/impl/IonWriterSystemTree.java  |  17 +-
 .../amazon/ion/impl/IonWriterUser.java        |   7 +-
 .../amazon/ion/impl/LocalSymbolTable.java     | 335 +++---------------
 .../ion/impl/LocalSymbolTableAsStruct.java    | 265 ++++++++++++++
 .../ion/impl/PrivateIonReaderFactory.java     | 152 ++++----
 .../ion/impl/PrivateIonTextWriterBuilder.java |   2 +-
 .../impl/PrivateLocalSymbolTableFactory.java  |  80 +++++
 .../amazon/ion/impl/PrivateUtils.java         |  83 ++---
 .../amazon/ion/impl/PrivateValueFactory.java  |  32 ++
 .../amazon/ion/impl/lite/IonDatagramLite.java |   5 +-
 .../amazon/ion/impl/lite/IonLoaderLite.java   |  12 +-
 .../amazon/ion/impl/lite/IonSystemLite.java   |  54 +--
 .../impl/lite/PrivateLiteDomTrampoline.java   |   7 +-
 .../ion/impl/lite/ValueFactoryLite.java       |  18 +-
 .../amazon/ion/system/IonReaderBuilder.java   | 307 ++++++++++++++++
 .../amazon/ion/system/IonSystemBuilder.java   |   3 +-
 test/AllTests.java                            |   2 +
 test/software/amazon/ion/DatagramTest.java    |   3 +-
 test/software/amazon/ion/LoaderTest.java      |   1 +
 .../amazon/ion/SharedSymtabMaker.java         |   2 +-
 .../amazon/ion/SystemProcessingTestCase.java  |   3 +-
 .../amazon/ion/impl/BinaryWriterTest.java     |   1 -
 .../BinaryWriterWithLocalSymtabsTest.java     |   7 +-
 .../amazon/ion/impl/IonWriterTestCase.java    |   3 +-
 .../LocalSymbolTableImportAdapterTest.java    |  14 +-
 .../amazon/ion/impl/LocalSymbolTableTest.java |   7 +-
 .../OptimizedBinaryWriterSymbolTableTest.java |   3 +-
 .../impl/OptimizedBinaryWriterTestCase.java   |   2 +-
 .../ion/impl/OutputStreamWriterTestCase.java  |   1 -
 .../ion/impl/SharedSymbolTableTest.java       |   3 +-
 .../amazon/ion/impl/SymbolTableTest.java      |  17 +-
 .../amazon/ion/{ => impl}/Symtabs.java        |  42 +--
 .../amazon/ion/impl/TextWriterTest.java       |   1 -
 .../amazon/ion/impl/ValueWriterTest.java      |   1 -
 .../amazon/ion/impl/lite/IonContextTest.java  |   4 +-
 .../amazon/ion/streaming/ReaderTest.java      |  16 +-
 .../system/IonBinaryWriterBuilderTest.java    |  15 +-
 .../ion/system/IonReaderBuilderTest.java      | 113 ++++++
 .../ion/system/IonTextWriterBuilderTest.java  |   2 +-
 46 files changed, 1172 insertions(+), 648 deletions(-)
 create mode 100644 src/software/amazon/ion/impl/LocalSymbolTableAsStruct.java
 create mode 100644 src/software/amazon/ion/impl/PrivateLocalSymbolTableFactory.java
 create mode 100644 src/software/amazon/ion/impl/PrivateValueFactory.java
 create mode 100644 src/software/amazon/ion/system/IonReaderBuilder.java
 rename test/software/amazon/ion/{ => impl}/Symtabs.java (90%)
 create mode 100644 test/software/amazon/ion/system/IonReaderBuilderTest.java

diff --git a/src/software/amazon/ion/impl/IonReaderBinarySystemX.java b/src/software/amazon/ion/impl/IonReaderBinarySystemX.java
index 544d4fcd81..1bf2a98e19 100644
--- a/src/software/amazon/ion/impl/IonReaderBinarySystemX.java
+++ b/src/software/amazon/ion/impl/IonReaderBinarySystemX.java
@@ -24,7 +24,6 @@
 import java.util.Iterator;
 import software.amazon.ion.Decimal;
 import software.amazon.ion.IntegerSize;
-import software.amazon.ion.IonSystem;
 import software.amazon.ion.IonType;
 import software.amazon.ion.NullValueException;
 import software.amazon.ion.SymbolTable;
@@ -38,16 +37,14 @@ class IonReaderBinarySystemX
     extends IonReaderBinaryRawX
     implements PrivateReaderWriter
 {
-    IonSystem _system;
     SymbolTable _symbols;
-    // ValueVariant _v; actually owned by the raw reader so it can be cleared at appropriate times
 
-    IonReaderBinarySystemX(IonSystem system, UnifiedInputStreamX in)
+    IonReaderBinarySystemX(UnifiedInputStreamX in)
     {
         super();
         init_raw(in);
-        _system = system;
-        _symbols = system.getSystemSymbolTable();
+        // TODO check IVM to determine version: amznlabs/ion-java#19, amznlabs/ion-java#24
+        _symbols = SharedSymbolTable.getSystemSymbolTable(1);
     }
 
 
diff --git a/src/software/amazon/ion/impl/IonReaderBinaryUserX.java b/src/software/amazon/ion/impl/IonReaderBinaryUserX.java
index 28727f3b0e..aa07fab0d3 100644
--- a/src/software/amazon/ion/impl/IonReaderBinaryUserX.java
+++ b/src/software/amazon/ion/impl/IonReaderBinaryUserX.java
@@ -16,11 +16,9 @@
 
 import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
 import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
-import static software.amazon.ion.impl.PrivateUtils.newLocalSymtab;
 
 import java.io.IOException;
 import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonSystem;
 import software.amazon.ion.IonType;
 import software.amazon.ion.OffsetSpan;
 import software.amazon.ion.SeekableReader;
@@ -41,6 +39,7 @@ final class IonReaderBinaryUserX
      * {@link OffsetSpan}s.
      */
     private final int _physical_start_offset;
+    private final PrivateLocalSymbolTableFactory _lstFactory;
 
     IonCatalog  _catalog;
 
@@ -63,29 +62,22 @@ public long getFinishOffset()
         }
     }
 
-    public IonReaderBinaryUserX(IonSystem system,
-                                IonCatalog catalog,
+    public IonReaderBinaryUserX(IonCatalog catalog,
+                                PrivateLocalSymbolTableFactory lstFactory,
                                 UnifiedInputStreamX userBytes,
                                 int physicalStartOffset)
     {
-        super(system, userBytes);
+        super(userBytes);
         _physical_start_offset = physicalStartOffset;
         init_user(catalog);
-    }
-
-    public IonReaderBinaryUserX(IonSystem system,
-                                IonCatalog catalog,
-                                UnifiedInputStreamX userBytes)
-    {
-        super(system, userBytes);
-        _physical_start_offset = 0;
-        init_user(catalog);
+        _lstFactory = lstFactory;
     }
 
     //FIXME: PERF_TEST was :private
     final void init_user(IonCatalog catalog)
     {
-        _symbols = _system.getSystemSymbolTable();
+        // TODO check IVM to determine version: amzn/ion-java#19, amzn/ion-java#24
+        _symbols = SharedSymbolTable.getSystemSymbolTable(1);
         _catalog = catalog;
     }
 
@@ -214,7 +206,7 @@ private final void has_next_helper_user() throws IOException
                     load_cached_value(AS_TYPE.int_value);
                     int sid = _v.getInt();
                     if (sid == ION_1_0_SID) {
-                        _symbols = _system.getSystemSymbolTable();
+                        _symbols = SharedSymbolTable.getSystemSymbolTable(1);
                         push_symbol_table(_symbols);
                         _has_next_needed = true;
                     }
@@ -224,13 +216,7 @@ else if (_value_tid == PrivateIonConstants.tidStruct) {
                 int count = load_annotations();
                 for(int ii=0; ii<count; ii++) {
                     if (_annotation_ids[ii] == ION_SYMBOL_TABLE_SID) {
-                        _symbols =
-                            newLocalSymtab(_system,
-                                           // TODO should be current symtab:
-                                           _system.getSystemSymbolTable(),
-                                           _catalog,
-                                           this,
-                                           false);
+                        _symbols = _lstFactory.newLocalSymtab(_catalog, this, false);
                         push_symbol_table(_symbols);
                         _has_next_needed = true;
                         break;
diff --git a/src/software/amazon/ion/impl/IonReaderTextSystemX.java b/src/software/amazon/ion/impl/IonReaderTextSystemX.java
index 573a07cb2d..537a26dd4b 100644
--- a/src/software/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextSystemX.java
@@ -58,21 +58,15 @@ class IonReaderTextSystemX
 {
     private static int UNSIGNED_BYTE_MAX_VALUE = 255;
 
-    protected IonSystem _system;
+    SymbolTable _system_symtab;
 
-
-    protected IonReaderTextSystemX(IonSystem system, UnifiedInputStreamX iis)
+    protected IonReaderTextSystemX(UnifiedInputStreamX iis)
     {
-        _system = system;
+        _system_symtab = PrivateUtils.systemSymtab(1); // TODO check IVM to determine version: amznlabs/ion-java#19, amznlabs/ion-java#24
         init_once();
         init(iis, IonType.DATAGRAM);
     }
 
-    public IonSystem getSystem()
-    {
-        return _system;
-    }
-
     // TODO getIntegerType() is duplicated in IonReaderBinarySystemX. It could
     // be consolidated into a single location, but that would have to be part
     // of a larger refactor of common logic from both IonReader*SystemX classes
@@ -623,7 +617,7 @@ public SymbolTable getSymbolTable()
         SymbolTable symtab = super.getSymbolTable();
         if (symtab == null)
         {
-            symtab = _system.getSystemSymbolTable();
+            symtab = _system_symtab;
         }
         return symtab;
     }
diff --git a/src/software/amazon/ion/impl/IonReaderTextUserX.java b/src/software/amazon/ion/impl/IonReaderTextUserX.java
index 04536869ea..d98d504b27 100644
--- a/src/software/amazon/ion/impl/IonReaderTextUserX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextUserX.java
@@ -16,11 +16,9 @@
 
 import static software.amazon.ion.SystemSymbols.ION_1_0;
 import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.impl.PrivateUtils.newLocalSymtab;
 
 import java.util.regex.Pattern;
 import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonSystem;
 import software.amazon.ion.IonType;
 import software.amazon.ion.OffsetSpan;
 import software.amazon.ion.SeekableReader;
@@ -63,47 +61,29 @@ class IonReaderTextUserX
      * {@link OffsetSpan}s.
      */
     private final int _physical_start_offset;
+    private final PrivateLocalSymbolTableFactory _lstFactory;
 
     // IonSystem   _system; now in IonReaderTextSystemX where it could be null
     IonCatalog  _catalog;
     SymbolTable _symbols;
 
 
-    protected IonReaderTextUserX(IonSystem system, IonCatalog catalog,
+    protected IonReaderTextUserX(IonCatalog catalog,
+                                 PrivateLocalSymbolTableFactory lstFactory,
                                  UnifiedInputStreamX uis,
                                  int physicalStartOffset)
     {
-        super(system, uis);
+        super(uis);
+        _symbols = _system_symtab;
         _physical_start_offset = physicalStartOffset;
-        initUserReader(system, catalog);
+        _catalog = catalog;
+        _lstFactory = lstFactory;
     }
 
-    protected IonReaderTextUserX(IonSystem system, IonCatalog catalog,
+    protected IonReaderTextUserX(IonCatalog catalog,
+                                 PrivateLocalSymbolTableFactory lstFactory,
                                  UnifiedInputStreamX uis) {
-        super(system, uis);
-        _physical_start_offset = 0;
-        initUserReader(system, catalog);
-    }
-
-    private void initUserReader(IonSystem system, IonCatalog catalog) {
-        if (system == null) {
-            throw new IllegalArgumentException();
-        }
-        _system = system;
-        if (catalog != null) {
-            _catalog = catalog;
-        }
-        else {
-            _catalog = system.getCatalog();
-        }
-        // not needed, getSymbolTable will force this when necessary
-        //  _symbols = system.getSystemSymbolTable();
-    }
-
-    @Override
-    public IonSystem getSystem()
-    {
-        return _system;
+        this(catalog, lstFactory, uis, 0);
     }
 
     /**
@@ -153,11 +133,9 @@ private final boolean has_next_user_value()
                             SymbolToken a = _annotations[ii];
                             // TODO SID only?
                             if (ION_SYMBOL_TABLE.equals(a.getText())) {
-                                _symbols = newLocalSymtab(_system,
-                                                          _system.getSystemSymbolTable(),
-                                                          _catalog,
-                                                          this,
-                                                          true);
+                                _symbols = _lstFactory.newLocalSymtab(_catalog,
+                                                                      this,
+                                                                      true);
                                 push_symbol_table(_symbols);
                                 _has_next_called = false;
                                 break;
@@ -175,7 +153,7 @@ private final boolean has_next_user_value()
                             if (ION_1_0.equals(version))
                             {
                                 symbol_table_reset();
-                                push_symbol_table(_system.getSystemSymbolTable());
+                                push_symbol_table(_system_symtab);
                                 _has_next_called = false;
                             }
                             else
@@ -202,7 +180,7 @@ private final void symbol_table_reset()
     {
         IonType t = next();
         assert( IonType.SYMBOL.equals(t) );
-        _symbols = null; // was: _symbols.getSystemSymbolTable(); - the null is fixed in getSymbolTable()
+        _symbols = _system_symtab;
         return;
     }
 
@@ -210,10 +188,6 @@ private final void symbol_table_reset()
     @Override
     public SymbolTable getSymbolTable()
     {
-        if (_symbols == null) {
-            SymbolTable system_symbols = _system.getSystemSymbolTable();
-            _symbols = newLocalSymtab(_system, system_symbols);
-        }
         return _symbols;
     }
 
diff --git a/src/software/amazon/ion/impl/IonReaderTreeSystem.java b/src/software/amazon/ion/impl/IonReaderTreeSystem.java
index f946ae15f5..55cb5b5245 100644
--- a/src/software/amazon/ion/impl/IonReaderTreeSystem.java
+++ b/src/software/amazon/ion/impl/IonReaderTreeSystem.java
@@ -49,8 +49,7 @@
 class IonReaderTreeSystem
     implements IonReader, PrivateReaderWriter
 {
-    protected IonSystem           _system;
-    protected SymbolTable         _symbols;
+    protected final SymbolTable   _system_symtab;
     protected Iterator<IonValue>  _iter;
     protected IonValue            _parent;
     protected PrivateIonValue   _next;
@@ -69,16 +68,17 @@ public IonReaderTreeSystem(IonValue value)
     {
         if (value == null) {
             // do nothing
+            _system_symtab = null;
             _symbolTableAccessor = null;
         }
         else {
-            _system = value.getSystem();
+            _system_symtab = value.getSystem().getSystemSymbolTable();
             re_init(value, /* hoisted */ false);
             _symbolTableAccessor = new SymbolTableProvider()
             {
                 public SymbolTable getSymbolTable()
                 {
-                    return null == _symbols ? _system.getSystemSymbolTable() : _symbols;
+                    return IonReaderTreeSystem.this.getSymbolTable();
                 }
             };
         }
@@ -97,7 +97,6 @@ public <T> T asFacet(Class<T> facetType)
 
     void re_init(IonValue value, boolean hoisted)
     {
-        _symbols = null;
         _curr = null;
         _eof = false;
         _top = 0;
@@ -121,12 +120,6 @@ public void close()
         _eof = true;
     }
 
-    protected void set_symbol_table(SymbolTable symtab)
-    {
-        _symbols = symtab;
-        return;
-    }
-
     private void push() {
         int oldlen = _stack.length;
         if (_top + 1 >= oldlen) { // we're going to do a "+2" on top so we need extra space
@@ -208,16 +201,7 @@ public final int getDepth() {
 
     public SymbolTable getSymbolTable()
     {
-        SymbolTable symboltable = null;
-
-        if (_curr != null) {
-            symboltable = _curr.getSymbolTable();
-        }
-        else if (_parent != null) {
-            symboltable = _parent.getSymbolTable();
-        }
-
-        return symboltable;
+        return _system_symtab;
     }
 
     public IonType getType()
diff --git a/src/software/amazon/ion/impl/IonReaderTreeUserX.java b/src/software/amazon/ion/impl/IonReaderTreeUserX.java
index 19b642d492..2ffef5b3a3 100644
--- a/src/software/amazon/ion/impl/IonReaderTreeUserX.java
+++ b/src/software/amazon/ion/impl/IonReaderTreeUserX.java
@@ -17,7 +17,6 @@
 import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
 import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.impl.PrivateUtils.newLocalSymtab;
 
 import software.amazon.ion.IonCatalog;
 import software.amazon.ion.IonDatagram;
@@ -35,17 +34,34 @@ final class IonReaderTreeUserX
     extends IonReaderTreeSystem
     implements PrivateReaderWriter
 {
+
+    private final PrivateLocalSymbolTableFactory _lstFactory;
+
     IonCatalog _catalog;
+    private SymbolTable _symbols;
 
-    public IonReaderTreeUserX(IonValue value, IonCatalog catalog)
+    public IonReaderTreeUserX(IonValue value, IonCatalog catalog, PrivateLocalSymbolTableFactory lstFactory)
     {
-        super(value);
+        super(value); // calls re_init
         _catalog = catalog;
+        _lstFactory = lstFactory;
     }
 
+    @Override
+    void re_init(IonValue value, boolean hoisted)
+    {
+        super.re_init(value, hoisted);
+        _symbols = _system_symtab;
+    }
 
     //========================================================================
 
+    @Override
+    public SymbolTable getSymbolTable()
+    {
+        return _symbols;
+    }
+
     @Override
     public IonType next()
     {
@@ -85,14 +101,14 @@ private boolean next_helper_user()
                     if (sid == UNKNOWN_SYMBOL_ID) {
                         String name = sym.stringValue();
                         if (name != null) {
-                            sid = _system.getSystemSymbolTable().findSymbol(name);
+                            sid = _system_symtab.findSymbol(name);
                         }
                     }
                     if (sid == ION_1_0_SID
                         && _next.getTypeAnnotationSymbols().length == 0) {
                         // $ion_1_0 is read as an IVM only if it is not annotated
-                        SymbolTable symbols = _system.getSystemSymbolTable();
-                        set_symbol_table(symbols);
+                        SymbolTable symbols = _system_symtab;
+                        _symbols = symbols;
                         push_symbol_table(symbols);
                         _next = null;
                         continue;
@@ -103,13 +119,9 @@ else if (IonType.STRUCT.equals(next_type)
                 ) {
                     assert(_next instanceof IonStruct);
                     // read a local symbol table
-                    IonReader reader = new IonReaderTreeUserX(_next, _catalog);
-                    SymbolTable symtab =
-                        newLocalSymtab(_system,
-                                       _system.getSystemSymbolTable(),
-                                       _system.getCatalog(),
-                                       reader, false);
-                    set_symbol_table(symtab);
+                    IonReader reader = new IonReaderTreeUserX(_next, _catalog, _lstFactory);
+                    SymbolTable symtab = _lstFactory.newLocalSymtab(_catalog, reader, false);
+                    _symbols = symtab;
                     push_symbol_table(symtab);
                     _next = null;
                     continue;
diff --git a/src/software/amazon/ion/impl/IonWriterSystem.java b/src/software/amazon/ion/impl/IonWriterSystem.java
index 8a3f823e34..7550732888 100644
--- a/src/software/amazon/ion/impl/IonWriterSystem.java
+++ b/src/software/amazon/ion/impl/IonWriterSystem.java
@@ -15,7 +15,6 @@
 package software.amazon.ion.impl;
 
 import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.impl.PrivateUtils.newLocalSymtab;
 import static software.amazon.ion.impl.PrivateUtils.newSymbolToken;
 import static software.amazon.ion.impl.PrivateUtils.newSymbolTokens;
 
@@ -226,7 +225,7 @@ SymbolTable inject_local_symbol_table() throws IOException
         assert _symbol_table.isSystemTable();
         // no catalog since it doesn't matter as this is a
         // pure local table, with no imports
-        return newLocalSymtab(null /*system*/, _symbol_table);
+        return LocalSymbolTable.DEFAULT_LST_FACTORY.newLocalSymtab(_symbol_table);
     }
 
     @Override
diff --git a/src/software/amazon/ion/impl/IonWriterSystemTree.java b/src/software/amazon/ion/impl/IonWriterSystemTree.java
index a4c9214c85..4223053445 100644
--- a/src/software/amazon/ion/impl/IonWriterSystemTree.java
+++ b/src/software/amazon/ion/impl/IonWriterSystemTree.java
@@ -14,7 +14,6 @@
 
 package software.amazon.ion.impl;
 
-import static software.amazon.ion.impl.PrivateUtils.newLocalSymtab;
 import static software.amazon.ion.impl.PrivateUtils.valueIsLocalSymbolTable;
 
 import java.io.IOException;
@@ -51,12 +50,17 @@
 final class IonWriterSystemTree
     extends IonWriterSystem
 {
+
+     /** Factory for constructing local symbol tables. Not null. */
+     private final LocalSymbolTableAsStruct.Factory _lst_factory;
+
+
     private final ValueFactory _factory;
 
     /** Used to construct new local symtabs. May be null */
     private final IonCatalog    _catalog;
 
-    private final int _initialDepth;
+    private final int           _initialDepth;
 
     private boolean             _in_struct;
 
@@ -82,9 +86,8 @@ protected IonWriterSystemTree(SymbolTable defaultSystemSymbolTable,
         super(defaultSystemSymbolTable, initialIvmHandling,
               IvmMinimizing.ADJACENT);
 
-        if (rootContainer == null) throw new NullPointerException();
-
         _factory = rootContainer.getSystem();
+        _lst_factory = (LocalSymbolTableAsStruct.Factory)((PrivateValueFactory)_factory).getLstFactory();
         _catalog = catalog;
         _current_parent = rootContainer;
         _in_struct = (_current_parent instanceof IonStruct);
@@ -223,9 +226,7 @@ public void stepOut() throws IOException
             && valueIsLocalSymbolTable(prior))
         {
             // We just finish writing a symbol table!
-            SymbolTable symbol_table =
-                newLocalSymtab(_default_system_symbol_table,
-                               _catalog, (IonStruct) prior);
+            SymbolTable symbol_table = _lst_factory.newLocalSymtab(_catalog, (IonStruct) prior);
             setSymbolTable(symbol_table);
         }
     }
@@ -255,7 +256,7 @@ void writeLocalSymtab(SymbolTable symtab)
     @Override
     final SymbolTable inject_local_symbol_table() throws IOException
     {
-        return newLocalSymtab(_factory, getSymbolTable());
+        return _lst_factory.newLocalSymtab(getSymbolTable());
     }
 
     //========================================================================
diff --git a/src/software/amazon/ion/impl/IonWriterUser.java b/src/software/amazon/ion/impl/IonWriterUser.java
index 9d05c2e76e..adf089de9a 100644
--- a/src/software/amazon/ion/impl/IonWriterUser.java
+++ b/src/software/amazon/ion/impl/IonWriterUser.java
@@ -256,10 +256,9 @@ private void close_local_symbol_table_copy() throws IOException
 
         // convert the struct we just wrote with the TreeWriter to a
         // local symbol table
-        SymbolTable symtab =
-            PrivateUtils.newLocalSymtab(activeSystemSymbolTable(),
-                                          _catalog,
-                                          _symbol_table_value);
+        LocalSymbolTableAsStruct.Factory lstFactory =
+            (LocalSymbolTableAsStruct.Factory)((PrivateValueFactory)_symtab_value_factory).getLstFactory();
+        SymbolTable symtab = lstFactory.newLocalSymtab(_catalog, _symbol_table_value);
 
         _symbol_table_value = null;
         _current_writer     = _system_writer;
diff --git a/src/software/amazon/ion/impl/LocalSymbolTable.java b/src/software/amazon/ion/impl/LocalSymbolTable.java
index 62311fcbf3..0367184683 100644
--- a/src/software/amazon/ion/impl/LocalSymbolTable.java
+++ b/src/software/amazon/ion/impl/LocalSymbolTable.java
@@ -18,13 +18,9 @@
 import static software.amazon.ion.SystemSymbols.IMPORTS_SID;
 import static software.amazon.ion.SystemSymbols.ION;
 import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.MAX_ID;
 import static software.amazon.ion.SystemSymbols.MAX_ID_SID;
-import static software.amazon.ion.SystemSymbols.NAME;
 import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.SystemSymbols.SYMBOLS;
 import static software.amazon.ion.SystemSymbols.SYMBOLS_SID;
-import static software.amazon.ion.SystemSymbols.VERSION;
 import static software.amazon.ion.SystemSymbols.VERSION_SID;
 import static software.amazon.ion.impl.PrivateUtils.copyOf;
 import static software.amazon.ion.impl.PrivateUtils.getSidForSymbolTableField;
@@ -39,16 +35,12 @@
 import java.util.NoSuchElementException;
 import software.amazon.ion.IonCatalog;
 import software.amazon.ion.IonException;
-import software.amazon.ion.IonList;
 import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
 import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.ReadOnlyValueException;
 import software.amazon.ion.SymbolTable;
 import software.amazon.ion.SymbolToken;
-import software.amazon.ion.ValueFactory;
 import software.amazon.ion.util.IonTextUtils;
 
 /**
@@ -56,9 +48,44 @@
  * <p>
  * Instances of this class are safe for use by multiple threads.
  */
-final class LocalSymbolTable
+class LocalSymbolTable
     implements SymbolTable
 {
+
+    static class Factory implements PrivateLocalSymbolTableFactory
+    {
+
+        private Factory(){} // Should be accessed through the singleton
+
+        @Override
+        public SymbolTable newLocalSymtab(IonCatalog catalog,
+                                          IonReader reader,
+                                          boolean alreadyInStruct)
+        {
+            List<String> symbolsList = new ArrayList<String>();
+            LocalSymbolTableImports imports = readLocalSymbolTable(reader,
+                                                                   catalog,
+                                                                   alreadyInStruct,
+                                                                   symbolsList);
+            return new LocalSymbolTable(imports, symbolsList);
+        }
+
+        @Override
+        public SymbolTable newLocalSymtab(SymbolTable defaultSystemSymtab,
+                                          SymbolTable... imports)
+        {
+            LocalSymbolTableImports unifiedSymtabImports =
+                new LocalSymbolTableImports(defaultSystemSymtab, imports);
+
+            return new LocalSymbolTable(unifiedSymtabImports,
+                                        null /* local symbols */);
+        }
+
+    }
+
+    static final Factory DEFAULT_LST_FACTORY = new Factory();
+
+
     /**
      * The initial length of {@link #mySymbolNames}.
      */
@@ -72,13 +99,6 @@ final class LocalSymbolTable
      */
     private final LocalSymbolTableImports myImportsList;
 
-    /**
-     * The factory used to build the {@link #myImage} of a local symtab.
-     * It's used by the datagram level to maintain the tree representation.
-     * It cannot be changed since local symtabs can't be moved between trees.
-     */
-    private final ValueFactory myImageFactory;
-
     /**
      * Map of symbol names to symbol ids of local symbols that are not in
      * imports.
@@ -90,30 +110,24 @@ final class LocalSymbolTable
      */
     private boolean isReadOnly;
 
-    /**
-     * Memoized result of {@link #getIonRepresentation(ValueFactory)};
-     * Once this is created, we maintain it as symbols are added.
-     */
-    private IonStruct myImage;
-
     /**
      * The local symbol names declared in this symtab; never null.
      * The sid of the first element is {@link #myFirstLocalSid}.
      * Only the first {@link #mySymbolsCount} elements are valid.
      */
-    private String[] mySymbolNames;
+    String[] mySymbolNames;
 
     /**
      * This is the number of symbols defined in this symbol table
      * locally, that is not imported from some other table.
      */
-    private int mySymbolsCount;
+    int mySymbolsCount;
 
     /**
      * The sid of the first local symbol, which is stored at
      * {@link #mySymbolNames}[0].
      */
-    private final int myFirstLocalSid;
+    final int myFirstLocalSid;
 
     //==========================================================================
     // Private constructor(s) and static factory methods
@@ -134,13 +148,10 @@ private void buildSymbolsMap()
 
 
     /**
-     * @param imageFactory      never null
      * @param imports           never null
      * @param symbolsList       may be null or empty
      */
-    private LocalSymbolTable(ValueFactory imageFactory,
-                             LocalSymbolTableImports imports,
-                             List<String> symbolsList)
+    protected LocalSymbolTable(LocalSymbolTableImports imports, List<String> symbolsList)
     {
         if (symbolsList == null || symbolsList.isEmpty())
         {
@@ -153,7 +164,6 @@ private LocalSymbolTable(ValueFactory imageFactory,
             mySymbolNames  = symbolsList.toArray(new String[mySymbolsCount]);
         }
 
-        myImageFactory = imageFactory;
         myImportsList = imports;
         myFirstLocalSid = myImportsList.getMaxId() + 1;
 
@@ -166,12 +176,10 @@ private LocalSymbolTable(ValueFactory imageFactory,
      * Copy-constructor, performs defensive copying of member fields where
      * necessary. The returned instance is mutable.
      */
-    private LocalSymbolTable(LocalSymbolTable other, int maxId)
+    protected LocalSymbolTable(LocalSymbolTable other, int maxId)
     {
         isReadOnly      = false;
         myFirstLocalSid = other.myFirstLocalSid;
-        myImage         = null;
-        myImageFactory  = other.myImageFactory;
         myImportsList   = other.myImportsList;
         mySymbolsCount  = maxId - myImportsList.getMaxId();
 
@@ -190,96 +198,10 @@ private LocalSymbolTable(LocalSymbolTable other, int maxId)
         }
     }
 
-    /**
-     * Constructs a new local symtab with given imports and local symbols.
-     *
-     * @param imageFactory
-     *          the factory to use when building a DOM image, may be null
-     * @param defaultSystemSymtab
-     *          the default system symtab, which will be used if the first
-     *          import in {@code imports} isn't a system symtab, never null
-     * @param localSymbols
-     *          the list of local symbols; may be null or empty to indicate
-     *          no local symbols
-     * @param imports
-     *          the set of shared symbol tables to import; the first (and only
-     *          the first) may be a system table, in which case the
-     *          {@code defaultSystemSymtab} is ignored
-     *
-     * @throws IllegalArgumentException
-     *          if any import is a local table, or if any but the first is a
-     *          system table
-     * @throws NullPointerException
-     *          if any import is null
-     */
-    static LocalSymbolTable
-    makeNewLocalSymbolTable(ValueFactory imageFactory,
-                            SymbolTable defaultSystemSymtab,
-                            List<String> localSymbols,
-                            SymbolTable... imports)
-    {
-        LocalSymbolTableImports unifiedSymtabImports =
-            new LocalSymbolTableImports(defaultSystemSymtab, imports);
-
-        return new LocalSymbolTable(imageFactory,
-                                    unifiedSymtabImports,
-                                    localSymbols);
-    }
-
-    /**
-     * Constructs a new local symbol table represented by the passed in
-     * {@link IonStruct}.
-     *
-     * @param systemSymbolTable
-     *          never null
-     * @param catalog
-     *          may be null
-     * @param ionRep
-     *          the struct represented the local symtab
-     */
-    static LocalSymbolTable
-    makeNewLocalSymbolTable(SymbolTable systemSymbolTable,
-                            IonCatalog catalog,
-                            IonStruct ionRep)
-    {
-        ValueFactory imageFactory = ionRep.getSystem();
-        IonReader reader = new IonReaderTreeSystem(ionRep);
-        LocalSymbolTable table =
-            makeNewLocalSymbolTable(imageFactory, systemSymbolTable,
-                                    catalog, reader, false);
-
-        table.myImage = ionRep;
-
-        return table;
-    }
-
-    /**
-     * Constructs a new local symbol table represented by the current value of
-     * the passed in {@link IonReader}.
-     * <p>
-     * <b>NOTE:</b> It is assumed that the passed in reader is positioned
-     * properly on/before a value that represents a local symtab semantically.
-     * That is, no exception-checks are made on the {@link IonType}
-     * and annotation, callers are responsible for checking this!
-     *
-     * @param imageFactory
-     * @param systemSymbolTable
-     * @param catalog
-     *          the catalog containing shared symtabs referenced by import
-     *          declarations within the local symtab
-     * @param reader
-     *          the reader positioned on the local symbol table represented as
-     *          a struct
-     * @param isOnStruct
-     *          denotes whether the reader is already positioned on the struct;
-     *          false if it is positioned before the struct
-     */
-    static LocalSymbolTable
-    makeNewLocalSymbolTable(ValueFactory imageFactory,
-                            SymbolTable systemSymbolTable,
-                            IonCatalog catalog,
-                            IonReader reader,
-                            boolean isOnStruct)
+    protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader,
+                                                                  IonCatalog catalog,
+                                                                  boolean isOnStruct,
+                                                                  List<String> symbolsListOut)
     {
         if (! isOnStruct)
         {
@@ -295,9 +217,8 @@ private LocalSymbolTable(LocalSymbolTable other, int maxId)
 
         reader.stepIn();
 
-        List<String> symbolsList = new ArrayList<String>();
         List<SymbolTable> importsList = new ArrayList<SymbolTable>();
-        importsList.add(systemSymbolTable);
+        importsList.add(reader.getSymbolTable().getSystemSymbolTable());
 
         IonType fieldType;
         boolean foundImportList = false;
@@ -346,7 +267,7 @@ private LocalSymbolTable(LocalSymbolTable other, int maxId)
                                 text = null;
                             }
 
-                            symbolsList.add(text);
+                            symbolsListOut.add(text);
                         }
                         reader.stepOut();
                     }
@@ -382,11 +303,7 @@ else if (fieldType == IonType.SYMBOL)
 
         reader.stepOut();
 
-        LocalSymbolTableImports imports =
-            new LocalSymbolTableImports(importsList);
-
-        // We have all necessary data, pass it over to the private constructor
-        return new LocalSymbolTable(imageFactory, imports, symbolsList);
+        return new LocalSymbolTableImports(importsList);
     }
 
     synchronized LocalSymbolTable makeCopy()
@@ -603,10 +520,8 @@ private static final void validateSymbol(String name)
 
     /**
      * NOT SYNCHRONIZED! Call within constructor or from synch'd method.
-     *
-     * @param symbolName must be nonempty.
      */
-    private int putSymbol(String symbolName)
+    int putSymbol(String symbolName)
     {
         if (isReadOnly)
         {
@@ -625,19 +540,17 @@ private int putSymbol(String symbolName)
             mySymbolNames = temp;
         }
 
-        int sid = mySymbolsCount + myFirstLocalSid;
-        assert sid == getMaxId() + 1;
-
-        putToMapIfNotThere(mySymbolsMap, symbolName, sid);
+        int sid = -1;
+        if (symbolName != null)
+        {
+            sid = mySymbolsCount + myFirstLocalSid;
+            assert sid == getMaxId() + 1;
 
+            putToMapIfNotThere(mySymbolsMap, symbolName, sid);
+        }
         mySymbolNames[mySymbolsCount] = symbolName;
         mySymbolsCount++;
 
-        if (myImage != null)
-        {
-            recordLocalSymbolInIonRep(myImage, symbolName, sid);
-        }
-
         return sid;
     }
 
@@ -690,132 +603,6 @@ public void writeTo(IonWriter writer) throws IOException
         writer.writeValues(reader);
     }
 
-    //
-    // TODO: there needs to be a better way to associate a System with
-    //       the symbol table, which is required if someone is to be
-    //       able to generate an instance.  The other way to resolve
-    //       this dependency would be for the IonSystem object to be
-    //       able to take a SymbolTable and synthesize an Ion
-    //       value from it, by using the public API's to see the useful
-    //       contents.  But what about open content?  If the origin of
-    //       the symbol table was an IonValue you could get the sys
-    //       from it, and update it, thereby preserving any extra bits.
-    //       If, OTOH, it was synthesized from scratch (a common case)
-    //       then extra content doesn't matter.
-    //
-
-    /**
-     * Only valid on local symtabs that already have an _image_factory set.
-     *
-     * @param imageFactory is used to check that the image uses the correct
-     *   DOM implementation.
-     *   It must be identical to the {@link #myImageFactory} and not null.
-     * @return Not null.
-     */
-    IonStruct getIonRepresentation(ValueFactory imageFactory)
-    {
-        if (imageFactory == null)
-        {
-            throw new IonExceptionNoSystem("can't create representation without a system");
-        }
-
-        if (imageFactory != myImageFactory)
-        {
-            throw new IonException("wrong system");
-        }
-
-        IonStruct image;
-        synchronized (this)
-        {
-            image = myImage;
-
-            if (image == null)
-            {
-                // Start a new image from scratch
-                myImage = image = makeIonRepresentation(myImageFactory);
-            }
-        }
-
-        return image;
-    }
-
-    /**
-     * NOT SYNCHRONIZED! Call only from a synch'd method.
-     *
-     * @return a new struct, not null.
-     */
-    private IonStruct makeIonRepresentation(ValueFactory factory)
-    {
-        IonStruct ionRep = factory.newEmptyStruct();
-
-        ionRep.addTypeAnnotation(ION_SYMBOL_TABLE);
-
-        SymbolTable[] importedTables = getImportedTablesNoCopy();
-
-        if (importedTables.length > 1)
-        {
-            IonList importsList = factory.newEmptyList();
-            for (int i = 1; i < importedTables.length; i++)
-            {
-                SymbolTable importedTable = importedTables[i];
-                IonStruct importStruct = factory.newEmptyStruct();
-
-                importStruct.add(NAME,
-                                 factory.newString(importedTable.getName()));
-                importStruct.add(VERSION,
-                                 factory.newInt(importedTable.getVersion()));
-                importStruct.add(MAX_ID,
-                                 factory.newInt(importedTable.getMaxId()));
-
-                importsList.add(importStruct);
-            }
-            ionRep.add(IMPORTS, importsList);
-        }
-
-        if (mySymbolsCount > 0)
-        {
-            int sid = myFirstLocalSid;
-            for (int offset = 0; offset < mySymbolsCount; offset++, sid++)
-            {
-                String symbolName = mySymbolNames[offset];
-                recordLocalSymbolInIonRep(ionRep, symbolName, sid);
-            }
-        }
-
-        return ionRep;
-    }
-
-    /**
-     * NOT SYNCHRONIZED! Call within constructor or from synched method.
-     * @param symbolName can be null when there's a gap in the local symbols list.
-     */
-    private void recordLocalSymbolInIonRep(IonStruct ionRep,
-                                           String symbolName,
-                                           int sid)
-    {
-        assert sid >= myFirstLocalSid;
-
-        ValueFactory sys = ionRep.getSystem();
-
-        // TODO this is crazy inefficient and not as reliable as it looks
-        // since it doesn't handle the case where's theres more than one list
-        IonValue syms = ionRep.get(SYMBOLS);
-        while (syms != null && syms.getType() != IonType.LIST)
-        {
-            ionRep.remove(syms);
-            syms = ionRep.get(SYMBOLS);
-        }
-        if (syms == null)
-        {
-            syms = sys.newEmptyList();
-            ionRep.put(SYMBOLS, syms);
-        }
-
-        int this_offset = sid - myFirstLocalSid;
-        IonValue name = sys.newString(symbolName);
-        ((IonList)syms).add(this_offset, name);
-    }
-
     /**
      * Collects the necessary imports from the reader and catalog, and load
      * them into the passed-in {@code importsList}.
@@ -976,16 +763,6 @@ public String toString()
         return "(LocalSymbolTable max_id:" + getMaxId() + ')';
     }
 
-    static class IonExceptionNoSystem extends IonException
-    {
-        private static final long serialVersionUID = 1L;
-
-        IonExceptionNoSystem(String msg)
-        {
-            super(msg);
-        }
-    }
-
     private static final class SymbolIterator
         implements Iterator<String>
     {
diff --git a/src/software/amazon/ion/impl/LocalSymbolTableAsStruct.java b/src/software/amazon/ion/impl/LocalSymbolTableAsStruct.java
new file mode 100644
index 0000000000..7cc6f3021e
--- /dev/null
+++ b/src/software/amazon/ion/impl/LocalSymbolTableAsStruct.java
@@ -0,0 +1,265 @@
+/*
+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at:
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+
+package software.amazon.ion.impl;
+
+import static software.amazon.ion.SystemSymbols.IMPORTS;
+import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static software.amazon.ion.SystemSymbols.MAX_ID;
+import static software.amazon.ion.SystemSymbols.NAME;
+import static software.amazon.ion.SystemSymbols.SYMBOLS;
+import static software.amazon.ion.SystemSymbols.VERSION;
+
+import java.util.ArrayList;
+import java.util.List;
+import software.amazon.ion.IonCatalog;
+import software.amazon.ion.IonList;
+import software.amazon.ion.IonReader;
+import software.amazon.ion.IonStruct;
+import software.amazon.ion.IonType;
+import software.amazon.ion.IonValue;
+import software.amazon.ion.SymbolTable;
+import software.amazon.ion.ValueFactory;
+
+/**
+ * A LocalSymbolTable that memoizes its IonStruct representation.
+ * @deprecated Should not be used in new code without data demonstrating its
+ *             benefits. Instead, use {@link LocalSymbolTable}.
+ */
+@Deprecated
+class LocalSymbolTableAsStruct
+    extends LocalSymbolTable
+{
+
+    static class Factory implements PrivateLocalSymbolTableFactory
+    {
+
+        private final ValueFactory imageFactory;
+
+        /**
+         * @param imageFactory
+         *          the factory to use when building a DOM image, not null
+         */
+        public Factory(ValueFactory imageFactory)
+        {
+            this.imageFactory = imageFactory;
+        }
+
+        @Override
+        public SymbolTable newLocalSymtab(IonCatalog catalog,
+                                          IonReader reader,
+                                          boolean alreadyInStruct)
+        {
+            List<String> symbolsList = new ArrayList<String>();
+            LocalSymbolTableImports imports = readLocalSymbolTable(reader,
+                                                                   catalog,
+                                                                   alreadyInStruct,
+                                                                   symbolsList);
+            return new LocalSymbolTableAsStruct(imageFactory, imports, symbolsList);
+        }
+
+        @Override
+        public SymbolTable newLocalSymtab(SymbolTable defaultSystemSymtab,
+                                          SymbolTable... imports)
+        {
+            LocalSymbolTableImports unifiedSymtabImports =
+                new LocalSymbolTableImports(defaultSystemSymtab, imports);
+
+            return new LocalSymbolTableAsStruct(imageFactory,
+                                                unifiedSymtabImports,
+                                                null /* local symbols */);
+        }
+
+        /**
+         * Constructs a new local symbol table represented by the passed in
+         * {@link IonStruct}.
+         *
+         * @param catalog
+         *          may be null
+         * @param ionRep
+         *          the struct represented the local symtab
+         */
+        // TODO this should die with the 'backed' DOM
+        public SymbolTable newLocalSymtab(IonCatalog catalog,
+                                          IonStruct ionRep)
+        {
+            assert imageFactory == ionRep.getSystem();
+            IonReader reader = new IonReaderTreeSystem(ionRep);
+
+            List<String> symbolsList = new ArrayList<String>();
+            LocalSymbolTableImports imports = readLocalSymbolTable(reader,
+                                                                   catalog,
+                                                                   false,
+                                                                   symbolsList);
+
+            LocalSymbolTableAsStruct table = new LocalSymbolTableAsStruct(imageFactory,
+                                                                          imports,
+                                                                          symbolsList);
+            table.myImage = ionRep;
+
+            return table;
+        }
+
+    }
+
+    /**
+     * The factory used to build the {@link #myImage} of a local symtab.
+     * It's used by the datagram level to maintain the tree representation.
+     * It cannot be changed since local symtabs can't be moved between trees.
+     */
+    private final ValueFactory myImageFactory;
+
+    /**
+     * Memoized result of {@link #getIonRepresentation()};
+     * Once this is created, we maintain it as symbols are added.
+     */
+    private IonStruct myImage;
+
+    /**
+     * @param imageFactory      never null
+     * @param imports           never null
+     * @param symbolsList       may be null or empty
+     */
+    private LocalSymbolTableAsStruct(ValueFactory imageFactory,
+                                     LocalSymbolTableImports imports,
+                                     List<String> symbolsList)
+    {
+        super(imports, symbolsList);
+        myImageFactory = imageFactory;
+    }
+
+    @Override
+    int putSymbol(String symbolName)
+    {
+        int sid = super.putSymbol(symbolName);
+        if (myImage != null)
+        {
+            recordLocalSymbolInIonRep(myImage, symbolName, sid);
+        }
+        return sid;
+    }
+
+    //
+    // TODO: there needs to be a better way to associate a System with
+    //       the symbol table, which is required if someone is to be
+    //       able to generate an instance.  The other way to resolve
+    //       this dependency would be for the IonSystem object to be
+    //       able to take a SymbolTable and synthesize an Ion
+    //       value from it, by using the public API's to see the useful
+    //       contents.  But what about open content?  If the origin of
+    //       the symbol table was an IonValue you could get the sys
+    //       from it, and update it, thereby preserving any extra bits.
+    //       If, OTOH, it was synthesized from scratch (a common case)
+    //       then extra content doesn't matter.
+    //
+
+    /**
+     * Only valid on local symtabs that already have an _image_factory set.
+     *
+     * @return Not null.
+     */
+    IonStruct getIonRepresentation()
+    {
+        synchronized (this)
+        {
+            IonStruct image = myImage;
+
+            if (image == null)
+            {
+                // Start a new image from scratch
+                myImage = image = makeIonRepresentation(myImageFactory);
+            }
+
+            return image;
+        }
+    }
+
+    /**
+     * NOT SYNCHRONIZED! Call only from a synch'd method.
+     *
+     * @return a new struct, not null.
+     */
+    private IonStruct makeIonRepresentation(ValueFactory factory)
+    {
+        IonStruct ionRep = factory.newEmptyStruct();
+
+        ionRep.addTypeAnnotation(ION_SYMBOL_TABLE);
+
+        SymbolTable[] importedTables = getImportedTablesNoCopy();
+
+        if (importedTables.length > 1)
+        {
+            IonList importsList = factory.newEmptyList();
+            for (int i = 1; i < importedTables.length; i++)
+            {
+                SymbolTable importedTable = importedTables[i];
+                IonStruct importStruct = factory.newEmptyStruct();
+
+                importStruct.add(NAME,
+                                 factory.newString(importedTable.getName()));
+                importStruct.add(VERSION,
+                                 factory.newInt(importedTable.getVersion()));
+                importStruct.add(MAX_ID,
+                                 factory.newInt(importedTable.getMaxId()));
+
+                importsList.add(importStruct);
+            }
+            ionRep.add(IMPORTS, importsList);
+        }
+
+        if (mySymbolsCount > 0)
+        {
+            int sid = myFirstLocalSid;
+            for (int offset = 0; offset < mySymbolsCount; offset++, sid++)
+            {
+                String symbolName = mySymbolNames[offset];
+                recordLocalSymbolInIonRep(ionRep, symbolName, sid);
+            }
+        }
+
+        return ionRep;
+    }
+
+    /**
+     * NOT SYNCHRONIZED! Call within constructor or from synched method.
+     * @param symbolName can be null when there's a gap in the local symbols list.
+     */
+    private void recordLocalSymbolInIonRep(IonStruct ionRep,
+                                           String symbolName,
+                                           int sid)
+    {
+        assert sid >= myFirstLocalSid;
+
+        ValueFactory sys = ionRep.getSystem();
+
+        // TODO this is crazy inefficient and not as reliable as it looks
+        // since it doesn't handle the case where's theres more than one list
+        IonValue syms = ionRep.get(SYMBOLS);
+        while (syms != null && syms.getType() != IonType.LIST)
+        {
+            ionRep.remove(syms);
+            syms = ionRep.get(SYMBOLS);
+        }
+        if (syms == null)
+        {
+            syms = sys.newEmptyList();
+            ionRep.put(SYMBOLS, syms);
+        }
+
+        int this_offset = sid - myFirstLocalSid;
+        IonValue name = sys.newString(symbolName);
+        ((IonList)syms).add(this_offset, name);
+    }
+
+}
diff --git a/src/software/amazon/ion/impl/PrivateIonReaderFactory.java b/src/software/amazon/ion/impl/PrivateIonReaderFactory.java
index 7f672a0d15..28f7cc4c31 100644
--- a/src/software/amazon/ion/impl/PrivateIonReaderFactory.java
+++ b/src/software/amazon/ion/impl/PrivateIonReaderFactory.java
@@ -36,21 +36,26 @@
 @Deprecated
 public final class PrivateIonReaderFactory
 {
-    public static final IonReader makeReader(IonSystem system,
-                                             IonCatalog catalog,
+    public static final IonReader makeReader(IonCatalog catalog,
                                              byte[] bytes)
     {
-        return makeReader(system, catalog, bytes, 0, bytes.length);
+        return makeReader(catalog, bytes, 0, bytes.length);
     }
 
-    public static IonReader makeSystemReader(IonSystem system, byte[] bytes)
+    public static final IonReader makeReader(IonCatalog catalog,
+                                             byte[] bytes,
+                                             PrivateLocalSymbolTableFactory lstFactory)
+   {
+       return makeReader(catalog, bytes, 0, bytes.length, lstFactory);
+   }
+
+    public static IonReader makeSystemReader(byte[] bytes)
     {
-        return makeSystemReader(system, bytes, 0, bytes.length);
+        return makeSystemReader(bytes, 0, bytes.length);
     }
 
 
-    public static final IonReader makeReader(IonSystem system,
-                                             IonCatalog catalog,
+    public static final IonReader makeReader(IonCatalog catalog,
                                              byte[] bytes,
                                              int offset,
                                              int length)
@@ -58,7 +63,7 @@ public static final IonReader makeReader(IonSystem system,
         try
         {
             UnifiedInputStreamX uis = makeUnifiedStream(bytes, offset, length);
-            return makeReader(system, catalog, uis, offset);
+            return makeReader(catalog, uis, offset, LocalSymbolTable.DEFAULT_LST_FACTORY);
         }
         catch (IOException e)
         {
@@ -66,15 +71,31 @@ public static final IonReader makeReader(IonSystem system,
         }
     }
 
-    public static IonReader makeSystemReader(IonSystem system,
+    public static final IonReader makeReader(IonCatalog catalog,
                                              byte[] bytes,
+                                             int offset,
+                                             int length,
+                                             PrivateLocalSymbolTableFactory lstFactory)
+    {
+        try
+        {
+            UnifiedInputStreamX uis = makeUnifiedStream(bytes, offset, length);
+            return makeReader(catalog, uis, offset, lstFactory);
+        }
+        catch (IOException e)
+        {
+            throw new IonException(e);
+        }
+    }
+
+    public static IonReader makeSystemReader(byte[] bytes,
                                              int offset,
                                              int length)
     {
         try
         {
             UnifiedInputStreamX uis = makeUnifiedStream(bytes, offset, length);
-            return makeSystemReader(system, uis, offset);
+            return makeSystemReader(uis, offset);
         }
         catch (IOException e)
         {
@@ -83,122 +104,129 @@ public static IonReader makeSystemReader(IonSystem system,
     }
 
 
-    public static final IonReader makeReader(IonSystem system,
-                                                 IonCatalog catalog,
-                                                 char[] chars)
+    public static final IonReader makeReader(IonCatalog catalog,
+                                             char[] chars)
     {
-        return makeReader(system, catalog, chars, 0, chars.length);
+        return makeReader(catalog, chars, 0, chars.length);
     }
 
-    public static final IonReader makeSystemReader(IonSystem system,
-                                                   char[] chars)
+    public static final IonReader makeSystemReader(char[] chars)
     {
         UnifiedInputStreamX in = makeStream(chars);
-        return new IonReaderTextSystemX(system, in);
+        return new IonReaderTextSystemX(in);
     }
 
 
-    public static final IonReader makeReader(IonSystem system,
-                                             IonCatalog catalog,
+    public static final IonReader makeReader(IonCatalog catalog,
                                              char[] chars,
                                              int offset,
                                              int length)
     {
         UnifiedInputStreamX in = makeStream(chars, offset, length);
-        return new IonReaderTextUserX(system, catalog, in, offset);
+        return new IonReaderTextUserX(catalog, LocalSymbolTable.DEFAULT_LST_FACTORY, in, offset);
     }
 
-    public static final IonReader makeSystemReader(IonSystem system,
-                                                   char[] chars,
+    public static final IonReader makeSystemReader(char[] chars,
                                                    int offset,
                                                    int length)
     {
         UnifiedInputStreamX in = makeStream(chars, offset, length);
-        return new IonReaderTextSystemX(system, in);
+        return new IonReaderTextSystemX(in);
     }
 
 
-    public static final IonReader makeReader(IonSystem system,
-                                                 IonCatalog catalog,
-                                                 CharSequence chars)
+    public static final IonReader makeReader(IonCatalog catalog,
+                                             CharSequence chars)
+    {
+        return makeReader(catalog, chars, LocalSymbolTable.DEFAULT_LST_FACTORY);
+    }
+
+    public static final IonReader makeReader(IonCatalog catalog,
+                                             CharSequence chars,
+                                             PrivateLocalSymbolTableFactory lstFactory)
     {
         UnifiedInputStreamX in = makeStream(chars);
-        return new IonReaderTextUserX(system, catalog, in);
+        return new IonReaderTextUserX(catalog, lstFactory, in);
     }
 
-    public static final IonReader makeSystemReader(IonSystem system,
-                                                   CharSequence chars)
+    public static final IonReader makeSystemReader(CharSequence chars)
     {
         UnifiedInputStreamX in = makeStream(chars);
-        return new IonReaderTextSystemX(system, in);
+        return new IonReaderTextSystemX(in);
     }
 
 
-    public static final IonReader makeReader(IonSystem system,
-                                             IonCatalog catalog,
+    public static final IonReader makeReader(IonCatalog catalog,
                                              CharSequence chars,
                                              int offset,
                                              int length)
     {
         UnifiedInputStreamX in = makeStream(chars, offset, length);
-        return new IonReaderTextUserX(system, catalog, in, offset);
+        return new IonReaderTextUserX(catalog, LocalSymbolTable.DEFAULT_LST_FACTORY, in, offset);
     }
 
-    public static final IonReader makeSystemReader(IonSystem system,
-                                                   CharSequence chars,
+    public static final IonReader makeSystemReader(CharSequence chars,
                                                    int offset,
                                                    int length)
     {
         UnifiedInputStreamX in = makeStream(chars, offset, length);
-        return new IonReaderTextSystemX(system, in);
+        return new IonReaderTextSystemX(in);
     }
 
-
-    public static final IonReader makeReader(IonSystem system,
-                                             IonCatalog catalog,
+    public static final IonReader makeReader(IonCatalog catalog,
                                              InputStream is)
+    {
+        return makeReader(catalog, is, LocalSymbolTable.DEFAULT_LST_FACTORY);
+    }
+
+    public static final IonReader makeReader(IonCatalog catalog,
+                                             InputStream is,
+                                             PrivateLocalSymbolTableFactory lstFactory)
     {
         try {
             UnifiedInputStreamX uis = makeUnifiedStream(is);
-            return makeReader(system, catalog, uis, 0);
+            return makeReader(catalog, uis, 0, lstFactory);
         }
         catch (IOException e) {
             throw new IonException(e);
         }
     }
 
-    public static IonReader makeSystemReader(IonSystem system,
-                                             InputStream is)
+    public static IonReader makeSystemReader(InputStream is)
     {
         try {
             UnifiedInputStreamX uis = makeUnifiedStream(is);
-            return makeSystemReader(system, uis, 0);
+            return makeSystemReader(uis, 0);
         }
         catch (IOException e) {
             throw new IonException(e);
         }
     }
 
-
-    public static final IonReader makeReader(IonSystem system,
-                                             IonCatalog catalog,
+    public static final IonReader makeReader(IonCatalog catalog,
                                              Reader chars)
+    {
+        return makeReader(catalog, chars, LocalSymbolTable.DEFAULT_LST_FACTORY);
+    }
+
+    public static final IonReader makeReader(IonCatalog catalog,
+                                             Reader chars,
+                                             PrivateLocalSymbolTableFactory lstFactory)
     {
         try {
             UnifiedInputStreamX in = makeStream(chars);
-            return new IonReaderTextUserX(system, catalog, in);
+            return new IonReaderTextUserX(catalog, lstFactory, in);
         }
         catch (IOException e) {
             throw new IonException(e);
         }
     }
 
-    public static final IonReader makeSystemReader(IonSystem system,
-                                                       Reader chars)
+    public static final IonReader makeSystemReader(Reader chars)
     {
         try {
             UnifiedInputStreamX in = makeStream(chars);
-            return new IonReaderTextSystemX(system, in);
+            return new IonReaderTextSystemX(in);
         }
         catch (IOException e) {
             throw new IonException(e);
@@ -206,11 +234,10 @@ public static final IonReader makeSystemReader(IonSystem system,
     }
 
 
-    public static final IonReader makeReader(IonSystem system,
-                                             IonCatalog catalog,
+    public static final IonReader makeReader(IonCatalog catalog,
                                              IonValue value)
     {
-        return new IonReaderTreeUserX(value, catalog);
+        return new IonReaderTreeUserX(value, catalog, LocalSymbolTable.DEFAULT_LST_FACTORY);
     }
 
     public static final IonReader makeSystemReader(IonSystem system,
@@ -227,35 +254,34 @@ public static final IonReader makeSystemReader(IonSystem system,
 
 
 
-    private static IonReader makeReader(IonSystem system,
-                                        IonCatalog catalog,
+    private static IonReader makeReader(IonCatalog catalog,
                                         UnifiedInputStreamX uis,
-                                        int offset)
+                                        int offset,
+                                        PrivateLocalSymbolTableFactory lstFactory)
         throws IOException
     {
         IonReader r;
         if (has_binary_cookie(uis)) {
-            r = new IonReaderBinaryUserX(system, catalog, uis, offset);
+            r = new IonReaderBinaryUserX(catalog, lstFactory, uis, offset);
         }
         else {
-            r = new IonReaderTextUserX(system, catalog, uis, offset);
+            r = new IonReaderTextUserX(catalog, lstFactory, uis, offset);
         }
         return r;
     }
 
-    private static IonReader makeSystemReader(IonSystem system,
-                                              UnifiedInputStreamX uis,
+    private static IonReader makeSystemReader(UnifiedInputStreamX uis,
                                               int offset)
         throws IOException
     {
         IonReader r;
         if (has_binary_cookie(uis)) {
             // TODO pass offset, or spans will be incorrect
-            r = new IonReaderBinarySystemX(system, uis);
+            r = new IonReaderBinarySystemX(uis);
         }
         else {
             // TODO pass offset, or spans will be incorrect
-            r = new IonReaderTextSystemX(system, uis);
+            r = new IonReaderTextSystemX(uis);
         }
         return r;
     }
@@ -284,7 +310,6 @@ private static UnifiedInputStreamX makeUnifiedStream(byte[] bytes,
         return uis;
     }
 
-
     private static UnifiedInputStreamX makeUnifiedStream(InputStream in)
         throws IOException
     {
@@ -296,7 +321,6 @@ private static UnifiedInputStreamX makeUnifiedStream(InputStream in)
         return uis;
     }
 
-
     private static final boolean has_binary_cookie(UnifiedInputStreamX uis)
         throws IOException
     {
diff --git a/src/software/amazon/ion/impl/PrivateIonTextWriterBuilder.java b/src/software/amazon/ion/impl/PrivateIonTextWriterBuilder.java
index a47693f3d9..fb3245e420 100644
--- a/src/software/amazon/ion/impl/PrivateIonTextWriterBuilder.java
+++ b/src/software/amazon/ion/impl/PrivateIonTextWriterBuilder.java
@@ -191,7 +191,7 @@ private IonWriter build(PrivateFastAppendable appender)
                                                                    appender);
 
         SymbolTable initialSymtab =
-            initialSymtab(system, defaultSystemSymtab, imports);
+            initialSymtab(((PrivateValueFactory)system).getLstFactory(), defaultSystemSymtab, imports);
 
         return new IonWriterUser(catalog, system, systemWriter, initialSymtab);
     }
diff --git a/src/software/amazon/ion/impl/PrivateLocalSymbolTableFactory.java b/src/software/amazon/ion/impl/PrivateLocalSymbolTableFactory.java
new file mode 100644
index 0000000000..2e1121f699
--- /dev/null
+++ b/src/software/amazon/ion/impl/PrivateLocalSymbolTableFactory.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at:
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+
+package software.amazon.ion.impl;
+
+import software.amazon.ion.IonCatalog;
+import software.amazon.ion.IonReader;
+import software.amazon.ion.IonType;
+import software.amazon.ion.SymbolTable;
+
+/**
+ * NOT FOR APPLICATION USE
+ *
+ * Implementations of this interface may be provided to IonReaders in order
+ * to force them to construct LocalSymbolTables in a different way.
+ *
+ * In practice, this is used to construct a different LocalSymbolTable
+ * implementation for use with the DOM than is used purely by readers
+ * and writers.
+ *
+ * If {@link LocalSymbolTableAsStruct} is ever deleted, this can go away
+ * too.
+ */
+@SuppressWarnings("javadoc")
+public interface PrivateLocalSymbolTableFactory
+{
+    /**
+     * Constructs a new local symbol table represented by the current value of
+     * the passed in {@link IonReader}.
+     * <p>
+     * <b>NOTE:</b> It is assumed that the passed in reader is positioned
+     * properly on/before a value that represents a local symtab semantically.
+     * That is, no exception-checks are made on the {@link IonType}
+     * and annotation, callers are responsible for checking this!
+     *
+     * @param catalog
+     *          the catalog containing shared symtabs referenced by import
+     *          declarations within the local symtab
+     * @param reader
+     *          the reader positioned on the local symbol table represented as
+     *          a struct
+     * @param alreadyInStruct
+     *          denotes whether the reader is already positioned on the struct;
+     *          false if it is positioned before the struct
+     */
+    public SymbolTable newLocalSymtab(IonCatalog catalog,
+                                      IonReader reader,
+                                      boolean alreadyInStruct);
+
+    /**
+     * Constructs a new local symtab with given imports and local symbols.
+     *
+     * @param defaultSystemSymtab
+     *          the default system symtab, which will be used if the first
+     *          import in {@code imports} isn't a system symtab, never null
+     * @param imports
+     *          the set of shared symbol tables to import; the first (and only
+     *          the first) may be a system table, in which case the
+     *          {@code defaultSystemSymtab} is ignored
+     *
+     * @throws IllegalArgumentException
+     *          if any import is a local table, or if any but the first is a
+     *          system table
+     * @throws NullPointerException
+     *          if any import is null
+     */
+    public SymbolTable newLocalSymtab(SymbolTable defaultSystemSymtab,
+                                      SymbolTable... imports);
+}
diff --git a/src/software/amazon/ion/impl/PrivateUtils.java b/src/software/amazon/ion/impl/PrivateUtils.java
index 2ecabe4cef..ed8ce655a3 100644
--- a/src/software/amazon/ion/impl/PrivateUtils.java
+++ b/src/software/amazon/ion/impl/PrivateUtils.java
@@ -42,11 +42,9 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
-import java.util.List;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 import java.util.TimeZone;
-import software.amazon.ion.IonCatalog;
 import software.amazon.ion.IonException;
 import software.amazon.ion.IonReader;
 import software.amazon.ion.IonStruct;
@@ -739,53 +737,6 @@ public static SymbolTable newSharedSymtab(String name,
                                                       symbols);
     }
 
-
-    public static SymbolTable newLocalSymtab(ValueFactory imageFactory,
-                                             SymbolTable systemSymtab,
-                                             List<String> localSymbols,
-                                             SymbolTable... imports)
-    {
-        return LocalSymbolTable.makeNewLocalSymbolTable(imageFactory,
-                                                        systemSymtab,
-                                                        localSymbols,
-                                                        imports);
-    }
-
-
-    public static SymbolTable newLocalSymtab(ValueFactory imageFactory,
-                                             SymbolTable systemSymtab,
-                                             SymbolTable... imports)
-    {
-        return LocalSymbolTable.makeNewLocalSymbolTable(imageFactory,
-                                                        systemSymtab,
-                                                        null /*localSymbols*/,
-                                                        imports);
-    }
-
-
-    public static SymbolTable newLocalSymtab(SymbolTable systemSymbtab,
-                                             IonCatalog catalog,
-                                             IonStruct ionRep)
-    {
-        return LocalSymbolTable.makeNewLocalSymbolTable(systemSymbtab,
-                                                        catalog,
-                                                        ionRep);
-    }
-
-
-    public static SymbolTable newLocalSymtab(ValueFactory imageFactory,
-                                             SymbolTable systemSymbolTable,
-                                             IonCatalog catalog,
-                                             IonReader reader,
-                                             boolean alreadyInStruct)
-    {
-        return LocalSymbolTable.makeNewLocalSymbolTable(imageFactory,
-                                                        systemSymbolTable,
-                                                        catalog,
-                                                        reader,
-                                                        alreadyInStruct);
-    }
-
     public static SymbolTable newSubstituteSymtab(SymbolTable original,
                                                   int version,
                                                   int maxId)
@@ -845,14 +796,27 @@ public static SymbolTable copyLocalSymbolTable(SymbolTable symtab)
         return ((LocalSymbolTable) symtab).makeCopy();
     }
 
+    /**
+     * Trampoline to {@link LocalSymbolTableAsStruct.Factory#Factory(ValueFactory)}
+     * @param imageFactory
+     *          the ValueFactory from which to construct the IonStruct representation of the LST
+     * @return a new {@link LocalSymbolTableAsStruct.Factory}
+     * @deprecated due to DOM entanglement. Streaming applications should use
+     *             {@value LocalSymbolTable#DEFAULT_LST_FACTORY}.
+     */
+    @Deprecated
+    public static PrivateLocalSymbolTableFactory newLocalSymbolTableAsStructFactory(ValueFactory imageFactory)
+    {
+        return new LocalSymbolTableAsStruct.Factory(imageFactory);
+    }
 
     /**
      * Returns a minimal symtab, either system or local depending on the
-     * given values. If the imports are empty, the default system symtab is
-     * returned.
+     * given values, that supports representation as an IonStruct. If the
+     * imports are empty, the default system symtab is returned.
      *
-     * @param imageFactory
-     *          the factory to use when building a DOM image, may be null
+     * @param lstFactory
+     *          the factory to use to build the local symbol table, never null
      * @param defaultSystemSymtab
      *          the default system symtab, which will be used if the first
      *          import in {@code imports} isn't a system symtab, never null
@@ -861,7 +825,7 @@ public static SymbolTable copyLocalSymbolTable(SymbolTable symtab)
      * The first (and only the first) may be a system table, in which case the
      * {@code defaultSystemSymtab} is ignored.
      */
-    public static SymbolTable initialSymtab(ValueFactory imageFactory,
+    public static SymbolTable initialSymtab(PrivateLocalSymbolTableFactory lstFactory,
                                             SymbolTable defaultSystemSymtab,
                                             SymbolTable... imports)
     {
@@ -875,20 +839,17 @@ public static SymbolTable initialSymtab(ValueFactory imageFactory,
             return imports[0];
         }
 
-        return LocalSymbolTable.makeNewLocalSymbolTable(imageFactory,
-                                                        defaultSystemSymtab,
-                                                        null, /*localSymbols*/
-                                                        imports);
+        return lstFactory.newLocalSymtab(defaultSystemSymtab, imports);
     }
 
 
     /**
      * Trampoline to
-     * {@link LocalSymbolTable#getIonRepresentation(ValueFactory)};
+     * {@link LocalSymbolTableAsStruct#getIonRepresentation()};
      */
-    public static IonStruct symtabTree(ValueFactory vf, SymbolTable symtab)
+    public static IonStruct symtabTree(SymbolTable symtab)
     {
-        return ((LocalSymbolTable)symtab).getIonRepresentation(vf);
+        return ((LocalSymbolTableAsStruct)symtab).getIonRepresentation();
     }
 
     /**
diff --git a/src/software/amazon/ion/impl/PrivateValueFactory.java b/src/software/amazon/ion/impl/PrivateValueFactory.java
new file mode 100644
index 0000000000..e4e2517ee5
--- /dev/null
+++ b/src/software/amazon/ion/impl/PrivateValueFactory.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at:
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+
+package software.amazon.ion.impl;
+
+import software.amazon.ion.IonStruct;
+import software.amazon.ion.ValueFactory;
+
+public interface PrivateValueFactory extends ValueFactory
+{
+    /**
+     * Gets the {@link LocalSymbolTableAsStruct.Factory} associated with this
+     * {@link ValueFactory}. This is used to construct local symbol tables
+     * backed by {@link IonStruct}s. Note that this should not be used in new
+     * code; use {@link LocalSymbolTable} instead.
+     *
+     * @return a LocalSymbolTableAsStruct.Factory; never null.
+     */
+    @SuppressWarnings("javadoc")
+    public PrivateLocalSymbolTableFactory getLstFactory();
+}
diff --git a/src/software/amazon/ion/impl/lite/IonDatagramLite.java b/src/software/amazon/ion/impl/lite/IonDatagramLite.java
index ad8cd0c20f..d8158b97a9 100644
--- a/src/software/amazon/ion/impl/lite/IonDatagramLite.java
+++ b/src/software/amazon/ion/impl/lite/IonDatagramLite.java
@@ -1010,8 +1010,7 @@ void load_current_symbol_table(IonValueLite prev_user_value)
                         rep = __iterator.get_datagram_ivm();
                     }
                     else {
-                        IonSystem sys = __iterator.get_datagram_system();
-                        rep = PrivateUtils.symtabTree(sys, new_symbol_table);
+                        rep = PrivateUtils.symtabTree(new_symbol_table);
                     }
                     assert(rep != null && __iterator.get_datagram_system() == rep.getSystem());
 
@@ -1118,7 +1117,7 @@ private static int count_system_values(IonSystem sys,
             int count = 0;
             while (curr.isLocalTable()) {
                 count++;
-                curr = PrivateUtils.symtabTree(sys, curr).getSymbolTable();
+                curr = PrivateUtils.symtabTree(curr).getSymbolTable();
             }
             // we should terminate when the symbol tables symbol table is the system symbol table
             assert(curr != null);
diff --git a/src/software/amazon/ion/impl/lite/IonLoaderLite.java b/src/software/amazon/ion/impl/lite/IonLoaderLite.java
index 5d771c3b91..1c50234e65 100644
--- a/src/software/amazon/ion/impl/lite/IonLoaderLite.java
+++ b/src/software/amazon/ion/impl/lite/IonLoaderLite.java
@@ -29,6 +29,7 @@
 import software.amazon.ion.IonSystem;
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.impl.PrivateIonWriterFactory;
+import software.amazon.ion.impl.PrivateLocalSymbolTableFactory;
 
 final class IonLoaderLite
     implements IonLoader
@@ -38,6 +39,8 @@ final class IonLoaderLite
     /** Not null. */
     private final IonCatalog    _catalog;
 
+    private final PrivateLocalSymbolTableFactory _lstFactory;
+
     /**
      * @param system must not be null.
      * @param catalog must not be null.
@@ -49,6 +52,7 @@ public IonLoaderLite(IonSystemLite system, IonCatalog catalog)
 
         _system = system;
         _catalog = catalog;
+        _lstFactory = system.getLstFactory();
     }
 
     public IonSystem getSystem()
@@ -93,7 +97,7 @@ public IonDatagram load(File ionFile) throws IonException, IOException
     public IonDatagram load(String ionText) throws IonException
     {
         try {
-            IonReader reader = makeReader(_system, _catalog, ionText);
+            IonReader reader = makeReader(_catalog, ionText, _lstFactory);
             IonDatagramLite datagram = load_helper(reader);
             return datagram;
         }
@@ -105,7 +109,7 @@ public IonDatagram load(String ionText) throws IonException
     public IonDatagram load(Reader ionText) throws IonException, IOException
     {
         try {
-            IonReader reader = makeReader(_system, _catalog, ionText);
+            IonReader reader = makeReader(_catalog, ionText, _lstFactory);
             IonDatagramLite datagram = load_helper(reader);
             return datagram;
         }
@@ -119,7 +123,7 @@ public IonDatagram load(Reader ionText) throws IonException, IOException
     public IonDatagram load(byte[] ionData) throws IonException
     {
         try {
-            IonReader reader = makeReader(_system, _catalog, ionData, 0, ionData.length);
+            IonReader reader = makeReader(_catalog, ionData, 0, ionData.length, _lstFactory);
             IonDatagramLite datagram = load_helper(reader);
             return datagram;
         }
@@ -132,7 +136,7 @@ public IonDatagram load(InputStream ionData)
         throws IonException, IOException
     {
         try {
-            IonReader reader = makeReader(_system, _catalog, ionData);
+            IonReader reader = makeReader(_catalog, ionData, _lstFactory);
             IonDatagramLite datagram = load_helper(reader);
             return datagram;
         }
diff --git a/src/software/amazon/ion/impl/lite/IonSystemLite.java b/src/software/amazon/ion/impl/lite/IonSystemLite.java
index 33d813ff6a..d7e94b36eb 100644
--- a/src/software/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/software/amazon/ion/impl/lite/IonSystemLite.java
@@ -52,6 +52,7 @@
 import software.amazon.ion.impl.PrivateIonSystem;
 import software.amazon.ion.impl.PrivateIonWriterFactory;
 import software.amazon.ion.impl.PrivateUtils;
+import software.amazon.ion.system.IonReaderBuilder;
 import software.amazon.ion.system.IonTextWriterBuilder;
 
 final class IonSystemLite
@@ -63,19 +64,22 @@ final class IonSystemLite
 
     /** Not null. */
     private final IonCatalog         _catalog;
-    private       ValueFactoryLite   _value_factory;
     private final IonLoader          _loader;
     /** Immutable. */
     private final IonTextWriterBuilder myTextWriterBuilder;
     /** Immutable. */
     private final PrivateIonBinaryWriterBuilder myBinaryWriterBuilder;
+    /** Immutable. **/
+    private final IonReaderBuilder myReaderBuilder;
 
     public IonSystemLite(IonTextWriterBuilder twb,
-                          PrivateIonBinaryWriterBuilder bwb)
+                         PrivateIonBinaryWriterBuilder bwb,
+                         IonReaderBuilder rb)
     {
         IonCatalog catalog = twb.getCatalog();
         assert catalog != null;
         assert catalog == bwb.getCatalog();
+        assert catalog == rb.getCatalog();
 
         _catalog = catalog;
         _loader = new IonLoaderLite(this, catalog);
@@ -84,12 +88,12 @@ public IonSystemLite(IonTextWriterBuilder twb,
 
         myTextWriterBuilder = twb.immutable();
 
-        // whacked but I'm not going to figure this out right now
-        _value_factory = this;
-        _value_factory.set_system(this);
+        set_system(this);
 
-        bwb.setSymtabValueFactory(_value_factory);
+        bwb.setSymtabValueFactory(this);
         myBinaryWriterBuilder = bwb.immutable();
+
+        myReaderBuilder = rb.immutable();
     }
 
     //==========================================================================
@@ -168,28 +172,28 @@ public SymbolTable getSystemSymbolTable(String ionVersionId)
 
     public Iterator<IonValue> iterate(Reader ionText)
     {
-        IonReader reader = makeReader(this, _catalog, ionText);
+        IonReader reader = makeReader(_catalog, ionText, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
 
     public Iterator<IonValue> iterate(InputStream ionData)
     {
-        IonReader reader = newReader(ionData);
+        IonReader reader = makeReader(_catalog, ionData, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
 
     public Iterator<IonValue> iterate(String ionText)
     {
-        IonReader reader = makeReader(this, _catalog, ionText);
+        IonReader reader = makeReader(_catalog, ionText, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
 
     public Iterator<IonValue> iterate(byte[] ionData)
     {
-        IonReader reader = makeReader(this, _catalog, ionData);
+        IonReader reader = makeReader(_catalog, ionData, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
@@ -224,10 +228,7 @@ public IonWriter newTextWriter(OutputStream out, SymbolTable... imports)
 
     public SymbolTable newLocalSymbolTable(SymbolTable... imports)
     {
-        return PrivateUtils.newLocalSymtab(this,
-                                             getSystemSymbolTable(),
-                                             null /* localSymbols */,
-                                             imports);
+        return _lstFactory.newLocalSymtab(getSystemSymbolTable(), imports);
     }
 
     public SymbolTable newSharedSymbolTable(IonStruct ionRep)
@@ -646,8 +647,7 @@ public IonDatagram newDatagram(SymbolTable... imports)
     public IonDatagram newDatagram(IonCatalog catalog, SymbolTable... imports)
     {
         SymbolTable defaultSystemSymtab = getSystemSymbolTable();
-        SymbolTable symbols =
-            initialSymtab(this, defaultSystemSymtab, imports);
+        SymbolTable symbols = initialSymtab(_lstFactory, defaultSystemSymtab, imports);
         IonDatagramLite dg = newDatagram(catalog);
         dg.appendTrailingSymbolTable(symbols);
         return dg;
@@ -655,55 +655,55 @@ public IonDatagram newDatagram(IonCatalog catalog, SymbolTable... imports)
 
     public IonReader newReader(byte[] ionData)
     {
-        return makeReader(this, _catalog, ionData);
+        return myReaderBuilder.build(ionData);
     }
 
     public IonReader newSystemReader(byte[] ionData)
     {
-        return makeSystemReader(this, ionData);
+        return makeSystemReader(ionData);
     }
 
 
     public IonReader newReader(byte[] ionData, int offset, int len)
     {
-        return makeReader(this, _catalog, ionData, offset, len);
+        return myReaderBuilder.build(ionData, offset, len);
     }
 
     public IonReader newSystemReader(byte[] ionData, int offset, int len)
     {
-        return makeSystemReader(this, ionData, offset, len);
+        return makeSystemReader(ionData, offset, len);
     }
 
 
     public IonReader newReader(String ionText)
     {
-        return makeReader(this, _catalog, ionText);
+        return myReaderBuilder.build(ionText);
     }
 
     public IonReader newSystemReader(String ionText)
     {
-        return makeSystemReader(this, ionText);
+        return makeSystemReader(ionText);
     }
 
 
     public IonReader newReader(InputStream ionData)
     {
-        return makeReader(this, _catalog, ionData);
+        return myReaderBuilder.build(ionData);
     }
 
     public IonReader newSystemReader(InputStream ionData)
     {
-        return makeSystemReader(this, ionData);
+        return makeSystemReader(ionData);
     }
 
     public IonReader newReader(Reader ionText)
     {
-        return makeReader(this, _catalog, ionText);
+        return myReaderBuilder.build(ionText);
     }
 
     public IonReader newReader(IonValue value)
     {
-        return makeReader(this, _catalog, value);
+        return myReaderBuilder.build(value);
     }
 
     //==========================================================================
@@ -712,7 +712,7 @@ public IonReader newReader(IonValue value)
 
     public IonReader newSystemReader(Reader ionText)
     {
-        return makeSystemReader(this, ionText);
+        return makeSystemReader(ionText);
     }
 
     public IonReader newSystemReader(IonValue value)
diff --git a/src/software/amazon/ion/impl/lite/PrivateLiteDomTrampoline.java b/src/software/amazon/ion/impl/lite/PrivateLiteDomTrampoline.java
index dcc8bde54c..eeeddab03b 100644
--- a/src/software/amazon/ion/impl/lite/PrivateLiteDomTrampoline.java
+++ b/src/software/amazon/ion/impl/lite/PrivateLiteDomTrampoline.java
@@ -17,6 +17,7 @@
 import software.amazon.ion.IonSystem;
 import software.amazon.ion.SymbolTable;
 import software.amazon.ion.impl.PrivateIonBinaryWriterBuilder;
+import software.amazon.ion.system.IonReaderBuilder;
 import software.amazon.ion.system.IonTextWriterBuilder;
 
 /**
@@ -27,10 +28,12 @@
 @Deprecated
 public final class PrivateLiteDomTrampoline
 {
+
     public static IonSystem newLiteSystem(IonTextWriterBuilder twb,
-                                          PrivateIonBinaryWriterBuilder bwb)
+                                          PrivateIonBinaryWriterBuilder bwb,
+                                          IonReaderBuilder rb)
     {
-        return new IonSystemLite(twb, bwb);
+        return new IonSystemLite(twb, bwb, rb);
     }
 
     public static boolean isLiteSystem(IonSystem system)
diff --git a/src/software/amazon/ion/impl/lite/ValueFactoryLite.java b/src/software/amazon/ion/impl/lite/ValueFactoryLite.java
index 83140bec13..a0609d0888 100644
--- a/src/software/amazon/ion/impl/lite/ValueFactoryLite.java
+++ b/src/software/amazon/ion/impl/lite/ValueFactoryLite.java
@@ -28,7 +28,9 @@
 import software.amazon.ion.IonValue;
 import software.amazon.ion.SymbolToken;
 import software.amazon.ion.Timestamp;
-import software.amazon.ion.ValueFactory;
+import software.amazon.ion.impl.PrivateLocalSymbolTableFactory;
+import software.amazon.ion.impl.PrivateUtils;
+import software.amazon.ion.impl.PrivateValueFactory;
 
 /**
  *  This class handles all of the IonValueLite
@@ -36,10 +38,16 @@
  *
  */
 abstract class ValueFactoryLite
-    implements ValueFactory
+    implements PrivateValueFactory
 {
+    protected final PrivateLocalSymbolTableFactory _lstFactory;
     private ContainerlessContext _context;
 
+    ValueFactoryLite()
+    {
+        _lstFactory = PrivateUtils.newLocalSymbolTableAsStructFactory(this);
+    }
+
     protected void set_system(IonSystemLite system) {
         _context = ContainerlessContext.wrap(system);
     }
@@ -436,4 +444,10 @@ private ArrayList<IonIntLite> newInts(long[] elements)
 
         return e;
     }
+
+    @Override
+    public PrivateLocalSymbolTableFactory getLstFactory()
+    {
+        return _lstFactory;
+    }
 }
diff --git a/src/software/amazon/ion/system/IonReaderBuilder.java b/src/software/amazon/ion/system/IonReaderBuilder.java
new file mode 100644
index 0000000000..7366ba52d9
--- /dev/null
+++ b/src/software/amazon/ion/system/IonReaderBuilder.java
@@ -0,0 +1,307 @@
+/*
+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at:
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+
+package software.amazon.ion.system;
+
+import static software.amazon.ion.impl.PrivateIonReaderFactory.makeReader;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+import software.amazon.ion.IonCatalog;
+import software.amazon.ion.IonException;
+import software.amazon.ion.IonReader;
+import software.amazon.ion.IonStruct;
+import software.amazon.ion.IonSystem;
+import software.amazon.ion.IonValue;
+
+/**
+ * Build a new {@link IonReader} from the given {@link IonCatalog} and data
+ * source. A data source is required, while an IonCatalog is optional. If no
+ * IonCatalog is provided, an empty {@link SimpleCatalog} will be used.
+ * <p>
+ * {@link IonReader}s parse incrementally, so syntax errors in the input data
+ * will not be detected as side effects of any of the {@code build} methods
+ * in this class.
+ */
+@SuppressWarnings("deprecation")
+public class IonReaderBuilder
+{
+
+    private IonCatalog catalog = null;
+
+    private IonReaderBuilder()
+    {
+    }
+
+    private IonReaderBuilder(IonReaderBuilder that)
+    {
+        this.catalog = that.catalog;
+    }
+
+    /**
+     * The standard builder of {@link IonReader}s, with all configuration
+     * properties having their default values.
+     *
+     * @return a new, mutable builder instance.
+     */
+    public static IonReaderBuilder standard()
+    {
+        return new Mutable();
+    }
+
+    /**
+     * Creates a mutable copy of this builder.
+     *
+     * @return a new builder with the same configuration as {@code this}.
+     */
+    public IonReaderBuilder copy()
+    {
+        return new Mutable(this);
+    }
+
+    /**
+     * Returns an immutable builder configured exactly like this one.
+     *
+     * @return this builder instance, if immutable;
+     * otherwise an immutable copy of this builder.
+     */
+    public IonReaderBuilder immutable()
+    {
+        return this;
+    }
+
+    /**
+     * Returns a mutable builder configured exactly like this one.
+     *
+     * @return this instance, if mutable;
+     * otherwise a mutable copy of this instance.
+     */
+    public IonReaderBuilder mutable()
+    {
+        return copy();
+    }
+
+    /** NOT FOR APPLICATION USE! */
+    protected void mutationCheck()
+    {
+        throw new UnsupportedOperationException("This builder is immutable");
+    }
+
+    /**
+     * Declares the catalog to use when building an {@link IonReader},
+     * returning a new mutable builder the current one is immutable.
+     *
+     * @param catalog the catalog to use in built readers.
+     *  If null, a new {@link SimpleCatalog} will be used.
+     *
+     * @return this builder instance, if mutable;
+     * otherwise a mutable copy of this builder.
+     *
+     * @see #setCatalog(IonCatalog)
+     * @see #withCatalog(IonCatalog)
+     */
+    public IonReaderBuilder withCatalog(IonCatalog catalog)
+    {
+        IonReaderBuilder b = mutable();
+        b.setCatalog(catalog);
+        return b;
+    }
+
+    /**
+     * Sets the catalog to use when building an {@link IonReader}.
+     *
+     * @param catalog the catalog to use in built readers.
+     *  If null, a new {@link SimpleCatalog} will be used.
+     *
+     * @see #getCatalog()
+     * @see #withCatalog(IonCatalog)
+     *
+     * @throws UnsupportedOperationException if this builder is immutable.
+     */
+    public void setCatalog(IonCatalog catalog)
+    {
+        mutationCheck();
+        this.catalog = catalog;
+    }
+
+    /**
+     * Gets the catalog to use when building an {@link IonReader}, or null
+     * if none has been manually set. The catalog is needed to resolve shared
+     * symbol table imports.
+     *
+     * @see #setCatalog(IonCatalog)
+     * @see #withCatalog(IonCatalog)
+     */
+    public IonCatalog getCatalog()
+    {
+        return catalog;
+    }
+
+    private IonCatalog validateCatalog()
+    {
+        // matches behavior in IonSystemBuilder when no catalog provided
+        return catalog != null ? catalog : new SimpleCatalog();
+    }
+
+    /**
+     * Based on the builder's configuration properties, creates a new IonReader
+     * instance over the given block of Ion data, detecting whether it's text or
+     * binary data.
+     * <p>
+     * This method will auto-detect and uncompress GZIPped Ion data.
+     *
+     * @param ionData the source of the Ion data, which may be either Ion binary
+     * data or UTF-8 Ion text. The reader retains a reference to the array, so
+     * its data must not be modified while the reader is active. Must not be
+     * null.
+     *
+     * @return a new {@link IonReader} instance; not {@code null}.
+     *
+     * @see IonSystem#newReader(byte[])
+     */
+    public IonReader build(byte[] ionData)
+    {
+        return makeReader(validateCatalog(), ionData);
+    }
+
+    /**
+     * Based on the builder's configuration properties, creates a new IonReader
+     * instance over the given block of Ion data, detecting whether it's text or
+     * binary data.
+     * <p>
+     * This method will auto-detect and uncompress GZIPped Ion data.
+     *
+     * @param ionData the source of the Ion data, which is used only within the
+     * range of bytes starting at {@code offset} for {@code len} bytes.
+     * The data in that range may be either Ion binary data or UTF-8 Ion text.
+     * The reader retains a reference to the array, so its data must not be
+     * modified while the reader is active. Must not be null.
+     * @param offset must be non-negative and less than {@code ionData.length}.
+     * @param length must be non-negative and {@code offset+length} must not
+     * exceed {@code ionData.length}.
+     *
+     * @see IonSystem#newReader(byte[], int, int)
+     */
+    public IonReader build(byte[] ionData, int offset, int length)
+    {
+        return makeReader(validateCatalog(), ionData, offset, length);
+    }
+
+    /**
+     * Based on the builder's configuration properties, creates a new IonReader
+     * instance over the given stream of Ion data, detecting whether it's text or
+     * binary data.
+     * <p>
+     * This method will auto-detect and uncompress GZIPped Ion data.
+     * <p>
+     * Because this library performs its own buffering, it's recommended that
+     * users avoid adding additional buffering to the given stream.
+     *
+     * @param ionData the source of the Ion data, which may be either Ion binary
+     * data or UTF-8 Ion text. Must not be null.
+     *
+     * @return a new reader instance.
+     * Callers must call {@link IonReader#close()} when finished with it.
+     *
+     * @throws IonException if the source throws {@link IOException}.
+     *
+     * @see IonSystem#newReader(InputStream)
+     */
+    public IonReader build(InputStream ionData)
+    {
+        return makeReader(validateCatalog(), ionData);
+    }
+
+    /**
+     * Based on the builder's configuration properties, creates a new
+     * {@link IonReader} instance over Ion text data.
+     * <p>
+     * Applications should generally use {@link #build(InputStream)}
+     * whenever possible, since this library has much faster Unicode decoding
+     * than the Java IO framework.
+     * <p>
+     * Because this library performs its own buffering, it's recommended that
+     * you avoid adding additional buffering to the given stream.
+     *
+     * @param ionText the source of the Ion text data. Must not be null.
+     *
+     * @throws IonException if the source throws {@link IOException}.
+     *
+     * @see IonSystem#newReader(Reader)
+     */
+    public IonReader build(Reader ionText)
+    {
+        return makeReader(validateCatalog(), ionText);
+    }
+
+    /**
+     * Based on the builder's configuration properties, creates a new
+     * {@link IonReader} instance over an {@link IonValue} data model. Typically
+     * this is used to iterate over a collection, such as an {@link IonStruct}.
+     *
+     * @param value must not be null.
+     *
+     * @see IonSystem#newReader(IonValue)
+     */
+    public IonReader build(IonValue value)
+    {
+        return makeReader(validateCatalog(), value);
+    }
+
+    /**
+     * Based on the builder's configuration properties, creates an new
+     * {@link IonReader} instance over Ion text data.
+     *
+     * @param ionText the source of the Ion text data. Must not be null.
+     *
+     * @see IonSystem#newReader(String)
+     */
+    public IonReader build(String ionText)
+    {
+        return makeReader(validateCatalog(), ionText);
+    }
+
+    private static class Mutable extends IonReaderBuilder
+    {
+
+        private Mutable()
+        {
+        }
+
+        private Mutable(IonReaderBuilder that)
+        {
+            super(that);
+        }
+
+        @Override
+        public IonReaderBuilder immutable()
+        {
+            return new IonReaderBuilder(this);
+        }
+
+        @Override
+        public IonReaderBuilder mutable()
+        {
+            return this;
+        }
+
+        @Override
+        protected void mutationCheck()
+        {
+        }
+
+    }
+
+}
diff --git a/src/software/amazon/ion/system/IonSystemBuilder.java b/src/software/amazon/ion/system/IonSystemBuilder.java
index 2e813dfc18..982f251d1f 100644
--- a/src/software/amazon/ion/system/IonSystemBuilder.java
+++ b/src/software/amazon/ion/system/IonSystemBuilder.java
@@ -286,7 +286,8 @@ public final IonSystem build()
         // This is what we need, more or less.
 //        bwb = bwb.fillDefaults();
 
-        return newLiteSystem(twb, bwb);
+        IonReaderBuilder rb = IonReaderBuilder.standard().withCatalog(catalog);
+        return newLiteSystem(twb, bwb, rb);
     }
 
     //=========================================================================
diff --git a/test/AllTests.java b/test/AllTests.java
index 392e8bcd5f..b5b44ef293 100644
--- a/test/AllTests.java
+++ b/test/AllTests.java
@@ -83,6 +83,7 @@
 import software.amazon.ion.streaming.RoundTripStreamingTest;
 import software.amazon.ion.streaming.SpanTests;
 import software.amazon.ion.system.IonBinaryWriterBuilderTest;
+import software.amazon.ion.system.IonReaderBuilderTest;
 import software.amazon.ion.system.IonSystemBuilderTest;
 import software.amazon.ion.system.IonTextWriterBuilderTest;
 import software.amazon.ion.system.SimpleCatalogTest;
@@ -186,6 +187,7 @@
     IonBinaryWriterBuilderTest.class,
     IonReaderToIonValueTest.class,
     BinaryReaderWrappedValueLengthTest.class,
+    IonReaderBuilderTest.class,
 
     // experimental binary writer tests
     PooledBlockAllocatorProviderTest.class,
diff --git a/test/software/amazon/ion/DatagramTest.java b/test/software/amazon/ion/DatagramTest.java
index ae6ec5442c..6491d6fd97 100644
--- a/test/software/amazon/ion/DatagramTest.java
+++ b/test/software/amazon/ion/DatagramTest.java
@@ -15,11 +15,11 @@
 package software.amazon.ion;
 
 import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.Symtabs.FRED_MAX_IDS;
 import static software.amazon.ion.SystemSymbols.ION_1_0;
 import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
 import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
 import static software.amazon.ion.SystemSymbols.SYMBOLS;
+import static software.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
 import static software.amazon.ion.junit.IonAssert.assertIonEquals;
 
 import java.io.ByteArrayOutputStream;
@@ -45,6 +45,7 @@
 import software.amazon.ion.SymbolTable;
 import software.amazon.ion.impl.PrivateIonSystem;
 import software.amazon.ion.impl.PrivateIonValue;
+import software.amazon.ion.impl.Symtabs;
 
 
 public class DatagramTest
diff --git a/test/software/amazon/ion/LoaderTest.java b/test/software/amazon/ion/LoaderTest.java
index f0f92f0014..18e9a76c89 100644
--- a/test/software/amazon/ion/LoaderTest.java
+++ b/test/software/amazon/ion/LoaderTest.java
@@ -42,6 +42,7 @@
 import software.amazon.ion.IonSymbol;
 import software.amazon.ion.IonSystem;
 import software.amazon.ion.IonValue;
+import software.amazon.ion.impl.Symtabs;
 import software.amazon.ion.system.SimpleCatalog;
 
 public class LoaderTest
diff --git a/test/software/amazon/ion/SharedSymtabMaker.java b/test/software/amazon/ion/SharedSymtabMaker.java
index 2101e2c27d..554854f6bb 100644
--- a/test/software/amazon/ion/SharedSymtabMaker.java
+++ b/test/software/amazon/ion/SharedSymtabMaker.java
@@ -15,7 +15,7 @@
 package software.amazon.ion;
 
 import static junit.framework.Assert.assertSame;
-import static software.amazon.ion.Symtabs.sharedSymtabStruct;
+import static software.amazon.ion.impl.Symtabs.sharedSymtabStruct;
 
 import software.amazon.ion.IonReader;
 import software.amazon.ion.IonStruct;
diff --git a/test/software/amazon/ion/SystemProcessingTestCase.java b/test/software/amazon/ion/SystemProcessingTestCase.java
index 1fc491e57a..98fcc99f94 100644
--- a/test/software/amazon/ion/SystemProcessingTestCase.java
+++ b/test/software/amazon/ion/SystemProcessingTestCase.java
@@ -15,12 +15,12 @@
 package software.amazon.ion;
 
 import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.Symtabs.LocalSymbolTablePrefix;
 import static software.amazon.ion.SystemSymbols.ION_1_0;
 import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
 import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
 import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE_SID;
 import static software.amazon.ion.TestUtils.FERMATA;
+import static software.amazon.ion.impl.Symtabs.LocalSymbolTablePrefix;
 
 import org.junit.Ignore;
 import org.junit.Test;
@@ -29,6 +29,7 @@
 import software.amazon.ion.SymbolTable;
 import software.amazon.ion.Timestamp;
 import software.amazon.ion.impl.SymbolTableTest;
+import software.amazon.ion.impl.Symtabs;
 import software.amazon.ion.system.SimpleCatalog;
 
 
diff --git a/test/software/amazon/ion/impl/BinaryWriterTest.java b/test/software/amazon/ion/impl/BinaryWriterTest.java
index 10dd9cc7f9..b7f51f8c1b 100644
--- a/test/software/amazon/ion/impl/BinaryWriterTest.java
+++ b/test/software/amazon/ion/impl/BinaryWriterTest.java
@@ -26,7 +26,6 @@
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.SymbolTable;
 import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Symtabs;
 import software.amazon.ion.junit.IonAssert;
 
 public class BinaryWriterTest
diff --git a/test/software/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java b/test/software/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
index 0188c11d71..6997522fcb 100644
--- a/test/software/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
+++ b/test/software/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
@@ -14,10 +14,10 @@
 
 package software.amazon.ion.impl;
 
-import static software.amazon.ion.Symtabs.FRED_MAX_IDS;
-import static software.amazon.ion.Symtabs.LOCAL_SYMBOLS_ABC;
-import static software.amazon.ion.Symtabs.makeLocalSymtab;
 import static software.amazon.ion.impl.PrivateUtils.EMPTY_STRING_ARRAY;
+import static software.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
+import static software.amazon.ion.impl.Symtabs.LOCAL_SYMBOLS_ABC;
+import static software.amazon.ion.impl.Symtabs.makeLocalSymtab;
 
 import java.io.ByteArrayOutputStream;
 import org.junit.After;
@@ -27,7 +27,6 @@
 import software.amazon.ion.IonValue;
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Symtabs;
 import software.amazon.ion.system.IonBinaryWriterBuilder;
 
 public class BinaryWriterWithLocalSymtabsTest
diff --git a/test/software/amazon/ion/impl/IonWriterTestCase.java b/test/software/amazon/ion/impl/IonWriterTestCase.java
index 0bf6626c0b..2c7e435489 100644
--- a/test/software/amazon/ion/impl/IonWriterTestCase.java
+++ b/test/software/amazon/ion/impl/IonWriterTestCase.java
@@ -14,13 +14,13 @@
 
 package software.amazon.ion.impl;
 
-import static software.amazon.ion.Symtabs.FRED_MAX_IDS;
 import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
 import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
 import static software.amazon.ion.SystemSymbols.NAME_SID;
 import static software.amazon.ion.TestUtils.FERMATA;
 import static software.amazon.ion.impl.PrivateIonWriterBase.ERROR_MISSING_FIELD_NAME;
 import static software.amazon.ion.impl.PrivateUtils.newSymbolToken;
+import static software.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
 import static software.amazon.ion.junit.IonAssert.assertIonEquals;
 import static software.amazon.ion.junit.IonAssert.expectNextField;
 
@@ -54,7 +54,6 @@
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.SymbolTable;
 import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Symtabs;
 import software.amazon.ion.SystemSymbols;
 import software.amazon.ion.TestUtils;
 import software.amazon.ion.impl.PrivateIonWriter;
diff --git a/test/software/amazon/ion/impl/LocalSymbolTableImportAdapterTest.java b/test/software/amazon/ion/impl/LocalSymbolTableImportAdapterTest.java
index 25cd944d45..b2dd6fce4f 100644
--- a/test/software/amazon/ion/impl/LocalSymbolTableImportAdapterTest.java
+++ b/test/software/amazon/ion/impl/LocalSymbolTableImportAdapterTest.java
@@ -1,15 +1,15 @@
 package software.amazon.ion.impl;
 
+import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.Arrays;
 import org.junit.Assert;
 import org.junit.Test;
 import software.amazon.ion.IonDatagram;
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.ReadOnlyValueException;
 import software.amazon.ion.SymbolTable;
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 import software.amazon.ion.SymbolToken;
 
 public class LocalSymbolTableImportAdapterTest extends BaseSymbolTableWrapperTest
@@ -251,12 +251,16 @@ private LocalSymbolTableBuilder(PrivateIonSystem system)
 
         public LocalSymbolTable build()
         {
-            return LocalSymbolTable.makeNewLocalSymbolTable(
-                system,
+            LocalSymbolTable lst = (LocalSymbolTable) LocalSymbolTable.DEFAULT_LST_FACTORY.newLocalSymtab(
                 system.getSystemSymbolTable(),
-                Arrays.asList(symbols),
                 importedTables
             );
+
+            for(String symbol : symbols) {
+                lst.intern(symbol);
+            }
+
+            return lst;
         }
 
         public LocalSymbolTableBuilder setSymbols(final String... symbols)
diff --git a/test/software/amazon/ion/impl/LocalSymbolTableTest.java b/test/software/amazon/ion/impl/LocalSymbolTableTest.java
index 14e2fe49af..a680f9055c 100644
--- a/test/software/amazon/ion/impl/LocalSymbolTableTest.java
+++ b/test/software/amazon/ion/impl/LocalSymbolTableTest.java
@@ -14,11 +14,11 @@
 
 package software.amazon.ion.impl;
 
-import static software.amazon.ion.Symtabs.FRED_MAX_IDS;
-import static software.amazon.ion.Symtabs.LOCAL_SYMBOLS_ABC;
-import static software.amazon.ion.Symtabs.makeLocalSymtab;
 import static software.amazon.ion.impl.PrivateUtils.EMPTY_STRING_ARRAY;
 import static software.amazon.ion.impl.PrivateUtils.copyLocalSymbolTable;
+import static software.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
+import static software.amazon.ion.impl.Symtabs.LOCAL_SYMBOLS_ABC;
+import static software.amazon.ion.impl.Symtabs.makeLocalSymtab;
 
 import org.junit.Test;
 import software.amazon.ion.IonException;
@@ -26,7 +26,6 @@
 import software.amazon.ion.SubstituteSymbolTableException;
 import software.amazon.ion.SymbolTable;
 import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Symtabs;
 import software.amazon.ion.impl.LocalSymbolTable;
 import software.amazon.ion.impl.SubstituteSymbolTable;
 
diff --git a/test/software/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java b/test/software/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
index 4f533910f4..cbd0532431 100644
--- a/test/software/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
+++ b/test/software/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
@@ -14,9 +14,9 @@
 
 package software.amazon.ion.impl;
 
-import static software.amazon.ion.Symtabs.printLocalSymtab;
 import static software.amazon.ion.impl.PrivateUtils.isNonSymbolScalar;
 import static software.amazon.ion.impl.PrivateUtils.symtabExtends;
+import static software.amazon.ion.impl.Symtabs.printLocalSymtab;
 import static software.amazon.ion.junit.IonAssert.assertIonEquals;
 import static software.amazon.ion.junit.IonAssert.assertIonIteratorEquals;
 
@@ -24,7 +24,6 @@
 import software.amazon.ion.IonDatagram;
 import software.amazon.ion.IonType;
 import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Symtabs;
 import software.amazon.ion.impl.PrivateUtils;
 
 /**
diff --git a/test/software/amazon/ion/impl/OptimizedBinaryWriterTestCase.java b/test/software/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
index 0c909cea5b..2941a201c2 100644
--- a/test/software/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
+++ b/test/software/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
@@ -15,8 +15,8 @@
 package software.amazon.ion.impl;
 
 import static java.lang.reflect.Proxy.newProxyInstance;
-import static software.amazon.ion.Symtabs.makeLocalSymtab;
 import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static software.amazon.ion.impl.Symtabs.makeLocalSymtab;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/test/software/amazon/ion/impl/OutputStreamWriterTestCase.java b/test/software/amazon/ion/impl/OutputStreamWriterTestCase.java
index f3d9451b8e..7749a64518 100644
--- a/test/software/amazon/ion/impl/OutputStreamWriterTestCase.java
+++ b/test/software/amazon/ion/impl/OutputStreamWriterTestCase.java
@@ -26,7 +26,6 @@
 import software.amazon.ion.IonValue;
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Symtabs;
 import software.amazon.ion.SystemSymbols;
 import software.amazon.ion.Timestamp;
 
diff --git a/test/software/amazon/ion/impl/SharedSymbolTableTest.java b/test/software/amazon/ion/impl/SharedSymbolTableTest.java
index 25554ee059..07d9eb5fd0 100644
--- a/test/software/amazon/ion/impl/SharedSymbolTableTest.java
+++ b/test/software/amazon/ion/impl/SharedSymbolTableTest.java
@@ -14,10 +14,10 @@
 
 package software.amazon.ion.impl;
 
-import static software.amazon.ion.Symtabs.sharedSymtabStruct;
 import static software.amazon.ion.impl.PrivateUtils.EMPTY_STRING_ARRAY;
 import static software.amazon.ion.impl.PrivateUtils.stringIterator;
 import static software.amazon.ion.impl.SymbolTableTest.checkSharedTable;
+import static software.amazon.ion.impl.Symtabs.sharedSymtabStruct;
 
 import java.io.IOException;
 import org.junit.Test;
@@ -30,7 +30,6 @@
 import software.amazon.ion.SharedSymtabMaker;
 import software.amazon.ion.SymbolTable;
 import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Symtabs;
 import software.amazon.ion.SystemSymbols;
 import software.amazon.ion.junit.Injected.Inject;
 
diff --git a/test/software/amazon/ion/impl/SymbolTableTest.java b/test/software/amazon/ion/impl/SymbolTableTest.java
index 66651f4612..32e08bdd8c 100644
--- a/test/software/amazon/ion/impl/SymbolTableTest.java
+++ b/test/software/amazon/ion/impl/SymbolTableTest.java
@@ -14,11 +14,7 @@
 
 package software.amazon.ion.impl;
 
-import org.junit.Assert;
-import static org.junit.Assert.assertEquals;
 import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import software.amazon.ion.SymbolToken;
-import static software.amazon.ion.Symtabs.printLocalSymtab;
 import static software.amazon.ion.SystemSymbols.ION;
 import static software.amazon.ion.SystemSymbols.ION_1_0;
 import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
@@ -30,6 +26,7 @@
 import static software.amazon.ion.impl.PrivateUtils.EMPTY_STRING_ARRAY;
 import static software.amazon.ion.impl.PrivateUtils.stringIterator;
 import static software.amazon.ion.impl.PrivateUtils.symtabTree;
+import static software.amazon.ion.impl.Symtabs.printLocalSymtab;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -56,7 +53,7 @@
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.ReadOnlyValueException;
 import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Symtabs;
+import software.amazon.ion.SymbolToken;
 import software.amazon.ion.SystemSymbols;
 import software.amazon.ion.Timestamp;
 import software.amazon.ion.system.SimpleCatalog;
@@ -939,11 +936,12 @@ public void testBasicLocalSymtabCreation()
     @Test
     public void testSymtabImageMaintenance()
     {
-        SymbolTable st = system().newLocalSymbolTable();
+        IonSystem system = system();
+        SymbolTable st = ((PrivateValueFactory)system).getLstFactory().newLocalSymtab(system.getSystemSymbolTable());
         st.intern("foo");
-        IonStruct image = symtabTree(system(), st);
+        IonStruct image = symtabTree(st);
         st.intern("bar");
-        image = symtabTree(system(), st);
+        image = symtabTree(st);
         IonList symbols = (IonList) image.get(SYMBOLS);
         assertEquals("[\"foo\",\"bar\"]", symbols.toString());
     }
@@ -1214,9 +1212,6 @@ SymbolTable checkFirstImport(String name, int version,
         IonStruct stStruct = writeIonRep(st);
         checkFirstImport(name, version, expectedSymbols, stStruct);
 
-        stStruct = PrivateUtils.symtabTree(system(), st);
-        checkFirstImport(name, version, expectedSymbols, stStruct);
-
         SymbolTable importedTable = st.getImportedTables()[0];
         checkSharedTable(name, version, expectedSymbols, importedTable);
 
diff --git a/test/software/amazon/ion/Symtabs.java b/test/software/amazon/ion/impl/Symtabs.java
similarity index 90%
rename from test/software/amazon/ion/Symtabs.java
rename to test/software/amazon/ion/impl/Symtabs.java
index fb265cdd18..c1c0ebf084 100644
--- a/test/software/amazon/ion/Symtabs.java
+++ b/test/software/amazon/ion/impl/Symtabs.java
@@ -12,14 +12,13 @@
  * language governing permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package software.amazon.ion.impl;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
 import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.impl.PrivateUtils.newLocalSymtab;
 import static software.amazon.ion.util.IonTextUtils.printString;
 
 import java.io.IOException;
@@ -31,6 +30,7 @@
 import software.amazon.ion.SystemSymbols;
 import software.amazon.ion.ValueFactory;
 import software.amazon.ion.impl.PrivateIonSystem;
+import software.amazon.ion.impl.PrivateLocalSymbolTableFactory;
 import software.amazon.ion.system.IonSystemBuilder;
 import software.amazon.ion.system.SimpleCatalog;
 
@@ -203,24 +203,6 @@ public static String printLocalSymtab(String... symbols)
         return s.toString();
     }
 
-
-    /**
-     * Creates a local symtab with local symbols but no imports.
-     *
-     * @param system
-     * @param localSymbols
-     *          the array (var-args) of local symbols that the resulting
-     *          local symtab to contain; may be {@code null} to indicate no
-     *          local symbols; elements may be {@code null} to indicate a gap
-     */
-    public static SymbolTable makeLocalSymtab(IonSystem system,
-                                              String... localSymbols)
-    {
-        return newLocalSymtab(system, system.getSystemSymbolTable(),
-                              Arrays.asList(localSymbols));
-    }
-
-
     /**
      * Creates a local symtab with local symbols and imports.
      */
@@ -232,9 +214,27 @@ public static SymbolTable makeLocalSymtab(IonSystem system,
 
         for (String localSymbol : localSymbols)
         {
-            localSymtab.intern(localSymbol);
+            if (localSymbol == null)
+            {
+                // This injects a gap.
+                ((LocalSymbolTable)localSymtab).putSymbol(null);
+            }
+            else
+            {
+                localSymtab.intern(localSymbol);
+            }
         }
 
         return localSymtab;
     }
+
+    /**
+     * Trampoline to {@link LocalSymbolTable#DEFAULT_LST_FACTORY}
+     * @return the {@link LocalSymbolTable.Factory} singleton.
+     */
+    public static PrivateLocalSymbolTableFactory localSymbolTableFactory()
+    {
+        return LocalSymbolTable.DEFAULT_LST_FACTORY;
+    }
+
 }
diff --git a/test/software/amazon/ion/impl/TextWriterTest.java b/test/software/amazon/ion/impl/TextWriterTest.java
index fc58162c30..536e47e534 100644
--- a/test/software/amazon/ion/impl/TextWriterTest.java
+++ b/test/software/amazon/ion/impl/TextWriterTest.java
@@ -29,7 +29,6 @@
 import software.amazon.ion.IonStruct;
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Symtabs;
 import software.amazon.ion.SystemSymbols;
 import software.amazon.ion.impl.PrivateUtils;
 import software.amazon.ion.system.IonTextWriterBuilder;
diff --git a/test/software/amazon/ion/impl/ValueWriterTest.java b/test/software/amazon/ion/impl/ValueWriterTest.java
index 05ac70e623..c8141fb9c1 100644
--- a/test/software/amazon/ion/impl/ValueWriterTest.java
+++ b/test/software/amazon/ion/impl/ValueWriterTest.java
@@ -23,7 +23,6 @@
 import software.amazon.ion.IonSymbol;
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Symtabs;
 
 public class ValueWriterTest
     extends IonWriterTestCase
diff --git a/test/software/amazon/ion/impl/lite/IonContextTest.java b/test/software/amazon/ion/impl/lite/IonContextTest.java
index 63ef347d52..823d507706 100644
--- a/test/software/amazon/ion/impl/lite/IonContextTest.java
+++ b/test/software/amazon/ion/impl/lite/IonContextTest.java
@@ -15,7 +15,7 @@
 package software.amazon.ion.impl.lite;
 
 import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.Symtabs.CATALOG;
+import static software.amazon.ion.impl.Symtabs.CATALOG;
 
 import org.junit.Test;
 import software.amazon.ion.IonDatagram;
@@ -27,7 +27,7 @@
 import software.amazon.ion.IonValue;
 import software.amazon.ion.SymbolTable;
 import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Symtabs;
+import software.amazon.ion.impl.Symtabs;
 import software.amazon.ion.impl.lite.ContainerlessContext;
 import software.amazon.ion.impl.lite.IonContainerLite;
 import software.amazon.ion.impl.lite.IonContext;
diff --git a/test/software/amazon/ion/streaming/ReaderTest.java b/test/software/amazon/ion/streaming/ReaderTest.java
index 2733a3d0d7..1a5eb9517b 100644
--- a/test/software/amazon/ion/streaming/ReaderTest.java
+++ b/test/software/amazon/ion/streaming/ReaderTest.java
@@ -14,7 +14,7 @@
 
 package software.amazon.ion.streaming;
 
-import static software.amazon.ion.Symtabs.printLocalSymtab;
+import static software.amazon.ion.impl.Symtabs.printLocalSymtab;
 import static software.amazon.ion.junit.IonAssert.checkNullSymbol;
 
 import java.io.IOException;
@@ -27,9 +27,10 @@
 import software.amazon.ion.Decimal;
 import software.amazon.ion.IonType;
 import software.amazon.ion.ReaderMaker;
+import software.amazon.ion.SymbolTable;
 import software.amazon.ion.SymbolToken;
-import software.amazon.ion.junit.IonAssert;
 import software.amazon.ion.junit.Injected.Inject;
+import software.amazon.ion.junit.IonAssert;
 
 public class ReaderTest
     extends ReaderTestCase
@@ -367,4 +368,15 @@ public void testSkippingLobInStruct()
         testSkippingLob("{a:1, b:{ c:", " }}");
         testSkippingLob("{a:1, b:{ c:", "}}");
     }
+
+    @Test
+    public void testGetSymbolTableBeforeFirstValue()
+    {
+        read("123");
+        SymbolTable symtab = in.getSymbolTable();
+        expectNoCurrentValue();
+        assertNotNull(symtab);
+        assertTrue(symtab.isSystemTable());
+    }
+
 }
diff --git a/test/software/amazon/ion/system/IonBinaryWriterBuilderTest.java b/test/software/amazon/ion/system/IonBinaryWriterBuilderTest.java
index 248a23b91b..bee7917c68 100644
--- a/test/software/amazon/ion/system/IonBinaryWriterBuilderTest.java
+++ b/test/software/amazon/ion/system/IonBinaryWriterBuilderTest.java
@@ -21,25 +21,20 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static software.amazon.ion.TestUtils.symbolTableEquals;
-import static software.amazon.ion.impl.PrivateUtils.newLocalSymtab;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Collections;
 import org.junit.Assert;
 import org.junit.Test;
 import software.amazon.ion.IonCatalog;
 import software.amazon.ion.IonSystem;
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Symtabs;
 import software.amazon.ion.impl.PrivateIonBinaryWriterBuilder;
 import software.amazon.ion.impl.PrivateIonWriter;
 import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.system.IonBinaryWriterBuilder;
-import software.amazon.ion.system.IonSystemBuilder;
-import software.amazon.ion.system.SimpleCatalog;
+import software.amazon.ion.impl.Symtabs;
 
 public class IonBinaryWriterBuilderTest
 {
@@ -240,11 +235,9 @@ public void testSymtabValueFactoryImmutability()
     public void testInitialSymtab()
         throws IOException
     {
-        IonSystem system = IonSystemBuilder.standard().build();
         SymbolTable sst = PrivateUtils.systemSymtab(1);
 
-        SymbolTable lst0 = newLocalSymtab(system, sst,
-                                          Collections.<String>emptyList());
+        SymbolTable lst0 = Symtabs.localSymbolTableFactory().newLocalSymtab(sst);
         lst0.intern("hello");
 
         PrivateIonBinaryWriterBuilder b =
@@ -284,12 +277,10 @@ public void testInitialSymtab()
     @Test
     public void testImmutableInitialSymtab()
     {
-        IonSystem system = IonSystemBuilder.standard().build();
         SymbolTable sst = PrivateUtils.systemSymtab(1);
 
         // Immutable local symtabs shouldn't get copied.
-        SymbolTable lst = newLocalSymtab(system, sst,
-                                         Collections.<String>emptyList());
+        SymbolTable lst = Symtabs.localSymbolTableFactory().newLocalSymtab(sst);
         lst.intern("hello");
         lst.makeReadOnly();
 
diff --git a/test/software/amazon/ion/system/IonReaderBuilderTest.java b/test/software/amazon/ion/system/IonReaderBuilderTest.java
new file mode 100644
index 0000000000..06b938396e
--- /dev/null
+++ b/test/software/amazon/ion/system/IonReaderBuilderTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at:
+ *
+ *     http://aws.amazon.com/apache2.0/
+ *
+ * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
+ */
+
+package software.amazon.ion.system;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import software.amazon.ion.IonCatalog;
+import software.amazon.ion.IonReader;
+import software.amazon.ion.IonType;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.impl.PrivateIonBinaryWriterBuilder;
+
+/**
+ * Note: because the IonReaderBuilder is used by IonSystem.newReader(...),
+ * its build() methods are well-exercised elsewhere. See: ReaderMaker.
+ */
+public class IonReaderBuilderTest
+{
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void testMutable()
+    {
+        IonCatalog catalog = new SimpleCatalog();
+        IonReaderBuilder mutable = IonReaderBuilder.standard().withCatalog(catalog);
+        assertSame(catalog, mutable.getCatalog());
+        IonReaderBuilder mutableSame = mutable.withCatalog(new SimpleCatalog());
+        assertNotSame(catalog, mutable.getCatalog());
+        assertSame(mutable, mutableSame);
+    }
+
+    @Test
+    public void testImmutable()
+    {
+        IonCatalog catalog = new SimpleCatalog();
+        IonReaderBuilder mutable = IonReaderBuilder.standard().withCatalog(catalog);
+        IonReaderBuilder immutable = mutable.immutable();
+        mutable.withCatalog(new SimpleCatalog());
+        assertNotSame(catalog, mutable.getCatalog());
+        assertSame(catalog, immutable.getCatalog());
+    }
+
+    @Test
+    public void testMutatingImmutableFails()
+    {
+        IonReaderBuilder immutable = IonReaderBuilder.standard().immutable();
+        thrown.expect(UnsupportedOperationException.class);
+        immutable.setCatalog(new SimpleCatalog());
+    }
+
+    @Test
+    public void testMutateCopiedImmutable()
+    {
+        IonCatalog catalog = new SimpleCatalog();
+        IonReaderBuilder immutable = IonReaderBuilder.standard().withCatalog(catalog).immutable();
+        IonReaderBuilder mutableCopy = immutable.copy();
+        assertSame(immutable, immutable.immutable());
+        assertNotSame(immutable, mutableCopy);
+        assertSame(catalog, mutableCopy.getCatalog());
+        mutableCopy.withCatalog(new SimpleCatalog());
+        assertNotSame(catalog, mutableCopy.getCatalog());
+    }
+
+    @Test
+    public void testMutateCopiedMutable()
+    {
+        IonCatalog catalog = new SimpleCatalog();
+        IonReaderBuilder mutable = IonReaderBuilder.standard().withCatalog(catalog);
+        IonReaderBuilder mutableCopy = mutable.copy();
+        assertNotSame(mutable, mutable.immutable());
+        assertNotSame(mutable, mutableCopy);
+        assertSame(mutable, mutable.mutable());
+        assertSame(catalog, mutableCopy.getCatalog());
+        IonReaderBuilder mutableSame = mutableCopy.withCatalog(new SimpleCatalog());
+        assertNotSame(catalog, mutableCopy.getCatalog());
+        assertSame(mutableCopy, mutableSame);
+    }
+
+    @Test
+    public void testSystemFreeRoundtrip() throws IOException
+    {
+        // No IonSystem in sight.
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = PrivateIonBinaryWriterBuilder.standard().build(out);
+        writer.writeInt(42);
+        writer.finish();
+        IonReader reader = IonReaderBuilder.standard().build(out.toByteArray());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(42, reader.intValue());
+    }
+
+}
diff --git a/test/software/amazon/ion/system/IonTextWriterBuilderTest.java b/test/software/amazon/ion/system/IonTextWriterBuilderTest.java
index a84ef37595..0e10244fe1 100644
--- a/test/software/amazon/ion/system/IonTextWriterBuilderTest.java
+++ b/test/software/amazon/ion/system/IonTextWriterBuilderTest.java
@@ -36,8 +36,8 @@
 import software.amazon.ion.IonCatalog;
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Symtabs;
 import software.amazon.ion.impl.PrivateIonWriter;
+import software.amazon.ion.impl.Symtabs;
 import software.amazon.ion.system.IonTextWriterBuilder;
 import software.amazon.ion.system.SimpleCatalog;
 

From 357388b31d3e4c75858eec5a4f214c5b4948b6cb Mon Sep 17 00:00:00 2001
From: barbosf <barbosf@amazon.com>
Date: Fri, 22 Jun 2018 10:46:05 -0700
Subject: [PATCH 003/490] Release 1.2.0

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a18834b8e1..04cb20b202 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>software.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.1.1</version>
+  <version>1.2.0</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index d13b85b9cb..2298eba7c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>software.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.1.3-SNAPSHOT</version>
+  <version>1.2.0</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 7992a822ba85fb538b3dd872f1a86b4d0e80906a Mon Sep 17 00:00:00 2001
From: barbosf <barbosf@amazon.com>
Date: Fri, 22 Jun 2018 12:11:23 -0700
Subject: [PATCH 004/490] Bumps version to 1.2.1-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2298eba7c8..9c2203e472 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>software.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 28309af0ffe96a045a270f92fa722642cc382df0 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Tue, 7 Aug 2018 16:53:30 -0700
Subject: [PATCH 005/490] Correctly detects overflow for VarUInt and VarInt
 (#147)

Correctly detects overflow for VarUInt and VarInt

https://github.com/amzn/ion-java/issues/146
---
 .../amazon/ion/impl/IonReaderBinaryRawX.java  | 230 +++++++-----------
 test/software/amazon/ion/impl/VarIntTest.java |  96 ++++++++
 2 files changed, 188 insertions(+), 138 deletions(-)
 create mode 100644 test/software/amazon/ion/impl/VarIntTest.java

diff --git a/src/software/amazon/ion/impl/IonReaderBinaryRawX.java b/src/software/amazon/ion/impl/IonReaderBinaryRawX.java
index 196d416872..ae391f7f32 100644
--- a/src/software/amazon/ion/impl/IonReaderBinaryRawX.java
+++ b/src/software/amazon/ion/impl/IonReaderBinaryRawX.java
@@ -886,129 +886,98 @@ protected final BigInteger readBigInteger(int len, boolean is_negative) throws I
         }
         return value;
     }
+
     protected final int readVarInt() throws IOException
     {
-        int     retvalue = 0;
-        boolean is_negative = false;
-        int     b;
-        // synthetic label "done" (yuck)
-done:   for (;;) {
-            // read the first byte - it has the sign bit
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            if ((b & 0x40) != 0) {
-                is_negative = true;
-            }
-            retvalue = (b & 0x3F);
-            if ((b & 0x80) != 0) break done;
-            // for the second byte we shift our eariler bits just as much,
-            // but there are fewer of them there to shift
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break done;
-            // for the rest, they're all the same
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break done;
-            // for the rest, they're all the same
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break done;
-            // for the rest, they're all the same
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break done;
-            // if we get here we have more bits than we have room for :(
-            throwIntOverflowExeption();
-        }
-        if (is_negative) {
-            retvalue = -retvalue;
-        }
-        return retvalue;
-    }
-    protected final long readVarLong() throws IOException
-    {
-        long    retvalue = 0;
-        boolean is_negative = false;
-        int     b;
-        // synthetic label "done" (yuck)
-done:   for (;;) {
-            // read the first byte - it has the sign bit
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            if ((b & 0x40) != 0) {
-                is_negative = true;
-            }
-            retvalue = (b & 0x3F);
-            if ((b & 0x80) != 0) break done;
-            // for the second byte we shift our eariler bits just as much,
-            // but there are fewer of them there to shift
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break done;
-            // for the rest, they're all the same
-            for (;;) {
-                if ((b = read()) < 0) throwUnexpectedEOFException();
-                if ((retvalue & 0xFE00000000000000L) != 0) throwIntOverflowExeption();
-                retvalue = (retvalue << 7) | (b & 0x7F);
-                if ((b & 0x80) != 0) break done;
-            }
-        }
-        if (is_negative) {
-            retvalue = -retvalue;
-        }
-        return retvalue;
+        return readVarInt(read());
     }
+
     /**
      * Reads an integer value, returning null to mean -0.
      * @throws IOException
      */
     protected final Integer readVarInteger() throws IOException
     {
-        int     retvalue = 0;
-        boolean is_negative = false;
-        int     b;
-        // Synthetic label "done" (yuck)
-done:   for (;;) {
-            // read the first byte - it has the sign bit
-            if ((b = read()) < 0) throwUnexpectedEOFException();
+        int firstByte = read();
+
+        // if byte represents -0 returns null
+        if (firstByte == 0xC0) {
+            return null;
+        }
+
+        return readVarInt(firstByte);
+    }
+
+    /**
+     * reads a varInt after the first byte was read. The first byte is used to specify the sign and -0 has different
+     * representation on the protected API that was called
+     *
+     * @param firstByte last varInt octet
+     */
+    private int readVarInt(int firstByte) throws IOException {
+        // VarInt uses the high-order bit of the last octet as a marker; some (but not all) 5-byte VarInts can fit
+        // into a Java int.
+        // To validate overflows we accumulate the VarInt in a long and then check if it can be represented by an int
+        //
+        // see http://amzn.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields
+
+        long retValue = 0;
+        int b = firstByte;
+        boolean isNegative = false;
+
+        for (;;) {
+            if (b < 0) throwUnexpectedEOFException();
+
             if ((b & 0x40) != 0) {
-                is_negative = true;
+                isNegative = true;
             }
-            retvalue = (b & 0x3F);
-            if ((b & 0x80) != 0) break done;
-            // for the second byte we shift our eariler bits just as much,
-            // but there are fewer of them there to shift
+            retValue = (b & 0x3F);
+            if ((b & 0x80) != 0) break;
+
             if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break done;
+            retValue = (retValue << 7) | (b & 0x7F);
+            if ((b & 0x80) != 0) break;
             // for the rest, they're all the same
+
             if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break done;
+            retValue = (retValue << 7) | (b & 0x7F);
+            if ((b & 0x80) != 0) break;
             // for the rest, they're all the same
+
             if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break done;
+            retValue = (retValue << 7) | (b & 0x7F);
+            if ((b & 0x80) != 0) break;
             // for the rest, they're all the same
+
             if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break done;
-            // if we get here we have more bits than we have room for :(
-            throwIntOverflowExeption();
-        }
-        Integer retInteger = null;
-        if (is_negative) {
-            if (retvalue != 0) {
-                retInteger = new Integer(-retvalue);
-            }
+            retValue = (retValue << 7) | (b & 0x7F);
+            if ((b & 0x80) != 0) break;
+
+            // Don't support anything above a 5-byte VarInt for now, see https://github.com/amzn/ion-java/issues/146
+            throwVarIntOverflowException();
         }
-        else {
-            retInteger = new Integer(retvalue);
+
+        if (isNegative) {
+            retValue = -retValue;
+        }
+
+        int retValueAsInt = (int) retValue;
+        if (retValue != ((long) retValueAsInt)) {
+            throwVarIntOverflowException();
         }
-        return retInteger;
+
+        return retValueAsInt;
     }
+
     protected final int readVarUIntOrEOF() throws IOException
     {
-        int retvalue = 0;
+        // VarUInt uses the high-order bit of the last octet as a marker; some (but not all) 5-byte VarUInt can fit
+        // into a Java int.
+        // To validate overflows we accumulate the VarInt in a long and then check if it can be represented by an int
+        //
+        // see http://amzn.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields
+
+        long retvalue = 0;
         int  b;
         for (;;) { // fake loop to create a "goto done"
             if ((b = read()) < 0) {
@@ -1016,47 +985,43 @@ protected final int readVarUIntOrEOF() throws IOException
             }
             retvalue = (retvalue << 7) | (b & 0x7F);
             if ((b & 0x80) != 0) break;
+
             if ((b = read()) < 0) throwUnexpectedEOFException();
             retvalue = (retvalue << 7) | (b & 0x7F);
             if ((b & 0x80) != 0) break;
+
             if ((b = read()) < 0) throwUnexpectedEOFException();
             retvalue = (retvalue << 7) | (b & 0x7F);
             if ((b & 0x80) != 0) break;
+
             if ((b = read()) < 0) throwUnexpectedEOFException();
             retvalue = (retvalue << 7) | (b & 0x7F);
             if ((b & 0x80) != 0) break;
+
             if ((b = read()) < 0) throwUnexpectedEOFException();
             retvalue = (retvalue << 7) | (b & 0x7F);
             if ((b & 0x80) != 0) break;
-            // if we get here we have more bits than we have room for :(
-            throwIntOverflowExeption();
+
+            // Don't support anything above a 5-byte VarUInt for now, see https://github.com/amzn/ion-java/issues/146
+            throwVarIntOverflowException();
         }
-        return retvalue;
+
+        int retValueAsInt = (int) retvalue;
+        if (retvalue != ((long) retValueAsInt)) {
+            throwVarIntOverflowException();
+        }
+
+        return retValueAsInt;
     }
+
     protected final int readVarUInt() throws IOException
     {
-        int retvalue = 0;
-        int  b;
-        for (;;) { // fake loop to create a "goto done"
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-            // if we get here we have more bits than we have room for :(
-            throwIntOverflowExeption();
+        int varUInt = readVarUIntOrEOF();
+        if (varUInt == UnifiedInputStreamX.EOF) {
+            throwUnexpectedEOFException();
         }
-        return retvalue;
+
+        return varUInt;
     }
     protected final double readFloat(int len) throws IOException
     {
@@ -1076,18 +1041,7 @@ protected final double readFloat(int len) throws IOException
             ? (double) Float.intBitsToFloat((int) (dBits & 0xffffffffL))
             : Double.longBitsToDouble(dBits);
     }
-    protected final long readVarULong() throws IOException
-    {
-        long retvalue = 0;
-        int  b;
-        for (;;) {
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            if ((retvalue & 0xFE00000000000000L) != 0) throwIntOverflowExeption();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-        }
-        return retvalue;
-    }
+
     protected final Decimal readDecimal(int len) throws IOException
     {
         MathContext mathContext = MathContext.UNLIMITED;
@@ -1276,8 +1230,8 @@ private final void throwUTF8Exception() throws IOException
     private final void throwUnexpectedEOFException() throws IOException {
         throwErrorAt("unexpected EOF in value");
     }
-    private final void throwIntOverflowExeption() throws IOException {
-        throwErrorAt("int in stream is too long for a Java int 32 use readLong()");
+    private final void throwVarIntOverflowException() throws IOException {
+        throwErrorAt("int in stream is too long for a Java int 32");
     }
 
     protected IonException newErrorAt(String msg) {
diff --git a/test/software/amazon/ion/impl/VarIntTest.java b/test/software/amazon/ion/impl/VarIntTest.java
new file mode 100644
index 0000000000..ae0e856cd1
--- /dev/null
+++ b/test/software/amazon/ion/impl/VarIntTest.java
@@ -0,0 +1,96 @@
+package software.amazon.ion.impl;
+
+import org.junit.Test;
+import software.amazon.ion.IonException;
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.system.SimpleCatalog;
+
+import javax.xml.bind.DatatypeConverter;
+import java.io.ByteArrayInputStream;
+
+public class VarIntTest extends IonTestCase {
+
+    @Test
+    public void readMaxVarUInt() throws Exception {
+        assertEquals(Integer.MAX_VALUE, makeReader("077F7F7FFF").readVarUInt());
+    }
+
+    @Test(expected = IonException.class)
+    public void overflowVarUInt() throws Exception {
+        makeReader("0800000080").readVarUInt(); // Integer.MAX_VALUE + 1
+    }
+
+    @Test(expected = IonException.class)
+    public void readEOFVarUInt() throws Exception {
+        makeReader("").readVarUInt();
+    }
+
+    @Test
+    public void readMaxVarUIntOrEOF() throws Exception {
+        assertEquals(Integer.MAX_VALUE, makeReader("077F7F7FFF").readVarUIntOrEOF());
+    }
+
+    @Test(expected = IonException.class)
+    public void overflowVarUIntOrEOF() throws Exception {
+        makeReader("0800000080").readVarUIntOrEOF(); // Integer.MAX_VALUE + 1
+    }
+
+    @Test
+    public void readEOFVarUIntOrEOF() throws Exception {
+        assertEquals(UnifiedInputStreamX.EOF, makeReader("").readVarUIntOrEOF());
+    }
+
+    @Test
+    public void readMaxVarInt() throws Exception {
+        assertEquals(Integer.MAX_VALUE, makeReader("077F7F7FFF").readVarInt());
+    }
+
+    @Test
+    public void readMinVarInt() throws Exception {
+        assertEquals(Integer.MIN_VALUE, makeReader("4800000080").readVarInt());
+    }
+
+    @Test(expected = IonException.class)
+    public void readVarIntOverflow() throws Exception {
+        makeReader("0800000080").readVarInt(); // Integer.MAX_VALUE + 1
+    }
+
+    @Test(expected = IonException.class)
+    public void readVarIntUnderflow() throws Exception {
+        makeReader("4800000081").readVarInt(); // Integer.MIN_VALUE - 1
+    }
+
+    @Test
+    public void readMaxVarInteger() throws Exception {
+        assertEquals(Integer.MAX_VALUE, (int) makeReader("077F7F7FFF").readVarInteger());
+    }
+
+    @Test
+    public void readMinVarInteger() throws Exception {
+        assertEquals(Integer.MIN_VALUE, (int) makeReader("4800000080").readVarInteger());
+    }
+
+    @Test(expected = IonException.class)
+    public void readVarIntegerOverflow() throws Exception {
+        makeReader("0800000080").readVarInteger(); // Integer.MAX_VALUE + 1
+    }
+
+    @Test(expected = IonException.class)
+    public void readVarIntegerUnderflow() throws Exception {
+        makeReader("4800000081").readVarInt(); // Integer.MIN_VALUE - 1
+    }
+
+    @Test
+    public void readVarIntegerNegativeZero() throws Exception {
+        assertNull(makeReader("C0").readVarInteger());
+    }
+
+    private IonReaderBinaryUserX makeReader(String hex) throws Exception {
+        ByteArrayInputStream input = new ByteArrayInputStream(DatatypeConverter.parseHexBinary("E00100EA" + hex));
+
+        UnifiedInputStreamX uis = UnifiedInputStreamX.makeStream(input);
+        uis.skip(4);
+
+        return new IonReaderBinaryUserX(new SimpleCatalog(), LocalSymbolTable.DEFAULT_LST_FACTORY, uis, 0);
+    }
+}
\ No newline at end of file

From e8818dbfc0be2eb59e2d044bb9667a97a304fa97 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Fri, 10 Aug 2018 13:00:09 -0700
Subject: [PATCH 006/490] uses decimal.longValue when casting from decimal to
 long (#149)

was using intValue previously resulting in overflow. Inludes UTs to
verify the behavior
---
 .../ion/impl/PrivateScalarConversions.java    |  2 +-
 .../impl/PrivateScalarConversionsTest.java    | 33 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 test/software/amazon/ion/impl/PrivateScalarConversionsTest.java

diff --git a/src/software/amazon/ion/impl/PrivateScalarConversions.java b/src/software/amazon/ion/impl/PrivateScalarConversions.java
index d02d2f8e49..5c71c1586a 100644
--- a/src/software/amazon/ion/impl/PrivateScalarConversions.java
+++ b/src/software/amazon/ion/impl/PrivateScalarConversions.java
@@ -800,7 +800,7 @@ private final void fn_from_decimal_to_long() {
             ) {
                 throw new CantConvertException("BigDecimal value is too large to fit in a long");
             }
-            _long_value = _decimal_value.intValue();
+            _long_value = _decimal_value.longValue();
             add_value_type(AS_TYPE.long_value);
         }
         private final void fn_from_double_to_long() {
diff --git a/test/software/amazon/ion/impl/PrivateScalarConversionsTest.java b/test/software/amazon/ion/impl/PrivateScalarConversionsTest.java
new file mode 100644
index 0000000000..b19b301839
--- /dev/null
+++ b/test/software/amazon/ion/impl/PrivateScalarConversionsTest.java
@@ -0,0 +1,33 @@
+package software.amazon.ion.impl;
+
+import org.junit.Assert;
+import org.junit.Test;
+import software.amazon.ion.Decimal;
+
+import static org.junit.Assert.*;
+
+public class PrivateScalarConversionsTest {
+
+    private long decimalToLong(final Decimal d) {
+        PrivateScalarConversions.ValueVariant v = new PrivateScalarConversions.ValueVariant();
+        v.setValue(d);
+
+        v.cast(PrivateScalarConversions.FNID_FROM_DECIMAL_TO_LONG);
+        return v.getLong();
+    }
+
+    @Test
+    public void decimalToLong() {
+        assertEquals(1, decimalToLong(Decimal.valueOf(1L)));
+    }
+
+    @Test
+    public void decimalToMinLong() {
+        assertEquals(Long.MAX_VALUE, decimalToLong(Decimal.valueOf(Long.MAX_VALUE)));
+    }
+
+    @Test
+    public void decimalToMaxLong() {
+        assertEquals(Long.MIN_VALUE, decimalToLong(Decimal.valueOf(Long.MIN_VALUE)));
+    }
+}
\ No newline at end of file

From 9e4c03f066d165166a6c858c6d701196537b2c3c Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 24 Aug 2018 17:38:37 -0700
Subject: [PATCH 007/490] Requires the  annotation to be a structs first
 annotation in order to carry LST semantics.

---
 ion-tests                                     |  2 +-
 .../amazon/ion/impl/IonReaderBinaryUserX.java | 11 ++---
 .../amazon/ion/impl/IonReaderTextUserX.java   | 19 +++-----
 .../amazon/ion/impl/IonReaderTreeUserX.java   |  2 +-
 .../amazon/ion/impl/IonWriterSystem.java      | 46 +++----------------
 .../amazon/ion/impl/IonWriterSystemTree.java  |  2 +-
 .../amazon/ion/impl/IonWriterUser.java        |  8 ++--
 .../amazon/ion/impl/PrivateIonValue.java      |  7 +++
 .../amazon/ion/impl/PrivateIonWriterBase.java |  8 +++-
 .../amazon/ion/impl/PrivateUtils.java         |  4 +-
 .../amazon/ion/impl/lite/IonValueLite.java    |  8 ++--
 11 files changed, 43 insertions(+), 74 deletions(-)

diff --git a/ion-tests b/ion-tests
index f7a4999a41..20bc2a6d4f 160000
--- a/ion-tests
+++ b/ion-tests
@@ -1 +1 @@
-Subproject commit f7a4999a416b98a4ab454ba18843a177404b7a45
+Subproject commit 20bc2a6d4f22f757ed8abbeb0c961296d42a97b4
diff --git a/src/software/amazon/ion/impl/IonReaderBinaryUserX.java b/src/software/amazon/ion/impl/IonReaderBinaryUserX.java
index aa07fab0d3..5a53c251fc 100644
--- a/src/software/amazon/ion/impl/IonReaderBinaryUserX.java
+++ b/src/software/amazon/ion/impl/IonReaderBinaryUserX.java
@@ -214,13 +214,10 @@ private final void has_next_helper_user() throws IOException
             }
             else if (_value_tid == PrivateIonConstants.tidStruct) {
                 int count = load_annotations();
-                for(int ii=0; ii<count; ii++) {
-                    if (_annotation_ids[ii] == ION_SYMBOL_TABLE_SID) {
-                        _symbols = _lstFactory.newLocalSymtab(_catalog, this, false);
-                        push_symbol_table(_symbols);
-                        _has_next_needed = true;
-                        break;
-                    }
+                if (count > 0 && _annotation_ids[0] == ION_SYMBOL_TABLE_SID) {
+                    _symbols = _lstFactory.newLocalSymtab(_catalog, this, false);
+                    push_symbol_table(_symbols);
+                    _has_next_needed = true;
                 }
             }
             else {
diff --git a/src/software/amazon/ion/impl/IonReaderTextUserX.java b/src/software/amazon/ion/impl/IonReaderTextUserX.java
index d98d504b27..5906f6b666 100644
--- a/src/software/amazon/ion/impl/IonReaderTextUserX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextUserX.java
@@ -128,19 +128,12 @@ private final boolean has_next_user_value()
             if (_value_type != null && !isNullValue() && IonType.DATAGRAM.equals(getContainerType())) {
                 switch (_value_type) {
                 case STRUCT:
-                    if (_annotation_count > 0) {
-                        for (int ii=0; ii<_annotation_count; ii++) {
-                            SymbolToken a = _annotations[ii];
-                            // TODO SID only?
-                            if (ION_SYMBOL_TABLE.equals(a.getText())) {
-                                _symbols = _lstFactory.newLocalSymtab(_catalog,
-                                                                      this,
-                                                                      true);
-                                push_symbol_table(_symbols);
-                                _has_next_called = false;
-                                break;
-                            }
-                        }
+                    if (_annotation_count > 0 && ION_SYMBOL_TABLE.equals(_annotations[0].getText())) {
+                        _symbols = _lstFactory.newLocalSymtab(_catalog,
+                                                              this,
+                                                              true);
+                        push_symbol_table(_symbols);
+                        _has_next_called = false;
                     }
                     break;
                 case SYMBOL:
diff --git a/src/software/amazon/ion/impl/IonReaderTreeUserX.java b/src/software/amazon/ion/impl/IonReaderTreeUserX.java
index 2ffef5b3a3..9b24511825 100644
--- a/src/software/amazon/ion/impl/IonReaderTreeUserX.java
+++ b/src/software/amazon/ion/impl/IonReaderTreeUserX.java
@@ -115,7 +115,7 @@ private boolean next_helper_user()
                     }
                 }
                 else if (IonType.STRUCT.equals(next_type)
-                      && _next.hasTypeAnnotation(ION_SYMBOL_TABLE)
+                      && _next.findTypeAnnotation(ION_SYMBOL_TABLE) == 0
                 ) {
                     assert(_next instanceof IonStruct);
                     // read a local symbol table
diff --git a/src/software/amazon/ion/impl/IonWriterSystem.java b/src/software/amazon/ion/impl/IonWriterSystem.java
index 7550732888..e4f3b5534c 100644
--- a/src/software/amazon/ion/impl/IonWriterSystem.java
+++ b/src/software/amazon/ion/impl/IonWriterSystem.java
@@ -434,58 +434,26 @@ final void ensureAnnotationCapacity(int length) {
     }
 
 
-    final int[] internAnnotationsAndGetSids() throws IOException
-    {
-        int count = _annotation_count;
-        if (count == 0) return PrivateUtils.EMPTY_INT_ARRAY;
-
-        int[] sids = new int[count];
-        for (int i = 0; i < count; i++)
-        {
-            SymbolToken sym = _annotations[i];
-            int sid = sym.getSid();
-            if (sid == UNKNOWN_SYMBOL_ID)
-            {
-                String text = sym.getText();
-                sid = add_symbol(text);
-                _annotations[i] = new SymbolTokenImpl(text, sid);
-            }
-            sids[i] = sid;
-        }
-        return sids;
-    }
-
-
     final boolean hasAnnotations()
     {
         return _annotation_count != 0;
     }
 
-    final int annotationCount()
-    {
-        return _annotation_count;
-    }
-
     final void clearAnnotations()
     {
         _annotation_count = 0;
     }
 
-
     @Override
-    final boolean has_annotation(String name, int id)
-    {
-        assert(this._symbol_table.findKnownSymbol(id).equals(name));
-        if (_annotation_count < 1) {
-            return false;
-        }
-
-        for (int ii=0; ii<_annotation_count; ii++) {
-            if (name.equals(_annotations[ii].getText())) {
-                return true;
+    final int findAnnotation(String name) {
+        if (_annotation_count > 0) {
+            for (int ii=0; ii<_annotation_count; ii++) {
+                if (name.equals(_annotations[ii].getText())) {
+                    return ii;
+                }
             }
         }
-        return false;
+        return -1;
     }
 
     final SymbolToken[] getTypeAnnotationSymbols()
diff --git a/src/software/amazon/ion/impl/IonWriterSystemTree.java b/src/software/amazon/ion/impl/IonWriterSystemTree.java
index 4223053445..663008a768 100644
--- a/src/software/amazon/ion/impl/IonWriterSystemTree.java
+++ b/src/software/amazon/ion/impl/IonWriterSystemTree.java
@@ -219,7 +219,7 @@ public void stepIn(IonType containerType) throws IOException
 
     public void stepOut() throws IOException
     {
-        IonValue prior = _current_parent;
+        PrivateIonValue prior = (PrivateIonValue)_current_parent;
         popParent();
 
         if (_current_parent instanceof IonDatagram
diff --git a/src/software/amazon/ion/impl/IonWriterUser.java b/src/software/amazon/ion/impl/IonWriterUser.java
index adf089de9a..b5b3fd2dca 100644
--- a/src/software/amazon/ion/impl/IonWriterUser.java
+++ b/src/software/amazon/ion/impl/IonWriterUser.java
@@ -148,11 +148,9 @@ public IonCatalog getCatalog()
         return _catalog;
     }
 
-
     @Override
-    boolean has_annotation(String name, int id)
-    {
-        return _current_writer.has_annotation(name, id);
+    int findAnnotation(String name) {
+        return _current_writer.findAnnotation(name);
     }
 
     @Override
@@ -374,7 +372,7 @@ public void stepIn(IonType containerType) throws IOException
         // see if it looks like we're starting a local symbol table
         if (containerType == IonType.STRUCT
             && _current_writer.getDepth() == 0
-            && has_annotation(ION_SYMBOL_TABLE, ION_SYMBOL_TABLE_SID))
+            && findAnnotation(ION_SYMBOL_TABLE) == 0)
         {
             open_local_symbol_table_copy();
         }
diff --git a/src/software/amazon/ion/impl/PrivateIonValue.java b/src/software/amazon/ion/impl/PrivateIonValue.java
index d7a4c2533f..cce85f4188 100644
--- a/src/software/amazon/ion/impl/PrivateIonValue.java
+++ b/src/software/amazon/ion/impl/PrivateIonValue.java
@@ -59,6 +59,13 @@ public interface SymbolTableProvider {
      */
     public SymbolToken[] getTypeAnnotationSymbols(SymbolTableProvider symbolTableProvider);
 
+    /**
+     * Returns the given annotation's index in the value's annotations list, or -1 if not present.
+     * @param annotation the annotation to find.
+     * @return the index or -1.
+     */
+    int findTypeAnnotation(String annotation);
+
     /**
      * Makes this symbol table current for this value.
      * This may directly apply to this IonValue if this
diff --git a/src/software/amazon/ion/impl/PrivateIonWriterBase.java b/src/software/amazon/ion/impl/PrivateIonWriterBase.java
index 16659f0030..0fda9b92b0 100644
--- a/src/software/amazon/ion/impl/PrivateIonWriterBase.java
+++ b/src/software/amazon/ion/impl/PrivateIonWriterBase.java
@@ -124,8 +124,12 @@ public abstract void setSymbolTable(SymbolTable symbols)
     //========================================================================
     // Annotations
 
-
-    abstract boolean has_annotation(String name, int id);
+    /**
+     * Returns the given annotation's index in the value's annotations list, or -1 if not present.
+     * @param name the annotation to find.
+     * @return the index or -1.
+     */
+    abstract int findAnnotation(String name);
 
 
     /**
diff --git a/src/software/amazon/ion/impl/PrivateUtils.java b/src/software/amazon/ion/impl/PrivateUtils.java
index ed8ce655a3..f047a87a52 100644
--- a/src/software/amazon/ion/impl/PrivateUtils.java
+++ b/src/software/amazon/ion/impl/PrivateUtils.java
@@ -644,10 +644,10 @@ public static Iterator<IonValue> iterate(ValueFactory valueFactory,
      *
      * @return boolean true if v can be a local symbol table otherwise false
      */
-    public static boolean valueIsLocalSymbolTable(IonValue v)
+    public static boolean valueIsLocalSymbolTable(PrivateIonValue v)
     {
         return (v instanceof IonStruct
-                && v.hasTypeAnnotation(ION_SYMBOL_TABLE));
+                && v.findTypeAnnotation(ION_SYMBOL_TABLE) == 0);
     }
 
 
diff --git a/src/software/amazon/ion/impl/lite/IonValueLite.java b/src/software/amazon/ion/impl/lite/IonValueLite.java
index e974eabe6f..cc2e80de65 100644
--- a/src/software/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/software/amazon/ion/impl/lite/IonValueLite.java
@@ -661,14 +661,16 @@ public void setTypeAnnotations(String... annotations)
     public final boolean hasTypeAnnotation(String annotation)
     {
         if (annotation != null && annotation.length() > 0) {
-            int pos = find_type_annotation(annotation);
+            int pos = findTypeAnnotation(annotation);
             if (pos >= 0) {
                 return true;
             }
         }
         return false;
     }
-    private final int find_type_annotation(String annotation)
+
+    @Override
+    public final int findTypeAnnotation(String annotation)
     {
         assert(annotation != null && annotation.length() > 0);
 
@@ -802,7 +804,7 @@ public void removeTypeAnnotation(String annotation)
         checkForLock();
 
         if (annotation != null && annotation.length() > 0) {
-            int pos = find_type_annotation(annotation);
+            int pos = findTypeAnnotation(annotation);
             if (pos < 0) {
                 return;
             }

From d9388a70be2a29609640b8ad16087651a7654ff2 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 24 Aug 2018 16:21:06 -0700
Subject: [PATCH 008/490] Disallows writing and reading symbol IDs out of range
 of the local symbol table.

---
 ion-tests                                     |  2 +-
 .../ion/impl/IonReaderBinarySystemX.java      |  4 +-
 .../amazon/ion/impl/IonReaderBinaryUserX.java | 33 +++++++
 .../amazon/ion/impl/IonReaderTextSystemX.java |  2 +-
 .../amazon/ion/impl/IonReaderTextUserX.java   | 31 +++++++
 .../amazon/ion/impl/IonWriterSystem.java      |  4 +
 .../amazon/ion/impl/PrivateIonSystem.java     |  6 +-
 .../amazon/ion/impl/PrivateIonWriterBase.java | 13 ++-
 .../ion/impl/bin/IonManagedBinaryWriter.java  |  7 ++
 test/software/amazon/ion/CloneTest.java       | 20 +----
 .../amazon/ion/HashCodeCorrectnessTest.java   | 49 +++++-----
 test/software/amazon/ion/IonValueTest.java    |  5 +-
 test/software/amazon/ion/StructTest.java      | 89 +++++++------------
 test/software/amazon/ion/SymbolTest.java      |  2 +-
 .../amazon/ion/SystemProcessingTestCase.java  | 15 ++--
 test/software/amazon/ion/TestUtils.java       |  2 +-
 .../amazon/ion/TrBwBrProcessingTest.java      | 12 +++
 .../amazon/ion/impl/IonWriterTestCase.java    | 37 +++++---
 .../ion/streaming/SeekableReaderTest.java     |  2 +-
 19 files changed, 207 insertions(+), 128 deletions(-)

diff --git a/ion-tests b/ion-tests
index 20bc2a6d4f..9bbb4ea124 160000
--- a/ion-tests
+++ b/ion-tests
@@ -1 +1 @@
-Subproject commit 20bc2a6d4f22f757ed8abbeb0c961296d42a97b4
+Subproject commit 9bbb4ea1244c707d77d0d0ff0d35a90d44b4d885
diff --git a/src/software/amazon/ion/impl/IonReaderBinarySystemX.java b/src/software/amazon/ion/impl/IonReaderBinarySystemX.java
index 1bf2a98e19..27b9900d48 100644
--- a/src/software/amazon/ion/impl/IonReaderBinarySystemX.java
+++ b/src/software/amazon/ion/impl/IonReaderBinarySystemX.java
@@ -403,7 +403,7 @@ public final String stringValue()
         return _v.getString();
     }
 
-    public final SymbolToken symbolValue()
+    public SymbolToken symbolValue()
     {
         if (_value_type != SYMBOL) throw new IllegalStateException();
         if (_value_is_null) return null;
@@ -439,7 +439,7 @@ public final String getFieldName()
         return name;
     }
 
-    public final SymbolToken getFieldNameSymbol()
+    public SymbolToken getFieldNameSymbol()
     {
         if (_value_field_id == SymbolTable.UNKNOWN_SYMBOL_ID) return null;
         int sid = _value_field_id;
diff --git a/src/software/amazon/ion/impl/IonReaderBinaryUserX.java b/src/software/amazon/ion/impl/IonReaderBinaryUserX.java
index 5a53c251fc..16c04d6192 100644
--- a/src/software/amazon/ion/impl/IonReaderBinaryUserX.java
+++ b/src/software/amazon/ion/impl/IonReaderBinaryUserX.java
@@ -25,6 +25,8 @@
 import software.amazon.ion.Span;
 import software.amazon.ion.SpanProvider;
 import software.amazon.ion.SymbolTable;
+import software.amazon.ion.SymbolToken;
+import software.amazon.ion.UnknownSymbolException;
 import software.amazon.ion.impl.PrivateScalarConversions.AS_TYPE;
 import software.amazon.ion.impl.UnifiedInputStreamX.FromByteArray;
 import software.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
@@ -226,6 +228,37 @@ else if (_value_tid == PrivateIonConstants.tidStruct) {
         }
     }
 
+    private void validateSymbolToken(SymbolToken symbol) {
+        if (symbol != null) {
+            if (symbol.getText() == null && symbol.getSid() > getSymbolTable().getMaxId()) {
+                throw new UnknownSymbolException(symbol.getSid());
+            }
+        }
+    }
+
+    @Override
+    public SymbolToken[] getTypeAnnotationSymbols() {
+        SymbolToken[] annotations = super.getTypeAnnotationSymbols();
+        for (SymbolToken annotation : annotations) {
+            validateSymbolToken(annotation);
+        }
+        return annotations;
+    }
+
+    @Override
+    public final SymbolToken getFieldNameSymbol() {
+        SymbolToken fieldName = super.getFieldNameSymbol();
+        validateSymbolToken(fieldName);
+        return fieldName;
+    }
+
+    @Override
+    public final SymbolToken symbolValue() {
+        SymbolToken symbol = super.symbolValue();
+        validateSymbolToken(symbol);
+        return symbol;
+    }
+
     //
     //  This code handles the skipped symbol table
     //  support - it is cloned in IonReaderTextUserX,
diff --git a/src/software/amazon/ion/impl/IonReaderTextSystemX.java b/src/software/amazon/ion/impl/IonReaderTextSystemX.java
index 537a26dd4b..459a067f10 100644
--- a/src/software/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextSystemX.java
@@ -662,7 +662,7 @@ public final String getFieldName()
     }
 
     @Override
-    public final SymbolToken getFieldNameSymbol()
+    public SymbolToken getFieldNameSymbol()
     {
         SymbolToken sym = super.getFieldNameSymbol();
         if (sym != null)
diff --git a/src/software/amazon/ion/impl/IonReaderTextUserX.java b/src/software/amazon/ion/impl/IonReaderTextUserX.java
index 5906f6b666..64fa372ac8 100644
--- a/src/software/amazon/ion/impl/IonReaderTextUserX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextUserX.java
@@ -27,6 +27,7 @@
 import software.amazon.ion.SymbolTable;
 import software.amazon.ion.SymbolToken;
 import software.amazon.ion.TextSpan;
+import software.amazon.ion.UnknownSymbolException;
 import software.amazon.ion.UnsupportedIonVersionException;
 
 /**
@@ -177,6 +178,36 @@ private final void symbol_table_reset()
         return;
     }
 
+    private void validateSymbolToken(SymbolToken symbol) {
+        if (symbol != null) {
+            if (symbol.getText() == null && symbol.getSid() > getSymbolTable().getMaxId()) {
+                throw new UnknownSymbolException(symbol.getSid());
+            }
+        }
+    }
+
+    @Override
+    public SymbolToken[] getTypeAnnotationSymbols() {
+        SymbolToken[] annotations = super.getTypeAnnotationSymbols();
+        for (SymbolToken annotation : annotations) {
+            validateSymbolToken(annotation);
+        }
+        return annotations;
+    }
+
+    @Override
+    public final SymbolToken getFieldNameSymbol() {
+        SymbolToken fieldName = super.getFieldNameSymbol();
+        validateSymbolToken(fieldName);
+        return fieldName;
+    }
+
+    @Override
+    public final SymbolToken symbolValue() {
+        SymbolToken symbol = super.symbolValue();
+        validateSymbolToken(symbol);
+        return symbol;
+    }
 
     @Override
     public SymbolTable getSymbolTable()
diff --git a/src/software/amazon/ion/impl/IonWriterSystem.java b/src/software/amazon/ion/impl/IonWriterSystem.java
index e4f3b5534c..6237a7c58a 100644
--- a/src/software/amazon/ion/impl/IonWriterSystem.java
+++ b/src/software/amazon/ion/impl/IonWriterSystem.java
@@ -391,6 +391,7 @@ public final void setFieldNameSymbol(SymbolToken name)
             if (sid < 0) {
                 throw new IllegalArgumentException();
             }
+            validateSymbolId(sid);
 
             _field_name_type = IonType.INT;
             _field_name_sid = sid;
@@ -483,6 +484,9 @@ public final void setTypeAnnotationSymbols(SymbolToken... annotations)
             for (int i = 0; i < count; i++)
             {
                 SymbolToken sym = annotations[i];
+                if (sym.getText() == null) {
+                    validateSymbolId(sym.getSid());
+                }
                 sym = PrivateUtils.localize(symtab, sym);
                 _annotations[i] = sym;
             }
diff --git a/src/software/amazon/ion/impl/PrivateIonSystem.java b/src/software/amazon/ion/impl/PrivateIonSystem.java
index a55dbc0b1b..640d0ae6f8 100644
--- a/src/software/amazon/ion/impl/PrivateIonSystem.java
+++ b/src/software/amazon/ion/impl/PrivateIonSystem.java
@@ -36,19 +36,19 @@ public interface PrivateIonSystem
     public SymbolTable newSharedSymbolTable(IonStruct ionRep);
 
     /**
-     * TODO Must correct amzn/ion-java#63 before exposing this or using from public API.
+     * TODO Must correct amzn/ion-java#14 before exposing this or using from public API.
      */
     public Iterator<IonValue> systemIterate(String ionText);
 
     /**
-     * TODO Must correct amzn/ion-java#63 before exposing this or using from public API.
+     * TODO Must correct amzn/ion-java#14 before exposing this or using from public API.
      */
     public Iterator<IonValue> systemIterate(Reader ionText);
 
     public Iterator<IonValue> systemIterate(byte[] ionData);
 
     /**
-     * TODO Must correct amzn/ion-java#63 before exposing this or using from public API.
+     * TODO Must correct amzn/ion-java#14 before exposing this or using from public API.
      */
     public Iterator<IonValue> systemIterate(InputStream ionData);
 
diff --git a/src/software/amazon/ion/impl/PrivateIonWriterBase.java b/src/software/amazon/ion/impl/PrivateIonWriterBase.java
index 0fda9b92b0..a5cdc96716 100644
--- a/src/software/amazon/ion/impl/PrivateIonWriterBase.java
+++ b/src/software/amazon/ion/impl/PrivateIonWriterBase.java
@@ -165,9 +165,8 @@ public abstract void setSymbolTable(SymbolTable symbols)
     abstract int[] getTypeAnnotationIds();
 
     /**
-     * Write symbolId out as an IonSymbol value.  The value does not
-     * have to be valid in the symbol table, unless the output is
-     * text, in which case it does.
+     * Write symbolId out as an IonSymbol value.  The value must
+     * be valid in the symbol table.
      *
      * @param symbolId symbol table id to write
      */
@@ -217,6 +216,13 @@ public void writeNull() throws IOException
         writeNull(IonType.NULL);
     }
 
+    final void validateSymbolId(int sid) {
+        if (sid > getSymbolTable().getMaxId()) {
+            // There is no slot for this symbol ID in the symbol table,
+            // so an error would be raised on read. Fail early on write.
+            throw new UnknownSymbolException(sid);
+        }
+    }
 
     public final void writeSymbolToken(SymbolToken tok)
         throws IOException
@@ -234,6 +240,7 @@ public final void writeSymbolToken(SymbolToken tok)
         else
         {
             int sid = tok.getSid();
+            validateSymbolId(sid);
             writeSymbol(sid);
         }
     }
diff --git a/src/software/amazon/ion/impl/bin/IonManagedBinaryWriter.java b/src/software/amazon/ion/impl/bin/IonManagedBinaryWriter.java
index ec0300a9e8..61d77afbc7 100644
--- a/src/software/amazon/ion/impl/bin/IonManagedBinaryWriter.java
+++ b/src/software/amazon/ion/impl/bin/IonManagedBinaryWriter.java
@@ -48,6 +48,7 @@
 import software.amazon.ion.SymbolTable;
 import software.amazon.ion.SymbolToken;
 import software.amazon.ion.Timestamp;
+import software.amazon.ion.UnknownSymbolException;
 import software.amazon.ion.impl.PrivateUtils;
 import software.amazon.ion.impl.bin.IonRawBinaryWriter.StreamCloseMode;
 import software.amazon.ion.impl.bin.IonRawBinaryWriter.StreamFlushMode;
@@ -843,6 +844,12 @@ private SymbolToken intern(final SymbolToken token)
             // string content always makes us intern
             return intern(text);
         }
+        final int sid = token.getSid();
+        if (sid > getSymbolTable().getMaxId()) {
+            // There is no slot for this symbol ID in the symbol table,
+            // so an error would be raised on read. Fail early on write.
+            throw new UnknownSymbolException(sid);
+        }
         // no text, we just return what we got
         return token;
     }
diff --git a/test/software/amazon/ion/CloneTest.java b/test/software/amazon/ion/CloneTest.java
index 682b223c9c..0e94379515 100644
--- a/test/software/amazon/ion/CloneTest.java
+++ b/test/software/amazon/ion/CloneTest.java
@@ -74,8 +74,6 @@ public void testDifferentValueFactoryCloneWithUnknownSymbolText()
         assertEquals(99, copy.symbolValue().getSid());
     }
 
-    static final boolean DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT = true;
-
     @Test
     public void testIonValueCloneWithUnknownAnnotationText()
     {
@@ -83,15 +81,8 @@ public void testIonValueCloneWithUnknownAnnotationText()
         IonInt original = system().newInt(5);
         original.setTypeAnnotationSymbols(tok);
 
-        if (! DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            thrown.expect(UnknownSymbolException.class);
-            thrown.expectMessage("$99");
-        }
-
         IonInt actual = original.clone();
-        if (DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            assertEquals(original, actual);
-        }
+        assertEquals(original, actual);
     }
 
     @Test
@@ -101,15 +92,8 @@ public void testValueFactoryCloneWithUnknownAnnotationText()
         IonInt original = system().newInt(5);
         original.setTypeAnnotationSymbols(tok);
 
-        if (! DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            thrown.expect(UnknownSymbolException.class);
-            thrown.expectMessage("$99");
-        }
-
         IonInt actual = system().clone(original);
-        if (DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            assertEquals(original, actual);
-        }
+        assertEquals(original, actual);
     }
 
     @Test
diff --git a/test/software/amazon/ion/HashCodeCorrectnessTest.java b/test/software/amazon/ion/HashCodeCorrectnessTest.java
index edd435c721..1a48f634fa 100644
--- a/test/software/amazon/ion/HashCodeCorrectnessTest.java
+++ b/test/software/amazon/ion/HashCodeCorrectnessTest.java
@@ -543,10 +543,11 @@ public void testIonStructEvenEquivChildValueHashCode()
                                        "{a:456, b:456}");
         assertIonNotEqImpliesHashNotEq("{a:annot::123, b:123}",
                                        "{a:456, b:annot::456}");
-        assertIonNotEqImpliesHashNotEq("{$99:123, $98:123}",
-                                       "{$99:456, $98:456}");
-        assertIonNotEqImpliesHashNotEq("{$99:annot::123, $98:123}",
-                                       "{$99:456, $98:annot::456}");
+        String sharedSymbolTable = "$ion_symbol_table::{imports:[{name:\"foo\", version: 1, max_id:90}]}";
+        assertIonNotEqImpliesHashNotEq(sharedSymbolTable + "{$99:123, $98:123}",
+                                       sharedSymbolTable + "{$99:456, $98:456}");
+        assertIonNotEqImpliesHashNotEq(sharedSymbolTable + "{$99:annot::123, $98:123}",
+                                       sharedSymbolTable + "{$99:456, $98:annot::456}");
     }
 
     @Test
@@ -564,18 +565,20 @@ public void testIonStructSwappedFieldNameAndValueHashCode()
                                        "{alpha:a, beta:b}");
         assertIonNotEqImpliesHashNotEq("{a:alpha, b:beta, c:charlie}",
                                        "{alpha:a, beta:b, charlie:c}");
-        assertIonNotEqImpliesHashNotEq("{$99:a}",
-                                       "{a:$99}");
-        assertIonNotEqImpliesHashNotEq("{$99:a, $999:b}",
-                                       "{a:$99, b:$999}");
-        assertIonNotEqImpliesHashNotEq("{$99:a, $999:b, $9999:c}",
-                                       "{a:$99, b:$999, c:$9999}");
+        String sharedSymbolTable = "$ion_symbol_table::{imports:[{name:\"foo\", version: 1, max_id:9990}]} ";
+        assertIonNotEqImpliesHashNotEq(sharedSymbolTable + "{$99:a}",
+                                       sharedSymbolTable + "{a:$99}");
+        assertIonNotEqImpliesHashNotEq(sharedSymbolTable + "{$99:a, $999:b}",
+                                       sharedSymbolTable + "{a:$99, b:$999}");
+        assertIonNotEqImpliesHashNotEq(sharedSymbolTable + "{$99:a, $999:b, $9999:c}",
+                                       sharedSymbolTable + "{a:$99, b:$999, c:$9999}");
     }
 
     protected void testTypeAnnotationHashCode(String text, IonType type)
     {
+        String sharedSymbolTable = "$ion_symbol_table::{imports:[{name:\"foo\", version: 1, max_id:90}]}";
         checkType(type, oneValue("annot1::" + text));
-        checkType(type, oneValue("$99::" + text));
+        checkType(type, oneValue(sharedSymbolTable + "$99::" + text));
 
         assertIonEqImpliesHashEq(oneValue("annot1::" + text),
                                  oneValue("annot2::" + text));
@@ -584,12 +587,12 @@ protected void testTypeAnnotationHashCode(String text, IonType type)
         assertIonEqImpliesHashEq(oneValue("annot1::annot2::annot3::" + text),
                                  oneValue("annot1::annot2::annot3::" + text));
 
-        assertIonEqImpliesHashEq(oneValue("$99::" + text),
-                                 oneValue("$98::" + text));
-        assertIonEqImpliesHashEq(oneValue("$99::$98::" + text),
-                                 oneValue("$99::$98::" + text));
-        assertIonEqImpliesHashEq(oneValue("$99::$98::$97::" + text),
-                                 oneValue("$99::$98::$97::" + text));
+        assertIonEqImpliesHashEq(oneValue(sharedSymbolTable + "$99::" + text),
+                                 oneValue(sharedSymbolTable + "$98::" + text));
+        assertIonEqImpliesHashEq(oneValue(sharedSymbolTable + "$99::$98::" + text),
+                                 oneValue(sharedSymbolTable + "$99::$98::" + text));
+        assertIonEqImpliesHashEq(oneValue(sharedSymbolTable + "$99::$98::$97::" + text),
+                                 oneValue(sharedSymbolTable + "$99::$98::$97::" + text));
 
         assertIonNotEqImpliesHashNotEq("annot1::" + text,
                                        "annot2::" + text);
@@ -598,12 +601,12 @@ protected void testTypeAnnotationHashCode(String text, IonType type)
         assertIonNotEqImpliesHashNotEq("annot1::annot2::annot3::" + text,
                                        "annot3::annot2::annot1::" + text);
 
-        assertIonNotEqImpliesHashNotEq("$99::" + text,
-                                       "$98::" + text);
-        assertIonNotEqImpliesHashNotEq("$99::$98::" + text,
-                                       "$98::$99::" + text);
-        assertIonNotEqImpliesHashNotEq("$99::$98::$97::" + text,
-                                       "$97::$98::$99::" + text);
+        assertIonNotEqImpliesHashNotEq(sharedSymbolTable + "$99::" + text,
+                                       sharedSymbolTable + "$98::" + text);
+        assertIonNotEqImpliesHashNotEq(sharedSymbolTable + "$99::$98::" + text,
+                                       sharedSymbolTable + "$98::$99::" + text);
+        assertIonNotEqImpliesHashNotEq(sharedSymbolTable + "$99::$98::$97::" + text,
+                                       sharedSymbolTable + "$97::$98::$99::" + text);
     }
 
     @Test
diff --git a/test/software/amazon/ion/IonValueTest.java b/test/software/amazon/ion/IonValueTest.java
index 7f907d0203..c6e92c4087 100644
--- a/test/software/amazon/ion/IonValueTest.java
+++ b/test/software/amazon/ion/IonValueTest.java
@@ -272,11 +272,12 @@ public void testRemoveDuplicateAnnotation()
     @Test
     public void testDetachWithUnknownAnnotation()
     {
-        IonList list = (IonList) system().singleValue("[$99::null]");
+        String sharedSymbolTable = "$ion_symbol_table::{imports:[{name:\"foo\", version: 1, max_id: 90}]}";
+        IonList list = (IonList) system().singleValue(sharedSymbolTable + "[$99::null]");
         IonValue child = list.get(0);
         child.removeFromContainer();
 
-        IonAssert.assertIonEquals(system().singleValue("$99::null"), child);
+        IonAssert.assertIonEquals(system().singleValue(sharedSymbolTable + "$99::null"), child);
     }
 
 
diff --git a/test/software/amazon/ion/StructTest.java b/test/software/amazon/ion/StructTest.java
index 23ee940fc8..15255dbdb2 100644
--- a/test/software/amazon/ion/StructTest.java
+++ b/test/software/amazon/ion/StructTest.java
@@ -14,7 +14,6 @@
 
 package software.amazon.ion;
 
-import static software.amazon.ion.CloneTest.DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT;
 import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 
 import java.io.PrintWriter;
@@ -50,6 +49,10 @@
 public class StructTest
     extends ContainerTestCase
 {
+
+    private static final String SHARED_SYMBOL_TABLE
+            = "$ion_symbol_table::{imports:[{name:\"foo\", version:1, max_id:90}]} ";
+
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
@@ -217,7 +220,7 @@ public void modifyStruct(IonStruct value)
     @Test
     public void testPutAfterUnknownFieldName()
     {
-        IonStruct value = struct("{$99:null}");
+        IonStruct value = struct(SHARED_SYMBOL_TABLE + "{$99:null}");
         value.put("hi", system().newNull());
     }
 
@@ -1120,7 +1123,7 @@ public void testCloneAndRemove()
     @Test
     public void testCloneAndRemoveWithSpecialFieldNames()
     {
-        IonStruct s1 = struct("{c:1,$99:2,'$19':3,'$20':3}");
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "{c:1,$99:2,'$19':3,'$20':3}");
 
         // Unlike cloneAndRetain(), cloneAndRemove() allows null args since it
         // makes sense to request removal of unknown field names.
@@ -1138,7 +1141,7 @@ public void testCloneAndRemoveWithSpecialFieldNames()
     @Test
     public void testCloneAndRemoveWithUnknownFieldNameOnRoot()
     {
-        IonStruct s1 = struct("{$99:a::{c:1,d:2,d:3}}");
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "{$99:a::{c:1,d:2,d:3}}");
 
         IonStruct root = (IonStruct) s1.iterator().next();
 
@@ -1150,7 +1153,7 @@ public void testCloneAndRemoveWithUnknownFieldNameOnRoot()
     @Test
     public void testCloneAndRemoveWithUnknownFieldNameOnField()
     {
-        IonStruct s1 = struct("a::{$99:1,d:2,e:3,d:3}");
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "a::{$99:1,d:2,e:3,d:3}");
 
         // OK if the unknown symbol is on a removed node.
         IonStruct actual = s1.cloneAndRemove(null, "e");
@@ -1158,7 +1161,7 @@ public void testCloneAndRemoveWithUnknownFieldNameOnField()
         assertEquals(expected, actual);
 
         // Not OK if the unknown symbol is on a retained node.
-        s1 = struct("a::{c:1,$99:2,e:3,d:3}");
+        s1 = struct(SHARED_SYMBOL_TABLE + "a::{c:1,$99:2,e:3,d:3}");
         thrown.expect(UnknownSymbolException.class);
         thrown.expectMessage("$99");
         s1.cloneAndRemove("c", "e");
@@ -1168,7 +1171,7 @@ public void testCloneAndRemoveWithUnknownFieldNameOnField()
     @Test
     public void testCloneAndRemoveWithUnknownSymbolTextOnField()
     {
-        IonStruct s1 = struct("a::{c:$99,d:2,e:3,d:3}");
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "a::{c:$99,d:2,e:3,d:3}");
 
         // OK if the unknown symbol is on a removed node.
         IonStruct actual = s1.cloneAndRemove("c", "e");
@@ -1176,7 +1179,7 @@ public void testCloneAndRemoveWithUnknownSymbolTextOnField()
         assertEquals(expected, actual);
 
         // Not OK if the unknown symbol is on a retained node.
-        s1 = struct("a::{c:1,d:$99,e:3,d:3}");
+        s1 = struct(SHARED_SYMBOL_TABLE + "a::{c:1,d:$99,e:3,d:3}");
         thrown.expect(UnknownSymbolException.class);
         thrown.expectMessage("$99");
         s1.cloneAndRemove("c", "e");
@@ -1185,23 +1188,17 @@ public void testCloneAndRemoveWithUnknownSymbolTextOnField()
     @Test
     public void testCloneAndRemoveWithUnknownAnnotationTextOnRoot()
     {
-        IonStruct s1 = struct("$99::{c:1,d:2,e:3,d:3}");
-        if (! DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            thrown.expect(UnknownSymbolException.class);
-            thrown.expectMessage("$99");
-        }
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "$99::{c:1,d:2,e:3,d:3}");
         IonStruct actual = s1.cloneAndRemove("c", "e");
-        if (DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            // If we don't fail we should at least retain the SID.
-            IonStruct expected = struct("$99::{d:2,d:3}");
-            assertEquals(expected, actual);
-        }
+        // If we don't fail we should at least retain the SID.
+        IonStruct expected = struct(SHARED_SYMBOL_TABLE + "$99::{d:2,d:3}");
+        assertEquals(expected, actual);
     }
 
     @Test
     public void testCloneAndRemoveWithUnknownAnnotationTextOnField()
     {
-        IonStruct s1 = struct("a::{c:$99::1,d:2,e:3,d:3}");
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "a::{c:$99::1,d:2,e:3,d:3}");
 
         // OK if the unknown symbol is on a removed node.
         IonStruct actual = s1.cloneAndRemove("c", "e");
@@ -1209,17 +1206,11 @@ public void testCloneAndRemoveWithUnknownAnnotationTextOnField()
         assertEquals(expected, actual);
 
         // Not OK if the unknown symbol is on a retained node.
-        s1 = struct("a::{c:1,d:$99::2,e:3}");
-        if (! DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            thrown.expect(UnknownSymbolException.class);
-            thrown.expectMessage("$99");
-        }
+        s1 = struct(SHARED_SYMBOL_TABLE + "a::{c:1,d:$99::2,e:3}");
         actual = s1.cloneAndRemove("c", "e");
-        if (DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            // If we don't fail we should at least retain the SID.
-            expected = struct("a::{d:$99::2}");
-            assertEquals(expected, actual);
-        }
+        // If we don't fail we should at least retain the SID.
+        expected = struct(SHARED_SYMBOL_TABLE + "a::{d:$99::2}");
+        assertEquals(expected, actual);
     }
 
     //-------------------------------------------------------------------------
@@ -1246,7 +1237,7 @@ public void testCloneAndRetain()
     @Test
     public void testCloneAndRetainWithSpecialFieldNames()
     {
-        IonStruct s1 = struct("{c:1,$99:2,'$19':3,'$20':3}");
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "{c:1,$99:2,'$19':3,'$20':3}");
         IonStruct actual = s1.cloneAndRetain("c", "$20");
         IonStruct expected = struct("{c:1,'$20':3}");
         assertEquals(expected, actual);
@@ -1262,7 +1253,7 @@ public void testCloneAndRetainWithSpecialFieldNames()
     @Test
     public void testCloneAndRetainWithUnknownFieldNameOnRoot()
     {
-        IonStruct s1 = struct("{$99:a::{c:1,d:2,d:3}}");
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "{$99:a::{c:1,d:2,d:3}}");
 
         IonStruct root = (IonStruct) s1.iterator().next();
 
@@ -1274,7 +1265,7 @@ public void testCloneAndRetainWithUnknownFieldNameOnRoot()
     @Test
     public void testCloneAndRetainWithUnknownFieldNameOnField()
     {
-        IonStruct s1 = struct("a::{$99:1,d:2,e:3,d:3}");
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "a::{$99:1,d:2,e:3,d:3}");
 
         // OK if the unknown symbol is on a removed node.
         IonStruct actual = s1.cloneAndRetain("d", "e");
@@ -1282,7 +1273,7 @@ public void testCloneAndRetainWithUnknownFieldNameOnField()
         assertEquals(expected, actual);
 
         // Not OK if the unknown symbol is on a retained node.
-        s1 = struct("a::{c:1,$99:2,e:3,d:3}");
+        s1 = struct(SHARED_SYMBOL_TABLE + "a::{c:1,$99:2,e:3,d:3}");
         thrown.expect(NullPointerException.class);
         s1.cloneAndRetain(null, "e");
     }
@@ -1291,7 +1282,7 @@ public void testCloneAndRetainWithUnknownFieldNameOnField()
     @Test
     public void testCloneAndRetainWithUnknownSymbolTextOnField()
     {
-        IonStruct s1 = struct("a::{c:$99,d:2,e:3,d:3}");
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "a::{c:$99,d:2,e:3,d:3}");
 
         // OK if the unknown symbol is on a removed node.
         IonStruct actual = s1.cloneAndRetain("d");
@@ -1299,7 +1290,7 @@ public void testCloneAndRetainWithUnknownSymbolTextOnField()
         assertEquals(expected, actual);
 
         // Not OK if the unknown symbol is on a retained node.
-        s1 = struct("a::{c:1,d:$99,e:3,d:3}");
+        s1 = struct(SHARED_SYMBOL_TABLE + "a::{c:1,d:$99,e:3,d:3}");
         thrown.expect(UnknownSymbolException.class);
         thrown.expectMessage("$99");
         s1.cloneAndRetain("c", "d");
@@ -1308,23 +1299,17 @@ public void testCloneAndRetainWithUnknownSymbolTextOnField()
     @Test
     public void testCloneAndRetainWithUnknownAnnotationTextOnRoot()
     {
-        IonStruct s1 = struct("$99::{c:1,d:2,e:3,d:3}");
-        if (! DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            thrown.expect(UnknownSymbolException.class);
-            thrown.expectMessage("$99");
-        }
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "$99::{c:1,d:2,e:3,d:3}");
         IonStruct actual = s1.cloneAndRetain("c", "e");
-        if (DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            // If we don't fail we should at least retain the SID.
-            IonStruct expected = struct("$99::{c:1,e:3}");
-            assertEquals(expected, actual);
-        }
+        // If we don't fail we should at least retain the SID.
+        IonStruct expected = struct(SHARED_SYMBOL_TABLE + "$99::{c:1,e:3}");
+        assertEquals(expected, actual);
     }
 
     @Test
     public void testCloneAndRetainWithUnknownAnnotationTextOnField()
     {
-        IonStruct s1 = struct("a::{c:$99::1,d:2,e:3,d:3}");
+        IonStruct s1 = struct(SHARED_SYMBOL_TABLE + "a::{c:$99::1,d:2,e:3,d:3}");
 
         // OK if the unknown symbol is on a removed node.
         IonStruct actual = s1.cloneAndRetain("d");
@@ -1332,16 +1317,10 @@ public void testCloneAndRetainWithUnknownAnnotationTextOnField()
         assertEquals(expected, actual);
 
         // Not OK if the unknown symbol is on a retained node.
-        if (! DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            thrown.expect(UnknownSymbolException.class);
-            thrown.expectMessage("$99");
-        }
         actual = s1.cloneAndRetain("c", "e");
-        if (DEFECTIVE_CLONE_OF_UNKNOWN_ANNOTATION_TEXT) {
-            // If we don't fail we should at least retain the SID.
-            expected = struct("a::{c:$99::1,e:3}");
-            assertEquals(expected, actual);
-        }
+        // If we don't fail we should at least retain the SID.
+        expected = struct(SHARED_SYMBOL_TABLE + "a::{c:$99::1,e:3}");
+        assertEquals(expected, actual);
     }
 
 
diff --git a/test/software/amazon/ion/SymbolTest.java b/test/software/amazon/ion/SymbolTest.java
index d968b721c3..853aafd3bb 100644
--- a/test/software/amazon/ion/SymbolTest.java
+++ b/test/software/amazon/ion/SymbolTest.java
@@ -165,7 +165,7 @@ public void testEmptySymbol()
     @Test
     public void testSyntheticSymbols()
     {
-        String symText = "$324";
+        String symText = "$ion_symbol_table::{imports:[{name:\"foo\", version: 1, max_id: 315}]} $324";
         IonSymbol value = (IonSymbol) oneValue(symText);
         checkUnknownSymbol(324, value);
 
diff --git a/test/software/amazon/ion/SystemProcessingTestCase.java b/test/software/amazon/ion/SystemProcessingTestCase.java
index 98fcc99f94..5ec1082e12 100644
--- a/test/software/amazon/ion/SystemProcessingTestCase.java
+++ b/test/software/amazon/ion/SystemProcessingTestCase.java
@@ -403,7 +403,7 @@ public void testLocalTableWithLesserImport()
             "            max_id:" + Symtabs.FRED_MAX_IDS[2] + "}]," +
             "}\n" +
             "local1 local2 fred_1 fred_2 fred_3 $12 " +
-            "fred_3::$99 [{fred_3:local2}]";
+            "fred_3::$10 [{fred_3:local2}]";
         // TODO { $12:something }
         // TODO $12::something
         // Nesting flushed out a bug at one point
@@ -450,7 +450,7 @@ public void testLocalTableWithLesserImport()
 // TODO checkAbsentSidLiteral("fred_3", fred3id);
 
         nextValue();
-        checkSymbol(null, 99);
+        checkSymbol("fred_1", fred1id);
         checkMissingAnnotation("fred_3", fred3id);
 
         nextValue();
@@ -835,6 +835,7 @@ public void testLargeStructWithUnknownFieldNames()
         throws Exception
     {
         startIteration(ION_1_0 +
+                       " $ion_symbol_table::{imports:[{name:\"foo\", version: 1, max_id: 10}]}" +
                        " { $10:10, $11:11, $12:12, $13:13, $14:14," +
                        "   $15:15, $16:16, $17:17, $18:18, $19:19 }");
         nextValue();
@@ -852,7 +853,7 @@ public void testLargeStructWithUnknownFieldNames()
     public void testUnknownFieldNames()
         throws Exception
     {
-        startIteration(ION_1_0 + " $10 { $11:$11, $12:$12 } ");
+        startIteration(ION_1_0 + " $ion_symbol_table::{imports:[{name:\"foo\", version: 1, max_id: 3}]} $10 { $11:$11, $12:$12 } ");
 
         nextValue();
         checkSymbol(null, 10);
@@ -877,7 +878,7 @@ public void testUnknownFieldNames()
     public void testUnknownAnnotations()
         throws Exception
     {
-        startIteration(ION_1_0 + " $10::$10 $11::[ $12::$12 ]");
+        startIteration(ION_1_0 + " $ion_symbol_table::{imports:[{name:\"foo\", version: 1, max_id: 3}]} $10::$10 $11::[ $12::$12 ]");
 
         nextValue();
         checkSymbol(null, 10);
@@ -1121,12 +1122,12 @@ public void testIvmWithAnnotationText()
     public void testIvmWithAnnotationSid()
         throws Exception
     {
-        startIteration("$99::" + ION_1_0 + " 123");
+        startIteration("$0::" + ION_1_0 + " 123");
 
-        // $99::$ion_1_0 is not an IVM, but an annotated user-value symbol
+        // $0::$ion_1_0 is not an IVM, but an annotated user-value symbol
         nextValue();
         checkSymbol(ION_1_0);
-        checkAnnotation(null, 99);
+        checkAnnotation(null, 0);
 
         nextValue();
         checkInt(123);
diff --git a/test/software/amazon/ion/TestUtils.java b/test/software/amazon/ion/TestUtils.java
index fe20f57d60..ba7cad7503 100644
--- a/test/software/amazon/ion/TestUtils.java
+++ b/test/software/amazon/ion/TestUtils.java
@@ -132,7 +132,6 @@ public boolean accept(File dir, String name)
              "bad/clobWithNullCharacter.ion"                // TODO amzn/ion-java#43
             , "bad/clobWithNonAsciiCharacter.ion"           // TODO amzn/ion-java#99
             , "bad/structOrderedEmpty.10n"                  // TODO amzn/ion-java#100
-            , "bad/symbolIDUnmapped.ion"                    // TODO amzn/ion-java#101
             , "bad/emptyAnnotatedInt.10n"                   // TODO amzn/ion-java#55
             , "bad/timestamp/timestampNegativeFraction.10n" // TODO amzn/ion-java#102
             , "bad/utf8/surrogate_5.ion"                    // TODO amzn/ion-java#60
@@ -147,6 +146,7 @@ public boolean accept(File dir, String name)
             , "good/whitespace.ion"                         // TODO amzn/ion-java#104
             , "bad/negativeIntZero.10n"                     // TODO amzn/ion-java#138
             , "bad/negativeIntZeroLn.10n"                   // TODO amzn/ion-java#138
+            , "good/item1.10n"                              // TODO amzn/ion-java#126 (roundtrip symbols with unknown text)
         );
 
 
diff --git a/test/software/amazon/ion/TrBwBrProcessingTest.java b/test/software/amazon/ion/TrBwBrProcessingTest.java
index 2c6c5d12f5..42d87d35ac 100644
--- a/test/software/amazon/ion/TrBwBrProcessingTest.java
+++ b/test/software/amazon/ion/TrBwBrProcessingTest.java
@@ -14,6 +14,8 @@
 
 package software.amazon.ion;
 
+import org.junit.Ignore;
+import org.junit.Test;
 import software.amazon.ion.IonReader;
 
 /**
@@ -31,4 +33,14 @@ protected void prepare(String text)
         IonReader textReader = system().newSystemReader(text);
         myBytes = writeBinaryBytes(textReader);
     }
+
+    @Override
+    @Ignore
+    @Test
+    public void testLocalSymtabWithMalformedSymbolEntries() throws Exception {
+        // TODO amzn/ion-java#151 this test exercises null slots in the local symbol table. The reader should collapse
+        // all local symbol table null slots to $0. Currently, since this doesn't happen, the reader passes $10 to the
+        // writer, which fails due to an out-of-range symbol ID.
+        super.testLocalSymtabWithMalformedSymbolEntries();
+    }
 }
diff --git a/test/software/amazon/ion/impl/IonWriterTestCase.java b/test/software/amazon/ion/impl/IonWriterTestCase.java
index 2c7e435489..6cf30dfbc3 100644
--- a/test/software/amazon/ion/impl/IonWriterTestCase.java
+++ b/test/software/amazon/ion/impl/IonWriterTestCase.java
@@ -56,6 +56,7 @@
 import software.amazon.ion.SymbolToken;
 import software.amazon.ion.SystemSymbols;
 import software.amazon.ion.TestUtils;
+import software.amazon.ion.UnknownSymbolException;
 import software.amazon.ion.impl.PrivateIonWriter;
 import software.amazon.ion.junit.IonAssert;
 
@@ -229,7 +230,7 @@ public void testWritingFieldName()
         iw = makeWriter();
         iw.stepIn(IonType.STRUCT);
         iw.setFieldName("foo");
-        iw.setFieldNameSymbol(newSymbolToken((String) null, 99)); // Replaces "foo"
+        iw.setFieldNameSymbol(newSymbolToken((String) null, 0)); // Replaces "foo"
         iw.writeNull();
         iw.stepOut();
 
@@ -237,7 +238,7 @@ public void testWritingFieldName()
         r.next();
         r.stepIn();
         r.next();
-        check(r).fieldName(null, 99);
+        check(r).fieldName(null, 0);
     }
 
     @Test
@@ -322,11 +323,27 @@ public void testWritingUnknownSymbol()
         throws Exception
     {
         iw = makeWriter();
+        thrown.expect(UnknownSymbolException.class);
         iw.writeSymbolToken(newSymbolToken((String) null, 99));
+    }
 
-        IonReader in = reread();
-        in.next();
-        IonAssert.checkSymbol(in, null, 99);
+    @Test
+    public void testWritingUnknownFieldName()
+        throws Exception
+    {
+        iw = makeWriter();
+        iw.stepIn(IonType.STRUCT);
+        thrown.expect(UnknownSymbolException.class);
+        iw.setFieldNameSymbol(newSymbolToken((String) null, 99));
+    }
+
+    @Test
+    public void testWritingUnknownAnnotation()
+        throws Exception
+    {
+        iw = makeWriter();
+        thrown.expect(UnknownSymbolException.class);
+        iw.setTypeAnnotationSymbols(newSymbolToken((String) null, 99));
     }
 
     @Test
@@ -728,10 +745,10 @@ public void testWritingAnnotationWithUnknownText()
         iw = makeWriter();
         IonDatagram expected = system().newDatagram();
 
-        iw.setTypeAnnotationSymbols(newSymbolToken((String) null, 99));
+        iw.setTypeAnnotationSymbols(newSymbolToken((String) null, 0));
         iw.writeNull(); // expected: the type annotation is written
         IonValue v = expected.add().newNull();
-        v.setTypeAnnotationSymbols(newSymbolToken(99));
+        v.setTypeAnnotationSymbols(newSymbolToken(0));
 
         assertEquals(expected, reload());
     }
@@ -816,7 +833,7 @@ public void testFinishDoesReset()
             checkSymbol(SystemSymbols.ION_1_0, it.next());
         }
         checkAnnotation(SystemSymbols.ION_SYMBOL_TABLE, it.next());
-        // TODO amzn/ion-java#63
+        // TODO amzn/ion-java#14
         if (myOutputForm != OutputForm.TEXT)
         {
             checkSymbol(null, 12, it.next());
@@ -994,7 +1011,7 @@ public void testWriteIVMImplicitly()
         if (myOutputForm == OutputForm.BINARY) {
             checkAnnotation(ION_SYMBOL_TABLE, it.next());
         }
-        // TODO amzn/ion-java#63
+        // TODO amzn/ion-java#14
         if (myOutputForm == OutputForm.BINARY)
         {
             checkSymbol(null, 10, it.next());
@@ -1038,7 +1055,7 @@ public void testWritingDatagram()
         if (myOutputForm != OutputForm.TEXT) {
             checkAnnotation(SystemSymbols.ION_SYMBOL_TABLE, it.next());
         }
-        // TODO amzn/ion-java#63
+        // TODO amzn/ion-java#14
         if (myOutputForm != OutputForm.TEXT)
         {
             checkSymbol(null, 10, it.next());
diff --git a/test/software/amazon/ion/streaming/SeekableReaderTest.java b/test/software/amazon/ion/streaming/SeekableReaderTest.java
index 4b4b289b63..1c73e42b8d 100644
--- a/test/software/amazon/ion/streaming/SeekableReaderTest.java
+++ b/test/software/amazon/ion/streaming/SeekableReaderTest.java
@@ -112,7 +112,7 @@ public void testWalkingBackwards()
     @Test
     public void testHoistingWithinContainers()
     {
-        read("{f:v,g:[c, (d), e], /* h */ $99:null} s");
+        read("{f:v,g:[c, (d), e], /* h */ $0:null} s");
 
         in.next();
         in.stepIn();

From 1a0af9e478004c9473774197fff7b0b157e42dab Mon Sep 17 00:00:00 2001
From: wesboyt <30701972+wesboyt@users.noreply.github.com>
Date: Mon, 17 Sep 2018 12:09:55 -0700
Subject: [PATCH 009/490] IonStructLite bugfixes (#155)

* Updated ionstructlite so fieldmap will not always result as null on construction, added a boolean hasNullField to throw correctly when a fieldname does not resolve and correctness cannot be determined.
---
 .../amazon/ion/UnknownSymbolException.java    | 13 ++++++++++++-
 .../amazon/ion/impl/lite/IonStructLite.java   | 19 +++++++------------
 test/software/amazon/ion/StructTest.java      | 17 +++++++++++++++++
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/software/amazon/ion/UnknownSymbolException.java b/src/software/amazon/ion/UnknownSymbolException.java
index becfecd654..e3cba54630 100644
--- a/src/software/amazon/ion/UnknownSymbolException.java
+++ b/src/software/amazon/ion/UnknownSymbolException.java
@@ -29,10 +29,17 @@ public class UnknownSymbolException
     private static final long serialVersionUID = 1L;
 
     private final int mySid;
+    private final String myText;
 
     public UnknownSymbolException(int sid)
     {
         mySid = sid;
+        myText = null;
+    }
+    public UnknownSymbolException(String message)
+    {
+        myText = message;
+        mySid = 0;
     }
 
     public int getSid()
@@ -43,6 +50,10 @@ public int getSid()
     @Override
     public String getMessage()
     {
-        return "Unknown symbol text for $" + mySid;
+        if(myText == null) {
+            return "Unknown symbol text for $" + mySid;
+        } else {
+            return myText;
+        }
     }
 }
diff --git a/src/software/amazon/ion/impl/lite/IonStructLite.java b/src/software/amazon/ion/impl/lite/IonStructLite.java
index 9358b273d8..8d7cb0d814 100644
--- a/src/software/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/software/amazon/ion/impl/lite/IonStructLite.java
@@ -34,6 +34,7 @@
 import software.amazon.ion.impl.PrivateCurriedValueFactory;
 import software.amazon.ion.util.Equivalence;
 import java.util.Set;
+import software.amazon.ion.UnknownSymbolException;
 
 final class IonStructLite
     extends IonContainerLite
@@ -41,7 +42,6 @@ final class IonStructLite
 {
     private static final int HASH_SIGNATURE =
         IonType.STRUCT.toString().hashCode();
-
     // TODO amzn/ion-java#41: add support for _isOrdered
 
     IonStructLite(ContainerlessContext context, boolean isNull)
@@ -54,14 +54,13 @@ private IonStructLite(IonStructLite existing, IonContext context)
         super(existing, context, true);
         // field map can be shallow cloned due to it dealing with String and Integer
         // values - both of which are immutable constructs and so safe to retain as references
-        this._field_map = null == _field_map
-                                ? null
-                                : new HashMap<String, Integer>(existing._field_map);
+        this._field_map = null == existing._field_map ? null : new HashMap<String, Integer>(existing._field_map);
         this._field_map_duplicate_count = existing._field_map_duplicate_count;
+        this.hasNullFieldName = existing.hasNullFieldName;
     }
 
     private Map<String, Integer> _field_map;
-
+    private boolean hasNullFieldName = false;
 
     public int                      _field_map_duplicate_count;
 
@@ -402,9 +401,9 @@ public IonValue get(String fieldName)
         IonValue field;
 
         if (field_idx < 0) {
+            if(hasNullFieldName) throw new UnknownSymbolException("Unable to determine whether the field exists because the struct contains field names with unknown text.");
             field = null;
-        }
-        else {
+        } else {
             field = get_child(field_idx);
         }
 
@@ -450,11 +449,6 @@ public boolean add(IonValue child)
     {
         // TODO validate in struct.setFieldName
         String text = child.getFieldNameSymbol().getText();
-        if (text != null)
-        {
-            validateFieldName(text);
-        }
-
         IonValueLite concrete = (IonValueLite) child;
         _add(text, concrete);
 
@@ -483,6 +477,7 @@ protected void handle(IonValue newValue)
      */
     private void _add(String fieldName, IonValueLite child)
     {
+        hasNullFieldName |= fieldName == null;
         int size = get_child_count();
 
         // add this to the Container child collection
diff --git a/test/software/amazon/ion/StructTest.java b/test/software/amazon/ion/StructTest.java
index 15255dbdb2..8a06144145 100644
--- a/test/software/amazon/ion/StructTest.java
+++ b/test/software/amazon/ion/StructTest.java
@@ -22,6 +22,8 @@
 import java.util.Iterator;
 import java.util.ListIterator;
 import java.util.Random;
+
+import com.sun.org.apache.bcel.internal.classfile.Unknown;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -738,6 +740,21 @@ public void testMakeNullRemovesChildsContainer()
                    val.getContainer());
     }
 
+    @Test
+    public void testUnknownSymbolException()
+    {
+        String input = "$ion_symbol_table::{imports:[{name:\"foo\", version:1, max_id:1}]} { $10: \"Unknown symbol\"}";
+        IonDatagram dg = loader().load(input);
+        IonStruct val = (IonStruct) dg.get(0);
+        try {
+            val.get("z");
+            fail("Should've thrown UnknownSymbolException");
+        } catch (UnknownSymbolException e) { }
+        try {
+            val = system().clone(val);
+        } catch (UnknownSymbolException e) { }
+    }
+
     @Test
     public void testRemoveAfterClone()
     {

From 7243a57125d341477cc2e82bf84769457cd84172 Mon Sep 17 00:00:00 2001
From: Boyett <wesboyt@amazon.com>
Date: Mon, 17 Sep 2018 12:16:03 -0700
Subject: [PATCH 010/490] Removed extraneous import.

---
 test/software/amazon/ion/StructTest.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/test/software/amazon/ion/StructTest.java b/test/software/amazon/ion/StructTest.java
index 8a06144145..7c1210d33b 100644
--- a/test/software/amazon/ion/StructTest.java
+++ b/test/software/amazon/ion/StructTest.java
@@ -22,8 +22,6 @@
 import java.util.Iterator;
 import java.util.ListIterator;
 import java.util.Random;
-
-import com.sun.org.apache.bcel.internal.classfile.Unknown;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;

From 7228e3cf343a67ad64c04a7e9aaf94b7c60baebc Mon Sep 17 00:00:00 2001
From: wesboyt <30701972+wesboyt@users.noreply.github.com>
Date: Wed, 26 Sep 2018 16:24:21 -0700
Subject: [PATCH 011/490] Updated number exceptions to indicate what the source
 of the error was. (#157)

Updated binary/hexadecimal parse exceptions to indicate what the source of the error was.
---
 .../amazon/ion/impl/IonReaderTextSystemX.java | 23 ++++++-------------
 test/software/amazon/ion/IntTest.java         |  5 +++-
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/software/amazon/ion/impl/IonReaderTextSystemX.java b/src/software/amazon/ion/impl/IonReaderTextSystemX.java
index 459a067f10..55b5a849de 100644
--- a/src/software/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextSystemX.java
@@ -41,6 +41,7 @@
 import software.amazon.ion.impl.IonTokenConstsX.CharacterSequence;
 import software.amazon.ion.impl.PrivateScalarConversions.AS_TYPE;
 import software.amazon.ion.impl.PrivateScalarConversions.CantConvertException;
+import java.lang.Character;
 
 /**
  * This reader calls the {@link IonReaderTextRawX} for low level events.
@@ -235,27 +236,17 @@ private final void load_scalar_value() throws IOException {
                     break;
                 }
             }
-        }
-        else if (token_type == IonTokenConstsX.TOKEN_HEX) {
-            boolean is_negative = (cs.charAt(0) == '-');
+        } else if (token_type == IonTokenConstsX.TOKEN_HEX || token_type == IonTokenConstsX.TOKEN_BINARY) {
+            boolean isNegative = (cs.charAt(0) == '-');
             // prefix = is_negative ? "-0x" : "0x";
-            int pos;
-            if (is_negative) {
-                pos = 1;
-            }
-            else {
-                pos = 0;
+            int pos = isNegative ? 1 : 0;
+            char caseChar = token_type == IonTokenConstsX.TOKEN_HEX ? 'x' : 'b';
+            if (cs.length() <= (isNegative ? 3 : 2) || Character.toLowerCase(cs.charAt(pos + 1)) != caseChar) {
+                parse_error("Invalid " + (caseChar == 'x' ? "hexadecimal" : "binary") + " int value.");
             }
-            assert((cs.length() > 2) && (cs.charAt(pos) == '0') && (cs.charAt(pos+1) == 'x' || cs.charAt(pos+1) == 'X'));
             cs.deleteCharAt(pos);
             cs.deleteCharAt(pos);
         }
-        else if (token_type == IonTokenConstsX.TOKEN_BINARY) {
-            boolean isNegative = (cs.charAt(0) == '-');
-            int position = isNegative ? 1 : 0;
-            cs.deleteCharAt(position);
-            cs.deleteCharAt(position);
-        }
 
 
         int          len = cs.length();
diff --git a/test/software/amazon/ion/IntTest.java b/test/software/amazon/ion/IntTest.java
index 466952c431..50d18a85bd 100644
--- a/test/software/amazon/ion/IntTest.java
+++ b/test/software/amazon/ion/IntTest.java
@@ -132,7 +132,6 @@ public void testInts()
         assertEquals(Integer.MIN_VALUE, value.intValue());
     }
 
-
     @Test
     public void testPositiveSign()
     {
@@ -243,6 +242,8 @@ public void testHexadecimal()
     {
         checkInt(-3, oneValue("-0x3"));
         checkInt(-3, oneValue("-0x0003"));
+        badValue("0x");
+        badValue("-0x");
     }
 
     @Test
@@ -293,6 +294,8 @@ public void testReadOnlyInt()
     public void testBinaryInt()
     {
         assertEquals(system().newInt(4), oneValue("0b0100"));
+        badValue("-0b");
+        badValue("0b");
     }
 
     @Test

From 88d5d45c8532f34fa7195e5ba8d205de28bd6e04 Mon Sep 17 00:00:00 2001
From: David Murray <fernomac@coronet.io>
Date: Wed, 3 Oct 2018 04:52:26 +1000
Subject: [PATCH 012/490] Fixes for compile errors when using Java 11 (#158)

* Disambiguate calls to IonSequence.toArray(null)

* Remove test dependency on javax.xml.bind.DatatypeConverter
---
 .../software/amazon/ion/SequenceTestCase.java |  2 +-
 .../amazon/ion/TrueSequenceTestCase.java      |  2 +-
 test/software/amazon/ion/impl/VarIntTest.java | 33 +++++++++++++++++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/test/software/amazon/ion/SequenceTestCase.java b/test/software/amazon/ion/SequenceTestCase.java
index 1412fe2c9b..c30e12520d 100644
--- a/test/software/amazon/ion/SequenceTestCase.java
+++ b/test/software/amazon/ion/SequenceTestCase.java
@@ -679,7 +679,7 @@ public void testToArray()
 
         try
         {
-            seq.toArray(null);
+            seq.toArray((Object[]) null);
             fail("expected exception");
         }
         catch (NullPointerException e) { }
diff --git a/test/software/amazon/ion/TrueSequenceTestCase.java b/test/software/amazon/ion/TrueSequenceTestCase.java
index 097b952729..b9d1e0bb63 100644
--- a/test/software/amazon/ion/TrueSequenceTestCase.java
+++ b/test/software/amazon/ion/TrueSequenceTestCase.java
@@ -489,7 +489,7 @@ public void testNullSequenceToArray()
 
         try
         {
-            seq.toArray(null);
+            seq.toArray((Object[]) null);
             fail("expected exception");
         }
         catch (NullPointerException e) { }
diff --git a/test/software/amazon/ion/impl/VarIntTest.java b/test/software/amazon/ion/impl/VarIntTest.java
index ae0e856cd1..d5ab77d912 100644
--- a/test/software/amazon/ion/impl/VarIntTest.java
+++ b/test/software/amazon/ion/impl/VarIntTest.java
@@ -5,7 +5,6 @@
 import software.amazon.ion.IonTestCase;
 import software.amazon.ion.system.SimpleCatalog;
 
-import javax.xml.bind.DatatypeConverter;
 import java.io.ByteArrayInputStream;
 
 public class VarIntTest extends IonTestCase {
@@ -86,11 +85,41 @@ public void readVarIntegerNegativeZero() throws Exception {
     }
 
     private IonReaderBinaryUserX makeReader(String hex) throws Exception {
-        ByteArrayInputStream input = new ByteArrayInputStream(DatatypeConverter.parseHexBinary("E00100EA" + hex));
+        ByteArrayInputStream input = new ByteArrayInputStream(parseHexBinary("E00100EA" + hex));
 
         UnifiedInputStreamX uis = UnifiedInputStreamX.makeStream(input);
         uis.skip(4);
 
         return new IonReaderBinaryUserX(new SimpleCatalog(), LocalSymbolTable.DEFAULT_LST_FACTORY, uis, 0);
     }
+
+    private static byte[] parseHexBinary(String str) {
+        int len = str.length();
+        if (len % 2 != 0) {
+            throw new IllegalArgumentException("str must have even length");
+        }
+
+        byte[] result = new byte[len / 2];
+
+        for (int i = 0; i < len; i += 2) {
+            int high = parseHexChar(str.charAt(i));
+            int low  = parseHexChar(str.charAt(i + 1));
+            result[i / 2] = (byte) ((high << 4) | low);
+        }
+
+        return result;
+    }
+
+    private static int parseHexChar(char c) {
+        if (c >= '0' && c <= '9') {
+            return c - '0';
+        }
+        if (c >= 'a' && c <= 'f') {
+            return (c - 'a') + 10;
+        }
+        if (c >= 'A' && c <= 'F') {
+            return (c - 'A') + 10;
+        }
+        throw new IllegalArgumentException("invalid hex character: " + c);
+    }
 }
\ No newline at end of file

From c4750dfbb6072e467919365636af8ca31d0f9f59 Mon Sep 17 00:00:00 2001
From: David Lurton <dlurton@users.noreply.github.com>
Date: Fri, 12 Oct 2018 13:20:46 -0700
Subject: [PATCH 013/490] Add additonal JDKs to .travis.yml, issue 164 (#166)

* Add additional JDKs to .travis.yml (#164)
---
 .travis.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9bcf99945d..0f6968597c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,10 @@
 language: java
 jdk:
+  - openjdk8
+  - openjdk9
+  - openjdk10
+  - openjdk11
   - oraclejdk8
+  - oraclejdk9
+  - oraclejdk10
+  - oraclejdk11

From db930a27f0f37ba3cc0a8cfe5cc172503cefcddd Mon Sep 17 00:00:00 2001
From: David Lurton <dlurton@users.noreply.github.com>
Date: Fri, 12 Oct 2018 13:55:18 -0700
Subject: [PATCH 014/490] Implements workaround for java.util.Date bug
 described in issue 160 (#162)

---
 src/software/amazon/ion/Timestamp.java      | 20 ++++++--
 test/software/amazon/ion/TimestampTest.java | 52 +++++++++++++++++++++
 2 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/src/software/amazon/ion/Timestamp.java b/src/software/amazon/ion/Timestamp.java
index bd036ae97e..645815488f 100644
--- a/src/software/amazon/ion/Timestamp.java
+++ b/src/software/amazon/ion/Timestamp.java
@@ -23,6 +23,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.TimeZone;
 import software.amazon.ion.impl.PrivateUtils;
 import software.amazon.ion.util.IonTextUtils;
 
@@ -276,14 +277,27 @@ private void apply_offset(int offset)
     @SuppressWarnings("deprecation")
     private void set_fields_from_millis(long millis)
     {
-        if(millis < MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS){
+        if(millis < MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS) {
             throw new IllegalArgumentException("year is less than 1");
         }
 
         Date date = new Date(millis);
 
-        // These fields are in the system timezone!
-        this._year    = checkAndCastYear(date.getYear() + 1900);
+        // https://github.com/amzn/ion-java/issues/160
+        // The java.util.Date(long) constructor expects an epoch time in milliseconds, and getYear(), getMonth(),
+        // getHour() on the resulting Date are supposed to return values adjusted to the default timezone.
+        // In Pacific Standard Time (offset -08:00), for a Date constructed with an epoch time equivalent to
+        // 0001-01-01T00:00:00.000Z, the Date.get*() methods should return values for
+        // 0000-12-31T16:00:00.000Z;  however, Date.getYear() incorrectly returns a value for year 1 (-1899)
+        // in this scenario. The following if/else block compensates for this bug:
+        int currentRawOffset = TimeZone.getDefault().getRawOffset();
+        if(currentRawOffset < 0 && MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS - currentRawOffset > millis) {
+            this._year = 0;
+        } else {
+            this._year = checkAndCastYear(date.getYear() + 1900);
+        }
+
+        // Note: date.get*() return values are in the local timezone!
         this._month   = checkAndCastMonth(date.getMonth() + 1);  // calendar months are 0 based, timestamp months are 1 based
         this._day     = checkAndCastDay(date.getDate(), _year, _month);
         this._hour    = checkAndCastHour(date.getHours());
diff --git a/test/software/amazon/ion/TimestampTest.java b/test/software/amazon/ion/TimestampTest.java
index ec55c0933a..c0017c7569 100644
--- a/test/software/amazon/ion/TimestampTest.java
+++ b/test/software/amazon/ion/TimestampTest.java
@@ -860,6 +860,58 @@ public void testNewTimestampFromLong()
         assertEquals("2010-02-01T10:11:12.340Z", ts.toZString());
     }
 
+    /**
+     * Regression test for https://github.com/amzn/ion-java/issues/160
+     */
+    @Test
+    public void testNewTimestampFromYearOneRegressionBug()
+    {
+        // This is the same as the private field Timestamp.MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS
+        final long MINIMUM_TIMESTAMP_MILLIS = -62135769600000L;
+        // This is the minimum timestamp instantiating by parsing a timestamp string,
+        // which is not effected by the `java.util.Date` bug.
+        final Timestamp MINIMUM_TIMESTAMP = Timestamp.valueOf("0001-01-01T00:00:00.000Z");
+        // Save the original timezone since we modify it below.
+        final TimeZone originalTimeZone = TimeZone.getDefault();
+
+        try {
+            // The `java.util.Date` bug has a different range of times depending on the local offset, so
+            // let's test against all time zones.
+            for (final String tzId : TimeZone.getAvailableIDs()) {
+                final TimeZone tz = TimeZone.getTimeZone(tzId);
+                TimeZone.setDefault(tz);
+
+                // The Timestamps under test must be instantiated *after* the the call to TimeZone.setDefault()
+                // since `java.util.Date` references the default TimeZone when calculating the values for its
+                // date field accessor methods (i.e. Date.get*()).
+                Timestamp minimumTimestampFromMillis = Timestamp.forMillis(MINIMUM_TIMESTAMP_MILLIS, 0);
+                assertEquals(MINIMUM_TIMESTAMP, minimumTimestampFromMillis);
+
+                // Only perform further assertions on timezones with negative offsets because positive
+                // offsets create millisecond values that are less than Timestamp.MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS
+                if (tz.getRawOffset() < 0) {
+                    // This will be the latest millisecond in which the bug with `java.util.Date` can happen
+                    Timestamp maximumTimestampWithBug =
+                        Timestamp.forMillis(MINIMUM_TIMESTAMP_MILLIS - tz.getRawOffset(), 0);
+                    assertEquals(1, maximumTimestampWithBug.getYear());
+
+                    // Test one millisecond after, just to be sure.
+                    Timestamp timestampPlusOne =
+                        Timestamp.forMillis(MINIMUM_TIMESTAMP_MILLIS - tz.getRawOffset() + 1, 0);
+                    assertEquals(1, timestampPlusOne.getYear());
+
+                    // Also test one milliscond before, just to be sure.
+                    Timestamp timestampMinusOne =
+                        Timestamp.forMillis(MINIMUM_TIMESTAMP_MILLIS - tz.getRawOffset() - 1L, 0);
+                    assertEquals(1, timestampMinusOne.getYear());
+                }
+            }
+        } finally {
+            // Have to set the TimeZone back to its original value so as not to effect other tests.
+            TimeZone.setDefault(originalTimeZone);
+        }
+    }
+
     /**
      * Test for {@link Timestamp#createFromUtcFields(Precision, int, int, int, int, int, int, BigDecimal, Integer)}
      * ensuring that varying precisions produce Timestamps as expected as per

From c653aad103e87b8be9828cbce368ac3f5aec4a65 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Fri, 19 Oct 2018 13:35:02 -0700
Subject: [PATCH 015/490] Removes oraclejdk10 from build list (#169)

Oracle JDK 10 was deprecated and fails travis builds example:
https://travis-ci.org/amzn/ion-java/jobs/442398169
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0f6968597c..cc409f79fe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,5 +6,4 @@ jdk:
   - openjdk11
   - oraclejdk8
   - oraclejdk9
-  - oraclejdk10
   - oraclejdk11

From cc146d6e672f8ad0146c1dd1a4bced50bd3640bc Mon Sep 17 00:00:00 2001
From: Hen Sapir <hensapir@amazon.com>
Date: Fri, 28 Sep 2018 15:46:18 -0700
Subject: [PATCH 016/490] Fix javadoc for some methods of Timestamp

Some Timestamp methods have incorrect javadocs due to copy/pasting.
This change fixes those javadocs.
---
 src/software/amazon/ion/Timestamp.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/software/amazon/ion/Timestamp.java b/src/software/amazon/ion/Timestamp.java
index 645815488f..89b14f0b99 100644
--- a/src/software/amazon/ion/Timestamp.java
+++ b/src/software/amazon/ion/Timestamp.java
@@ -2025,7 +2025,7 @@ private static void print_fractional_digits(Appendable out, BigDecimal value)
      * Returns a timestamp relative to this one by the given number of
      * milliseconds.
      *
-     * @param amount a (positive or negative) number of milliseconds.
+     * @param amount a number of milliseconds.
      */
     public final Timestamp addMillis(long amount)
     {
@@ -2052,7 +2052,7 @@ public final Timestamp addMillis(long amount)
     /**
      * Returns a timestamp relative to this one by the given number of seconds.
      *
-     * @param amount a (positive or negative) number of seconds.
+     * @param amount a number of seconds.
      */
     public final Timestamp addSecond(int amount)
     {
@@ -2064,7 +2064,7 @@ public final Timestamp addSecond(int amount)
     /**
      * Returns a timestamp relative to this one by the given number of minutes.
      *
-     * @param amount a (positive or negative) number of minutes.
+     * @param amount a number of minutes.
      */
     public final Timestamp addMinute(int amount)
     {
@@ -2076,7 +2076,7 @@ public final Timestamp addMinute(int amount)
     /**
      * Returns a timestamp relative to this one by the given number of hours.
      *
-     * @param amount a (positive or negative) number of hours.
+     * @param amount a number of hours.
      */
     public final Timestamp addHour(int amount)
     {
@@ -2088,7 +2088,7 @@ public final Timestamp addHour(int amount)
     /**
      * Returns a timestamp relative to this one by the given number of days.
      *
-     * @param amount a (positive or negative) number of hours.
+     * @param amount a number of days.
      */
     public final Timestamp addDay(int amount)
     {
@@ -2107,7 +2107,7 @@ public final Timestamp addDay(int amount)
      * leap days.  For example, adding one month to {@code 2011-01-31}
      * results in {@code 2011-02-28}.
      *
-     * @param amount a (positive or negative) number of hours.
+     * @param amount a number of months.
      */
     public final Timestamp addMonth(int amount)
     {
@@ -2124,7 +2124,7 @@ public final Timestamp addMonth(int amount)
      * The day field may be adjusted to account for leap days.  For example,
      * adding one year to {@code 2012-02-29} results in {@code 2013-02-28}.
      *
-     * @param amount a (positive or negative) number of hours.
+     * @param amount a number of years.
      */
     public final Timestamp addYear(int amount)
     {

From 173877e7794b9e17795c22de577339401fefe5d0 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Mon, 22 Oct 2018 16:50:17 -0700
Subject: [PATCH 017/490] Bound checking BigDecimal in Timestamp to guard
 against DoS (#161)

* Bound checking BigDecimal in Timestamp to guard against DoS

Operations that require inflating the BigDecimal can be expensive for
large exponents, examples:
* longValue
* intValue
* setScale

https://github.com/amzn/ion-java/issues/159
---
 src/software/amazon/ion/Timestamp.java      | 47 ++++++++++----
 test/software/amazon/ion/TimestampTest.java | 70 ++++++++++++++++++---
 2 files changed, 97 insertions(+), 20 deletions(-)

diff --git a/src/software/amazon/ion/Timestamp.java b/src/software/amazon/ion/Timestamp.java
index 89b14f0b99..1d668bb97c 100644
--- a/src/software/amazon/ion/Timestamp.java
+++ b/src/software/amazon/ion/Timestamp.java
@@ -84,6 +84,15 @@ public final class Timestamp
     private static final int NO_SECONDS = 0;
     private static final BigDecimal NO_FRACTIONAL_SECONDS = null;
 
+    // 0001-01-01T00:00:00.0Z in millis
+    private static final long MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS = -62135769600000L;
+
+    // 0001-01-01T00:00:00.0Z in millis
+    static final BigDecimal MINIMUM_ALLOWED_FRACTIONAL_MILLIS = new BigDecimal(MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS);
+
+    // 10000T in millis, upper bound exclusive
+    static final BigDecimal FRACTIONAL_MILLIS_UPPER_BOUND = new BigDecimal(253402300800000L);
+
     /**
      * Unknown local offset from UTC.
      */
@@ -266,9 +275,6 @@ private void apply_offset(int offset)
         }
     }
 
-    // 0001-01-01T00:00:00.0Z in millis
-    private static final long MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS = -62135769600000L;
-
     /**
      * This method uses deprecated methods from {@link java.util.Date}
      * instead of {@link Calendar} so that this code can be used (more easily)
@@ -704,7 +710,22 @@ private Timestamp(BigDecimal millis, Integer localOffset)
     {
         if (millis == null) throw new NullPointerException("millis is null");
 
-        long ms = millis.longValue();
+        // check bounds to avoid hanging when calling longValue() on decimals with large positive exponents,
+        // e.g. 1e10000000
+        if(millis.compareTo(MINIMUM_ALLOWED_FRACTIONAL_MILLIS) < 0 ||
+            FRACTIONAL_MILLIS_UPPER_BOUND.compareTo(millis) < 0) {
+            throw new IllegalArgumentException("millis: " + millis + " is outside of valid the range: from "
+                + MINIMUM_ALLOWED_FRACTIONAL_MILLIS
+                + " (0001T)"
+                + ", inclusive, to "
+                + FRACTIONAL_MILLIS_UPPER_BOUND
+                + " (10000T)"
+                + " , exclusive");
+        }
+
+        // quick handle integral zero
+        long ms = isIntegralZero(millis) ? 0 : millis.longValue();
+
         set_fields_from_millis(ms);
 
         this._precision = Precision.SECOND;
@@ -714,12 +735,19 @@ private Timestamp(BigDecimal millis, Integer localOffset)
         }
         else {
             BigDecimal secs = millis.movePointLeft(3);
-            BigDecimal secsDown = secs.setScale(0, RoundingMode.FLOOR);
+            BigDecimal secsDown = isIntegralZero(secs) ? BigDecimal.ZERO : secs.setScale(0, BigDecimal.ROUND_FLOOR);
             this._fraction = secs.subtract(secsDown);
         }
         this._offset = localOffset;
     }
 
+    private boolean isIntegralZero(final BigDecimal decimal) {
+        // zero || no low-order bits || < 1.0
+        return  decimal.signum() == 0
+            || decimal.scale() < -63
+            || (decimal.precision() - decimal.scale() <= 0);
+    }
+
     /**
      * Creates a new Timestamp that represents the point in time that is
      * {@code millis} milliseconds from the epoch, with a given local offset.
@@ -1418,7 +1446,8 @@ public long getMillis()
         //                                        month is 0 based for Date
         long millis = Date.UTC(this._year - 1900, this._month - 1, this._day, this._hour, this._minute, this._second);
         if (this._fraction != null) {
-            int frac = this._fraction.movePointRight(3).intValue();
+            BigDecimal fracAsDecimal = this._fraction.movePointRight(3);
+            int frac = isIntegralZero(fracAsDecimal) ? 0 : fracAsDecimal.intValue();
             millis += frac;
         }
         return millis;
@@ -1816,7 +1845,6 @@ public String toString()
         return buffer.toString();
     }
 
-
     /**
      * Returns the string representation (in Ion format) of this Timestamp
      * in UTC.
@@ -1834,12 +1862,11 @@ public String toZString()
         catch (IOException e)
         {
             throw new RuntimeException("Exception printing to StringBuilder",
-                                       e);
+                e);
         }
         return buffer.toString();
     }
 
-
     /**
      * Prints to an {@code Appendable} the string representation (in Ion format)
      * of this Timestamp in its local time.
@@ -1868,7 +1895,6 @@ public void print(Appendable out)
         print(out, adjusted);
     }
 
-
     /**
      * Prints to an {@code Appendable} the string representation (in Ion format)
      * of this Timestamp in UTC.
@@ -1906,7 +1932,6 @@ public void printZ(Appendable out)
         }
     }
 
-
     /**
      * helper for print(out) and printZ(out) so that printZ can create
      * a zulu time and pass it directly and print can apply the local
diff --git a/test/software/amazon/ion/TimestampTest.java b/test/software/amazon/ion/TimestampTest.java
index c0017c7569..28bffb87f7 100644
--- a/test/software/amazon/ion/TimestampTest.java
+++ b/test/software/amazon/ion/TimestampTest.java
@@ -16,6 +16,8 @@
 
 import static software.amazon.ion.Decimal.NEGATIVE_ZERO;
 import static software.amazon.ion.Decimal.negativeZero;
+import static software.amazon.ion.Timestamp.FRACTIONAL_MILLIS_UPPER_BOUND;
+import static software.amazon.ion.Timestamp.MINIMUM_ALLOWED_FRACTIONAL_MILLIS;
 import static software.amazon.ion.Timestamp.UNKNOWN_OFFSET;
 import static software.amazon.ion.Timestamp.UTC_OFFSET;
 import static software.amazon.ion.Timestamp.createFromUtcFields;
@@ -26,19 +28,17 @@
 import static software.amazon.ion.Timestamp.Precision.YEAR;
 import static software.amazon.ion.impl.PrivateUtils.UTC;
 
+import java.io.IOException;
 import java.math.BigDecimal;
+import java.sql.Time;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.TimeZone;
+import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.Timestamp;
 import software.amazon.ion.Timestamp.Precision;
 
 /**
@@ -781,12 +781,47 @@ public void testNewTimestampFromBigDecimal()
         assertEquals("2012-01-01T12:12:30.555123Z", ts.toZString());
     }
 
+    @Test
+    @Ignore // see https://github.com/amzn/ion-java/issues/160
+    public void testNewTimestampFromMinimumAllowedMillis()
+    {
+        Timestamp ts = Timestamp.forMillis(MINIMUM_ALLOWED_FRACTIONAL_MILLIS, PST_OFFSET);
+        assertEquals("0001-01-01T00:00:00.000Z", ts.toZString());
+    }
+
+    @Test
+    public void testNewTimestampFromBigDecimalWithMaximumAllowedMillis()
+    {
+        Timestamp ts = Timestamp.forMillis(FRACTIONAL_MILLIS_UPPER_BOUND.add(BigDecimal.ONE.negate()), PST_OFFSET);
+        checkFields(9999, 12, 31, 15, 59, 59, new BigDecimal("0.999"), PST_OFFSET, SECOND, ts);
+        assertEquals("9999-12-31T15:59:59.999-08:00", ts.toString());
+        assertEquals("9999-12-31T23:59:59.999Z", ts.toZString());
+    }
 
-    @SuppressWarnings("unused")
-    @Test (expected = NullPointerException.class)
+    @Test(expected = NullPointerException.class)
     public void testNewTimestampFromBigDecimalWithNull()
     {
-        Timestamp ts = Timestamp.forMillis(null, PST_OFFSET);
+        Timestamp.forMillis(null, PST_OFFSET);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNewTimestampFromBigDecimalWithMillisTooSmall()
+    {
+        // MIN - 1
+        Timestamp.forMillis(MINIMUM_ALLOWED_FRACTIONAL_MILLIS.add(BigDecimal.ONE.negate()), PST_OFFSET);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNewTimestampFromBigDecimalWithMillisTooBig()
+    {
+        // Max
+        Timestamp.forMillis(FRACTIONAL_MILLIS_UPPER_BOUND, PST_OFFSET);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNewTimestampFromBigDecimalWithScaleTooBigPositive()
+    {
+        Timestamp.forMillis(new BigDecimal("1e100000"), PST_OFFSET);
     }
 
     /**
@@ -2307,4 +2342,21 @@ public void forCalendarRejectsLargeYear()
         Timestamp t = Timestamp.forCalendar(cal);
         assertEquals(year, t.getYear());
     }
+
+    // High scale timeout tests
+
+    // max scale permitted by BigDecimal from the String constructor
+    private static BigDecimal LARGE_SCALE_DECIMAL = new BigDecimal("1e-1000000000");
+
+    @Test(timeout = 50L)
+    public void testForMillisWithLargeScaleBigDecimal()
+    {
+        Timestamp ts = Timestamp.forMillis(LARGE_SCALE_DECIMAL, PST_OFFSET);
+    }
+
+    @Test(timeout = 50L)
+    public void testGetMillisWithLargeScaleBigDecimal()
+    {
+        Timestamp.forMillis(LARGE_SCALE_DECIMAL, PST_OFFSET).getMillis();
+    }
 }

From 7d6156525968cac7bbc965f0db98cf6983ed91a7 Mon Sep 17 00:00:00 2001
From: barbosf <barbosf@amazon.com>
Date: Tue, 23 Oct 2018 18:50:18 -0700
Subject: [PATCH 018/490] Fixing fraction calculation logic

Correctly floors negative big decimals with a fast path for numbers
close to zero

Was broken by the DoS prevention fix.
---
 src/software/amazon/ion/Timestamp.java      | 8 +++++++-
 test/software/amazon/ion/TimestampTest.java | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/software/amazon/ion/Timestamp.java b/src/software/amazon/ion/Timestamp.java
index 1d668bb97c..cff8412eac 100644
--- a/src/software/amazon/ion/Timestamp.java
+++ b/src/software/amazon/ion/Timestamp.java
@@ -735,12 +735,18 @@ private Timestamp(BigDecimal millis, Integer localOffset)
         }
         else {
             BigDecimal secs = millis.movePointLeft(3);
-            BigDecimal secsDown = isIntegralZero(secs) ? BigDecimal.ZERO : secs.setScale(0, BigDecimal.ROUND_FLOOR);
+            BigDecimal secsDown = fastRoundZeroFloor(secs);
             this._fraction = secs.subtract(secsDown);
         }
         this._offset = localOffset;
     }
 
+    private BigDecimal fastRoundZeroFloor(final BigDecimal decimal) {
+        BigDecimal fastValue = decimal.signum() < 0 ? BigDecimal.ONE.negate() : BigDecimal.ZERO;
+
+        return isIntegralZero(decimal) ? fastValue : decimal.setScale(0, RoundingMode.FLOOR);
+    }
+
     private boolean isIntegralZero(final BigDecimal decimal) {
         // zero || no low-order bits || < 1.0
         return  decimal.signum() == 0
diff --git a/test/software/amazon/ion/TimestampTest.java b/test/software/amazon/ion/TimestampTest.java
index 28bffb87f7..5ca81e707b 100644
--- a/test/software/amazon/ion/TimestampTest.java
+++ b/test/software/amazon/ion/TimestampTest.java
@@ -781,6 +781,13 @@ public void testNewTimestampFromBigDecimal()
         assertEquals("2012-01-01T12:12:30.555123Z", ts.toZString());
     }
 
+    @Test
+    public void testForMillisWithNegativeMilli()
+    {
+        Timestamp ts = Timestamp.forMillis(BigDecimal.valueOf(-1), 0);
+        assertEquals("1969-12-31T23:59:59.999Z", ts.toZString());
+    }
+
     @Test
     @Ignore // see https://github.com/amzn/ion-java/issues/160
     public void testNewTimestampFromMinimumAllowedMillis()

From 9a567e2a01c06a0abb02dc038fce88e070749d48 Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Fri, 26 Oct 2018 12:29:24 -0400
Subject: [PATCH 019/490] WriteBuffer truncation fix (#171)

---
 src/software/amazon/ion/impl/bin/WriteBuffer.java      | 5 +++--
 test/software/amazon/ion/impl/bin/WriteBufferTest.java | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/software/amazon/ion/impl/bin/WriteBuffer.java b/src/software/amazon/ion/impl/bin/WriteBuffer.java
index 34ef9fbc07..b5ddb05b72 100644
--- a/src/software/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/software/amazon/ion/impl/bin/WriteBuffer.java
@@ -1071,9 +1071,10 @@ public void writeUInt8At(final long position, final long value)
     /** Write the entire buffer to output stream. */
     public void writeTo(final OutputStream out) throws IOException
     {
-        for (final Block block : blocks)
+        for (int i = 0; i <= index; i++)
         {
-            out.write(block.data, 0, block.limit);
+	    Block block = blocks.get(i);
+	    out.write(block.data, 0, block.limit);
         }
     }
 
diff --git a/test/software/amazon/ion/impl/bin/WriteBufferTest.java b/test/software/amazon/ion/impl/bin/WriteBufferTest.java
index e5386c9272..8c200e9c04 100644
--- a/test/software/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/test/software/amazon/ion/impl/bin/WriteBufferTest.java
@@ -915,4 +915,12 @@ public void testBytes() throws IOException
         buf.writeBytes("DOO".getBytes("UTF-8"));
         assertBuffer("ARGLEFOOBARGLEDOO".getBytes("UTF-8"));
     }
+
+    @Test
+    public void testTruncate() throws IOException
+    {
+        buf.writeBytes("ARGLEFOOBARGLEDOO".getBytes("UTF-8"));
+        buf.truncate(3);
+        assertBuffer("ARG".getBytes("UTF-8"));
+    }
 }

From 39a5b56bca48ae63bfd1776443acc6eb69bf46ed Mon Sep 17 00:00:00 2001
From: Peter Cornell <pcornell@amazon.com>
Date: Wed, 31 Oct 2018 12:52:45 -0700
Subject: [PATCH 020/490] Avoids calling WriteBuffer.finish() if the writer is
 closed (#175)

---
 src/software/amazon/ion/impl/bin/IonRawBinaryWriter.java | 6 +++++-
 .../amazon/ion/impl/bin/IonRawBinaryWriterTest.java      | 9 +++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/software/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/software/amazon/ion/impl/bin/IonRawBinaryWriter.java
index ae3e7bf4b7..b8e13d68aa 100644
--- a/src/software/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/software/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -1432,6 +1432,10 @@ public void flush() throws IOException {}
 
     public void finish() throws IOException
     {
+        if (closed)
+        {
+            return;
+        }
         if (!containers.isEmpty())
         {
             throw new IllegalStateException("Cannot finish within container: " + containers);
@@ -1478,7 +1482,6 @@ public void close() throws IOException
         {
             return;
         }
-        closed = true;
         try
         {
             try
@@ -1497,6 +1500,7 @@ public void close() throws IOException
         }
         finally
         {
+            closed = true;
             if (streamCloseMode == StreamCloseMode.CLOSE)
             {
                 // release the stream
diff --git a/test/software/amazon/ion/impl/bin/IonRawBinaryWriterTest.java b/test/software/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
index 909681de44..33745b978e 100644
--- a/test/software/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
+++ b/test/software/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
@@ -179,6 +179,15 @@ public NullDesc(final IonType type, final String literal)
         new NullDesc(STRUCT,    "null.struct")
     };
 
+    @Test
+    public void testFinishOnClose() throws IOException
+    {
+        // verify data is flushed if a writer is closed prior to calling finish()
+        writer.writeNull();
+        writer.close();
+        assertValue("null.null");
+    }
+
     @Test
     public void testNullNull() throws Exception
     {

From 14a1d37e955b44ce5e0e5a6ecfaff8d358cb23e5 Mon Sep 17 00:00:00 2001
From: Peter Cornell <pcornell@amazon.com>
Date: Wed, 31 Oct 2018 13:47:40 -0700
Subject: [PATCH 021/490] miscellaneous javadoc cleanup (#177)

---
 src/software/amazon/ion/IonLoader.java                 |  2 +-
 src/software/amazon/ion/IonSequence.java               |  8 ++++----
 src/software/amazon/ion/IonValue.java                  |  8 ++++----
 src/software/amazon/ion/Timestamp.java                 | 10 +++++-----
 .../amazon/ion/system/IonBinaryWriterBuilder.java      |  3 ---
 src/software/amazon/ion/util/Equivalence.java          |  2 --
 6 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/software/amazon/ion/IonLoader.java b/src/software/amazon/ion/IonLoader.java
index 147997f359..9b6e7819c5 100644
--- a/src/software/amazon/ion/IonLoader.java
+++ b/src/software/amazon/ion/IonLoader.java
@@ -127,7 +127,7 @@ public IonDatagram load(byte[] ionData)
     /**
      * Loads an entire stream of Ion data into a single datagram,
      * detecting whether it's text or binary data.
-     * <p/>
+     * <p>
      * The specified stream remains open after this method returns.
      * <p>
      * This method will auto-detect and uncompress GZIPped Ion data.
diff --git a/src/software/amazon/ion/IonSequence.java b/src/software/amazon/ion/IonSequence.java
index 68816412a1..378d9dc261 100644
--- a/src/software/amazon/ion/IonSequence.java
+++ b/src/software/amazon/ion/IonSequence.java
@@ -60,7 +60,7 @@ public interface IonSequence
      * @return the element at the given index; not <code>null</code>.
      * @throws NullValueException if {@link #isNullValue()}.
      * @throws IndexOutOfBoundsException if the index is out of range
-     * (<code>index < 0 || index >= size()</code>).
+     * (<code>index &lt; 0 || index &gt;= size()</code>).
      */
     public IonValue get(int index)
         throws NullValueException, IndexOutOfBoundsException;
@@ -113,7 +113,7 @@ public boolean add(IonValue child)
      * @throws IllegalArgumentException
      *   if {@code child} is an {@link IonDatagram}.
      * @throws IndexOutOfBoundsException if the index is out of range
-     * (index < 0 || index > size()).
+     * (index &lt; 0 || index &gt; size()).
      */
     public void add(int index, IonValue child)
         throws ContainedValueException, NullPointerException;
@@ -169,7 +169,7 @@ public void add(int index, IonValue child)
      * @return the element previously at the specified position.
      *
      * @throws IndexOutOfBoundsException if the index is out of range
-     * (index < 0 || index >= size()).
+     * (index &lt; 0 || index &gt;= size()).
      */
     public IonValue remove(int index);
 
@@ -357,7 +357,7 @@ public void add(int index, IonValue child)
      * @throws ContainedValueException
      * if one of the elements is already contained by an {@link IonContainer}.
      * @throws IndexOutOfBoundsException
-     * if the index is out of range (index < 0 || index > size()).
+     * if the index is out of range (index &lt; 0 || index &gt; size()).
      */
     public boolean addAll(int index, Collection<? extends IonValue> c);
 
diff --git a/src/software/amazon/ion/IonValue.java b/src/software/amazon/ion/IonValue.java
index 3159df19a8..d22a58ed43 100644
--- a/src/software/amazon/ion/IonValue.java
+++ b/src/software/amazon/ion/IonValue.java
@@ -434,10 +434,10 @@ public IonValue clone()
      * {@link IonString} or {@link IonSymbol}!
      * Use {@link IonText#stringValue()} for that purpose.
      * <pre>
-     *    ionSystem.newString("Levi's").toString()     =>  "\"Levi's\""
-     *    ionSystem.newString("Levi's").stringValue()  =>  "Levi's"
-     *    ionSystem.newSymbol("Levi's").toString()     =>  "'Levi\\'s'"
-     *    ionSystem.newSymbol("Levi's").stringValue()  =>  "Levi's"
+     *    ionSystem.newString("Levi's").toString()     =&gt;  "\"Levi's\""
+     *    ionSystem.newString("Levi's").stringValue()  =&gt;  "Levi's"
+     *    ionSystem.newSymbol("Levi's").toString()     =&gt;  "'Levi\\'s'"
+     *    ionSystem.newSymbol("Levi's").stringValue()  =&gt;  "Levi's"
      * </pre>
      *
      * @return Ion text data equivalent to this value.
diff --git a/src/software/amazon/ion/Timestamp.java b/src/software/amazon/ion/Timestamp.java
index cff8412eac..7d504fd47a 100644
--- a/src/software/amazon/ion/Timestamp.java
+++ b/src/software/amazon/ion/Timestamp.java
@@ -40,7 +40,7 @@
  * as the start of the new year/month/day.
  *
  *
- * <h4>Equality and Comparison</h4>
+ * <h3>Equality and Comparison</h3>
  *
  * As with {@link IonValue} classes, the {@link #equals equals} methods on this class
  * perform a strict equivalence that observes the precision and local offset
@@ -544,7 +544,7 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
      *</pre>
      * Note: All of these resulting Timestamps have the similar value (in UTC) 2012-02-03T04:05:06.007Z.
      *
-     * <h4>Precision "Narrowing"</h4>
+     * <h3>Precision "Narrowing"</h3>
      *
      * <p>
      * Any time component that is more precise
@@ -2226,10 +2226,10 @@ public int hashCode()
      *
      * <p>
      * This method is provided in preference to individual methods for each of
-     * the six boolean comparison operators (<, ==, >, >=, !=, <=).
+     * the six boolean comparison operators (&lt;, ==, &gt;, &gt;=, !=, &lt;=).
      * The suggested idiom for performing these comparisons is:
-     * {@code (x.compareTo(y)}<em>&lt;op></em>{@code 0)},
-     * where <em>&lt;op></em> is one of the six comparison operators.
+     * {@code (x.compareTo(y)}<em>&lt;op&gt;</em>{@code 0)},
+     * where <em>&lt;op&gt;</em> is one of the six comparison operators.
      *
      * <p>
      * For example, the pairs below will return a {@code 0} result:
diff --git a/src/software/amazon/ion/system/IonBinaryWriterBuilder.java b/src/software/amazon/ion/system/IonBinaryWriterBuilder.java
index 6ffc6a5a0c..eddc25b362 100644
--- a/src/software/amazon/ion/system/IonBinaryWriterBuilder.java
+++ b/src/software/amazon/ion/system/IonBinaryWriterBuilder.java
@@ -221,9 +221,6 @@ public IvmMinimizing getIvmMinimizing()
      * regardless of value. This is the legacy behavior for all Ion binary
      * writers and ensures the boarded compatibility with other Ion consumers.
      *
-     * @param enabled {@code true} to enable writing 4-byte floats,
-     * {@code false} to always write 8-byte floats.
-     *
      * @see IonBinaryWriterBuilder#setIsFloatBinary32Enabled(boolean)
      * @see IonBinaryWriterBuilder#withFloatBinary32Enabled
      */
diff --git a/src/software/amazon/ion/util/Equivalence.java b/src/software/amazon/ion/util/Equivalence.java
index 8e93ac787f..644225ddc0 100644
--- a/src/software/amazon/ion/util/Equivalence.java
+++ b/src/software/amazon/ion/util/Equivalence.java
@@ -59,8 +59,6 @@
  *    boolean equivalent = ionEquals( v1, v2 );
  *</pre>
  *
- * </p>
- *
  * <p>
  * <h3>Ion Equivalence</h3>
  * In order to make Ion a useful model to describe data, we must first define

From 400f681b5d4d553d0c94efb3c53bab6604d66ec4 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <barbosf@amazon.com>
Date: Fri, 9 Nov 2018 13:59:53 -0800
Subject: [PATCH 022/490] Fixing javadoc badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 04cb20b202..18c5f78708 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ A Java implementation of the [Ion data notation](http://amzn.github.io/ion-docs)
 
 [![Build Status](https://travis-ci.org/amzn/ion-java.svg?branch=master)](https://travis-ci.org/amzn/ion-java)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/software.amazon.ion/ion-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/software.amazon.ion/ion-java)
-[![Javadoc](https://javadoc-emblem.rhcloud.com/doc/software.amazon.ion/ion-java/badge.svg)](http://www.javadoc.io/doc/software.amazon.ion/ion-java)
+[![Javadoc](https://javadoc-badge.appspot.com/software.amazon.ion/ion-java.svg?label=javadoc)](http://www.javadoc.io/doc/software.amazon.ion/ion-java)
 
 ## Setup
 This repository contains a [git submodule](https://git-scm.com/docs/git-submodule)

From 1db8c657ce88f20c82228d920b6787a27ace8ecc Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Mon, 3 Dec 2018 15:35:28 -0800
Subject: [PATCH 023/490] Removes unnecessary synchronization from
 IonSystemLite.getLoader.

---
 src/software/amazon/ion/impl/lite/IonSystemLite.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/software/amazon/ion/impl/lite/IonSystemLite.java b/src/software/amazon/ion/impl/lite/IonSystemLite.java
index d7e94b36eb..ff74dd44ee 100644
--- a/src/software/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/software/amazon/ion/impl/lite/IonSystemLite.java
@@ -140,7 +140,7 @@ public IonCatalog getCatalog()
         return _catalog;
     }
 
-    public synchronized IonLoader getLoader()
+    public IonLoader getLoader()
     {
         return _loader;
     }

From 741556070b0518eb8f1a937ff77d4b966c028914 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Mon, 10 Dec 2018 13:10:08 -0800
Subject: [PATCH 024/490] Throwing for negative zero in binary (#182)

https://github.com/amzn/ion-java/issues/138

Spec: http://amzn.github.io/ion-docs/docs/binary.html#2-and-3-int
---
 .../amazon/ion/impl/IonReaderBinarySystemX.java   | 15 +++++++++++++--
 test/software/amazon/ion/TestUtils.java           |  2 --
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/software/amazon/ion/impl/IonReaderBinarySystemX.java b/src/software/amazon/ion/impl/IonReaderBinarySystemX.java
index 27b9900d48..f28361e7e8 100644
--- a/src/software/amazon/ion/impl/IonReaderBinarySystemX.java
+++ b/src/software/amazon/ion/impl/IonReaderBinarySystemX.java
@@ -180,14 +180,19 @@ private final void load_scalar_value() throws IOException
             _v.setAuthoritativeType(AS_TYPE.boolean_value);
             break;
         case INT:
+            boolean is_negative = _value_tid == PrivateIonConstants.tidNegInt;
+
             if (_value_len == 0) {
+                if (is_negative) {
+                    throwIllegalNegativeZeroException();
+                }
+
                 int v = 0;
                 _v.setValue(v);
                 _v.setAuthoritativeType(AS_TYPE.int_value);
             }
             else if (_value_len <= Long.BYTES) {
                 long v = readULong(_value_len);
-                boolean is_negative = _value_tid == PrivateIonConstants.tidNegInt;
 
                 if (v < 0) {
                     // we probably can't fit this magnitude properly into a Java long
@@ -205,6 +210,9 @@ else if (_value_len <= Long.BYTES) {
                 }
                 else {
                     if (is_negative) {
+                        if(v == 0) {
+                            throwIllegalNegativeZeroException();
+                        }
                         v = -v;
                     }
                     if (v < Integer.MIN_VALUE || v > Integer.MAX_VALUE) {
@@ -217,7 +225,6 @@ else if (_value_len <= Long.BYTES) {
                 }
             }
             else {
-                boolean is_negative = (_value_tid == PrivateIonConstants.tidNegInt);
                 BigInteger v = readBigInteger(_value_len, is_negative);
                 _v.setValue(v);
                 _v.setAuthoritativeType(AS_TYPE.bigInteger_value);
@@ -482,4 +489,8 @@ public SymbolTable pop_passed_symbol_table()
     {
         return null;
     }
+
+    private void throwIllegalNegativeZeroException() {
+        throw newErrorAt("negative zero is illegal in the binary format");
+    }
 }
diff --git a/test/software/amazon/ion/TestUtils.java b/test/software/amazon/ion/TestUtils.java
index ba7cad7503..f76b96d771 100644
--- a/test/software/amazon/ion/TestUtils.java
+++ b/test/software/amazon/ion/TestUtils.java
@@ -144,8 +144,6 @@ public boolean accept(File dir, String name)
             , "good/utf16.ion"                              // TODO amzn/ion-java#61
             , "good/utf32.ion"                              // TODO amzn/ion-java#61
             , "good/whitespace.ion"                         // TODO amzn/ion-java#104
-            , "bad/negativeIntZero.10n"                     // TODO amzn/ion-java#138
-            , "bad/negativeIntZeroLn.10n"                   // TODO amzn/ion-java#138
             , "good/item1.10n"                              // TODO amzn/ion-java#126 (roundtrip symbols with unknown text)
         );
 

From b7c13ad308f049eee5414e9e851c4536a1fc16e5 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Mon, 10 Dec 2018 14:22:50 -0800
Subject: [PATCH 025/490] IonSequenceLite#retainAll javadoc fix and tests
 (#181)

* Removes retainAll from IonDatagram interface

Interface and implementation are inherited from IonSequence and
IonSequenceLite respectively so no need to have it in the IonDatagram
interface

* IonSequenceLite#retailAll tests

Adding tests to IonSequenceLite#retainAll and subclasses
---
 src/software/amazon/ion/IonDatagram.java      | 13 ----
 .../impl/lite/BaseIonSequenceLiteTest.java    | 67 +++++++++++++++++++
 .../ion/impl/lite/IonDatagramLiteTest.java    | 10 +++
 .../amazon/ion/impl/lite/IonListLiteTest.java | 10 +++
 .../amazon/ion/impl/lite/IonSexpLiteTest.java | 10 +++
 5 files changed, 97 insertions(+), 13 deletions(-)
 create mode 100644 test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTest.java
 create mode 100644 test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
 create mode 100644 test/software/amazon/ion/impl/lite/IonListLiteTest.java
 create mode 100644 test/software/amazon/ion/impl/lite/IonSexpLiteTest.java

diff --git a/src/software/amazon/ion/IonDatagram.java b/src/software/amazon/ion/IonDatagram.java
index 747390f443..fad4c6ce62 100644
--- a/src/software/amazon/ion/IonDatagram.java
+++ b/src/software/amazon/ion/IonDatagram.java
@@ -238,19 +238,6 @@ public int getBytes(OutputStream out)
      */
     public void makeNull();
 
-
-    /**
-     * This inherited method is not yet supported by datagrams.
-     * <p>
-     * Vote for SIM issue amzn/ion-java#49 if you need this.
-     *
-     * @throws UnsupportedOperationException at every call.
-     *
-     * @see <a href="https://github.com/amzn/ion-java/issues/49">amzn/ion-java#49</a>
-     */
-    public boolean retainAll(Collection<?> c);
-
-
     public IonDatagram clone()
         throws UnknownSymbolException;
 }
diff --git a/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTest.java b/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTest.java
new file mode 100644
index 0000000000..e0614b3e37
--- /dev/null
+++ b/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTest.java
@@ -0,0 +1,67 @@
+package software.amazon.ion.impl.lite;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import org.junit.Test;
+import software.amazon.ion.IonSequence;
+import software.amazon.ion.IonSystem;
+import software.amazon.ion.IonValue;
+import software.amazon.ion.ReadOnlyValueException;
+import software.amazon.ion.system.IonSystemBuilder;
+
+public abstract class BaseIonSequenceLiteTest {
+
+    protected static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
+
+    protected abstract IonSequence newEmptySequence();
+
+    @Test
+    public void retainAll() {
+        final IonSequence sequence = newEmptySequence();
+        final ArrayList<IonValue> toRetain = new ArrayList<IonValue>();
+
+        final IonValue retainedValue = SYSTEM.newInt(1);
+        sequence.add(retainedValue);
+        toRetain.add(retainedValue);
+
+        final IonValue toRemoveValue = SYSTEM.newInt(2);
+        sequence.add(toRemoveValue);
+
+        assertTrue(sequence.retainAll(toRetain));
+
+        assertEquals(1, sequence.size());
+        assertTrue(sequence.contains(retainedValue));
+        assertFalse(sequence.contains(toRemoveValue));
+    }
+
+    @Test
+    public void retainAllUsesReferenceEquality() {
+        final IonSequence sequence = newEmptySequence();
+        final ArrayList<IonValue> toRetain = new ArrayList<IonValue>();
+
+        final IonValue value = SYSTEM.newInt(1);
+        sequence.add(value);
+
+        final IonValue equalValue = SYSTEM.newInt(1);
+        toRetain.add(equalValue);
+
+        assertEquals(equalValue, value);
+        assertNotSame(equalValue, value);
+
+        assertTrue(sequence.retainAll(toRetain));
+        assertEquals(0, sequence.size());
+    }
+
+    @Test(expected = ReadOnlyValueException.class)
+    public void retainAllReadOnly() {
+        final IonSequence sequence = newEmptySequence();
+        sequence.makeReadOnly();
+
+        sequence.retainAll(Collections.emptyList());
+    }
+}
\ No newline at end of file
diff --git a/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java b/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
new file mode 100644
index 0000000000..45af7a15d0
--- /dev/null
+++ b/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
@@ -0,0 +1,10 @@
+package software.amazon.ion.impl.lite;
+
+import software.amazon.ion.IonSequence;
+
+public class IonDatagramLiteTest extends BaseIonSequenceLiteTest {
+    @Override
+    protected IonSequence newEmptySequence() {
+        return SYSTEM.newDatagram();
+    }
+}
diff --git a/test/software/amazon/ion/impl/lite/IonListLiteTest.java b/test/software/amazon/ion/impl/lite/IonListLiteTest.java
new file mode 100644
index 0000000000..ee5b48c980
--- /dev/null
+++ b/test/software/amazon/ion/impl/lite/IonListLiteTest.java
@@ -0,0 +1,10 @@
+package software.amazon.ion.impl.lite;
+
+import software.amazon.ion.IonSequence;
+
+public class IonListLiteTest extends BaseIonSequenceLiteTest {
+    @Override
+    protected IonSequence newEmptySequence() {
+        return SYSTEM.newEmptyList();
+    }
+}
diff --git a/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java b/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java
new file mode 100644
index 0000000000..56528bcd57
--- /dev/null
+++ b/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java
@@ -0,0 +1,10 @@
+package software.amazon.ion.impl.lite;
+
+import software.amazon.ion.IonSequence;
+
+public class IonSexpLiteTest extends BaseIonSequenceLiteTest {
+    @Override
+    protected IonSequence newEmptySequence() {
+        return SYSTEM.newEmptySexp();
+    }
+}

From d014ffc85b12182a22e808c430080636d093daac Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Tue, 11 Dec 2018 13:46:58 -0800
Subject: [PATCH 026/490] (Build) Adds codecoverage (#183)

* (DOCS) remove callouts to empty symbol/field being disallowed

* Adds coverage reports

* Adds gitignore and removes idea file

* Fix JaCoCo breaking Travis
---
 .gitignore | 257 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 pom.xml    |  59 ++++++++++--
 2 files changed, 307 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index d20bced0a4..708300db93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,260 @@ tmp*
 /target
 /resources
 *~
+
+# Created by https://www.gitignore.io/api/vim,emacs,maven,gradle,eclipse,intellij
+# Edit at https://www.gitignore.io/?templates=vim,emacs,maven,gradle,eclipse,intellij
+
+### Eclipse ###
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+### Eclipse Patch ###
+# Eclipse Core
+.project
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Annotation Processing
+.apt_generated
+
+.sts4-cache/
+
+### Emacs ###
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+# Org-mode
+.org-id-locations
+*_archive
+
+# flymake-mode
+*_flymake.*
+
+# eshell files
+/eshell/history
+/eshell/lastdir
+
+# elpa packages
+/elpa/
+
+# reftex files
+*.rel
+
+# AUCTeX auto folder
+/auto/
+
+# cask packages
+.cask/
+dist/
+
+# Flycheck
+flycheck_*.el
+
+# server auth directory
+/server/
+
+# projectiles files
+.projectile
+
+# directory configuration
+.dir-locals.el
+
+# network security
+/network-security.data
+
+
+### Intellij ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+.idea 
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Intellij Patch ###
+# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+
+# *.iml
+# modules.xml
+# .idea/misc.xml
+# *.ipr
+
+# Sonarlint plugin
+.idea/sonarlint
+
+### Maven ###
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
+
+### Vim ###
+# Swap
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+
+# Session
+Session.vim
+
+# Temporary
+.netrwhist
+# Auto-generated tag files
+tags
+# Persistent undo
+[._]*.un~
+
+### Gradle ###
+.gradle
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+### Gradle Patch ###
+**/build/
+
+# End of https://www.gitignore.io/api/vim,emacs,maven,gradle,eclipse,intellij
+
diff --git a/pom.xml b/pom.xml
index 9c2203e472..defe6f67e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
           <excludes>
             <exclude>**/*TestCase.java</exclude>
           </excludes>
-          <argLine>-ea -Xmx3000M</argLine>
+          <argLine>-ea -Xmx3000M ${argLine}</argLine>
         </configuration>
       </plugin>
       <plugin>
@@ -124,6 +124,43 @@
           </instructions>
         </configuration>
       </plugin>
+      <!-- Code Coverage -->
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.2</version>
+        <executions>
+          <execution>
+            <id>default-prepare-agent</id>
+            <goals>
+              <goal>prepare-agent</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>default-report</id>
+            <phase>test</phase>
+            <goals>
+              <goal>report</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>default-check</id>
+            <goals>
+              <goal>check</goal>
+            </goals>
+            <configuration>
+              <rules>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Static Site generation with all reports -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.7.1</version>
+      </plugin>
       <!-- TODO findbugs, checkstyle -->
     </plugins>
   </build>
@@ -131,15 +168,19 @@
   <reporting>
     <plugins>
       <plugin>
-        <!-- TODO replace with coverage report? -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.19.1</version>
-        <configuration>
-          <outputName>test-report</outputName>
-          <showSuccess>false</showSuccess>
-        </configuration>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+        <version>0.8.2</version>
+        <reportSets>
+          <reportSet>
+            <reports>
+              <!-- select non-aggregate reports -->
+              <report>report</report>
+            </reports>
+          </reportSet>
+        </reportSets>
       </plugin>
+
       <plugin>
         <!-- Generate the Javadocs. -->
         <groupId>org.apache.maven.plugins</groupId>

From 39c9e823db5804345b67bbc216b3d54197031477 Mon Sep 17 00:00:00 2001
From: Peter Cornell <pcornell@amazon.com>
Date: Tue, 11 Dec 2018 18:00:59 -0800
Subject: [PATCH 027/490] Ignores pseudo-IVMs as expected by the specification
 (#184)

---
 src/software/amazon/ion/impl/IonReaderTextRawX.java  | 2 +-
 src/software/amazon/ion/impl/IonReaderTextUserX.java | 7 +++++--
 test/software/amazon/ion/TestUtils.java              | 1 -
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/software/amazon/ion/impl/IonReaderTextRawX.java b/src/software/amazon/ion/impl/IonReaderTextRawX.java
index 8a4e633755..57715b85cb 100644
--- a/src/software/amazon/ion/impl/IonReaderTextRawX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextRawX.java
@@ -944,7 +944,7 @@ protected final void parse_to_next_value() throws IOException
             case ACTION_LOAD_SCALAR:
                 if (t == IonTokenConstsX.TOKEN_SYMBOL_IDENTIFIER) {
                     sb = token_contents_load(t);
-                    int _value_keyword = IonTokenConstsX.keyword(sb, 0, sb.length());
+                    _value_keyword = IonTokenConstsX.keyword(sb, 0, sb.length());
                     switch (_value_keyword) {
                     case IonTokenConstsX.KEYWORD_NULL:
                     {
diff --git a/src/software/amazon/ion/impl/IonReaderTextUserX.java b/src/software/amazon/ion/impl/IonReaderTextUserX.java
index 64fa372ac8..b1dfc8d5a4 100644
--- a/src/software/amazon/ion/impl/IonReaderTextUserX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextUserX.java
@@ -146,8 +146,11 @@ private final boolean has_next_user_value()
                         {
                             if (ION_1_0.equals(version))
                             {
-                                symbol_table_reset();
-                                push_symbol_table(_system_symtab);
+                                if (_value_keyword != IonTokenConstsX.KEYWORD_sid)
+                                {
+                                    symbol_table_reset();
+                                    push_symbol_table(_system_symtab);
+                                }
                                 _has_next_called = false;
                             }
                             else
diff --git a/test/software/amazon/ion/TestUtils.java b/test/software/amazon/ion/TestUtils.java
index f76b96d771..187af1a6af 100644
--- a/test/software/amazon/ion/TestUtils.java
+++ b/test/software/amazon/ion/TestUtils.java
@@ -139,7 +139,6 @@ public boolean accept(File dir, String name)
             , "bad/utf8/surrogate_2.ion"                    // TODO amzn/ion-java#105
             , "bad/utf8/surrogate_4.ion"                    // TODO amzn/ion-java#105
             , "equivs/paddedInts.10n"                       // TODO amzn/ion-java#54
-            , "equivs/nonIVMNoOps.ion"                      // TODO amzn/ion-java#114
             , "good/subfieldVarUInt32bit.ion"               // TODO amzn/ion-java#62
             , "good/utf16.ion"                              // TODO amzn/ion-java#61
             , "good/utf32.ion"                              // TODO amzn/ion-java#61

From 62ebb7424fc438a8682765c7c430da6a551daae6 Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Wed, 12 Dec 2018 17:16:43 -0500
Subject: [PATCH 028/490] Empty ordered structs now cause an exception. (#185)

---
 src/software/amazon/ion/impl/IonReaderBinaryRawX.java | 3 +++
 test/software/amazon/ion/TestUtils.java               | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/software/amazon/ion/impl/IonReaderBinaryRawX.java b/src/software/amazon/ion/impl/IonReaderBinaryRawX.java
index ae391f7f32..92470bb5fc 100644
--- a/src/software/amazon/ion/impl/IonReaderBinaryRawX.java
+++ b/src/software/amazon/ion/impl/IonReaderBinaryRawX.java
@@ -494,6 +494,9 @@ else if (tid == PrivateIonConstants.tidStruct) {
                 // special case of an ordered struct, it gets the
                 // otherwise impossible to have length of 1
                 len = readVarUInt();
+                if (len == 0) {
+                    throwErrorAt("Structs flagged as having ordered keys must contain at least one key/value pair.");
+                }
                 start_of_value = _input.getPosition();
             }
         }
diff --git a/test/software/amazon/ion/TestUtils.java b/test/software/amazon/ion/TestUtils.java
index 187af1a6af..4455209899 100644
--- a/test/software/amazon/ion/TestUtils.java
+++ b/test/software/amazon/ion/TestUtils.java
@@ -131,7 +131,6 @@ public boolean accept(File dir, String name)
         new FileIsNot(
              "bad/clobWithNullCharacter.ion"                // TODO amzn/ion-java#43
             , "bad/clobWithNonAsciiCharacter.ion"           // TODO amzn/ion-java#99
-            , "bad/structOrderedEmpty.10n"                  // TODO amzn/ion-java#100
             , "bad/emptyAnnotatedInt.10n"                   // TODO amzn/ion-java#55
             , "bad/timestamp/timestampNegativeFraction.10n" // TODO amzn/ion-java#102
             , "bad/utf8/surrogate_5.ion"                    // TODO amzn/ion-java#60

From cbd1ab93393fbf213d6cdffbd4200b00dd261029 Mon Sep 17 00:00:00 2001
From: Peter Cornell <pcornell@amazon.com>
Date: Wed, 12 Dec 2018 16:50:01 -0800
Subject: [PATCH 029/490] Produces an error for a struct field that has no
 value (#187)

* Produces an error for a struct field that has no value
* updates existing 'lob' tests to actually test lobs, rather than just strings
---
 ion-tests                                     |  2 +-
 .../amazon/ion/impl/IonReaderTextRawX.java    |  2 +-
 .../amazon/ion/streaming/ReaderTest.java      | 24 +++++++++----------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ion-tests b/ion-tests
index 9bbb4ea124..ad489bf2df 160000
--- a/ion-tests
+++ b/ion-tests
@@ -1 +1 @@
-Subproject commit 9bbb4ea1244c707d77d0d0ff0d35a90d44b4d885
+Subproject commit ad489bf2df23381eedb3df8ccd69931f581dea18
diff --git a/src/software/amazon/ion/impl/IonReaderTextRawX.java b/src/software/amazon/ion/impl/IonReaderTextRawX.java
index 57715b85cb..d0b1369713 100644
--- a/src/software/amazon/ion/impl/IonReaderTextRawX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextRawX.java
@@ -183,7 +183,7 @@ static final int[][] makeTransitionActionArray()
         // now patch up the differences between these 4 states handling of tokens vs before_annotation_datagram
         actions[STATE_BEFORE_ANNOTATION_CONTAINED][IonTokenConstsX.TOKEN_EOF]            = 0;
         actions[STATE_BEFORE_ANNOTATION_CONTAINED][IonTokenConstsX.TOKEN_CLOSE_PAREN]    = ACTION_FINISH_CONTAINER;
-        actions[STATE_BEFORE_ANNOTATION_CONTAINED][IonTokenConstsX.TOKEN_CLOSE_BRACE]    = ACTION_FINISH_CONTAINER;
+        actions[STATE_BEFORE_ANNOTATION_CONTAINED][IonTokenConstsX.TOKEN_CLOSE_BRACE]    = 0;
         actions[STATE_BEFORE_ANNOTATION_CONTAINED][IonTokenConstsX.TOKEN_CLOSE_SQUARE]   = ACTION_FINISH_CONTAINER;
 
         actions[STATE_BEFORE_ANNOTATION_SEXP][IonTokenConstsX.TOKEN_EOF]                 = 0;
diff --git a/test/software/amazon/ion/streaming/ReaderTest.java b/test/software/amazon/ion/streaming/ReaderTest.java
index 1a5eb9517b..72e4a83fa0 100644
--- a/test/software/amazon/ion/streaming/ReaderTest.java
+++ b/test/software/amazon/ion/streaming/ReaderTest.java
@@ -319,18 +319,18 @@ private void skipThroughTopLevelContainer(String data)
 
 
     private String[] LOB_DATA = {
-          "\"\"",
-          "\"clob\"",
-
-          "''''''",
-          "''' '''",
-          "'''clob'''",
-          "'''c}ob'''",
-          "'''c}}b'''",
-          "'''c\\'''ob'''",
-
-          "",
-          "Zm9v",
+          "{{\"\"}}",
+          "{{\"clob\"}}",
+
+          "{{''''''}}",
+          "{{''' '''}}",
+          "{{'''clob'''}}",
+          "{{'''c}ob'''}}",
+          "{{'''c}}b'''}}",
+          "{{'''c\\'''ob'''}}",
+
+          "{{}}",
+          "{{Zm9v}}",
     };
 
     private void testSkippingLob(String containerPrefix,

From 1bf99b6eb2f3510325366f4c532600d8c92515e8 Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Thu, 13 Dec 2018 13:58:29 -0800
Subject: [PATCH 030/490] (Build) Enable site generation and deployment with
 Travis (#189)

---
 .travis.yml | 28 +++++++++++++++++++++-------
 pom.xml     | 23 +++++++++++++++++++++++
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cc409f79fe..363db65d7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,23 @@
+sudo: false
 language: java
 jdk:
-  - openjdk8
-  - openjdk9
-  - openjdk10
-  - openjdk11
-  - oraclejdk8
-  - oraclejdk9
-  - oraclejdk11
+- openjdk8
+- openjdk9
+- openjdk10
+- openjdk11
+- oraclejdk8
+- oraclejdk9
+- oraclejdk11
+after_success:
+    # enable once we get authorization with codecov.io sorted out
+    # - bash <(curl -s https://codecov.io/bash) 
+- mvn site
+deploy:
+  provider: pages
+  local-dir: "./target/site/"
+  skip-cleanup: true
+  github-token: "$GITHUB_TOKEN"
+  keep-history: true # keeps commit history of gh-pages branch
+  on:
+    branch: master
+    jdk: openjdk11
diff --git a/pom.xml b/pom.xml
index defe6f67e9..d23bc97626 100644
--- a/pom.xml
+++ b/pom.xml
@@ -208,6 +208,29 @@
           </reportSet>
         </reportSets>
       </plugin>
+      <!-- Findbugs -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>findbugs-maven-plugin</artifactId>
+        <version>3.0.5</version>
+      </plugin>
+      <!-- PMD -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>3.11.0</version>
+        <configuration>
+          <linkXref>true</linkXref>
+          <sourceEncoding>utf-8</sourceEncoding>
+          <minimumTokens>100</minimumTokens>
+        </configuration>
+      </plugin>
+      <!-- XLR to add links in reports to code -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>3.0.0</version>
+      </plugin>
     </plugins>
   </reporting>
 

From fcaf7b0555355806aea5fb4894186a9502fd9564 Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Thu, 13 Dec 2018 17:59:08 -0500
Subject: [PATCH 031/490] Timestamp fractional seconds outside of [0, 1) now
 cause an exception. (#190)

---
 src/software/amazon/ion/impl/IonReaderBinaryRawX.java | 10 ++++++++--
 test/software/amazon/ion/TestUtils.java               |  1 -
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/software/amazon/ion/impl/IonReaderBinaryRawX.java b/src/software/amazon/ion/impl/IonReaderBinaryRawX.java
index 92470bb5fc..aca36e5de9 100644
--- a/src/software/amazon/ion/impl/IonReaderBinaryRawX.java
+++ b/src/software/amazon/ion/impl/IonReaderBinaryRawX.java
@@ -1115,12 +1115,12 @@ protected final Timestamp readTimestamp(int len) throws IOException
         year  = readVarUInt();
         Precision p = Precision.YEAR; // our lowest significant option
 
-        // now we look for hours and minutes
+        // now we look for months
         if (_local_remaining > 0) {
             month = readVarUInt();
             p = Precision.MONTH;
 
-            // now we look for hours and minutes
+            // now we look for days
             if (_local_remaining > 0) {
                 day   = readVarUInt();
                 p = Precision.DAY; // our lowest significant option
@@ -1136,6 +1136,12 @@ protected final Timestamp readTimestamp(int len) throws IOException
                         if (_local_remaining > 0) {
                             // now we read in our actual "milliseconds since the epoch"
                             frac = readDecimal(_local_remaining);
+                            if (frac.compareTo(BigDecimal.ZERO) < 0 || frac.compareTo(BigDecimal.ONE) >= 0) {
+                                throwErrorAt(
+                                    "The fractional seconds value in a timestamp must be greater than or "
+                                        + "equal to zero and less than one."
+                                );
+                            }
                         }
                     }
                 }
diff --git a/test/software/amazon/ion/TestUtils.java b/test/software/amazon/ion/TestUtils.java
index 4455209899..f50ff04276 100644
--- a/test/software/amazon/ion/TestUtils.java
+++ b/test/software/amazon/ion/TestUtils.java
@@ -132,7 +132,6 @@ public boolean accept(File dir, String name)
              "bad/clobWithNullCharacter.ion"                // TODO amzn/ion-java#43
             , "bad/clobWithNonAsciiCharacter.ion"           // TODO amzn/ion-java#99
             , "bad/emptyAnnotatedInt.10n"                   // TODO amzn/ion-java#55
-            , "bad/timestamp/timestampNegativeFraction.10n" // TODO amzn/ion-java#102
             , "bad/utf8/surrogate_5.ion"                    // TODO amzn/ion-java#60
             , "bad/utf8/surrogate_1.ion"                    // TODO amzn/ion-java#105
             , "bad/utf8/surrogate_2.ion"                    // TODO amzn/ion-java#105

From 2101628f83aee87d0ab6d4a83482397e258bf32d Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Fri, 14 Dec 2018 13:26:21 -0800
Subject: [PATCH 032/490] Implements IonSequence#sublist (#188)

Implements IonSequence#sublist

Implements sublist according to java List spec, i.e. sublist is a view
of the parent list so changes to the parent list are reflected on
the the sublist.

Java's List contract warns that the sublist semantics became undefined
after any structural changes, that affect size, to the parent list.
Most implementations, see ArrayList and LinkedList, throw a
`ConcurrentModificationException` to avoid surprising behavior. This PR
takes the same approach being even more conservative by throwing on all
sublist operations after a parent structural change.

https://github.com/amzn/ion-java/issues/52
---
 src/software/amazon/ion/IonSequence.java      |  22 +-
 .../ion/impl/lite/IonContainerLite.java       |   4 +
 .../amazon/ion/impl/lite/IonSequenceLite.java | 330 +++++++++-
 .../BaseIonSequenceLiteSublistTestCase.java   | 597 ++++++++++++++++++
 ....java => BaseIonSequenceLiteTestCase.java} |  12 +-
 .../impl/lite/IonDatagramLiteSublistTest.java |  16 +
 .../ion/impl/lite/IonDatagramLiteTest.java    |   2 +-
 .../amazon/ion/impl/lite/IonListLiteTest.java |   2 +-
 .../impl/lite/IonListSexpLiteSublistTest.java | 111 ++++
 .../amazon/ion/impl/lite/IonSexpLiteTest.java |   2 +-
 10 files changed, 1085 insertions(+), 13 deletions(-)
 create mode 100644 test/software/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
 rename test/software/amazon/ion/impl/lite/{BaseIonSequenceLiteTest.java => BaseIonSequenceLiteTestCase.java} (82%)
 create mode 100644 test/software/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
 create mode 100644 test/software/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java

diff --git a/src/software/amazon/ion/IonSequence.java b/src/software/amazon/ion/IonSequence.java
index 378d9dc261..f42a9c6dfe 100644
--- a/src/software/amazon/ion/IonSequence.java
+++ b/src/software/amazon/ion/IonSequence.java
@@ -286,10 +286,15 @@ public void add(int index, IonValue child)
      * Returns the index in the sequence of the specified element,
      * or -1 if this sequence doesn't contain the element.
      * <p>
-     * <b>Due to the reference-equality-based semantics of Ion sequences,
+     * <b>
+     * Due to the reference-equality-based semantics of Ion sequences,
      * this method does not use {@link Object#equals} as specified by the
      * contract of {@link java.util.List}. Instead it uses reference
-     * equality ({@code ==} operator) to find the instance.</b>
+     * equality ({@code ==} operator) to find the instance.
+     *
+     * And since IonSequences do not allow for duplicates this method behaves
+     * in the same way as {@link IonSequence#indexOf(Object)}
+     * </b>
      *
      * @param o the element to search for.
      * @return the index in this sequence of the element,
@@ -393,13 +398,18 @@ public void add(int index, IonValue child)
 
 
     /**
-     * This inherited method is not yet supported.
      * <p>
-     * Vote for issue amzn/ion-java#52 if you need this.
+     * Returns a view of the portion of this list according to {@link List#subList(int, int)}
+     * contract.
+     * </p>
      *
-     * @throws UnsupportedOperationException at every call.
+     * <p>
+     * Sublist methods will throw a {@link java.util.ConcurrentModificationException} if
+     * its parent list, i.e. this list, had any changes that affect its size the after sublist
+     * was created.
+     * </p>
      *
-     * @see <a href="https://github.com/amzn/ion-java/issues/52">amzn/ion-java#52</a>
+     * @see List#subList(int, int)
      */
     public List<IonValue> subList(int fromIndex, int toIndex);
 
diff --git a/src/software/amazon/ion/impl/lite/IonContainerLite.java b/src/software/amazon/ion/impl/lite/IonContainerLite.java
index e3653a3acd..a77b583431 100644
--- a/src/software/amazon/ion/impl/lite/IonContainerLite.java
+++ b/src/software/amazon/ion/impl/lite/IonContainerLite.java
@@ -38,6 +38,7 @@ abstract class IonContainerLite
 
     protected int            _child_count;
     protected IonValueLite[] _children;
+    protected int            structuralModificationCount;
 
     protected IonContainerLite(ContainerlessContext context, boolean isNull)
     {
@@ -100,6 +101,7 @@ else if (!isEmpty())
         {
             detachAllChildren();
             _child_count = 0;
+            structuralModificationCount++;
         }
     }
 
@@ -655,6 +657,7 @@ protected int add_child(int idx, IonValueLite child)
         }
         _child_count++;
         _children[idx] = child;
+        structuralModificationCount++;
 
         child._elementid(idx);
         return idx;
@@ -681,6 +684,7 @@ void remove_child(int idx)
         }
         _child_count--;
         _children[_child_count] = null;
+        structuralModificationCount++;
     }
 
     public final void patch_elements_helper(int lowest_bad_idx)
diff --git a/src/software/amazon/ion/impl/lite/IonSequenceLite.java b/src/software/amazon/ion/impl/lite/IonSequenceLite.java
index 5585677352..9fb5db65be 100644
--- a/src/software/amazon/ion/impl/lite/IonSequenceLite.java
+++ b/src/software/amazon/ion/impl/lite/IonSequenceLite.java
@@ -16,10 +16,14 @@
 
 import java.io.IOException;
 import java.lang.reflect.Array;
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.ConcurrentModificationException;
 import java.util.IdentityHashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
 import software.amazon.ion.ContainedValueException;
 import software.amazon.ion.IonSequence;
 import software.amazon.ion.IonType;
@@ -334,8 +338,7 @@ public int lastIndexOf(Object o)
 
     public List<IonValue> subList(int fromIndex, int toIndex)
     {
-        // TODO amzn/ion-java#52
-        throw new UnsupportedOperationException("issue amzn/ion-java#52");
+        return new SubListView(this, fromIndex, toIndex);
     }
 
     public IonValue[] toArray()
@@ -398,4 +401,327 @@ void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
             writer.stepOut();
         }
     }
+
+    /**
+     * SubListView throws a {@link ConcurrentModificationException} if the parent list has any
+     * structural modifications, i.e. any operation that cause its size to change. To determine if
+     * a parent structural modification happened it keeps track of the structural modification count
+     * to compare against the parent
+     *
+     * Structural modifications from the sublist itself are allowed.
+     */
+    private class SubListView implements List<IonValue> {
+
+        /**
+         * index in top level IonSequenceLite that marks the start of this sublist view. For nested
+         * sublists fromIndex will be in relation to the root parent which must be a IonSequenceLite
+         */
+        private final int fromIndex;
+        private int size;
+        private int structuralModificationCount;
+
+        private SubListView(final List<IonValue> parent,
+                            final int fromIndex,
+                            final int toIndex) {
+            this.fromIndex = toTopLevelFromIndex(parent, fromIndex);
+            this.size = toIndex - fromIndex;
+            this.structuralModificationCount = IonSequenceLite.this.structuralModificationCount;
+        }
+
+        public int size() {
+            checkForParentModification();
+            return size;
+        }
+
+        public boolean isEmpty() {
+            checkForParentModification();
+            return size == 0;
+        }
+
+        public IonValue get(final int index) {
+            checkForParentModification();
+            rangeCheck(index);
+
+            return IonSequenceLite.this.get(toParentIndex(index));
+        }
+
+        public IonValue set(final int index, final IonValue element) {
+            checkForParentModification();
+            rangeCheck(index);
+
+            return IonSequenceLite.this.set(toParentIndex(index), element);
+        }
+
+        public boolean contains(final Object o) {
+            checkForParentModification();
+            return indexOf(o) != -1;
+        }
+
+        public boolean containsAll(final Collection<?> c) {
+            for (Object o : c) {
+                if (!contains(o)) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        public IonValue[] toArray() {
+            checkForParentModification();
+
+            if (size < 1) {
+                return EMPTY_VALUE_ARRAY;
+            }
+
+            return toArray(new IonValue[size]);
+        }
+
+        @SuppressWarnings("unchecked")
+        public <T> T[] toArray(T[] array) {
+            checkForParentModification();
+
+            if (array.length < size) {
+                final Class<?> type = array.getClass().getComponentType();
+                // generates unchecked warning
+                array = (T[]) Array.newInstance(type, size);
+            }
+
+            if (size > 0) {
+                System.arraycopy(IonSequenceLite.this._children, fromIndex, array, 0, size);
+            }
+
+            if (size < array.length) {
+                // See IonSequence#toArray and ArrayList#toArray
+                array[size] = null;
+            }
+
+            return array;
+        }
+
+        public boolean add(final IonValue ionValue) {
+            checkForParentModification();
+
+            int parentIndex = toParentIndex(size);
+
+            // adds at end of parent list
+            if (parentIndex == IonSequenceLite.this.size()) {
+                IonSequenceLite.this.add(ionValue);
+            } else {
+                IonSequenceLite.this.add(parentIndex, ionValue);
+            }
+
+            this.structuralModificationCount = IonSequenceLite.this.structuralModificationCount;
+            size++;
+
+            return true;
+        }
+
+        public void add(final int index, final IonValue ionValue) {
+            checkForParentModification();
+            rangeCheck(index);
+
+            IonSequenceLite.this.add(toParentIndex(index), ionValue);
+
+            this.structuralModificationCount = IonSequenceLite.this.structuralModificationCount;
+            size++;
+        }
+
+        public boolean addAll(final Collection<? extends IonValue> c) {
+            for (IonValue ionValue : c) {
+                add(ionValue);
+            }
+
+            return true;
+        }
+
+        public boolean addAll(final int index, final Collection<? extends IonValue> c) {
+            int i = index;
+
+            for (IonValue ionValue : c) {
+                add(i, ionValue);
+                i++;
+            }
+
+            return true;
+        }
+
+        public boolean retainAll(final Collection<?> c) {
+            if (size < 1) {
+                return false;
+            }
+
+            final Map<Object,Object> toRetain = new IdentityHashMap<Object,Object>();
+            for (Object o : c) {
+                toRetain.put(o, null);
+            }
+
+            final List<IonValue> toRemove = new ArrayList<IonValue>(size - c.size());
+            for (int i = 0; i < size; i++) {
+                final IonValue ionValue = get(i);
+
+                if (!toRetain.containsKey(ionValue)) {
+                    toRemove.add(ionValue);
+                }
+            }
+
+            return removeAll(toRemove);
+        }
+
+        public void clear() {
+            checkForParentModification();
+
+            // remove the first element size times to remove all elements
+            int parentIndex = toParentIndex(0);
+            for (int i = 0; i < size; i++) {
+                IonSequenceLite.this.remove(parentIndex);
+            }
+
+            size = 0;
+            this.structuralModificationCount = IonSequenceLite.this.structuralModificationCount;
+        }
+
+        public IonValue remove(final int index) {
+            checkForParentModification();
+            rangeCheck(index);
+
+            final IonValue removed = IonSequenceLite.this.remove(toParentIndex(index));
+
+            this.structuralModificationCount = IonSequenceLite.this.structuralModificationCount;
+            size--;
+
+            return removed;
+        }
+
+        public boolean remove(final Object o) {
+            int index = indexOf(o);
+            if (index < 0) {
+                return false;
+            }
+
+            remove(index);
+            return true;
+        }
+
+        public boolean removeAll(final Collection<?> c) {
+            boolean changed = false;
+            for (Object o : c) {
+                if (remove(o)) {
+                    changed = true;
+                }
+            }
+
+            return changed;
+        }
+
+        public int indexOf(final Object o) {
+            checkForParentModification();
+
+            final int parentIndex = IonSequenceLite.this.indexOf(o);
+            final int index = fromParentIndex(parentIndex);
+
+            // not found
+            if (parentIndex < 0 || index < 0 || index >= size) {
+                return -1;
+            }
+
+            return index;
+        }
+
+        public int lastIndexOf(final Object o) {
+            return indexOf(o);
+        }
+
+        public Iterator<IonValue> iterator() {
+            return listIterator(0);
+        }
+
+        public ListIterator<IonValue> listIterator() {
+            return listIterator(0);
+        }
+
+        public ListIterator<IonValue> listIterator(final int index) {
+            checkForParentModification();
+
+            return new ListIterator<IonValue>() {
+                private int lastReturnedIndex = index;
+                private int nextIndex = index;
+
+                public boolean hasNext() {
+                    return nextIndex < SubListView.this.size();
+                }
+
+                public IonValue next() {
+                    lastReturnedIndex = nextIndex++;
+                    return SubListView.this.get(lastReturnedIndex);
+                }
+
+                public boolean hasPrevious() {
+                    return nextIndex > 0;
+                }
+
+                public IonValue previous() {
+                    lastReturnedIndex = --nextIndex;
+                    return SubListView.this.get(lastReturnedIndex);
+                }
+
+                public int nextIndex() {
+                    return nextIndex;
+                }
+
+                public int previousIndex() {
+                    return nextIndex - 1;
+                }
+
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }
+
+                public void set(final IonValue ionValue) {
+                    SubListView.this.set(lastReturnedIndex, ionValue);
+                }
+
+                public void add(final IonValue ionValue) {
+                    SubListView.this.add(lastReturnedIndex, ionValue);
+                }
+            };
+        }
+
+        public List<IonValue> subList(final int fromIndex, final int toIndex) {
+            checkForParentModification();
+            return new SubListView(this, fromIndex, toIndex);
+        }
+
+        private void rangeCheck(int index) {
+            if (index < 0 || index >= size) {
+                throw new IndexOutOfBoundsException(String.valueOf(index));
+            }
+        }
+
+        private int toParentIndex(int index) {
+            return index + fromIndex;
+        }
+
+        private int fromParentIndex(int index) {
+            return index - fromIndex;
+        }
+
+        /**
+         * Calculates fromIndex based on the top level parent which must be an {@link IonSequenceLite}. With this
+         * nested sublists are able to directly call the top level parent instead of delegating up the parent chain
+         */
+        private int toTopLevelFromIndex(final List<IonValue> parent, int fromIndex) {
+            if (parent instanceof SubListView) {
+                return fromIndex + ((SubListView) parent).fromIndex;
+            }
+
+            return fromIndex;
+        }
+
+        private void checkForParentModification() {
+            if (this.structuralModificationCount != IonSequenceLite.this.structuralModificationCount) {
+                throw new ConcurrentModificationException();
+            }
+        }
+    }
 }
diff --git a/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java b/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
new file mode 100644
index 0000000000..644ece031f
--- /dev/null
+++ b/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
@@ -0,0 +1,597 @@
+package software.amazon.ion.impl.lite;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import org.junit.Test;
+import software.amazon.ion.ContainedValueException;
+import software.amazon.ion.IonInt;
+import software.amazon.ion.IonSequence;
+import software.amazon.ion.IonSystem;
+import software.amazon.ion.IonValue;
+import software.amazon.ion.system.IonSystemBuilder;
+
+/**
+ * All tests related to {@link IonSequenceLite#subList(int, int)}. Extracted to a separate test due to the amount of
+ * tests
+ */
+public abstract class BaseIonSequenceLiteSublistTestCase {
+
+    static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
+    static final int[] INTS = new int[]{0, 1, 2, 3, 4, 5, 6};
+
+    protected abstract IonSequence newSequence();
+
+    @Test
+    public void sublistSize() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> actual = sequence.subList(2, 5);
+
+        assertEquals(3, actual.size());
+    }
+
+    @Test
+    public void sublistIsEmpty() {
+        IonSequence sequence = newSequence();
+
+        assertTrue(sequence.subList(0, 0).isEmpty());
+        assertFalse(sequence.subList(0, 1).isEmpty());
+    }
+
+    @Test
+    public void sublistGet() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonValue element = sublist.get(0);
+
+        assertEquals(2, ((IonInt) element).intValue());
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void sublistGetOutOfRange() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        sublist.get(4);
+    }
+
+    @Test
+    public void sublistContains() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonValue insideSubList = sequence.get(2);
+        final IonValue outsideSublist = sequence.get(0);
+
+        assertTrue(sublist.contains(insideSubList));
+        assertFalse(sublist.contains(outsideSublist));
+    }
+
+    @Test
+    public void sublistContainsAll() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final List<IonValue> insideSubList = Arrays.asList(sequence.get(2), sequence.get(3));
+        final List<IonValue> outsideSublist = Arrays.asList(sequence.get(0), sequence.get(1));
+        final List<IonValue> mixed = Arrays.asList(sequence.get(0), sequence.get(3));
+
+        assertTrue(sublist.containsAll(insideSubList));
+        assertFalse(sublist.containsAll(outsideSublist));
+        assertFalse(sublist.containsAll(mixed));
+    }
+
+    @Test
+    public void sublistToArray() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final Object[] array = sublist.toArray();
+        assertEquals(3, array.length);
+        assertEquals(2, ((IonInt) array[0]).intValue());
+        assertEquals(3, ((IonInt) array[1]).intValue());
+        assertEquals(4, ((IonInt) array[2]).intValue());
+    }
+
+    @Test
+    public void sublistToTypedArray() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonValue[] array = sublist.toArray(IonValue.EMPTY_ARRAY);
+
+        assertEquals(3, array.length);
+        assertEquals(2, ((IonInt) array[0]).intValue());
+        assertEquals(3, ((IonInt) array[1]).intValue());
+        assertEquals(4, ((IonInt) array[2]).intValue());
+    }
+
+    @Test
+    public void sublistAdd() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonInt value = SYSTEM.newInt(99);
+        sublist.add(value);
+        assertEquals(4, sublist.size());
+        assertEquals(value, sublist.get(3));
+    }
+
+    @Test(expected = ContainedValueException.class)
+    public void sublistAddSame() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonValue value = sequence.get(0);
+        sublist.add(value);
+    }
+
+    @Test
+    public void sublistAddWithIndex() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonInt value = SYSTEM.newInt(99);
+        sublist.add(0, value);
+        assertEquals(4, sublist.size());
+        assertEquals(value, sublist.get(0));
+        assertEquals(2, ((IonInt) sublist.get(1)).intValue());
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void sublistAddWithIndexOutOfRange() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonInt value = SYSTEM.newInt(99);
+        sublist.add(4, value);
+    }
+
+    @Test
+    public void sublistAddAll() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final List<IonInt> values = Arrays.asList(SYSTEM.newInt(100), SYSTEM.newInt(101));
+        sublist.addAll(values);
+        assertEquals(5, sublist.size());
+        assertEquals(values.get(0), sublist.get(3));
+        assertEquals(values.get(1), sublist.get(4));
+    }
+
+    @Test
+    public void sublistAddAllWithIndex() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final List<IonInt> values = Arrays.asList(SYSTEM.newInt(100), SYSTEM.newInt(101));
+        sublist.addAll(0, values);
+        assertEquals(5, sublist.size());
+        assertEquals(values.get(0), sublist.get(0));
+        assertEquals(values.get(1), sublist.get(1));
+
+        assertEquals(2, ((IonInt) sublist.get(2)).intValue());
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void sublistAddAllWithIndexOutOfRange() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final List<IonInt> values = Arrays.asList(SYSTEM.newInt(100), SYSTEM.newInt(101));
+        sublist.addAll(3, values);
+    }
+
+    @Test
+    public void sublistRetainAll() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final List<IonValue> toRetain = Collections.singletonList(sublist.get(0));
+
+        assertTrue(sublist.retainAll(toRetain));
+
+        assertEquals(1, sublist.size());
+        assertTrue(sublist.contains(toRetain.get(0)));
+        assertEquals(5, sequence.size());
+    }
+
+    @Test
+    public void sublistRetainAllWithDuplicates() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final List<IonValue> toRetain = Arrays.asList(sublist.get(0), sublist.get(0));
+
+        assertTrue(sublist.retainAll(toRetain));
+
+        assertEquals(1, sublist.size());
+        assertTrue(sublist.contains(toRetain.get(0)));
+        assertEquals(5, sequence.size());
+    }
+
+    @Test
+    public void sublistClear() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        sublist.clear();
+
+        assertEquals(0, sublist.size());
+        assertEquals(4, sequence.size());
+    }
+
+    @Test
+    public void sublistRemoveIndex() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonInt ionValue = (IonInt) sublist.remove(0);
+        assertEquals(2, sublist.size());
+        assertEquals(2, ionValue.intValue());
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void sublistRemoveIndexOutOfRange() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        sublist.remove(3);
+    }
+
+    @Test
+    public void sublistRemoveObject() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonInt ionValue = (IonInt) sequence.get(2);
+        assertTrue(sublist.remove(ionValue));
+        assertEquals(2, sublist.size());
+    }
+
+    @Test
+    public void sublistRemoveAll() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final List<IonValue> toRemove = Arrays.asList(sequence.get(2), sequence.get(3));
+        assertTrue(sublist.removeAll(toRemove));
+        assertEquals(1, sublist.size());
+        for (IonValue v : toRemove) {
+            assertFalse(sublist.contains(v));
+        }
+    }
+
+    @Test
+    public void sublistRemoveAllNotInList() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final List<IonValue> toRemove = Arrays.asList(sequence.get(0), sequence.get(1));
+        assertFalse(sublist.removeAll(toRemove));
+        assertEquals(3, sublist.size());
+    }
+
+    @Test
+    public void sublistIndexOf() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        assertEquals(0, sublist.indexOf(sequence.get(2)));
+        assertEquals(-1, sublist.indexOf(sequence.get(0)));
+        assertEquals(-1, sublist.indexOf(SYSTEM.newInt(99)));
+    }
+
+    @Test
+    public void sublistLastIndexOf() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        assertEquals(0, sublist.lastIndexOf(sequence.get(2)));
+        assertEquals(-1, sublist.lastIndexOf(sequence.get(0)));
+        assertEquals(-1, sublist.lastIndexOf(SYSTEM.newInt(99)));
+    }
+
+    @Test
+    public void sublistIterator() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final Iterator<IonValue> iterator = sublist.iterator();
+        assertTrue(iterator.hasNext());
+        assertEquals(sublist.get(0), iterator.next());
+
+        assertTrue(iterator.hasNext());
+        assertEquals(sublist.get(1), iterator.next());
+
+        assertTrue(iterator.hasNext());
+        assertEquals(sublist.get(2), iterator.next());
+
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    public void sublistListIterator() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final ListIterator<IonValue> iterator = sublist.listIterator();
+
+        assertFalse(iterator.hasPrevious());
+        assertTrue(iterator.hasNext());
+        assertEquals(0, iterator.nextIndex());
+        assertEquals(-1, iterator.previousIndex());
+        assertEquals(sublist.get(0), iterator.next());
+
+        assertTrue(iterator.hasNext());
+        assertTrue(iterator.hasPrevious());
+        assertEquals(1, iterator.nextIndex());
+        assertEquals(0, iterator.previousIndex());
+        assertEquals(sublist.get(1), iterator.next());
+
+        assertTrue(iterator.hasNext());
+        assertTrue(iterator.hasPrevious());
+        assertEquals(2, iterator.nextIndex());
+        assertEquals(1, iterator.previousIndex());
+        assertEquals(sublist.get(2), iterator.next());
+
+        assertEquals(3, iterator.nextIndex());
+        assertEquals(2, iterator.previousIndex());
+        assertFalse(iterator.hasNext());
+        assertTrue(iterator.hasPrevious());
+
+        assertEquals(sublist.get(2), iterator.previous());
+        final IonInt newAddValue = SYSTEM.newInt(200);
+        iterator.add(newAddValue);
+        assertEquals(newAddValue, sublist.get(2));
+        assertTrue(iterator.hasNext());
+    }
+
+    @Test
+    public void sublistListIteratorWithIndex() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final ListIterator<IonValue> iterator = sublist.listIterator(1);
+
+        assertTrue(iterator.hasNext());
+        assertTrue(iterator.hasPrevious());
+        assertEquals(1, iterator.nextIndex());
+        assertEquals(0, iterator.previousIndex());
+        assertEquals(sublist.get(1), iterator.next());
+
+        iterator.previous(); // back to initial state
+
+        assertEquals(sublist.get(0), iterator.previous());
+    }
+
+    @Test
+    public void sublistSublist() {
+        IonSequence sequence = newSequence();
+
+        final List<IonValue> sublist = sequence.subList(1, 5);   // 1,2,3,4
+        final List<IonValue> subSublist = sublist.subList(1, 2); // 2
+
+        assertEquals(sublist.get(1), subSublist.get(0));
+        assertEquals(sequence.get(2), subSublist.get(0));
+    }
+
+    // Concurrent modification tests ---------------------------------------------------------------------------------
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistSizeConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.add(SYSTEM.newInt(99));
+
+        sublist.size();
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistIsEmptyConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.isEmpty();
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistGetConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.clear();
+
+        sublist.get(0);
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistSetConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        final IonInt element = SYSTEM.newInt(99);
+        sublist.set(0, element);
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistContainsConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        final IonInt value = SYSTEM.newInt(99);
+        sequence.add(value);
+
+        sublist.contains(value);
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistContainsAllConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        final IonValue value = sequence.remove(0);
+
+        sublist.containsAll(Collections.singletonList(value));
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistToArrayConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.toArray();
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistToTypedArrayConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.toArray(IonValue.EMPTY_ARRAY);
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistAddConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.add(SYSTEM.newInt(0));
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistAddWithIndexConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.add(0, SYSTEM.newInt(0));
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistAddAllConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.addAll(Arrays.asList(SYSTEM.newInt(100), SYSTEM.newInt(101)));
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistAddAllWithIndexConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.addAll(0, Arrays.asList(SYSTEM.newInt(100), SYSTEM.newInt(101)));
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistRetainAllConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.retainAll(Arrays.asList(SYSTEM.newInt(100), SYSTEM.newInt(101)));
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistClearConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.retainAll(Collections.emptyList());
+
+        sublist.clear();
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistRemoveIndexConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.remove(0);
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistRemoveObjectConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.remove(sequence.get(2));
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistRemoveAllConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.removeAll(Collections.singletonList(sequence.get(2)));
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistIndexOfConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.indexOf(sequence.get(2));
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistLastIndexOfConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.lastIndexOf(sequence.get(2));
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistIteratorConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.add(SYSTEM.newInt(99));
+
+        sublist.iterator();
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistListIteratorConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.listIterator();
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistListIteratorWithIndexConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.add(SYSTEM.newInt(99));
+
+        sublist.listIterator(1);
+    }
+
+    @Test(expected = ConcurrentModificationException.class)
+    public void sublistSubListConcurrentModification() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+        sequence.remove(0);
+
+        sublist.subList(0, 1);
+    }
+}
diff --git a/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTest.java b/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
similarity index 82%
rename from test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTest.java
rename to test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
index e0614b3e37..0942a0ae7c 100644
--- a/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTest.java
+++ b/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
@@ -6,17 +6,25 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.ConcurrentModificationException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
 import org.junit.Test;
+import software.amazon.ion.ContainedValueException;
+import software.amazon.ion.IonInt;
+import software.amazon.ion.IonList;
 import software.amazon.ion.IonSequence;
 import software.amazon.ion.IonSystem;
 import software.amazon.ion.IonValue;
 import software.amazon.ion.ReadOnlyValueException;
 import software.amazon.ion.system.IonSystemBuilder;
 
-public abstract class BaseIonSequenceLiteTest {
+public abstract class BaseIonSequenceLiteTestCase {
 
-    protected static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
+    static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
 
     protected abstract IonSequence newEmptySequence();
 
diff --git a/test/software/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java b/test/software/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
new file mode 100644
index 0000000000..7bb57e17c9
--- /dev/null
+++ b/test/software/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
@@ -0,0 +1,16 @@
+package software.amazon.ion.impl.lite;
+
+import software.amazon.ion.IonDatagram;
+import software.amazon.ion.IonSequence;
+
+public class IonDatagramLiteSublistTest extends BaseIonSequenceLiteSublistTestCase {
+
+    protected IonSequence newSequence() {
+        final IonDatagram datagram = SYSTEM.newDatagram();
+        for(int i : INTS) {
+            datagram.add(SYSTEM.newInt(INTS[i]));
+        }
+
+        return datagram;
+    }
+}
diff --git a/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java b/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
index 45af7a15d0..3637df1eba 100644
--- a/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
+++ b/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
@@ -2,7 +2,7 @@
 
 import software.amazon.ion.IonSequence;
 
-public class IonDatagramLiteTest extends BaseIonSequenceLiteTest {
+public class IonDatagramLiteTest extends BaseIonSequenceLiteTestCase {
     @Override
     protected IonSequence newEmptySequence() {
         return SYSTEM.newDatagram();
diff --git a/test/software/amazon/ion/impl/lite/IonListLiteTest.java b/test/software/amazon/ion/impl/lite/IonListLiteTest.java
index ee5b48c980..2da37f29b7 100644
--- a/test/software/amazon/ion/impl/lite/IonListLiteTest.java
+++ b/test/software/amazon/ion/impl/lite/IonListLiteTest.java
@@ -2,7 +2,7 @@
 
 import software.amazon.ion.IonSequence;
 
-public class IonListLiteTest extends BaseIonSequenceLiteTest {
+public class IonListLiteTest extends BaseIonSequenceLiteTestCase {
     @Override
     protected IonSequence newEmptySequence() {
         return SYSTEM.newEmptyList();
diff --git a/test/software/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java b/test/software/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
new file mode 100644
index 0000000000..6166a5843b
--- /dev/null
+++ b/test/software/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
@@ -0,0 +1,111 @@
+package software.amazon.ion.impl.lite;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+import java.util.ListIterator;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import software.amazon.ion.IonInt;
+import software.amazon.ion.IonSequence;
+import software.amazon.ion.IonValue;
+import software.amazon.ion.junit.Injected;
+import software.amazon.ion.junit.Injected.Inject;
+
+/**
+ * Sublist tests for list and sexp
+ */
+@RunWith(Injected.class)
+public class IonListSexpLiteSublistTest extends BaseIonSequenceLiteSublistTestCase {
+
+    interface IonSequenceProvider {
+
+        IonSequence newSequence();
+    }
+
+    @Inject("provider")
+    public static final IonSequenceProvider[] providers = new IonSequenceProvider[]{
+        new IonSequenceProvider() {
+            public IonSequence newSequence() {
+                return SYSTEM.newList(INTS);
+            }
+        },
+        new IonSequenceProvider() {
+            public IonSequence newSequence() {
+                return SYSTEM.newSexp(INTS);
+            }
+        },
+    };
+
+    private IonSequenceProvider provider;
+
+    public void setProvider(final IonSequenceProvider provider) {
+        this.provider = provider;
+    }
+
+    protected IonSequence newSequence() {
+        return provider.newSequence();
+    }
+
+    @Test
+    public void sublistSet() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonInt element = SYSTEM.newInt(99);
+        final IonValue previous = sublist.set(0, element);
+
+        assertEquals(2, ((IonInt) previous).intValue());
+        assertEquals(element, sublist.get(0));
+        assertEquals(element, sequence.get(2));
+    }
+
+    @Test
+    public void sublistSetOnParent() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonInt element = SYSTEM.newInt(99);
+        final IonValue previous = sequence.set(2, element);
+
+        assertEquals(2, ((IonInt) previous).intValue());
+        assertEquals(element, sublist.get(0));
+        assertEquals(element, sequence.get(2));
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void sublistSetOutOfRange() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final IonInt element = SYSTEM.newInt(99);
+        sublist.set(4, element);
+    }
+
+    @Test
+    public void sublistSublistChangingParentValues() {
+        IonSequence sequence = newSequence();
+
+        final List<IonValue> sublist = sequence.subList(1, 5);    // 1,2,3,4
+        final List<IonValue> subSublist = sublist.subList(0, 2);  // 1,2
+
+        final IonInt newValue = SYSTEM.newInt(100);
+        sequence.set(1, newValue);
+        assertEquals(newValue, sublist.get(0));
+        assertEquals(newValue, subSublist.get(0));
+    }
+
+    @Test
+    public void sublistListIteratorWithSet() {
+        final IonSequence sequence = newSequence();
+        final List<IonValue> sublist = sequence.subList(2, 5);
+
+        final ListIterator<IonValue> iterator = sublist.listIterator();
+
+        iterator.next();
+
+        final IonInt newSetValue = SYSTEM.newInt(100);
+        iterator.set(newSetValue);
+        assertEquals(newSetValue, sublist.get(0));
+    }
+}
diff --git a/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java b/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java
index 56528bcd57..3b3fbfaa96 100644
--- a/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java
+++ b/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java
@@ -2,7 +2,7 @@
 
 import software.amazon.ion.IonSequence;
 
-public class IonSexpLiteTest extends BaseIonSequenceLiteTest {
+public class IonSexpLiteTest extends BaseIonSequenceLiteTestCase {
     @Override
     protected IonSequence newEmptySequence() {
         return SYSTEM.newEmptySexp();

From f302af7a76b100bd18c9803c5dc34615abf5ec49 Mon Sep 17 00:00:00 2001
From: 0xflotus <0xflotus@gmail.com>
Date: Sat, 15 Dec 2018 07:13:21 +0100
Subject: [PATCH 033/490] changed some if-statements to ternary expressions
 (#156)

You can use ternary expressions, if you only return a conditional value
---
 src/software/amazon/ion/Decimal.java | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/software/amazon/ion/Decimal.java b/src/software/amazon/ion/Decimal.java
index 08b235ba62..a92dc06644 100644
--- a/src/software/amazon/ion/Decimal.java
+++ b/src/software/amazon/ion/Decimal.java
@@ -68,16 +68,14 @@ private NegativeZero(int scale, MathContext mc)
         public float floatValue()
         {
             float v = super.floatValue();
-            if (Float.compare(0f, v) <= 0) v = -1 * v;
-            return v;
+            return Float.compare(0f, v) <= 0 ? -1 * v : v;
         }
 
         @Override
         public double doubleValue()
         {
             double v = super.doubleValue();
-            if (Double.compare(0d, v) <= 0) v = -1 * v;
-            return v;
+            return Double.compare(0d, v) <= 0 ? -1 * v : v;
         }
 
 
@@ -159,12 +157,8 @@ public static boolean isNegativeZero(BigDecimal val)
      */
     public static BigDecimal bigDecimalValue(BigDecimal val)
     {
-        if (val == null
-            || val.getClass() == BigDecimal.class)
-        {
-            return val;
-        }
-        return new BigDecimal(val.unscaledValue(), val.scale());
+        return val == null || val.getClass() == BigDecimal.class ?
+            val : new BigDecimal(val.unscaledValue(), val.scale());
     }
 
     /**
@@ -269,17 +263,12 @@ public static Decimal valueOf(double val)
 
     public static Decimal valueOf(double val, MathContext mc)
     {
-        if (Double.compare(val, -0d) == 0)
-        {
-            return new NegativeZero(1, mc);
-        }
-        return new Decimal(Double.toString(val), mc);
+        return Double.compare(val, -0d) == 0 ? new NegativeZero(1, mc) : new Decimal(Double.toString(val), mc);
     }
 
     public static Decimal valueOf(BigDecimal val)
     {
-        if (val == null || val instanceof Decimal) return (Decimal) val;
-        return new Decimal(val.unscaledValue(), val.scale());
+        return val == null || val instanceof Decimal ? (Decimal) val : new Decimal(val.unscaledValue(), val.scale());
     }
 
     public static Decimal valueOf(BigDecimal val, MathContext mc)
@@ -421,7 +410,6 @@ public final boolean isNegativeZero()
      */
     public final BigDecimal bigDecimalValue()
     {
-
         return new BigDecimal(unscaledValue(), scale());
     }
 }

From fcd528e308f9ea585ae627a64d5eda57b416ecd3 Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Sat, 15 Dec 2018 06:16:44 -0800
Subject: [PATCH 034/490] (Build) Enable codecov (#194)

Enable pushing coverage to codecov
---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 363db65d7a..faced71d63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,8 +9,7 @@ jdk:
 - oraclejdk9
 - oraclejdk11
 after_success:
-    # enable once we get authorization with codecov.io sorted out
-    # - bash <(curl -s https://codecov.io/bash) 
+- bash <(curl -s https://codecov.io/bash) 
 - mvn site
 deploy:
   provider: pages

From 369b5618a23caaac1c0730200cb21742d749c65f Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Mon, 17 Dec 2018 11:30:48 -0800
Subject: [PATCH 035/490] (Build) Split tests and report generation  (#196)

* Adds stages for build & test & report generation
---
 .travis.yml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index faced71d63..a8b579c681 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,15 +8,21 @@ jdk:
 - oraclejdk8
 - oraclejdk9
 - oraclejdk11
-after_success:
-- bash <(curl -s https://codecov.io/bash) 
-- mvn site
-deploy:
-  provider: pages
-  local-dir: "./target/site/"
-  skip-cleanup: true
-  github-token: "$GITHUB_TOKEN"
-  keep-history: true # keeps commit history of gh-pages branch
-  on:
-    branch: master
-    jdk: openjdk11
+
+script: mvn test 
+
+jobs: 
+  include: 
+    stage: report generation 
+    jdk: openjdk11 
+    script: mvn test site 
+    after_success:
+      - bash <(curl -s https://codecov.io/bash) 
+    deploy: 
+      provider: pages
+      local-dir: "./target/site/"
+      skip-cleanup: true
+      github-token: "$GITHUB_TOKEN"
+      keep-history: true # keeps commit history of gh-pages branch
+      on:
+        branch: master

From b73931ead1c0e8da6dbcd9e0790b9ccfffe2efd6 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Mon, 17 Dec 2018 12:06:25 -0800
Subject: [PATCH 036/490] Clob nonascii error 99 (#192)

* Throws error when reading clobs with non ascii characters
* Change UTF8 check
Relies on actual test file data instead of a naming convention that is
not being followed
* Updates skip list and ion-tests

https://github.com/amzn/ion-java/issues/99
---
 ion-tests                                        |  2 +-
 .../amazon/ion/impl/IonReaderTextRawTokensX.java |  7 +++++++
 .../amazon/ion/impl/IonReaderTextSystemX.java    |  5 ++++-
 test/software/amazon/ion/BadIonTest.java         | 16 +++++++++++++---
 test/software/amazon/ion/TestUtils.java          |  8 ++++++--
 5 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/ion-tests b/ion-tests
index ad489bf2df..0281240a90 160000
--- a/ion-tests
+++ b/ion-tests
@@ -1 +1 @@
-Subproject commit ad489bf2df23381eedb3df8ccd69931f581dea18
+Subproject commit 0281240a9039a1f609fc8e289721efff489956be
diff --git a/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java b/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java
index 33757bc3a6..aba793f173 100644
--- a/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java
@@ -2049,6 +2049,9 @@ protected int load_double_quoted_string(StringBuilder sb, boolean is_clob)
     protected int read_double_quoted_char(boolean is_clob) throws IOException
     {
         int c = read_char();
+        if(is_clob && c > 127) {
+            throw new IonReaderTextTokenException("non ASCII character in clob: " + c);
+        }
 
         switch (c) {
         case '"':
@@ -2174,6 +2177,10 @@ protected int load_triple_quoted_string(StringBuilder sb, boolean is_clob)
     protected int read_triple_quoted_char(boolean is_clob) throws IOException
     {
         int c = read_string_char(ProhibitedCharacters.LONG_CHAR);
+        if(is_clob && c > 127) {
+            throw new IonReaderTextTokenException("non ASCII character in clob: " + c);
+        }
+
         switch (c) {
         case '\'':
             if (is_2_single_quotes_helper()) {
diff --git a/src/software/amazon/ion/impl/IonReaderTextSystemX.java b/src/software/amazon/ion/impl/IonReaderTextSystemX.java
index 55b5a849de..07c5668365 100644
--- a/src/software/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextSystemX.java
@@ -849,6 +849,7 @@ private int readBytes(byte[] buffer, int offset, int len)
         int c = -1;
 
         switch (_lob_token) {
+        // BLOB
         case IonTokenConstsX.TOKEN_OPEN_DOUBLE_BRACE:
             while (len-- > 0) {
                 c = _scanner.read_base64_byte();
@@ -856,6 +857,7 @@ private int readBytes(byte[] buffer, int offset, int len)
                 buffer[offset++] = (byte)c;
             }
             break;
+        // CLOB
         case IonTokenConstsX.TOKEN_STRING_DOUBLE_QUOTE:
             while (len-- > 0) {
                 c = _scanner.read_double_quoted_char(true);
@@ -868,10 +870,11 @@ private int readBytes(byte[] buffer, int offset, int len)
                     }
                     break;
                 }
-                assert(c >= 0 && c <= UNSIGNED_BYTE_MAX_VALUE);
+                assert(c <= UNSIGNED_BYTE_MAX_VALUE);
                 buffer[offset++] = (byte)c;
             }
             break;
+        // CLOB 
         case IonTokenConstsX.TOKEN_STRING_TRIPLE_QUOTE:
             while (len-- > 0) {
                 c = _scanner.read_triple_quoted_char(true);
diff --git a/test/software/amazon/ion/BadIonTest.java b/test/software/amazon/ion/BadIonTest.java
index ff02120175..326066842a 100644
--- a/test/software/amazon/ion/BadIonTest.java
+++ b/test/software/amazon/ion/BadIonTest.java
@@ -18,10 +18,12 @@
 import static software.amazon.ion.TestUtils.testdataFiles;
 
 import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
 import software.amazon.ion.impl.PrivateUtils;
 import software.amazon.ion.junit.Injected.Inject;
 
@@ -75,7 +77,15 @@ public void testLoadString()
             }
             catch (IonException e)
             {
-                assert myTestFile.getPath().contains("bad/utf8") || myTestFile.getPath().contains("bad\\utf8");
+                // checks that test failed because of bad UTF-8 data
+                final CharBuffer buffer = CharBuffer.allocate(1024);
+                final CharsetEncoder utf8Encoder = Charset.forName("UTF-8").newEncoder();
+
+                final FileReader fileReader = new FileReader(myTestFile);
+                while(fileReader.read(buffer) != -1){
+                    assert utf8Encoder.canEncode(buffer);
+                }
+
                 return;
             }
 
diff --git a/test/software/amazon/ion/TestUtils.java b/test/software/amazon/ion/TestUtils.java
index f50ff04276..d7ade58f7c 100644
--- a/test/software/amazon/ion/TestUtils.java
+++ b/test/software/amazon/ion/TestUtils.java
@@ -130,12 +130,16 @@ public boolean accept(File dir, String name)
     public static final FilenameFilter GLOBAL_SKIP_LIST =
         new FileIsNot(
              "bad/clobWithNullCharacter.ion"                // TODO amzn/ion-java#43
-            , "bad/clobWithNonAsciiCharacter.ion"           // TODO amzn/ion-java#99
             , "bad/emptyAnnotatedInt.10n"                   // TODO amzn/ion-java#55
-            , "bad/utf8/surrogate_5.ion"                    // TODO amzn/ion-java#60
             , "bad/utf8/surrogate_1.ion"                    // TODO amzn/ion-java#105
             , "bad/utf8/surrogate_2.ion"                    // TODO amzn/ion-java#105
             , "bad/utf8/surrogate_4.ion"                    // TODO amzn/ion-java#105
+            , "bad/utf8/surrogate_5.ion"                    // TODO amzn/ion-java#60
+            , "bad/utf8/surrogate_6.ion"                    // TODO amzn/ion-java#105
+            , "bad/utf8/surrogate_7.ion"                    // TODO amzn/ion-java#105
+            , "bad/utf8/surrogate_8.ion"                    // TODO amzn/ion-java#105
+            , "bad/utf8/surrogate_9.ion"                    // TODO amzn/ion-java#105
+            , "bad/utf8/surrogate_10.ion"                   // TODO amzn/ion-java#105
             , "equivs/paddedInts.10n"                       // TODO amzn/ion-java#54
             , "good/subfieldVarUInt32bit.ion"               // TODO amzn/ion-java#62
             , "good/utf16.ion"                              // TODO amzn/ion-java#61

From f8dad16d1c17deca775dd08b43a3a192c453c90b Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Mon, 17 Dec 2018 21:04:20 +0000
Subject: [PATCH 037/490] Replaces Timestamp internals with Calendar. (#195)

* Makes Timestamp use Calendar internally for date arithmetic and leap year calculations.

* Removes Timestamp's individual fields in favor of a backing Calendar.

* Adds support in Timestamp for receiving lenient Calendars as input.

* Creates the Timestamp.addSecond(long seconds) method and enhances some JavaDoc comments.
---
 src/software/amazon/ion/Timestamp.java      | 714 +++++++++-----------
 test/software/amazon/ion/TimestampTest.java | 525 +++++++++-----
 2 files changed, 678 insertions(+), 561 deletions(-)

diff --git a/src/software/amazon/ion/Timestamp.java b/src/software/amazon/ion/Timestamp.java
index 7d504fd47a..2f5fa7c3f1 100644
--- a/src/software/amazon/ion/Timestamp.java
+++ b/src/software/amazon/ion/Timestamp.java
@@ -23,7 +23,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.TimeZone;
+
 import software.amazon.ion.impl.PrivateUtils;
 import software.amazon.ion.util.IonTextUtils;
 
@@ -68,6 +68,16 @@
  *   <li>{@code 2009-01-01T00:00:00.000Z} <em>etc.</em></li>
  * </ul>
  *
+ *
+ * <h4>Date Arithmetic and Leap Years</h4>
+ * Date arithmetic is performed according to the logic provided by
+ * {@link Calendar#add(int, int)}. When constructed by {@link Timestamp#forCalendar(Calendar)}
+ * the new Timestamp and any other Timestamps that spawn from it (e.g. through
+ * {@link #clone()}, {@link #addDay(int)}, etc.) will use the given Calendar's date arithmetic
+ * rules, including its rules for determining leap years. When constructed without a
+ * Calendar, a default GregorianCalendar (as constructed by
+ * <code>new GregorianCalendar(TimeZone.getTimeZone("UTC"))</code> will be used.
+ *
  * @see #equals(Timestamp)
  * @see #compareTo(Timestamp)
  */
@@ -84,15 +94,6 @@ public final class Timestamp
     private static final int NO_SECONDS = 0;
     private static final BigDecimal NO_FRACTIONAL_SECONDS = null;
 
-    // 0001-01-01T00:00:00.0Z in millis
-    private static final long MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS = -62135769600000L;
-
-    // 0001-01-01T00:00:00.0Z in millis
-    static final BigDecimal MINIMUM_ALLOWED_FRACTIONAL_MILLIS = new BigDecimal(MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS);
-
-    // 10000T in millis, upper bound exclusive
-    static final BigDecimal FRACTIONAL_MILLIS_UPPER_BOUND = new BigDecimal(253402300800000L);
-
     /**
      * Unknown local offset from UTC.
      */
@@ -162,18 +163,16 @@ public boolean includes(Precision isIncluded)
      */
     private Precision   _precision;
 
-    // These are the time field values for the Timestamp.
-    // _month and _day are 1-based (0 is an invalid value for
-    // these in a non-null Timestamp).
-    // TODO amzn/ion-java#28 - Represent internal time field values in its local time,
-    // instead of UTC. This makes it much less confusing.
-    private short       _year;
-    private byte        _month = 1; // Initialized to valid default
-    private byte        _day   = 1; // Initialized to valid default
-    private byte        _hour;
-    private byte        _minute;
-    private byte        _second;
-    private BigDecimal  _fraction;  // fractional seconds, must be within range [0, 1)
+    /**
+     * Calendar to hold the Timestamp's year, month, day, hour, minute, second, and calendar system. Fractional
+     * seconds are left to {@link #_fraction}, while local offset is left to {@link #_offset}.
+     */
+    private final Calendar _calendar;
+
+    /**
+     * Fractional seconds. Must be within range [0, 1).
+     */
+    private BigDecimal  _fraction;
 
     /**
      * Minutes offset from UTC; zero means UTC proper,
@@ -181,39 +180,18 @@ public boolean includes(Precision isIncluded)
      */
     private Integer     _offset;
 
-                                                      //   jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec
-                                                      // the first 0 is to make these arrays 1 based (since month values are 1-12)
-    private static final int[] LEAP_DAYS_IN_MONTH   = { 0,  31,  29,  31,  30,  31,  30,  31,  31,  30,  31,  30,  31 };
-    private static final int[] NORMAL_DAYS_IN_MONTH = { 0,  31,  28,  31,  30,  31,  30,  31,  31,  30,  31,  30,  31 };
-
-    private static int last_day_in_month(int year, int month) {
-        boolean is_leap;
-        if ((year % 4) == 0) {
-            // divisible by 4 (lower 2 bits are zero) - may be a leap year
-            if ((year % 100) == 0) {
-                // and divisible by 100 - not a leap year
-                if ((year % 400) == 0) {
-                    // but divisible by 400 - then it is a leap year
-                    is_leap = true;
-                }
-                else {
-                    is_leap = false;
-                }
-            }
-            else {
-                is_leap = true;
-            }
-        }
-        else {
-            is_leap = false;
-        }
-        return is_leap ? LEAP_DAYS_IN_MONTH[month] : NORMAL_DAYS_IN_MONTH[month];
-    }
+    // Minimum millis under the calendar system provided by the default GregorianCalendar implementation.
+    private static final long MINIMUM_TIMESTAMP_IN_MILLIS = Timestamp.valueOf("0001-01-01T00:00:00.000Z").getMillis();
+    static final BigDecimal MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL = new BigDecimal(MINIMUM_TIMESTAMP_IN_MILLIS);
+
+    // 10000T in millis, upper bound exclusive, under the calendar system provided by the default GregorianCalendar implementation.
+    private static final long UPPER_BOUND_TIMESTAMP_IN_MILLIS = Timestamp.valueOf("9999-12-31T23:59:59.999-00:00").getMillis() + 1;
+    static final BigDecimal UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL = new BigDecimal(UPPER_BOUND_TIMESTAMP_IN_MILLIS);
 
     /**
      * Applies the local time zone offset from UTC to the applicable time field
      * values. Depending on the local time zone offset, adjustments
-     * (i.e. rollover) will be made to the Year, Day, Hour, Minute time field
+     * (i.e. rollover) will be made to the calendar's year, day, hour, and minute
      * values.
      *
      * @param offset the local offset, in minutes from UTC.
@@ -228,164 +206,80 @@ private void apply_offset(int offset)
         offset = -offset;
         int hour_offset = offset / 60;
         int min_offset = offset - (hour_offset * 60);
-        if (offset < 0) {
-            _minute += min_offset;  // lower the minute value by adding a negative offset
-            _hour += hour_offset;
-            if (_minute < 0) {
-                _minute += 60;
-                _hour -= 1;
-            }
-            if (_hour >= 0) return;  // hour is 0-23
-            _hour += 24;
-            _day -= 1;
-            if (_day >= 1) return;  // day is 1-31
-            // we can't do this until we've figured out the month and year: _day += last_day_in_month(_year, _month);
-            _month -= 1;
-            if (_month >= 1) {
-                _day += last_day_in_month(_year, _month);  // now we know (when the year doesn't change
-                assert(_day == last_day_in_month(_year, _month));
-                return;  // 1-12
-            }
-            _month += 12;
-            _year -= 1;
-            if (_year < 1) throw new IllegalArgumentException("year is less than 1");
-            _day += last_day_in_month(_year, _month);  // and now we know, even if the year did change
-            assert(_day == last_day_in_month(_year, _month));
-        }
-        else {
-            _minute += min_offset;  // lower the minute value by adding a negative offset
-            _hour += hour_offset;
-            if (_minute > 59) {
-                _minute -= 60;
-                _hour += 1;
-            }
-            if (_hour < 24) return;  // hour is 0-23
-            _hour -= 24;
-            _day += 1;
-            if (_day <= last_day_in_month(_year, _month)) return;  // day is 1-31
-            // we can't do this until we figure out the final month and year: _day -= last_day_in_month(_year, _month);
-            _day = 1; // this is always the case
-            _month += 1;
-            if (_month <= 12) {
-                return;  // 1-12
-            }
-            _month -= 12;
-            _year += 1;
-            if (_year > 9999) throw new IllegalArgumentException("year exceeds 9999");
-        }
+        // First, clear the offsets that are already set. Otherwise, the 'add' calls will add them in, which will
+        // result in a double add.
+        _calendar.clear(Calendar.ZONE_OFFSET);
+        _calendar.clear(Calendar.DST_OFFSET);
+        _calendar.add(Calendar.MINUTE, min_offset);
+        _calendar.add(Calendar.HOUR_OF_DAY, hour_offset);
     }
 
     /**
-     * This method uses deprecated methods from {@link java.util.Date}
-     * instead of {@link Calendar} so that this code can be used (more easily)
-     * on the mobile Java platform (which has Date but does not have Calendar).
+     * Create a Calendar from a number of milliseconds and the given local offset.
+     * @param millis a number of epoch milliseconds.
+     * @param localOffset a local offset in minutes.
+     * @return a new Calendar.
      */
-    @SuppressWarnings("deprecation")
-    private void set_fields_from_millis(long millis)
-    {
-        if(millis < MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS) {
-            throw new IllegalArgumentException("year is less than 1");
+    private static Calendar calendarFromMillis(long millis, Integer localOffset) {
+        Calendar calendar = new GregorianCalendar(PrivateUtils.UTC);
+        calendar.clear();
+        calendar.setTimeInMillis(millis);
+        if (localOffset != null) {
+            calendar.set(Calendar.ZONE_OFFSET, localOffset * 60 * 1000);
         }
-
-        Date date = new Date(millis);
-
-        // https://github.com/amzn/ion-java/issues/160
-        // The java.util.Date(long) constructor expects an epoch time in milliseconds, and getYear(), getMonth(),
-        // getHour() on the resulting Date are supposed to return values adjusted to the default timezone.
-        // In Pacific Standard Time (offset -08:00), for a Date constructed with an epoch time equivalent to
-        // 0001-01-01T00:00:00.000Z, the Date.get*() methods should return values for
-        // 0000-12-31T16:00:00.000Z;  however, Date.getYear() incorrectly returns a value for year 1 (-1899)
-        // in this scenario. The following if/else block compensates for this bug:
-        int currentRawOffset = TimeZone.getDefault().getRawOffset();
-        if(currentRawOffset < 0 && MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS - currentRawOffset > millis) {
-            this._year = 0;
-        } else {
-            this._year = checkAndCastYear(date.getYear() + 1900);
-        }
-
-        // Note: date.get*() return values are in the local timezone!
-        this._month   = checkAndCastMonth(date.getMonth() + 1);  // calendar months are 0 based, timestamp months are 1 based
-        this._day     = checkAndCastDay(date.getDate(), _year, _month);
-        this._hour    = checkAndCastHour(date.getHours());
-        this._minute  = checkAndCastMinute(date.getMinutes());
-        this._second  = checkAndCastSecond(date.getSeconds());
-
-        // this is done because the y-m-d values are in the local timezone
-        // so this adjusts the value back to zulu time (UTC)
-        // Note that the sign on this is opposite of Ion (and Calendar) offset.
-        // Example: PST = 480 here but Ion/Calendar use -480 = -08:00 = UTC-8
-        int offset = date.getTimezoneOffset();
-        this.apply_offset(-offset);
+        return calendar;
     }
 
     /**
      * Copies data from a {@link Calendar} into this timestamp.
      * Must only be called during construction due to timestamp immutabliity.
      *
-     * @param cal must have at least one field set.
+     * @param setLocalOffset if true and the given calendar has its ZONE_OFFSET set, sets the timestamp's _offset field.
+     * @param applyLocalOffset if true and _offset has been set to a known offset, applies the local offset to the
+     *                         timestamp's fields to convert them from local time to UTC. This should be false whenever
+     *                         the given calendar is already in UTC (such as when it was constructed from millis).
      *
      * @throws IllegalArgumentException if the calendar has no fields set.
      */
-    private void set_fields_from_calendar(Calendar cal,
-                                          Precision precision,
-                                          boolean setLocalOffset)
+    private void setFieldsFromCalendar(Precision precision,
+                                       boolean setLocalOffset,
+                                       boolean applyLocalOffset)
     {
         _precision = precision;
         _offset = UNKNOWN_OFFSET;
-        boolean dayPrecision = false;
-        boolean calendarHasMilliseconds = cal.isSet(Calendar.MILLISECOND);
+        boolean calendarHasMilliseconds = _calendar.isSet(Calendar.MILLISECOND);
 
         switch (this._precision) {
             case SECOND:
-                this._second = checkAndCastSecond(cal.get(Calendar.SECOND));
                 if (calendarHasMilliseconds) {
-                    BigDecimal millis = BigDecimal.valueOf(cal.get(Calendar.MILLISECOND));
+                    BigDecimal millis = BigDecimal.valueOf(_calendar.get(Calendar.MILLISECOND));
                     this._fraction = millis.movePointLeft(3); // convert to fraction
+                    checkFraction(precision, this._fraction);
                 }
             case MINUTE:
             {
-                this._hour   = checkAndCastHour(cal.get(Calendar.HOUR_OF_DAY));
-                this._minute = checkAndCastMinute(cal.get(Calendar.MINUTE));
-
-                // If this test is made before calling get(), it will return
-                // false even when Calendar.setTimeZone() was called.
-                if (setLocalOffset && cal.isSet(Calendar.ZONE_OFFSET))
+                int offset = _calendar.get(Calendar.ZONE_OFFSET);
+                if (setLocalOffset)
                 {
-                    int offset = cal.get(Calendar.ZONE_OFFSET);
-                    if (cal.isSet(Calendar.DST_OFFSET)) {
-                        offset += cal.get(Calendar.DST_OFFSET);
+                    if (_calendar.isSet(Calendar.DST_OFFSET)) {
+                        offset += _calendar.get(Calendar.DST_OFFSET);
                     }
-
                     // convert ms to minutes
                     _offset = offset / (1000*60);
                 }
             }
             case DAY:
-                dayPrecision = true;
             case MONTH:
-                // Calendar months are 0 based, Timestamp months are 1 based
-                this._month  = checkAndCastMonth((cal.get(Calendar.MONTH) + 1));
             case YEAR:
-                int year;
-                if(cal.get(Calendar.ERA) == GregorianCalendar.AD) {
-                    year = cal.get(Calendar.YEAR);
-                }
-                else {
-                    year = -cal.get(Calendar.YEAR);
-                }
-
-                this._year = checkAndCastYear(year);
-        }
-
-        if (dayPrecision)
-        {
-            this._day = checkAndCastDay(cal.get(Calendar.DAY_OF_MONTH), _year, _month);
         }
 
-        if (_offset != UNKNOWN_OFFSET) {
+        if (_offset != UNKNOWN_OFFSET && applyLocalOffset) {
             // Transform our members from local time to Zulu
             this.apply_offset(_offset);
         }
+        // fractional seconds are ONLY tracked by the _fraction field.
+        _calendar.clear(Calendar.MILLISECOND);
+        checkCalendarYear(_calendar);
     }
 
     /**
@@ -482,6 +376,8 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
                       int zhour, int zminute, int zsecond, BigDecimal frac,
                       Integer offset, boolean shouldApplyOffset)
     {
+        _calendar = new GregorianCalendar(PrivateUtils.UTC);
+        _calendar.clear();
         boolean dayPrecision = false;
 
         switch (p) {
@@ -496,22 +392,23 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
             {
                 _fraction = frac.abs();
             }
-            _second = checkAndCastSecond(zsecond);
+            _calendar.set(Calendar.SECOND, checkAndCastSecond(zsecond));
         case MINUTE:
-            _minute = checkAndCastMinute(zminute);
-            _hour   = checkAndCastHour(zhour);
+            _calendar.set(Calendar.MINUTE, checkAndCastMinute(zminute));
+            _calendar.set(Calendar.HOUR_OF_DAY, checkAndCastHour(zhour));
             _offset = offset;      // offset must be null for years/months/days
         case DAY:
              dayPrecision = true;
         case MONTH:
-            _month  = checkAndCastMonth(zmonth);
+            _calendar.set(Calendar.MONTH, checkAndCastMonth(zmonth) - 1);
         case YEAR:
-            _year   = checkAndCastYear(zyear);
+            _calendar.set(Calendar.YEAR, checkAndCastYear(zyear));
         }
 
         if (dayPrecision)
         {
-            _day    = checkAndCastDay(zday, zyear, zmonth);
+            checkCalendarDay(zday);
+            _calendar.set(Calendar.DAY_OF_MONTH, zday);
         }
 
         _precision = checkFraction(p, _fraction);
@@ -528,8 +425,10 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
      * applied</em> to the time components.
      * As such, if the given {@code offset} is non-null or zero, the resulting
      * Timestamp will have time values that <em>DO NOT</em> match the time
-     * parameters. This method also has a behavior of precision "narrowing",
-     * detailed in the sub-section below.
+     * parameters. A default {@link GregorianCalendar} will be used to
+     * perform any arithmetic operations on the resulting Timestamp. This
+     * method also has a behavior of precision "narrowing", detailed in the
+     * sub-section below.
      *
      * <p>
      * For example, the following method calls will return Timestamps with
@@ -625,51 +524,62 @@ else if (cal.isSet(Calendar.YEAR)) {
         else {
             throw new IllegalArgumentException("Calendar has no fields set");
         }
-
-        set_fields_from_calendar(cal, precision, true);
+        _calendar = (Calendar) cal.clone();
+        setFieldsFromCalendar(precision, true, APPLY_OFFSET_YES);
     }
 
 
     private Timestamp(Calendar cal, Precision precision, BigDecimal fraction,
                       Integer offset)
     {
-        set_fields_from_calendar(cal, precision, false);
+        this._calendar = cal;
+        setFieldsFromCalendar(precision, false, APPLY_OFFSET_NO);
         _fraction = fraction;
         if (offset != null)
         {
             _offset = offset;
-            apply_offset(offset);
         }
     }
 
+    private static void throwTimestampOutOfRangeError(Number millis) {
+        throw new IllegalArgumentException("millis: " + millis + " is outside of valid the range: from "
+                + MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL
+                + " (0001T)"
+                + ", inclusive, to "
+                + UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL
+                + " (10000T)"
+                + " , exclusive");
+    }
 
     private Timestamp(BigDecimal millis, Precision precision, Integer localOffset)
     {
-        long ms = millis.longValue();
-        set_fields_from_millis(ms);
+        if (millis == null) throw new NullPointerException("millis is null");
 
-        switch (precision)
-        {
-            case YEAR:
-                _month  = 1;
-            case MONTH:
-                _day    = 1;
-            case DAY:
-                _hour   = 0;
-                _minute = 0;
-            case MINUTE:
-                _second = 0;
-                _fraction = null;
-                break;
-            case SECOND:
-                BigDecimal secs = millis.movePointLeft(3);
-                BigDecimal secsDown = secs.setScale(0, RoundingMode.FLOOR);
-                _fraction = secs.subtract(secsDown);
+        // check bounds to avoid hanging when calling longValue() on decimals with large positive exponents,
+        // e.g. 1e10000000
+        if(millis.compareTo(MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL) < 0 ||
+                UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL.compareTo(millis) <= 0) {
+            throwTimestampOutOfRangeError(millis);
         }
 
-        _precision = checkFraction(precision, _fraction);
+        // quick handle integral zero
+        long ms = isIntegralZero(millis) ? 0 : millis.longValue();
+
+        _calendar = calendarFromMillis(ms, localOffset);
+        setFieldsFromCalendar(precision, localOffset != null, APPLY_OFFSET_NO);
 
-        _offset = localOffset;
+        // The given BigDecimal may contain greater than milliseconds precision, which is the maximum precision that
+        // a Calendar can handle. Set the _fraction here so that extra precision (if any) is not lost.
+        // However, don't set the fraction if the given BigDecimal does not have precision at least to the tenth of
+        // a second.
+        if (precision == Precision.SECOND && millis.scale() > -3) {
+            BigDecimal secs = millis.movePointLeft(3);
+            BigDecimal secsDown = fastRoundZeroFloor(secs);
+            _fraction = secs.subtract(secsDown);
+        } else {
+            _fraction = null;
+        }
+        checkFraction(precision, _fraction);
     }
 
 
@@ -708,37 +618,7 @@ private Timestamp(BigDecimal millis, Precision precision, Integer localOffset)
     @Deprecated
     private Timestamp(BigDecimal millis, Integer localOffset)
     {
-        if (millis == null) throw new NullPointerException("millis is null");
-
-        // check bounds to avoid hanging when calling longValue() on decimals with large positive exponents,
-        // e.g. 1e10000000
-        if(millis.compareTo(MINIMUM_ALLOWED_FRACTIONAL_MILLIS) < 0 ||
-            FRACTIONAL_MILLIS_UPPER_BOUND.compareTo(millis) < 0) {
-            throw new IllegalArgumentException("millis: " + millis + " is outside of valid the range: from "
-                + MINIMUM_ALLOWED_FRACTIONAL_MILLIS
-                + " (0001T)"
-                + ", inclusive, to "
-                + FRACTIONAL_MILLIS_UPPER_BOUND
-                + " (10000T)"
-                + " , exclusive");
-        }
-
-        // quick handle integral zero
-        long ms = isIntegralZero(millis) ? 0 : millis.longValue();
-
-        set_fields_from_millis(ms);
-
-        this._precision = Precision.SECOND;
-        int scale = millis.scale();
-        if (scale <= -3) {
-            this._fraction = null;
-        }
-        else {
-            BigDecimal secs = millis.movePointLeft(3);
-            BigDecimal secsDown = fastRoundZeroFloor(secs);
-            this._fraction = secs.subtract(secsDown);
-        }
-        this._offset = localOffset;
+        this(millis, Precision.SECOND, localOffset);
     }
 
     private BigDecimal fastRoundZeroFloor(final BigDecimal decimal) {
@@ -769,15 +649,11 @@ private boolean isIntegralZero(final BigDecimal decimal) {
     @Deprecated
     private Timestamp(long millis, Integer localOffset)
     {
-        this.set_fields_from_millis(millis);
-
-        // fractional seconds portion
-        BigDecimal secs = BigDecimal.valueOf(millis).movePointLeft(3);
-        BigDecimal secsDown = secs.setScale(0, RoundingMode.FLOOR);
-        this._fraction = secs.subtract(secsDown);
-        this._precision = checkFraction(Precision.SECOND, _fraction);
-
-        this._offset = localOffset;
+        if(millis < MINIMUM_TIMESTAMP_IN_MILLIS || millis >= UPPER_BOUND_TIMESTAMP_IN_MILLIS) {
+            throwTimestampOutOfRangeError(millis);
+        }
+        this._calendar = calendarFromMillis(millis, localOffset);
+        setFieldsFromCalendar(Precision.SECOND, localOffset != null, APPLY_OFFSET_NO);
     }
 
 
@@ -806,6 +682,8 @@ private static IllegalArgumentException fail(CharSequence input)
     /**
      * Returns a new Timestamp that represents the point in time, precision
      * and local offset defined in Ion format by the {@link CharSequence}.
+     * A default {@link GregorianCalendar} will be used to perform any
+     * arithmetic operations on the resulting Timestamp.
      *
      * @param ionFormattedTimestamp
      *          a sequence of characters that is the Ion representation of a
@@ -1069,27 +947,15 @@ private static boolean isValidFollowChar(char c) {
 
     /**
      * Creates a copy of this Timestamp. The resulting Timestamp will
-     * represent the same point in time and has the same precision and local
-     * offset.
+     * represent the same point in time, have the same precision and local
+     * offset, and use the same calendar system for date arithmetic.
      * <p>
      * {@inheritDoc}
      */
     @Override
     public Timestamp clone()
     {
-        // The Copy-Constructor we're using here already expects the time field
-        // values to be in UTC, and that is already what we have for this
-        // Timestamp -- no adjustment necessary to make it local time.
-        return new Timestamp(_precision,
-                             _year,
-                             _month,
-                             _day,
-                             _hour,
-                             _minute,
-                             _second,
-                             _fraction,
-                             _offset,
-                             APPLY_OFFSET_NO);
+        return new Timestamp((Calendar) _calendar.clone(), _precision, _fraction, _offset);
     }
 
     /**
@@ -1105,22 +971,7 @@ private Timestamp make_localtime()
             ? _offset.intValue()
             : 0;
 
-        // We use a Copy-Constructor that expects the time parameters to be in
-        // UTC, as that's what we're supposed to have.
-        // As this Copy-Constructor doesn't apply local offset to the time
-        // field values (it assumes that the local offset is already applied to
-        // them), we explicitly apply the local offset to the time field values
-        // after we obtain the new Timestamp instance.
-        Timestamp localtime = new Timestamp(_precision,
-                                            _year,
-                                            _month,
-                                            _day,
-                                            _hour,
-                                            _minute,
-                                            _second,
-                                            _fraction,
-                                            _offset,
-                                            APPLY_OFFSET_NO);
+        Timestamp localtime = clone();
         // explicitly apply the local offset to the time field values
         localtime.apply_offset(-offset);
 
@@ -1131,6 +982,8 @@ private Timestamp make_localtime()
 
     /**
      * Returns a Timestamp, precise to the year, with unknown local offset.
+     * A default {@link GregorianCalendar} will be used to perform any
+     * arithmetic operations on the resulting Timestamp.
      * <p>
      * This is equivalent to the corresponding Ion value {@code YYYYT}.
      */
@@ -1141,6 +994,8 @@ public static Timestamp forYear(int yearZ)
 
     /**
      * Returns a Timestamp, precise to the month, with unknown local offset.
+     * A default {@link GregorianCalendar} will be used to perform any
+     * arithmetic operations on the resulting Timestamp.
      * <p>
      * This is equivalent to the corresponding Ion value {@code YYYY-MMT}.
      */
@@ -1151,6 +1006,8 @@ public static Timestamp forMonth(int yearZ, int monthZ)
 
     /**
      * Returns a Timestamp, precise to the day, with unknown local offset.
+     * A default {@link GregorianCalendar} will be used to perform any
+     * arithmetic operations on the resulting Timestamp.
      * <p>
      * This is equivalent to the corresponding Ion value {@code YYYY-MM-DD}.
      *
@@ -1163,7 +1020,8 @@ public static Timestamp forDay(int yearZ, int monthZ, int dayZ)
 
     /**
      * Returns a Timestamp, precise to the minute, with a given local
-     * offset.
+     * offset. A default {@link GregorianCalendar} will be used to perform any
+     * arithmetic operations on the resulting Timestamp.
      * <p>
      * This is equivalent to the corresponding Ion value
      * {@code YYYY-MM-DDThh:mm+-oo:oo}, where {@code oo:oo} represents the
@@ -1184,6 +1042,8 @@ public static Timestamp forMinute(int year, int month, int day,
 
     /**
      * Returns a Timestamp, precise to the second, with a given local offset.
+     * A default {@link GregorianCalendar} will be used to perform any
+     * arithmetic operations on the resulting Timestamp.
      * <p>
      * This is equivalent to the corresponding Ion value
      * {@code YYYY-MM-DDThh:mm:ss+-oo:oo}, where {@code oo:oo} represents the
@@ -1204,6 +1064,8 @@ public static Timestamp forSecond(int year, int month, int day,
 
     /**
      * Returns a Timestamp, precise to the second, with a given local offset.
+     * A default {@link GregorianCalendar} will be used to perform any
+     * arithmetic operations on the resulting Timestamp.
      * <p>
      * This is equivalent to the corresponding Ion value
      * {@code YYYY-MM-DDThh:mm:ss.sss+-oo:oo}, where {@code oo:oo} represents
@@ -1232,6 +1094,14 @@ public static Timestamp forSecond(int year, int month, int day,
     /**
      * Returns a Timestamp that represents the point in time that is
      * {@code millis} milliseconds from the epoch, with a given local offset.
+     * A default {@link GregorianCalendar} will be used to perform any
+     * arithmetic operations on the resulting Timestamp.
+     * <p>
+     * <strong>NOTE:</strong> this means that providing a number of milliseconds
+     * that was produced using a different calendar system may result in a Timestamp
+     * that represents a different point in time than the one that originally
+     * produced the milliseconds. In this case, {@link #forCalendar(Calendar)} should
+     * be used instead.
      * <p>
      * The resulting Timestamp will be precise to the millisecond.
      *
@@ -1252,7 +1122,14 @@ public static Timestamp forMillis(long millis, Integer localOffset)
      * Returns a Timestamp that represents the point in time that is
      * {@code millis} milliseconds (including any fractional
      * milliseconds) from the epoch, with a given local offset.
-     *
+     * A default {@link GregorianCalendar} will be used to perform any
+     * arithmetic operations on the resulting Timestamp.
+     * <p>
+     * <strong>NOTE:</strong> this means that providing a number of milliseconds
+     * that was produced using a different calendar system may result in a Timestamp
+     * that represents a different point in time than the one that originally
+     * produced the milliseconds. In this case, {@link #forCalendar(Calendar)} should
+     * be used instead.
      * <p>
      * The resulting Timestamp will be precise to the second if {@code millis}
      * doesn't contain information that is more granular than seconds.
@@ -1290,7 +1167,8 @@ public static Timestamp forMillis(BigDecimal millis, Integer localOffset)
     /**
      * Converts a {@link Calendar} to a Timestamp, preserving the calendar's
      * time zone as the equivalent local offset when it has at least minutes
-     * precision.
+     * precision. The given Calendar will be used to perform any arithmetic
+     * operations on the resulting Timestamp.
      *
      * @return a Timestamp instance, with precision determined by the smallest
      *   field set in the {@code Calendar};
@@ -1306,7 +1184,8 @@ public static Timestamp forCalendar(Calendar calendar)
 
     /**
      * Converts a {@link Date} to a Timestamp in UTC representing the same
-     * point in time.
+     * point in time. A default {@link GregorianCalendar} will be used to perform
+     * any arithmetic operations on the resulting Timestamp.
      * <p>
      * The resulting Timestamp will be precise to the millisecond.
      *
@@ -1325,7 +1204,8 @@ public static Timestamp forDateZ(Date date)
 
     /**
      * Converts a {@link java.sql.Timestamp} to a Timestamp in UTC representing
-     * the same point in time.
+     * the same point in time. A default {@link GregorianCalendar} will be used to perform
+     * any arithmetic operations on the resulting Timestamp.
      * <p>
      * The resulting Timestamp will be precise to the nanosecond.
      *
@@ -1352,7 +1232,8 @@ public static Timestamp forSqlTimestampZ(java.sql.Timestamp sqlTimestamp)
 
     /**
      * Returns a Timestamp representing the current time (based on the JVM
-     * clock), with an unknown local offset.
+     * clock), with an unknown local offset. A default {@link GregorianCalendar}
+     * will be used to perform any arithmetic operations on the resulting Timestamp.
      * <p>
      * The resulting Timestamp will be precise to the millisecond.
      *
@@ -1367,7 +1248,8 @@ public static Timestamp now()
 
     /**
      * Returns a Timestamp in UTC representing the current time (based on the
-     * the JVM clock).
+     * the JVM clock). A default {@link GregorianCalendar} will be used to perform
+     * any arithmetic operations on the resulting Timestamp.
      * <p>
      * The resulting Timestamp will be precise to the millisecond.
      *
@@ -1401,10 +1283,11 @@ public Date dateValue()
         return new Date(millis);
     }
 
-
     /**
      * Converts the value of this Timestamp as a {@link Calendar}, in its
-     * local time.
+     * local time. The resulting Calendar will have its fields set up to
+     * this Timestamp's precision. The maximum fractional precision supported
+     * by Calendar is milliseconds; any additional precision will be truncated.
      * <p>
      * Because {@link Calendar} instances are mutable, this method returns a
      * new instance from each call.
@@ -1414,22 +1297,26 @@ public Date dateValue()
      */
     public Calendar calendarValue()
     {
-        Calendar cal = new GregorianCalendar(PrivateUtils.UTC);
-
-        long millis = getMillis();
-        Integer offset = _offset;
-        if (offset != null && offset != 0)
+        Calendar cal = (Calendar) _calendar.clone();
+        if (_precision.includes(Precision.SECOND)) {
+            if (this._fraction != null)
+            {
+                int fractionalMillis = this._fraction.movePointRight(3).intValue();
+                cal.set(Calendar.MILLISECOND, fractionalMillis);
+            }
+        }
+        if (_precision.includes(Precision.MINUTE) && _offset != null && _offset != 0)
         {
-            int offsetMillis = offset * 60 * 1000;
-            millis += offsetMillis;
-            cal.setTimeInMillis(millis);                // Resets the offset!
+            int offsetMillis = _offset * 60 * 1000;
+            cal.add(Calendar.MILLISECOND, offsetMillis);
             cal.set(Calendar.ZONE_OFFSET, offsetMillis);
         }
-        else
-        {
-            cal.setTimeInMillis(millis);
+        if (!_precision.includes(Precision.SECOND)) {
+            cal.clear(Calendar.SECOND);
+        }
+        if (_fraction == null) {
+            cal.clear(Calendar.MILLISECOND);
         }
-
         return cal;
     }
 
@@ -1437,7 +1324,7 @@ public Calendar calendarValue()
     /**
      * Returns a number representing the Timestamp's point in time that is
      * the number of milliseconds (<em>ignoring</em> any fractional milliseconds)
-     * from the epoch.
+     * from the epoch, using this Timestamp's configured Calendar.
      * <p>
      * This method will return the same result for all Timestamps representing
      * the same point in time, regardless of the local offset.
@@ -1446,11 +1333,9 @@ public Calendar calendarValue()
      *          number of milliseconds (<em>ignoring</em> any fractional
      *          milliseconds) from the epoch (1970-01-01T00:00:00.000Z)
      */
-    @SuppressWarnings("deprecation")
     public long getMillis()
     {
-        //                                        month is 0 based for Date
-        long millis = Date.UTC(this._year - 1900, this._month - 1, this._day, this._hour, this._minute, this._second);
+        long millis = _calendar.getTimeInMillis();
         if (this._fraction != null) {
             BigDecimal fracAsDecimal = this._fraction.movePointRight(3);
             int frac = isIntegralZero(fracAsDecimal) ? 0 : fracAsDecimal.intValue();
@@ -1463,7 +1348,7 @@ public long getMillis()
     /**
      * Returns a BigDecimal representing the Timestamp's point in time that is
      * the number of milliseconds (<em>including</em> any fractional milliseconds)
-     * from the epoch.
+     * from the epoch, using this Timestamp's configured Calendar.
      * <p>
      * This method will return the same result for all Timestamps representing
      * the same point in time, regardless of the local offset.
@@ -1472,20 +1357,16 @@ public long getMillis()
      *          number of milliseconds (<em>including</em> any fractional
      *          milliseconds) from the epoch (1970-01-01T00:00:00.000Z)
      */
-    @SuppressWarnings("deprecation")
     public BigDecimal getDecimalMillis()
     {
-        long       millis;
-        BigDecimal dec;
-
         switch (this._precision) {
         case YEAR:
         case MONTH:
         case DAY:
         case MINUTE:
         case SECOND:
-            millis = Date.UTC(this._year - 1900, this._month - 1, this._day, this._hour, this._minute, this._second);
-            dec = BigDecimal.valueOf(millis);
+            long millis = _calendar.getTimeInMillis();
+            BigDecimal dec = BigDecimal.valueOf(millis);
             if (_fraction != null) {
                 dec = dec.add(this._fraction.movePointRight(3));
             }
@@ -1540,7 +1421,7 @@ public int getYear()
                 adjusted = make_localtime();
             }
         }
-        return adjusted._year;
+        return adjusted.getZYear();
     }
 
 
@@ -1562,7 +1443,7 @@ public int getMonth()
                 adjusted = make_localtime();
             }
         }
-        return adjusted._month;
+        return adjusted.getZMonth();
     }
 
 
@@ -1582,7 +1463,7 @@ public int getDay()
                 adjusted = make_localtime();
             }
         }
-        return adjusted._day;
+        return adjusted.getZDay();
     }
 
 
@@ -1602,7 +1483,7 @@ public int getHour()
                 adjusted = make_localtime();
             }
         }
-        return adjusted._hour;
+        return adjusted.getZHour();
     }
 
 
@@ -1622,7 +1503,7 @@ public int getMinute()
                 adjusted = make_localtime();
             }
         }
-        return adjusted._minute;
+        return adjusted.getZMinute();
     }
 
 
@@ -1640,7 +1521,7 @@ public int getMinute()
      */
     public int getSecond()
     {
-        return this._second;
+        return this.getZSecond();
     }
 
 
@@ -1659,7 +1540,7 @@ public int getSecond()
      */
     public BigDecimal getDecimalSecond()
     {
-        BigDecimal sec = BigDecimal.valueOf(_second);
+        BigDecimal sec = BigDecimal.valueOf(getSecond());
         if (_fraction != null)
         {
             sec = sec.add(_fraction);
@@ -1676,7 +1557,7 @@ public BigDecimal getDecimalSecond()
      */
     public int getZYear()
     {
-        return this._year;
+        return this._calendar.get(Calendar.YEAR);
     }
 
 
@@ -1691,7 +1572,7 @@ public int getZYear()
      */
     public int getZMonth()
     {
-        return this._month;
+        return this._calendar.get(Calendar.MONTH) + 1;
     }
 
 
@@ -1705,7 +1586,7 @@ public int getZMonth()
      */
     public int getZDay()
     {
-        return this._day;
+        return this._calendar.get(Calendar.DAY_OF_MONTH);
     }
 
 
@@ -1719,7 +1600,7 @@ public int getZDay()
      */
     public int getZHour()
     {
-        return this._hour;
+        return this._calendar.get(Calendar.HOUR_OF_DAY);
     }
 
 
@@ -1733,7 +1614,7 @@ public int getZHour()
      */
     public int getZMinute()
     {
-        return this._minute;
+        return this._calendar.get(Calendar.MINUTE);
     }
 
 
@@ -1751,7 +1632,7 @@ public int getZMinute()
      */
     public int getZSecond()
     {
-        return this._second;
+        return this._calendar.get(Calendar.SECOND);
     }
 
 
@@ -1811,17 +1692,7 @@ public Timestamp withLocalOffset(Integer offset)
         {
             return this;
         }
-
-        Timestamp ts = createFromUtcFields(precision,
-                                           getZYear(),
-                                           getZMonth(),
-                                           getZDay(),
-                                           getZHour(),
-                                           getZMinute(),
-                                           getZSecond(),
-                                           getZFractionalSecond(),
-                                           offset);
-        return ts;
+        return new Timestamp((Calendar) _calendar.clone(), precision, _fraction, offset);
     }
 
 
@@ -1958,7 +1829,7 @@ private static void print(Appendable out, Timestamp adjusted)
 
         // so we have a real value - we'll start with the date portion
         // which we always have
-        print_digits(out, adjusted._year, 4);
+        print_digits(out, adjusted.getZYear(), 4);
         if (adjusted._precision == Precision.YEAR) {
             assert adjusted._offset == UNKNOWN_OFFSET;
             out.append("T");
@@ -1966,7 +1837,7 @@ private static void print(Appendable out, Timestamp adjusted)
         }
 
         out.append("-");
-        print_digits(out, adjusted._month, 2);  // convert calendar months to a base 1 value
+        print_digits(out, adjusted.getZMonth(), 2);  // convert calendar months to a base 1 value
         if (adjusted._precision == Precision.MONTH) {
             assert adjusted._offset == UNKNOWN_OFFSET;
             out.append("T");
@@ -1974,7 +1845,7 @@ private static void print(Appendable out, Timestamp adjusted)
         }
 
         out.append("-");
-        print_digits(out, adjusted._day, 2);
+        print_digits(out, adjusted.getZDay(), 2);
         if (adjusted._precision == Precision.DAY) {
             assert adjusted._offset == UNKNOWN_OFFSET;
             // out.append("T");
@@ -1982,13 +1853,13 @@ private static void print(Appendable out, Timestamp adjusted)
         }
 
         out.append("T");
-        print_digits(out, adjusted._hour, 2);
+        print_digits(out, adjusted.getZHour(), 2);
         out.append(":");
-        print_digits(out, adjusted._minute, 2);
+        print_digits(out, adjusted.getZMinute(), 2);
         // ok, so how much time do we have ?
         if (adjusted._precision == Precision.SECOND) {
             out.append(":");
-            print_digits(out, adjusted._second, 2);
+            print_digits(out, adjusted.getZSecond(), 2);
             if (adjusted._fraction != null) {
                 print_fractional_digits(out, adjusted._fraction);
             }
@@ -2051,119 +1922,155 @@ private static void print_fractional_digits(Appendable out, BigDecimal value)
     //=========================================================================
     // Timestamp arithmetic
 
-
     /**
      * Returns a timestamp relative to this one by the given number of
-     * milliseconds.
+     * milliseconds. Uses this Timestamp's configured Calendar to perform the
+     * arithmetic.
      *
      * @param amount a number of milliseconds.
      */
-    public final Timestamp addMillis(long amount)
-    {
-        if (amount == 0) return this;
-
-        // This strips off the local offset, expressing our fields as if they
-        // were UTC.
-        BigDecimal millis = make_localtime().getDecimalMillis();
-        millis = millis.add(BigDecimal.valueOf(amount));
-
-        Timestamp ts = new Timestamp(millis, _precision, _offset);
-
-        // Anything with courser-than-millis precision will have been extended
-        // to 3 decimal places due to use of getDecimalMillis().  Fix that.
-        ts._fraction = _fraction;
-        if (_offset != null && _offset != 0)
-        {
-            ts.apply_offset(_offset);
+    public final Timestamp addMillis(long amount) {
+        if (amount == 0 && _precision == Precision.SECOND && _fraction != null && _fraction.scale() >= 3) {
+            // Zero milliseconds are to be added, and the precision does not need to be increased.
+            return this;
         }
+        long seconds = amount / 1000;
+        BigDecimal millis = BigDecimal.valueOf(amount % 1000).movePointLeft(3);
+        if (_fraction != null) {
+            millis = _fraction.add(millis);
+        }
+        BigDecimal newFraction;
+        if (BigDecimal.ONE.compareTo(millis) <= 0) {
+            newFraction = millis.subtract(BigDecimal.ONE);
+            seconds += 1;
+        } else if (BigDecimal.ZERO.compareTo(millis) > 0) {
+            newFraction = BigDecimal.ONE.add(millis);
+            seconds -= 1;
+        } else {
+            newFraction = millis;
+        }
+        Timestamp ts = addSecond(seconds);
+        ts._fraction = newFraction;
         return ts;
     }
 
+    /**
+     * Adds the given amount to the given {@link Calendar} field and returns a new Timestamp.
+     * @param field the field.
+     * @param amount an amount.
+     * @param precision the precision corresponding to the given field.
+     * @return a new Timestamp instance.
+     */
+    private Timestamp calendarAdd(int field, int amount, Precision precision) {
+        if (amount == 0 && _precision == precision) return this;
+        Timestamp timestamp = make_localtime();
+        timestamp._calendar.add(field, amount);
+        checkCalendarYear(timestamp._calendar);
+        if (_offset != null) {
+            timestamp.apply_offset(_offset);
+            timestamp._offset = _offset;
+        }
+        timestamp._precision = _precision.includes(precision) ? timestamp._precision : precision;
+        return timestamp;
+    }
 
     /**
      * Returns a timestamp relative to this one by the given number of seconds.
+     * Uses this Timestamp's configured Calendar to perform the arithmetic.
+     *
+     * @param seconds a number of seconds.
+     */
+    private final Timestamp addSecond(long seconds) {
+        Timestamp ts = this;
+        do {
+            int incrementalSeconds;
+            if (seconds > Integer.MAX_VALUE) {
+                incrementalSeconds = Integer.MAX_VALUE;
+            } else if (seconds < Integer.MIN_VALUE) {
+                incrementalSeconds = Integer.MIN_VALUE;
+            } else {
+                incrementalSeconds = (int)seconds;
+            }
+            ts = ts.addSecond(incrementalSeconds);
+            seconds -= incrementalSeconds;
+        } while (seconds != 0);
+        return ts;
+    }
+
+    /**
+     * Returns a timestamp relative to this one by the given number of seconds.
+     * Uses this Timestamp's configured Calendar to perform the arithmetic.
      *
      * @param amount a number of seconds.
      */
     public final Timestamp addSecond(int amount)
     {
-        long delta = (long) amount * 1000;
-        return addMillis(delta);
+        return calendarAdd(Calendar.SECOND, amount, Precision.SECOND);
     }
 
 
     /**
      * Returns a timestamp relative to this one by the given number of minutes.
+     * Uses this Timestamp's configured Calendar to perform the arithmetic.
      *
      * @param amount a number of minutes.
      */
     public final Timestamp addMinute(int amount)
     {
-        long delta = (long) amount * 60 * 1000;
-        return addMillis(delta);
+        return calendarAdd(Calendar.MINUTE, amount, Precision.MINUTE);
     }
 
 
     /**
      * Returns a timestamp relative to this one by the given number of hours.
+     * Uses this Timestamp's configured Calendar to perform the arithmetic.
      *
      * @param amount a number of hours.
      */
     public final Timestamp addHour(int amount)
     {
-        long delta = (long) amount * 60 * 60 * 1000;
-        return addMillis(delta);
+        return calendarAdd(Calendar.HOUR_OF_DAY, amount, Precision.MINUTE);
     }
 
 
     /**
      * Returns a timestamp relative to this one by the given number of days.
+     * Uses this Timestamp's configured Calendar to perform the arithmetic.
      *
      * @param amount a number of days.
      */
     public final Timestamp addDay(int amount)
     {
-        long delta = (long) amount * 24 * 60 * 60 * 1000;
-        return addMillis(delta);
+        return calendarAdd(Calendar.DAY_OF_MONTH, amount, Precision.DAY);
     }
 
-
-    // Shifting month and year are more complicated since the length of a month
-    // varies and we want the day-of-month to stay the same when possible.
-    // We rely on Calendar for the logic.
-
     /**
      * Returns a timestamp relative to this one by the given number of months.
      * The day field may be adjusted to account for different month length and
-     * leap days.  For example, adding one month to {@code 2011-01-31}
-     * results in {@code 2011-02-28}.
+     * leap days, as required by the configured Calendar's rules. For example,
+     * using the default {@link GregorianCalendar}, adding one month to
+     * {@code 2011-01-31} results in {@code 2011-02-28}.
      *
      * @param amount a number of months.
      */
     public final Timestamp addMonth(int amount)
     {
-        if (amount == 0) return this;
-
-        Calendar cal = calendarValue();
-        cal.add(Calendar.MONTH, amount);
-        return new Timestamp(cal, _precision, _fraction, _offset);
+        return calendarAdd(Calendar.MONTH, amount, Precision.MONTH);
     }
 
 
     /**
      * Returns a timestamp relative to this one by the given number of years.
-     * The day field may be adjusted to account for leap days.  For example,
-     * adding one year to {@code 2012-02-29} results in {@code 2013-02-28}.
+     * The day field may be adjusted to account for leap days, as required by
+     * the configured Calendar's rules. For example, using the default
+     * {@link GregorianCalendar}, adding one year to {@code 2012-02-29} results
+     * in {@code 2013-02-28}.
      *
      * @param amount a number of years.
      */
     public final Timestamp addYear(int amount)
     {
-        if (amount == 0) return this;
-
-        Calendar cal = calendarValue();
-        cal.add(Calendar.YEAR, amount);
-        return new Timestamp(cal, _precision, _fraction, _offset);
+        return calendarAdd(Calendar.YEAR, amount, Precision.YEAR);
     }
 
 
@@ -2190,12 +2097,12 @@ public int hashCode()
 
         result ^= (result << 19) ^ (result >> 13);
 
-        result = prime * result + this._year;
-        result = prime * result + this._month;
-        result = prime * result + this._day;
-        result = prime * result + this._hour;
-        result = prime * result + this._minute;
-        result = prime * result + this._second;
+        result = prime * result + this.getZYear();
+        result = prime * result + this.getZMonth();
+        result = prime * result + this.getZDay();
+        result = prime * result + this.getZHour();
+        result = prime * result + this.getZMinute();
+        result = prime * result + this.getZSecond();
 
         result ^= (result << 19) ^ (result >> 13);
 
@@ -2355,12 +2262,12 @@ public boolean equals(Timestamp t)
         }
 
         // so now we check the actual time value
-        if (this._year   != t._year)    return false;
-        if (this._month  != t._month)   return false;
-        if (this._day    != t._day)     return false;
-        if (this._hour   != t._hour)    return false;
-        if (this._minute != t._minute)  return false;
-        if (this._second != t._second)  return false;
+        if (this.getZYear()   != t.getZYear())    return false;
+        if (this.getZMonth()  != t.getZMonth())   return false;
+        if (this.getZDay()    != t.getZDay())     return false;
+        if (this.getZHour()   != t.getZHour())    return false;
+        if (this.getZMinute() != t.getZMinute())  return false;
+        if (this.getZSecond() != t.getZSecond())  return false;
 
         // and if we have a local offset, check the value here
         if (this._offset != null) {
@@ -2381,6 +2288,14 @@ public boolean equals(Timestamp t)
         return this._fraction.equals(t._fraction);
     }
 
+    private static void checkCalendarYear(Calendar calendar) {
+        int year = calendar.get(Calendar.YEAR);
+        if (calendar.get(Calendar.ERA) == GregorianCalendar.BC) {
+            year *= -1;
+        }
+        checkAndCastYear(year);
+    }
+
     private static short checkAndCastYear(int year)
     {
         if (year < 1 || year > 9999)
@@ -2401,14 +2316,11 @@ private static byte checkAndCastMonth(int month)
         return (byte) month;
     }
 
-    private static byte checkAndCastDay(int day, int year, int month)
-    {
-        int lastDayInMonth = last_day_in_month(year, month);
-        if (day < 1 || day > lastDayInMonth) {
-            throw new IllegalArgumentException(String.format("Day %s for year %s and month %s must be between 1 and %s inclusive", day, year, month, lastDayInMonth));
+    private void checkCalendarDay(int day) {
+        int lastDayInMonth = _calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
+        if (day > lastDayInMonth || day < _calendar.getActualMinimum(Calendar.DAY_OF_MONTH)) {
+            throw new IllegalArgumentException(String.format("Day %s for year %s and month %s must be between 1 and %s inclusive", day, getZYear(), getZMonth(), lastDayInMonth));
         }
-
-        return (byte) day;
     }
 
     private static byte checkAndCastHour(int hour)
diff --git a/test/software/amazon/ion/TimestampTest.java b/test/software/amazon/ion/TimestampTest.java
index 5ca81e707b..491aaa89ac 100644
--- a/test/software/amazon/ion/TimestampTest.java
+++ b/test/software/amazon/ion/TimestampTest.java
@@ -16,8 +16,8 @@
 
 import static software.amazon.ion.Decimal.NEGATIVE_ZERO;
 import static software.amazon.ion.Decimal.negativeZero;
-import static software.amazon.ion.Timestamp.FRACTIONAL_MILLIS_UPPER_BOUND;
-import static software.amazon.ion.Timestamp.MINIMUM_ALLOWED_FRACTIONAL_MILLIS;
+import static software.amazon.ion.Timestamp.UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL;
+import static software.amazon.ion.Timestamp.MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL;
 import static software.amazon.ion.Timestamp.UNKNOWN_OFFSET;
 import static software.amazon.ion.Timestamp.UTC_OFFSET;
 import static software.amazon.ion.Timestamp.createFromUtcFields;
@@ -28,16 +28,16 @@
 import static software.amazon.ion.Timestamp.Precision.YEAR;
 import static software.amazon.ion.impl.PrivateUtils.UTC;
 
-import java.io.IOException;
 import java.math.BigDecimal;
-import java.sql.Time;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
+import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.TimeZone;
-import org.junit.Ignore;
+
 import org.junit.Test;
 import software.amazon.ion.Timestamp.Precision;
 
@@ -789,17 +789,23 @@ public void testForMillisWithNegativeMilli()
     }
 
     @Test
-    @Ignore // see https://github.com/amzn/ion-java/issues/160
     public void testNewTimestampFromMinimumAllowedMillis()
     {
-        Timestamp ts = Timestamp.forMillis(MINIMUM_ALLOWED_FRACTIONAL_MILLIS, PST_OFFSET);
+        Timestamp ts = Timestamp.forMillis(MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL, PST_OFFSET);
         assertEquals("0001-01-01T00:00:00.000Z", ts.toZString());
     }
 
+    @Test
+    public void testNewMinimumTimestampFromStringAndMillisIsSame() {
+        Timestamp t1 = Timestamp.valueOf("0001-01-01T00:00:00.000Z");
+        Timestamp t2 = Timestamp.forMillis(t1.getMillis(), 0);
+        assertEquals(t1, t2);
+    }
+
     @Test
     public void testNewTimestampFromBigDecimalWithMaximumAllowedMillis()
     {
-        Timestamp ts = Timestamp.forMillis(FRACTIONAL_MILLIS_UPPER_BOUND.add(BigDecimal.ONE.negate()), PST_OFFSET);
+        Timestamp ts = Timestamp.forMillis(UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL.add(BigDecimal.ONE.negate()), PST_OFFSET);
         checkFields(9999, 12, 31, 15, 59, 59, new BigDecimal("0.999"), PST_OFFSET, SECOND, ts);
         assertEquals("9999-12-31T15:59:59.999-08:00", ts.toString());
         assertEquals("9999-12-31T23:59:59.999Z", ts.toZString());
@@ -815,14 +821,26 @@ public void testNewTimestampFromBigDecimalWithNull()
     public void testNewTimestampFromBigDecimalWithMillisTooSmall()
     {
         // MIN - 1
-        Timestamp.forMillis(MINIMUM_ALLOWED_FRACTIONAL_MILLIS.add(BigDecimal.ONE.negate()), PST_OFFSET);
+        Timestamp.forMillis(MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL.add(BigDecimal.ONE.negate()), PST_OFFSET);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNewTimestampFromLongWithMillisTooSmall()
+    {
+        Timestamp.forMillis(MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL.longValue() - 1, 0);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testNewTimestampFromBigDecimalWithMillisTooBig()
     {
         // Max
-        Timestamp.forMillis(FRACTIONAL_MILLIS_UPPER_BOUND, PST_OFFSET);
+        Timestamp.forMillis(UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL, PST_OFFSET);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNewTimestampFromLongWithMillisTooBig()
+    {
+        Timestamp.forMillis(UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL.longValue(), PST_OFFSET);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -902,58 +920,6 @@ public void testNewTimestampFromLong()
         assertEquals("2010-02-01T10:11:12.340Z", ts.toZString());
     }
 
-    /**
-     * Regression test for https://github.com/amzn/ion-java/issues/160
-     */
-    @Test
-    public void testNewTimestampFromYearOneRegressionBug()
-    {
-        // This is the same as the private field Timestamp.MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS
-        final long MINIMUM_TIMESTAMP_MILLIS = -62135769600000L;
-        // This is the minimum timestamp instantiating by parsing a timestamp string,
-        // which is not effected by the `java.util.Date` bug.
-        final Timestamp MINIMUM_TIMESTAMP = Timestamp.valueOf("0001-01-01T00:00:00.000Z");
-        // Save the original timezone since we modify it below.
-        final TimeZone originalTimeZone = TimeZone.getDefault();
-
-        try {
-            // The `java.util.Date` bug has a different range of times depending on the local offset, so
-            // let's test against all time zones.
-            for (final String tzId : TimeZone.getAvailableIDs()) {
-                final TimeZone tz = TimeZone.getTimeZone(tzId);
-                TimeZone.setDefault(tz);
-
-                // The Timestamps under test must be instantiated *after* the the call to TimeZone.setDefault()
-                // since `java.util.Date` references the default TimeZone when calculating the values for its
-                // date field accessor methods (i.e. Date.get*()).
-                Timestamp minimumTimestampFromMillis = Timestamp.forMillis(MINIMUM_TIMESTAMP_MILLIS, 0);
-                assertEquals(MINIMUM_TIMESTAMP, minimumTimestampFromMillis);
-
-                // Only perform further assertions on timezones with negative offsets because positive
-                // offsets create millisecond values that are less than Timestamp.MINIMUM_ALLOWED_TIMESTAMP_IN_MILLIS
-                if (tz.getRawOffset() < 0) {
-                    // This will be the latest millisecond in which the bug with `java.util.Date` can happen
-                    Timestamp maximumTimestampWithBug =
-                        Timestamp.forMillis(MINIMUM_TIMESTAMP_MILLIS - tz.getRawOffset(), 0);
-                    assertEquals(1, maximumTimestampWithBug.getYear());
-
-                    // Test one millisecond after, just to be sure.
-                    Timestamp timestampPlusOne =
-                        Timestamp.forMillis(MINIMUM_TIMESTAMP_MILLIS - tz.getRawOffset() + 1, 0);
-                    assertEquals(1, timestampPlusOne.getYear());
-
-                    // Also test one milliscond before, just to be sure.
-                    Timestamp timestampMinusOne =
-                        Timestamp.forMillis(MINIMUM_TIMESTAMP_MILLIS - tz.getRawOffset() - 1L, 0);
-                    assertEquals(1, timestampMinusOne.getYear());
-                }
-            }
-        } finally {
-            // Have to set the TimeZone back to its original value so as not to effect other tests.
-            TimeZone.setDefault(originalTimeZone);
-        }
-    }
-
     /**
      * Test for {@link Timestamp#createFromUtcFields(Precision, int, int, int, int, int, int, BigDecimal, Integer)}
      * ensuring that varying precisions produce Timestamps as expected as per
@@ -1768,9 +1734,9 @@ private void addMonthWithMins(String orig, int amount, String expected)
     @Test
     public void testAddMonth()
     {
-        // TODO Is it reasonable to add months to TSs that aren't that precise?
-        addMonth("2012T",    -1, "2011T");
-        addMonth("2012T",     1, "2012T");
+        // Adding more precise amounts extends the precision.
+        addMonth("2012T",    -1, "2011-12T");
+        addMonth("2012T",     1, "2012-02T");
 
         addMonth("2012-04T", -4, "2011-12T");
         addMonth("2012-04T", -1, "2012-03T");
@@ -1851,17 +1817,18 @@ private void addDayWithMins(String orig, int amount, String expected)
     @Test
     public void testAddDay()
     {
-        // TODO Is it reasonable to add days to TSs that aren't that precise?
-        addDay("2012T",     1, "2012T");
-        addDay("2012T",    -1, "2011T");
+        // Adding more precise amounts extends the precision.
+        addDay("2012T",     1, "2012-01-02");
+        addDay("2012T",     0, "2012-01-01");
+        addDay("2012T",    -1, "2011-12-31");
 
-        addDay("2012-04T",-32, "2012-02T");
-        addDay("2012-04T",-31, "2012-03T");
-        addDay("2012-04T", -1, "2012-03T");
-        addDay("2012-04T",  1, "2012-04T");
-        addDay("2012-04T",  9, "2012-04T");
-        addDay("2012-04T", 30, "2012-05T");
-        addDay("2012-04T", 31, "2012-05T");
+        addDay("2012-04T",-32, "2012-02-29");
+        addDay("2012-04T",-31, "2012-03-01");
+        addDay("2012-04T", -1, "2012-03-31");
+        addDay("2012-04T",  1, "2012-04-02");
+        addDay("2012-04T",  9, "2012-04-10");
+        addDay("2012-04T", 30, "2012-05-01");
+        addDay("2012-04T", 31, "2012-05-02");
 
         addDayWithMins("2011-01-31",-31, "2010-12-31");
         addDayWithMins("2011-01-31",-30, "2011-01-01");
@@ -1931,34 +1898,34 @@ private void addHourWithMins(String orig, int amount, String expected)
     @Test
     public void testAddHour()
     {
-        // TODO Is it reasonable to add hours to TSs that aren't that precise?
-        addHour("2012T",    -1, "2011T");
-        addHour("2012T",     0, "2012T");
-        addHour("2012T",     1, "2012T");
-
-        addHour("2012-04T", -31 * 24 - 1, "2012-02T");
-        addHour("2012-04T", -31 * 24    , "2012-03T");
-        addHour("2012-04T",           -1, "2012-03T");
-        addHour("2012-04T",            0, "2012-04T");
-        addHour("2012-04T",            1, "2012-04T");
-        addHour("2012-04T",  30 * 24 - 1, "2012-04T");
-        addHour("2012-04T",  30 * 24    , "2012-05T");
-
-        addHour("2011-02-28",  -1, "2011-02-27");
-        addHour("2011-02-28",   0, "2011-02-28");
-        addHour("2011-02-28",   1, "2011-02-28");
-        addHour("2011-02-28",  24, "2011-03-01");
-        addHour("2011-03-01", -24, "2011-02-28");
-        addHour("2012-02-28",  24, "2012-02-29");
-        addHour("2012-02-29", -24, "2012-02-28");
-        addHour("2012-02-29",  24, "2012-03-01");
-
-        addHour("2012-10-04",-48, "2012-10-02");
-        addHour("2012-10-04",-24, "2012-10-03");
-        addHour("2012-10-04", -1, "2012-10-03");
-        addHour("2012-10-04",  1, "2012-10-04");
-        addHour("2012-10-04", 24, "2012-10-05");
-        addHour("2012-10-04", 48, "2012-10-06");
+        // Adding more precise amounts extends the precision.
+        addHour("2012T",    -1, "2011-12-31T23:00-00:00");
+        addHour("2012T",     0, "2012-01-01T00:00-00:00");
+        addHour("2012T",     1, "2012-01-01T01:00-00:00");
+
+        addHour("2012-04T", -31 * 24 - 1, "2012-02-29T23:00-00:00");
+        addHour("2012-04T", -31 * 24    , "2012-03-01T00:00-00:00");
+        addHour("2012-04T",           -1, "2012-03-31T23:00-00:00");
+        addHour("2012-04T",            0, "2012-04-01T00:00-00:00");
+        addHour("2012-04T",            1, "2012-04-01T01:00-00:00");
+        addHour("2012-04T",  30 * 24 - 1, "2012-04-30T23:00-00:00");
+        addHour("2012-04T",  30 * 24    , "2012-05-01T00:00-00:00");
+
+        addHour("2011-02-28",  -1, "2011-02-27T23:00-00:00");
+        addHour("2011-02-28",   0, "2011-02-28T00:00-00:00");
+        addHour("2011-02-28",   1, "2011-02-28T01:00-00:00");
+        addHour("2011-02-28",  24, "2011-03-01T00:00-00:00");
+        addHour("2011-03-01", -24, "2011-02-28T00:00-00:00");
+        addHour("2012-02-28",  24, "2012-02-29T00:00-00:00");
+        addHour("2012-02-29", -24, "2012-02-28T00:00-00:00");
+        addHour("2012-02-29",  24, "2012-03-01T00:00-00:00");
+
+        addHour("2012-10-04",-48, "2012-10-02T00:00-00:00");
+        addHour("2012-10-04",-24, "2012-10-03T00:00-00:00");
+        addHour("2012-10-04", -1, "2012-10-03T23:00-00:00");
+        addHour("2012-10-04",  1, "2012-10-04T01:00-00:00");
+        addHour("2012-10-04", 24, "2012-10-05T00:00-00:00");
+        addHour("2012-10-04", 48, "2012-10-06T00:00-00:00");
 
         addHourWithMins("2011-01-31T12",  0, "2011-01-31T12");
         addHourWithMins("2011-01-31T12", 12, "2011-02-01T00");
@@ -2025,34 +1992,34 @@ private void addMinuteWithsSecs(String orig, int amount, String expected)
     @Test
     public void testAddMinute()
     {
-        // TODO Is it reasonable to add minutes to TSs that aren't that precise?
-        addMinute("2012T",    -1, "2011T");
-        addMinute("2012T",     0, "2012T");
-        addMinute("2012T",     1, "2012T");
-
-        addMinute("2012-04T", -31 * 24 * 60 - 1, "2012-02T");
-        addMinute("2012-04T", -31 * 24 * 60    , "2012-03T");
-        addMinute("2012-04T",                -1, "2012-03T");
-        addMinute("2012-04T",                 0, "2012-04T");
-        addMinute("2012-04T",                 1, "2012-04T");
-        addMinute("2012-04T",  30 * 24 * 60 - 1, "2012-04T");
-        addMinute("2012-04T",  30 * 24 * 60    , "2012-05T");
-
-        addMinute("2011-02-28",       -1, "2011-02-27");
-        addMinute("2011-02-28",        0, "2011-02-28");
-        addMinute("2011-02-28",        1, "2011-02-28");
-        addMinute("2011-02-28",  24 * 60, "2011-03-01");
-        addMinute("2011-03-01", -24 * 60, "2011-02-28");
-        addMinute("2012-02-28",  24 * 60, "2012-02-29");
-        addMinute("2012-02-29", -24 * 60, "2012-02-28");
-        addMinute("2012-02-29",  24 * 60, "2012-03-01");
-
-        addMinute("2012-10-04", -48 * 60, "2012-10-02");
-        addMinute("2012-10-04", -24 * 60, "2012-10-03");
-        addMinute("2012-10-04",       -1, "2012-10-03");
-        addMinute("2012-10-04",        1, "2012-10-04");
-        addMinute("2012-10-04",  24 * 60, "2012-10-05");
-        addMinute("2012-10-04",  48 * 60, "2012-10-06");
+        // Adding more precise amounts extends the precision.
+        addMinute("2012T",    -1, "2011-12-31T23:59-00:00");
+        addMinute("2012T",     0, "2012-01-01T00:00-00:00");
+        addMinute("2012T",     1, "2012-01-01T00:01-00:00");
+
+        addMinute("2012-04T", -31 * 24 * 60 - 1, "2012-02-29T23:59-00:00");
+        addMinute("2012-04T", -31 * 24 * 60    , "2012-03-01T00:00-00:00");
+        addMinute("2012-04T",                -1, "2012-03-31T23:59-00:00");
+        addMinute("2012-04T",                 0, "2012-04-01T00:00-00:00");
+        addMinute("2012-04T",                 1, "2012-04-01T00:01-00:00");
+        addMinute("2012-04T",  30 * 24 * 60 - 1, "2012-04-30T23:59-00:00");
+        addMinute("2012-04T",  30 * 24 * 60    , "2012-05-01T00:00-00:00");
+
+        addMinute("2011-02-28",       -1, "2011-02-27T23:59-00:00");
+        addMinute("2011-02-28",        0, "2011-02-28T00:00-00:00");
+        addMinute("2011-02-28",        1, "2011-02-28T00:01-00:00");
+        addMinute("2011-02-28",  24 * 60, "2011-03-01T00:00-00:00");
+        addMinute("2011-03-01", -24 * 60, "2011-02-28T00:00-00:00");
+        addMinute("2012-02-28",  24 * 60, "2012-02-29T00:00-00:00");
+        addMinute("2012-02-29", -24 * 60, "2012-02-28T00:00-00:00");
+        addMinute("2012-02-29",  24 * 60, "2012-03-01T00:00-00:00");
+
+        addMinute("2012-10-04", -48 * 60, "2012-10-02T00:00-00:00");
+        addMinute("2012-10-04", -24 * 60, "2012-10-03T00:00-00:00");
+        addMinute("2012-10-04",       -1, "2012-10-03T23:59-00:00");
+        addMinute("2012-10-04",        1, "2012-10-04T00:01-00:00");
+        addMinute("2012-10-04",  24 * 60, "2012-10-05T00:00-00:00");
+        addMinute("2012-10-04",  48 * 60, "2012-10-06T00:00-00:00");
 
         addMinuteWithsSecs("2011-01-31T12:03",  -60, "2011-01-31T11:03");
         addMinuteWithsSecs("2011-01-31T12:03",    0, "2011-01-31T12:03");
@@ -2120,35 +2087,35 @@ private void addSecondWithsFrac(String orig, int amount, String expected)
     @Test
     public void testAddSecond()
     {
-        // TODO Is it reasonable to add seconds to TSs that aren't that precise?
-        addSecond("2012T",    -1, "2011T");
-        addSecond("2012T",     0, "2012T");
-        addSecond("2012T",     1, "2012T");
-
-        addSecond("2012-04T", -31 * 24 * 60 * 60 - 1, "2012-02T");
-        addSecond("2012-04T", -31 * 24 * 60 * 60    , "2012-03T");
-        addSecond("2012-04T",                     -1, "2012-03T");
-        addSecond("2012-04T",                      0, "2012-04T");
-        addSecond("2012-04T",                      1, "2012-04T");
-        addSecond("2012-04T",  30 * 24 * 60 * 60 - 1, "2012-04T");
-        addSecond("2012-04T",  30 * 24 * 60 * 60    , "2012-05T");
-
-
-        addSecond("2011-02-28",            -1, "2011-02-27");
-        addSecond("2011-02-28",             0, "2011-02-28");
-        addSecond("2011-02-28",             1, "2011-02-28");
-        addSecond("2011-02-28",  24 * 60 * 60, "2011-03-01");
-        addSecond("2011-03-01", -24 * 60 * 60, "2011-02-28");
-        addSecond("2012-02-28",  24 * 60 * 60, "2012-02-29");
-        addSecond("2012-02-29", -24 * 60 * 60, "2012-02-28");
-        addSecond("2012-02-29",  24 * 60 * 60, "2012-03-01");
-
-        addSecond("2012-10-04", -24 * 60 * 60 - 1, "2012-10-02");
-        addSecond("2012-10-04", -24 * 60 * 60    , "2012-10-03");
-        addSecond("2012-10-04",                -1, "2012-10-03");
-        addSecond("2012-10-04",                 1, "2012-10-04");
-        addSecond("2012-10-04",  48 * 60 * 60 - 1, "2012-10-05");
-        addSecond("2012-10-04",  48 * 60 * 60    , "2012-10-06");
+        // Adding more precise amounts extends the precision.
+        addSecond("2012T",    -1, "2011-12-31T23:59:59-00:00");
+        addSecond("2012T",     0, "2012-01-01T00:00:00-00:00");
+        addSecond("2012T",     1, "2012-01-01T00:00:01-00:00");
+
+        addSecond("2012-04T", -31 * 24 * 60 * 60 - 1, "2012-02-29T23:59:59-00:00");
+        addSecond("2012-04T", -31 * 24 * 60 * 60    , "2012-03-01T00:00:00-00:00");
+        addSecond("2012-04T",                     -1, "2012-03-31T23:59:59-00:00");
+        addSecond("2012-04T",                      0, "2012-04-01T00:00:00-00:00");
+        addSecond("2012-04T",                      1, "2012-04-01T00:00:01-00:00");
+        addSecond("2012-04T",  30 * 24 * 60 * 60 - 1, "2012-04-30T23:59:59-00:00");
+        addSecond("2012-04T",  30 * 24 * 60 * 60    , "2012-05-01T00:00:00-00:00");
+
+
+        addSecond("2011-02-28",            -1, "2011-02-27T23:59:59-00:00");
+        addSecond("2011-02-28",             0, "2011-02-28T00:00:00-00:00");
+        addSecond("2011-02-28",             1, "2011-02-28T00:00:01-00:00");
+        addSecond("2011-02-28",  24 * 60 * 60, "2011-03-01T00:00:00-00:00");
+        addSecond("2011-03-01", -24 * 60 * 60, "2011-02-28T00:00:00-00:00");
+        addSecond("2012-02-28",  24 * 60 * 60, "2012-02-29T00:00:00-00:00");
+        addSecond("2012-02-29", -24 * 60 * 60, "2012-02-28T00:00:00-00:00");
+        addSecond("2012-02-29",  24 * 60 * 60, "2012-03-01T00:00:00-00:00");
+
+        addSecond("2012-10-04", -24 * 60 * 60 - 1, "2012-10-02T23:59:59-00:00");
+        addSecond("2012-10-04", -24 * 60 * 60    , "2012-10-03T00:00:00-00:00");
+        addSecond("2012-10-04",                -1, "2012-10-03T23:59:59-00:00");
+        addSecond("2012-10-04",                 1, "2012-10-04T00:00:01-00:00");
+        addSecond("2012-10-04",  48 * 60 * 60 - 1, "2012-10-05T23:59:59-00:00");
+        addSecond("2012-10-04",  48 * 60 * 60    , "2012-10-06T00:00:00-00:00");
 
         addSecondWithsFrac("2011-01-31T12:03:23",  -60 * 60, "2011-01-31T11:03:23");
         addSecondWithsFrac("2011-01-31T12:03:23",         0, "2011-01-31T12:03:23");
@@ -2162,6 +2129,221 @@ public void testAddSecond()
         addSecondWithsFrac("2012-03-01T02:35:23", -4 * 60 * 60, "2012-02-29T22:35:23");
     }
 
+    private void addMillisecond(String orig, long amount, String expected)
+    {
+        Timestamp ts1 = Timestamp.valueOf(orig);
+        Timestamp ts2 = ts1.addMillis(amount);
+        checkTimestamp(expected, ts2);
+    }
+
+    private void addMillisecond(String orig, long amount, String expected, String suffix)
+    {
+        addMillisecond(orig + suffix, amount, expected + suffix);
+    }
+
+    private void addMillisecondWithOffsets(String orig, long amount, String expected) {
+        addMillisecond(orig, amount, expected, "-00:00");
+        addMillisecond(orig, amount, expected, "Z");
+        addMillisecond(orig, amount, expected, "+01:23");
+        addMillisecond(orig, amount, expected, "-01:23");
+        addMillisecond(orig, amount, expected, "+23:59");
+        addMillisecond(orig, amount, expected, "-23:59");
+    }
+
+    private void addMillisecondWithFrac(String orig, long amount, String expected)
+    {
+        // If the timestamp has less than milliseconds precision, always expand its precision to milliseconds.
+        addMillisecondWithOffsets(orig, amount, expected + ".000");
+        addMillisecondWithOffsets(orig + ".0", amount, expected + ".000");
+        addMillisecondWithOffsets(orig + ".00", amount, expected + ".000");
+        addMillisecondWithOffsets(orig + ".000", amount, expected +".000");
+        addMillisecondWithOffsets(orig + ".456", amount, expected + ".456");
+        // If the Timestamp has greater than milliseconds precision, don't reduce the precision.
+        addMillisecondWithOffsets(orig + ".0000", amount, expected + ".0000");
+        addMillisecondWithOffsets(orig + ".45678", amount, expected +".45678");
+    }
+
+    @Test
+    public void testAddMillisecond()
+    {
+        addMillisecond("2012T",    -1, "2011-12-31T23:59:59.999-00:00");
+        addMillisecond("2012T",     0, "2012-01-01T00:00:00.000-00:00");
+        addMillisecond("2012T",     1, "2012-01-01T00:00:00.001-00:00");
+
+        addMillisecond("2012-04T", -31L * 24 * 60 * 60 * 1000 - 1, "2012-02-29T23:59:59.999-00:00");
+        addMillisecond("2012-04T", -31L * 24 * 60 * 60 * 1000    , "2012-03-01T00:00:00.000-00:00");
+        addMillisecond("2012-04T",                             -1, "2012-03-31T23:59:59.999-00:00");
+        addMillisecond("2012-04T",                              0, "2012-04-01T00:00:00.000-00:00");
+        addMillisecond("2012-04T",                              1, "2012-04-01T00:00:00.001-00:00");
+        addMillisecond("2012-04T",  30L * 24 * 60 * 60 * 1000 - 1, "2012-04-30T23:59:59.999-00:00");
+        addMillisecond("2012-04T",  30L * 24 * 60 * 60 * 1000    , "2012-05-01T00:00:00.000-00:00");
+
+
+        addMillisecond("2011-02-28",                   -1, "2011-02-27T23:59:59.999-00:00");
+        addMillisecond("2011-02-28",                    0, "2011-02-28T00:00:00.000-00:00");
+        addMillisecond("2011-02-28",                    1, "2011-02-28T00:00:00.001-00:00");
+        addMillisecond("2011-02-28",  24 * 60 * 60 * 1000, "2011-03-01T00:00:00.000-00:00");
+        addMillisecond("2011-03-01", -24 * 60 * 60 * 1000, "2011-02-28T00:00:00.000-00:00");
+        addMillisecond("2012-02-28",  24 * 60 * 60 * 1000, "2012-02-29T00:00:00.000-00:00");
+        addMillisecond("2012-02-29", -24 * 60 * 60 * 1000, "2012-02-28T00:00:00.000-00:00");
+        addMillisecond("2012-02-29",  24 * 60 * 60 * 1000, "2012-03-01T00:00:00.000-00:00");
+
+        addMillisecond("2012-10-04", -24 * 60 * 60 * 1000 - 1, "2012-10-02T23:59:59.999-00:00");
+        addMillisecond("2012-10-04", -24 * 60 * 60 * 1000    , "2012-10-03T00:00:00.000-00:00");
+        addMillisecond("2012-10-04",                       -1, "2012-10-03T23:59:59.999-00:00");
+        addMillisecond("2012-10-04",                        1, "2012-10-04T00:00:00.001-00:00");
+        addMillisecond("2012-10-04",  48 * 60 * 60 * 1000 - 1, "2012-10-05T23:59:59.999-00:00");
+        addMillisecond("2012-10-04",  48 * 60 * 60 * 1000    , "2012-10-06T00:00:00.000-00:00");
+
+        addMillisecondWithFrac("2011-01-31T12:03:23",  -60 * 60 * 1000, "2011-01-31T11:03:23");
+        addMillisecondWithFrac("2011-01-31T12:03:23",                0, "2011-01-31T12:03:23");
+        addMillisecondWithFrac("2011-01-31T12:03:23",   60 * 60 * 1000, "2011-01-31T13:03:23");
+        addMillisecondWithFrac("2011-01-31T23:03:23",   57 * 60 * 1000, "2011-02-01T00:00:23");
+
+        addMillisecondWithFrac("2011-02-28T02:03:23", 25 * 60 * 60 * 1000, "2011-03-01T03:03:23");
+        addMillisecondWithFrac("2012-02-28T02:03:23", 25 * 60 * 60 * 1000, "2012-02-29T03:03:23");
+
+        addMillisecondWithFrac("2011-03-01T02:35:23", -4 * 60 * 60 * 1000, "2011-02-28T22:35:23");
+        addMillisecondWithFrac("2012-03-01T02:35:23", -4 * 60 * 60 * 1000, "2012-02-29T22:35:23");
+
+        addMillisecondWithOffsets("2011-01-31T23:59:59.999", 1, "2011-02-01T00:00:00.000");
+        addMillisecondWithOffsets("2011-02-01T00:00:00.000", -1, "2011-01-31T23:59:59.999");
+        addMillisecondWithOffsets("2011-01-31T23:59:59.999123", 1, "2011-02-01T00:00:00.000123");
+        addMillisecondWithOffsets("2011-02-01T00:00:00.000123", -1, "2011-01-31T23:59:59.999123");
+
+    }
+
+    @Test
+    public void addLargeNumberOfMilliseconds() {
+        // Internally, the value is divided by 1000, then added as seconds. Multiply by more than 1000 to make sure
+        // more seconds than can fit in an integer can be added.
+        long largeAmountToAdd = (Integer.MAX_VALUE + 1L) * 1000;
+        Timestamp ts1 = Timestamp.forMillis(0, 0);
+        Timestamp ts2 = ts1.addMillis(largeAmountToAdd);
+        assertEquals(Timestamp.forMillis(largeAmountToAdd, 0), ts2);
+        long largeAmountToSubtract = -(Integer.MIN_VALUE - 1L) * 1000;
+        Timestamp ts3 = Timestamp.forMillis(largeAmountToSubtract, 0);
+        assertEquals(ts1, ts3.addMillis(-largeAmountToSubtract));
+    }
+
+    @Test
+    public void testSubtractDayNonLeapYear()
+    {
+        // See: ion-java#163. Previously, this failed because the Timestamp arithmetic was performed using
+        // java.util.Date, which returns its components in the system's local time.
+        Timestamp timestamp = Timestamp.valueOf("1500-03-02T00:00:00.000Z");
+        Timestamp result = timestamp.addDay(-1);
+        assertEquals(Timestamp.valueOf("1500-03-01T00:00:00.000Z"), result);
+    }
+
+    @Test
+    public void testCalendarValueRoundtrip() {
+        Timestamp timestamp = Timestamp.valueOf("2014T");
+        assertEquals(timestamp, Timestamp.forCalendar(timestamp.calendarValue()));
+        timestamp = Timestamp.valueOf("2014-06T");
+        assertEquals(timestamp, Timestamp.forCalendar(timestamp.calendarValue()));
+        timestamp = Timestamp.valueOf("2014-06-02T");
+        assertEquals(timestamp, Timestamp.forCalendar(timestamp.calendarValue()));
+        timestamp = Timestamp.valueOf("2014-06-02T08:00-07:00");
+        assertEquals(timestamp, Timestamp.forCalendar(timestamp.calendarValue()));
+        timestamp = Timestamp.valueOf("2014-06-02T08:00:01-07:00");
+        assertEquals(timestamp, Timestamp.forCalendar(timestamp.calendarValue()));
+        // Calendar can represent up to milliseconds precision, but not more.
+        timestamp = Timestamp.valueOf("2014-06-02T08:00:01.987-07:00");
+        assertEquals(timestamp, Timestamp.forCalendar(timestamp.calendarValue()));
+        Timestamp timestampTooPrecise = Timestamp.valueOf("2014-06-02T08:00:01.9876-07:00");
+        assertEquals(timestamp, Timestamp.forCalendar(timestampTooPrecise.calendarValue()));
+    }
+
+    @Test
+    public void testGregorianCalendarNonLeapYear() {
+        GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+        calendar.clear();
+        // 1800 is not a leap year under the Gregorian calendar.
+        calendar.set(1800, Calendar.FEBRUARY, 28);
+        Timestamp timestamp1 = Timestamp.forCalendar(calendar);
+        Timestamp timestamp2 = timestamp1.addDay(1);
+        assertEquals("1800-03-01", timestamp2.toString());
+    }
+
+    @Test
+    public void testConstructCustomCalendarWithValidLeapYear() {
+        // Create a purely Julian calendar, where leap years were every four years.
+        GregorianCalendar julianCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+        julianCalendar.setGregorianChange(new Date(Long.MAX_VALUE));
+        julianCalendar.clear();
+        // 1800 is not a leap year under the Gregorian calendar, but it is under the Julian calendar.
+        julianCalendar.set(1800, Calendar.FEBRUARY, 29, 0, 0);
+        Timestamp timestamp = Timestamp.forCalendar(julianCalendar);
+        assertEquals("1800-02-29T00:00Z", timestamp.toString());
+    }
+
+    @Test
+    public void testCustomCalendarLeapYear() {
+        // Create a purely Julian calendar, where leap years were every four years.
+        GregorianCalendar julianCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+        julianCalendar.setGregorianChange(new Date(Long.MAX_VALUE));
+        julianCalendar.clear();
+        // 1800 is not a leap year under the Gregorian calendar, but it is under the Julian calendar.
+        julianCalendar.set(1800, Calendar.FEBRUARY, 28);
+        Timestamp timestamp1 = Timestamp.forCalendar(julianCalendar);
+        Timestamp timestamp2 = timestamp1.addDay(1);
+        assertEquals("1800-02-29", timestamp2.toString());
+    }
+
+    @Test
+    public void testCustomCalendarLeapYearAfterClone() {
+        // Create a purely Julian calendar, where leap years were every four years.
+        GregorianCalendar julianCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+        julianCalendar.setGregorianChange(new Date(Long.MAX_VALUE));
+        julianCalendar.clear();
+        // 1800 is not a leap year under the Gregorian calendar, but it is under the Julian calendar.
+        julianCalendar.set(1800, Calendar.MARCH, 1, 0, 0);
+        Timestamp timestamp1 = Timestamp.forCalendar(julianCalendar);
+        Timestamp timestamp2 = timestamp1.clone().addHour(-1);
+        assertEquals("1800-02-29T23:00Z", timestamp2.toString());
+    }
+
+    @Test
+    public void testCustomCalendarLeapYearAfterCalendarValue() {
+        // Create a purely Julian calendar, where leap years were every four years.
+        GregorianCalendar julianCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+        julianCalendar.setGregorianChange(new Date(Long.MAX_VALUE));
+        julianCalendar.clear();
+        // 1800 is not a leap year under the Gregorian calendar, but it is under the Julian calendar.
+        julianCalendar.set(1800, Calendar.MARCH, 1, 0, 0);
+        Timestamp timestamp1 = Timestamp.forCalendar(julianCalendar);
+        Timestamp timestamp2 = Timestamp.forCalendar(timestamp1.calendarValue()).addMinute(-1);
+        assertEquals("1800-02-29T23:59Z", timestamp2.toString());
+    }
+
+    @Test
+    public void testCustomCalendarLeapYearAfterWithLocalOffset() {
+        // Create a purely Julian calendar, where leap years were every four years.
+        GregorianCalendar julianCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+        julianCalendar.setGregorianChange(new Date(Long.MAX_VALUE));
+        julianCalendar.clear();
+        // 1800 is not a leap year under the Gregorian calendar, but it is under the Julian calendar.
+        julianCalendar.set(1800, Calendar.FEBRUARY, 28, 23, 59, 59);
+        Timestamp timestamp1 = Timestamp.forCalendar(julianCalendar);
+        Timestamp timestamp2 = timestamp1.withLocalOffset(0).addSecond(1);
+        assertEquals("1800-02-29T00:00:00Z", timestamp2.toString());
+    }
+
+    @Test
+    public void testCustomCalendarLeapYearWithChainedArithmetic() {
+        // Create a purely Julian calendar, where leap years were every four years.
+        GregorianCalendar julianCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+        julianCalendar.setGregorianChange(new Date(Long.MAX_VALUE));
+        julianCalendar.clear();
+        // 1800 is not a leap year under the Gregorian calendar, but it is under the Julian calendar.
+        julianCalendar.set(1799, Calendar.JANUARY, 27, 22, 58, 58);
+        julianCalendar.set(Calendar.MILLISECOND, 999);
+        Timestamp timestamp1 = Timestamp.forCalendar(julianCalendar);
+        Timestamp timestamp2 = timestamp1.addYear(1).addMonth(1).addDay(1).addHour(1).addMinute(1).addSecond(1).addMillis(1);
+        assertEquals("1800-02-29T00:00:00.000Z", timestamp2.toString());
+    }
+
     @Test(expected = IllegalArgumentException.class)
     public void testAddSecondOutsideMaxRange()
     {
@@ -2366,4 +2548,27 @@ public void testGetMillisWithLargeScaleBigDecimal()
     {
         Timestamp.forMillis(LARGE_SCALE_DECIMAL, PST_OFFSET).getMillis();
     }
+
+    @Test
+    public void testInstantVsTimestampMillis() {
+        // addresses: https://github.com/amzn/ion-java/issues/165
+        String tsText = "0001-01-01T00:00:00.000Z";
+        // Instant extends the Gregorian calendar system all the way back to the beginning, whereas Timestamp uses
+        // the default GregorianCalendar implementation, which transitions from Julian to Gregorian in 1582. As a
+        // result, the two map from milliseconds to date differently before 1582, as demonstrated below.
+        long millisFromInstant = Instant.parse(tsText).toEpochMilli();
+        long millisFromTimestamp = Timestamp.valueOf(tsText).getMillis();
+        assertNotEquals(millisFromInstant, millisFromTimestamp);
+        // However, the discrepancy can be avoided by using Timestamp.forCalendar, which always respects the given
+        // Calendar's method for determining leap years.
+        Timestamp ts1 = Timestamp.forCalendar(GregorianCalendar.from(Instant.parse(tsText).atZone(ZoneId.of("UTC"))));
+        Timestamp ts2 = Timestamp.valueOf(tsText);
+        assertEquals(tsText, ts1.toString());
+        assertEquals(tsText, ts2.toString());
+        assertEquals(ts1, ts2);
+        // Because Timestamp always uses the configured Calendar for determining leap years, the original milliseconds
+        // values are roundtripped unchanged.
+        assertEquals(millisFromInstant, ts1.getMillis());
+        assertEquals(millisFromTimestamp, ts2.getMillis());
+    }
 }

From 5beefbdd63984a31c0e43cec5e66ba3c00ed6223 Mon Sep 17 00:00:00 2001
From: Peter Cornell <pcornell@amazon.com>
Date: Mon, 17 Dec 2018 16:45:24 -0800
Subject: [PATCH 038/490] Produces an error when an unpaired surrogate is
 encountered (#193)

---
 .../ion/impl/IonReaderTextRawTokensX.java     | 48 ++++++++++++++++++-
 .../amazon/ion/SystemProcessingTestCase.java  |  3 --
 test/software/amazon/ion/TestUtils.java       |  9 ----
 3 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java b/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java
index aba793f173..4e815ebb0d 100644
--- a/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java
+++ b/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java
@@ -1935,6 +1935,7 @@ protected int load_single_quoted_string(StringBuilder sb, boolean is_clob)
         throws IOException
     {
         int c;
+        boolean expectLowSurrogate = false;
 
         for (;;) {
             c = read_string_char(ProhibitedCharacters.NONE);
@@ -1945,6 +1946,9 @@ protected int load_single_quoted_string(StringBuilder sb, boolean is_clob)
                 continue;
             case -1:
             case '\'':
+                if (!is_clob) {
+                    check_for_low_surrogate(c, expectLowSurrogate);
+                }
                 return c;
             // new line normalization and counting is handled in read_char
             case CharacterSequence.CHAR_SEQ_NEWLINE_SEQUENCE_1:
@@ -1962,11 +1966,16 @@ protected int load_single_quoted_string(StringBuilder sb, boolean is_clob)
                     c = read_large_char_sequence(c);
                 }
             }
-
+            // if this isn't a clob we need to decode UTF8 and
+            // handle surrogate encoding (otherwise we don't care)
             if (!is_clob) {
+                expectLowSurrogate = check_for_low_surrogate(c, expectLowSurrogate);
+
                 if (IonUTF8.needsSurrogateEncoding(c)) {
                     sb.append(IonUTF8.highSurrogate(c));
                     c = IonUTF8.lowSurrogate(c);
+                } else {
+                    expectLowSurrogate = IonUTF8.isHighSurrogate(c);
                 }
             }
             else if (IonTokenConstsX.is8bitValue(c)) {
@@ -2010,6 +2019,7 @@ protected int load_double_quoted_string(StringBuilder sb, boolean is_clob)
         throws IOException
     {
         int c;
+        boolean expectLowSurrogate = false;
 
         for (;;) {
             c = read_string_char(ProhibitedCharacters.SHORT_CHAR);
@@ -2020,6 +2030,9 @@ protected int load_double_quoted_string(StringBuilder sb, boolean is_clob)
                 continue;
             case -1:
             case '"':
+                if (!is_clob) {
+                    check_for_low_surrogate(c, expectLowSurrogate);
+                }
                 return c;
             // new line normalization and counting is handled in read_char
             case CharacterSequence.CHAR_SEQ_NEWLINE_SEQUENCE_1:
@@ -2035,17 +2048,36 @@ protected int load_double_quoted_string(StringBuilder sb, boolean is_clob)
                 }
                 break;
             }
-
+            // if this isn't a clob we need to decode UTF8 and
+            // handle surrogate encoding (otherwise we don't care)
             if (!is_clob) {
+                expectLowSurrogate = check_for_low_surrogate(c, expectLowSurrogate);
+
                 if (IonUTF8.needsSurrogateEncoding(c)) {
                     sb.append(IonUTF8.highSurrogate(c));
                     c = IonUTF8.lowSurrogate(c);
+                } else {
+                    expectLowSurrogate = IonUTF8.isHighSurrogate(c);
                 }
             }
             sb.append((char)c);
         }
     }
 
+    private boolean check_for_low_surrogate(int c, boolean expectLowSurrogate) throws IonException
+    {
+        if (IonUTF8.isLowSurrogate(c)) {
+            if (expectLowSurrogate) {
+                return false;
+            } else {
+                error("unexpected low surrogate " + printCodePointAsString(c));
+            }
+        } else if (expectLowSurrogate) {
+            expected_but_found("a low surrogate", c);
+        }
+        return false;
+    }
+
     protected int read_double_quoted_char(boolean is_clob) throws IOException
     {
         int c = read_char();
@@ -2135,12 +2167,16 @@ protected int load_triple_quoted_string(StringBuilder sb, boolean is_clob)
         throws IOException
     {
         int c;
+        boolean expectLowSurrogate = false;
 
         for (;;) {
             c = read_triple_quoted_char(is_clob);
             switch(c) {
             case CharacterSequence.CHAR_SEQ_STRING_TERMINATOR:
             case CharacterSequence.CHAR_SEQ_EOF: // was EOF
+                if (!is_clob) {
+                    check_for_low_surrogate(c, expectLowSurrogate);
+                }
                 return c;
             // new line normalization and counting is handled in read_char
             case CharacterSequence.CHAR_SEQ_NEWLINE_SEQUENCE_1:
@@ -2157,7 +2193,11 @@ protected int load_triple_quoted_string(StringBuilder sb, boolean is_clob)
             case CharacterSequence.CHAR_SEQ_ESCAPED_NEWLINE_SEQUENCE_1:
             case CharacterSequence.CHAR_SEQ_ESCAPED_NEWLINE_SEQUENCE_2:
             case CharacterSequence.CHAR_SEQ_ESCAPED_NEWLINE_SEQUENCE_3:
+                continue;
             case CharacterSequence.CHAR_SEQ_STRING_NON_TERMINATOR:
+                if (!is_clob) {
+                    expectLowSurrogate = check_for_low_surrogate(c, expectLowSurrogate);
+                }
                 continue;
             default:
                 break;
@@ -2165,9 +2205,13 @@ protected int load_triple_quoted_string(StringBuilder sb, boolean is_clob)
             // if this isn't a clob we need to decode UTF8 and
             // handle surrogate encoding (otherwise we don't care)
             if (!is_clob) {
+                expectLowSurrogate = check_for_low_surrogate(c, expectLowSurrogate);
+
                 if (IonUTF8.needsSurrogateEncoding(c)) {
                     sb.append(IonUTF8.highSurrogate(c));
                     c = IonUTF8.lowSurrogate(c);
+                } else {
+                    expectLowSurrogate = IonUTF8.isHighSurrogate(c);
                 }
             }
             sb.append((char)c);
diff --git a/test/software/amazon/ion/SystemProcessingTestCase.java b/test/software/amazon/ion/SystemProcessingTestCase.java
index 5ec1082e12..c72e8ffa22 100644
--- a/test/software/amazon/ion/SystemProcessingTestCase.java
+++ b/test/software/amazon/ion/SystemProcessingTestCase.java
@@ -804,9 +804,6 @@ public void testSurrogateGluing()
 
                 ionData = "'''" + high + low + "'''";
                 checkString(FERMATA, "\"\\U0001d110\"", ionData);
-
-                ionData = "'''" + high + "''' '''" + low + "'''";
-                checkString(FERMATA, "\"\\U0001d110\"", ionData);
             }
         }
     }
diff --git a/test/software/amazon/ion/TestUtils.java b/test/software/amazon/ion/TestUtils.java
index d7ade58f7c..a2b5cb68ac 100644
--- a/test/software/amazon/ion/TestUtils.java
+++ b/test/software/amazon/ion/TestUtils.java
@@ -131,15 +131,6 @@ public boolean accept(File dir, String name)
         new FileIsNot(
              "bad/clobWithNullCharacter.ion"                // TODO amzn/ion-java#43
             , "bad/emptyAnnotatedInt.10n"                   // TODO amzn/ion-java#55
-            , "bad/utf8/surrogate_1.ion"                    // TODO amzn/ion-java#105
-            , "bad/utf8/surrogate_2.ion"                    // TODO amzn/ion-java#105
-            , "bad/utf8/surrogate_4.ion"                    // TODO amzn/ion-java#105
-            , "bad/utf8/surrogate_5.ion"                    // TODO amzn/ion-java#60
-            , "bad/utf8/surrogate_6.ion"                    // TODO amzn/ion-java#105
-            , "bad/utf8/surrogate_7.ion"                    // TODO amzn/ion-java#105
-            , "bad/utf8/surrogate_8.ion"                    // TODO amzn/ion-java#105
-            , "bad/utf8/surrogate_9.ion"                    // TODO amzn/ion-java#105
-            , "bad/utf8/surrogate_10.ion"                   // TODO amzn/ion-java#105
             , "equivs/paddedInts.10n"                       // TODO amzn/ion-java#54
             , "good/subfieldVarUInt32bit.ion"               // TODO amzn/ion-java#62
             , "good/utf16.ion"                              // TODO amzn/ion-java#61

From 77ba31c570b6cd6c2f35f70a0896b0e0d0e472ac Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 17 Dec 2018 18:03:23 -0800
Subject: [PATCH 039/490] Uses Precision.includes when testing for SECOND
 precision.

---
 src/software/amazon/ion/Timestamp.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/software/amazon/ion/Timestamp.java b/src/software/amazon/ion/Timestamp.java
index 2f5fa7c3f1..7349107581 100644
--- a/src/software/amazon/ion/Timestamp.java
+++ b/src/software/amazon/ion/Timestamp.java
@@ -572,7 +572,7 @@ private Timestamp(BigDecimal millis, Precision precision, Integer localOffset)
         // a Calendar can handle. Set the _fraction here so that extra precision (if any) is not lost.
         // However, don't set the fraction if the given BigDecimal does not have precision at least to the tenth of
         // a second.
-        if (precision == Precision.SECOND && millis.scale() > -3) {
+        if (precision.includes(Precision.SECOND) && millis.scale() > -3) {
             BigDecimal secs = millis.movePointLeft(3);
             BigDecimal secsDown = fastRoundZeroFloor(secs);
             _fraction = secs.subtract(secsDown);
@@ -1857,7 +1857,7 @@ private static void print(Appendable out, Timestamp adjusted)
         out.append(":");
         print_digits(out, adjusted.getZMinute(), 2);
         // ok, so how much time do we have ?
-        if (adjusted._precision == Precision.SECOND) {
+        if (adjusted._precision.includes(Precision.SECOND)) {
             out.append(":");
             print_digits(out, adjusted.getZSecond(), 2);
             if (adjusted._fraction != null) {
@@ -1930,7 +1930,7 @@ private static void print_fractional_digits(Appendable out, BigDecimal value)
      * @param amount a number of milliseconds.
      */
     public final Timestamp addMillis(long amount) {
-        if (amount == 0 && _precision == Precision.SECOND && _fraction != null && _fraction.scale() >= 3) {
+        if (amount == 0 && _precision.includes(Precision.SECOND) && _fraction != null && _fraction.scale() >= 3) {
             // Zero milliseconds are to be added, and the precision does not need to be increased.
             return this;
         }
@@ -2355,7 +2355,7 @@ private static byte checkAndCastSecond(int second)
 
     private static Precision checkFraction(Precision precision, BigDecimal fraction)
     {
-        if (precision == Precision.SECOND) {
+        if (precision.includes(Precision.SECOND)) {
             if (fraction != null && (fraction.signum() == -1 || BigDecimal.ONE.compareTo(fraction) != 1)) {
                 throw new IllegalArgumentException(String.format("Fractional seconds %s must be greater than or equal to 0 and less than 1", fraction));
             }

From 931d89962d8c023ebdd2d661c64a82b01b6c3c03 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 19 Dec 2018 12:11:19 -0800
Subject: [PATCH 040/490] Adds Timestamp.adjust* methods, which perform date
 arithmetic without extending precision.

---
 src/software/amazon/ion/Timestamp.java      |  218 +++-
 test/software/amazon/ion/TimestampTest.java | 1151 ++++++++++++-------
 2 files changed, 952 insertions(+), 417 deletions(-)

diff --git a/src/software/amazon/ion/Timestamp.java b/src/software/amazon/ion/Timestamp.java
index 7349107581..62984161f7 100644
--- a/src/software/amazon/ion/Timestamp.java
+++ b/src/software/amazon/ion/Timestamp.java
@@ -1926,6 +1926,48 @@ private static void print_fractional_digits(Appendable out, BigDecimal value)
      * Returns a timestamp relative to this one by the given number of
      * milliseconds. Uses this Timestamp's configured Calendar to perform the
      * arithmetic.
+     * <p>
+     * This method always returns a Timestamp with the same precision as
+     * the original. After performing the arithmetic, the resulting Timestamp's
+     * seconds value will be truncated to the same fractional precision as the
+     * original. For example, adjusting {@code 2012-04-01T00:00:00Z} by one
+     * millisecond results in {@code 2012-04-01T00:00:00Z}; adjusting
+     * {@code 2012-04-01T00:00:00.0010Z} by -1 millisecond results in
+     * {@code 2012-04-01T00:00:00.0000Z}. To extend the precision when the
+     * original Timestamp has coarser than SECOND precision and to avoid
+     * truncation of the seconds value, use {@link #addSecond(int)}.
+     *
+     * @param amount a number of milliseconds.
+     */
+    public final Timestamp adjustMillis(long amount) {
+        if (amount == 0) return this;
+        Timestamp ts = addMillis(amount);
+        ts._precision = _precision;
+        ts.clearUnusedPrecision();
+        if (_precision.includes(Precision.SECOND)) {
+            // Maintain the same amount of fractional precision.
+            if (_fraction == null) {
+                ts._fraction = null;
+            } else {
+                // Truncate the result only if it exceeds the fractional precision of the original.
+                if (ts._fraction.scale() > _fraction.scale()) {
+                    ts._fraction = ts._fraction.setScale(_fraction.scale(), RoundingMode.FLOOR);
+                }
+            }
+        }
+        return ts;
+    }
+
+    /**
+     * Returns a timestamp relative to this one by the given number of
+     * milliseconds. Uses this Timestamp's configured Calendar to perform the
+     * arithmetic.
+     * <p>
+     * This method always returns a Timestamp with SECOND precision and a seconds
+     * value precise at least to the millisecond. For example, adding one millisecond
+     * to {@code 2011T} results in {@code 2011-01-01T00:00:00.001-00:00}. To receive
+     * a Timestamp that always maintains the same precision as the original, use
+     * {@link #adjustMillis(long)}.
      *
      * @param amount a number of milliseconds.
      */
@@ -1950,12 +1992,19 @@ public final Timestamp addMillis(long amount) {
             newFraction = millis;
         }
         Timestamp ts = addSecond(seconds);
+        if (ts == this) {
+            // When the precision does not need to be extended and there are no seconds to add,
+            // addSecond returns the same reference unchanged. Clone it to ensure it is not
+            // mutated.
+            ts = clone();
+        }
         ts._fraction = newFraction;
         return ts;
     }
 
     /**
-     * Adds the given amount to the given {@link Calendar} field and returns a new Timestamp.
+     * Adds the given amount to the given {@link Calendar} field and returns a new Timestamp
+     * with precision set to the maximum of the current precision and the given precision.
      * @param field the field.
      * @param amount an amount.
      * @param precision the precision corresponding to the given field.
@@ -1974,13 +2023,46 @@ private Timestamp calendarAdd(int field, int amount, Precision precision) {
         return timestamp;
     }
 
+    /**
+     * Clears any fields more precise than this Timestamp's precision supports.
+     */
+    private void clearUnusedPrecision() {
+        switch (_precision) {
+            case YEAR:
+                _calendar.set(Calendar.MONTH, 0);
+            case MONTH:
+                _calendar.set(Calendar.DAY_OF_MONTH, 1);
+            case DAY:
+                _calendar.set(Calendar.HOUR_OF_DAY, 0);
+                _calendar.set(Calendar.MINUTE, 0);
+            case MINUTE:
+                _calendar.set(Calendar.SECOND, 0);
+                _fraction = null;
+            case SECOND:
+        }
+    }
+
+    /**
+     * Adds the given amount to the given {@link Calendar} field and returns a new Timestamp
+     * with the same precision as the original Timestamp.
+     * @param field the field.
+     * @param amount an amount.
+     * @return a new Timestamp instance.
+     */
+    private Timestamp calendarAdjust(int field, int amount) {
+        if (amount == 0) return this;
+        Timestamp ts = calendarAdd(field, amount, _precision);
+        ts.clearUnusedPrecision();
+        return ts;
+    }
+
     /**
      * Returns a timestamp relative to this one by the given number of seconds.
      * Uses this Timestamp's configured Calendar to perform the arithmetic.
      *
      * @param seconds a number of seconds.
      */
-    private final Timestamp addSecond(long seconds) {
+    private Timestamp addSecond(long seconds) {
         Timestamp ts = this;
         do {
             int incrementalSeconds;
@@ -2000,6 +2082,29 @@ private final Timestamp addSecond(long seconds) {
     /**
      * Returns a timestamp relative to this one by the given number of seconds.
      * Uses this Timestamp's configured Calendar to perform the arithmetic.
+     * <p>
+     * This method always returns a Timestamp with the same precision as
+     * the original. For example, adjusting {@code 2012-04-01T00:00Z} by one
+     * second results in {@code 2012-04-01T00:00Z}; adjusting
+     * {@code 2012-04-01T00:00:00Z} by -1 second results in
+     * {@code 2012-03-31T23:59:59Z}. To extend the precision when the original
+     * Timestamp has coarser than SECOND precision, use {@link #addSecond(int)}.
+     *
+     * @param amount a number of seconds.
+     */
+    public final Timestamp adjustSecond(int amount)
+    {
+        return calendarAdjust(Calendar.SECOND, amount);
+    }
+
+    /**
+     * Returns a timestamp relative to this one by the given number of seconds.
+     * Uses this Timestamp's configured Calendar to perform the arithmetic.
+     * <p>
+     * This method always returns a Timestamp with SECOND precision.
+     * For example, adding one second to {@code 2011T} results in
+     * {@code 2011-01-01T00:00:01-00:00}. To receive a Timestamp that always
+     * maintains the same precision as the original, use {@link #adjustSecond(int)}.
      *
      * @param amount a number of seconds.
      */
@@ -2008,10 +2113,32 @@ public final Timestamp addSecond(int amount)
         return calendarAdd(Calendar.SECOND, amount, Precision.SECOND);
     }
 
+    /**
+     * Returns a timestamp relative to this one by the given number of minutes.
+     * Uses this Timestamp's configured Calendar to perform the arithmetic.
+     * <p>
+     * This method always returns a Timestamp with the same precision as
+     * the original. For example, adjusting {@code 2012-04-01T} by one minute
+     * results in {@code 2012-04-01T}; adjusting {@code 2012-04-01T00:00-00:00}
+     * by -1 minute results in {@code 2012-03-31T23:59-00:00}. To extend the
+     * precision when the original Timestamp has coarser than MINUTE precision,
+     * use {@link #addMinute(int)}.
+     *
+     * @param amount a number of minutes.
+     */
+    public final Timestamp adjustMinute(int amount)
+    {
+        return calendarAdjust(Calendar.MINUTE, amount);
+    }
 
     /**
      * Returns a timestamp relative to this one by the given number of minutes.
      * Uses this Timestamp's configured Calendar to perform the arithmetic.
+     * <p>
+     * This method always returns a Timestamp with at least MINUTE precision.
+     * For example, adding one minute to {@code 2011T} results in
+     * {@code 2011-01-01T00:01-00:00}. To receive a Timestamp that always
+     * maintains the same precision as the original, use {@link #adjustMinute(int)}.
      *
      * @param amount a number of minutes.
      */
@@ -2020,10 +2147,32 @@ public final Timestamp addMinute(int amount)
         return calendarAdd(Calendar.MINUTE, amount, Precision.MINUTE);
     }
 
+    /**
+     * Returns a timestamp relative to this one by the given number of hours.
+     * Uses this Timestamp's configured Calendar to perform the arithmetic.
+     * <p>
+     * This method always returns a Timestamp with the same precision as
+     * the original. For example, adjusting {@code 2012-04-01T} by one hour
+     * results in {@code 2012-04-01T}; adjusting {@code 2012-04-01T00:00-00:00}
+     * by -1 hour results in {@code 2012-03-31T23:00-00:00}. To extend the
+     * precision when the original Timestamp has coarser than MINUTE precision,
+     * use {@link #addHour(int)}.
+     *
+     * @param amount a number of hours.
+     */
+    public final Timestamp adjustHour(int amount)
+    {
+        return calendarAdjust(Calendar.HOUR_OF_DAY, amount);
+    }
 
     /**
      * Returns a timestamp relative to this one by the given number of hours.
      * Uses this Timestamp's configured Calendar to perform the arithmetic.
+     * <p>
+     * This method always returns a Timestamp with at least MINUTE precision.
+     * For example, adding one hour to {@code 2011T} results in
+     * {@code 2011-01-01T01:00-00:00}. To receive a Timestamp that always
+     * maintains the same precision as the original, use {@link #adjustHour(int)}.
      *
      * @param amount a number of hours.
      */
@@ -2032,10 +2181,31 @@ public final Timestamp addHour(int amount)
         return calendarAdd(Calendar.HOUR_OF_DAY, amount, Precision.MINUTE);
     }
 
+    /**
+     * Returns a timestamp relative to this one by the given number of days.
+     * Uses this Timestamp's configured Calendar to perform the arithmetic.
+     * <p>
+     * This method always returns a Timestamp with the same precision as
+     * the original. For example, adjusting {@code 2012-04T} by one day results
+     * in {@code 2012-04T}; adjusting {@code 2012-04-01T} by -1 days results in
+     * {@code 2012-03-31T}. To extend the precision when the original Timestamp
+     * has coarser than DAY precision, use {@link #addDay(int)}.
+     *
+     * @param amount a number of days.
+     */
+    public final Timestamp adjustDay(int amount)
+    {
+        return calendarAdjust(Calendar.DAY_OF_MONTH, amount);
+    }
 
     /**
      * Returns a timestamp relative to this one by the given number of days.
      * Uses this Timestamp's configured Calendar to perform the arithmetic.
+     * <p>
+     * This method always returns a Timestamp with at least DAY precision.
+     * For example, adding one day to {@code 2011T} results in {@code 2011-01-02T}.
+     * To receive a Timestamp that always maintains the same precision as the
+     * original, use {@link #adjustDay(int)}.
      *
      * @param amount a number of days.
      */
@@ -2044,12 +2214,37 @@ public final Timestamp addDay(int amount)
         return calendarAdd(Calendar.DAY_OF_MONTH, amount, Precision.DAY);
     }
 
+    /**
+     * Returns a timestamp relative to this one by the given number of months.
+     * The day field may be adjusted to account for different month length and
+     * leap days, as required by the configured Calendar's rules. For example,
+     * using the default {@link GregorianCalendar}, adjusting {@code 2011-01-31}
+     * by one month results in {@code 2011-02-28}.
+     * <p>
+     * This method always returns a Timestamp with the same precision as the
+     * original. For example, adjusting {@code 2011T} by one month results in
+     * {@code 2011T}; adding 12 months to {@code 2011T} results in {@code 2012T}.
+     * To extend the precision when the original Timestamp has coarser than MONTH
+     * precision, use {@link #addMonth(int)}.
+     *
+     * @param amount a number of months.
+     */
+    public final Timestamp adjustMonth(int amount)
+    {
+        return calendarAdjust(Calendar.MONTH, amount);
+    }
+
     /**
      * Returns a timestamp relative to this one by the given number of months.
      * The day field may be adjusted to account for different month length and
      * leap days, as required by the configured Calendar's rules. For example,
      * using the default {@link GregorianCalendar}, adding one month to
      * {@code 2011-01-31} results in {@code 2011-02-28}.
+     * <p>
+     * This method always returns a Timestamp with at least MONTH precision.
+     * For example, adding one month to {@code 2011T} results in {@code 2011-02T}.
+     * To receive a Timestamp that always maintains the same precision as the
+     * original, use {@link #adjustMonth(int)}.
      *
      * @param amount a number of months.
      */
@@ -2058,6 +2253,22 @@ public final Timestamp addMonth(int amount)
         return calendarAdd(Calendar.MONTH, amount, Precision.MONTH);
     }
 
+    /**
+     * Returns a timestamp relative to this one by the given number of years.
+     * The day field may be adjusted to account for leap days, as required by
+     * the configured Calendar's rules. For example, using the default
+     * {@link GregorianCalendar}, adjusting {@code 2012-02-29} by one year
+     * results in {@code 2013-02-28}.
+     * <p>
+     * Because YEAR is the coarsest precision possible, this method always
+     * returns a Timestamp with the same precision as the original and
+     * behaves identically to {@link #addYear(int)}.
+     *
+     * @param amount a number of years.
+     */
+    public final Timestamp adjustYear(int amount) {
+        return addYear(amount);
+    }
 
     /**
      * Returns a timestamp relative to this one by the given number of years.
@@ -2065,6 +2276,9 @@ public final Timestamp addMonth(int amount)
      * the configured Calendar's rules. For example, using the default
      * {@link GregorianCalendar}, adding one year to {@code 2012-02-29} results
      * in {@code 2013-02-28}.
+     * <p>
+     * This method always returns a Timestamp with the same precision as
+     * the original. See also: {@link #adjustYear(int)}.
      *
      * @param amount a number of years.
      */
diff --git a/test/software/amazon/ion/TimestampTest.java b/test/software/amazon/ion/TimestampTest.java
index 491aaa89ac..5893f27470 100644
--- a/test/software/amazon/ion/TimestampTest.java
+++ b/test/software/amazon/ion/TimestampTest.java
@@ -1617,64 +1617,86 @@ public void testWithLocalOffset()
     //=========================================================================
     // Timestamp arithmetic
 
+    private interface TimestampArithmeticInvoker {
+        Timestamp invoke(Timestamp input, Number amount);
+    }
 
-    private void addYear(String orig, int amount, String expected)
+    private void addAndCompare(String orig, Number amount, String expected, TimestampArithmeticInvoker invoker)
     {
         Timestamp ts1 = Timestamp.valueOf(orig);
-        Timestamp ts2 = ts1.addYear(amount);
+        Timestamp ts2 = invoker.invoke(ts1, amount);
         checkTimestamp(expected, ts2);
+        checkTimestamp(orig, ts1); // Make sure the arithmetic does not mutate the original timestamp.
     }
 
-    private void addYear(String orig, int amount, String expected,
-                         String suffix)
+    private void addAndCompare(String orig, Number amount, String expected,
+                               String suffix, TimestampArithmeticInvoker invoker)
     {
-        addYear(orig + suffix, amount, expected + suffix);
+        addAndCompare(orig + suffix, amount, expected + suffix, invoker);
     }
 
-    private void addYearWithOffsets(String orig, int amount, String expected,
-                                    String suffix)
+    private void addAndCompareWithOffsets(String orig, Number amount, String expected,
+                                          String suffix, TimestampArithmeticInvoker invoker)
     {
-        addYear(orig, amount, expected, suffix + "-00:00");
-        addYear(orig, amount, expected, suffix + "Z");
-        addYear(orig, amount, expected, suffix + "+01:23");
-        addYear(orig, amount, expected, suffix + "-01:23");
-        addYear(orig, amount, expected, suffix + "+23:59");
-        addYear(orig, amount, expected, suffix + "-23:59");
+        addAndCompare(orig, amount, expected, suffix + "-00:00", invoker);
+        addAndCompare(orig, amount, expected, suffix + "Z", invoker);
+        addAndCompare(orig, amount, expected, suffix + "+01:23", invoker);
+        addAndCompare(orig, amount, expected, suffix + "-01:23", invoker);
+        addAndCompare(orig, amount, expected, suffix + "+23:59", invoker);
+        addAndCompare(orig, amount, expected, suffix + "-23:59", invoker);
     }
 
-    private void addYearWithMins(String orig, int amount, String expected)
+    private void addAndCompareWithFullPrecision(String orig, Number amount, String expected, TimestampArithmeticInvoker invoker)
     {
-        addYear(orig, amount, expected);
+        addAndCompare(orig, amount, expected, invoker);
 
-        addYearWithOffsets(orig, amount, expected, "T19:03");
-        addYearWithOffsets(orig, amount, expected, "T19:03:23");
-        addYearWithOffsets(orig, amount, expected, "T19:03:23.0");
-        addYearWithOffsets(orig, amount, expected, "T19:03:23.00");
-        addYearWithOffsets(orig, amount, expected, "T19:03:23.000");
-        addYearWithOffsets(orig, amount, expected, "T19:03:23.456");
-        addYearWithOffsets(orig, amount, expected, "T19:03:23.0000");
-        addYearWithOffsets(orig, amount, expected, "T19:03:23.45678");
+        addAndCompareWithOffsets(orig, amount, expected, "T19:03", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, "T19:03:23", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, "T19:03:23.0", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, "T19:03:23.00", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, "T19:03:23.000", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, "T19:03:23.456", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, "T19:03:23.0000", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, "T19:03:23.45678", invoker);
     }
 
-    @Test
-    public void testAddYear()
-    {
-        addYear("2012T",     1, "2013T");
-        addYear("2012T",    -1, "2011T");
+    private void testYearArithmetic(TimestampArithmeticInvoker invoker) {
+        addAndCompare("2012T",     1, "2013T", invoker);
+        addAndCompare("2012T",    -1, "2011T", invoker);
 
-        addYear("2012-04T",  1, "2013-04T");
-        addYear("2012-04T", -1, "2011-04T");
+        addAndCompare("2012-04T",  1, "2013-04T", invoker);
+        addAndCompare("2012-04T", -1, "2011-04T", invoker);
 
-        addYearWithMins("2012-04-23",  1, "2013-04-23");
-        addYearWithMins("2012-04-23", -1, "2011-04-23");
+        addAndCompareWithFullPrecision("2012-04-23",  1, "2013-04-23", invoker);
+        addAndCompareWithFullPrecision("2012-04-23", -1, "2011-04-23", invoker);
 
         // Leap-year handling
-        addYearWithMins("2012-02-29", -5, "2007-02-28");
-        addYearWithMins("2012-02-29", -4, "2008-02-29");
-        addYearWithMins("2012-02-29", -1, "2011-02-28");
-        addYearWithMins("2012-02-29",  1, "2013-02-28");
-        addYearWithMins("2012-02-29",  4, "2016-02-29");
-        addYearWithMins("2012-02-29",  5, "2017-02-28");
+        addAndCompareWithFullPrecision("2012-02-29", -5, "2007-02-28", invoker);
+        addAndCompareWithFullPrecision("2012-02-29", -4, "2008-02-29", invoker);
+        addAndCompareWithFullPrecision("2012-02-29", -1, "2011-02-28", invoker);
+        addAndCompareWithFullPrecision("2012-02-29",  1, "2013-02-28", invoker);
+        addAndCompareWithFullPrecision("2012-02-29",  4, "2016-02-29", invoker);
+        addAndCompareWithFullPrecision("2012-02-29",  5, "2017-02-28", invoker);
+    }
+
+    @Test
+    public void testAddYear()
+    {
+        testYearArithmetic(new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.addYear(amount.intValue());
+            }
+        });
+    }
+
+    @Test
+    public void testAdjustYear()
+    {
+        testYearArithmetic(new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.adjustYear(amount.intValue());
+            }
+        });
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -1691,156 +1713,187 @@ public void testAddYearOutsideMinRange()
         ts1.addYear(-2000);
     }
 
-    //-------------------------------------------------------------------------
-
-    private void addMonth(String orig, int amount, String expected)
-    {
-        Timestamp ts1 = Timestamp.valueOf(orig);
-        Timestamp ts2 = ts1.addMonth(amount);
-        checkTimestamp(expected, ts2);
-    }
-
-    private void addMonth(String orig, int amount, String expected,
-                          String suffix)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustYearOutsideMaxRange()
     {
-        addMonth(orig + suffix, amount, expected + suffix);
+        Timestamp ts1 = Timestamp.valueOf("1000T");
+        ts1.adjustYear(10000);
     }
 
-    private void addMonthWithOffsets(String orig, int amount, String expected,
-                                     String suffix)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustYearOutsideMinRange()
     {
-        addMonth(orig, amount, expected, suffix + "-00:00");
-        addMonth(orig, amount, expected, suffix + "Z");
-        addMonth(orig, amount, expected, suffix + "+01:23");
-        addMonth(orig, amount, expected, suffix + "-01:23");
-        addMonth(orig, amount, expected, suffix + "+23:59");
-        addMonth(orig, amount, expected, suffix + "-23:59");
+        Timestamp ts1 = Timestamp.valueOf("1000T");
+        ts1.adjustYear(-2000);
     }
 
-    private void addMonthWithMins(String orig, int amount, String expected)
-    {
-        addMonth(orig, amount, expected);
-
-        addMonthWithOffsets(orig, amount, expected, "T19:03");
-        addMonthWithOffsets(orig, amount, expected, "T19:03:23");
-        addMonthWithOffsets(orig, amount, expected, "T19:03:23.0");
-        addMonthWithOffsets(orig, amount, expected, "T19:03:23.00");
-        addMonthWithOffsets(orig, amount, expected, "T19:03:23.000");
-        addMonthWithOffsets(orig, amount, expected, "T19:03:23.456");
-        addMonthWithOffsets(orig, amount, expected, "T19:03:23.0000");
-        addMonthWithOffsets(orig, amount, expected, "T19:03:23.45678");
-    }
+    //-------------------------------------------------------------------------
 
     @Test
     public void testAddMonth()
     {
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            @Override
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.addMonth(amount.intValue());
+            }
+        };
         // Adding more precise amounts extends the precision.
-        addMonth("2012T",    -1, "2011-12T");
-        addMonth("2012T",     1, "2012-02T");
-
-        addMonth("2012-04T", -4, "2011-12T");
-        addMonth("2012-04T", -1, "2012-03T");
-        addMonth("2012-04T",  1, "2012-05T");
-        addMonth("2012-04T",  9, "2013-01T");
-
-        addMonthWithMins("2012-04-23", -4, "2011-12-23");
-        addMonthWithMins("2012-04-23", -1, "2012-03-23");
-        addMonthWithMins("2012-04-23",  1, "2012-05-23");
-        addMonthWithMins("2012-04-23",  9, "2013-01-23");
-
-        addMonthWithMins("2011-01-31",  1, "2011-02-28");
-        addMonthWithMins("2011-02-28", 12, "2012-02-28");
-        addMonthWithMins("2012-01-31",  1, "2012-02-29");
-        addMonthWithMins("2012-01-31",  2, "2012-03-31");
-        addMonthWithMins("2012-01-31",  3, "2012-04-30");
-        addMonthWithMins("2012-02-29", -1, "2012-01-29");
-        addMonthWithMins("2012-02-29", 12, "2013-02-28");
-        addMonthWithMins("2012-02-29", 24, "2014-02-28");
-        addMonthWithMins("2012-02-29", 48, "2016-02-29");
-        addMonthWithMins("2013-01-31",-11, "2012-02-29");
+        addAndCompare("2012T",    -1, "2011-12T", invoker);
+        addAndCompare("2012T",     1, "2012-02T", invoker);
+
+        addAndCompare("2012-04T", -4, "2011-12T", invoker);
+        addAndCompare("2012-04T", -1, "2012-03T", invoker);
+        addAndCompare("2012-04T",  1, "2012-05T", invoker);
+        addAndCompare("2012-04T",  9, "2013-01T", invoker);
+
+        addAndCompareWithFullPrecision("2012-04-23", -4, "2011-12-23", invoker);
+        addAndCompareWithFullPrecision("2012-04-23", -1, "2012-03-23", invoker);
+        addAndCompareWithFullPrecision("2012-04-23",  1, "2012-05-23", invoker);
+        addAndCompareWithFullPrecision("2012-04-23",  9, "2013-01-23", invoker);
+
+        addAndCompareWithFullPrecision("2011-01-31",  1, "2011-02-28", invoker);
+        addAndCompareWithFullPrecision("2011-02-28", 12, "2012-02-28", invoker);
+        addAndCompareWithFullPrecision("2012-01-31",  1, "2012-02-29", invoker);
+        addAndCompareWithFullPrecision("2012-01-31",  2, "2012-03-31", invoker);
+        addAndCompareWithFullPrecision("2012-01-31",  3, "2012-04-30", invoker);
+        addAndCompareWithFullPrecision("2012-02-29", -1, "2012-01-29", invoker);
+        addAndCompareWithFullPrecision("2012-02-29", 12, "2013-02-28", invoker);
+        addAndCompareWithFullPrecision("2012-02-29", 24, "2014-02-28", invoker);
+        addAndCompareWithFullPrecision("2012-02-29", 48, "2016-02-29", invoker);
+        addAndCompareWithFullPrecision("2013-01-31",-11, "2012-02-29", invoker);
+    }
+
+    @Test
+    public void testAdjustMonth()
+    {
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            @Override
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.adjustMonth(amount.intValue());
+            }
+        };
+        // Adding more precise amounts does not extend the precision.
+        addAndCompare("2012T",    -1, "2011T", invoker);
+        addAndCompare("2012T",     1, "2012T", invoker);
+
+        addAndCompare("2012-04T", -4, "2011-12T", invoker);
+        addAndCompare("2012-04T", -1, "2012-03T", invoker);
+        addAndCompare("2012-04T",  1, "2012-05T", invoker);
+        addAndCompare("2012-04T",  9, "2013-01T", invoker);
+
+        addAndCompareWithFullPrecision("2012-04-23", -4, "2011-12-23", invoker);
+        addAndCompareWithFullPrecision("2012-04-23", -1, "2012-03-23", invoker);
+        addAndCompareWithFullPrecision("2012-04-23",  1, "2012-05-23", invoker);
+        addAndCompareWithFullPrecision("2012-04-23",  9, "2013-01-23", invoker);
+
+        addAndCompareWithFullPrecision("2011-01-31",  1, "2011-02-28", invoker);
+        addAndCompareWithFullPrecision("2011-02-28", 12, "2012-02-28", invoker);
+        addAndCompareWithFullPrecision("2012-01-31",  1, "2012-02-29", invoker);
+        addAndCompareWithFullPrecision("2012-01-31",  2, "2012-03-31", invoker);
+        addAndCompareWithFullPrecision("2012-01-31",  3, "2012-04-30", invoker);
+        addAndCompareWithFullPrecision("2012-02-29", -1, "2012-01-29", invoker);
+        addAndCompareWithFullPrecision("2012-02-29", 12, "2013-02-28", invoker);
+        addAndCompareWithFullPrecision("2012-02-29", 24, "2014-02-28", invoker);
+        addAndCompareWithFullPrecision("2012-02-29", 48, "2016-02-29", invoker);
+        addAndCompareWithFullPrecision("2013-01-31",-11, "2012-02-29", invoker);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testAddMonthOutsideMaxRange()
     {
         Timestamp ts1 = Timestamp.valueOf("1000T");
-        ts1.addYear(10000*12);
+        ts1.addMonth(10000*12);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testAddMonthOutsideMinRange()
     {
         Timestamp ts1 = Timestamp.valueOf("1000T");
-        ts1.addYear(-2000*12);
+        ts1.addMonth(-2000*12);
     }
 
-    //-------------------------------------------------------------------------
-
-    private void addDay(String orig, int amount, String expected)
-    {
-        Timestamp ts1 = Timestamp.valueOf(orig);
-        Timestamp ts2 = ts1.addDay(amount);
-        checkTimestamp(expected, ts2);
-    }
-
-    private void addDay(String orig, int amount, String expected,
-                          String suffix)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustMonthOutsideMaxRange()
     {
-        addDay(orig + suffix, amount, expected + suffix);
+        Timestamp ts1 = Timestamp.valueOf("1000T");
+        ts1.adjustMonth(10000*12);
     }
 
-    private void addDayWithOffsets(String orig, int amount, String expected,
-                                     String suffix)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustMonthOutsideMinRange()
     {
-        addDay(orig, amount, expected, suffix + "-00:00");
-        addDay(orig, amount, expected, suffix + "Z");
-        addDay(orig, amount, expected, suffix + "+01:23");
-        addDay(orig, amount, expected, suffix + "-01:23");
-        addDay(orig, amount, expected, suffix + "+23:59");
-        addDay(orig, amount, expected, suffix + "-23:59");
+        Timestamp ts1 = Timestamp.valueOf("1000T");
+        ts1.adjustMonth(-2000*12);
     }
 
-    private void addDayWithMins(String orig, int amount, String expected)
-    {
-        addDay(orig, amount, expected);
-
-        addDayWithOffsets(orig, amount, expected, "T19:03");
-        addDayWithOffsets(orig, amount, expected, "T19:03:23");
-        addDayWithOffsets(orig, amount, expected, "T19:03:23.0");
-        addDayWithOffsets(orig, amount, expected, "T19:03:23.00");
-        addDayWithOffsets(orig, amount, expected, "T19:03:23.000");
-        addDayWithOffsets(orig, amount, expected, "T19:03:23.456");
-        addDayWithOffsets(orig, amount, expected, "T19:03:23.0000");
-        addDayWithOffsets(orig, amount, expected, "T19:03:23.45678");
-    }
+    //-------------------------------------------------------------------------
 
     @Test
     public void testAddDay()
     {
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.addDay(amount.intValue());
+            }
+        };
         // Adding more precise amounts extends the precision.
-        addDay("2012T",     1, "2012-01-02");
-        addDay("2012T",     0, "2012-01-01");
-        addDay("2012T",    -1, "2011-12-31");
-
-        addDay("2012-04T",-32, "2012-02-29");
-        addDay("2012-04T",-31, "2012-03-01");
-        addDay("2012-04T", -1, "2012-03-31");
-        addDay("2012-04T",  1, "2012-04-02");
-        addDay("2012-04T",  9, "2012-04-10");
-        addDay("2012-04T", 30, "2012-05-01");
-        addDay("2012-04T", 31, "2012-05-02");
-
-        addDayWithMins("2011-01-31",-31, "2010-12-31");
-        addDayWithMins("2011-01-31",-30, "2011-01-01");
-        addDayWithMins("2011-01-31",  1, "2011-02-01");
-        addDayWithMins("2011-01-31", 28, "2011-02-28");
-        addDayWithMins("2011-01-31", 29, "2011-03-01");
-        addDayWithMins("2011-01-31", 30, "2011-03-02");
-        addDayWithMins("2012-01-31",  1, "2012-02-01");
-        addDayWithMins("2012-01-31", 28, "2012-02-28");
-        addDayWithMins("2012-01-31", 29, "2012-02-29");
-        addDayWithMins("2012-01-31", 30, "2012-03-01");
-        addDayWithMins("2012-03-01",-30, "2012-01-31");
+        addAndCompare("2012T",     1, "2012-01-02", invoker);
+        addAndCompare("2012T",     0, "2012-01-01", invoker);
+        addAndCompare("2012T",    -1, "2011-12-31", invoker);
+
+        addAndCompare("2012-04T",-32, "2012-02-29", invoker);
+        addAndCompare("2012-04T",-31, "2012-03-01", invoker);
+        addAndCompare("2012-04T", -1, "2012-03-31", invoker);
+        addAndCompare("2012-04T",  1, "2012-04-02", invoker);
+        addAndCompare("2012-04T",  9, "2012-04-10", invoker);
+        addAndCompare("2012-04T", 30, "2012-05-01", invoker);
+        addAndCompare("2012-04T", 31, "2012-05-02", invoker);
+
+        addAndCompareWithFullPrecision("2011-01-31",-31, "2010-12-31", invoker);
+        addAndCompareWithFullPrecision("2011-01-31",-30, "2011-01-01", invoker);
+        addAndCompareWithFullPrecision("2011-01-31",  1, "2011-02-01", invoker);
+        addAndCompareWithFullPrecision("2011-01-31", 28, "2011-02-28", invoker);
+        addAndCompareWithFullPrecision("2011-01-31", 29, "2011-03-01", invoker);
+        addAndCompareWithFullPrecision("2011-01-31", 30, "2011-03-02", invoker);
+        addAndCompareWithFullPrecision("2012-01-31",  1, "2012-02-01", invoker);
+        addAndCompareWithFullPrecision("2012-01-31", 28, "2012-02-28", invoker);
+        addAndCompareWithFullPrecision("2012-01-31", 29, "2012-02-29", invoker);
+        addAndCompareWithFullPrecision("2012-01-31", 30, "2012-03-01", invoker);
+        addAndCompareWithFullPrecision("2012-03-01",-30, "2012-01-31", invoker);
+    }
+
+    @Test
+    public void testAdjustDay()
+    {
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.adjustDay(amount.intValue());
+            }
+        };
+        // Adding more precise amounts does not extend the precision.
+        addAndCompare("2012T",     1, "2012T", invoker);
+        addAndCompare("2012T",    -1, "2011T", invoker);
+
+        addAndCompare("2012-04T",-32, "2012-02T", invoker);
+        addAndCompare("2012-04T",-31, "2012-03T", invoker);
+        addAndCompare("2012-04T", -1, "2012-03T", invoker);
+        addAndCompare("2012-04T",  1, "2012-04T", invoker);
+        addAndCompare("2012-04T",  9, "2012-04T", invoker);
+        addAndCompare("2012-04T", 30, "2012-05T", invoker);
+        addAndCompare("2012-04T", 31, "2012-05T", invoker);
+
+        addAndCompareWithFullPrecision("2011-01-31",-31, "2010-12-31", invoker);
+        addAndCompareWithFullPrecision("2011-01-31",-30, "2011-01-01", invoker);
+        addAndCompareWithFullPrecision("2011-01-31",  1, "2011-02-01", invoker);
+        addAndCompareWithFullPrecision("2011-01-31", 28, "2011-02-28", invoker);
+        addAndCompareWithFullPrecision("2011-01-31", 29, "2011-03-01", invoker);
+        addAndCompareWithFullPrecision("2011-01-31", 30, "2011-03-02", invoker);
+        addAndCompareWithFullPrecision("2012-01-31",  1, "2012-02-01", invoker);
+        addAndCompareWithFullPrecision("2012-01-31", 28, "2012-02-28", invoker);
+        addAndCompareWithFullPrecision("2012-01-31", 29, "2012-02-29", invoker);
+        addAndCompareWithFullPrecision("2012-01-31", 30, "2012-03-01", invoker);
+        addAndCompareWithFullPrecision("2012-03-01",-30, "2012-01-31", invoker);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -1857,84 +1910,126 @@ public void testAddDayOutsideMinRange()
         ts1.addDay(-2000*12*35);
     }
 
-    //-------------------------------------------------------------------------
-
-    private void addHour(String orig, int amount, String expected)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustDayOutsideMaxRange()
     {
-        Timestamp ts1 = Timestamp.valueOf(orig);
-        Timestamp ts2 = ts1.addHour(amount);
-        checkTimestamp(expected, ts2);
+        Timestamp ts1 = Timestamp.valueOf("1000T");
+        ts1.adjustDay(10000*12*35);
     }
 
-    private void addHour(String orig, int amount, String expected,
-                         String suffix)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustDayOutsideMinRange()
     {
-        addHour(orig + suffix, amount, expected + suffix);
+        Timestamp ts1 = Timestamp.valueOf("1000T");
+        ts1.adjustDay(-2000*12*35);
     }
 
-    private void addHourWithOffsets(String orig, int amount, String expected,
-                                    String suffix)
-    {
-        addHour(orig, amount, expected, suffix + "-00:00");
-        addHour(orig, amount, expected, suffix + "Z");
-        addHour(orig, amount, expected, suffix + "+01:23");
-        addHour(orig, amount, expected, suffix + "-01:23");
-        addHour(orig, amount, expected, suffix + "+23:59");
-        addHour(orig, amount, expected, suffix + "-23:59");
-    }
+    //-------------------------------------------------------------------------
 
-    private void addHourWithMins(String orig, int amount, String expected)
+    private void addAndCompareHourWithFullPrecision(String orig, int amount, String expected, TimestampArithmeticInvoker invoker)
     {
-        addHourWithOffsets(orig, amount, expected, ":03");
-        addHourWithOffsets(orig, amount, expected, ":03:23");
-        addHourWithOffsets(orig, amount, expected, ":03:23.0");
-        addHourWithOffsets(orig, amount, expected, ":03:23.00");
-        addHourWithOffsets(orig, amount, expected, ":03:23.000");
-        addHourWithOffsets(orig, amount, expected, ":03:23.456");
-        addHourWithOffsets(orig, amount, expected, ":03:23.0000");
-        addHourWithOffsets(orig, amount, expected, ":03:23.45678");
+        addAndCompareWithOffsets(orig, amount, expected, ":03", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":03:23", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":03:23.0", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":03:23.00", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":03:23.000", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":03:23.456", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":03:23.0000", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":03:23.45678", invoker);
     }
 
     @Test
     public void testAddHour()
     {
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.addHour(amount.intValue());
+            }
+        };
         // Adding more precise amounts extends the precision.
-        addHour("2012T",    -1, "2011-12-31T23:00-00:00");
-        addHour("2012T",     0, "2012-01-01T00:00-00:00");
-        addHour("2012T",     1, "2012-01-01T01:00-00:00");
-
-        addHour("2012-04T", -31 * 24 - 1, "2012-02-29T23:00-00:00");
-        addHour("2012-04T", -31 * 24    , "2012-03-01T00:00-00:00");
-        addHour("2012-04T",           -1, "2012-03-31T23:00-00:00");
-        addHour("2012-04T",            0, "2012-04-01T00:00-00:00");
-        addHour("2012-04T",            1, "2012-04-01T01:00-00:00");
-        addHour("2012-04T",  30 * 24 - 1, "2012-04-30T23:00-00:00");
-        addHour("2012-04T",  30 * 24    , "2012-05-01T00:00-00:00");
-
-        addHour("2011-02-28",  -1, "2011-02-27T23:00-00:00");
-        addHour("2011-02-28",   0, "2011-02-28T00:00-00:00");
-        addHour("2011-02-28",   1, "2011-02-28T01:00-00:00");
-        addHour("2011-02-28",  24, "2011-03-01T00:00-00:00");
-        addHour("2011-03-01", -24, "2011-02-28T00:00-00:00");
-        addHour("2012-02-28",  24, "2012-02-29T00:00-00:00");
-        addHour("2012-02-29", -24, "2012-02-28T00:00-00:00");
-        addHour("2012-02-29",  24, "2012-03-01T00:00-00:00");
-
-        addHour("2012-10-04",-48, "2012-10-02T00:00-00:00");
-        addHour("2012-10-04",-24, "2012-10-03T00:00-00:00");
-        addHour("2012-10-04", -1, "2012-10-03T23:00-00:00");
-        addHour("2012-10-04",  1, "2012-10-04T01:00-00:00");
-        addHour("2012-10-04", 24, "2012-10-05T00:00-00:00");
-        addHour("2012-10-04", 48, "2012-10-06T00:00-00:00");
-
-        addHourWithMins("2011-01-31T12",  0, "2011-01-31T12");
-        addHourWithMins("2011-01-31T12", 12, "2011-02-01T00");
-
-        addHourWithMins("2011-02-28T02", 25, "2011-03-01T03");
-        addHourWithMins("2012-02-28T02", 25, "2012-02-29T03");
-
-        addHourWithMins("2011-03-01T02", -4, "2011-02-28T22");
-        addHourWithMins("2012-03-01T02", -4, "2012-02-29T22");
+        addAndCompare("2012T",    -1, "2011-12-31T23:00-00:00", invoker);
+        addAndCompare("2012T",     0, "2012-01-01T00:00-00:00", invoker);
+        addAndCompare("2012T",     1, "2012-01-01T01:00-00:00", invoker);
+
+        addAndCompare("2012-04T", -31 * 24 - 1, "2012-02-29T23:00-00:00", invoker);
+        addAndCompare("2012-04T", -31 * 24    , "2012-03-01T00:00-00:00", invoker);
+        addAndCompare("2012-04T",           -1, "2012-03-31T23:00-00:00", invoker);
+        addAndCompare("2012-04T",            0, "2012-04-01T00:00-00:00", invoker);
+        addAndCompare("2012-04T",            1, "2012-04-01T01:00-00:00", invoker);
+        addAndCompare("2012-04T",  30 * 24 - 1, "2012-04-30T23:00-00:00", invoker);
+        addAndCompare("2012-04T",  30 * 24    , "2012-05-01T00:00-00:00", invoker);
+
+        addAndCompare("2011-02-28",  -1, "2011-02-27T23:00-00:00", invoker);
+        addAndCompare("2011-02-28",   0, "2011-02-28T00:00-00:00", invoker);
+        addAndCompare("2011-02-28",   1, "2011-02-28T01:00-00:00", invoker);
+        addAndCompare("2011-02-28",  24, "2011-03-01T00:00-00:00", invoker);
+        addAndCompare("2011-03-01", -24, "2011-02-28T00:00-00:00", invoker);
+        addAndCompare("2012-02-28",  24, "2012-02-29T00:00-00:00", invoker);
+        addAndCompare("2012-02-29", -24, "2012-02-28T00:00-00:00", invoker);
+        addAndCompare("2012-02-29",  24, "2012-03-01T00:00-00:00", invoker);
+
+        addAndCompare("2012-10-04",-48, "2012-10-02T00:00-00:00", invoker);
+        addAndCompare("2012-10-04",-24, "2012-10-03T00:00-00:00", invoker);
+        addAndCompare("2012-10-04", -1, "2012-10-03T23:00-00:00", invoker);
+        addAndCompare("2012-10-04",  1, "2012-10-04T01:00-00:00", invoker);
+        addAndCompare("2012-10-04", 24, "2012-10-05T00:00-00:00", invoker);
+        addAndCompare("2012-10-04", 48, "2012-10-06T00:00-00:00", invoker);
+
+        addAndCompareHourWithFullPrecision("2011-01-31T12",  0, "2011-01-31T12", invoker);
+        addAndCompareHourWithFullPrecision("2011-01-31T12", 12, "2011-02-01T00", invoker);
+
+        addAndCompareHourWithFullPrecision("2011-02-28T02", 25, "2011-03-01T03", invoker);
+        addAndCompareHourWithFullPrecision("2012-02-28T02", 25, "2012-02-29T03", invoker);
+
+        addAndCompareHourWithFullPrecision("2011-03-01T02", -4, "2011-02-28T22", invoker);
+        addAndCompareHourWithFullPrecision("2012-03-01T02", -4, "2012-02-29T22", invoker);
+    }
+
+    @Test
+    public void testAdjustHour()
+    {
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.adjustHour(amount.intValue());
+            }
+        };
+        // Adding more precise amounts does not extend the precision.
+        addAndCompare("2012T",    -1, "2011T", invoker);
+        addAndCompare("2012T",     0, "2012T", invoker);
+        addAndCompare("2012T",     1, "2012T", invoker);
+
+        addAndCompare("2012-04T", -31 * 24 - 1, "2012-02T", invoker);
+        addAndCompare("2012-04T", -31 * 24    , "2012-03T", invoker);
+        addAndCompare("2012-04T",           -1, "2012-03T", invoker);
+        addAndCompare("2012-04T",            0, "2012-04T", invoker);
+        addAndCompare("2012-04T",            1, "2012-04T", invoker);
+        addAndCompare("2012-04T",  30 * 24 - 1, "2012-04T", invoker);
+        addAndCompare("2012-04T",  30 * 24    , "2012-05T", invoker);
+
+        addAndCompare("2011-02-28",  -1, "2011-02-27", invoker);
+        addAndCompare("2011-02-28",   0, "2011-02-28", invoker);
+        addAndCompare("2011-02-28",   1, "2011-02-28", invoker);
+        addAndCompare("2011-02-28",  24, "2011-03-01", invoker);
+        addAndCompare("2011-03-01", -24, "2011-02-28", invoker);
+        addAndCompare("2012-02-28",  24, "2012-02-29", invoker);
+        addAndCompare("2012-02-29", -24, "2012-02-28", invoker);
+        addAndCompare("2012-02-29",  24, "2012-03-01", invoker);
+
+        addAndCompare("2012-10-04",-48, "2012-10-02", invoker);
+        addAndCompare("2012-10-04",-24, "2012-10-03", invoker);
+        addAndCompare("2012-10-04", -1, "2012-10-03", invoker);
+        addAndCompare("2012-10-04",  1, "2012-10-04", invoker);
+        addAndCompare("2012-10-04", 24, "2012-10-05", invoker);
+        addAndCompare("2012-10-04", 48, "2012-10-06", invoker);
+
+        addAndCompareHourWithFullPrecision("2011-01-31T12",  0, "2011-01-31T12", invoker);
+        addAndCompareHourWithFullPrecision("2011-01-31T12", 12, "2011-02-01T00", invoker);
+
+        addAndCompareHourWithFullPrecision("2011-02-28T02", 25, "2011-03-01T03", invoker);
+        addAndCompareHourWithFullPrecision("2012-02-28T02", 25, "2012-02-29T03", invoker);
+
+        addAndCompareHourWithFullPrecision("2011-03-01T02", -4, "2011-02-28T22", invoker);
+        addAndCompareHourWithFullPrecision("2012-03-01T02", -4, "2012-02-29T22", invoker);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -1951,86 +2046,130 @@ public void testAddHourOutsideMinRange()
         ts1.addHour(-2000*12*35*24);
     }
 
-    //-------------------------------------------------------------------------
-
-    private void addMinute(String orig, int amount, String expected)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustHourOutsideMaxRange()
     {
-        Timestamp ts1 = Timestamp.valueOf(orig);
-        Timestamp ts2 = ts1.addMinute(amount);
-        checkTimestamp(expected, ts2);
+        Timestamp ts1 = Timestamp.valueOf("1000T");
+        ts1.adjustHour(10000*12*35*24);
     }
 
-    private void addMinute(String orig, int amount, String expected,
-                           String suffix)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustHourOutsideMinRange()
     {
-        addMinute(orig + suffix, amount, expected + suffix);
+        Timestamp ts1 = Timestamp.valueOf("1000T");
+        ts1.adjustHour(-2000*12*35*24);
     }
 
-    private void addMinuteWithOffsets(String orig, int amount, String expected,
-                                      String suffix)
-    {
-        addMinute(orig, amount, expected, suffix + "-00:00");
-        addMinute(orig, amount, expected, suffix + "Z");
-        addMinute(orig, amount, expected, suffix + "+01:23");
-        addMinute(orig, amount, expected, suffix + "-01:23");
-        addMinute(orig, amount, expected, suffix + "+23:59");
-        addMinute(orig, amount, expected, suffix + "-23:59");
-    }
+    //-------------------------------------------------------------------------
 
-    private void addMinuteWithsSecs(String orig, int amount, String expected)
+    private void addAndCompareMinuteWithFullPrecision(String orig, int amount, String expected, TimestampArithmeticInvoker invoker)
     {
-        addMinuteWithOffsets(orig, amount, expected, "");
-        addMinuteWithOffsets(orig, amount, expected, ":23");
-        addMinuteWithOffsets(orig, amount, expected, ":23.0");
-        addMinuteWithOffsets(orig, amount, expected, ":23.00");
-        addMinuteWithOffsets(orig, amount, expected, ":23.000");
-        addMinuteWithOffsets(orig, amount, expected, ":23.456");
-        addMinuteWithOffsets(orig, amount, expected, ":23.0000");
-        addMinuteWithOffsets(orig, amount, expected, ":23.45678");
+        addAndCompareWithOffsets(orig, amount, expected, "", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":23", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":23.0", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":23.00", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":23.000", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":23.456", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":23.0000", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ":23.45678", invoker);
     }
 
     @Test
     public void testAddMinute()
     {
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.addMinute(amount.intValue());
+            }
+        };
         // Adding more precise amounts extends the precision.
-        addMinute("2012T",    -1, "2011-12-31T23:59-00:00");
-        addMinute("2012T",     0, "2012-01-01T00:00-00:00");
-        addMinute("2012T",     1, "2012-01-01T00:01-00:00");
-
-        addMinute("2012-04T", -31 * 24 * 60 - 1, "2012-02-29T23:59-00:00");
-        addMinute("2012-04T", -31 * 24 * 60    , "2012-03-01T00:00-00:00");
-        addMinute("2012-04T",                -1, "2012-03-31T23:59-00:00");
-        addMinute("2012-04T",                 0, "2012-04-01T00:00-00:00");
-        addMinute("2012-04T",                 1, "2012-04-01T00:01-00:00");
-        addMinute("2012-04T",  30 * 24 * 60 - 1, "2012-04-30T23:59-00:00");
-        addMinute("2012-04T",  30 * 24 * 60    , "2012-05-01T00:00-00:00");
-
-        addMinute("2011-02-28",       -1, "2011-02-27T23:59-00:00");
-        addMinute("2011-02-28",        0, "2011-02-28T00:00-00:00");
-        addMinute("2011-02-28",        1, "2011-02-28T00:01-00:00");
-        addMinute("2011-02-28",  24 * 60, "2011-03-01T00:00-00:00");
-        addMinute("2011-03-01", -24 * 60, "2011-02-28T00:00-00:00");
-        addMinute("2012-02-28",  24 * 60, "2012-02-29T00:00-00:00");
-        addMinute("2012-02-29", -24 * 60, "2012-02-28T00:00-00:00");
-        addMinute("2012-02-29",  24 * 60, "2012-03-01T00:00-00:00");
-
-        addMinute("2012-10-04", -48 * 60, "2012-10-02T00:00-00:00");
-        addMinute("2012-10-04", -24 * 60, "2012-10-03T00:00-00:00");
-        addMinute("2012-10-04",       -1, "2012-10-03T23:59-00:00");
-        addMinute("2012-10-04",        1, "2012-10-04T00:01-00:00");
-        addMinute("2012-10-04",  24 * 60, "2012-10-05T00:00-00:00");
-        addMinute("2012-10-04",  48 * 60, "2012-10-06T00:00-00:00");
-
-        addMinuteWithsSecs("2011-01-31T12:03",  -60, "2011-01-31T11:03");
-        addMinuteWithsSecs("2011-01-31T12:03",    0, "2011-01-31T12:03");
-        addMinuteWithsSecs("2011-01-31T12:03",   60, "2011-01-31T13:03");
-        addMinuteWithsSecs("2011-01-31T23:03",   57, "2011-02-01T00:00");
-
-        addMinuteWithsSecs("2011-02-28T02:03", 25 * 60, "2011-03-01T03:03");
-        addMinuteWithsSecs("2012-02-28T02:03", 25 * 60, "2012-02-29T03:03");
-
-        addMinuteWithsSecs("2011-03-01T02:35", -4 * 60, "2011-02-28T22:35");
-        addMinuteWithsSecs("2012-03-01T02:35", -4 * 60, "2012-02-29T22:35");
+        addAndCompare("2012T",    -1, "2011-12-31T23:59-00:00", invoker);
+        addAndCompare("2012T",     0, "2012-01-01T00:00-00:00", invoker);
+        addAndCompare("2012T",     1, "2012-01-01T00:01-00:00", invoker);
+
+        addAndCompare("2012-04T", -31 * 24 * 60 - 1, "2012-02-29T23:59-00:00", invoker);
+        addAndCompare("2012-04T", -31 * 24 * 60    , "2012-03-01T00:00-00:00", invoker);
+        addAndCompare("2012-04T",                -1, "2012-03-31T23:59-00:00", invoker);
+        addAndCompare("2012-04T",                 0, "2012-04-01T00:00-00:00", invoker);
+        addAndCompare("2012-04T",                 1, "2012-04-01T00:01-00:00", invoker);
+        addAndCompare("2012-04T",  30 * 24 * 60 - 1, "2012-04-30T23:59-00:00", invoker);
+        addAndCompare("2012-04T",  30 * 24 * 60    , "2012-05-01T00:00-00:00", invoker);
+
+        addAndCompare("2011-02-28",       -1, "2011-02-27T23:59-00:00", invoker);
+        addAndCompare("2011-02-28",        0, "2011-02-28T00:00-00:00", invoker);
+        addAndCompare("2011-02-28",        1, "2011-02-28T00:01-00:00", invoker);
+        addAndCompare("2011-02-28",  24 * 60, "2011-03-01T00:00-00:00", invoker);
+        addAndCompare("2011-03-01", -24 * 60, "2011-02-28T00:00-00:00", invoker);
+        addAndCompare("2012-02-28",  24 * 60, "2012-02-29T00:00-00:00", invoker);
+        addAndCompare("2012-02-29", -24 * 60, "2012-02-28T00:00-00:00", invoker);
+        addAndCompare("2012-02-29",  24 * 60, "2012-03-01T00:00-00:00", invoker);
+
+        addAndCompare("2012-10-04", -48 * 60, "2012-10-02T00:00-00:00", invoker);
+        addAndCompare("2012-10-04", -24 * 60, "2012-10-03T00:00-00:00", invoker);
+        addAndCompare("2012-10-04",       -1, "2012-10-03T23:59-00:00", invoker);
+        addAndCompare("2012-10-04",        1, "2012-10-04T00:01-00:00", invoker);
+        addAndCompare("2012-10-04",  24 * 60, "2012-10-05T00:00-00:00", invoker);
+        addAndCompare("2012-10-04",  48 * 60, "2012-10-06T00:00-00:00", invoker);
+
+        addAndCompareMinuteWithFullPrecision("2011-01-31T12:03",  -60, "2011-01-31T11:03", invoker);
+        addAndCompareMinuteWithFullPrecision("2011-01-31T12:03",    0, "2011-01-31T12:03", invoker);
+        addAndCompareMinuteWithFullPrecision("2011-01-31T12:03",   60, "2011-01-31T13:03", invoker);
+        addAndCompareMinuteWithFullPrecision("2011-01-31T23:03",   57, "2011-02-01T00:00", invoker);
+
+        addAndCompareMinuteWithFullPrecision("2011-02-28T02:03", 25 * 60, "2011-03-01T03:03", invoker);
+        addAndCompareMinuteWithFullPrecision("2012-02-28T02:03", 25 * 60, "2012-02-29T03:03", invoker);
+
+        addAndCompareMinuteWithFullPrecision("2011-03-01T02:35", -4 * 60, "2011-02-28T22:35", invoker);
+        addAndCompareMinuteWithFullPrecision("2012-03-01T02:35", -4 * 60, "2012-02-29T22:35", invoker);
+    }
+
+    @Test
+    public void testAdjustMinute()
+    {
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.adjustMinute(amount.intValue());
+            }
+        };
+        // Adding more precise amounts does not extend the precision.
+        addAndCompare("2012T",    -1, "2011T", invoker);
+        addAndCompare("2012T",     0, "2012T", invoker);
+        addAndCompare("2012T",     1, "2012T", invoker);
+
+        addAndCompare("2012-04T", -31 * 24 * 60 - 1, "2012-02T", invoker);
+        addAndCompare("2012-04T", -31 * 24 * 60    , "2012-03T", invoker);
+        addAndCompare("2012-04T",                -1, "2012-03T", invoker);
+        addAndCompare("2012-04T",                 0, "2012-04T", invoker);
+        addAndCompare("2012-04T",                 1, "2012-04T", invoker);
+        addAndCompare("2012-04T",  30 * 24 * 60 - 1, "2012-04T", invoker);
+        addAndCompare("2012-04T",  30 * 24 * 60    , "2012-05T", invoker);
+
+        addAndCompare("2011-02-28",       -1, "2011-02-27", invoker);
+        addAndCompare("2011-02-28",        0, "2011-02-28", invoker);
+        addAndCompare("2011-02-28",        1, "2011-02-28", invoker);
+        addAndCompare("2011-02-28",  24 * 60, "2011-03-01", invoker);
+        addAndCompare("2011-03-01", -24 * 60, "2011-02-28", invoker);
+        addAndCompare("2012-02-28",  24 * 60, "2012-02-29", invoker);
+        addAndCompare("2012-02-29", -24 * 60, "2012-02-28", invoker);
+        addAndCompare("2012-02-29",  24 * 60, "2012-03-01", invoker);
+
+        addAndCompare("2012-10-04", -48 * 60, "2012-10-02", invoker);
+        addAndCompare("2012-10-04", -24 * 60, "2012-10-03", invoker);
+        addAndCompare("2012-10-04",       -1, "2012-10-03", invoker);
+        addAndCompare("2012-10-04",        1, "2012-10-04", invoker);
+        addAndCompare("2012-10-04",  24 * 60, "2012-10-05", invoker);
+        addAndCompare("2012-10-04",  48 * 60, "2012-10-06", invoker);
+
+        addAndCompareMinuteWithFullPrecision("2011-01-31T12:03",  -60, "2011-01-31T11:03", invoker);
+        addAndCompareMinuteWithFullPrecision("2011-01-31T12:03",    0, "2011-01-31T12:03", invoker);
+        addAndCompareMinuteWithFullPrecision("2011-01-31T12:03",   60, "2011-01-31T13:03", invoker);
+        addAndCompareMinuteWithFullPrecision("2011-01-31T23:03",   57, "2011-02-01T00:00", invoker);
+
+        addAndCompareMinuteWithFullPrecision("2011-02-28T02:03", 25 * 60, "2011-03-01T03:03", invoker);
+        addAndCompareMinuteWithFullPrecision("2012-02-28T02:03", 25 * 60, "2012-02-29T03:03", invoker);
+
+        addAndCompareMinuteWithFullPrecision("2011-03-01T02:35", -4 * 60, "2011-02-28T22:35", invoker);
+        addAndCompareMinuteWithFullPrecision("2012-03-01T02:35", -4 * 60, "2012-02-29T22:35", invoker);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -2047,170 +2186,340 @@ public void testAddMinuteOutsideMinRange()
         ts1.addMinute(-2*12*35*24*60);
     }
 
-    //-------------------------------------------------------------------------
-
-    private void addSecond(String orig, int amount, String expected)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustMinuteOutsideMaxRange()
     {
-        Timestamp ts1 = Timestamp.valueOf(orig);
-        Timestamp ts2 = ts1.addSecond(amount);
-        checkTimestamp(expected, ts2);
+        Timestamp ts1 = Timestamp.valueOf("9998T");
+        ts1.adjustMinute(2*12*35*24*60);
     }
 
-    private void addSecond(String orig, int amount, String expected,
-                           String suffix)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustMinuteOutsideMinRange()
     {
-        addSecond(orig + suffix, amount, expected + suffix);
+        Timestamp ts1 = Timestamp.valueOf("0001T");
+        ts1.adjustMinute(-2*12*35*24*60);
     }
 
-    private void addSecondWithOffsets(String orig, int amount, String expected,
-                                      String suffix)
-    {
-        addSecond(orig, amount, expected, suffix + "-00:00");
-        addSecond(orig, amount, expected, suffix + "Z");
-        addSecond(orig, amount, expected, suffix + "+01:23");
-        addSecond(orig, amount, expected, suffix + "-01:23");
-        addSecond(orig, amount, expected, suffix + "+23:59");
-        addSecond(orig, amount, expected, suffix + "-23:59");
-    }
+    //-------------------------------------------------------------------------
 
-    private void addSecondWithsFrac(String orig, int amount, String expected)
+    private void addAndCompareSecondWithFullPrecision(String orig, int amount, String expected, TimestampArithmeticInvoker invoker)
     {
-        addSecondWithOffsets(orig, amount, expected, "");
-        addSecondWithOffsets(orig, amount, expected, ".0");
-        addSecondWithOffsets(orig, amount, expected, ".00");
-        addSecondWithOffsets(orig, amount, expected, ".000");
-        addSecondWithOffsets(orig, amount, expected, ".456");
-        addSecondWithOffsets(orig, amount, expected, ".0000");
-        addSecondWithOffsets(orig, amount, expected, ".45678");
+        addAndCompareWithOffsets(orig, amount, expected, "", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ".0", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ".00", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ".000", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ".456", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ".0000", invoker);
+        addAndCompareWithOffsets(orig, amount, expected, ".45678", invoker);
     }
 
     @Test
     public void testAddSecond()
     {
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.addSecond(amount.intValue());
+            }
+        };
         // Adding more precise amounts extends the precision.
-        addSecond("2012T",    -1, "2011-12-31T23:59:59-00:00");
-        addSecond("2012T",     0, "2012-01-01T00:00:00-00:00");
-        addSecond("2012T",     1, "2012-01-01T00:00:01-00:00");
-
-        addSecond("2012-04T", -31 * 24 * 60 * 60 - 1, "2012-02-29T23:59:59-00:00");
-        addSecond("2012-04T", -31 * 24 * 60 * 60    , "2012-03-01T00:00:00-00:00");
-        addSecond("2012-04T",                     -1, "2012-03-31T23:59:59-00:00");
-        addSecond("2012-04T",                      0, "2012-04-01T00:00:00-00:00");
-        addSecond("2012-04T",                      1, "2012-04-01T00:00:01-00:00");
-        addSecond("2012-04T",  30 * 24 * 60 * 60 - 1, "2012-04-30T23:59:59-00:00");
-        addSecond("2012-04T",  30 * 24 * 60 * 60    , "2012-05-01T00:00:00-00:00");
-
-
-        addSecond("2011-02-28",            -1, "2011-02-27T23:59:59-00:00");
-        addSecond("2011-02-28",             0, "2011-02-28T00:00:00-00:00");
-        addSecond("2011-02-28",             1, "2011-02-28T00:00:01-00:00");
-        addSecond("2011-02-28",  24 * 60 * 60, "2011-03-01T00:00:00-00:00");
-        addSecond("2011-03-01", -24 * 60 * 60, "2011-02-28T00:00:00-00:00");
-        addSecond("2012-02-28",  24 * 60 * 60, "2012-02-29T00:00:00-00:00");
-        addSecond("2012-02-29", -24 * 60 * 60, "2012-02-28T00:00:00-00:00");
-        addSecond("2012-02-29",  24 * 60 * 60, "2012-03-01T00:00:00-00:00");
-
-        addSecond("2012-10-04", -24 * 60 * 60 - 1, "2012-10-02T23:59:59-00:00");
-        addSecond("2012-10-04", -24 * 60 * 60    , "2012-10-03T00:00:00-00:00");
-        addSecond("2012-10-04",                -1, "2012-10-03T23:59:59-00:00");
-        addSecond("2012-10-04",                 1, "2012-10-04T00:00:01-00:00");
-        addSecond("2012-10-04",  48 * 60 * 60 - 1, "2012-10-05T23:59:59-00:00");
-        addSecond("2012-10-04",  48 * 60 * 60    , "2012-10-06T00:00:00-00:00");
-
-        addSecondWithsFrac("2011-01-31T12:03:23",  -60 * 60, "2011-01-31T11:03:23");
-        addSecondWithsFrac("2011-01-31T12:03:23",         0, "2011-01-31T12:03:23");
-        addSecondWithsFrac("2011-01-31T12:03:23",   60 * 60, "2011-01-31T13:03:23");
-        addSecondWithsFrac("2011-01-31T23:03:23",   57 * 60, "2011-02-01T00:00:23");
+        addAndCompare("2012T",    -1, "2011-12-31T23:59:59-00:00", invoker);
+        addAndCompare("2012T",     0, "2012-01-01T00:00:00-00:00", invoker);
+        addAndCompare("2012T",     1, "2012-01-01T00:00:01-00:00", invoker);
+
+        addAndCompare("2012-04T", -31 * 24 * 60 * 60 - 1, "2012-02-29T23:59:59-00:00", invoker);
+        addAndCompare("2012-04T", -31 * 24 * 60 * 60    , "2012-03-01T00:00:00-00:00", invoker);
+        addAndCompare("2012-04T",                     -1, "2012-03-31T23:59:59-00:00", invoker);
+        addAndCompare("2012-04T",                      0, "2012-04-01T00:00:00-00:00", invoker);
+        addAndCompare("2012-04T",                      1, "2012-04-01T00:00:01-00:00", invoker);
+        addAndCompare("2012-04T",  30 * 24 * 60 * 60 - 1, "2012-04-30T23:59:59-00:00", invoker);
+        addAndCompare("2012-04T",  30 * 24 * 60 * 60    , "2012-05-01T00:00:00-00:00", invoker);
+
+
+        addAndCompare("2011-02-28",            -1, "2011-02-27T23:59:59-00:00", invoker);
+        addAndCompare("2011-02-28",             0, "2011-02-28T00:00:00-00:00", invoker);
+        addAndCompare("2011-02-28",             1, "2011-02-28T00:00:01-00:00", invoker);
+        addAndCompare("2011-02-28",  24 * 60 * 60, "2011-03-01T00:00:00-00:00", invoker);
+        addAndCompare("2011-03-01", -24 * 60 * 60, "2011-02-28T00:00:00-00:00", invoker);
+        addAndCompare("2012-02-28",  24 * 60 * 60, "2012-02-29T00:00:00-00:00", invoker);
+        addAndCompare("2012-02-29", -24 * 60 * 60, "2012-02-28T00:00:00-00:00", invoker);
+        addAndCompare("2012-02-29",  24 * 60 * 60, "2012-03-01T00:00:00-00:00", invoker);
+
+        addAndCompare("2012-10-04", -24 * 60 * 60 - 1, "2012-10-02T23:59:59-00:00", invoker);
+        addAndCompare("2012-10-04", -24 * 60 * 60    , "2012-10-03T00:00:00-00:00", invoker);
+        addAndCompare("2012-10-04",                -1, "2012-10-03T23:59:59-00:00", invoker);
+        addAndCompare("2012-10-04",                 1, "2012-10-04T00:00:01-00:00", invoker);
+        addAndCompare("2012-10-04",  48 * 60 * 60 - 1, "2012-10-05T23:59:59-00:00", invoker);
+        addAndCompare("2012-10-04",  48 * 60 * 60    , "2012-10-06T00:00:00-00:00", invoker);
+
+        addAndCompareSecondWithFullPrecision("2011-01-31T12:03:23",  -60 * 60, "2011-01-31T11:03:23", invoker);
+        addAndCompareSecondWithFullPrecision("2011-01-31T12:03:23",         0, "2011-01-31T12:03:23", invoker);
+        addAndCompareSecondWithFullPrecision("2011-01-31T12:03:23",   60 * 60, "2011-01-31T13:03:23", invoker);
+        addAndCompareSecondWithFullPrecision("2011-01-31T23:03:23",   57 * 60, "2011-02-01T00:00:23", invoker);
+
+        addAndCompareSecondWithFullPrecision("2011-02-28T02:03:23", 25 * 60 * 60, "2011-03-01T03:03:23", invoker);
+        addAndCompareSecondWithFullPrecision("2012-02-28T02:03:23", 25 * 60 * 60, "2012-02-29T03:03:23", invoker);
+
+        addAndCompareSecondWithFullPrecision("2011-03-01T02:35:23", -4 * 60 * 60, "2011-02-28T22:35:23", invoker);
+        addAndCompareSecondWithFullPrecision("2012-03-01T02:35:23", -4 * 60 * 60, "2012-02-29T22:35:23", invoker);
+    }
+
+    @Test
+    public void testAdjustSecond()
+    {
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.adjustSecond(amount.intValue());
+            }
+        };
+        // Adding more precise amounts does not extend the precision.
+        addAndCompare("2012T",    -1, "2011T", invoker);
+        addAndCompare("2012T",     0, "2012T", invoker);
+        addAndCompare("2012T",     1, "2012T", invoker);
+
+        addAndCompare("2012-04T", -31 * 24 * 60 * 60 - 1, "2012-02T", invoker);
+        addAndCompare("2012-04T", -31 * 24 * 60 * 60    , "2012-03T", invoker);
+        addAndCompare("2012-04T",                     -1, "2012-03T", invoker);
+        addAndCompare("2012-04T",                      0, "2012-04T", invoker);
+        addAndCompare("2012-04T",                      1, "2012-04T", invoker);
+        addAndCompare("2012-04T",  30 * 24 * 60 * 60 - 1, "2012-04T", invoker);
+        addAndCompare("2012-04T",  30 * 24 * 60 * 60    , "2012-05T", invoker);
+
+
+        addAndCompare("2011-02-28",            -1, "2011-02-27", invoker);
+        addAndCompare("2011-02-28",             0, "2011-02-28", invoker);
+        addAndCompare("2011-02-28",             1, "2011-02-28", invoker);
+        addAndCompare("2011-02-28",  24 * 60 * 60, "2011-03-01", invoker);
+        addAndCompare("2011-03-01", -24 * 60 * 60, "2011-02-28", invoker);
+        addAndCompare("2012-02-28",  24 * 60 * 60, "2012-02-29", invoker);
+        addAndCompare("2012-02-29", -24 * 60 * 60, "2012-02-28", invoker);
+        addAndCompare("2012-02-29",  24 * 60 * 60, "2012-03-01", invoker);
+
+        addAndCompare("2012-10-04", -24 * 60 * 60 - 1, "2012-10-02", invoker);
+        addAndCompare("2012-10-04", -24 * 60 * 60    , "2012-10-03", invoker);
+        addAndCompare("2012-10-04",                -1, "2012-10-03", invoker);
+        addAndCompare("2012-10-04",                 1, "2012-10-04", invoker);
+        addAndCompare("2012-10-04",  48 * 60 * 60 - 1, "2012-10-05", invoker);
+        addAndCompare("2012-10-04",  48 * 60 * 60    , "2012-10-06", invoker);
+
+        addAndCompareSecondWithFullPrecision("2011-01-31T12:03:23",  -60 * 60, "2011-01-31T11:03:23", invoker);
+        addAndCompareSecondWithFullPrecision("2011-01-31T12:03:23",         0, "2011-01-31T12:03:23", invoker);
+        addAndCompareSecondWithFullPrecision("2011-01-31T12:03:23",   60 * 60, "2011-01-31T13:03:23", invoker);
+        addAndCompareSecondWithFullPrecision("2011-01-31T23:03:23",   57 * 60, "2011-02-01T00:00:23", invoker);
+
+        addAndCompareSecondWithFullPrecision("2011-02-28T02:03:23", 25 * 60 * 60, "2011-03-01T03:03:23", invoker);
+        addAndCompareSecondWithFullPrecision("2012-02-28T02:03:23", 25 * 60 * 60, "2012-02-29T03:03:23", invoker);
+
+        addAndCompareSecondWithFullPrecision("2011-03-01T02:35:23", -4 * 60 * 60, "2011-02-28T22:35:23", invoker);
+        addAndCompareSecondWithFullPrecision("2012-03-01T02:35:23", -4 * 60 * 60, "2012-02-29T22:35:23", invoker);
+    }
 
-        addSecondWithsFrac("2011-02-28T02:03:23", 25 * 60 * 60, "2011-03-01T03:03:23");
-        addSecondWithsFrac("2012-02-28T02:03:23", 25 * 60 * 60, "2012-02-29T03:03:23");
+    @Test(expected = IllegalArgumentException.class)
+    public void testAddSecondOutsideMaxRange()
+    {
+        Timestamp ts1 = Timestamp.valueOf("9998T");
+        ts1.addSecond(2*12*35*24*60*60);
+    }
 
-        addSecondWithsFrac("2011-03-01T02:35:23", -4 * 60 * 60, "2011-02-28T22:35:23");
-        addSecondWithsFrac("2012-03-01T02:35:23", -4 * 60 * 60, "2012-02-29T22:35:23");
+    @Test(expected = IllegalArgumentException.class)
+    public void testAddSecondOutsideMinRange()
+    {
+        Timestamp ts1 = Timestamp.valueOf("0001T");
+        ts1.addSecond(-1);
     }
 
-    private void addMillisecond(String orig, long amount, String expected)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustSecondOutsideMaxRange()
     {
-        Timestamp ts1 = Timestamp.valueOf(orig);
-        Timestamp ts2 = ts1.addMillis(amount);
-        checkTimestamp(expected, ts2);
+        Timestamp ts1 = Timestamp.valueOf("9998T");
+        ts1.adjustSecond(2*12*35*24*60*60);
     }
 
-    private void addMillisecond(String orig, long amount, String expected, String suffix)
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustSecondOutsideMinRange()
     {
-        addMillisecond(orig + suffix, amount, expected + suffix);
+        Timestamp ts1 = Timestamp.valueOf("0001T");
+        ts1.adjustSecond(-1);
     }
 
-    private void addMillisecondWithOffsets(String orig, long amount, String expected) {
-        addMillisecond(orig, amount, expected, "-00:00");
-        addMillisecond(orig, amount, expected, "Z");
-        addMillisecond(orig, amount, expected, "+01:23");
-        addMillisecond(orig, amount, expected, "-01:23");
-        addMillisecond(orig, amount, expected, "+23:59");
-        addMillisecond(orig, amount, expected, "-23:59");
+    //-------------------------------------------------------------------------
+
+    private void addAndCompareMillisWithOffsets(String orig, long amount, String expected, TimestampArithmeticInvoker invoker) {
+        addAndCompare(orig, amount, expected, "-00:00", invoker);
+        addAndCompare(orig, amount, expected, "Z", invoker);
+        addAndCompare(orig, amount, expected, "+01:23", invoker);
+        addAndCompare(orig, amount, expected, "-01:23", invoker);
+        addAndCompare(orig, amount, expected, "+23:59", invoker);
+        addAndCompare(orig, amount, expected, "-23:59", invoker);
     }
 
-    private void addMillisecondWithFrac(String orig, long amount, String expected)
+    private void addAndCompareMillisWithFullPrecision(String orig, long amount, String expected, TimestampArithmeticInvoker invoker)
     {
         // If the timestamp has less than milliseconds precision, always expand its precision to milliseconds.
-        addMillisecondWithOffsets(orig, amount, expected + ".000");
-        addMillisecondWithOffsets(orig + ".0", amount, expected + ".000");
-        addMillisecondWithOffsets(orig + ".00", amount, expected + ".000");
-        addMillisecondWithOffsets(orig + ".000", amount, expected +".000");
-        addMillisecondWithOffsets(orig + ".456", amount, expected + ".456");
+        addAndCompareMillisWithOffsets(orig, amount, expected + ".000", invoker);
+        addAndCompareMillisWithOffsets(orig + ".0", amount, expected + ".000", invoker);
+        addAndCompareMillisWithOffsets(orig + ".00", amount, expected + ".000", invoker);
+        addAndCompareMillisWithOffsets(orig + ".000", amount, expected +".000", invoker);
+        addAndCompareMillisWithOffsets(orig + ".456", amount, expected + ".456", invoker);
+        // If the Timestamp has greater than milliseconds precision, don't reduce the precision.
+        addAndCompareMillisWithOffsets(orig + ".0000", amount, expected + ".0000", invoker);
+        addAndCompareMillisWithOffsets(orig + ".45678", amount, expected +".45678", invoker);
+    }
+
+    @Test
+    public void testAddMillis()
+    {
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.addMillis(amount.longValue());
+            }
+        };
+        // Adding more precise amounts extends the precision.
+        addAndCompare("2012T",    -1, "2011-12-31T23:59:59.999-00:00", invoker);
+        addAndCompare("2012T",     0, "2012-01-01T00:00:00.000-00:00", invoker);
+        addAndCompare("2012T",     1, "2012-01-01T00:00:00.001-00:00", invoker);
+
+        addAndCompare("2012-04T", -31L * 24 * 60 * 60 * 1000 - 1, "2012-02-29T23:59:59.999-00:00", invoker);
+        addAndCompare("2012-04T", -31L * 24 * 60 * 60 * 1000    , "2012-03-01T00:00:00.000-00:00", invoker);
+        addAndCompare("2012-04T",                             -1, "2012-03-31T23:59:59.999-00:00", invoker);
+        addAndCompare("2012-04T",                              0, "2012-04-01T00:00:00.000-00:00", invoker);
+        addAndCompare("2012-04T",                              1, "2012-04-01T00:00:00.001-00:00", invoker);
+        addAndCompare("2012-04T",  30L * 24 * 60 * 60 * 1000 - 1, "2012-04-30T23:59:59.999-00:00", invoker);
+        addAndCompare("2012-04T",  30L * 24 * 60 * 60 * 1000    , "2012-05-01T00:00:00.000-00:00", invoker);
+
+
+        addAndCompare("2011-02-28",                   -1, "2011-02-27T23:59:59.999-00:00", invoker);
+        addAndCompare("2011-02-28",                    0, "2011-02-28T00:00:00.000-00:00", invoker);
+        addAndCompare("2011-02-28",                    1, "2011-02-28T00:00:00.001-00:00", invoker);
+        addAndCompare("2011-02-28",  24 * 60 * 60 * 1000, "2011-03-01T00:00:00.000-00:00", invoker);
+        addAndCompare("2011-03-01", -24 * 60 * 60 * 1000, "2011-02-28T00:00:00.000-00:00", invoker);
+        addAndCompare("2012-02-28",  24 * 60 * 60 * 1000, "2012-02-29T00:00:00.000-00:00", invoker);
+        addAndCompare("2012-02-29", -24 * 60 * 60 * 1000, "2012-02-28T00:00:00.000-00:00", invoker);
+        addAndCompare("2012-02-29",  24 * 60 * 60 * 1000, "2012-03-01T00:00:00.000-00:00", invoker);
+
+        addAndCompare("2012-10-04", -24 * 60 * 60 * 1000 - 1, "2012-10-02T23:59:59.999-00:00", invoker);
+        addAndCompare("2012-10-04", -24 * 60 * 60 * 1000    , "2012-10-03T00:00:00.000-00:00", invoker);
+        addAndCompare("2012-10-04",                       -1, "2012-10-03T23:59:59.999-00:00", invoker);
+        addAndCompare("2012-10-04",                        1, "2012-10-04T00:00:00.001-00:00", invoker);
+        addAndCompare("2012-10-04",  48 * 60 * 60 * 1000 - 1, "2012-10-05T23:59:59.999-00:00", invoker);
+        addAndCompare("2012-10-04",  48 * 60 * 60 * 1000    , "2012-10-06T00:00:00.000-00:00", invoker);
+
+        addAndCompareMillisWithFullPrecision("2011-01-31T12:03:23",  -60 * 60 * 1000, "2011-01-31T11:03:23", invoker);
+        addAndCompareMillisWithFullPrecision("2011-01-31T12:03:23",                0, "2011-01-31T12:03:23", invoker);
+        addAndCompareMillisWithFullPrecision("2011-01-31T12:03:23",   60 * 60 * 1000, "2011-01-31T13:03:23", invoker);
+        addAndCompareMillisWithFullPrecision("2011-01-31T23:03:23",   57 * 60 * 1000, "2011-02-01T00:00:23", invoker);
+
+        addAndCompareMillisWithFullPrecision("2011-02-28T02:03:23", 25 * 60 * 60 * 1000, "2011-03-01T03:03:23", invoker);
+        addAndCompareMillisWithFullPrecision("2012-02-28T02:03:23", 25 * 60 * 60 * 1000, "2012-02-29T03:03:23", invoker);
+
+        addAndCompareMillisWithFullPrecision("2011-03-01T02:35:23", -4 * 60 * 60 * 1000, "2011-02-28T22:35:23", invoker);
+        addAndCompareMillisWithFullPrecision("2012-03-01T02:35:23", -4 * 60 * 60 * 1000, "2012-02-29T22:35:23", invoker);
+
+        addAndCompareMillisWithOffsets("2011-01-31T23:59:59.999", 1, "2011-02-01T00:00:00.000", invoker);
+        addAndCompareMillisWithOffsets("2011-02-01T00:00:00.000", -1, "2011-01-31T23:59:59.999", invoker);
+        addAndCompareMillisWithOffsets("2011-01-31T23:59:59.999123", 1, "2011-02-01T00:00:00.000123", invoker);
+        addAndCompareMillisWithOffsets("2011-02-01T00:00:00.000123", -1, "2011-01-31T23:59:59.999123", invoker);
+
+    }
+
+    private void adjustMillisecondWithFrac(String orig, long amount, String expected, TimestampArithmeticInvoker invoker)
+    {
+        // If the timestamp has less than milliseconds precision, maintain the original precision.
+        addAndCompareMillisWithOffsets(orig, amount, expected, invoker);
+        addAndCompareMillisWithOffsets(orig + ".0", amount, expected + ".0", invoker);
+        addAndCompareMillisWithOffsets(orig + ".00", amount, expected + ".00", invoker);
+        addAndCompareMillisWithOffsets(orig + ".000", amount, expected +".000", invoker);
+        addAndCompareMillisWithOffsets(orig + ".456", amount, expected + ".456", invoker);
         // If the Timestamp has greater than milliseconds precision, don't reduce the precision.
-        addMillisecondWithOffsets(orig + ".0000", amount, expected + ".0000");
-        addMillisecondWithOffsets(orig + ".45678", amount, expected +".45678");
+        addAndCompareMillisWithOffsets(orig + ".0000", amount, expected + ".0000", invoker);
+        addAndCompareMillisWithOffsets(orig + ".45678", amount, expected +".45678", invoker);
     }
 
     @Test
-    public void testAddMillisecond()
+    public void testAdjustMillis()
     {
-        addMillisecond("2012T",    -1, "2011-12-31T23:59:59.999-00:00");
-        addMillisecond("2012T",     0, "2012-01-01T00:00:00.000-00:00");
-        addMillisecond("2012T",     1, "2012-01-01T00:00:00.001-00:00");
+        TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
+            public Timestamp invoke(Timestamp input, Number amount) {
+                return input.adjustMillis(amount.longValue());
+            }
+        };
+        // Adding more precise amounts extends the precision.
+        addAndCompare("2012T",    -1, "2011T", invoker);
+        addAndCompare("2012T",     0, "2012T", invoker);
+        addAndCompare("2012T",     1, "2012T", invoker);
 
-        addMillisecond("2012-04T", -31L * 24 * 60 * 60 * 1000 - 1, "2012-02-29T23:59:59.999-00:00");
-        addMillisecond("2012-04T", -31L * 24 * 60 * 60 * 1000    , "2012-03-01T00:00:00.000-00:00");
-        addMillisecond("2012-04T",                             -1, "2012-03-31T23:59:59.999-00:00");
-        addMillisecond("2012-04T",                              0, "2012-04-01T00:00:00.000-00:00");
-        addMillisecond("2012-04T",                              1, "2012-04-01T00:00:00.001-00:00");
-        addMillisecond("2012-04T",  30L * 24 * 60 * 60 * 1000 - 1, "2012-04-30T23:59:59.999-00:00");
-        addMillisecond("2012-04T",  30L * 24 * 60 * 60 * 1000    , "2012-05-01T00:00:00.000-00:00");
+        addAndCompare("2012-04T", -31L * 24 * 60 * 60 * 1000 - 1, "2012-02T", invoker);
+        addAndCompare("2012-04T", -31L * 24 * 60 * 60 * 1000    , "2012-03T", invoker);
+        addAndCompare("2012-04T",                             -1, "2012-03T", invoker);
+        addAndCompare("2012-04T",                              0, "2012-04T", invoker);
+        addAndCompare("2012-04T",                              1, "2012-04T", invoker);
+        addAndCompare("2012-04T",  30L * 24 * 60 * 60 * 1000 - 1, "2012-04T", invoker);
+        addAndCompare("2012-04T",  30L * 24 * 60 * 60 * 1000    , "2012-05T", invoker);
 
 
-        addMillisecond("2011-02-28",                   -1, "2011-02-27T23:59:59.999-00:00");
-        addMillisecond("2011-02-28",                    0, "2011-02-28T00:00:00.000-00:00");
-        addMillisecond("2011-02-28",                    1, "2011-02-28T00:00:00.001-00:00");
-        addMillisecond("2011-02-28",  24 * 60 * 60 * 1000, "2011-03-01T00:00:00.000-00:00");
-        addMillisecond("2011-03-01", -24 * 60 * 60 * 1000, "2011-02-28T00:00:00.000-00:00");
-        addMillisecond("2012-02-28",  24 * 60 * 60 * 1000, "2012-02-29T00:00:00.000-00:00");
-        addMillisecond("2012-02-29", -24 * 60 * 60 * 1000, "2012-02-28T00:00:00.000-00:00");
-        addMillisecond("2012-02-29",  24 * 60 * 60 * 1000, "2012-03-01T00:00:00.000-00:00");
+        addAndCompare("2011-02-28",                   -1, "2011-02-27", invoker);
+        addAndCompare("2011-02-28",                    0, "2011-02-28", invoker);
+        addAndCompare("2011-02-28",                    1, "2011-02-28", invoker);
+        addAndCompare("2011-02-28",  24 * 60 * 60 * 1000, "2011-03-01", invoker);
+        addAndCompare("2011-03-01", -24 * 60 * 60 * 1000, "2011-02-28", invoker);
+        addAndCompare("2012-02-28",  24 * 60 * 60 * 1000, "2012-02-29", invoker);
+        addAndCompare("2012-02-29", -24 * 60 * 60 * 1000, "2012-02-28", invoker);
+        addAndCompare("2012-02-29",  24 * 60 * 60 * 1000, "2012-03-01", invoker);
 
-        addMillisecond("2012-10-04", -24 * 60 * 60 * 1000 - 1, "2012-10-02T23:59:59.999-00:00");
-        addMillisecond("2012-10-04", -24 * 60 * 60 * 1000    , "2012-10-03T00:00:00.000-00:00");
-        addMillisecond("2012-10-04",                       -1, "2012-10-03T23:59:59.999-00:00");
-        addMillisecond("2012-10-04",                        1, "2012-10-04T00:00:00.001-00:00");
-        addMillisecond("2012-10-04",  48 * 60 * 60 * 1000 - 1, "2012-10-05T23:59:59.999-00:00");
-        addMillisecond("2012-10-04",  48 * 60 * 60 * 1000    , "2012-10-06T00:00:00.000-00:00");
+        addAndCompare("2012-10-04", -24 * 60 * 60 * 1000 - 1, "2012-10-02", invoker);
+        addAndCompare("2012-10-04", -24 * 60 * 60 * 1000    , "2012-10-03", invoker);
+        addAndCompare("2012-10-04",                       -1, "2012-10-03", invoker);
+        addAndCompare("2012-10-04",                        1, "2012-10-04", invoker);
+        addAndCompare("2012-10-04",  48 * 60 * 60 * 1000 - 1, "2012-10-05", invoker);
+        addAndCompare("2012-10-04",  48 * 60 * 60 * 1000    , "2012-10-06", invoker);
 
-        addMillisecondWithFrac("2011-01-31T12:03:23",  -60 * 60 * 1000, "2011-01-31T11:03:23");
-        addMillisecondWithFrac("2011-01-31T12:03:23",                0, "2011-01-31T12:03:23");
-        addMillisecondWithFrac("2011-01-31T12:03:23",   60 * 60 * 1000, "2011-01-31T13:03:23");
-        addMillisecondWithFrac("2011-01-31T23:03:23",   57 * 60 * 1000, "2011-02-01T00:00:23");
+        adjustMillisecondWithFrac("2011-01-31T12:03:23",  -60 * 60 * 1000, "2011-01-31T11:03:23", invoker);
+        adjustMillisecondWithFrac("2011-01-31T12:03:23",                0, "2011-01-31T12:03:23", invoker);
+        adjustMillisecondWithFrac("2011-01-31T12:03:23",   60 * 60 * 1000, "2011-01-31T13:03:23", invoker);
+        adjustMillisecondWithFrac("2011-01-31T23:03:23",   57 * 60 * 1000, "2011-02-01T00:00:23", invoker);
 
-        addMillisecondWithFrac("2011-02-28T02:03:23", 25 * 60 * 60 * 1000, "2011-03-01T03:03:23");
-        addMillisecondWithFrac("2012-02-28T02:03:23", 25 * 60 * 60 * 1000, "2012-02-29T03:03:23");
+        adjustMillisecondWithFrac("2011-02-28T02:03:23", 25 * 60 * 60 * 1000, "2011-03-01T03:03:23", invoker);
+        adjustMillisecondWithFrac("2012-02-28T02:03:23", 25 * 60 * 60 * 1000, "2012-02-29T03:03:23", invoker);
+
+        adjustMillisecondWithFrac("2011-03-01T02:35:23", -4 * 60 * 60 * 1000, "2011-02-28T22:35:23", invoker);
+        adjustMillisecondWithFrac("2012-03-01T02:35:23", -4 * 60 * 60 * 1000, "2012-02-29T22:35:23", invoker);
+
+        addAndCompareMillisWithOffsets("2011-01-31T23:59:59.999", 1, "2011-02-01T00:00:00.000", invoker);
+        addAndCompareMillisWithOffsets("2011-02-01T00:00:00.000", -1, "2011-01-31T23:59:59.999", invoker);
+        addAndCompareMillisWithOffsets("2011-01-31T23:59:59.999123", 1, "2011-02-01T00:00:00.000123", invoker);
+        addAndCompareMillisWithOffsets("2011-02-01T00:00:00.000123", -1, "2011-01-31T23:59:59.999123", invoker);
+
+        // Additional fractional precision is truncated.
+        addAndCompareMillisWithOffsets("2011-01-31T23:59:59.99", 9, "2011-01-31T23:59:59.99", invoker);
+        addAndCompareMillisWithOffsets("2011-02-01T00:00:00.00", -1, "2011-01-31T23:59:59.99", invoker);
+
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testAddMillisOutsideMaxRange()
+    {
+        Timestamp ts1 = Timestamp.valueOf("9998T");
+        ts1.addMillis(2*12*35*24*60*60*1000L);
+    }
 
-        addMillisecondWithFrac("2011-03-01T02:35:23", -4 * 60 * 60 * 1000, "2011-02-28T22:35:23");
-        addMillisecondWithFrac("2012-03-01T02:35:23", -4 * 60 * 60 * 1000, "2012-02-29T22:35:23");
+    @Test(expected = IllegalArgumentException.class)
+    public void testAddMillisOutsideMinRange()
+    {
+        Timestamp ts1 = Timestamp.valueOf("0001T");
+        ts1.addMillis(-1);
+    }
 
-        addMillisecondWithOffsets("2011-01-31T23:59:59.999", 1, "2011-02-01T00:00:00.000");
-        addMillisecondWithOffsets("2011-02-01T00:00:00.000", -1, "2011-01-31T23:59:59.999");
-        addMillisecondWithOffsets("2011-01-31T23:59:59.999123", 1, "2011-02-01T00:00:00.000123");
-        addMillisecondWithOffsets("2011-02-01T00:00:00.000123", -1, "2011-01-31T23:59:59.999123");
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustMillisOutsideMaxRange()
+    {
+        Timestamp ts1 = Timestamp.valueOf("9998T");
+        ts1.adjustMillis(2*12*35*24*60*60*1000L);
+    }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void testAdjustMillisOutsideMinRange()
+    {
+        Timestamp ts1 = Timestamp.valueOf("0001T");
+        ts1.adjustMillis(-1);
     }
 
     @Test
@@ -2331,7 +2640,7 @@ public void testCustomCalendarLeapYearAfterWithLocalOffset() {
     }
 
     @Test
-    public void testCustomCalendarLeapYearWithChainedArithmetic() {
+    public void testCustomCalendarLeapYearWithChainedAdd() {
         // Create a purely Julian calendar, where leap years were every four years.
         GregorianCalendar julianCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
         julianCalendar.setGregorianChange(new Date(Long.MAX_VALUE));
@@ -2344,18 +2653,30 @@ public void testCustomCalendarLeapYearWithChainedArithmetic() {
         assertEquals("1800-02-29T00:00:00.000Z", timestamp2.toString());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testAddSecondOutsideMaxRange()
-    {
-        Timestamp ts1 = Timestamp.valueOf("9998T");
-        ts1.addSecond(2*12*35*24*60*60);
+    @Test
+    public void testCustomCalendarLeapYearWithChainedAdjust() {
+        // Create a purely Julian calendar, where leap years were every four years.
+        GregorianCalendar julianCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+        julianCalendar.setGregorianChange(new Date(Long.MAX_VALUE));
+        julianCalendar.clear();
+        // 1800 is not a leap year under the Gregorian calendar, but it is under the Julian calendar.
+        julianCalendar.set(1799, Calendar.JANUARY, 27, 22, 58, 58);
+        julianCalendar.set(Calendar.MILLISECOND, 999);
+        Timestamp timestamp1 = Timestamp.forCalendar(julianCalendar);
+        Timestamp timestamp2 = timestamp1.adjustYear(1).adjustMonth(1).adjustDay(1).adjustHour(1).adjustMinute(1).adjustSecond(1).adjustMillis(1);
+        assertEquals("1800-02-29T00:00:00.000Z", timestamp2.toString());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testAddSecondOutsideMinRange()
-    {
-        Timestamp ts1 = Timestamp.valueOf("0001T");
-        ts1.addSecond(-1);
+    @Test
+    public void testCustomCalendarLeapYearWithChainedAdjustLessPrecise() {
+        // Create a purely Julian calendar, where leap years were every four years.
+        GregorianCalendar julianCalendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
+        julianCalendar.setGregorianChange(new Date(Long.MAX_VALUE));
+        julianCalendar.clear();
+        julianCalendar.set(1799, Calendar.JANUARY, 28);
+        Timestamp timestamp1 = Timestamp.forCalendar(julianCalendar);
+        Timestamp timestamp2 = timestamp1.adjustYear(1).adjustMonth(1).adjustDay(1).adjustHour(1).adjustMinute(1).adjustSecond(1).adjustMillis(1);
+        assertEquals("1800-02-29", timestamp2.toString());
     }
 
     @Test

From 10d467a6a4086819900c9aa636e331ff6fb227db Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Wed, 26 Dec 2018 22:14:21 +0000
Subject: [PATCH 041/490] Reworks the local symbol table append reading
 implementation for better performance. (#201)

---
 .../ion/impl/BaseSymbolTableWrapper.java      | 124 --------
 .../amazon/ion/impl/LocalSymbolTable.java     |  16 +-
 .../impl/LocalSymbolTableImportAdapter.java   | 115 -------
 .../ion/impl/LocalSymbolTableImports.java     |  70 +----
 .../amazon/ion/impl/lite/IonDatagramLite.java |  17 +-
 .../ion/impl/BaseSymbolTableWrapperTest.java  | 134 ---------
 .../LocalSymbolTableImportAdapterTest.java    | 280 ------------------
 .../amazon/ion/impl/SymbolTableTest.java      |  75 +++--
 8 files changed, 85 insertions(+), 746 deletions(-)
 delete mode 100644 src/software/amazon/ion/impl/BaseSymbolTableWrapper.java
 delete mode 100644 src/software/amazon/ion/impl/LocalSymbolTableImportAdapter.java
 delete mode 100644 test/software/amazon/ion/impl/BaseSymbolTableWrapperTest.java
 delete mode 100644 test/software/amazon/ion/impl/LocalSymbolTableImportAdapterTest.java

diff --git a/src/software/amazon/ion/impl/BaseSymbolTableWrapper.java b/src/software/amazon/ion/impl/BaseSymbolTableWrapper.java
deleted file mode 100644
index 7e16d6e628..0000000000
--- a/src/software/amazon/ion/impl/BaseSymbolTableWrapper.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package software.amazon.ion.impl;
-
-import java.io.IOException;
-import java.util.Iterator;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-
-/**
- * Base class for {@link SymbolTable} wrapper. Subclasses can add and/or override methods as needed
- * <p>
- * Delegates all {@link SymbolTable} methods to internal {@link SymbolTable} instance
- * </p>
- */
-abstract class BaseSymbolTableWrapper implements SymbolTable
-{
-    private final SymbolTable delegate;
-
-    protected BaseSymbolTableWrapper(SymbolTable delegate)
-    {
-        this.delegate = delegate;
-    }
-
-    protected final SymbolTable getDelegate()
-    {
-        return delegate;
-    }
-
-    public String getName()
-    {
-        return delegate.getName();
-    }
-
-    public int getVersion()
-    {
-        return delegate.getVersion();
-    }
-
-    public boolean isLocalTable()
-    {
-        return delegate.isLocalTable();
-    }
-
-    public boolean isSharedTable()
-    {
-        return delegate.isSharedTable();
-    }
-
-    public boolean isSubstitute()
-    {
-        return delegate.isSubstitute();
-    }
-
-    public boolean isSystemTable()
-    {
-        return delegate.isSystemTable();
-    }
-
-    public boolean isReadOnly()
-    {
-        return delegate.isReadOnly();
-    }
-
-    public void makeReadOnly()
-    {
-        delegate.makeReadOnly();
-    }
-
-    public SymbolTable getSystemSymbolTable()
-    {
-        return delegate.getSystemSymbolTable();
-    }
-
-    public String getIonVersionId()
-    {
-        return delegate.getIonVersionId();
-    }
-
-    public SymbolTable[] getImportedTables()
-    {
-        return delegate.getImportedTables();
-    }
-
-    public int getImportedMaxId()
-    {
-        return delegate.getImportedMaxId();
-    }
-
-    public int getMaxId()
-    {
-        return delegate.getMaxId();
-    }
-
-    public SymbolToken intern(String text)
-    {
-        return delegate.intern(text);
-    }
-
-    public SymbolToken find(String text)
-    {
-        return delegate.find(text);
-    }
-
-    public int findSymbol(String name)
-    {
-        return delegate.findSymbol(name);
-    }
-
-    public String findKnownSymbol(int id)
-    {
-        return delegate.findKnownSymbol(id);
-    }
-
-    public Iterator<String> iterateDeclaredSymbolNames()
-    {
-        return delegate.iterateDeclaredSymbolNames();
-    }
-
-    public void writeTo(IonWriter writer) throws IOException
-    {
-        delegate.writeTo(writer);
-    }
-}
-
diff --git a/src/software/amazon/ion/impl/LocalSymbolTable.java b/src/software/amazon/ion/impl/LocalSymbolTable.java
index 0367184683..d221661400 100644
--- a/src/software/amazon/ion/impl/LocalSymbolTable.java
+++ b/src/software/amazon/ion/impl/LocalSymbolTable.java
@@ -28,6 +28,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -219,6 +220,10 @@ protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader,
 
         List<SymbolTable> importsList = new ArrayList<SymbolTable>();
         importsList.add(reader.getSymbolTable().getSystemSymbolTable());
+        // Isolate the newly-declared symbols because they must be added after any symbols declared
+        // by the previous symbol table if this is an appending local symbol table, but the 'imports' and
+        // 'symbols' declarations can occur in any order.
+        List<String> newSymbols = new ArrayList<String>();
 
         IonType fieldType;
         boolean foundImportList = false;
@@ -267,7 +272,7 @@ protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader,
                                 text = null;
                             }
 
-                            symbolsListOut.add(text);
+                            newSymbols.add(text);
                         }
                         reader.stepOut();
                     }
@@ -288,7 +293,12 @@ else if (fieldType == IonType.SYMBOL)
                         // trying to import the current table
                         if(reader.getSymbolTable().isLocalTable() && ION_SYMBOL_TABLE.equals(reader.stringValue()))
                         {
-                            importsList.add(reader.getSymbolTable());
+                            SymbolTable currentSymbolTable = reader.getSymbolTable();
+                            importsList.addAll(Arrays.asList(currentSymbolTable.getImportedTables()));
+                            Iterator<String> currentSymbols = currentSymbolTable.iterateDeclaredSymbolNames();
+                            while (currentSymbols.hasNext()) {
+                                symbolsListOut.add(currentSymbols.next());
+                            }
                         }
                     }
                     break;
@@ -302,7 +312,7 @@ else if (fieldType == IonType.SYMBOL)
         }
 
         reader.stepOut();
-
+        symbolsListOut.addAll(newSymbols);
         return new LocalSymbolTableImports(importsList);
     }
 
diff --git a/src/software/amazon/ion/impl/LocalSymbolTableImportAdapter.java b/src/software/amazon/ion/impl/LocalSymbolTableImportAdapter.java
deleted file mode 100644
index 1d4bb82db8..0000000000
--- a/src/software/amazon/ion/impl/LocalSymbolTableImportAdapter.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package software.amazon.ion.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-
-/**
- * Adapter for {@link LocalSymbolTable} to make it importable by ignoring any potentially imported
- * system table.
- * <p>
- * <strong>Important:</strong> All adapted instances are read only
- * </p>
- */
-final class LocalSymbolTableImportAdapter
-    extends BaseSymbolTableWrapper
-{
-
-    private final int systemSymbolCount;
-
-    static LocalSymbolTableImportAdapter of(final LocalSymbolTable delegate)
-    {
-        /*
-         * There is a hard boundary between the data regions from the imported and derived table. Example:
-         *
-         * LST A that contains symbol A1, LST B is created importing LST A and after B is created symbol A2 is added
-         * to LST A. LST B should have symbol A1, through the import, but it should not have symbol A2 as it was included
-         * after LST B creation
-         *
-         * To maintain this boundary we make a read only copy for mutable LSTs. Copying is not necessary for read only LSTs
-         * as no extra items can be added into them
-         */
-        final LocalSymbolTable readOnlyDelegate;
-        if(delegate.isReadOnly())
-        {
-            readOnlyDelegate = delegate;
-        }
-        else {
-            readOnlyDelegate = delegate.makeCopy();
-            readOnlyDelegate.makeReadOnly();
-        }
-
-        return new LocalSymbolTableImportAdapter(readOnlyDelegate);
-    }
-
-    private LocalSymbolTableImportAdapter(final LocalSymbolTable delegate)
-    {
-        super(delegate);
-
-        systemSymbolCount = countSystemSymbols(getDelegate());
-    }
-
-    @Override
-    public SymbolTable getSystemSymbolTable()
-    {
-        return null;
-    }
-
-    @Override
-    public int getImportedMaxId()
-    {
-        return getDelegate().getImportedMaxId() - systemSymbolCount;
-    }
-
-    @Override
-    public int getMaxId()
-    {
-        return getDelegate().getMaxId() - systemSymbolCount;
-    }
-
-    @Override
-    public SymbolToken find(String text)
-    {
-        SymbolToken symbolToken = getDelegate().find(text);
-        if(symbolToken != null)
-        {
-            symbolToken = new SymbolTokenImpl(symbolToken.getText(), symbolToken.getSid() - systemSymbolCount);
-        }
-
-        return symbolToken;
-    }
-
-    @Override
-    public int findSymbol(String name)
-    {
-        int sid = getDelegate().findSymbol(name);
-        if(sid != UNKNOWN_SYMBOL_ID){
-            sid = sid - systemSymbolCount;
-        }
-
-        return sid;
-    }
-
-    @Override
-    public String findKnownSymbol(int id)
-    {
-        return getDelegate().findKnownSymbol(id + systemSymbolCount);
-    }
-
-    private int countSystemSymbols(SymbolTable symbolTable)
-    {
-        SymbolTable systemSymbolTable = symbolTable.getSystemSymbolTable();
-
-        if(systemSymbolTable != null)
-        {
-            return systemSymbolTable.getMaxId();
-        }
-
-        return 0;
-    }
-}
diff --git a/src/software/amazon/ion/impl/LocalSymbolTableImports.java b/src/software/amazon/ion/impl/LocalSymbolTableImports.java
index fbb62b944c..ca78b9c322 100644
--- a/src/software/amazon/ion/impl/LocalSymbolTableImports.java
+++ b/src/software/amazon/ion/impl/LocalSymbolTableImports.java
@@ -74,49 +74,14 @@ final class LocalSymbolTableImports
      */
     LocalSymbolTableImports(List<SymbolTable> importTables)
     {
-        validateImports(importTables);
-
         int importTablesSize = importTables.size();
 
-        // detects and adapts local tables so they are importable
-        myImports = new SymbolTable[importTablesSize];
-        for(int i = 0; i < importTables.size(); i++)
-        {
-            SymbolTable symbolTable = importTables.get(i);
-            if(symbolTable.isLocalTable())
-            {
-                myImports[i] = LocalSymbolTableImportAdapter.of((LocalSymbolTable) symbolTable);
-            }
-            else
-            {
-                myImports[i] = symbolTable;
-            }
-        }
+        myImports = importTables.toArray(new SymbolTable[importTablesSize]);
 
         myBaseSids = new int[importTablesSize];
         myMaxId = prepBaseSids(myBaseSids, myImports);
     }
 
-    /**
-     * Validates the import list to ensure that if there is a {@link LocalSymbolTable} in it then it's a single import
-     * apart from the system table
-     */
-    private void validateImports(final List<SymbolTable> importTables)
-    {
-        int sizeWithoutSystemTables = importTables.size();
-        int numberOfLocalTables = 0;
-
-        for(SymbolTable table : importTables)
-        {
-            if(table.isLocalTable()) numberOfLocalTables++;
-            if(table.isSystemTable()) sizeWithoutSystemTables--;
-        }
-
-        if(numberOfLocalTables > 0 && sizeWithoutSystemTables != 1){
-            throw new IllegalArgumentException("when importing LocalSymbolTables it needs to be the only import");
-        }
-    }
-
     /**
      * @param defaultSystemSymtab
      *          the default system symtab, which will be used if the first
@@ -140,36 +105,17 @@ private void validateImports(final List<SymbolTable> importTables)
 
         if (imports != null && imports.length > 0)
         {
-            final int offset;
-            final SymbolTable systemTable;
             if (imports[0].isSystemTable())
             {
-                offset = 0;
-                systemTable = imports[0];
+                // copy imports as-is
+                myImports = imports.clone();
             }
             else
             {
-                offset = 1;
-                systemTable = defaultSystemSymtab;
-            }
-
-            myImports = new SymbolTable[imports.length + offset];
-            myImports[0] = systemTable;
-
-            // no need to consider the offset here as it only comes in play when there is a system table
-            validateImports(Arrays.asList(imports));
-
-            for(int i = 1 - offset; i < imports.length; i++)
-            {
-                SymbolTable symbolTable = imports[i];
-                if(symbolTable instanceof LocalSymbolTable)
-                {
-                    myImports[i + offset] = LocalSymbolTableImportAdapter.of((LocalSymbolTable) symbolTable);
-                }
-                else
-                {
-                    myImports[i + offset] = symbolTable;
-                }
+                // use defaultSystemSymtab and append imports
+                myImports = new SymbolTable[imports.length + 1];
+                myImports[0] = defaultSystemSymtab;
+                System.arraycopy(imports, 0, myImports, 1, imports.length);
             }
         }
         else
@@ -205,7 +151,7 @@ private static int prepBaseSids(int[] baseSids, SymbolTable[] imports)
         {
             SymbolTable importedTable = imports[i];
 
-            if (importedTable.isSystemTable())
+            if (importedTable.isLocalTable() || importedTable.isSystemTable())
             {
                 String message = "only non-system shared tables can be imported";
                 throw new IllegalArgumentException(message);
diff --git a/src/software/amazon/ion/impl/lite/IonDatagramLite.java b/src/software/amazon/ion/impl/lite/IonDatagramLite.java
index d8158b97a9..cdc6c62ebd 100644
--- a/src/software/amazon/ion/impl/lite/IonDatagramLite.java
+++ b/src/software/amazon/ion/impl/lite/IonDatagramLite.java
@@ -410,11 +410,18 @@ public IonType getType()
     @Override
     public final void writeTo(IonWriter writer)
     {
-        try
-        {
-            writer.writeSymbol(SystemSymbols.ION_1_0);  // TODO amzn/ion-java#8 ???
-        } catch (IOException ioe) {
-            throw new IonException(ioe);
+        if (writer.getSymbolTable().isSystemTable()) {
+            // If the writer was configured with a non-default symbol table, writing an IVM here will
+            // reset that symbol table. If the datagram contains any symbols with unknown text that
+            // refer to slots in shared symbol table imports declared by the discarded table, an
+            // error will be raised unnecessarily. To avoid that, only write an IVM when the writer's
+            // symbol table is already the system symbol table.
+            // TODO evaluate whether an IVM should ever be written here. amzn/ion-java#200
+            try {
+                writer.writeSymbol(SystemSymbols.ION_1_0);
+            } catch (IOException ioe) {
+                throw new IonException(ioe);
+            }
         }
         for (IonValue iv : this) {
             iv.writeTo(writer);
diff --git a/test/software/amazon/ion/impl/BaseSymbolTableWrapperTest.java b/test/software/amazon/ion/impl/BaseSymbolTableWrapperTest.java
deleted file mode 100644
index 0d2fba459b..0000000000
--- a/test/software/amazon/ion/impl/BaseSymbolTableWrapperTest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package software.amazon.ion.impl;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.junit.Test;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.SymbolTable;
-
-/**
- * Parent test class for classes that extend {@link BaseSymbolTableWrapper}. Provides simple equality tests for non void
- * methods with no arguments by comparing delegate and subject returns. Other methods and overridden methods need to be
- * handled by the subclasses
- */
-public abstract class BaseSymbolTableWrapperTest extends IonTestCase
-{
-    protected abstract BaseSymbolTableWrapper getSubject();
-
-    @Test
-    public void testGetName()
-    {
-        assertEquals(getDelegate().getName(), getSubject().getName());
-    }
-
-    @Test
-    public void testGetVersion()
-    {
-        assertEquals(getDelegate().getVersion(), getSubject().getVersion());
-    }
-
-    @Test
-    public void testIsLocalTable()
-    {
-        assertEquals(getDelegate().isLocalTable(), getSubject().isLocalTable());
-    }
-
-    @Test
-    public void testIsSharedTable()
-    {
-        assertEquals(getDelegate().isSharedTable(), getSubject().isSharedTable());
-    }
-
-    @Test
-    public void testIsSubstitute()
-    {
-        assertEquals(getDelegate().isSubstitute(), getSubject().isSubstitute());
-    }
-
-    @Test
-    public void testIsSystemTable()
-    {
-        assertEquals(getDelegate().isSystemTable(), getSubject().isSystemTable());
-    }
-
-    @Test
-    public void testIsReadOnly()
-    {
-        assertEquals(getDelegate().isReadOnly(), getSubject().isReadOnly());
-    }
-
-    @Test
-    public abstract void testMakeReadOnly();
-
-    @Test
-    public void testGetSystemSymbolTable()
-    {
-        assertEquals(getDelegate().getSystemSymbolTable(), getSubject().getSystemSymbolTable());
-    }
-
-    @Test
-    public void testGetIonVersionId()
-    {
-        assertEquals(getDelegate().getIonVersionId(), getSubject().getIonVersionId());
-    }
-
-    @Test
-    public void testGetImportedTables()
-    {
-        assertEquals(getDelegate().getImportedTables(), getSubject().getImportedTables());
-    }
-
-    @Test
-    public void testGetImportedMaxId()
-    {
-        assertEquals(getDelegate().getImportedMaxId(), getSubject().getImportedMaxId());
-    }
-
-    @Test
-    public void testGetMaxId()
-    {
-        assertEquals(getDelegate().getMaxId(), getSubject().getMaxId());
-    }
-
-    @Test
-    public abstract void testIntern();
-
-    @Test
-    public abstract void testFind();
-
-    @Test
-    public abstract void testFindSymbol();
-
-    @Test
-    public abstract void testFindKnownSymbol();
-
-    @Test
-    public void testIterateDeclaredSymbolNames()
-    {
-        Iterator<String> expected = getDelegate().iterateDeclaredSymbolNames();
-        Iterator<String> actual = getSubject().iterateDeclaredSymbolNames();
-
-        assertEquals(collect(expected), collect(actual));
-    }
-
-    private <T> List<T> collect(Iterator<T> iterator) {
-        List<T> list = new ArrayList<T>();
-
-        for(T t = null; iterator.hasNext(); t = iterator.next())
-        {
-            list.add(t);
-        }
-
-        return list;
-    }
-
-    @Test
-    public abstract void testWriteTo() throws IOException;
-
-    private SymbolTable getDelegate()
-    {
-        return getSubject().getDelegate();
-    }
-}
diff --git a/test/software/amazon/ion/impl/LocalSymbolTableImportAdapterTest.java b/test/software/amazon/ion/impl/LocalSymbolTableImportAdapterTest.java
deleted file mode 100644
index b2dd6fce4f..0000000000
--- a/test/software/amazon/ion/impl/LocalSymbolTableImportAdapterTest.java
+++ /dev/null
@@ -1,280 +0,0 @@
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-
-public class LocalSymbolTableImportAdapterTest extends BaseSymbolTableWrapperTest
-{
-    @Test
-    public void testIsReadOnlyByDefault()
-    {
-        LocalSymbolTable lst = lstBuilder().build();
-        assertEquals(false, lst.isReadOnly());
-
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(lst);
-
-        assertEquals(true, subject.isReadOnly());
-    }
-
-    @Override
-    public void testGetSystemSymbolTable()
-    {
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(lstBuilder().build());
-
-        assertEquals(null, subject.getSystemSymbolTable());
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testImportedTables()
-    {
-        LocalSymbolTable imported1 = lstBuilder().build();
-        LocalSymbolTable imported2 = lstBuilder().build();
-
-        lstBuilder().setImportedTables(imported1, imported2).build();
-    }
-
-    @Test
-    public void testMaxIdNoImports()
-    {
-        LocalSymbolTable delegate = lstBuilder()
-            .setSymbols("one", "two")
-            .build();
-
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(delegate);
-
-        assertEquals(2, subject.getMaxId());
-    }
-
-    @Override
-    public void testGetMaxId()
-    {
-        SymbolTable imported = lstBuilder().setSymbols("1", "2", "3").build();
-
-        LocalSymbolTable delegate = lstBuilder()
-            .setSymbols("one", "two")
-            .setImportedTables(imported)
-            .build();
-
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(delegate);
-
-        assertEquals(5, subject.getMaxId());
-    }
-
-    @Test
-    public void testImportedMaxIdNoImports()
-    {
-        LocalSymbolTable delegate = lstBuilder()
-            .setSymbols("one", "two")
-            .build();
-
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(delegate);
-
-        assertEquals(0, subject.getImportedMaxId());
-    }
-
-    @Override
-    public void testGetImportedMaxId()
-    {
-        SymbolTable imported = lstBuilder().setSymbols("1", "2", "3").build();
-
-        LocalSymbolTable delegate = lstBuilder()
-            .setSymbols("one", "two")
-            .setImportedTables(imported)
-            .build();
-
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(delegate);
-
-        assertEquals(3, subject.getImportedMaxId());
-    }
-
-    @Test(expected = ReadOnlyValueException.class)
-    @Override
-    public void testIntern()
-    {
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(lstBuilder().build());
-
-        subject.intern("");
-    }
-
-    @Override
-    public void testFind()
-    {
-        SymbolTable imported = lstBuilder().setSymbols("onImport").build();
-
-        LocalSymbolTable delegate = lstBuilder()
-            .setImportedTables(imported)
-            .setSymbols("onDelegate")
-            .build();
-
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(delegate);
-
-        SymbolToken onDelegateSymbol = subject.find("onDelegate");
-        assertNotNull(onDelegateSymbol);
-        assertEquals("onDelegate", onDelegateSymbol.getText());
-        assertEquals(2, onDelegateSymbol.getSid());
-
-        SymbolToken onImportSymbol = subject.find("onImport");
-        assertNotNull(onImportSymbol);
-        assertEquals("onImport", onImportSymbol.getText());
-        assertEquals(1, onImportSymbol.getSid());
-
-        SymbolToken unknown = subject.find("unknown");
-        assertNull(unknown);
-    }
-
-    @Override
-    protected BaseSymbolTableWrapper getSubject()
-    {
-        return LocalSymbolTableImportAdapter.of(lstBuilder().build());
-    }
-
-    @Override
-    public void testMakeReadOnly()
-    {
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(lstBuilder().build());
-        subject.makeReadOnly();
-        assertEquals(true, subject.isReadOnly());
-
-        try
-        {
-            subject.intern("asd");
-            Assert.fail("could modify read only");
-        } catch (ReadOnlyValueException ignored)
-        {
-
-        }
-    }
-
-    @Override
-    public void testFindSymbol()
-    {
-        SymbolTable imported = lstBuilder().setSymbols("onImport").build();
-
-        LocalSymbolTable delegate = lstBuilder()
-            .setImportedTables(imported)
-            .setSymbols("onDelegate")
-            .build();
-
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(delegate);
-
-        int onDelegateSid = subject.findSymbol("onDelegate");
-        assertEquals(2, onDelegateSid);
-
-        int onImportSid = subject.findSymbol("onImport");
-        assertEquals(1, onImportSid);
-
-        int unknown = subject.findSymbol("unknown");
-        assertEquals(UNKNOWN_SYMBOL_ID, unknown);
-    }
-
-    @Override
-    public void testFindKnownSymbol()
-    {
-        SymbolTable imported = lstBuilder().setSymbols("onImport").build();
-
-        LocalSymbolTable delegate = lstBuilder()
-            .setImportedTables(imported)
-            .setSymbols("onDelegate")
-            .build();
-
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(delegate);
-
-        String onDelegate = subject.findKnownSymbol(2);
-        assertEquals("onDelegate", onDelegate);
-
-        String onImport = subject.findKnownSymbol(1);
-        assertEquals("onImport", onImport);
-
-        String unknown = subject.findKnownSymbol(99);
-        assertNull(unknown);
-    }
-
-    @Override
-    public void testWriteTo() throws IOException
-    {
-        LocalSymbolTable delegate = lstBuilder().setSymbols("mySymbol").build();
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(delegate);
-
-        StringBuilder out = new StringBuilder();
-
-        IonWriter ionWriter = system().newTextWriter(out);
-        subject.writeTo(ionWriter);
-        ionWriter.close();
-
-        assertEquals(out.toString(), "$ion_symbol_table::{symbols:[\"mySymbol\"]}");
-    }
-
-    @Test
-    public void testWriteToBinary() throws IOException
-    {
-        LocalSymbolTable delegate = lstBuilder().setSymbols("mySymbol").build();
-        LocalSymbolTableImportAdapter subject = LocalSymbolTableImportAdapter.of(delegate);
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        IonWriter ionWriter = system().newBinaryWriter(out);
-        subject.writeTo(ionWriter);
-        system().newInt(1).writeTo(ionWriter);
-        ionWriter.close();
-
-        IonDatagram datagram = loader().load(out.toByteArray());
-        SymbolTable symbolTable = datagram.get(0).getSymbolTable();
-
-        assertEquals(10, symbolTable.getMaxId());
-        assertEquals(10, symbolTable.findSymbol("mySymbol"));
-    }
-
-    private LocalSymbolTableBuilder lstBuilder()
-    {
-        return new LocalSymbolTableBuilder(system());
-    }
-
-    private static class LocalSymbolTableBuilder
-    {
-        private final PrivateIonSystem system;
-        private String[] symbols = new String[0];
-        private SymbolTable[] importedTables = new SymbolTable[0];
-
-        private LocalSymbolTableBuilder(PrivateIonSystem system)
-        {
-            this.system = system;
-        }
-
-        public LocalSymbolTable build()
-        {
-            LocalSymbolTable lst = (LocalSymbolTable) LocalSymbolTable.DEFAULT_LST_FACTORY.newLocalSymtab(
-                system.getSystemSymbolTable(),
-                importedTables
-            );
-
-            for(String symbol : symbols) {
-                lst.intern(symbol);
-            }
-
-            return lst;
-        }
-
-        public LocalSymbolTableBuilder setSymbols(final String... symbols)
-        {
-            this.symbols = symbols;
-
-            return this;
-        }
-
-        public LocalSymbolTableBuilder setImportedTables(final SymbolTable... importedTables)
-        {
-            this.importedTables = importedTables;
-
-            return this;
-        }
-    }
-}
diff --git a/test/software/amazon/ion/impl/SymbolTableTest.java b/test/software/amazon/ion/impl/SymbolTableTest.java
index 32e08bdd8c..d4ea57f8d1 100644
--- a/test/software/amazon/ion/impl/SymbolTableTest.java
+++ b/test/software/amazon/ion/impl/SymbolTableTest.java
@@ -32,11 +32,14 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Set;
 import org.junit.Ignore;
 import org.junit.Test;
+import software.amazon.ion.IonCatalog;
 import software.amazon.ion.IonDatagram;
 import software.amazon.ion.IonException;
 import software.amazon.ion.IonInt;
@@ -56,6 +59,9 @@
 import software.amazon.ion.SymbolToken;
 import software.amazon.ion.SystemSymbols;
 import software.amazon.ion.Timestamp;
+import software.amazon.ion.system.IonBinaryWriterBuilder;
+import software.amazon.ion.system.IonSystemBuilder;
+import software.amazon.ion.system.IonTextWriterBuilder;
 import software.amazon.ion.system.SimpleCatalog;
 
 /**
@@ -175,26 +181,6 @@ public void testLocalSymbolTableAppend()
         checkUnknownSymbol(33, symbolTable);
     }
 
-    @Test
-    public void testLocalSymbolTableAppendThroughDom()
-    {
-        SymbolTable base = system().newLocalSymbolTable();
-        base.intern("beforeDerivedCreation");
-
-        SymbolTable derived = system().newLocalSymbolTable(base);
-        derived.intern("onDerived");
-
-        base.intern("afterDerivedCreation");
-
-        checkSymbol("beforeDerivedCreation", systemMaxId() + 1, derived);
-        checkSymbol("onDerived", systemMaxId() + 2, derived);
-
-        // derived only see symbols that were added in base before derived creation
-        // so "afterDerivedCreation" is unknown to derived
-        checkUnknownSymbol("afterDerivedCreation", UNKNOWN_SYMBOL_ID, derived);
-        checkSymbol("afterDerivedCreation", systemMaxId() + 2, base);
-    }
-
     @Test
     public void testLocalSymbolTableMultiAppend()
     {
@@ -297,6 +283,50 @@ public void testLocalSymbolTableAppendImportBoundary()
         assertNull(appended.find("o1"));
     }
 
+    @Test
+    public void testMutateDomAfterLocalSymbolTableAppend() throws IOException {
+        String text =
+                LocalSymbolTablePrefix +
+                "{" +
+                "   imports:[{name:\"foo\", version:1, max_id:1}], " +
+                "   symbols:[\"s1\", \"s2\"]" +
+                "}\n" +
+                "$10\n" + // Symbol with unknown text from "foo"
+                "$11\n" + // s1
+                LocalSymbolTablePrefix +
+                "{" +
+                "   imports:" + ION_SYMBOL_TABLE + "," +
+                "   symbols:[\"s3\"]" +
+                "}\n" +
+                "$12"; // s2
+        IonDatagram datagram = loader().load(text);
+        datagram.add(1, system().newSymbol("abc"));
+        datagram.add(system().newSymbol(new SymbolTokenImpl(null, 13))); // s3
+        datagram.add(system().newSymbol(new SymbolTokenImpl(null, 10))); // Symbol with unknown text from "foo"
+        ByteArrayOutputStream textOutput = new ByteArrayOutputStream();
+        ByteArrayOutputStream binaryOutput = new ByteArrayOutputStream();
+        List<String> fooSymbols = Collections.singletonList("bar");
+        SymbolTable fooTable = system().newSharedSymbolTable("foo", 1, fooSymbols.iterator());
+        IonWriter textWriter = IonTextWriterBuilder.standard().withImports(fooTable).build(textOutput);
+        datagram.writeTo(textWriter);
+        textWriter.close();
+        IonWriter binaryWriter = IonBinaryWriterBuilder.standard().withImports(fooTable).build(binaryOutput);
+        datagram.writeTo(binaryWriter);
+        binaryWriter.close();
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(fooTable);
+        IonSystem system = IonSystemBuilder.standard().withCatalog(catalog).build();
+        IonDatagram textRoundtrip = system.getLoader().load(textOutput.toByteArray());
+        IonDatagram binaryRoundtrip = system.getLoader().load(binaryOutput.toByteArray());
+        assertEquals(textRoundtrip, binaryRoundtrip);
+        assertEquals("bar", ((IonSymbol)textRoundtrip.get(0)).stringValue());
+        assertEquals("abc", ((IonSymbol)textRoundtrip.get(1)).stringValue());
+        assertEquals("s1", ((IonSymbol)textRoundtrip.get(2)).stringValue());
+        assertEquals("s2", ((IonSymbol)textRoundtrip.get(3)).stringValue());
+        assertEquals("s3", ((IonSymbol)textRoundtrip.get(4)).stringValue());
+        assertEquals("bar", ((IonSymbol)textRoundtrip.get(0)).stringValue());
+    }
+
     @Test
     public void testSymtabsPrintLocalSymtabWithGaps()
         throws Exception
@@ -491,7 +521,7 @@ public void testOverridingImportedSymbolId()
     }
 
 
-    @Test @Ignore
+    @Test
     public void testInjectingMaxIdIntoImport() // TODO implement
     {
         SymbolTable importedTable = registerImportedV1();
@@ -713,8 +743,7 @@ public void testRepeatedImport()
         checkSymbol("imported 2", 13, /* dupe */ true, symbolTable);
     }
 
-    // amzn/ion-java#46
-    @Test @Ignore
+    @Test
     public void testDupLocalSymbolOnDatagram() throws Exception {
         final IonSystem ion1 = system();
         final SymbolTable st = ion1.newSharedSymbolTable("foobar", 1, Arrays.asList("s1").iterator());

From 9dc90d41f43b23c8fa9382d9e696665b0054810b Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Tue, 8 Jan 2019 20:05:40 -0800
Subject: [PATCH 042/490] Memleak gzip (#204)

* Fixing memleak when auto detecting gzipped bytes

Correctly closes the created IonReader in order to free the memory
allocated outside the heap by GzipInputStream.

For methods that return an iterator changed the signature to
return a CloseableIterator which is closeable permiting users to
close the iterator. This iterator also closes itself when there are
no more values next to return.

The gzip auto detect functionality should be removed from this package
as it is an orthogonal concern to reading/writing Ion data. Right now
our API has to close streams created by users to guaranteed that the
internal wrapped Gzip stream is correctly closed.

https://github.com/amzn/ion-java/issues/198
---
 .../amazon/ion/CloseableIterator.java         |  14 +++
 src/software/amazon/ion/IonLoader.java        |  24 +++-
 src/software/amazon/ion/IonSystem.java        | 113 +++++++++++++++---
 .../amazon/ion/impl/lite/IonLoaderLite.java   |  22 +++-
 .../amazon/ion/impl/lite/IonSystemLite.java   |  52 +++++---
 .../amazon/ion/system/IonReaderBuilder.java   |  19 ++-
 6 files changed, 204 insertions(+), 40 deletions(-)
 create mode 100644 src/software/amazon/ion/CloseableIterator.java

diff --git a/src/software/amazon/ion/CloseableIterator.java b/src/software/amazon/ion/CloseableIterator.java
new file mode 100644
index 0000000000..fde07b8de2
--- /dev/null
+++ b/src/software/amazon/ion/CloseableIterator.java
@@ -0,0 +1,14 @@
+package software.amazon.ion;
+
+import java.io.Closeable;
+import java.util.Iterator;
+
+/**
+ * Iterator that can close its source of data.
+ *
+ * @param <T> the type of elements returned by this iterator.
+ */
+public interface CloseableIterator<T> extends Iterator<T>, Closeable
+{
+    // empty
+}
diff --git a/src/software/amazon/ion/IonLoader.java b/src/software/amazon/ion/IonLoader.java
index 9b6e7819c5..ad2fa9e590 100644
--- a/src/software/amazon/ion/IonLoader.java
+++ b/src/software/amazon/ion/IonLoader.java
@@ -105,10 +105,16 @@ public IonDatagram load(Reader ionText)
 
 
     /**
+     * <p>
      * Loads a block of Ion data into a single datagram,
      * detecting whether it's text or binary data.
+     * </p>
+     *
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data.
+     * This method will auto-detect and decompress GZIPped Ion data.
+     * <strong>WARNING:</strong> this feature is deprecated and will
+     * be removed in subsequent releases.
+     *</p>
      *
      * @param ionData may be either Ion binary data, or UTF-8 Ion text.
      * <em>This method assumes ownership of the array</em> and may modify it at
@@ -119,6 +125,9 @@ public IonDatagram load(Reader ionText)
      *
      * @throws NullPointerException if <code>ionData</code> is null.
      * @throws IonException if there's a syntax error in the Ion content.
+     *
+     * @deprecated auto-detecting of and decompression GZIPped Ion data will
+     * be removed in subsequent releases.
      */
     public IonDatagram load(byte[] ionData)
         throws IonException;
@@ -129,11 +138,18 @@ public IonDatagram load(byte[] ionData)
      * detecting whether it's text or binary data.
      * <p>
      * The specified stream remains open after this method returns.
+     * </p>
+     *
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data.
+     * This method will auto-detect and decompress GZIPped Ion data.
+     * <strong>WARNING:</strong> this feature is deprecated and will be
+     * removed in subsequent releases.
+     * </p>
+     *
      * <p>
      * Because this library performs its own buffering, it's recommended that
      * you avoid adding additional buffering to the given stream.
+     * </p>
      *
      * @param ionData the stream from which to read Ion data.
      *
@@ -144,6 +160,10 @@ public IonDatagram load(byte[] ionData)
      * @throws IonException if there's a syntax error in the Ion content.
      * @throws IOException if reading from the specified input stream results
      * in an <code>IOException</code>.
+     *
+     * @deprecated auto-detecting of and decompression GZIPped Ion data will
+     * be removed in subsequent releases. Use a {@link java.util.zip.GZIPInputStream}
+     * to process GZIPped Ion data.
      */
     public IonDatagram load(InputStream ionData)
         throws IonException, IOException;
diff --git a/src/software/amazon/ion/IonSystem.java b/src/software/amazon/ion/IonSystem.java
index 56b4849b95..0115ffc251 100644
--- a/src/software/amazon/ion/IonSystem.java
+++ b/src/software/amazon/ion/IonSystem.java
@@ -204,66 +204,99 @@ public SymbolTable newSharedSymbolTable(String name,
 
 
     /**
+     * <p>
      * Creates an iterator over a stream of Ion text data.
      * Values returned by the iterator have no container.
+     * </p>
+     *
      * <p>
      * The iterator will automatically consume Ion system IDs and local symbol
      * tables; they will not be returned by the iterator.
+     * </p>
+     *
      * <p>
      * If the input source throws an {@link IOException} during iteration, it
      * will be wrapped in an {@link IonException}. See documentation there for
      * tips on how to recover the cause.
+     * </p>
+     *
      * <p>
      * This method is suitable for use over unbounded streams with a reasonable
      * schema.
+     * </p>
+     *
      * <p>
      * Applications should generally use {@link #iterate(InputStream)}
      * whenever possible, since this library has much faster UTF-8 decoding
      * than the Java IO framework.
+     * </p>
+     *
      * <p>
      * Because this library performs its own buffering, it's recommended that
      * you avoid adding additional buffering to the given stream.
+     * </p>
      *
-     * @param ionText a stream of Ion text data.  The caller is responsible for
+     * @param ionText a stream of Ion text data. The caller is responsible for
      * closing the Reader after iteration is complete.
      *
-     * @return a new iterator instance.
+     * @return a new iterator instance. Closing this iterator
+     * will close ionText Reader. The iterator automatically closes when
+     * there are no more values to return.
      *
      * @throws NullPointerException if <code>ionText</code> is null.
      * @throws IonException if the source throws {@link IOException}.
      */
-    public Iterator<IonValue> iterate(Reader ionText);
-
+    public CloseableIterator<IonValue> iterate(Reader ionText);
 
     /**
+     * <p>
      * Creates an iterator over a stream of Ion data,
      * detecting whether it's text or binary data.
      * Values returned by the iterator have no container.
+     * </p>
+     *
      * <p>
      * The iterator will automatically consume Ion system IDs and local symbol
      * tables; they will not be returned by the iterator.
+     * </p>
+     *
      * <p>
      * If the input source throws an {@link IOException} during iteration, it
      * will be wrapped in an {@link IonException}. See documentation there for
      * tips on how to recover the cause.
+     * </p>
+     *
      * <p>
      * This method is suitable for use over unbounded streams with a reasonable
      * schema.
+     * </p>
+     *
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data.
+     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
+     * this feature is deprecated and will be removed in subsequent releases.
+     * </p>
+     *
      * <p>
      * Because this library performs its own buffering, it's recommended that
      * you avoid adding additional buffering to the given stream.
+     * </p>
      *
      * @param ionData a stream of Ion data.  The caller is responsible for
      * closing the InputStream after iteration is complete.
      *
-     * @return a new iterator instance.
+     * @return a new CloseableIterator<IonValue> instance. Closing this iterator
+     * will close ionData InputStream. The iterator automatically closes when
+     * there are no more values to return. <strong>WARNING:</strong> This instance
+     * must be closed by the client to avoid memory leaks when dealing with
+     * GZIPped Ion data.
      *
      * @throws NullPointerException if <code>ionData</code> is null.
      * @throws IonException if the source throws {@link IOException}.
+     *
+     * @deprecated auto-detecting of and decompression GZIPped Ion data
+     * will be removed in subsequent releases.
      */
-    public Iterator<IonValue> iterate(InputStream ionData);
+    public CloseableIterator<IonValue> iterate(InputStream ionData);
 
 
     /**
@@ -275,32 +308,47 @@ public SymbolTable newSharedSymbolTable(String name,
      *
      * @param ionText must not be null.
      *
-     * @return a new iterator instance.
+     * @return a new iterator instance. Closing this iterator will
+     * close the underlying {@link IonReader} created to read ionText.
+     * The iterator automatically closes when there are no more values
+     * to return.
      *
      * @throws NullPointerException if <code>ionText</code> is null.
      */
-    public Iterator<IonValue> iterate(String ionText);
+    public CloseableIterator<IonValue> iterate(String ionText);
 
 
     /**
+     * <p>
      * Creates an iterator over Ion data.
      * Values returned by the iterator have no container.
+     * </p>
      * <p>
      * The iterator will automatically consume Ion system IDs and local symbol
      * tables; they will not be returned by the iterator.
+     * </p>
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data.
+     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
+     * this feature is deprecated and will be removed in subsequent releases.
+     * </p>
      *
      * @param ionData may be either Ion binary data or (UTF-8) Ion text, or
      * GZIPped Ion data.
      * <em>This method assumes ownership of the array</em> and may modify it at
      * will.
      *
-     * @return a new iterator instance.
+     * @return a new CloseableIterator<IonValue> instance. Closing this iterator will
+     * close the underlying {@link IonReader} created to read ionData. The iterator
+     * automatically closes when there are no more values to return.
+     * <strong>WARNING:</strong> This instance must be closed by the client
+     * to avoid memory leaks when dealing with GZIPped Ion data.
      *
      * @throws NullPointerException if <code>ionData</code> is null.
+     *
+     * @deprecated auto-detecting of and decompression GZIPped Ion data
+     * will be removed in subsequent releases.
      */
-    public Iterator<IonValue> iterate(byte[] ionData);
+    public CloseableIterator<IonValue> iterate(byte[] ionData);
 
 
     /**
@@ -320,9 +368,14 @@ public SymbolTable newSharedSymbolTable(String name,
 
 
     /**
+     * <p>
      * Extracts a single value from Ion text or binary data.
+     * </p>
+     *
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data.
+     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
+     * this feature is deprecated and will be removed in subsequent releases.
+     * </p>
      *
      * @param ionData may be either Ion binary data or (UTF-8) Ion text, or
      * GZIPped Ion data.
@@ -336,6 +389,9 @@ public SymbolTable newSharedSymbolTable(String name,
      * values.
      * @throws IonException if the data does not contain exactly one user
      * value.
+     *
+     * @deprecated auto-detecting of and decompression GZIPped Ion data
+     * will be removed in subsequent releases.
      */
     public IonValue singleValue(byte[] ionData);
 
@@ -364,22 +420,35 @@ public SymbolTable newSharedSymbolTable(String name,
     public IonReader newReader(String ionText);
 
     /**
+     * <p>
      * Creates an new {@link IonReader} instance over a block of Ion data,
      * detecting whether it's text or binary data.
+     * </p>
+     *
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data.
+     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
+     * this feature is deprecated and will be removed in subsequent releases.
+     * </p>
      *
      * @param ionData may be either Ion binary data, or UTF-8 Ion text.
      * The reader retains a reference to the array, so its data must not be
      * modified while the reader is active.
+     *
+     * @deprecated auto-detecting of and decompression GZIPped Ion data
+     * will be removed in subsequent releases.
      */
     public IonReader newReader(byte[] ionData);
 
     /**
+     * <p>
      * Creates an new {@link IonReader} instance over a block of Ion data,
      * detecting whether it's text or binary data.
+     * </p>
+     *
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data.
+     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
+     * this feature is deprecated and will be removed in subsequent releases.
+     * </p>
      *
      * @param ionData is used only within the range of bytes starting at
      * {@code offset} for {@code len} bytes.
@@ -389,17 +458,26 @@ public SymbolTable newSharedSymbolTable(String name,
      * @param offset must be non-negative and less than {@code ionData.length}.
      * @param len must be non-negative and {@code offset+len} must not exceed
      * {@code ionData.length}.
+     *
+     * @deprecated auto-detecting of and decompression GZIPped Ion data
+     * will be removed in subsequent releases.
      */
     public IonReader newReader(byte[] ionData, int offset, int len);
 
     /**
+     * <p>
      * Creates a new {@link IonReader} instance over a stream of Ion data,
      * detecting whether it's text or binary data.
+     *
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data.
+     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
+     * this feature is deprecated and will be removed in subsequent releases.
+     * </p>
+     *
      * <p>
      * Because this library performs its own buffering, it's recommended that
      * you avoid adding additional buffering to the given stream.
+     * </p>
      *
      * @param ionData must not be null.
      *
@@ -407,6 +485,9 @@ public SymbolTable newSharedSymbolTable(String name,
      * Callers must call {@link IonReader#close()} when finished with it.
      *
      * @throws IonException if the source throws {@link IOException}.
+     *
+     * @deprecated auto-detecting of and decompression GZIPped Ion data
+     * will be removed in subsequent releases.
      */
     public IonReader newReader(InputStream ionData);
 
diff --git a/src/software/amazon/ion/impl/lite/IonLoaderLite.java b/src/software/amazon/ion/impl/lite/IonLoaderLite.java
index 1c50234e65..2b96c923bb 100644
--- a/src/software/amazon/ion/impl/lite/IonLoaderLite.java
+++ b/src/software/amazon/ion/impl/lite/IonLoaderLite.java
@@ -122,21 +122,34 @@ public IonDatagram load(Reader ionText) throws IonException, IOException
 
     public IonDatagram load(byte[] ionData) throws IonException
     {
+        IonReader reader = null;
         try {
-            IonReader reader = makeReader(_catalog, ionData, 0, ionData.length, _lstFactory);
+            reader = makeReader(_catalog, ionData, 0, ionData.length, _lstFactory);
             IonDatagramLite datagram = load_helper(reader);
             return datagram;
         }
         catch (IOException e) {
             throw new IonException(e);
         }
+        finally
+        {
+            if (reader != null) {
+                try {
+                    reader.close();
+                }
+                catch (IOException e) {
+                    throw new IonException(e);
+                }
+            }
+        }
     }
 
     public IonDatagram load(InputStream ionData)
         throws IonException, IOException
     {
+        IonReader reader = null;
         try {
-            IonReader reader = makeReader(_catalog, ionData, _lstFactory);
+            reader = makeReader(_catalog, ionData, _lstFactory);
             IonDatagramLite datagram = load_helper(reader);
             return datagram;
         }
@@ -145,6 +158,11 @@ public IonDatagram load(InputStream ionData)
             if (io != null) throw io;
             throw e;
         }
+        finally {
+            if (reader != null) {
+                reader.close();
+            }
+        }
     }
 
 }
diff --git a/src/software/amazon/ion/impl/lite/IonSystemLite.java b/src/software/amazon/ion/impl/lite/IonSystemLite.java
index ff74dd44ee..601d5ca0e7 100644
--- a/src/software/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/software/amazon/ion/impl/lite/IonSystemLite.java
@@ -14,6 +14,7 @@
 
 package software.amazon.ion.impl.lite;
 
+import software.amazon.ion.CloseableIterator;
 import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 import static software.amazon.ion.SystemSymbols.ION_1_0;
 import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
@@ -170,28 +171,28 @@ public SymbolTable getSystemSymbolTable(String ionVersionId)
         return getSystemSymbolTable();
     }
 
-    public Iterator<IonValue> iterate(Reader ionText)
+    public CloseableIterator<IonValue> iterate(Reader ionText)
     {
         IonReader reader = makeReader(_catalog, ionText, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
 
-    public Iterator<IonValue> iterate(InputStream ionData)
+    public CloseableIterator<IonValue> iterate(InputStream ionData)
     {
         IonReader reader = makeReader(_catalog, ionData, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
 
-    public Iterator<IonValue> iterate(String ionText)
+    public CloseableIterator<IonValue> iterate(String ionText)
     {
         IonReader reader = makeReader(_catalog, ionText, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
 
-    public Iterator<IonValue> iterate(byte[] ionData)
+    public CloseableIterator<IonValue> iterate(byte[] ionData)
     {
         IonReader reader = makeReader(_catalog, ionData, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
@@ -471,31 +472,38 @@ public IonWriter newWriter(IonContainer container)
         return writer;
     }
 
-    private IonValue singleValue(Iterator<IonValue> it)
+    private IonValue singleValue(CloseableIterator<IonValue> it)
     {
-        IonValue value;
         try {
-            value = it.next();
+            IonValue value = it.next();
+            if (it.hasNext()) {
+                throw new IonException("not a single value");
+            }
+            return value;
         }
         catch (NoSuchElementException e) {
             throw new UnexpectedEofException("no value found on input stream");
         }
-        if (it.hasNext()) {
-            throw new IonException("not a single value");
+        finally {
+            try {
+                it.close();
+            }
+            catch (IOException e) {
+                throw new IonException(e);
+            }
         }
-        return value;
     }
 
     public IonValue singleValue(String ionText)
     {
-        Iterator<IonValue> it = iterate(ionText);
+        CloseableIterator<IonValue> it = iterate(ionText);
         return singleValue(it);
     }
 
     public IonValue singleValue(byte[] ionData)
     {
-        Iterator<IonValue> it = iterate(ionData);
-        return singleValue(it);
+        CloseableIterator<IonValue> iterator = iterate(ionData);
+        return singleValue(iterator);
     }
 
     protected IonSymbolLite newSystemIdSymbol(String ionVersionMarker)
@@ -510,7 +518,7 @@ protected IonSymbolLite newSystemIdSymbol(String ionVersionMarker)
     }
 
     static class ReaderIterator
-        implements Iterator<IonValue>, Closeable
+        implements CloseableIterator<IonValue>
     {
         private final IonReader        _reader;
         private final IonSystemLite    _system;
@@ -531,7 +539,18 @@ public boolean hasNext()
             if (_next == null) {
                 _next = _reader.next();
             }
-            return (_next != null);
+            boolean hasNext = _next != null;
+
+            if (!hasNext) {
+                try {
+                    close();
+                }
+                catch (IOException e) {
+                    throw new IonException(e);
+                }
+            }
+
+            return hasNext;
         }
 
         public IonValue next()
@@ -567,11 +586,10 @@ public void remove()
 
         public void close() throws IOException
         {
-            // TODO _reader.close();
+            _reader.close();
         }
     }
 
-
     public IonTimestamp newUtcTimestampFromMillis(long millis)
     {
         IonTimestamp result = newNullTimestamp();
diff --git a/src/software/amazon/ion/system/IonReaderBuilder.java b/src/software/amazon/ion/system/IonReaderBuilder.java
index 7366ba52d9..10b45d4004 100644
--- a/src/software/amazon/ion/system/IonReaderBuilder.java
+++ b/src/software/amazon/ion/system/IonReaderBuilder.java
@@ -160,7 +160,8 @@ private IonCatalog validateCatalog()
      * instance over the given block of Ion data, detecting whether it's text or
      * binary data.
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data.
+     * This method will auto-detect and uncompress GZIPped Ion data. <strong>WARNING:</strong>
+     *      * this feature is deprecated and will be removed in subsequent releases.
      *
      * @param ionData the source of the Ion data, which may be either Ion binary
      * data or UTF-8 Ion text. The reader retains a reference to the array, so
@@ -170,6 +171,9 @@ private IonCatalog validateCatalog()
      * @return a new {@link IonReader} instance; not {@code null}.
      *
      * @see IonSystem#newReader(byte[])
+     *
+     * @deprecated auto-detecting of and decompression GZIPped Ion data will be
+     * removed in subsequent releases.
      */
     public IonReader build(byte[] ionData)
     {
@@ -181,7 +185,8 @@ public IonReader build(byte[] ionData)
      * instance over the given block of Ion data, detecting whether it's text or
      * binary data.
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data.
+     * This method will auto-detect and uncompress GZIPped Ion data. <strong>WARNING:</strong>
+     * this feature is deprecated and will be removed in subsequent releases.
      *
      * @param ionData the source of the Ion data, which is used only within the
      * range of bytes starting at {@code offset} for {@code len} bytes.
@@ -193,6 +198,9 @@ public IonReader build(byte[] ionData)
      * exceed {@code ionData.length}.
      *
      * @see IonSystem#newReader(byte[], int, int)
+     *
+     * @deprecated auto-detecting of and decompression GZIPped Ion data will be
+     * removed in subsequent releases.
      */
     public IonReader build(byte[] ionData, int offset, int length)
     {
@@ -204,7 +212,8 @@ public IonReader build(byte[] ionData, int offset, int length)
      * instance over the given stream of Ion data, detecting whether it's text or
      * binary data.
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data.
+     * This method will auto-detect and uncompress GZIPped Ion data. <strong>WARNING:</strong>
+     * this feature is deprecated and will be removed in subsequent releases.
      * <p>
      * Because this library performs its own buffering, it's recommended that
      * users avoid adding additional buffering to the given stream.
@@ -218,6 +227,10 @@ public IonReader build(byte[] ionData, int offset, int length)
      * @throws IonException if the source throws {@link IOException}.
      *
      * @see IonSystem#newReader(InputStream)
+     *
+     * @deprecated auto-detecting of and decompression GZIPped Ion data will be
+     * removed in subsequent releases. Use a {@link java.util.zip.GZIPInputStream}
+     * to process GZIPped Ion data.
      */
     public IonReader build(InputStream ionData)
     {

From 135139e58d5e5cdb350e10b4cd784ad59a586f5f Mon Sep 17 00:00:00 2001
From: David Lurton <dlurton@users.noreply.github.com>
Date: Mon, 4 Feb 2019 12:16:17 -0800
Subject: [PATCH 043/490] OpenJDK11 javadoc fix (#208)

#207 fix OpenJDK11 build failing during javadoc
---
 pom.xml                                   | 3 +++
 src/software/amazon/ion/IonSystem.java    | 4 ++--
 src/software/amazon/ion/ValueFactory.java | 8 ++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index d23bc97626..0747f87d48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,9 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
         <version>2.10.3</version>
+        <configuration>
+          <source>8</source>
+        </configuration>
         <reportSets>
           <reportSet>
             <configuration>
diff --git a/src/software/amazon/ion/IonSystem.java b/src/software/amazon/ion/IonSystem.java
index 0115ffc251..25ed5a3b0d 100644
--- a/src/software/amazon/ion/IonSystem.java
+++ b/src/software/amazon/ion/IonSystem.java
@@ -650,8 +650,8 @@ public IonWriter newTextWriter(Appendable out, SymbolTable... imports)
 
     /**
      * Creates a new datagram, bootstrapped with imported symbol tables.
-     * Generally an application will use this to aquire a datagram, then adds
-     * values to it, then calls {@link IonDatagram#getBytes(byte[])}
+     * Generally an application will use this to acquire a datagram, then adds
+     * values to it, then calls {@link IonDatagram#getBytes()}
      * (or similar) to extract binary data.
      *
      * @param imports the set of shared symbol tables to import.
diff --git a/src/software/amazon/ion/ValueFactory.java b/src/software/amazon/ion/ValueFactory.java
index 8767ae5832..7b9f5d9b07 100644
--- a/src/software/amazon/ion/ValueFactory.java
+++ b/src/software/amazon/ion/ValueFactory.java
@@ -252,14 +252,14 @@ public interface ValueFactory
 
     /**
      * Constructs a new {@code list} with the given child.
+     *
+     * @param child the initial child of the new list.
      * <p>
-     * <b>This method is temporary</b> until {@link #newList(Collection)} is
+     * <b>This method is temporary</b> until "newList(Collection)" is
      * removed.  It's sole purpose is to avoid the doomed attempt to add all
      * of the parameter's children to the new list; that will always throw
      * {@link ContainedValueException}.
      *
-     * @param child the initial child of the new list.
-     *
      * @throws NullPointerException if {@code child} is null.
      * @throws IllegalArgumentException if {@code child} is an {@link IonDatagram}.
      * @throws ContainedValueException
@@ -360,7 +360,7 @@ public IonList newList(IonValue... children)
     /**
      * Constructs a new {@code sexp} with the given child.
      * <p>
-     * <b>This method is temporary</b> until {@link #newSexp(Collection)} is
+     * <b>This method is temporary</b> until "newSexp(Collection)" is
      * removed.  It's sole purpose is to avoid the doomed attempt to add all
      * of the parameter's children to the new sequence; that will always throw
      * {@link ContainedValueException}.

From 151492d7bf1bb8785a35b275cf431b39d5d80829 Mon Sep 17 00:00:00 2001
From: Peter Cornell <pcornell@amazon.com>
Date: Thu, 7 Feb 2019 17:39:16 -0800
Subject: [PATCH 044/490] Revert "Memleak gzip (#204)" (#211)

This reverts commit 9dc90d41f43b23c8fa9382d9e696665b0054810b.
---
 .../amazon/ion/CloseableIterator.java         |  14 ---
 src/software/amazon/ion/IonLoader.java        |  24 +---
 src/software/amazon/ion/IonSystem.java        | 113 +++---------------
 .../amazon/ion/impl/lite/IonLoaderLite.java   |  22 +---
 .../amazon/ion/impl/lite/IonSystemLite.java   |  52 +++-----
 .../amazon/ion/system/IonReaderBuilder.java   |  19 +--
 6 files changed, 40 insertions(+), 204 deletions(-)
 delete mode 100644 src/software/amazon/ion/CloseableIterator.java

diff --git a/src/software/amazon/ion/CloseableIterator.java b/src/software/amazon/ion/CloseableIterator.java
deleted file mode 100644
index fde07b8de2..0000000000
--- a/src/software/amazon/ion/CloseableIterator.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package software.amazon.ion;
-
-import java.io.Closeable;
-import java.util.Iterator;
-
-/**
- * Iterator that can close its source of data.
- *
- * @param <T> the type of elements returned by this iterator.
- */
-public interface CloseableIterator<T> extends Iterator<T>, Closeable
-{
-    // empty
-}
diff --git a/src/software/amazon/ion/IonLoader.java b/src/software/amazon/ion/IonLoader.java
index ad2fa9e590..9b6e7819c5 100644
--- a/src/software/amazon/ion/IonLoader.java
+++ b/src/software/amazon/ion/IonLoader.java
@@ -105,16 +105,10 @@ public IonDatagram load(Reader ionText)
 
 
     /**
-     * <p>
      * Loads a block of Ion data into a single datagram,
      * detecting whether it's text or binary data.
-     * </p>
-     *
      * <p>
-     * This method will auto-detect and decompress GZIPped Ion data.
-     * <strong>WARNING:</strong> this feature is deprecated and will
-     * be removed in subsequent releases.
-     *</p>
+     * This method will auto-detect and uncompress GZIPped Ion data.
      *
      * @param ionData may be either Ion binary data, or UTF-8 Ion text.
      * <em>This method assumes ownership of the array</em> and may modify it at
@@ -125,9 +119,6 @@ public IonDatagram load(Reader ionText)
      *
      * @throws NullPointerException if <code>ionData</code> is null.
      * @throws IonException if there's a syntax error in the Ion content.
-     *
-     * @deprecated auto-detecting of and decompression GZIPped Ion data will
-     * be removed in subsequent releases.
      */
     public IonDatagram load(byte[] ionData)
         throws IonException;
@@ -138,18 +129,11 @@ public IonDatagram load(byte[] ionData)
      * detecting whether it's text or binary data.
      * <p>
      * The specified stream remains open after this method returns.
-     * </p>
-     *
      * <p>
-     * This method will auto-detect and decompress GZIPped Ion data.
-     * <strong>WARNING:</strong> this feature is deprecated and will be
-     * removed in subsequent releases.
-     * </p>
-     *
+     * This method will auto-detect and uncompress GZIPped Ion data.
      * <p>
      * Because this library performs its own buffering, it's recommended that
      * you avoid adding additional buffering to the given stream.
-     * </p>
      *
      * @param ionData the stream from which to read Ion data.
      *
@@ -160,10 +144,6 @@ public IonDatagram load(byte[] ionData)
      * @throws IonException if there's a syntax error in the Ion content.
      * @throws IOException if reading from the specified input stream results
      * in an <code>IOException</code>.
-     *
-     * @deprecated auto-detecting of and decompression GZIPped Ion data will
-     * be removed in subsequent releases. Use a {@link java.util.zip.GZIPInputStream}
-     * to process GZIPped Ion data.
      */
     public IonDatagram load(InputStream ionData)
         throws IonException, IOException;
diff --git a/src/software/amazon/ion/IonSystem.java b/src/software/amazon/ion/IonSystem.java
index 25ed5a3b0d..5c6da86b36 100644
--- a/src/software/amazon/ion/IonSystem.java
+++ b/src/software/amazon/ion/IonSystem.java
@@ -204,99 +204,66 @@ public SymbolTable newSharedSymbolTable(String name,
 
 
     /**
-     * <p>
      * Creates an iterator over a stream of Ion text data.
      * Values returned by the iterator have no container.
-     * </p>
-     *
      * <p>
      * The iterator will automatically consume Ion system IDs and local symbol
      * tables; they will not be returned by the iterator.
-     * </p>
-     *
      * <p>
      * If the input source throws an {@link IOException} during iteration, it
      * will be wrapped in an {@link IonException}. See documentation there for
      * tips on how to recover the cause.
-     * </p>
-     *
      * <p>
      * This method is suitable for use over unbounded streams with a reasonable
      * schema.
-     * </p>
-     *
      * <p>
      * Applications should generally use {@link #iterate(InputStream)}
      * whenever possible, since this library has much faster UTF-8 decoding
      * than the Java IO framework.
-     * </p>
-     *
      * <p>
      * Because this library performs its own buffering, it's recommended that
      * you avoid adding additional buffering to the given stream.
-     * </p>
      *
-     * @param ionText a stream of Ion text data. The caller is responsible for
+     * @param ionText a stream of Ion text data.  The caller is responsible for
      * closing the Reader after iteration is complete.
      *
-     * @return a new iterator instance. Closing this iterator
-     * will close ionText Reader. The iterator automatically closes when
-     * there are no more values to return.
+     * @return a new iterator instance.
      *
      * @throws NullPointerException if <code>ionText</code> is null.
      * @throws IonException if the source throws {@link IOException}.
      */
-    public CloseableIterator<IonValue> iterate(Reader ionText);
+    public Iterator<IonValue> iterate(Reader ionText);
+
 
     /**
-     * <p>
      * Creates an iterator over a stream of Ion data,
      * detecting whether it's text or binary data.
      * Values returned by the iterator have no container.
-     * </p>
-     *
      * <p>
      * The iterator will automatically consume Ion system IDs and local symbol
      * tables; they will not be returned by the iterator.
-     * </p>
-     *
      * <p>
      * If the input source throws an {@link IOException} during iteration, it
      * will be wrapped in an {@link IonException}. See documentation there for
      * tips on how to recover the cause.
-     * </p>
-     *
      * <p>
      * This method is suitable for use over unbounded streams with a reasonable
      * schema.
-     * </p>
-     *
      * <p>
-     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
-     * this feature is deprecated and will be removed in subsequent releases.
-     * </p>
-     *
+     * This method will auto-detect and uncompress GZIPped Ion data.
      * <p>
      * Because this library performs its own buffering, it's recommended that
      * you avoid adding additional buffering to the given stream.
-     * </p>
      *
      * @param ionData a stream of Ion data.  The caller is responsible for
      * closing the InputStream after iteration is complete.
      *
-     * @return a new CloseableIterator<IonValue> instance. Closing this iterator
-     * will close ionData InputStream. The iterator automatically closes when
-     * there are no more values to return. <strong>WARNING:</strong> This instance
-     * must be closed by the client to avoid memory leaks when dealing with
-     * GZIPped Ion data.
+     * @return a new iterator instance.
      *
      * @throws NullPointerException if <code>ionData</code> is null.
      * @throws IonException if the source throws {@link IOException}.
-     *
-     * @deprecated auto-detecting of and decompression GZIPped Ion data
-     * will be removed in subsequent releases.
      */
-    public CloseableIterator<IonValue> iterate(InputStream ionData);
+    public Iterator<IonValue> iterate(InputStream ionData);
 
 
     /**
@@ -308,47 +275,32 @@ public SymbolTable newSharedSymbolTable(String name,
      *
      * @param ionText must not be null.
      *
-     * @return a new iterator instance. Closing this iterator will
-     * close the underlying {@link IonReader} created to read ionText.
-     * The iterator automatically closes when there are no more values
-     * to return.
+     * @return a new iterator instance.
      *
      * @throws NullPointerException if <code>ionText</code> is null.
      */
-    public CloseableIterator<IonValue> iterate(String ionText);
+    public Iterator<IonValue> iterate(String ionText);
 
 
     /**
-     * <p>
      * Creates an iterator over Ion data.
      * Values returned by the iterator have no container.
-     * </p>
      * <p>
      * The iterator will automatically consume Ion system IDs and local symbol
      * tables; they will not be returned by the iterator.
-     * </p>
      * <p>
-     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
-     * this feature is deprecated and will be removed in subsequent releases.
-     * </p>
+     * This method will auto-detect and uncompress GZIPped Ion data.
      *
      * @param ionData may be either Ion binary data or (UTF-8) Ion text, or
      * GZIPped Ion data.
      * <em>This method assumes ownership of the array</em> and may modify it at
      * will.
      *
-     * @return a new CloseableIterator<IonValue> instance. Closing this iterator will
-     * close the underlying {@link IonReader} created to read ionData. The iterator
-     * automatically closes when there are no more values to return.
-     * <strong>WARNING:</strong> This instance must be closed by the client
-     * to avoid memory leaks when dealing with GZIPped Ion data.
+     * @return a new iterator instance.
      *
      * @throws NullPointerException if <code>ionData</code> is null.
-     *
-     * @deprecated auto-detecting of and decompression GZIPped Ion data
-     * will be removed in subsequent releases.
      */
-    public CloseableIterator<IonValue> iterate(byte[] ionData);
+    public Iterator<IonValue> iterate(byte[] ionData);
 
 
     /**
@@ -368,14 +320,9 @@ public SymbolTable newSharedSymbolTable(String name,
 
 
     /**
-     * <p>
      * Extracts a single value from Ion text or binary data.
-     * </p>
-     *
      * <p>
-     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
-     * this feature is deprecated and will be removed in subsequent releases.
-     * </p>
+     * This method will auto-detect and uncompress GZIPped Ion data.
      *
      * @param ionData may be either Ion binary data or (UTF-8) Ion text, or
      * GZIPped Ion data.
@@ -389,9 +336,6 @@ public SymbolTable newSharedSymbolTable(String name,
      * values.
      * @throws IonException if the data does not contain exactly one user
      * value.
-     *
-     * @deprecated auto-detecting of and decompression GZIPped Ion data
-     * will be removed in subsequent releases.
      */
     public IonValue singleValue(byte[] ionData);
 
@@ -420,35 +364,22 @@ public SymbolTable newSharedSymbolTable(String name,
     public IonReader newReader(String ionText);
 
     /**
-     * <p>
      * Creates an new {@link IonReader} instance over a block of Ion data,
      * detecting whether it's text or binary data.
-     * </p>
-     *
      * <p>
-     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
-     * this feature is deprecated and will be removed in subsequent releases.
-     * </p>
+     * This method will auto-detect and uncompress GZIPped Ion data.
      *
      * @param ionData may be either Ion binary data, or UTF-8 Ion text.
      * The reader retains a reference to the array, so its data must not be
      * modified while the reader is active.
-     *
-     * @deprecated auto-detecting of and decompression GZIPped Ion data
-     * will be removed in subsequent releases.
      */
     public IonReader newReader(byte[] ionData);
 
     /**
-     * <p>
      * Creates an new {@link IonReader} instance over a block of Ion data,
      * detecting whether it's text or binary data.
-     * </p>
-     *
      * <p>
-     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
-     * this feature is deprecated and will be removed in subsequent releases.
-     * </p>
+     * This method will auto-detect and uncompress GZIPped Ion data.
      *
      * @param ionData is used only within the range of bytes starting at
      * {@code offset} for {@code len} bytes.
@@ -458,26 +389,17 @@ public SymbolTable newSharedSymbolTable(String name,
      * @param offset must be non-negative and less than {@code ionData.length}.
      * @param len must be non-negative and {@code offset+len} must not exceed
      * {@code ionData.length}.
-     *
-     * @deprecated auto-detecting of and decompression GZIPped Ion data
-     * will be removed in subsequent releases.
      */
     public IonReader newReader(byte[] ionData, int offset, int len);
 
     /**
-     * <p>
      * Creates a new {@link IonReader} instance over a stream of Ion data,
      * detecting whether it's text or binary data.
-     *
      * <p>
-     * This method will auto-detect and decompress GZIPped Ion data. <strong>WARNING:</strong>
-     * this feature is deprecated and will be removed in subsequent releases.
-     * </p>
-     *
+     * This method will auto-detect and uncompress GZIPped Ion data.
      * <p>
      * Because this library performs its own buffering, it's recommended that
      * you avoid adding additional buffering to the given stream.
-     * </p>
      *
      * @param ionData must not be null.
      *
@@ -485,9 +407,6 @@ public SymbolTable newSharedSymbolTable(String name,
      * Callers must call {@link IonReader#close()} when finished with it.
      *
      * @throws IonException if the source throws {@link IOException}.
-     *
-     * @deprecated auto-detecting of and decompression GZIPped Ion data
-     * will be removed in subsequent releases.
      */
     public IonReader newReader(InputStream ionData);
 
diff --git a/src/software/amazon/ion/impl/lite/IonLoaderLite.java b/src/software/amazon/ion/impl/lite/IonLoaderLite.java
index 2b96c923bb..1c50234e65 100644
--- a/src/software/amazon/ion/impl/lite/IonLoaderLite.java
+++ b/src/software/amazon/ion/impl/lite/IonLoaderLite.java
@@ -122,34 +122,21 @@ public IonDatagram load(Reader ionText) throws IonException, IOException
 
     public IonDatagram load(byte[] ionData) throws IonException
     {
-        IonReader reader = null;
         try {
-            reader = makeReader(_catalog, ionData, 0, ionData.length, _lstFactory);
+            IonReader reader = makeReader(_catalog, ionData, 0, ionData.length, _lstFactory);
             IonDatagramLite datagram = load_helper(reader);
             return datagram;
         }
         catch (IOException e) {
             throw new IonException(e);
         }
-        finally
-        {
-            if (reader != null) {
-                try {
-                    reader.close();
-                }
-                catch (IOException e) {
-                    throw new IonException(e);
-                }
-            }
-        }
     }
 
     public IonDatagram load(InputStream ionData)
         throws IonException, IOException
     {
-        IonReader reader = null;
         try {
-            reader = makeReader(_catalog, ionData, _lstFactory);
+            IonReader reader = makeReader(_catalog, ionData, _lstFactory);
             IonDatagramLite datagram = load_helper(reader);
             return datagram;
         }
@@ -158,11 +145,6 @@ public IonDatagram load(InputStream ionData)
             if (io != null) throw io;
             throw e;
         }
-        finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
     }
 
 }
diff --git a/src/software/amazon/ion/impl/lite/IonSystemLite.java b/src/software/amazon/ion/impl/lite/IonSystemLite.java
index 601d5ca0e7..ff74dd44ee 100644
--- a/src/software/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/software/amazon/ion/impl/lite/IonSystemLite.java
@@ -14,7 +14,6 @@
 
 package software.amazon.ion.impl.lite;
 
-import software.amazon.ion.CloseableIterator;
 import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 import static software.amazon.ion.SystemSymbols.ION_1_0;
 import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
@@ -171,28 +170,28 @@ public SymbolTable getSystemSymbolTable(String ionVersionId)
         return getSystemSymbolTable();
     }
 
-    public CloseableIterator<IonValue> iterate(Reader ionText)
+    public Iterator<IonValue> iterate(Reader ionText)
     {
         IonReader reader = makeReader(_catalog, ionText, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
 
-    public CloseableIterator<IonValue> iterate(InputStream ionData)
+    public Iterator<IonValue> iterate(InputStream ionData)
     {
         IonReader reader = makeReader(_catalog, ionData, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
 
-    public CloseableIterator<IonValue> iterate(String ionText)
+    public Iterator<IonValue> iterate(String ionText)
     {
         IonReader reader = makeReader(_catalog, ionText, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
 
-    public CloseableIterator<IonValue> iterate(byte[] ionData)
+    public Iterator<IonValue> iterate(byte[] ionData)
     {
         IonReader reader = makeReader(_catalog, ionData, _lstFactory);
         ReaderIterator iterator = new ReaderIterator(this, reader);
@@ -472,38 +471,31 @@ public IonWriter newWriter(IonContainer container)
         return writer;
     }
 
-    private IonValue singleValue(CloseableIterator<IonValue> it)
+    private IonValue singleValue(Iterator<IonValue> it)
     {
+        IonValue value;
         try {
-            IonValue value = it.next();
-            if (it.hasNext()) {
-                throw new IonException("not a single value");
-            }
-            return value;
+            value = it.next();
         }
         catch (NoSuchElementException e) {
             throw new UnexpectedEofException("no value found on input stream");
         }
-        finally {
-            try {
-                it.close();
-            }
-            catch (IOException e) {
-                throw new IonException(e);
-            }
+        if (it.hasNext()) {
+            throw new IonException("not a single value");
         }
+        return value;
     }
 
     public IonValue singleValue(String ionText)
     {
-        CloseableIterator<IonValue> it = iterate(ionText);
+        Iterator<IonValue> it = iterate(ionText);
         return singleValue(it);
     }
 
     public IonValue singleValue(byte[] ionData)
     {
-        CloseableIterator<IonValue> iterator = iterate(ionData);
-        return singleValue(iterator);
+        Iterator<IonValue> it = iterate(ionData);
+        return singleValue(it);
     }
 
     protected IonSymbolLite newSystemIdSymbol(String ionVersionMarker)
@@ -518,7 +510,7 @@ protected IonSymbolLite newSystemIdSymbol(String ionVersionMarker)
     }
 
     static class ReaderIterator
-        implements CloseableIterator<IonValue>
+        implements Iterator<IonValue>, Closeable
     {
         private final IonReader        _reader;
         private final IonSystemLite    _system;
@@ -539,18 +531,7 @@ public boolean hasNext()
             if (_next == null) {
                 _next = _reader.next();
             }
-            boolean hasNext = _next != null;
-
-            if (!hasNext) {
-                try {
-                    close();
-                }
-                catch (IOException e) {
-                    throw new IonException(e);
-                }
-            }
-
-            return hasNext;
+            return (_next != null);
         }
 
         public IonValue next()
@@ -586,10 +567,11 @@ public void remove()
 
         public void close() throws IOException
         {
-            _reader.close();
+            // TODO _reader.close();
         }
     }
 
+
     public IonTimestamp newUtcTimestampFromMillis(long millis)
     {
         IonTimestamp result = newNullTimestamp();
diff --git a/src/software/amazon/ion/system/IonReaderBuilder.java b/src/software/amazon/ion/system/IonReaderBuilder.java
index 10b45d4004..7366ba52d9 100644
--- a/src/software/amazon/ion/system/IonReaderBuilder.java
+++ b/src/software/amazon/ion/system/IonReaderBuilder.java
@@ -160,8 +160,7 @@ private IonCatalog validateCatalog()
      * instance over the given block of Ion data, detecting whether it's text or
      * binary data.
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data. <strong>WARNING:</strong>
-     *      * this feature is deprecated and will be removed in subsequent releases.
+     * This method will auto-detect and uncompress GZIPped Ion data.
      *
      * @param ionData the source of the Ion data, which may be either Ion binary
      * data or UTF-8 Ion text. The reader retains a reference to the array, so
@@ -171,9 +170,6 @@ private IonCatalog validateCatalog()
      * @return a new {@link IonReader} instance; not {@code null}.
      *
      * @see IonSystem#newReader(byte[])
-     *
-     * @deprecated auto-detecting of and decompression GZIPped Ion data will be
-     * removed in subsequent releases.
      */
     public IonReader build(byte[] ionData)
     {
@@ -185,8 +181,7 @@ public IonReader build(byte[] ionData)
      * instance over the given block of Ion data, detecting whether it's text or
      * binary data.
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data. <strong>WARNING:</strong>
-     * this feature is deprecated and will be removed in subsequent releases.
+     * This method will auto-detect and uncompress GZIPped Ion data.
      *
      * @param ionData the source of the Ion data, which is used only within the
      * range of bytes starting at {@code offset} for {@code len} bytes.
@@ -198,9 +193,6 @@ public IonReader build(byte[] ionData)
      * exceed {@code ionData.length}.
      *
      * @see IonSystem#newReader(byte[], int, int)
-     *
-     * @deprecated auto-detecting of and decompression GZIPped Ion data will be
-     * removed in subsequent releases.
      */
     public IonReader build(byte[] ionData, int offset, int length)
     {
@@ -212,8 +204,7 @@ public IonReader build(byte[] ionData, int offset, int length)
      * instance over the given stream of Ion data, detecting whether it's text or
      * binary data.
      * <p>
-     * This method will auto-detect and uncompress GZIPped Ion data. <strong>WARNING:</strong>
-     * this feature is deprecated and will be removed in subsequent releases.
+     * This method will auto-detect and uncompress GZIPped Ion data.
      * <p>
      * Because this library performs its own buffering, it's recommended that
      * users avoid adding additional buffering to the given stream.
@@ -227,10 +218,6 @@ public IonReader build(byte[] ionData, int offset, int length)
      * @throws IonException if the source throws {@link IOException}.
      *
      * @see IonSystem#newReader(InputStream)
-     *
-     * @deprecated auto-detecting of and decompression GZIPped Ion data will be
-     * removed in subsequent releases. Use a {@link java.util.zip.GZIPInputStream}
-     * to process GZIPped Ion data.
      */
     public IonReader build(InputStream ionData)
     {

From 4f2bed5ddaa51f2ec7bd3ba33b1d89f3e7aa6c6d Mon Sep 17 00:00:00 2001
From: Peter Cornell <pcornell@amazon.com>
Date: Fri, 8 Feb 2019 14:00:50 -0800
Subject: [PATCH 045/490] fixes getMillis() and getDecimalMillis() behavior for
 Timestamps constructed via forCalendar() (#213)

---
 src/software/amazon/ion/Timestamp.java      | 23 +++++++++++++++---
 test/software/amazon/ion/TimestampTest.java | 26 +++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/software/amazon/ion/Timestamp.java b/src/software/amazon/ion/Timestamp.java
index 62984161f7..eb1bc13bbc 100644
--- a/src/software/amazon/ion/Timestamp.java
+++ b/src/software/amazon/ion/Timestamp.java
@@ -166,6 +166,9 @@ public boolean includes(Precision isIncluded)
     /**
      * Calendar to hold the Timestamp's year, month, day, hour, minute, second, and calendar system. Fractional
      * seconds are left to {@link #_fraction}, while local offset is left to {@link #_offset}.
+     * <p>
+     * This calendar instance is adjusted such that it is always in UTC;  see _calendarCompensationOffsetMs
+     * if the original "instant" millis is needed.
      */
     private final Calendar _calendar;
 
@@ -180,6 +183,12 @@ public boolean includes(Precision isIncluded)
      */
     private Integer     _offset;
 
+    /**
+     * Number of milliseconds _calendar has been adjusted so that it is in UTC.
+     * Allows getMillis() and getDecimalMillis() to return the correct response.
+     */
+    private int _calendarCompensationOffsetMs;
+
     // Minimum millis under the calendar system provided by the default GregorianCalendar implementation.
     private static final long MINIMUM_TIMESTAMP_IN_MILLIS = Timestamp.valueOf("0001-01-01T00:00:00.000Z").getMillis();
     static final BigDecimal MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL = new BigDecimal(MINIMUM_TIMESTAMP_IN_MILLIS);
@@ -206,12 +215,20 @@ private void apply_offset(int offset)
         offset = -offset;
         int hour_offset = offset / 60;
         int min_offset = offset - (hour_offset * 60);
+
+        // When we add hour_offset and min_offset to _calendar below, the underlying millis "instant"
+        // is changed.  To compensate, we set _calendarCompensationOffsetMs here and use it to
+        // recalculate the correct millis if/when needed
+        if (_calendar.isSet(Calendar.ZONE_OFFSET) || _calendar.isSet(Calendar.DST_OFFSET)) {
+            _calendarCompensationOffsetMs = -offset * 60 * 1000;
+        }
+
         // First, clear the offsets that are already set. Otherwise, the 'add' calls will add them in, which will
         // result in a double add.
         _calendar.clear(Calendar.ZONE_OFFSET);
         _calendar.clear(Calendar.DST_OFFSET);
-        _calendar.add(Calendar.MINUTE, min_offset);
         _calendar.add(Calendar.HOUR_OF_DAY, hour_offset);
+        _calendar.add(Calendar.MINUTE, min_offset);
     }
 
     /**
@@ -1341,7 +1358,7 @@ public long getMillis()
             int frac = isIntegralZero(fracAsDecimal) ? 0 : fracAsDecimal.intValue();
             millis += frac;
         }
-        return millis;
+        return millis + _calendarCompensationOffsetMs;
 
     }
 
@@ -1365,7 +1382,7 @@ public BigDecimal getDecimalMillis()
         case DAY:
         case MINUTE:
         case SECOND:
-            long millis = _calendar.getTimeInMillis();
+            long millis = _calendar.getTimeInMillis() + _calendarCompensationOffsetMs;
             BigDecimal dec = BigDecimal.valueOf(millis);
             if (_fraction != null) {
                 dec = dec.add(this._fraction.movePointRight(3));
diff --git a/test/software/amazon/ion/TimestampTest.java b/test/software/amazon/ion/TimestampTest.java
index 5893f27470..ecf86dff1c 100644
--- a/test/software/amazon/ion/TimestampTest.java
+++ b/test/software/amazon/ion/TimestampTest.java
@@ -30,6 +30,7 @@
 
 import java.math.BigDecimal;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.ZoneId;
@@ -2870,6 +2871,31 @@ public void testGetMillisWithLargeScaleBigDecimal()
         Timestamp.forMillis(LARGE_SCALE_DECIMAL, PST_OFFSET).getMillis();
     }
 
+    @Test
+    public void testMillisIsIndepedentOfOffset() throws ParseException {
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
+        Date date = format.parse("2010-06-29T23:20:00+0000");
+
+        Calendar cal1 = Calendar.getInstance();
+        cal1.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
+        cal1.setTime(date);
+        Timestamp t1 = Timestamp.forCalendar(cal1);
+
+        Calendar cal2 = Calendar.getInstance();
+        cal2.setTimeZone(TimeZone.getTimeZone("GMT+02:00"));
+        cal2.setTime(date);
+        Timestamp t2 = Timestamp.forCalendar(cal2);
+
+        assertEquals(t1.getMillis(), date.getTime());
+        assertEquals(t2.getMillis(), date.getTime());
+
+        assertEquals(BigDecimal.valueOf(t1.getMillis()), t1.getDecimalMillis());
+        assertEquals(BigDecimal.valueOf(t2.getMillis()), t2.getDecimalMillis());
+
+        assertEquals(t1.getMillis(), t2.getMillis());
+        assertEquals(t1.getDecimalMillis(), t2.getDecimalMillis());
+    }
+
     @Test
     public void testInstantVsTimestampMillis() {
         // addresses: https://github.com/amzn/ion-java/issues/165

From 295cda36744d370a0556803408beefe8b40587dc Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Tue, 26 Feb 2019 13:54:48 -0800
Subject: [PATCH 046/490] Bumps version to 1.3.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0747f87d48..8e3b3b2930 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>software.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.3.0</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 3aa8d03cb78c38be3bb9ac2233f6a41fd65d5ef1 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Tue, 26 Feb 2019 14:27:31 -0800
Subject: [PATCH 047/490] Updates README.md to refer to 1.3.0.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 18c5f78708..df313a313d 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>software.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.2.0</version>
+  <version>1.3.0</version>
 </dependency>
 ```
 

From 9bf1cf895cb1e9866c1881c608f049cfff67cf5b Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Tue, 26 Feb 2019 16:23:07 -0800
Subject: [PATCH 048/490] Bumps version to 1.3.1-SNAPSHOT.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8e3b3b2930..9038a710db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>software.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 61fae4297abad87f952a02f56e2b6fcce8dbc353 Mon Sep 17 00:00:00 2001
From: sullis <github@seansullivan.com>
Date: Thu, 28 Feb 2019 11:58:16 -0800
Subject: [PATCH 049/490] Updates to maven-bundle-plugin 4.1.0 (#205)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9038a710db..8fa2bfbb8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,7 +106,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>3.2.0</version>
+        <version>4.1.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

From 875df4e565d5a52089ef21fb1113b670a3115c8c Mon Sep 17 00:00:00 2001
From: freddytuxworth <freddytuxworth@gmail.com>
Date: Thu, 28 Feb 2019 23:41:39 +0000
Subject: [PATCH 050/490] Added tests for software.amazon.ion.impl.IonUTF8
 (#206)

These tests were written using Diffblue Cover.
---
 .../software/amazon/ion/impl/IonUTF8Test.java | 205 ++++++++++++++++++
 1 file changed, 205 insertions(+)
 create mode 100644 test/software/amazon/ion/impl/IonUTF8Test.java

diff --git a/test/software/amazon/ion/impl/IonUTF8Test.java b/test/software/amazon/ion/impl/IonUTF8Test.java
new file mode 100644
index 0000000000..15b09cd9e8
--- /dev/null
+++ b/test/software/amazon/ion/impl/IonUTF8Test.java
@@ -0,0 +1,205 @@
+package software.amazon.ion.impl;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class IonUTF8Test {
+
+    @Test
+    public void testGetScalarReadLengthFromBytes() {
+        Assert.assertEquals(-1, IonUTF8.getScalarReadLengthFromBytes(new byte[] {(byte) -8}, 0, 10));
+        Assert.assertEquals(2, IonUTF8.getScalarReadLengthFromBytes(new byte[] {(byte) -64}, 0, 20));
+        Assert.assertEquals(1, IonUTF8.getScalarReadLengthFromBytes(new byte[] {(byte) 120}, 0, 20));
+        Assert.assertEquals(3, IonUTF8.getScalarReadLengthFromBytes(new byte[] {(byte) -32}, 0, 20));
+        Assert.assertEquals(4, IonUTF8.getScalarReadLengthFromBytes(new byte[] {(byte) -16}, 0, 20));
+        Assert.assertEquals(-1, IonUTF8.getScalarReadLengthFromBytes(new byte[] {(byte) -12, (byte) -128}, 1, 20));
+        Assert.assertEquals(1, IonUTF8.getScalarReadLengthFromBytes(new byte[] {(byte) 112, (byte) 112}, 1, 20));
+        Assert.assertEquals(4, IonUTF8.getScalarReadLengthFromBytes(new byte[] {(byte) -16, (byte) -16}, 1, 20));
+        Assert.assertEquals(3, IonUTF8.getScalarReadLengthFromBytes(new byte[] {(byte) -32, (byte) -32}, 1, 20));
+        Assert.assertEquals(2, IonUTF8.getScalarReadLengthFromBytes(new byte[] {(byte) -64, (byte) -63}, 0, 20));
+    }
+
+    @Test
+    public void testGetScalarFromBytes() {
+        Assert.assertEquals(112, IonUTF8.getScalarFromBytes(new byte[] {112}, 0, 33));
+        Assert.assertEquals(9, IonUTF8.getScalarFromBytes(new byte[] {-63, -120, 20, 30}, 0, 3));
+        Assert.assertEquals(9, IonUTF8.getScalarFromBytes(new byte[] {-31, -120, -64, 50} , 0, 8));
+        Assert.assertEquals(17, IonUTF8.getScalarFromBytes(new byte[] {-15, -112, -128, -128}, 0, 8));
+    }
+
+    @Test
+    public void testIsContinueByteUTF8() {
+        Assert.assertEquals(true, IonUTF8.isContinueByteUTF8(128));
+        Assert.assertEquals(false, IonUTF8.isContinueByteUTF8(0));
+    }
+
+    @Test
+    public void testIsOneByteScalar() {
+        Assert.assertEquals(true, IonUTF8.isOneByteScalar(-2147450752));
+        Assert.assertEquals(false, IonUTF8.isOneByteScalar(128));
+    }
+
+    @Test
+    public void testIsHighSurrogate() {
+        Assert.assertEquals(true, IonUTF8.isHighSurrogate(55296));
+        Assert.assertEquals(false, IonUTF8.isHighSurrogate(0));
+    }
+
+    @Test
+    public void testGetScalarFrom4BytesReversed() {
+        Assert.assertEquals(0, IonUTF8.getScalarFrom4BytesReversed(192));
+        Assert.assertEquals(0, IonUTF8.getScalarFrom4BytesReversed(224));
+        Assert.assertEquals(63, IonUTF8.getScalarFrom4BytesReversed((240<<24) - 64));
+        Assert.assertEquals(0, IonUTF8.getScalarFrom4BytesReversed(192));
+        Assert.assertEquals(0, IonUTF8.getScalarFrom4BytesReversed(240));
+        Assert.assertEquals(0, IonUTF8.getScalarFrom4BytesReversed(0));
+    }
+
+    @Test
+    public void testGetUnicodeScalarFromSurrogates() {
+        Assert.assertEquals(458752, IonUTF8.getUnicodeScalarFromSurrogates(55680, 56320));
+    }
+
+    @Test
+    public void testIsFourByteScalar() {
+        Assert.assertEquals(true, IonUTF8.isFourByteScalar(-2146369535));
+        Assert.assertEquals(false, IonUTF8.isFourByteScalar(1114113));
+    }
+
+    @Test
+    public void testConvertToUTF8Bytes() {
+        byte[] outBytes = new byte[] {13, 13, 13, 13};
+        Assert.assertEquals(1, IonUTF8.convertToUTF8Bytes(32, outBytes, 0, 257));
+        Assert.assertArrayEquals(new byte[] {32, 13, 13, 13}, outBytes);
+        Assert.assertEquals(2, IonUTF8.convertToUTF8Bytes(1026, outBytes,  0, 257));
+        Assert.assertArrayEquals(new byte[] {-48, -126, 13, 13}, outBytes);
+        Assert.assertEquals(3, IonUTF8.convertToUTF8Bytes(3000, outBytes, 0, 257));
+        Assert.assertArrayEquals(new byte[] {-32, -82, -72, 13}, outBytes);
+        Assert.assertEquals(4, IonUTF8.convertToUTF8Bytes(65536, outBytes, 0, 257));
+        Assert.assertArrayEquals(new byte[] {-16, -112, -128, -128}, outBytes);
+    }
+
+    @Test
+    public void testIsFourByteUTF8() {
+        Assert.assertEquals(true, IonUTF8.isFourByteUTF8(240));
+        Assert.assertEquals(false, IonUTF8.isFourByteUTF8(0));
+    }
+
+    @Test
+    public void testIsThreeByteScalar() {
+        Assert.assertEquals(true, IonUTF8.isThreeByteScalar(-2147401728));
+        Assert.assertEquals(false, IonUTF8.isThreeByteScalar(81920));
+    }
+
+    @Test
+    public void testIsSurrogate() {
+        Assert.assertEquals(false, IonUTF8.isSurrogate(57344));
+        Assert.assertEquals(true, IonUTF8.isSurrogate(55300));
+        Assert.assertEquals(false, IonUTF8.isSurrogate(0));
+    }
+
+    @Test
+    public void testIsLowSurrogate() {
+        Assert.assertEquals(true, IonUTF8.isLowSurrogate(56320));
+        Assert.assertEquals(false, IonUTF8.isLowSurrogate(0));
+    }
+
+    @Test
+    public void testGetAs4BytesReversed() {
+        Assert.assertEquals(-48, IonUTF8.getAs4BytesReversed(1024));
+        Assert.assertEquals(-24, IonUTF8.getAs4BytesReversed(32768));
+        Assert.assertEquals(-16, IonUTF8.getAs4BytesReversed(66560));
+        Assert.assertEquals(0, IonUTF8.getAs4BytesReversed(0));
+    }
+
+    @Test
+    public void testTwoByteScalar() {
+        Assert.assertEquals('\u0000', IonUTF8.twoByteScalar(0, 0));
+    }
+
+    @Test
+    public void testIsTwoByteScalar() {
+        Assert.assertEquals(true, IonUTF8.isTwoByteScalar(-2147481600));
+        Assert.assertEquals(false, IonUTF8.isTwoByteScalar(2048));
+    }
+
+    @Test
+    public void testIsTwoByteUTF8() {
+        Assert.assertEquals(true, IonUTF8.isTwoByteUTF8(192));
+        Assert.assertEquals(false, IonUTF8.isTwoByteUTF8(0));
+    }
+
+    @Test
+    public void testGetUTF8ByteCount() {
+        Assert.assertEquals(3, IonUTF8.getUTF8ByteCount(2048));
+        Assert.assertEquals(4, IonUTF8.getUTF8ByteCount(67584));
+        Assert.assertEquals(2, IonUTF8.getUTF8ByteCount(1024));
+        Assert.assertEquals(1, IonUTF8.getUTF8ByteCount(0));
+    }
+
+    @Test
+    public void testPackBytesAfter1() {
+        Assert.assertEquals(-128, IonUTF8.packBytesAfter1(0, 2));
+        Assert.assertEquals(-128, IonUTF8.packBytesAfter1(0, 3));
+        Assert.assertEquals(-128, IonUTF8.packBytesAfter1(0, 4));
+        Assert.assertEquals(-128, IonUTF8.packBytesAfter1(0, 3));
+        Assert.assertEquals(-128, IonUTF8.packBytesAfter1(0, 4));
+    }
+
+    @Test
+    public void testGetUTF8LengthFromFirstByte() {
+        Assert.assertEquals(-1, IonUTF8.getUTF8LengthFromFirstByte(128));
+        Assert.assertEquals(2, IonUTF8.getUTF8LengthFromFirstByte(192));
+        Assert.assertEquals(4, IonUTF8.getUTF8LengthFromFirstByte(240));
+        Assert.assertEquals(3, IonUTF8.getUTF8LengthFromFirstByte(224));
+        Assert.assertEquals(1, IonUTF8.getUTF8LengthFromFirstByte(0));
+    }
+
+    @Test
+    public void testIsOneByteUTF8() {
+        Assert.assertEquals(false, IonUTF8.isOneByteUTF8(128));
+        Assert.assertEquals(true, IonUTF8.isOneByteUTF8(0));
+    }
+
+    @Test
+    public void testIsThreeByteUTF8() {
+        Assert.assertEquals(true, IonUTF8.isThreeByteUTF8(224));
+        Assert.assertEquals(false, IonUTF8.isThreeByteUTF8(0));
+    }
+
+    @Test
+    public void testLowSurrogate() {
+        Assert.assertEquals('\udc00', IonUTF8.lowSurrogate(73728));
+        Assert.assertEquals('\udfc4', IonUTF8.lowSurrogate(131012));
+    }
+
+    @Test
+    public void testHighSurrogate() {
+        Assert.assertEquals('\ud808', IonUTF8.highSurrogate(73728));
+        Assert.assertEquals('\ud83f', IonUTF8.highSurrogate(131012));
+    }
+
+    @Test
+    public void testNeedsSurrogateEncoding() {
+        Assert.assertEquals(true, IonUTF8.needsSurrogateEncoding(65536));
+        Assert.assertEquals(false, IonUTF8.needsSurrogateEncoding(0));
+    }
+
+    @Test
+    public void testIsStartByte() {
+        Assert.assertEquals(true, IonUTF8.isStartByte(-2147483648));
+        Assert.assertEquals(true, IonUTF8.isStartByte(-2147483520));
+        Assert.assertEquals(false, IonUTF8.isStartByte(128));
+        Assert.assertEquals(true, IonUTF8.isStartByte(0));
+    }
+
+    @Test
+    public void testThreeByteScalar() {
+        Assert.assertEquals(4227, IonUTF8.threeByteScalar(1, 2, 3));
+    }
+
+    @Test
+    public void testFourByteScalar() {
+        Assert.assertEquals(270532, IonUTF8.fourByteScalar(1, 2, 3, 4));
+    }
+}

From ef74f881423aea237a751b7d19460a3b805e6d16 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 27 Feb 2019 18:05:55 -0800
Subject: [PATCH 051/490] Reverts replacing Timestamp internals with Calendar.

The additional memory pressure caused by backing Timestamp
by Calendar was noticeable by heavy users of Timestamp.

Keeps the other bug fixes from that commit (see #160, #163,
and most of #165).
---
 src/software/amazon/ion/Timestamp.java      | 862 +++++++++++---------
 test/software/amazon/ion/TimestampTest.java |  25 +-
 2 files changed, 510 insertions(+), 377 deletions(-)

diff --git a/src/software/amazon/ion/Timestamp.java b/src/software/amazon/ion/Timestamp.java
index eb1bc13bbc..1dcd2587f2 100644
--- a/src/software/amazon/ion/Timestamp.java
+++ b/src/software/amazon/ion/Timestamp.java
@@ -68,16 +68,6 @@
  *   <li>{@code 2009-01-01T00:00:00.000Z} <em>etc.</em></li>
  * </ul>
  *
- *
- * <h4>Date Arithmetic and Leap Years</h4>
- * Date arithmetic is performed according to the logic provided by
- * {@link Calendar#add(int, int)}. When constructed by {@link Timestamp#forCalendar(Calendar)}
- * the new Timestamp and any other Timestamps that spawn from it (e.g. through
- * {@link #clone()}, {@link #addDay(int)}, etc.) will use the given Calendar's date arithmetic
- * rules, including its rules for determining leap years. When constructed without a
- * Calendar, a default GregorianCalendar (as constructed by
- * <code>new GregorianCalendar(TimeZone.getTimeZone("UTC"))</code> will be used.
- *
  * @see #equals(Timestamp)
  * @see #compareTo(Timestamp)
  */
@@ -94,6 +84,18 @@ public final class Timestamp
     private static final int NO_SECONDS = 0;
     private static final BigDecimal NO_FRACTIONAL_SECONDS = null;
 
+    // 0001-01-01T00:00:00.0Z in millis
+    static final long MINIMUM_TIMESTAMP_IN_MILLIS = -62135769600000L;
+
+    // 0001-01-01T00:00:00.0Z in millis
+    static final BigDecimal MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL = new BigDecimal(MINIMUM_TIMESTAMP_IN_MILLIS);
+
+    // 10000T in millis, upper bound exclusive
+    static final long MAXIMUM_TIMESTAMP_IN_MILLIS = 253402300800000L;
+
+    // 10000T in millis, upper bound exclusive
+    static final BigDecimal MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL = new BigDecimal(MAXIMUM_TIMESTAMP_IN_MILLIS);
+
     /**
      * Unknown local offset from UTC.
      */
@@ -163,19 +165,16 @@ public boolean includes(Precision isIncluded)
      */
     private Precision   _precision;
 
-    /**
-     * Calendar to hold the Timestamp's year, month, day, hour, minute, second, and calendar system. Fractional
-     * seconds are left to {@link #_fraction}, while local offset is left to {@link #_offset}.
-     * <p>
-     * This calendar instance is adjusted such that it is always in UTC;  see _calendarCompensationOffsetMs
-     * if the original "instant" millis is needed.
-     */
-    private final Calendar _calendar;
-
-    /**
-     * Fractional seconds. Must be within range [0, 1).
-     */
-    private BigDecimal  _fraction;
+    // These are the time field values for the Timestamp.
+    // _month and _day are 1-based (0 is an invalid value for
+    // these in a non-null Timestamp).
+    private short       _year;
+    private byte        _month = 1; // Initialized to valid default
+    private byte        _day   = 1; // Initialized to valid default
+    private byte        _hour;
+    private byte        _minute;
+    private byte        _second;
+    private BigDecimal  _fraction;  // fractional seconds, must be within range [0, 1)
 
     /**
      * Minutes offset from UTC; zero means UTC proper,
@@ -183,24 +182,39 @@ public boolean includes(Precision isIncluded)
      */
     private Integer     _offset;
 
-    /**
-     * Number of milliseconds _calendar has been adjusted so that it is in UTC.
-     * Allows getMillis() and getDecimalMillis() to return the correct response.
-     */
-    private int _calendarCompensationOffsetMs;
-
-    // Minimum millis under the calendar system provided by the default GregorianCalendar implementation.
-    private static final long MINIMUM_TIMESTAMP_IN_MILLIS = Timestamp.valueOf("0001-01-01T00:00:00.000Z").getMillis();
-    static final BigDecimal MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL = new BigDecimal(MINIMUM_TIMESTAMP_IN_MILLIS);
-
-    // 10000T in millis, upper bound exclusive, under the calendar system provided by the default GregorianCalendar implementation.
-    private static final long UPPER_BOUND_TIMESTAMP_IN_MILLIS = Timestamp.valueOf("9999-12-31T23:59:59.999-00:00").getMillis() + 1;
-    static final BigDecimal UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL = new BigDecimal(UPPER_BOUND_TIMESTAMP_IN_MILLIS);
+                                                      //   jan, feb, mar, apr, may, jun, jul, aug, sep, oct, nov, dec
+                                                      // the first 0 is to make these arrays 1 based (since month values are 1-12)
+    private static final int[] LEAP_DAYS_IN_MONTH   = { 0,  31,  29,  31,  30,  31,  30,  31,  31,  30,  31,  30,  31 };
+    private static final int[] NORMAL_DAYS_IN_MONTH = { 0,  31,  28,  31,  30,  31,  30,  31,  31,  30,  31,  30,  31 };
+
+    private static int last_day_in_month(int year, int month) {
+        boolean is_leap;
+        if ((year % 4) == 0) {
+            // divisible by 4 (lower 2 bits are zero) - may be a leap year
+            if ((year % 100) == 0) {
+                // and divisible by 100 - not a leap year
+                if ((year % 400) == 0) {
+                    // but divisible by 400 - then it is a leap year
+                    is_leap = true;
+                }
+                else {
+                    is_leap = false;
+                }
+            }
+            else {
+                is_leap = true;
+            }
+        }
+        else {
+            is_leap = false;
+        }
+        return is_leap ? LEAP_DAYS_IN_MONTH[month] : NORMAL_DAYS_IN_MONTH[month];
+    }
 
     /**
      * Applies the local time zone offset from UTC to the applicable time field
      * values. Depending on the local time zone offset, adjustments
-     * (i.e. rollover) will be made to the calendar's year, day, hour, and minute
+     * (i.e. rollover) will be made to the Year, Day, Hour, Minute time field
      * values.
      *
      * @param offset the local offset, in minutes from UTC.
@@ -216,87 +230,181 @@ private void apply_offset(int offset)
         int hour_offset = offset / 60;
         int min_offset = offset - (hour_offset * 60);
 
-        // When we add hour_offset and min_offset to _calendar below, the underlying millis "instant"
-        // is changed.  To compensate, we set _calendarCompensationOffsetMs here and use it to
-        // recalculate the correct millis if/when needed
-        if (_calendar.isSet(Calendar.ZONE_OFFSET) || _calendar.isSet(Calendar.DST_OFFSET)) {
-            _calendarCompensationOffsetMs = -offset * 60 * 1000;
+        if (offset < 0) {
+            _minute += min_offset;  // lower the minute value by adding a negative offset
+            _hour += hour_offset;
+            if (_minute < 0) {
+                _minute += 60;
+                _hour -= 1;
+            }
+            if (_hour >= 0) return;  // hour is 0-23
+            _hour += 24;
+            _day -= 1;
+            if (_day >= 1) return;  // day is 1-31
+            // we can't do this until we've figured out the month and year: _day += last_day_in_month(_year, _month);
+            _month -= 1;
+            if (_month >= 1) {
+                _day += last_day_in_month(_year, _month);  // now we know (when the year doesn't change
+                assert(_day == last_day_in_month(_year, _month));
+                return;  // 1-12
+            }
+            _month += 12;
+            _year -= 1;
+            if (_year < 1) throw new IllegalArgumentException("year is less than 1");
+            _day += last_day_in_month(_year, _month);  // and now we know, even if the year did change
+            assert(_day == last_day_in_month(_year, _month));
+        }
+        else {
+            _minute += min_offset;  // lower the minute value by adding a negative offset
+            _hour += hour_offset;
+            if (_minute > 59) {
+                _minute -= 60;
+                _hour += 1;
+            }
+            if (_hour < 24) return;  // hour is 0-23
+            _hour -= 24;
+            _day += 1;
+            if (_day <= last_day_in_month(_year, _month)) return;  // day is 1-31
+            // we can't do this until we figure out the final month and year: _day -= last_day_in_month(_year, _month);
+            _day = 1; // this is always the case
+            _month += 1;
+            if (_month <= 12) {
+                return;  // 1-12
+            }
+            _month -= 12;
+            _year += 1;
+            if (_year > 9999) throw new IllegalArgumentException("year exceeds 9999");
+        }
+    }
+
+    private static byte requireByte(int value, String location) {
+        if (value > Byte.MAX_VALUE || value < Byte.MIN_VALUE) {
+            throw new IllegalArgumentException(String.format("%s of %d is out of range.", location, value));
         }
+        return (byte) value;
+    }
 
-        // First, clear the offsets that are already set. Otherwise, the 'add' calls will add them in, which will
-        // result in a double add.
-        _calendar.clear(Calendar.ZONE_OFFSET);
-        _calendar.clear(Calendar.DST_OFFSET);
-        _calendar.add(Calendar.HOUR_OF_DAY, hour_offset);
-        _calendar.add(Calendar.MINUTE, min_offset);
+    private static short requireShort(int value, String location) {
+        if (value > Short.MAX_VALUE || value < Short.MIN_VALUE) {
+            throw new IllegalArgumentException(String.format("%s of %d is out of range.", location, value));
+        }
+        return (short) value;
     }
 
     /**
-     * Create a Calendar from a number of milliseconds and the given local offset.
-     * @param millis a number of epoch milliseconds.
-     * @param localOffset a local offset in minutes.
-     * @return a new Calendar.
+     * This method uses deprecated methods from {@link java.util.Date}
+     * instead of {@link Calendar} so that this code can be used (more easily)
+     * on the mobile Java platform (which has Date but does not have Calendar).
      */
-    private static Calendar calendarFromMillis(long millis, Integer localOffset) {
-        Calendar calendar = new GregorianCalendar(PrivateUtils.UTC);
-        calendar.clear();
-        calendar.setTimeInMillis(millis);
-        if (localOffset != null) {
-            calendar.set(Calendar.ZONE_OFFSET, localOffset * 60 * 1000);
+    @SuppressWarnings("deprecation")
+    private void set_fields_from_millis(long millis)
+    {
+        if(millis < MINIMUM_TIMESTAMP_IN_MILLIS){
+            throw new IllegalArgumentException("year is less than 1");
         }
-        return calendar;
+
+        Date date = new Date(millis);
+
+        // The Date getters return values in the Date's time zone (i.e. the system time zone).
+        // The components need to be converted to UTC before being validated for exact ranges, because the offset
+        // conversion can affect which values are considered valid. Simply verify that the values can fit in the
+        // destination type here. If they do not, they would be out of range no matter the offset.
+        _minute = requireByte(date.getMinutes(), "Minute");
+        _second = requireByte(date.getSeconds(), "Second");
+        _hour = requireByte(date.getHours(), "Hour");
+        _day = requireByte(date.getDate(), "Day");
+        _month = requireByte(date.getMonth() + 1, "Month");
+
+        // Date does not correctly handle year values that represent year 0 or earlier in the system time zone through
+        // getYear(). This case is detected and forced to zero.
+        int offset = -date.getTimezoneOffset();
+        if(offset < 0 && MINIMUM_TIMESTAMP_IN_MILLIS - offset > millis) {
+            _year = 0;
+        } else {
+            _year = requireShort(date.getYear() + 1900, "Year");
+        }
+
+        // Now apply the offset to convert the components to UTC.
+        apply_offset(offset);
+
+        // Now that all components are in UTC, they may be validated for exact ranges.
+        this._year    = checkAndCastYear(_year);
+        this._month   = checkAndCastMonth(_month);
+        this._day     = checkAndCastDay(_day, _year, _month);
+        this._hour    = checkAndCastHour(_hour);
+        this._minute  = checkAndCastMinute(_minute);
+        this._second  = checkAndCastSecond(_second);
     }
 
     /**
      * Copies data from a {@link Calendar} into this timestamp.
      * Must only be called during construction due to timestamp immutabliity.
      *
-     * @param setLocalOffset if true and the given calendar has its ZONE_OFFSET set, sets the timestamp's _offset field.
-     * @param applyLocalOffset if true and _offset has been set to a known offset, applies the local offset to the
-     *                         timestamp's fields to convert them from local time to UTC. This should be false whenever
-     *                         the given calendar is already in UTC (such as when it was constructed from millis).
+     * @param cal must have at least one field set.
      *
      * @throws IllegalArgumentException if the calendar has no fields set.
      */
-    private void setFieldsFromCalendar(Precision precision,
-                                       boolean setLocalOffset,
-                                       boolean applyLocalOffset)
+    private void set_fields_from_calendar(Calendar cal,
+                                          Precision precision,
+                                          boolean setLocalOffset)
     {
         _precision = precision;
         _offset = UNKNOWN_OFFSET;
-        boolean calendarHasMilliseconds = _calendar.isSet(Calendar.MILLISECOND);
+        boolean dayPrecision = false;
+        boolean calendarHasMilliseconds = cal.isSet(Calendar.MILLISECOND);
 
         switch (this._precision) {
             case SECOND:
+                this._second = checkAndCastSecond(cal.get(Calendar.SECOND));
                 if (calendarHasMilliseconds) {
-                    BigDecimal millis = BigDecimal.valueOf(_calendar.get(Calendar.MILLISECOND));
+                    BigDecimal millis = BigDecimal.valueOf(cal.get(Calendar.MILLISECOND));
                     this._fraction = millis.movePointLeft(3); // convert to fraction
                     checkFraction(precision, this._fraction);
                 }
             case MINUTE:
             {
-                int offset = _calendar.get(Calendar.ZONE_OFFSET);
-                if (setLocalOffset)
+                this._hour   = checkAndCastHour(cal.get(Calendar.HOUR_OF_DAY));
+                this._minute = checkAndCastMinute(cal.get(Calendar.MINUTE));
+
+                // If this test is made before calling get(), it will return
+                // false even when Calendar.setTimeZone() was called.
+                if (setLocalOffset && cal.isSet(Calendar.ZONE_OFFSET))
                 {
-                    if (_calendar.isSet(Calendar.DST_OFFSET)) {
-                        offset += _calendar.get(Calendar.DST_OFFSET);
+                    int offset = cal.get(Calendar.ZONE_OFFSET);
+                    if (cal.isSet(Calendar.DST_OFFSET)) {
+                        offset += cal.get(Calendar.DST_OFFSET);
                     }
+
                     // convert ms to minutes
                     _offset = offset / (1000*60);
                 }
             }
             case DAY:
+                dayPrecision = true;
             case MONTH:
+                // Calendar months are 0 based, Timestamp months are 1 based
+                this._month  = checkAndCastMonth((cal.get(Calendar.MONTH) + 1));
             case YEAR:
+                int year;
+                if(cal.get(Calendar.ERA) == GregorianCalendar.AD) {
+                    year = cal.get(Calendar.YEAR);
+                }
+                else {
+                    year = -cal.get(Calendar.YEAR);
+                }
+
+                this._year = checkAndCastYear(year);
+        }
+
+        if (dayPrecision)
+        {
+            this._day = checkAndCastDay(cal.get(Calendar.DAY_OF_MONTH), _year, _month);
         }
 
-        if (_offset != UNKNOWN_OFFSET && applyLocalOffset) {
+        if (_offset != UNKNOWN_OFFSET) {
             // Transform our members from local time to Zulu
             this.apply_offset(_offset);
         }
-        // fractional seconds are ONLY tracked by the _fraction field.
-        _calendar.clear(Calendar.MILLISECOND);
-        checkCalendarYear(_calendar);
     }
 
     /**
@@ -393,8 +501,6 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
                       int zhour, int zminute, int zsecond, BigDecimal frac,
                       Integer offset, boolean shouldApplyOffset)
     {
-        _calendar = new GregorianCalendar(PrivateUtils.UTC);
-        _calendar.clear();
         boolean dayPrecision = false;
 
         switch (p) {
@@ -409,23 +515,22 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
             {
                 _fraction = frac.abs();
             }
-            _calendar.set(Calendar.SECOND, checkAndCastSecond(zsecond));
+            _second = checkAndCastSecond(zsecond);
         case MINUTE:
-            _calendar.set(Calendar.MINUTE, checkAndCastMinute(zminute));
-            _calendar.set(Calendar.HOUR_OF_DAY, checkAndCastHour(zhour));
+            _minute = checkAndCastMinute(zminute);
+            _hour   = checkAndCastHour(zhour);
             _offset = offset;      // offset must be null for years/months/days
         case DAY:
              dayPrecision = true;
         case MONTH:
-            _calendar.set(Calendar.MONTH, checkAndCastMonth(zmonth) - 1);
+            _month  = checkAndCastMonth(zmonth);
         case YEAR:
-            _calendar.set(Calendar.YEAR, checkAndCastYear(zyear));
+            _year   = checkAndCastYear(zyear);
         }
 
         if (dayPrecision)
         {
-            checkCalendarDay(zday);
-            _calendar.set(Calendar.DAY_OF_MONTH, zday);
+            _day    = checkAndCastDay(zday, zyear, zmonth);
         }
 
         _precision = checkFraction(p, _fraction);
@@ -442,21 +547,19 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
      * applied</em> to the time components.
      * As such, if the given {@code offset} is non-null or zero, the resulting
      * Timestamp will have time values that <em>DO NOT</em> match the time
-     * parameters. A default {@link GregorianCalendar} will be used to
-     * perform any arithmetic operations on the resulting Timestamp. This
-     * method also has a behavior of precision "narrowing", detailed in the
-     * sub-section below.
+     * parameters. This method also has a behavior of precision "narrowing",
+     * detailed in the sub-section below.
      *
      * <p>
      * For example, the following method calls will return Timestamps with
      * values (in its local time) respectively:
      *<pre>
-     * createFromUtcFields(Precision.FRACTION, 2012, 2, 3, 4, 5, 6, 0.007, <b>null</b>)    will return 2012-02-03T04:05:06.007-00:00 (match)
-     * createFromUtcFields(Precision.FRACTION, 2012, 2, 3, 4, 5, 6, 0.007, <b>0</b>)       will return 2012-02-03T04:05:06.007+00:00 (match)
-     * createFromUtcFields(Precision.FRACTION, 2012, 2, 3, 4, 5, 6, 0.007, <b>480</b>)     will return 2012-02-03T<b>12</b>:05:06.007<b>+08:00</b> (do not match)
-     * createFromUtcFields(Precision.FRACTION, 2012, 2, 3, 4, 5, 6, 0.007, <b>-480</b>)    will return 2012-02-<b>02</b>T<b>20</b>:05:06.007<b>-08:00</b> (do not match)
-     * createFromUtcFields(Precision.FRACTION, 2012, 2, 3, 4, 5, 6, 0.007, <b>720</b>)     will return 2012-02-03T<b>16</b>:05:06.007<b>+12:00</b> (do not match)
-     * createFromUtcFields(Precision.FRACTION, 2012, 2, 3, 4, 5, 6, 0.007, <b>-720</b>)    will return 2012-02-<b>02</b>T<b>16</b>:05:06.007<b>-12:00</b> (do not match)
+     * createFromUtcFields(Precision.SECOND, 2012, 2, 3, 4, 5, 6, 0.007, <b>null</b>)    will return 2012-02-03T04:05:06.007-00:00 (match)
+     * createFromUtcFields(Precision.SECOND, 2012, 2, 3, 4, 5, 6, 0.007, <b>0</b>)       will return 2012-02-03T04:05:06.007+00:00 (match)
+     * createFromUtcFields(Precision.SECOND, 2012, 2, 3, 4, 5, 6, 0.007, <b>480</b>)     will return 2012-02-03T<b>12</b>:05:06.007<b>+08:00</b> (do not match)
+     * createFromUtcFields(Precision.SECOND, 2012, 2, 3, 4, 5, 6, 0.007, <b>-480</b>)    will return 2012-02-<b>02</b>T<b>20</b>:05:06.007<b>-08:00</b> (do not match)
+     * createFromUtcFields(Precision.SECOND, 2012, 2, 3, 4, 5, 6, 0.007, <b>720</b>)     will return 2012-02-03T<b>16</b>:05:06.007<b>+12:00</b> (do not match)
+     * createFromUtcFields(Precision.SECOND, 2012, 2, 3, 4, 5, 6, 0.007, <b>-720</b>)    will return 2012-02-<b>02</b>T<b>16</b>:05:06.007<b>-12:00</b> (do not match)
      *</pre>
      * Note: All of these resulting Timestamps have the similar value (in UTC) 2012-02-03T04:05:06.007Z.
      *
@@ -474,8 +577,8 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
      * createFromUtcFields(<b>Precision.MONTH</b>   , 2012, 2, 3, 4, 5, 6, 0.007, 0)    will return 2012-02T
      * createFromUtcFields(<b>Precision.DAY</b>     , 2012, 2, 3, 4, 5, 6, 0.007, 0)    will return 2012-02-03T
      * createFromUtcFields(<b>Precision.MINUTE</b>  , 2012, 2, 3, 4, 5, 6, 0.007, 0)    will return 2012-02-03T04:05Z
-     * createFromUtcFields(<b>Precision.SECOND</b>  , 2012, 2, 3, 4, 5, 6, 0.007, 0)    will return 2012-02-03T04:05:06Z
-     * createFromUtcFields(<b>Precision.FRACTION</b>, 2012, 2, 3, 4, 5, 6, 0.007, 0)    will return 2012-02-03T04:05:06.007Z
+     * createFromUtcFields(<b>Precision.SECOND</b>  , 2012, 2, 3, 4, 5, 6,  null, 0)    will return 2012-02-03T04:05:06Z
+     * createFromUtcFields(<b>Precision.SECOND</b>  , 2012, 2, 3, 4, 5, 6, 0.007, 0)    will return 2012-02-03T04:05:06.007Z
      *</pre>
      *
      * @param p the desired timestamp precision. The result may have a
@@ -541,50 +644,51 @@ else if (cal.isSet(Calendar.YEAR)) {
         else {
             throw new IllegalArgumentException("Calendar has no fields set");
         }
-        _calendar = (Calendar) cal.clone();
-        setFieldsFromCalendar(precision, true, APPLY_OFFSET_YES);
+
+        set_fields_from_calendar(cal, precision, true);
     }
 
 
     private Timestamp(Calendar cal, Precision precision, BigDecimal fraction,
                       Integer offset)
     {
-        this._calendar = cal;
-        setFieldsFromCalendar(precision, false, APPLY_OFFSET_NO);
+        set_fields_from_calendar(cal, precision, false);
         _fraction = fraction;
         if (offset != null)
         {
             _offset = offset;
+            apply_offset(offset);
         }
     }
 
-    private static void throwTimestampOutOfRangeError(Number millis) {
-        throw new IllegalArgumentException("millis: " + millis + " is outside of valid the range: from "
-                + MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL
-                + " (0001T)"
-                + ", inclusive, to "
-                + UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL
-                + " (10000T)"
-                + " , exclusive");
-    }
 
     private Timestamp(BigDecimal millis, Precision precision, Integer localOffset)
     {
-        if (millis == null) throw new NullPointerException("millis is null");
-
         // check bounds to avoid hanging when calling longValue() on decimals with large positive exponents,
         // e.g. 1e10000000
         if(millis.compareTo(MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL) < 0 ||
-                UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL.compareTo(millis) <= 0) {
+                MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL.compareTo(millis) <= 0) {
             throwTimestampOutOfRangeError(millis);
         }
-
         // quick handle integral zero
         long ms = isIntegralZero(millis) ? 0 : millis.longValue();
+        set_fields_from_millis(ms);
 
-        _calendar = calendarFromMillis(ms, localOffset);
-        setFieldsFromCalendar(precision, localOffset != null, APPLY_OFFSET_NO);
+        switch (precision)
+        {
+            case YEAR:
+                _month  = 1;
+            case MONTH:
+                _day    = 1;
+            case DAY:
+                _hour   = 0;
+                _minute = 0;
+            case MINUTE:
+                _second = 0;
+            case SECOND:
+        }
 
+        _offset = localOffset;
         // The given BigDecimal may contain greater than milliseconds precision, which is the maximum precision that
         // a Calendar can handle. Set the _fraction here so that extra precision (if any) is not lost.
         // However, don't set the fraction if the given BigDecimal does not have precision at least to the tenth of
@@ -596,7 +700,7 @@ private Timestamp(BigDecimal millis, Precision precision, Integer localOffset)
         } else {
             _fraction = null;
         }
-        checkFraction(precision, _fraction);
+        _precision = checkFraction(precision, _fraction);
     }
 
 
@@ -635,7 +739,32 @@ private Timestamp(BigDecimal millis, Precision precision, Integer localOffset)
     @Deprecated
     private Timestamp(BigDecimal millis, Integer localOffset)
     {
-        this(millis, Precision.SECOND, localOffset);
+        if (millis == null) throw new NullPointerException("millis is null");
+
+        // check bounds to avoid hanging when calling longValue() on decimals with large positive exponents,
+        // e.g. 1e10000000
+        if(millis.compareTo(MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL) < 0 ||
+            MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL.compareTo(millis) < 0) {
+            throwTimestampOutOfRangeError(millis);
+        }
+
+        // quick handle integral zero
+        long ms = isIntegralZero(millis) ? 0 : millis.longValue();
+
+        set_fields_from_millis(ms);
+
+        int scale = millis.scale();
+        if (scale <= -3) {
+            this._precision = Precision.SECOND;
+            this._fraction = null;
+        }
+        else {
+            BigDecimal secs = millis.movePointLeft(3);
+            BigDecimal secsDown = fastRoundZeroFloor(secs);
+            this._fraction = secs.subtract(secsDown);
+            this._precision = checkFraction(Precision.SECOND, _fraction);
+        }
+        this._offset = localOffset;
     }
 
     private BigDecimal fastRoundZeroFloor(final BigDecimal decimal) {
@@ -651,6 +780,16 @@ private boolean isIntegralZero(final BigDecimal decimal) {
             || (decimal.precision() - decimal.scale() <= 0);
     }
 
+    private static void throwTimestampOutOfRangeError(Number millis) {
+        throw new IllegalArgumentException("millis: " + millis + " is outside of valid the range: from "
+                + MINIMUM_TIMESTAMP_IN_MILLIS
+                + " (0001T)"
+                + ", inclusive, to "
+                + MAXIMUM_TIMESTAMP_IN_MILLIS
+                + " (10000T)"
+                + " , exclusive");
+    }
+
     /**
      * Creates a new Timestamp that represents the point in time that is
      * {@code millis} milliseconds from the epoch, with a given local offset.
@@ -666,11 +805,18 @@ private boolean isIntegralZero(final BigDecimal decimal) {
     @Deprecated
     private Timestamp(long millis, Integer localOffset)
     {
-        if(millis < MINIMUM_TIMESTAMP_IN_MILLIS || millis >= UPPER_BOUND_TIMESTAMP_IN_MILLIS) {
+        if(millis < MINIMUM_TIMESTAMP_IN_MILLIS || millis >= MAXIMUM_TIMESTAMP_IN_MILLIS) {
             throwTimestampOutOfRangeError(millis);
         }
-        this._calendar = calendarFromMillis(millis, localOffset);
-        setFieldsFromCalendar(Precision.SECOND, localOffset != null, APPLY_OFFSET_NO);
+        this.set_fields_from_millis(millis);
+
+        // fractional seconds portion
+        BigDecimal secs = BigDecimal.valueOf(millis).movePointLeft(3);
+        BigDecimal secsDown = secs.setScale(0, RoundingMode.FLOOR);
+        this._fraction = secs.subtract(secsDown);
+        this._precision = checkFraction(Precision.SECOND, _fraction);
+
+        this._offset = localOffset;
     }
 
 
@@ -699,8 +845,6 @@ private static IllegalArgumentException fail(CharSequence input)
     /**
      * Returns a new Timestamp that represents the point in time, precision
      * and local offset defined in Ion format by the {@link CharSequence}.
-     * A default {@link GregorianCalendar} will be used to perform any
-     * arithmetic operations on the resulting Timestamp.
      *
      * @param ionFormattedTimestamp
      *          a sequence of characters that is the Ion representation of a
@@ -964,15 +1108,27 @@ private static boolean isValidFollowChar(char c) {
 
     /**
      * Creates a copy of this Timestamp. The resulting Timestamp will
-     * represent the same point in time, have the same precision and local
-     * offset, and use the same calendar system for date arithmetic.
+     * represent the same point in time and has the same precision and local
+     * offset.
      * <p>
      * {@inheritDoc}
      */
     @Override
     public Timestamp clone()
     {
-        return new Timestamp((Calendar) _calendar.clone(), _precision, _fraction, _offset);
+        // The Copy-Constructor we're using here already expects the time field
+        // values to be in UTC, and that is already what we have for this
+        // Timestamp -- no adjustment necessary to make it local time.
+        return new Timestamp(_precision,
+                             _year,
+                             _month,
+                             _day,
+                             _hour,
+                             _minute,
+                             _second,
+                             _fraction,
+                             _offset,
+                             APPLY_OFFSET_NO);
     }
 
     /**
@@ -988,7 +1144,22 @@ private Timestamp make_localtime()
             ? _offset.intValue()
             : 0;
 
-        Timestamp localtime = clone();
+        // We use a Copy-Constructor that expects the time parameters to be in
+        // UTC, as that's what we're supposed to have.
+        // As this Copy-Constructor doesn't apply local offset to the time
+        // field values (it assumes that the local offset is already applied to
+        // them), we explicitly apply the local offset to the time field values
+        // after we obtain the new Timestamp instance.
+        Timestamp localtime = new Timestamp(_precision,
+                                            _year,
+                                            _month,
+                                            _day,
+                                            _hour,
+                                            _minute,
+                                            _second,
+                                            _fraction,
+                                            _offset,
+                                            APPLY_OFFSET_NO);
         // explicitly apply the local offset to the time field values
         localtime.apply_offset(-offset);
 
@@ -999,8 +1170,6 @@ private Timestamp make_localtime()
 
     /**
      * Returns a Timestamp, precise to the year, with unknown local offset.
-     * A default {@link GregorianCalendar} will be used to perform any
-     * arithmetic operations on the resulting Timestamp.
      * <p>
      * This is equivalent to the corresponding Ion value {@code YYYYT}.
      */
@@ -1011,8 +1180,6 @@ public static Timestamp forYear(int yearZ)
 
     /**
      * Returns a Timestamp, precise to the month, with unknown local offset.
-     * A default {@link GregorianCalendar} will be used to perform any
-     * arithmetic operations on the resulting Timestamp.
      * <p>
      * This is equivalent to the corresponding Ion value {@code YYYY-MMT}.
      */
@@ -1023,8 +1190,6 @@ public static Timestamp forMonth(int yearZ, int monthZ)
 
     /**
      * Returns a Timestamp, precise to the day, with unknown local offset.
-     * A default {@link GregorianCalendar} will be used to perform any
-     * arithmetic operations on the resulting Timestamp.
      * <p>
      * This is equivalent to the corresponding Ion value {@code YYYY-MM-DD}.
      *
@@ -1037,8 +1202,7 @@ public static Timestamp forDay(int yearZ, int monthZ, int dayZ)
 
     /**
      * Returns a Timestamp, precise to the minute, with a given local
-     * offset. A default {@link GregorianCalendar} will be used to perform any
-     * arithmetic operations on the resulting Timestamp.
+     * offset.
      * <p>
      * This is equivalent to the corresponding Ion value
      * {@code YYYY-MM-DDThh:mm+-oo:oo}, where {@code oo:oo} represents the
@@ -1059,8 +1223,6 @@ public static Timestamp forMinute(int year, int month, int day,
 
     /**
      * Returns a Timestamp, precise to the second, with a given local offset.
-     * A default {@link GregorianCalendar} will be used to perform any
-     * arithmetic operations on the resulting Timestamp.
      * <p>
      * This is equivalent to the corresponding Ion value
      * {@code YYYY-MM-DDThh:mm:ss+-oo:oo}, where {@code oo:oo} represents the
@@ -1081,8 +1243,6 @@ public static Timestamp forSecond(int year, int month, int day,
 
     /**
      * Returns a Timestamp, precise to the second, with a given local offset.
-     * A default {@link GregorianCalendar} will be used to perform any
-     * arithmetic operations on the resulting Timestamp.
      * <p>
      * This is equivalent to the corresponding Ion value
      * {@code YYYY-MM-DDThh:mm:ss.sss+-oo:oo}, where {@code oo:oo} represents
@@ -1111,14 +1271,6 @@ public static Timestamp forSecond(int year, int month, int day,
     /**
      * Returns a Timestamp that represents the point in time that is
      * {@code millis} milliseconds from the epoch, with a given local offset.
-     * A default {@link GregorianCalendar} will be used to perform any
-     * arithmetic operations on the resulting Timestamp.
-     * <p>
-     * <strong>NOTE:</strong> this means that providing a number of milliseconds
-     * that was produced using a different calendar system may result in a Timestamp
-     * that represents a different point in time than the one that originally
-     * produced the milliseconds. In this case, {@link #forCalendar(Calendar)} should
-     * be used instead.
      * <p>
      * The resulting Timestamp will be precise to the millisecond.
      *
@@ -1139,14 +1291,7 @@ public static Timestamp forMillis(long millis, Integer localOffset)
      * Returns a Timestamp that represents the point in time that is
      * {@code millis} milliseconds (including any fractional
      * milliseconds) from the epoch, with a given local offset.
-     * A default {@link GregorianCalendar} will be used to perform any
-     * arithmetic operations on the resulting Timestamp.
-     * <p>
-     * <strong>NOTE:</strong> this means that providing a number of milliseconds
-     * that was produced using a different calendar system may result in a Timestamp
-     * that represents a different point in time than the one that originally
-     * produced the milliseconds. In this case, {@link #forCalendar(Calendar)} should
-     * be used instead.
+     *
      * <p>
      * The resulting Timestamp will be precise to the second if {@code millis}
      * doesn't contain information that is more granular than seconds.
@@ -1184,8 +1329,7 @@ public static Timestamp forMillis(BigDecimal millis, Integer localOffset)
     /**
      * Converts a {@link Calendar} to a Timestamp, preserving the calendar's
      * time zone as the equivalent local offset when it has at least minutes
-     * precision. The given Calendar will be used to perform any arithmetic
-     * operations on the resulting Timestamp.
+     * precision.
      *
      * @return a Timestamp instance, with precision determined by the smallest
      *   field set in the {@code Calendar};
@@ -1201,8 +1345,7 @@ public static Timestamp forCalendar(Calendar calendar)
 
     /**
      * Converts a {@link Date} to a Timestamp in UTC representing the same
-     * point in time. A default {@link GregorianCalendar} will be used to perform
-     * any arithmetic operations on the resulting Timestamp.
+     * point in time.
      * <p>
      * The resulting Timestamp will be precise to the millisecond.
      *
@@ -1221,8 +1364,7 @@ public static Timestamp forDateZ(Date date)
 
     /**
      * Converts a {@link java.sql.Timestamp} to a Timestamp in UTC representing
-     * the same point in time. A default {@link GregorianCalendar} will be used to perform
-     * any arithmetic operations on the resulting Timestamp.
+     * the same point in time.
      * <p>
      * The resulting Timestamp will be precise to the nanosecond.
      *
@@ -1249,8 +1391,7 @@ public static Timestamp forSqlTimestampZ(java.sql.Timestamp sqlTimestamp)
 
     /**
      * Returns a Timestamp representing the current time (based on the JVM
-     * clock), with an unknown local offset. A default {@link GregorianCalendar}
-     * will be used to perform any arithmetic operations on the resulting Timestamp.
+     * clock), with an unknown local offset.
      * <p>
      * The resulting Timestamp will be precise to the millisecond.
      *
@@ -1265,8 +1406,7 @@ public static Timestamp now()
 
     /**
      * Returns a Timestamp in UTC representing the current time (based on the
-     * the JVM clock). A default {@link GregorianCalendar} will be used to perform
-     * any arithmetic operations on the resulting Timestamp.
+     * the JVM clock).
      * <p>
      * The resulting Timestamp will be precise to the millisecond.
      *
@@ -1300,11 +1440,10 @@ public Date dateValue()
         return new Date(millis);
     }
 
+
     /**
      * Converts the value of this Timestamp as a {@link Calendar}, in its
-     * local time. The resulting Calendar will have its fields set up to
-     * this Timestamp's precision. The maximum fractional precision supported
-     * by Calendar is milliseconds; any additional precision will be truncated.
+     * local time.
      * <p>
      * Because {@link Calendar} instances are mutable, this method returns a
      * new instance from each call.
@@ -1314,26 +1453,39 @@ public Date dateValue()
      */
     public Calendar calendarValue()
     {
-        Calendar cal = (Calendar) _calendar.clone();
-        if (_precision.includes(Precision.SECOND)) {
-            if (this._fraction != null)
-            {
-                int fractionalMillis = this._fraction.movePointRight(3).intValue();
-                cal.set(Calendar.MILLISECOND, fractionalMillis);
-            }
-        }
-        if (_precision.includes(Precision.MINUTE) && _offset != null && _offset != 0)
+        Calendar cal = new GregorianCalendar(PrivateUtils.UTC);
+
+        long millis = getMillis();
+        Integer offset = _offset;
+        if (offset != null && offset != 0)
         {
-            int offsetMillis = _offset * 60 * 1000;
-            cal.add(Calendar.MILLISECOND, offsetMillis);
+            int offsetMillis = offset * 60 * 1000;
+            millis += offsetMillis;
+            cal.setTimeInMillis(millis);                // Resets the offset!
             cal.set(Calendar.ZONE_OFFSET, offsetMillis);
         }
-        if (!_precision.includes(Precision.SECOND)) {
-            cal.clear(Calendar.SECOND);
+        else
+        {
+            cal.setTimeInMillis(millis);
         }
-        if (_fraction == null) {
-            cal.clear(Calendar.MILLISECOND);
+
+        switch (_precision) {
+            case YEAR:
+                cal.clear(Calendar.MONTH);
+            case MONTH:
+                cal.clear(Calendar.DAY_OF_MONTH);
+            case DAY:
+                cal.clear(Calendar.HOUR_OF_DAY);
+                cal.clear(Calendar.MINUTE);
+            case MINUTE:
+                cal.clear(Calendar.SECOND);
+                cal.clear(Calendar.MILLISECOND);
+            case SECOND:
+                if (_fraction == null) {
+                    cal.clear(Calendar.MILLISECOND);
+                }
         }
+
         return cal;
     }
 
@@ -1341,7 +1493,7 @@ public Calendar calendarValue()
     /**
      * Returns a number representing the Timestamp's point in time that is
      * the number of milliseconds (<em>ignoring</em> any fractional milliseconds)
-     * from the epoch, using this Timestamp's configured Calendar.
+     * from the epoch.
      * <p>
      * This method will return the same result for all Timestamps representing
      * the same point in time, regardless of the local offset.
@@ -1350,22 +1502,24 @@ public Calendar calendarValue()
      *          number of milliseconds (<em>ignoring</em> any fractional
      *          milliseconds) from the epoch (1970-01-01T00:00:00.000Z)
      */
+    @SuppressWarnings("deprecation")
     public long getMillis()
     {
-        long millis = _calendar.getTimeInMillis();
+        //                                        month is 0 based for Date
+        long millis = Date.UTC(this._year - 1900, this._month - 1, this._day, this._hour, this._minute, this._second);
         if (this._fraction != null) {
             BigDecimal fracAsDecimal = this._fraction.movePointRight(3);
             int frac = isIntegralZero(fracAsDecimal) ? 0 : fracAsDecimal.intValue();
             millis += frac;
         }
-        return millis + _calendarCompensationOffsetMs;
+        return millis;
 
     }
 
     /**
      * Returns a BigDecimal representing the Timestamp's point in time that is
      * the number of milliseconds (<em>including</em> any fractional milliseconds)
-     * from the epoch, using this Timestamp's configured Calendar.
+     * from the epoch.
      * <p>
      * This method will return the same result for all Timestamps representing
      * the same point in time, regardless of the local offset.
@@ -1374,6 +1528,7 @@ public long getMillis()
      *          number of milliseconds (<em>including</em> any fractional
      *          milliseconds) from the epoch (1970-01-01T00:00:00.000Z)
      */
+    @SuppressWarnings("deprecation")
     public BigDecimal getDecimalMillis()
     {
         switch (this._precision) {
@@ -1382,7 +1537,7 @@ public BigDecimal getDecimalMillis()
         case DAY:
         case MINUTE:
         case SECOND:
-            long millis = _calendar.getTimeInMillis() + _calendarCompensationOffsetMs;
+            long millis = Date.UTC(this._year - 1900, this._month - 1, this._day, this._hour, this._minute, this._second);
             BigDecimal dec = BigDecimal.valueOf(millis);
             if (_fraction != null) {
                 dec = dec.add(this._fraction.movePointRight(3));
@@ -1438,7 +1593,7 @@ public int getYear()
                 adjusted = make_localtime();
             }
         }
-        return adjusted.getZYear();
+        return adjusted._year;
     }
 
 
@@ -1460,7 +1615,7 @@ public int getMonth()
                 adjusted = make_localtime();
             }
         }
-        return adjusted.getZMonth();
+        return adjusted._month;
     }
 
 
@@ -1480,7 +1635,7 @@ public int getDay()
                 adjusted = make_localtime();
             }
         }
-        return adjusted.getZDay();
+        return adjusted._day;
     }
 
 
@@ -1500,7 +1655,7 @@ public int getHour()
                 adjusted = make_localtime();
             }
         }
-        return adjusted.getZHour();
+        return adjusted._hour;
     }
 
 
@@ -1520,7 +1675,7 @@ public int getMinute()
                 adjusted = make_localtime();
             }
         }
-        return adjusted.getZMinute();
+        return adjusted._minute;
     }
 
 
@@ -1538,7 +1693,7 @@ public int getMinute()
      */
     public int getSecond()
     {
-        return this.getZSecond();
+        return this._second;
     }
 
 
@@ -1557,7 +1712,7 @@ public int getSecond()
      */
     public BigDecimal getDecimalSecond()
     {
-        BigDecimal sec = BigDecimal.valueOf(getSecond());
+        BigDecimal sec = BigDecimal.valueOf(_second);
         if (_fraction != null)
         {
             sec = sec.add(_fraction);
@@ -1574,7 +1729,7 @@ public BigDecimal getDecimalSecond()
      */
     public int getZYear()
     {
-        return this._calendar.get(Calendar.YEAR);
+        return this._year;
     }
 
 
@@ -1589,7 +1744,7 @@ public int getZYear()
      */
     public int getZMonth()
     {
-        return this._calendar.get(Calendar.MONTH) + 1;
+        return this._month;
     }
 
 
@@ -1603,7 +1758,7 @@ public int getZMonth()
      */
     public int getZDay()
     {
-        return this._calendar.get(Calendar.DAY_OF_MONTH);
+        return this._day;
     }
 
 
@@ -1617,7 +1772,7 @@ public int getZDay()
      */
     public int getZHour()
     {
-        return this._calendar.get(Calendar.HOUR_OF_DAY);
+        return this._hour;
     }
 
 
@@ -1631,7 +1786,7 @@ public int getZHour()
      */
     public int getZMinute()
     {
-        return this._calendar.get(Calendar.MINUTE);
+        return this._minute;
     }
 
 
@@ -1649,7 +1804,7 @@ public int getZMinute()
      */
     public int getZSecond()
     {
-        return this._calendar.get(Calendar.SECOND);
+        return this._second;
     }
 
 
@@ -1709,7 +1864,17 @@ public Timestamp withLocalOffset(Integer offset)
         {
             return this;
         }
-        return new Timestamp((Calendar) _calendar.clone(), precision, _fraction, offset);
+
+        Timestamp ts = createFromUtcFields(precision,
+                                           getZYear(),
+                                           getZMonth(),
+                                           getZDay(),
+                                           getZHour(),
+                                           getZMinute(),
+                                           getZSecond(),
+                                           getZFractionalSecond(),
+                                           offset);
+        return ts;
     }
 
 
@@ -1846,7 +2011,7 @@ private static void print(Appendable out, Timestamp adjusted)
 
         // so we have a real value - we'll start with the date portion
         // which we always have
-        print_digits(out, adjusted.getZYear(), 4);
+        print_digits(out, adjusted._year, 4);
         if (adjusted._precision == Precision.YEAR) {
             assert adjusted._offset == UNKNOWN_OFFSET;
             out.append("T");
@@ -1854,7 +2019,7 @@ private static void print(Appendable out, Timestamp adjusted)
         }
 
         out.append("-");
-        print_digits(out, adjusted.getZMonth(), 2);  // convert calendar months to a base 1 value
+        print_digits(out, adjusted._month, 2);  // convert calendar months to a base 1 value
         if (adjusted._precision == Precision.MONTH) {
             assert adjusted._offset == UNKNOWN_OFFSET;
             out.append("T");
@@ -1862,7 +2027,7 @@ private static void print(Appendable out, Timestamp adjusted)
         }
 
         out.append("-");
-        print_digits(out, adjusted.getZDay(), 2);
+        print_digits(out, adjusted._day, 2);
         if (adjusted._precision == Precision.DAY) {
             assert adjusted._offset == UNKNOWN_OFFSET;
             // out.append("T");
@@ -1870,13 +2035,13 @@ private static void print(Appendable out, Timestamp adjusted)
         }
 
         out.append("T");
-        print_digits(out, adjusted.getZHour(), 2);
+        print_digits(out, adjusted._hour, 2);
         out.append(":");
-        print_digits(out, adjusted.getZMinute(), 2);
+        print_digits(out, adjusted._minute, 2);
         // ok, so how much time do we have ?
-        if (adjusted._precision.includes(Precision.SECOND)) {
+        if (adjusted._precision == Precision.SECOND) {
             out.append(":");
-            print_digits(out, adjusted.getZSecond(), 2);
+            print_digits(out, adjusted._second, 2);
             if (adjusted._fraction != null) {
                 print_fractional_digits(out, adjusted._fraction);
             }
@@ -1939,10 +2104,10 @@ private static void print_fractional_digits(Appendable out, BigDecimal value)
     //=========================================================================
     // Timestamp arithmetic
 
+
     /**
      * Returns a timestamp relative to this one by the given number of
-     * milliseconds. Uses this Timestamp's configured Calendar to perform the
-     * arithmetic.
+     * milliseconds.
      * <p>
      * This method always returns a Timestamp with the same precision as
      * the original. After performing the arithmetic, the resulting Timestamp's
@@ -1958,10 +2123,9 @@ private static void print_fractional_digits(Appendable out, BigDecimal value)
      */
     public final Timestamp adjustMillis(long amount) {
         if (amount == 0) return this;
-        Timestamp ts = addMillis(amount);
-        ts._precision = _precision;
+        Timestamp ts = addMillisForPrecision(amount, _precision, false);
         ts.clearUnusedPrecision();
-        if (_precision.includes(Precision.SECOND)) {
+        if (ts._precision.includes(Precision.SECOND)) {
             // Maintain the same amount of fractional precision.
             if (_fraction == null) {
                 ts._fraction = null;
@@ -1977,14 +2141,14 @@ public final Timestamp adjustMillis(long amount) {
 
     /**
      * Returns a timestamp relative to this one by the given number of
-     * milliseconds. Uses this Timestamp's configured Calendar to perform the
-     * arithmetic.
+     * milliseconds.
      * <p>
      * This method always returns a Timestamp with SECOND precision and a seconds
      * value precise at least to the millisecond. For example, adding one millisecond
      * to {@code 2011T} results in {@code 2011-01-01T00:00:00.001-00:00}. To receive
      * a Timestamp that always maintains the same precision as the original, use
      * {@link #adjustMillis(long)}.
+     * milliseconds.
      *
      * @param amount a number of milliseconds.
      */
@@ -1993,51 +2157,48 @@ public final Timestamp addMillis(long amount) {
             // Zero milliseconds are to be added, and the precision does not need to be increased.
             return this;
         }
-        long seconds = amount / 1000;
-        BigDecimal millis = BigDecimal.valueOf(amount % 1000).movePointLeft(3);
+        return addMillisForPrecision(amount, Precision.SECOND, true);
+    }
+
+    /**
+     * Adds the given number of milliseconds, extending (if necessary) the resulting Timestamp to the given
+     * precision.
+     * @param amount the number of milliseconds to add.
+     * @param precision the precision that the Timestamp will be extended to, if it does not already include that
+     *                  precision.
+     * @param millisecondsPrecision true if and only if the `amount` includes milliseconds precision. If true, the
+     *                              resulting timestamp's fraction will have precision at least to the millisecond.
+     * @return a new Timestamp.
+     */
+    private Timestamp addMillisForPrecision(long amount, Precision precision, boolean millisecondsPrecision) {
+        // When millisecondsPrecision is true, the caller must do its own short-circuiting because it must
+        // check the fractional precision.
+        if (!millisecondsPrecision && amount == 0 && _precision == precision) return this;
+        // This strips off the local offset, expressing our fields as if they
+        // were UTC.
+        BigDecimal millis = make_localtime().getDecimalMillis();
+        millis = millis.add(BigDecimal.valueOf(amount));
+        Precision newPrecision = _precision.includes(precision) ? _precision : precision;
+
+
+        Timestamp ts = new Timestamp(millis, newPrecision, _offset);
+        // Anything with courser-than-millis precision will have been extended
+        // to 3 decimal places due to use of getDecimalMillis(). Compensate for
+        // that by setting the scale such that it is never extended unless
+        // milliseconds precision is being added and the fraction does not yet
+        // have milliseconds precision.
+        int newScale = millisecondsPrecision ? 3 : 0;
         if (_fraction != null) {
-            millis = _fraction.add(millis);
-        }
-        BigDecimal newFraction;
-        if (BigDecimal.ONE.compareTo(millis) <= 0) {
-            newFraction = millis.subtract(BigDecimal.ONE);
-            seconds += 1;
-        } else if (BigDecimal.ZERO.compareTo(millis) > 0) {
-            newFraction = BigDecimal.ONE.add(millis);
-            seconds -= 1;
-        } else {
-            newFraction = millis;
+            newScale = Math.max(newScale, _fraction.scale());
         }
-        Timestamp ts = addSecond(seconds);
-        if (ts == this) {
-            // When the precision does not need to be extended and there are no seconds to add,
-            // addSecond returns the same reference unchanged. Clone it to ensure it is not
-            // mutated.
-            ts = clone();
+        if (ts._fraction != null) {
+            ts._fraction = newScale == 0 ? null : ts._fraction.setScale(newScale, RoundingMode.FLOOR);
         }
-        ts._fraction = newFraction;
-        return ts;
-    }
-
-    /**
-     * Adds the given amount to the given {@link Calendar} field and returns a new Timestamp
-     * with precision set to the maximum of the current precision and the given precision.
-     * @param field the field.
-     * @param amount an amount.
-     * @param precision the precision corresponding to the given field.
-     * @return a new Timestamp instance.
-     */
-    private Timestamp calendarAdd(int field, int amount, Precision precision) {
-        if (amount == 0 && _precision == precision) return this;
-        Timestamp timestamp = make_localtime();
-        timestamp._calendar.add(field, amount);
-        checkCalendarYear(timestamp._calendar);
-        if (_offset != null) {
-            timestamp.apply_offset(_offset);
-            timestamp._offset = _offset;
+        if (_offset != null && _offset != 0)
+        {
+            ts.apply_offset(_offset);
         }
-        timestamp._precision = _precision.includes(precision) ? timestamp._precision : precision;
-        return timestamp;
+        return ts;
     }
 
     /**
@@ -2046,59 +2207,21 @@ private Timestamp calendarAdd(int field, int amount, Precision precision) {
     private void clearUnusedPrecision() {
         switch (_precision) {
             case YEAR:
-                _calendar.set(Calendar.MONTH, 0);
+                _month = 1;
             case MONTH:
-                _calendar.set(Calendar.DAY_OF_MONTH, 1);
+                _day = 1;
             case DAY:
-                _calendar.set(Calendar.HOUR_OF_DAY, 0);
-                _calendar.set(Calendar.MINUTE, 0);
+                _hour = 0;
+                _minute = 0;
             case MINUTE:
-                _calendar.set(Calendar.SECOND, 0);
+                _second = 0;
                 _fraction = null;
             case SECOND:
         }
     }
 
-    /**
-     * Adds the given amount to the given {@link Calendar} field and returns a new Timestamp
-     * with the same precision as the original Timestamp.
-     * @param field the field.
-     * @param amount an amount.
-     * @return a new Timestamp instance.
-     */
-    private Timestamp calendarAdjust(int field, int amount) {
-        if (amount == 0) return this;
-        Timestamp ts = calendarAdd(field, amount, _precision);
-        ts.clearUnusedPrecision();
-        return ts;
-    }
-
     /**
      * Returns a timestamp relative to this one by the given number of seconds.
-     * Uses this Timestamp's configured Calendar to perform the arithmetic.
-     *
-     * @param seconds a number of seconds.
-     */
-    private Timestamp addSecond(long seconds) {
-        Timestamp ts = this;
-        do {
-            int incrementalSeconds;
-            if (seconds > Integer.MAX_VALUE) {
-                incrementalSeconds = Integer.MAX_VALUE;
-            } else if (seconds < Integer.MIN_VALUE) {
-                incrementalSeconds = Integer.MIN_VALUE;
-            } else {
-                incrementalSeconds = (int)seconds;
-            }
-            ts = ts.addSecond(incrementalSeconds);
-            seconds -= incrementalSeconds;
-        } while (seconds != 0);
-        return ts;
-    }
-
-    /**
-     * Returns a timestamp relative to this one by the given number of seconds.
-     * Uses this Timestamp's configured Calendar to perform the arithmetic.
      * <p>
      * This method always returns a Timestamp with the same precision as
      * the original. For example, adjusting {@code 2012-04-01T00:00Z} by one
@@ -2111,12 +2234,12 @@ private Timestamp addSecond(long seconds) {
      */
     public final Timestamp adjustSecond(int amount)
     {
-        return calendarAdjust(Calendar.SECOND, amount);
+        long delta = (long) amount * 1000;
+        return adjustMillis(delta);
     }
 
     /**
      * Returns a timestamp relative to this one by the given number of seconds.
-     * Uses this Timestamp's configured Calendar to perform the arithmetic.
      * <p>
      * This method always returns a Timestamp with SECOND precision.
      * For example, adding one second to {@code 2011T} results in
@@ -2127,12 +2250,12 @@ public final Timestamp adjustSecond(int amount)
      */
     public final Timestamp addSecond(int amount)
     {
-        return calendarAdd(Calendar.SECOND, amount, Precision.SECOND);
+        long delta = (long) amount * 1000;
+        return addMillisForPrecision(delta, Precision.SECOND, false);
     }
 
     /**
      * Returns a timestamp relative to this one by the given number of minutes.
-     * Uses this Timestamp's configured Calendar to perform the arithmetic.
      * <p>
      * This method always returns a Timestamp with the same precision as
      * the original. For example, adjusting {@code 2012-04-01T} by one minute
@@ -2145,12 +2268,12 @@ public final Timestamp addSecond(int amount)
      */
     public final Timestamp adjustMinute(int amount)
     {
-        return calendarAdjust(Calendar.MINUTE, amount);
+        long delta = (long) amount * 60 * 1000;
+        return adjustMillis(delta);
     }
 
     /**
      * Returns a timestamp relative to this one by the given number of minutes.
-     * Uses this Timestamp's configured Calendar to perform the arithmetic.
      * <p>
      * This method always returns a Timestamp with at least MINUTE precision.
      * For example, adding one minute to {@code 2011T} results in
@@ -2161,12 +2284,12 @@ public final Timestamp adjustMinute(int amount)
      */
     public final Timestamp addMinute(int amount)
     {
-        return calendarAdd(Calendar.MINUTE, amount, Precision.MINUTE);
+        long delta = (long) amount * 60 * 1000;
+        return addMillisForPrecision(delta, Precision.MINUTE, false);
     }
 
     /**
      * Returns a timestamp relative to this one by the given number of hours.
-     * Uses this Timestamp's configured Calendar to perform the arithmetic.
      * <p>
      * This method always returns a Timestamp with the same precision as
      * the original. For example, adjusting {@code 2012-04-01T} by one hour
@@ -2179,12 +2302,12 @@ public final Timestamp addMinute(int amount)
      */
     public final Timestamp adjustHour(int amount)
     {
-        return calendarAdjust(Calendar.HOUR_OF_DAY, amount);
+        long delta = (long) amount * 60 * 60 * 1000;
+        return adjustMillis(delta);
     }
 
     /**
      * Returns a timestamp relative to this one by the given number of hours.
-     * Uses this Timestamp's configured Calendar to perform the arithmetic.
      * <p>
      * This method always returns a Timestamp with at least MINUTE precision.
      * For example, adding one hour to {@code 2011T} results in
@@ -2195,12 +2318,12 @@ public final Timestamp adjustHour(int amount)
      */
     public final Timestamp addHour(int amount)
     {
-        return calendarAdd(Calendar.HOUR_OF_DAY, amount, Precision.MINUTE);
+        long delta = (long) amount * 60 * 60 * 1000;
+        return addMillisForPrecision(delta, Precision.MINUTE, false);
     }
 
     /**
      * Returns a timestamp relative to this one by the given number of days.
-     * Uses this Timestamp's configured Calendar to perform the arithmetic.
      * <p>
      * This method always returns a Timestamp with the same precision as
      * the original. For example, adjusting {@code 2012-04T} by one day results
@@ -2212,31 +2335,29 @@ public final Timestamp addHour(int amount)
      */
     public final Timestamp adjustDay(int amount)
     {
-        return calendarAdjust(Calendar.DAY_OF_MONTH, amount);
+        long delta = (long) amount * 24 * 60 * 60 * 1000;
+        return adjustMillis(delta);
     }
 
     /**
      * Returns a timestamp relative to this one by the given number of days.
-     * Uses this Timestamp's configured Calendar to perform the arithmetic.
-     * <p>
-     * This method always returns a Timestamp with at least DAY precision.
-     * For example, adding one day to {@code 2011T} results in {@code 2011-01-02T}.
-     * To receive a Timestamp that always maintains the same precision as the
-     * original, use {@link #adjustDay(int)}.
      *
      * @param amount a number of days.
      */
     public final Timestamp addDay(int amount)
     {
-        return calendarAdd(Calendar.DAY_OF_MONTH, amount, Precision.DAY);
+        long delta = (long) amount * 24 * 60 * 60 * 1000;
+        return addMillisForPrecision(delta, Precision.DAY, false);
     }
 
+    // Shifting month and year are more complicated since the length of a month
+    // varies and we want the day-of-month to stay the same when possible.
+    // We rely on Calendar for the logic.
+
     /**
      * Returns a timestamp relative to this one by the given number of months.
      * The day field may be adjusted to account for different month length and
-     * leap days, as required by the configured Calendar's rules. For example,
-     * using the default {@link GregorianCalendar}, adjusting {@code 2011-01-31}
-     * by one month results in {@code 2011-02-28}.
+     * leap days.
      * <p>
      * This method always returns a Timestamp with the same precision as the
      * original. For example, adjusting {@code 2011T} by one month results in
@@ -2248,34 +2369,42 @@ public final Timestamp addDay(int amount)
      */
     public final Timestamp adjustMonth(int amount)
     {
-        return calendarAdjust(Calendar.MONTH, amount);
+        if (amount == 0) return this;
+        return addMonthForPrecision(amount, _precision);
+    }
+
+    /**
+     * Adds the given number of months, extending (if necessary) the resulting Timestamp to the given
+     * precision.
+     * @param amount the number of months to add.
+     * @param precision the precision that the Timestamp will be extended to, if it does not already include that
+     *                  precision.
+     * @return a new Timestamp.
+     */
+    private Timestamp addMonthForPrecision(int amount, Precision precision) {
+        Calendar cal = calendarValue();
+        cal.add(Calendar.MONTH, amount);
+        return new Timestamp(cal, precision, _fraction, _offset);
     }
 
     /**
      * Returns a timestamp relative to this one by the given number of months.
      * The day field may be adjusted to account for different month length and
-     * leap days, as required by the configured Calendar's rules. For example,
-     * using the default {@link GregorianCalendar}, adding one month to
-     * {@code 2011-01-31} results in {@code 2011-02-28}.
-     * <p>
-     * This method always returns a Timestamp with at least MONTH precision.
-     * For example, adding one month to {@code 2011T} results in {@code 2011-02T}.
-     * To receive a Timestamp that always maintains the same precision as the
-     * original, use {@link #adjustMonth(int)}.
+     * leap days.  For example, adding one month to {@code 2011-01-31}
+     * results in {@code 2011-02-28}.
      *
      * @param amount a number of months.
      */
     public final Timestamp addMonth(int amount)
     {
-        return calendarAdd(Calendar.MONTH, amount, Precision.MONTH);
+        if (amount == 0 && _precision.includes(Precision.MONTH)) return this;
+        return addMonthForPrecision(amount, _precision.includes(Precision.MONTH) ? _precision : Precision.MONTH);
     }
 
     /**
      * Returns a timestamp relative to this one by the given number of years.
-     * The day field may be adjusted to account for leap days, as required by
-     * the configured Calendar's rules. For example, using the default
-     * {@link GregorianCalendar}, adjusting {@code 2012-02-29} by one year
-     * results in {@code 2013-02-28}.
+     * The day field may be adjusted to account for leap days. For example,
+     * adjusting {@code 2012-02-29} by one year results in {@code 2013-02-28}.
      * <p>
      * Because YEAR is the coarsest precision possible, this method always
      * returns a Timestamp with the same precision as the original and
@@ -2289,19 +2418,18 @@ public final Timestamp adjustYear(int amount) {
 
     /**
      * Returns a timestamp relative to this one by the given number of years.
-     * The day field may be adjusted to account for leap days, as required by
-     * the configured Calendar's rules. For example, using the default
-     * {@link GregorianCalendar}, adding one year to {@code 2012-02-29} results
-     * in {@code 2013-02-28}.
-     * <p>
-     * This method always returns a Timestamp with the same precision as
-     * the original. See also: {@link #adjustYear(int)}.
+     * The day field may be adjusted to account for leap days.  For example,
+     * adding one year to {@code 2012-02-29} results in {@code 2013-02-28}.
      *
      * @param amount a number of years.
      */
     public final Timestamp addYear(int amount)
     {
-        return calendarAdd(Calendar.YEAR, amount, Precision.YEAR);
+        if (amount == 0) return this;
+
+        Calendar cal = calendarValue();
+        cal.add(Calendar.YEAR, amount);
+        return new Timestamp(cal, _precision, _fraction, _offset);
     }
 
 
@@ -2328,12 +2456,12 @@ public int hashCode()
 
         result ^= (result << 19) ^ (result >> 13);
 
-        result = prime * result + this.getZYear();
-        result = prime * result + this.getZMonth();
-        result = prime * result + this.getZDay();
-        result = prime * result + this.getZHour();
-        result = prime * result + this.getZMinute();
-        result = prime * result + this.getZSecond();
+        result = prime * result + this._year;
+        result = prime * result + this._month;
+        result = prime * result + this._day;
+        result = prime * result + this._hour;
+        result = prime * result + this._minute;
+        result = prime * result + this._second;
 
         result ^= (result << 19) ^ (result >> 13);
 
@@ -2493,12 +2621,12 @@ public boolean equals(Timestamp t)
         }
 
         // so now we check the actual time value
-        if (this.getZYear()   != t.getZYear())    return false;
-        if (this.getZMonth()  != t.getZMonth())   return false;
-        if (this.getZDay()    != t.getZDay())     return false;
-        if (this.getZHour()   != t.getZHour())    return false;
-        if (this.getZMinute() != t.getZMinute())  return false;
-        if (this.getZSecond() != t.getZSecond())  return false;
+        if (this._year   != t._year)    return false;
+        if (this._month  != t._month)   return false;
+        if (this._day    != t._day)     return false;
+        if (this._hour   != t._hour)    return false;
+        if (this._minute != t._minute)  return false;
+        if (this._second != t._second)  return false;
 
         // and if we have a local offset, check the value here
         if (this._offset != null) {
@@ -2506,7 +2634,6 @@ public boolean equals(Timestamp t)
         }
 
         // we only look at the fraction if we know that it's actually there
-
         if ((this._fraction != null && t._fraction == null)
             || (this._fraction == null && t._fraction != null)) {
             // one of the fractions are null
@@ -2519,14 +2646,6 @@ public boolean equals(Timestamp t)
         return this._fraction.equals(t._fraction);
     }
 
-    private static void checkCalendarYear(Calendar calendar) {
-        int year = calendar.get(Calendar.YEAR);
-        if (calendar.get(Calendar.ERA) == GregorianCalendar.BC) {
-            year *= -1;
-        }
-        checkAndCastYear(year);
-    }
-
     private static short checkAndCastYear(int year)
     {
         if (year < 1 || year > 9999)
@@ -2547,11 +2666,14 @@ private static byte checkAndCastMonth(int month)
         return (byte) month;
     }
 
-    private void checkCalendarDay(int day) {
-        int lastDayInMonth = _calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
-        if (day > lastDayInMonth || day < _calendar.getActualMinimum(Calendar.DAY_OF_MONTH)) {
-            throw new IllegalArgumentException(String.format("Day %s for year %s and month %s must be between 1 and %s inclusive", day, getZYear(), getZMonth(), lastDayInMonth));
+    private static byte checkAndCastDay(int day, int year, int month)
+    {
+        int lastDayInMonth = last_day_in_month(year, month);
+        if (day < 1 || day > lastDayInMonth) {
+            throw new IllegalArgumentException(String.format("Day %s for year %s and month %s must be between 1 and %s inclusive", day, year, month, lastDayInMonth));
         }
+
+        return (byte) day;
     }
 
     private static byte checkAndCastHour(int hour)
diff --git a/test/software/amazon/ion/TimestampTest.java b/test/software/amazon/ion/TimestampTest.java
index ecf86dff1c..322898aef8 100644
--- a/test/software/amazon/ion/TimestampTest.java
+++ b/test/software/amazon/ion/TimestampTest.java
@@ -16,7 +16,8 @@
 
 import static software.amazon.ion.Decimal.NEGATIVE_ZERO;
 import static software.amazon.ion.Decimal.negativeZero;
-import static software.amazon.ion.Timestamp.UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL;
+import static software.amazon.ion.Timestamp.MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL;
+import static software.amazon.ion.Timestamp.MINIMUM_TIMESTAMP_IN_MILLIS;
 import static software.amazon.ion.Timestamp.MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL;
 import static software.amazon.ion.Timestamp.UNKNOWN_OFFSET;
 import static software.amazon.ion.Timestamp.UTC_OFFSET;
@@ -39,6 +40,7 @@
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import software.amazon.ion.Timestamp.Precision;
 
@@ -792,7 +794,7 @@ public void testForMillisWithNegativeMilli()
     @Test
     public void testNewTimestampFromMinimumAllowedMillis()
     {
-        Timestamp ts = Timestamp.forMillis(MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL, PST_OFFSET);
+        Timestamp ts = Timestamp.forMillis(MINIMUM_TIMESTAMP_IN_MILLIS, PST_OFFSET);
         assertEquals("0001-01-01T00:00:00.000Z", ts.toZString());
     }
 
@@ -806,7 +808,7 @@ public void testNewMinimumTimestampFromStringAndMillisIsSame() {
     @Test
     public void testNewTimestampFromBigDecimalWithMaximumAllowedMillis()
     {
-        Timestamp ts = Timestamp.forMillis(UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL.add(BigDecimal.ONE.negate()), PST_OFFSET);
+        Timestamp ts = Timestamp.forMillis(MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL.add(BigDecimal.ONE.negate()), PST_OFFSET);
         checkFields(9999, 12, 31, 15, 59, 59, new BigDecimal("0.999"), PST_OFFSET, SECOND, ts);
         assertEquals("9999-12-31T15:59:59.999-08:00", ts.toString());
         assertEquals("9999-12-31T23:59:59.999Z", ts.toZString());
@@ -828,20 +830,20 @@ public void testNewTimestampFromBigDecimalWithMillisTooSmall()
     @Test(expected = IllegalArgumentException.class)
     public void testNewTimestampFromLongWithMillisTooSmall()
     {
-        Timestamp.forMillis(MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL.longValue() - 1, 0);
+        Timestamp.forMillis(MINIMUM_TIMESTAMP_IN_MILLIS - 1, 0);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testNewTimestampFromBigDecimalWithMillisTooBig()
     {
         // Max
-        Timestamp.forMillis(UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL, PST_OFFSET);
+        Timestamp.forMillis(MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL, PST_OFFSET);
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void testNewTimestampFromLongWithMillisTooBig()
     {
-        Timestamp.forMillis(UPPER_BOUND_TIMESTAMP_IN_MILLIS_DECIMAL.longValue(), PST_OFFSET);
+        Timestamp.forMillis(MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL.longValue(), PST_OFFSET);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -2576,6 +2578,7 @@ public void testGregorianCalendarNonLeapYear() {
         assertEquals("1800-03-01", timestamp2.toString());
     }
 
+    @Ignore // TODO ion-java#165
     @Test
     public void testConstructCustomCalendarWithValidLeapYear() {
         // Create a purely Julian calendar, where leap years were every four years.
@@ -2588,6 +2591,7 @@ public void testConstructCustomCalendarWithValidLeapYear() {
         assertEquals("1800-02-29T00:00Z", timestamp.toString());
     }
 
+    @Ignore // TODO ion-java#165
     @Test
     public void testCustomCalendarLeapYear() {
         // Create a purely Julian calendar, where leap years were every four years.
@@ -2601,6 +2605,7 @@ public void testCustomCalendarLeapYear() {
         assertEquals("1800-02-29", timestamp2.toString());
     }
 
+    @Ignore // TODO ion-java#165
     @Test
     public void testCustomCalendarLeapYearAfterClone() {
         // Create a purely Julian calendar, where leap years were every four years.
@@ -2614,6 +2619,7 @@ public void testCustomCalendarLeapYearAfterClone() {
         assertEquals("1800-02-29T23:00Z", timestamp2.toString());
     }
 
+    @Ignore // TODO ion-java#165
     @Test
     public void testCustomCalendarLeapYearAfterCalendarValue() {
         // Create a purely Julian calendar, where leap years were every four years.
@@ -2627,6 +2633,7 @@ public void testCustomCalendarLeapYearAfterCalendarValue() {
         assertEquals("1800-02-29T23:59Z", timestamp2.toString());
     }
 
+    @Ignore // TODO ion-java#165
     @Test
     public void testCustomCalendarLeapYearAfterWithLocalOffset() {
         // Create a purely Julian calendar, where leap years were every four years.
@@ -2640,6 +2647,7 @@ public void testCustomCalendarLeapYearAfterWithLocalOffset() {
         assertEquals("1800-02-29T00:00:00Z", timestamp2.toString());
     }
 
+    @Ignore // TODO ion-java#165
     @Test
     public void testCustomCalendarLeapYearWithChainedAdd() {
         // Create a purely Julian calendar, where leap years were every four years.
@@ -2654,6 +2662,7 @@ public void testCustomCalendarLeapYearWithChainedAdd() {
         assertEquals("1800-02-29T00:00:00.000Z", timestamp2.toString());
     }
 
+    @Ignore // TODO ion-java#165
     @Test
     public void testCustomCalendarLeapYearWithChainedAdjust() {
         // Create a purely Julian calendar, where leap years were every four years.
@@ -2668,6 +2677,7 @@ public void testCustomCalendarLeapYearWithChainedAdjust() {
         assertEquals("1800-02-29T00:00:00.000Z", timestamp2.toString());
     }
 
+    @Ignore // TODO ion-java#165
     @Test
     public void testCustomCalendarLeapYearWithChainedAdjustLessPrecise() {
         // Create a purely Julian calendar, where leap years were every four years.
@@ -2896,6 +2906,7 @@ public void testMillisIsIndepedentOfOffset() throws ParseException {
         assertEquals(t1.getDecimalMillis(), t2.getDecimalMillis());
     }
 
+    @Ignore // TODO ion-java#165
     @Test
     public void testInstantVsTimestampMillis() {
         // addresses: https://github.com/amzn/ion-java/issues/165
@@ -2905,7 +2916,7 @@ public void testInstantVsTimestampMillis() {
         // result, the two map from milliseconds to date differently before 1582, as demonstrated below.
         long millisFromInstant = Instant.parse(tsText).toEpochMilli();
         long millisFromTimestamp = Timestamp.valueOf(tsText).getMillis();
-        assertNotEquals(millisFromInstant, millisFromTimestamp);
+        assertTrue(millisFromInstant != millisFromTimestamp);
         // However, the discrepancy can be avoided by using Timestamp.forCalendar, which always respects the given
         // Calendar's method for determining leap years.
         Timestamp ts1 = Timestamp.forCalendar(GregorianCalendar.from(Instant.parse(tsText).atZone(ZoneId.of("UTC"))));

From 36c370bf658dc697ad8fbdd6fbfe7eaac911a38d Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 28 Feb 2019 17:17:41 -0800
Subject: [PATCH 052/490] Bumps version to 1.3.1.

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index df313a313d..8a9da762ad 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>software.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 8fa2bfbb8b..9550562224 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>software.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.3.1</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From a19302d1ebcc5e8ca41d19342581364f89d09c1a Mon Sep 17 00:00:00 2001
From: David Lurton <dlurton@users.noreply.github.com>
Date: Mon, 18 Mar 2019 12:08:39 -0700
Subject: [PATCH 053/490] IonValueLite.clearSymbolIdValues() performance fix
 (#221)

* improve clearSymbolIDValues() performance for IonValueLite DOM by keeping SID presence lifecycle as a flag bit
---
 .../ion/impl/lite/IonContainerLite.java       |  27 ++-
 .../amazon/ion/impl/lite/IonSymbolLite.java   |  60 +++--
 .../amazon/ion/impl/lite/IonValueLite.java    |  94 +++++++-
 test/AllTests.java                            |   5 +
 .../impl/lite/SIDPresentLifecycleTest.java    | 224 ++++++++++++++++++
 5 files changed, 385 insertions(+), 25 deletions(-)
 create mode 100644 test/software/amazon/ion/impl/lite/SIDPresentLifecycleTest.java

diff --git a/src/software/amazon/ion/impl/lite/IonContainerLite.java b/src/software/amazon/ion/impl/lite/IonContainerLite.java
index a77b583431..d8fe748df1 100644
--- a/src/software/amazon/ion/impl/lite/IonContainerLite.java
+++ b/src/software/amazon/ion/impl/lite/IonContainerLite.java
@@ -49,6 +49,7 @@ protected IonContainerLite(ContainerlessContext context, boolean isNull)
 
     IonContainerLite(IonContainerLite existing, IonContext context, boolean isStruct) {
         super(existing, context);
+        boolean retainingSIDs = false;
         int childCount = existing._child_count;
         this._child_count = childCount;
         // when cloning the children we establish 'this' the cloned outer container as the context
@@ -76,7 +77,13 @@ protected IonContainerLite(ContainerlessContext context, boolean isNull)
                     }
                 }
                 this._children[i] = copy;
+                retainingSIDs |= copy._isSymbolIdPresent();
             }
+            // unfortunately due to the existing behavior in IonValueLite copy-constructor where annotation SID's are
+            // preserved across the copy-constructor IF they have no resolved text it means that encodings could have
+            // been preserved on the child - therefore the cloned children each have to be re-interrogated and the
+            // setting updated IF such a change has occurred.
+            _isSymbolIdPresent(retainingSIDs);
         }
     }
 
@@ -432,13 +439,19 @@ public final SymbolTable getContextSymbolTable()
     }
 
     @Override
-    void clearSymbolIDValues()
+    boolean attemptClearSymbolIDValues()
     {
-        super.clearSymbolIDValues();
-        for (int ii=0; ii<get_child_count(); ii++) {
+        boolean symbolIDsAllCleared = super.attemptClearSymbolIDValues();
+
+        for (int ii = 0; ii < get_child_count(); ii++)
+        {
             IonValueLite child = get_child(ii);
-            child.clearSymbolIDValues();
+            // NOTE: recursion is done to #clearSymbolIDValues rather than #attemptClearSymbolIDValues in order to
+            // set the SYMBOL ID PRESENT status flag correctly.
+            symbolIDsAllCleared &= child.clearSymbolIDValues();
         }
+
+        return symbolIDsAllCleared;
     }
 
     /**
@@ -660,6 +673,12 @@ protected int add_child(int idx, IonValueLite child)
         structuralModificationCount++;
 
         child._elementid(idx);
+
+        if (!_isSymbolIdPresent() && child._isSymbolIdPresent())
+        {
+            cascadeSIDPresentToContextRoot();
+        }
+
         return idx;
     }
 
diff --git a/src/software/amazon/ion/impl/lite/IonSymbolLite.java b/src/software/amazon/ion/impl/lite/IonSymbolLite.java
index 3f73a1cacc..8f13f8eb0a 100644
--- a/src/software/amazon/ion/impl/lite/IonSymbolLite.java
+++ b/src/software/amazon/ion/impl/lite/IonSymbolLite.java
@@ -14,15 +14,15 @@
 
 package software.amazon.ion.impl.lite;
 
+import software.amazon.ion.IonType;
+import software.amazon.ion.IonWriter;
+import software.amazon.ion.SymbolTable;
 import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import software.amazon.ion.SymbolToken;
 import static software.amazon.ion.SystemSymbols.ION_1_0;
 import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
 
 import java.io.IOException;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
 import software.amazon.ion.UnknownSymbolException;
 import software.amazon.ion.ValueVisitor;
 import software.amazon.ion.impl.PrivateIonSymbol;
@@ -62,16 +62,14 @@ final class IonSymbolLite
             if (text != null)
             {
                 super.setValue(text);
-
-                // TODO why is the sid ignored in this case?
-                // Probably because we don't trust our ability to change the
-                // sid if this value gets recontextualized.
-                // BUT: we retain the sid on field names and annotations,
-                // so one or the other is buggy.
+                // TODO [ION-320] - needs consistent handling, when to retain SID's vs ignore
             }
             else
             {
+                // TODO [IONJAVA-579] - needs consistent handling, resolution against context symbol table
                 _sid = sid;
+                // there *is* an encoding present so we must update
+                _isSymbolIdPresent(true);
             }
         }
     }
@@ -130,6 +128,7 @@ public IonType getType()
         return IonType.SYMBOL;
     }
 
+
     /**
      * Get's the text of this NON-NULL symbol, finding it from our symbol
      * table if it's not yet known (and caching the result if possible).
@@ -173,22 +172,26 @@ public SymbolToken symbolValue()
 
     private int resolveSymbolId(SymbolTableProvider symbolTableProvider)
     {
+
         validateThisNotNull();
 
         if (_sid != UNKNOWN_SYMBOL_ID || isReadOnly()) {
             return _sid;
         }
 
-        SymbolTable symtab = symbolTableProvider.getSymbolTable();
+        SymbolTable symtab =
+            symbolTableProvider != null ? symbolTableProvider.getSymbolTable()
+                : getSymbolTable();
         if (symtab == null) {
             symtab = getSystem().getSystemSymbolTable();
         }
         assert(symtab != null);
 
         String name = _get_value();
+        // TODO [ION-320] - needs consistent handling, when to retain SID's vs ignore (here memoizing SID on read)
         if (!symtab.isLocalTable())
         {
-            _sid = symtab.findSymbol(name);
+            setSID(symtab.findSymbol(name));
             if (_sid > 0 || isReadOnly()) {
                 return _sid;
             }
@@ -196,12 +199,21 @@ private int resolveSymbolId(SymbolTableProvider symbolTableProvider)
         SymbolToken tok = symtab.find(name);
         if (tok != null)
         {
-            _sid = tok.getSid();
+            setSID(tok.getSid());
             _set_value(tok.getText()); // Use the interned instance of the text
         }
         return _sid;
     }
 
+    private void setSID(int sid)
+    {
+        _sid = sid;
+        if (_sid > 0)
+        {
+            cascadeSIDPresentToContextRoot();
+        }
+    }
+
     public SymbolToken symbolValue(SymbolTableProvider symbolTableProvider)
     {
         if (isNullValue()) return null;
@@ -224,15 +236,28 @@ protected boolean isIonVersionMarker() {
     }
 
     @Override
-    void clearSymbolIDValues()
+    boolean attemptClearSymbolIDValues()
     {
-        super.clearSymbolIDValues();
+        boolean allSymbolIDsCleared = super.attemptClearSymbolIDValues();
 
-        // Don't lose the sid if that's all we have!
-        if (! isNullValue() && _stringValue() != null)
+        // if there is no value, or there is already no SID - there is no clear action
+        if (isNullValue() || _sid == UNKNOWN_SYMBOL_ID)
+        {
+            // no behavior required - value has no SID value to clear
+        }
+        // if there is text, clear the SID
+        else if (_stringValue() != null)
         {
             _sid = UNKNOWN_SYMBOL_ID;
         }
+        else
+        {
+            // TODO [IONJAVA-579] - needs consistent handling, resolution against context symbol table
+            // there is not text, so we can't clear the SID.
+            allSymbolIDsCleared = false;
+        }
+
+        return allSymbolIDsCleared;
     }
 
     protected void setIsIonVersionMarker(boolean isIVM)
@@ -246,7 +271,6 @@ protected void setIsIonVersionMarker(boolean isIVM)
         _sid = ION_1_0_SID;
     }
 
-
     @Override
     final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
         throws IOException
diff --git a/src/software/amazon/ion/impl/lite/IonValueLite.java b/src/software/amazon/ion/impl/lite/IonValueLite.java
index cc2e80de65..c0245cbcf9 100644
--- a/src/software/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/software/amazon/ion/impl/lite/IonValueLite.java
@@ -71,6 +71,16 @@ abstract class IonValueLite
     protected static final int IS_IVM             = 0x10;
     protected static final int IS_AUTO_CREATED    = 0x20;
     protected static final int IS_SYMBOL_PRESENT  = 0x40;
+    /**
+     * Symbol ID present refers to there being the <i>possibility</i> that the IonValueLite, or it's contained sub graph
+     * <i>(e.g. if it is a {@link IonContainerLite} based sub type)</i> contains one or more defined
+     * Symbol ID's (SID)'s. This flag is used to track lifecycle, such that operations that require SID's are purged
+     * from the IonValueLite and it's contained sub-DOM can conduct a fast evaluation rather than having to do a full
+     * contained graph traversal on each and every invocation. For more detail on impact see
+     * <a href="https://issues.amazon.com/issues/IONPT-8">IONPT-8</a>
+     */
+    protected static final int IS_SYMBOL_ID_PRESENT = 0x80;
+
     private   static final int ELEMENT_MASK       = 0xff;
     protected static final int ELEMENT_SHIFT      = 8; // low 8 bits is flag, upper 24 (or 48 is element id)
 
@@ -200,6 +210,17 @@ protected final boolean _isSymbolPresent(boolean flag) {
         return flag;
     }
 
+    protected final boolean _isSymbolIdPresent() { return is_true(IS_SYMBOL_ID_PRESENT); }
+    protected final boolean _isSymbolIdPresent(boolean flag) {
+        if (flag) {
+            set_flag(IS_SYMBOL_ID_PRESENT);
+        }
+        else {
+            clear_flag(IS_SYMBOL_ID_PRESENT);
+        }
+        return flag;
+    }
+
     /**
      * Lazy memoized symtab provider. Should be used when a call path
      * conditionally needs access to a value's symbol table. This provider
@@ -283,6 +304,7 @@ public SymbolTable getSymbolTable()
      */
     IonValueLite(IonValueLite existing, IonContext context) {
         // Symbols are *immutable* therefore a shallow copy is sufficient
+        boolean hasSIDsRetained = false;
         if (null == existing._annotations) {
             this._annotations = null;
         } else {
@@ -296,9 +318,9 @@ public SymbolTable getSymbolTable()
                         this._annotations[i] =
                             PrivateUtils.newSymbolToken(text, UNKNOWN_SYMBOL_ID);
                     } else {
-                        // TODO - this is clearly wrong; however was the existing behavior as
-                        // existing under #getAnnotationTypeSymbols();
+                        // TODO - IONJAVA-579 needs consistent handling, should attempt to resolve and if it cant; fail
                         this._annotations[i] = existing._annotations[i];
+                        hasSIDsRetained |= this._annotations[i].getSid() > UNKNOWN_SYMBOL_ID;
                     }
                 }
             }
@@ -310,6 +332,10 @@ public SymbolTable getSymbolTable()
         // as IonValue.clone() mandates that the returned value is mutable, regardless of the
         // existing 'read only' flag - we force the deep-copy back to being mutable
         clear_flag(IS_LOCKED);
+        // whilst the clone *should* guarantee symbol context is purged, the annotation behavior existing above
+        // under the TO DO for IONJAVA-579 does mean that SID context can be propogated through a clone, therefore
+        // the encoding flag has to reflect this reality
+        _isSymbolIdPresent(hasSIDsRetained);
     }
 
     public abstract void accept(ValueVisitor visitor) throws Exception;
@@ -359,6 +385,10 @@ public SymbolTable getSymbolTable()
                 _annotations[ii] = null;
             }
         }
+
+        // although annotations have been removed from the node, which *may* mean the sub-graph from this Node is
+        // now without encodings... the check is expensive for container types (need to check all immediate children)
+        // and so we will opt to clear down encoding present in a lazy fashion (e.g. when something actually needs it)
     }
 
     /**
@@ -475,15 +505,41 @@ public final SymbolToken getKnownFieldNameSymbol()
         return token;
     }
 
+    final boolean clearSymbolIDValues()
+    {
+        // short circuit exit - no SID's present to remove - so can exit immediately
+        if (!_isSymbolIdPresent())
+        {
+            return true;
+        }
+
+        boolean allSIDsRemoved = attemptClearSymbolIDValues();
+        // if all the SID's have been successfully removed - the SID Present flag can be set to false
+        if (allSIDsRemoved)
+        {
+            // clear the symbolID status flag
+            _isSymbolIdPresent(false);
+        }
+        return allSIDsRemoved;
+    }
+
     /**
      * Sets this value's symbol table to null, and erases any SIDs here and
      * recursively.
+     *
+     * @return true if all SID's have been successfully removed, otherwise false
      */
-    void clearSymbolIDValues()
+    boolean attemptClearSymbolIDValues()
     {
+        boolean sidsRemain = false;
         if (_fieldName != null)
         {
             _fieldId = UNKNOWN_SYMBOL_ID;
+        } else if (_fieldId > UNKNOWN_SYMBOL_ID)
+        {
+            // retaining the field SID, as it couldn't be cleared due to loss of context
+            // TODO - for SID handling consistency; this should attempt resolution first
+            sidsRemain = true;
         }
 
         if (_annotations != null)
@@ -496,6 +552,7 @@ void clearSymbolIDValues()
                 if (annotation == null) break;
 
                 String text = annotation.getText();
+                // TODO - for SID handling consistency; this should attempt resolution first, not just drop entry
                 if (text != null && annotation.getSid() != UNKNOWN_SYMBOL_ID)
                 {
                     _annotations[i] =
@@ -503,8 +560,20 @@ void clearSymbolIDValues()
                 }
             }
         }
+
+        return !sidsRemain;
     }
 
+    protected void cascadeSIDPresentToContextRoot() {
+        // start with self
+        IonValueLite node = this;
+        // iterate from leaf to context root setting encoding present until either context root is hit OR a node is
+        // encountered that already has encodings present (and so no further propogation is required).
+        while (null != node && !node._isSymbolIdPresent()) {
+            node._isSymbolIdPresent(true);
+            node = node.getContainer();
+        }
+    }
 
     final void setFieldName(String name)
     {
@@ -525,6 +594,12 @@ final void setFieldNameSymbol(SymbolToken name)
         assert _fieldId == UNKNOWN_SYMBOL_ID && _fieldName == null;
         _fieldName = name.getText();
         _fieldId   = name.getSid();
+
+        // if a SID has been added by this operation to a previously SID-less node we have to mark upwards
+        // towards the context root that a SID is present
+        if (UNKNOWN_SYMBOL_ID != _fieldId && !_isSymbolIdPresent()) {
+            cascadeSIDPresentToContextRoot();
+        }
     }
 
     public final String getFieldName()
@@ -625,6 +700,19 @@ public void setTypeAnnotationSymbols(SymbolToken... annotations)
         else
         {
             _annotations = annotations.clone();
+
+            // new annotations could have SID's - so if this node is not currently marked as SID
+            // present then the new annotations have to be interrogated to see if they contain SID's and if they
+            // do - the SID Present flag must be cascaded.
+            if (!_isSymbolIdPresent()) {
+                for (SymbolToken token : _annotations) {
+                    // upon finding first match of a symbol token containing a SID - cascade upwards and exit
+                    if (null != token && UNKNOWN_SYMBOL_ID != token.getSid()) {
+                        cascadeSIDPresentToContextRoot();
+                        break;
+                    }
+                }
+            }
         }
     }
 
diff --git a/test/AllTests.java b/test/AllTests.java
index b5b44ef293..609b86e896 100644
--- a/test/AllTests.java
+++ b/test/AllTests.java
@@ -71,6 +71,7 @@
 import software.amazon.ion.impl.bin.PooledBlockAllocatorProviderTest;
 import software.amazon.ion.impl.bin.WriteBufferTest;
 import software.amazon.ion.impl.lite.IonContextTest;
+import software.amazon.ion.impl.lite.SIDPresentLifecycleTest;
 import software.amazon.ion.streaming.BadIonStreamingTest;
 import software.amazon.ion.streaming.BinaryStreamingTest;
 import software.amazon.ion.streaming.GoodIonStreamingTest;
@@ -198,6 +199,10 @@
     // Hash code tests
     HashCodeCorrectnessTest.class,
     HashCodeDistributionTest.class,
+    HashCodeDeltaCollisionTest.class,
+
+    // DOM Lifecycle / mode tests
+    SIDPresentLifecycleTest.class,
     HashCodeDeltaCollisionTest.class
 })
 public class AllTests
diff --git a/test/software/amazon/ion/impl/lite/SIDPresentLifecycleTest.java b/test/software/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
new file mode 100644
index 0000000000..d62e8f89fd
--- /dev/null
+++ b/test/software/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
@@ -0,0 +1,224 @@
+package software.amazon.ion.impl.lite;
+
+import software.amazon.ion.IonTestCase;
+import software.amazon.ion.IonValue;
+import software.amazon.ion.SymbolTable;
+import software.amazon.ion.UnknownSymbolException;
+import software.amazon.ion.impl.PrivateUtils;
+import org.junit.Test;
+
+/**
+ * Tests to ensure that the current emerged retention behaviors for SID's across the IonValueLite DOM are correctly
+ * preserved with the symbol ID flag / state management. As of time of authoring the observed behavior for SID
+ * management is as follows:
+ *
+ * -------------------------------------------------------------------------------------------------------
+ * |                     | fieldName                 | annotations               | value (IonSymbolLite) |
+ * |                     | text + SID | SID only     | text + SID | SID only     | text + SID | SID only |
+ * -------------------------------------------------------------------------------------------------------
+ * | <init>              | N/A        | N/A          | N/A        | N/A          | clear      | retain   |
+ * | clone               | clear      | resolve/fail | clear      | retain       | clear      | clear (?)|
+ * | clearSymbolIDValues | clear      | retain       | clear      | clear [null] | clear      | retain   |
+ * | set                 | retain     | retain       | retain     | retain       | N/A        | N/A      |
+ * | get                 | ephemeral  | ephemeral    | ephemeral  | N/A          | ephemeral  | memoizes |
+ * -------------------------------------------------------------------------------------------------------
+ *
+ */
+public class SIDPresentLifecycleTest extends IonTestCase {
+
+    @Test
+    public void testFieldsWithSID() {
+        IonStringLite value = (IonStringLite) system().newString("Test Value");
+        // a new value should create without SID presence as it has no annotations
+        assertFalse(value._isSymbolIdPresent());
+        value.setFieldNameSymbol(PrivateUtils.newSymbolToken("Symbol-With-Sid", 12));
+        // setting a field with a SID means that SID Present now must be true
+        assertTrue(value._isSymbolIdPresent());
+
+        // test clone of the value results in no SID present
+        assertFalse(value.clone()._isSymbolIdPresent());
+
+        // verify detaching from the container clears the SID present flag
+        value.detachFromContainer();
+        assertFalse(value._isSymbolIdPresent());
+
+        //verify that detaching still retains symbols - as SID is still present
+        value.setFieldNameSymbol(PrivateUtils.newSymbolToken(13));
+        assertTrue(value._isSymbolIdPresent());
+        value.clearSymbolIDValues();
+        // NOTE: SID is still present as clearSymbolIDValues doesn't clear SID-only tokens
+        assertEquals(13, value.getFieldNameSymbol().getSid());
+        assertTrue(value._isSymbolIdPresent());
+    }
+
+    @Test
+    public void testAnnotationsWithSIDs() {
+        IonStringLite value = (IonStringLite) system().newString("Test Value 2");
+        // a new value should create without any SID's as it has no annotations
+        assertFalse(value._isSymbolIdPresent());
+        value.setTypeAnnotationSymbols(
+            PrivateUtils.newSymbolToken("Symbol-Without-SID", -1),
+            PrivateUtils.newSymbolToken("Symbol-With-SID", 99));
+        // setting an annotation with a SID means that SID present now must be true
+        assertTrue(value._isSymbolIdPresent());
+
+        // test clone of the value (given no *unresolvable* SID's) results in no SID's present
+        assertFalse(value.clone()._isSymbolIdPresent());
+
+        // ensure that setting annotations that don't have SIDs doesn't change the SID present status (need to wait for
+        // an explicit action such as detatch from container or clone).
+        value.setTypeAnnotationSymbols(PrivateUtils.newSymbolToken("Symbol-Without-Sid", -1));
+        assertTrue(value._isSymbolIdPresent());
+
+        // verify detaching from the container clears the SID Present flag
+        value.detachFromContainer();
+        assertFalse(value._isSymbolIdPresent());
+
+        // verify that where SID context preserves through the clone due to SID context not being known (believed a bug)
+        // that the SID present flag is *retained*
+        value.setTypeAnnotationSymbols(PrivateUtils.newSymbolToken(101));
+        assertTrue(value.clone()._isSymbolIdPresent());
+    }
+
+    @Test
+    public void testPropagationAcrossGraph() {
+        IonStructLite struct = (IonStructLite) system().newEmptyStruct();
+        assertFalse(struct._isSymbolIdPresent());
+
+        // 1. test addition of child by field WITHOUT SID causes no propagation
+        IonStringLite keyValue1 = (IonStringLite) system().newString("Foo");
+        struct.add(PrivateUtils.newSymbolToken("field_1", -1), keyValue1);
+        assertFalse(struct._isSymbolIdPresent());
+        assertFalse(keyValue1._isSymbolIdPresent());
+
+        // 2. test addition of child by field WITH SID but also with field text causes no propagation
+        // (struct only takes field name if present and strips SID)
+        IonStringLite keyValue2 = (IonStringLite) system().newString("Bar");
+        struct.add(PrivateUtils.newSymbolToken("field_2", 87), keyValue2);
+        assertFalse(struct._isSymbolIdPresent());
+        assertFalse(keyValue1._isSymbolIdPresent());
+        assertFalse(keyValue2._isSymbolIdPresent());
+
+        // 3. test addition of child by field with SID ONLY causes propagation due to retention of field SID
+        IonStringLite keyValue3 = (IonStringLite) system().newString("Car");
+        struct.add(PrivateUtils.newSymbolToken(76), keyValue3);
+        assertTrue(struct._isSymbolIdPresent());
+        assertFalse(keyValue1._isSymbolIdPresent());
+        assertFalse(keyValue2._isSymbolIdPresent());
+        assertTrue(keyValue3._isSymbolIdPresent());
+
+        // 4. test explicitly annotating a field propagates
+        IonStructLite struct2 = (IonStructLite) system().newEmptyStruct();
+        IonStringLite keyValue4 = (IonStringLite) system().newString("But");
+        struct2.add("field_1", keyValue4);
+        keyValue4.setTypeAnnotationSymbols(PrivateUtils.newSymbolToken("Lah", 13));
+        assertTrue(struct2._isSymbolIdPresent());
+
+        // 5. test clone propagates clearing of status. NOTE - clone with an unresolvable SID for a field ID fails
+        try {
+            struct.clone();
+            fail("clone was expected NOT to succeed due to behavior at time of writing where unresolvable SID's fail");
+        } catch (UnknownSymbolException use) {
+            // this is expected??! until someone fixed the TO DO in IonValueLite#getFieldName
+        }
+
+        // remove the field without SID such that the clone can be enacted.
+        struct.remove_child(2);
+
+        IonStructLite clonedStruct = struct.clone();
+        assertFalse(clonedStruct._isSymbolIdPresent());
+        for (IonValue value : clonedStruct) {
+            assertFalse(((IonValueLite) value)._isSymbolIdPresent());
+        }
+
+        // 6. ensure clearing symbols propogates from root to impacted leaves
+        // add back in field ID (SID) only child before clearing to test SID retained
+        struct.add(PrivateUtils.newSymbolToken(76), keyValue3);
+        struct.clearSymbolIDValues();
+        assertTrue(struct._isSymbolIdPresent());
+        assertFalse(keyValue1._isSymbolIdPresent());
+        assertFalse(keyValue2._isSymbolIdPresent());
+        assertTrue(keyValue3._isSymbolIdPresent());
+
+        // 7. ensure that nested SID-only annotation clone behavior propogates to cloned root.
+        IonStructLite outer = (IonStructLite) system().newEmptyStruct();
+        IonListLite middle = (IonListLite) system().newEmptyList();
+        IonIntLite inner = (IonIntLite) system().newInt(10);
+        middle.add(inner);
+        outer.put("foo", middle);
+        // now add a SID only annotation to inner
+        inner.setTypeAnnotationSymbols(PrivateUtils.newSymbolToken(99));
+        // verify that all components are signaling SID present
+        assertTrue(outer._isSymbolIdPresent());
+        assertTrue(middle._isSymbolIdPresent());
+        assertTrue(inner._isSymbolIdPresent());
+        // conduct a clone and verify all cloned components have retained SID
+        IonStructLite clonedOuter = outer.clone();
+        assertTrue(clonedOuter._isSymbolIdPresent());
+        IonListLite clonedMiddle = (IonListLite) outer.get("foo");
+        assertTrue(clonedMiddle._isSymbolIdPresent());
+        assertTrue(clonedMiddle.get_child(0)._isSymbolIdPresent());
+    }
+
+    @Test
+    public void testSymbolValueLifecyle() {
+        // test creation from SymbolToken
+        IonSymbolLite symbolLite = (IonSymbolLite) system().newSymbol(PrivateUtils.newSymbolToken("version", 5));
+        // SID isn't present as it is stripped if there is text present
+        assertFalse(symbolLite._isSymbolIdPresent());
+
+        IonListLite container1 = (IonListLite) system().newEmptyList();
+        container1.add(symbolLite);
+        // test propagation of context when symbol context is added
+        assertEquals(5, symbolLite.symbolValue().getSid());
+        // as the getSymbolId memoizes SID into the entity SID present must be set
+        assertTrue(symbolLite._isSymbolIdPresent());
+        // check memoization propagates to container
+        assertTrue(container1._isSymbolIdPresent());
+        container1.clearSymbolIDValues();
+        assertFalse(container1._isSymbolIdPresent());
+        assertFalse(symbolLite._isSymbolIdPresent());
+
+        IonSymbolLite symbolSIDOnly = (IonSymbolLite) system().newSymbol(PrivateUtils.newSymbolToken(321));
+        // SID Present is preserved when only SID is present
+        assertTrue(symbolSIDOnly._isSymbolIdPresent());
+        IonListLite container2 = (IonListLite) system().newEmptyList();
+        container2.add(symbolSIDOnly);
+        assertTrue(container2._isSymbolIdPresent());
+        // clear symbol ID values won't clear the symbolSIDOnly SID value - therefore container2 must still remain
+        // marked as having a SID present
+        container2.clearSymbolIDValues();
+        assertTrue(container2._isSymbolIdPresent());
+        assertTrue(symbolSIDOnly._isSymbolIdPresent());
+    }
+
+    @Test
+    public void testSIDRetentionAcrossObjectHierarchy() {
+        // field ID's can be retained on Container - so ensure these are retained.
+        IonStructLite outer = (IonStructLite) system().newEmptyStruct();
+        IonListLite middle = (IonListLite) system().newEmptyList();
+        IonStringLite inner = (IonStringLite) system().newString("A");
+        outer.add(PrivateUtils.newSymbolToken(321), middle);
+        middle.add(inner);
+        inner.setTypeAnnotationSymbols(PrivateUtils.newSymbolToken("B", 123));
+        assertTrue(outer._isSymbolIdPresent());
+        assertTrue(middle._isSymbolIdPresent());
+        assertTrue(inner._isSymbolIdPresent());
+        outer.clearSymbolIDValues();
+        assertTrue(outer._isSymbolIdPresent());
+        assertTrue(middle._isSymbolIdPresent());
+        assertFalse(inner._isSymbolIdPresent());
+
+        // field ID's can be retained on IonSymbolLite - so ensure these are retained as well.
+        IonStructLite container = (IonStructLite) system().newEmptyStruct();
+        IonSymbolLite symbol = (IonSymbolLite) system().newSymbol(PrivateUtils.newSymbolToken("Foo", 123));
+        container.add(PrivateUtils.newSymbolToken(321), symbol);
+        container.clearSymbolIDValues();
+        assertEquals(SymbolTable.UNKNOWN_SYMBOL_ID, symbol.symbolValue().getSid());
+        assertEquals("Foo", symbol.stringValue());
+        assertEquals(321, symbol.getFieldNameSymbol().getSid());
+        assertTrue(symbol._isSymbolIdPresent());
+
+        assertTrue(container._isSymbolIdPresent());
+    }
+}

From 40e7a3c946e47a6e0f9d1749fa404fb01a435bef Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Thu, 28 Mar 2019 13:57:14 -0700
Subject: [PATCH 054/490] Gzip memleak fix (#224)

Gzip memleak fix

This commit addresses the memleak caused by auto detecting and
uncompressing gzipped ion data by either:
* Fixing the issue when possible, example `IonSystem#singleValue`
* Deprecating methods where a fix is not feasible providing a safe
alternative, example `IonSystem#iterate(InputStream)`

The alternative method takes in an `IonReader` which the user is
responsible for closing. `IonReader` will close all used resources
including the Gzip stream used to decompress which is hidden from users
in the unsafe deprecated methods.

Issues:
* https://github.com/amzn/ion-java/issues/210
* https://github.com/amzn/ion-java/issues/198
---
 src/software/amazon/ion/IonLoader.java        | 26 ++++++
 src/software/amazon/ion/IonSystem.java        | 37 ++++++++-
 .../amazon/ion/impl/PrivateIonSystem.java     |  7 +-
 .../amazon/ion/impl/lite/IonLoaderLite.java   | 28 +++++--
 .../amazon/ion/impl/lite/IonSystemLite.java   | 36 +++++---
 ...ByteArrayIteratorSystemProcessingTest.java |  2 +-
 ...aryStreamIteratorSystemProcessingTest.java |  2 +-
 test/software/amazon/ion/IonSystemTest.java   | 83 +++++++++++++++++++
 ...ByteArrayIteratorSystemProcessingTest.java |  2 +-
 ...extStreamIteratorSystemProcessingTest.java |  2 +-
 .../amazon/ion/impl/IonWriterTestCase.java    |  2 +-
 11 files changed, 194 insertions(+), 33 deletions(-)

diff --git a/src/software/amazon/ion/IonLoader.java b/src/software/amazon/ion/IonLoader.java
index 9b6e7819c5..fe91b340ef 100644
--- a/src/software/amazon/ion/IonLoader.java
+++ b/src/software/amazon/ion/IonLoader.java
@@ -125,6 +125,11 @@ public IonDatagram load(byte[] ionData)
 
 
     /**
+     * <p>
+     * <strong>WARNING: Will cause a memory leak when reading a gzipped stream, use
+     * {@link IonLoader#load(IonReader)} instead.</strong>
+     * </p>
+     *
      * Loads an entire stream of Ion data into a single datagram,
      * detecting whether it's text or binary data.
      * <p>
@@ -144,7 +149,28 @@ public IonDatagram load(byte[] ionData)
      * @throws IonException if there's a syntax error in the Ion content.
      * @throws IOException if reading from the specified input stream results
      * in an <code>IOException</code>.
+     *
+     * @deprecated Will cause a memory leak when reading a gzipped stream.
+     * Use {@link IonLoader#load(IonReader)} instead.
      */
+    @Deprecated
     public IonDatagram load(InputStream ionData)
         throws IonException, IOException;
+
+
+    /**
+     * Loads an entire stream of Ion data into a single datagram,
+     * detecting whether it's text or binary data.
+     * <p>
+     * The specified reader remains open after this method returns.
+     * </p>
+     *
+     * @param reader @param reader source of the Ion data to load.
+     *
+     * @return a datagram containing all the values on the reader; not null.
+     *
+     * @throws NullPointerException if <code>reader</code> is null.
+     * @throws IonException if there's a syntax error in the Ion content.
+     */
+    public IonDatagram load(IonReader reader) throws IonException;
 }
diff --git a/src/software/amazon/ion/IonSystem.java b/src/software/amazon/ion/IonSystem.java
index 5c6da86b36..57c2e92987 100644
--- a/src/software/amazon/ion/IonSystem.java
+++ b/src/software/amazon/ion/IonSystem.java
@@ -236,6 +236,11 @@ public SymbolTable newSharedSymbolTable(String name,
 
 
     /**
+     * <p>
+     * <strong>WARNING: Will cause a memory leak when reading a gzipped stream, use
+     * {@link IonSystem#iterate(IonReader)} instead.</strong>
+     * </p>
+     *
      * Creates an iterator over a stream of Ion data,
      * detecting whether it's text or binary data.
      * Values returned by the iterator have no container.
@@ -262,10 +267,13 @@ public SymbolTable newSharedSymbolTable(String name,
      *
      * @throws NullPointerException if <code>ionData</code> is null.
      * @throws IonException if the source throws {@link IOException}.
+     *
+     * @deprecated Will cause a memory leak when reading a gzipped stream.
+     * Use {@link IonSystem#iterate(IonReader)} instead.
      */
+    @Deprecated
     public Iterator<IonValue> iterate(InputStream ionData);
 
-
     /**
      * Creates an iterator over a string containing Ion text data.
      * Values returned by the iterator have no container.
@@ -281,8 +289,12 @@ public SymbolTable newSharedSymbolTable(String name,
      */
     public Iterator<IonValue> iterate(String ionText);
 
-
     /**
+     * <p>
+     * <strong>WARNING: Will cause a memory leak when reading a gzipped byte[], use
+     * {@link IonSystem#iterate(IonReader)} instead.</strong>
+     * </p>
+     *
      * Creates an iterator over Ion data.
      * Values returned by the iterator have no container.
      * <p>
@@ -299,9 +311,30 @@ public SymbolTable newSharedSymbolTable(String name,
      * @return a new iterator instance.
      *
      * @throws NullPointerException if <code>ionData</code> is null.
+     *
+     * @deprecated Will cause a memory leak when reading a gzipped byte[].
+     * Use {@link IonSystem#iterate(IonReader)} instead.
      */
+    @Deprecated
     public Iterator<IonValue> iterate(byte[] ionData);
 
+    /**
+     * <p>
+     * Creates an iterator over Ion data.
+     * Values returned by the iterator have no container.
+     * </p>
+     * <p>
+     * The iterator will automatically consume Ion system IDs and local symbol
+     * tables; they will not be returned by the iterator.
+     * </p>
+     *
+     * @param reader source of the Ion data to iterate over.
+     *
+     * @return a new iterator instance.
+     *
+     * @throws NullPointerException if <code>reader</code> is null.
+     */
+    public Iterator<IonValue> iterate(IonReader reader);
 
     /**
      * Extracts a single value from Ion text data.
diff --git a/src/software/amazon/ion/impl/PrivateIonSystem.java b/src/software/amazon/ion/impl/PrivateIonSystem.java
index 640d0ae6f8..f2d55b2f60 100644
--- a/src/software/amazon/ion/impl/PrivateIonSystem.java
+++ b/src/software/amazon/ion/impl/PrivateIonSystem.java
@@ -45,12 +45,7 @@ public interface PrivateIonSystem
      */
     public Iterator<IonValue> systemIterate(Reader ionText);
 
-    public Iterator<IonValue> systemIterate(byte[] ionData);
-
-    /**
-     * TODO Must correct amzn/ion-java#14 before exposing this or using from public API.
-     */
-    public Iterator<IonValue> systemIterate(InputStream ionData);
+    public Iterator<IonValue> systemIterate(IonReader reader);
 
     public IonReader newSystemReader(Reader ionText);
 
diff --git a/src/software/amazon/ion/impl/lite/IonLoaderLite.java b/src/software/amazon/ion/impl/lite/IonLoaderLite.java
index 1c50234e65..8dd6d5821e 100644
--- a/src/software/amazon/ion/impl/lite/IonLoaderLite.java
+++ b/src/software/amazon/ion/impl/lite/IonLoaderLite.java
@@ -122,14 +122,19 @@ public IonDatagram load(Reader ionText) throws IonException, IOException
 
     public IonDatagram load(byte[] ionData) throws IonException
     {
+        IonReader reader = makeReader(_catalog, ionData, 0, ionData.length, _lstFactory);
         try {
-            IonReader reader = makeReader(_catalog, ionData, 0, ionData.length, _lstFactory);
-            IonDatagramLite datagram = load_helper(reader);
-            return datagram;
+            return load(reader);
         }
-        catch (IOException e) {
-            throw new IonException(e);
+        finally {
+            try {
+                reader.close();
+            }
+            catch (IOException e) {
+                throw new IonException(e);
+            }
         }
+
     }
 
     public IonDatagram load(InputStream ionData)
@@ -137,8 +142,7 @@ public IonDatagram load(InputStream ionData)
     {
         try {
             IonReader reader = makeReader(_catalog, ionData, _lstFactory);
-            IonDatagramLite datagram = load_helper(reader);
-            return datagram;
+            return load(reader);
         }
         catch (IonException e) {
             IOException io = e.causeOfType(IOException.class);
@@ -147,4 +151,14 @@ public IonDatagram load(InputStream ionData)
         }
     }
 
+    public IonDatagram load(IonReader reader) throws IonException
+    {
+        try {
+            IonDatagramLite datagram = load_helper(reader);
+            return datagram;
+        }
+        catch (IOException e) {
+            throw new IonException(e);
+        }
+    }
 }
diff --git a/src/software/amazon/ion/impl/lite/IonSystemLite.java b/src/software/amazon/ion/impl/lite/IonSystemLite.java
index ff74dd44ee..db49fd6688 100644
--- a/src/software/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/software/amazon/ion/impl/lite/IonSystemLite.java
@@ -179,9 +179,9 @@ public Iterator<IonValue> iterate(Reader ionText)
 
     public Iterator<IonValue> iterate(InputStream ionData)
     {
+        // This method causes a memory leak when reading a gzipped stream, see deprecation notice.
         IonReader reader = makeReader(_catalog, ionData, _lstFactory);
-        ReaderIterator iterator = new ReaderIterator(this, reader);
-        return iterator;
+        return iterate(reader);
     }
 
     public Iterator<IonValue> iterate(String ionText)
@@ -193,7 +193,13 @@ public Iterator<IonValue> iterate(String ionText)
 
     public Iterator<IonValue> iterate(byte[] ionData)
     {
+        // This method causes a memory leak when reading a gzipped stream, see deprecation notice.
         IonReader reader = makeReader(_catalog, ionData, _lstFactory);
+        return iterate(reader);
+    }
+
+    public Iterator<IonValue> iterate(IonReader reader)
+    {
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
@@ -494,8 +500,19 @@ public IonValue singleValue(String ionText)
 
     public IonValue singleValue(byte[] ionData)
     {
-        Iterator<IonValue> it = iterate(ionData);
-        return singleValue(it);
+        IonReader reader = newReader(ionData);
+        try {
+            Iterator<IonValue> it = iterate(reader);
+            return singleValue(it);
+        }
+        finally {
+            try {
+                reader.close();
+            }
+            catch (IOException e) {
+                throw new IonException(e);
+            }
+        }
     }
 
     protected IonSymbolLite newSystemIdSymbol(String ionVersionMarker)
@@ -756,16 +773,9 @@ public Iterator<IonValue> systemIterate(String ionText)
         return PrivateUtils.iterate(this, ir);
     }
 
-    public Iterator<IonValue> systemIterate(InputStream ionData)
+    public Iterator<IonValue> systemIterate(IonReader reader)
     {
-        IonReader ir = newSystemReader(ionData);
-        return PrivateUtils.iterate(this, ir);
-    }
-
-    public Iterator<IonValue> systemIterate(byte[] ionData)
-    {
-        IonReader ir = newSystemReader(ionData);
-        return PrivateUtils.iterate(this, ir);
+        return PrivateUtils.iterate(this, reader);
     }
 
 
diff --git a/test/software/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java b/test/software/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
index b85cba9ac1..7602be6b37 100644
--- a/test/software/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
@@ -41,6 +41,6 @@ protected Iterator<IonValue> iterate()
     @Override
     protected Iterator<IonValue> systemIterate()
     {
-        return system().systemIterate(myBytes);
+        return system().systemIterate(system().newSystemReader(myBytes));
     }
 }
diff --git a/test/software/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java b/test/software/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
index 381a01a277..9188d92388 100644
--- a/test/software/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
@@ -45,6 +45,6 @@ protected Iterator<IonValue> iterate()
     @Override
     protected Iterator<IonValue> systemIterate()
     {
-        return system().systemIterate(myStream);
+        return system().systemIterate(system().newSystemReader(myStream));
     }
 }
diff --git a/test/software/amazon/ion/IonSystemTest.java b/test/software/amazon/ion/IonSystemTest.java
index c1ca0748e3..f0170c82c9 100644
--- a/test/software/amazon/ion/IonSystemTest.java
+++ b/test/software/amazon/ion/IonSystemTest.java
@@ -341,4 +341,87 @@ public void testGzipDetection()
         checkGzipDetection(binaryBytes);
         checkGzipDetection(gzipBinaryBytes);
     }
+
+    private byte[] toBinaryIon(String text) throws IOException
+    {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonReader ionReader = system().newReader(text);
+        IonWriter ionWriter = system().newBinaryWriter(out);
+        ionWriter.writeValues(ionReader);
+        ionWriter.close();
+        ionReader.close();
+        return out.toByteArray();
+    }
+
+    @Test
+    public void singleValueTextGzip() throws IOException
+    {
+        String ionText = "1234";
+        byte[] textBytes = PrivateUtils.utf8(ionText);
+        byte[] gzipTextBytes = gzip(textBytes);
+        IonInt ionValue = (IonInt) system().singleValue(gzipTextBytes);
+
+        assertEquals(1234, ionValue.intValue());
+    }
+
+    @Test
+    public void singleValueBinaryGzip() throws IOException
+    {
+        String ionText = "1234";
+        byte[] binaryIon = toBinaryIon(ionText);
+        byte[] gzipBytes = gzip(binaryIon);
+        IonInt ionValue = (IonInt) system().singleValue(gzipBytes);
+
+        assertEquals(1234, ionValue.intValue());
+    }
+
+    @Test
+    public void iterateReader() throws IOException
+    {
+        String ionText = "1 2 3 4";
+        IonReader ionReader = system().newReader(ionText);
+
+        Iterator<IonValue> iterate = system().iterate(ionReader);
+
+        assertTrue(iterate.hasNext());
+        assertEquals(1, ((IonInt) iterate.next()).intValue());
+
+        assertTrue(iterate.hasNext());
+        assertEquals(2, ((IonInt) iterate.next()).intValue());
+
+        assertTrue(iterate.hasNext());
+        assertEquals(3, ((IonInt) iterate.next()).intValue());
+
+        assertTrue(iterate.hasNext());
+        assertEquals(4, ((IonInt) iterate.next()).intValue());
+
+        assertFalse(iterate.hasNext());
+
+        ionReader.close();
+    }
+
+    @Test
+    public void systemIterateReader() throws IOException
+    {
+        String ionText = "1 2 3 4";
+        IonReader ionReader = system().newSystemReader(ionText);
+
+        Iterator<IonValue> iterate = system().systemIterate(ionReader);
+
+        assertTrue(iterate.hasNext());
+        assertEquals(1, ((IonInt) iterate.next()).intValue());
+
+        assertTrue(iterate.hasNext());
+        assertEquals(2, ((IonInt) iterate.next()).intValue());
+
+        assertTrue(iterate.hasNext());
+        assertEquals(3, ((IonInt) iterate.next()).intValue());
+
+        assertTrue(iterate.hasNext());
+        assertEquals(4, ((IonInt) iterate.next()).intValue());
+
+        assertFalse(iterate.hasNext());
+
+        ionReader.close();
+    }
 }
diff --git a/test/software/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java b/test/software/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
index 5cc4ed4b98..2115881ff4 100644
--- a/test/software/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
@@ -40,6 +40,6 @@ protected Iterator<IonValue> iterate()
     @Override
     protected Iterator<IonValue> systemIterate()
     {
-        return system().systemIterate(myBytes);
+        return system().systemIterate(system().newSystemReader(myBytes));
     }
 }
diff --git a/test/software/amazon/ion/TextStreamIteratorSystemProcessingTest.java b/test/software/amazon/ion/TextStreamIteratorSystemProcessingTest.java
index 50a189e8ac..a716a80ef7 100644
--- a/test/software/amazon/ion/TextStreamIteratorSystemProcessingTest.java
+++ b/test/software/amazon/ion/TextStreamIteratorSystemProcessingTest.java
@@ -45,6 +45,6 @@ protected Iterator<IonValue> iterate()
     @Override
     protected Iterator<IonValue> systemIterate()
     {
-        return system().systemIterate(myStream);
+        return system().systemIterate(system().newSystemReader(myStream));
     }
 }
diff --git a/test/software/amazon/ion/impl/IonWriterTestCase.java b/test/software/amazon/ion/impl/IonWriterTestCase.java
index 6cf30dfbc3..79690fbfb4 100644
--- a/test/software/amazon/ion/impl/IonWriterTestCase.java
+++ b/test/software/amazon/ion/impl/IonWriterTestCase.java
@@ -810,7 +810,7 @@ Iterator<IonValue> systemIterateOutput()
         throws Exception
     {
         byte[] data = outputByteArray();
-        Iterator<IonValue> it = system().systemIterate(data);
+        Iterator<IonValue> it = system().systemIterate(system().newSystemReader(data));
         return it;
     }
 

From d5939190808b815ec940ef5d45db0d39e9c3fb63 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Thu, 11 Apr 2019 11:37:21 -0700
Subject: [PATCH 055/490] Import of Amazon IonJava with com.amazon.ion

Re-importing ion-java to keep the original com.amazon.ion groupId and
java package name to maintain naming consistency with other Amazon open
source projects.

Also updates all copyright notices
---
 .classpath                                    |    8 -
 .gitignore                                    |    3 +-
 .gitmodules                                   |    1 -
 .project                                      |   15 -
 .settings/AllTests.launch                     |   18 -
 .../de.loskutov.anyedit.AnyEditTools.prefs    |   13 -
 .settings/org.eclipse.jdt.core.prefs          |  354 --
 .settings/org.eclipse.jdt.ui.prefs            |  116 -
 .settings/org.eclipse.wst.validation.prefs    |    6 -
 .travis.yml                                   |   32 +-
 CODE_OF_CONDUCT.md                            |    6 +-
 CONTRIBUTING.md                               |   16 +-
 LICENSE                                       |    2 +-
 NOTICE                                        |    2 +-
 README.md                                     |   10 +-
 ion-tests                                     |    2 +-
 pom.xml                                       |   51 +-
 .../amazon/ion/ContainedValueException.java   |   40 +
 src/{software => com}/amazon/ion/Decimal.java |   39 +-
 src/com/amazon/ion/EmptySymbolException.java  |   35 +
 .../amazon/ion/IntegerSize.java               |   17 +-
 .../ion/InvalidSystemSymbolException.java     |   42 +
 src/com/amazon/ion/IonBinaryWriter.java       |   85 +
 src/{software => com}/amazon/ion/IonBlob.java |   15 +-
 src/{software => com}/amazon/ion/IonBool.java |   15 +-
 .../amazon/ion/IonCatalog.java                |   21 +-
 src/{software => com}/amazon/ion/IonClob.java |   15 +-
 .../amazon/ion/IonContainer.java              |   15 +-
 .../amazon/ion/IonDatagram.java               |   92 +-
 .../amazon/ion/IonDecimal.java                |   15 +-
 .../amazon/ion/IonException.java              |   15 +-
 .../amazon/ion/IonFloat.java                  |   15 +-
 src/{software => com}/amazon/ion/IonInt.java  |   15 +-
 src/{software => com}/amazon/ion/IonList.java |   15 +-
 .../amazon/ion/IonLoader.java                 |   15 +-
 src/{software => com}/amazon/ion/IonLob.java  |   15 +-
 .../amazon/ion/IonMutableCatalog.java         |   15 +-
 src/{software => com}/amazon/ion/IonNull.java |   15 +-
 .../amazon/ion/IonNumber.java                 |   17 +-
 .../amazon/ion/IonReader.java                 |   59 +-
 .../amazon/ion/IonSequence.java               |   15 +-
 src/{software => com}/amazon/ion/IonSexp.java |   15 +-
 .../amazon/ion/IonString.java                 |   15 +-
 .../amazon/ion/IonStruct.java                 |   15 +-
 .../amazon/ion/IonSymbol.java                 |   30 +-
 .../amazon/ion/IonSystem.java                 |   60 +-
 src/{software => com}/amazon/ion/IonText.java |   15 +-
 src/com/amazon/ion/IonTextReader.java         |   35 +
 .../amazon/ion/IonTimestamp.java              |   17 +-
 src/{software => com}/amazon/ion/IonType.java |   17 +-
 .../amazon/ion/IonValue.java                  |   43 +-
 .../amazon/ion/IonWriter.java                 |   73 +-
 .../amazon/ion/NullValueException.java        |   16 +-
 .../amazon/ion/OffsetSpan.java                |   19 +-
 src/com/amazon/ion/RawValueSpanProvider.java  |   59 +
 .../amazon/ion/ReadOnlyValueException.java    |   15 +-
 .../amazon/ion/SeekableReader.java            |   15 +-
 src/{software => com}/amazon/ion/Span.java    |   19 +-
 .../amazon/ion/SpanProvider.java              |   15 +-
 .../ion/SubstituteSymbolTableException.java   |   17 +-
 .../amazon/ion/SymbolTable.java               |   21 +-
 .../amazon/ion/SymbolToken.java               |   15 +-
 .../amazon/ion/SystemSymbols.java             |   15 +-
 .../amazon/ion/TextSpan.java                  |   19 +-
 .../amazon/ion/Timestamp.java                 |  173 +-
 .../amazon/ion/UnexpectedEofException.java    |   16 +-
 .../amazon/ion/UnknownSymbolException.java    |   15 +-
 .../ion/UnsupportedIonVersionException.java   |   15 +-
 .../amazon/ion/ValueFactory.java              |   74 +-
 .../amazon/ion/ValueVisitor.java              |   17 +-
 .../amazon/ion/apps/BaseApp.java              |   29 +-
 src/com/amazon/ion/apps/EncodeApp.java        |  175 +
 .../amazon/ion/apps/PrintApp.java             |   23 +-
 .../amazon/ion/apps/SymtabApp.java            |   40 +-
 .../amazon/ion/facet/Faceted.java             |   15 +-
 .../amazon/ion/facet/Facets.java              |   15 +-
 .../ion/facet/UnsupportedFacetException.java  |   15 +-
 .../amazon/ion/facet/package-info.java        |   21 +-
 .../ion/impl/AppendableFastAppendable.java    |   21 +-
 .../amazon/ion/impl/Base64Encoder.java        |   36 +-
 src/com/amazon/ion/impl/BlockedBuffer.java    | 1778 ++++++++++
 src/com/amazon/ion/impl/ByteBuffer.java       |   72 +
 src/com/amazon/ion/impl/ByteReader.java       |  185 ++
 src/com/amazon/ion/impl/ByteWriter.java       |   53 +
 .../amazon/ion/impl/DowncastingFaceted.java   |   19 +-
 src/com/amazon/ion/impl/IonBinary.java        | 2942 +++++++++++++++++
 .../amazon/ion/impl/IonCharacterReader.java   |  284 ++
 .../amazon/ion/impl/IonIteratorImpl.java      |   39 +-
 src/com/amazon/ion/impl/IonMessages.java      |   24 +
 .../amazon/ion/impl/IonReaderBinaryRawX.java  |  161 +-
 .../ion/impl/IonReaderBinarySystemX.java      |  107 +-
 .../amazon/ion/impl/IonReaderBinaryUserX.java |  173 +-
 .../ion/impl/IonReaderTextRawTokensX.java     |   51 +-
 .../amazon/ion/impl/IonReaderTextRawX.java    |   61 +-
 .../amazon/ion/impl/IonReaderTextSystemX.java |   78 +-
 .../amazon/ion/impl/IonReaderTextUserX.java   |   56 +-
 .../amazon/ion/impl/IonReaderTreeSystem.java  |  103 +-
 .../amazon/ion/impl/IonReaderTreeUserX.java   |   60 +-
 .../ion/impl/IonTextBufferedStream.java       |  311 ++
 .../amazon/ion/impl/IonTokenConstsX.java      |   21 +-
 src/com/amazon/ion/impl/IonTokenReader.java   | 1623 +++++++++
 .../amazon/ion/impl/IonUTF8.java              |   17 +-
 .../amazon/ion/impl/IonWriterSystem.java      |  128 +-
 .../ion/impl/IonWriterSystemBinary.java       | 1050 ++++++
 .../amazon/ion/impl/IonWriterSystemText.java  |   82 +-
 .../ion/impl/IonWriterSystemTextMarkup.java   |  266 ++
 .../amazon/ion/impl/IonWriterSystemTree.java  |   78 +-
 .../amazon/ion/impl/IonWriterUser.java        |   53 +-
 .../amazon/ion/impl/IonWriterUserBinary.java  |  158 +
 .../amazon/ion/impl/LocalSymbolTable.java     |   79 +-
 .../ion/impl/LocalSymbolTableAsStruct.java    |   57 +-
 .../ion/impl/LocalSymbolTableImports.java     |   24 +-
 .../ion/impl/OutputStreamFastAppendable.java  |   23 +-
 .../amazon/ion/impl/SharedSymbolTable.java    |   59 +-
 src/com/amazon/ion/impl/SimpleByteBuffer.java | 1386 ++++++++
 .../ion/impl/SubstituteSymbolTable.java       |   25 +-
 .../amazon/ion/impl/SymbolTableReader.java    |  126 +-
 src/com/amazon/ion/impl/SymbolTokenImpl.java  |   93 +
 .../amazon/ion/impl/SystemValueIterator.java  |   88 +
 .../amazon/ion/impl/UnifiedDataPageX.java     |   15 +-
 .../amazon/ion/impl/UnifiedInputBufferX.java  |   15 +-
 .../amazon/ion/impl/UnifiedInputStreamX.java  |   19 +-
 .../ion/impl/UnifiedSavePointManagerX.java    |   15 +-
 .../ion/impl/_Private_ByteTransferReader.java |   29 +
 .../ion/impl/_Private_ByteTransferSink.java}  |   22 +-
 .../ion/impl/_Private_CallbackBuilder.java    |   30 +
 .../ion/impl/_Private_CommandLine.java}       |   49 +-
 .../impl/_Private_CurriedValueFactory.java}   |   87 +-
 .../_Private_FastAppendableDecorator.java}    |   28 +-
 .../_Private_FastAppendableTrampoline.java    |   38 +
 .../_Private_IonBinaryWriterBuilder.java}     |  163 +-
 .../impl/_Private_IonBinaryWriterImpl.java    |   84 +
 .../ion/impl/_Private_IonConstants.java}      |   34 +-
 .../ion/impl/_Private_IonContainer.java       |   32 +
 .../amazon/ion/impl/_Private_IonDatagram.java |   28 +
 .../ion/impl/_Private_IonReaderFactory.java}  |  105 +-
 .../amazon/ion/impl/_Private_IonSymbol.java}  |   26 +-
 .../amazon/ion/impl/_Private_IonSystem.java}  |   40 +-
 .../ion/impl/_Private_IonTextAppender.java}   |   70 +-
 .../impl/_Private_IonTextWriterBuilder.java   |  305 ++
 .../amazon/ion/impl/_Private_IonValue.java}   |   28 +-
 .../amazon/ion/impl/_Private_IonWriter.java}  |   32 +-
 .../ion/impl/_Private_IonWriterBase.java}     |   76 +-
 .../ion/impl/_Private_IonWriterFactory.java}  |   34 +-
 .../amazon/ion/impl/_Private_ListWriter.java} |   24 +-
 .../_Private_LocalSymbolTableFactory.java}    |   27 +-
 .../ion/impl/_Private_MarkupCallback.java     |  352 ++
 .../ion/impl/_Private_ReaderWriter.java       |   27 +
 .../ion/impl/_Private_ScalarConversions.java} |   34 +-
 .../amazon/ion/impl/_Private_SymbolToken.java |   31 +
 .../impl/_Private_SymtabExtendsCache.java}    |   25 +-
 .../amazon/ion/impl/_Private_Utils.java}      |  156 +-
 .../ion/impl/_Private_ValueFactory.java}      |   23 +-
 .../ion/impl/bin/AbstractIonWriter.java       |   95 +-
 .../ion/impl/bin/AbstractSymbolTable.java     |   44 +-
 .../amazon/ion/impl/bin/Block.java            |   15 +-
 .../amazon/ion/impl/bin/BlockAllocator.java   |   15 +-
 .../ion/impl/bin/BlockAllocatorProvider.java  |   15 +-
 .../ion/impl/bin/BlockAllocatorProviders.java |   15 +-
 .../ion/impl/bin/IonBinaryWriterAdapter.java  |  268 ++
 .../ion/impl/bin/IonManagedBinaryWriter.java  |  124 +-
 .../ion/impl/bin/IonRawBinaryWriter.java      |  206 +-
 .../bin/PooledBlockAllocatorProvider.java     |   15 +-
 .../amazon/ion/impl/bin/Symbols.java          |   61 +-
 .../amazon/ion/impl/bin/WriteBuffer.java      |   19 +-
 .../impl/bin/_PrivateIon_HashTrampoline.java  |   44 +
 ...rivate_IonManagedBinaryWriterBuilder.java} |  106 +-
 .../impl/bin/_Private_IonManagedWriter.java   |   64 +
 .../ion/impl/bin/_Private_IonRawWriter.java   |   84 +
 src/com/amazon/ion/impl/bin/package-info.java |   51 +
 .../ion/impl/lite/ContainerlessContext.java   |   17 +-
 .../amazon/ion/impl/lite/IonBlobLite.java     |   28 +-
 .../amazon/ion/impl/lite/IonBoolLite.java     |   26 +-
 .../amazon/ion/impl/lite/IonClobLite.java     |   28 +-
 .../ion/impl/lite/IonContainerLite.java       |   83 +-
 .../amazon/ion/impl/lite/IonContext.java      |   19 +-
 .../amazon/ion/impl/lite/IonDatagramLite.java |   87 +-
 .../amazon/ion/impl/lite/IonDecimalLite.java  |   28 +-
 .../amazon/ion/impl/lite/IonFloatLite.java    |   28 +-
 .../amazon/ion/impl/lite/IonIntLite.java      |   29 +-
 .../amazon/ion/impl/lite/IonListLite.java     |   28 +-
 .../amazon/ion/impl/lite/IonLoaderLite.java   |   42 +-
 .../amazon/ion/impl/lite/IonLobLite.java      |   18 +-
 .../amazon/ion/impl/lite/IonNullLite.java     |   24 +-
 .../amazon/ion/impl/lite/IonSequenceLite.java |   38 +-
 .../amazon/ion/impl/lite/IonSexpLite.java     |   28 +-
 .../amazon/ion/impl/lite/IonStringLite.java   |   24 +-
 .../amazon/ion/impl/lite/IonStructLite.java   |   46 +-
 .../amazon/ion/impl/lite/IonSymbolLite.java   |  159 +-
 .../amazon/ion/impl/lite/IonSystemLite.java   |  152 +-
 .../amazon/ion/impl/lite/IonTextLite.java     |   18 +-
 .../ion/impl/lite/IonTimestampLite.java       |   32 +-
 .../amazon/ion/impl/lite/IonValueLite.java    |  127 +-
 .../ion/impl/lite/ReverseBinaryEncoder.java   |  177 +-
 .../amazon/ion/impl/lite/TopLevelContext.java |   19 +-
 .../ion/impl/lite/ValueFactoryLite.java       |   48 +-
 .../lite/_Private_LiteDomTrampoline.java}     |   36 +-
 .../amazon/ion/overview.html                  |   85 +-
 src/com/amazon/ion/package-info.java          |   19 +
 .../ion/system/IonBinaryWriterBuilder.java    |   30 +-
 .../amazon/ion/system/IonReaderBuilder.java   |   32 +-
 .../amazon/ion/system/IonSystemBuilder.java   |   56 +-
 .../ion/system/IonTextWriterBuilder.java      |   56 +-
 .../amazon/ion/system/IonWriterBuilder.java   |   25 +-
 .../ion/system/IonWriterBuilderBase.java      |   22 +-
 .../amazon/ion/system/SimpleCatalog.java      |   21 +-
 src/com/amazon/ion/system/SystemFactory.java  |   66 +
 src/com/amazon/ion/system/package-info.java   |   19 +
 .../amazon/ion/util/AbstractValueVisitor.java |   49 +-
 .../amazon/ion/util/Equivalence.java          |   68 +-
 .../amazon/ion/util/GzipOrRawInputStream.java |   15 +-
 .../amazon/ion/util/IonStreamUtils.java       |   61 +-
 .../amazon/ion/util/IonTextUtils.java         |   68 +-
 .../amazon/ion/util/IonValueUtils.java        |   17 +-
 .../amazon/ion/util/JarInfo.java              |   21 +-
 src/com/amazon/ion/util/Printer.java          | 1160 +++++++
 .../amazon/ion/util/Spans.java                |   21 +-
 .../ion/util/_Private_FastAppendable.java}    |   22 +-
 src/com/amazon/ion/util/package-info.java     |   19 +
 .../amazon/ion/ContainedValueException.java   |   28 -
 .../amazon/ion/EmptySymbolException.java      |   24 -
 .../ion/InvalidSystemSymbolException.java     |   31 -
 src/software/amazon/ion/impl/IonMessages.java |   22 -
 .../ion/impl/PrivateByteTransferReader.java   |   31 -
 .../impl/PrivateFastAppendableTrampoline.java |   38 -
 .../amazon/ion/impl/PrivateIonContainer.java  |   32 -
 .../amazon/ion/impl/PrivateIonDatagram.java   |   28 -
 .../ion/impl/PrivateIonTextWriterBuilder.java |  250 --
 .../amazon/ion/impl/PrivateReaderWriter.java  |   27 -
 .../amazon/ion/impl/SymbolTokenImpl.java      |   68 -
 .../impl/bin/PrivateIonHashTrampoline.java    |   29 -
 .../amazon/ion/impl/bin/package-info.java     |   50 -
 src/software/amazon/ion/package-info.java     |   18 -
 .../amazon/ion/system/package-info.java       |   18 -
 .../amazon/ion/util/package-info.java         |   18 -
 test/AllTests.java                            |  193 +-
 .../amazon/ion/AnnotationEscapesTest.java     |   16 +-
 .../amazon/ion/AssertionsEnabledTest.java     |   16 +-
 .../amazon/ion/BadIonTest.java                |   28 +-
 ...ByteArrayIteratorSystemProcessingTest.java |   16 +-
 .../ion/BinaryReaderSystemProcessingTest.java |   20 +-
 .../BinaryReaderWrappedValueLengthTest.java   |   20 +-
 ...aryStreamIteratorSystemProcessingTest.java |   16 +-
 .../amazon/ion/BinaryTest.java                |   21 +-
 .../amazon/ion/BitUtils.java                  |   15 +-
 .../amazon/ion/BlobTest.java                  |   28 +-
 .../amazon/ion/BoolTest.java                  |   20 +-
 .../{software => com}/amazon/ion/Checker.java |   16 +-
 .../amazon/ion/ClobTest.java                  |   26 +-
 .../amazon/ion/CloneTest.java                 |   32 +-
 .../amazon/ion/ContainerTestCase.java         |   35 +-
 .../DatagramIteratorSystemProcessingTest.java |   19 +-
 .../amazon/ion/DatagramMaker.java             |   26 +-
 .../amazon/ion/DatagramTest.java              |  101 +-
 ...atagramTreeReaderSystemProcessingTest.java |   22 +-
 .../amazon/ion/DecimalTest.java               |   33 +-
 .../amazon/ion/EquivTimelineTest.java         |   27 +-
 test/com/amazon/ion/EquivsTest.java           |   34 +
 .../amazon/ion/EquivsTestCase.java            |   40 +-
 .../amazon/ion/ExtendedDecimalTest.java       |   18 +-
 .../amazon/ion/FakeSymbolToken.java           |   18 +-
 .../amazon/ion/FieldNameEscapesTest.java      |   17 +-
 .../amazon/ion/FloatTest.java                 |   19 +-
 .../amazon/ion/GoodIonTest.java               |   52 +-
 .../amazon/ion/HashCodeCorrectnessTest.java   |   26 +-
 .../ion/HashCodeDeltaCollisionTest.java       |   35 +-
 .../amazon/ion/HashCodeDistributionTest.java  |   29 +-
 .../amazon/ion/InputStreamWrapper.java        |   15 +-
 .../{software => com}/amazon/ion/IntTest.java |   16 +-
 .../amazon/ion/IonExceptionTest.java          |   17 +-
 .../com/amazon/ion/IonRawWriterBasicTest.java |  255 ++
 .../amazon/ion/IonRawWriterSymbolsTest.java   |  477 +++
 .../amazon/ion/IonReaderToIonValueTest.java   |   19 +-
 .../amazon/ion/IonSystemTest.java             |   44 +-
 .../amazon/ion/IonTestCase.java               |  200 +-
 .../amazon/ion/IonValueChecker.java           |   26 +-
 .../amazon/ion/IonValueDeltaGenerator.java    |   54 +-
 .../amazon/ion/IonValueTest.java              |   37 +-
 .../ion/IteratorSystemProcessingTestCase.java |   21 +-
 .../amazon/ion/JavaNumericsTest.java          |   15 +-
 ...avaReaderIteratorSystemProcessingTest.java |   16 +-
 .../amazon/ion/ListTest.java                  |   41 +-
 .../LoadBinaryBytesSystemProcessingTest.java  |   19 +-
 .../LoadBinaryStreamSystemProcessingTest.java |   18 +-
 .../LoadTextBytesSystemProcessingTest.java    |   22 +-
 .../LoadTextStreamSystemProcessingTest.java   |   22 +-
 .../amazon/ion/LoaderTest.java                |   38 +-
 .../amazon/ion/LongStringTest.java            |   16 +-
 ...wDatagramIteratorSystemProcessingTest.java |   19 +-
 test/com/amazon/ion/NonEquivsTest.java        |   35 +
 .../amazon/ion/NopPaddingTest.java            |   15 +-
 .../amazon/ion/NullTest.java                  |   21 +-
 .../ion/RawValueSpanReaderBasicTest.java      |  154 +
 .../amazon/ion/ReaderChecker.java             |   35 +-
 .../amazon/ion/ReaderMaker.java               |   34 +-
 .../ion/ReaderSystemProcessingTestCase.java   |   41 +-
 .../amazon/ion/RoundTripTest.java             |   80 +-
 .../amazon/ion/SequenceTestCase.java          |   33 +-
 .../amazon/ion/SexpTest.java                  |   44 +-
 .../amazon/ion/SharedSymtabMaker.java         |   38 +-
 .../ion/StringFieldNameEscapesTest.java       |   17 +-
 .../amazon/ion/StringTest.java                |   19 +-
 .../amazon/ion/StructTest.java                |   52 +-
 .../amazon/ion/SurrogateEscapeTest.java       |   28 +-
 .../amazon/ion/SymbolTest.java                |   35 +-
 .../amazon/ion/SystemProcessingTestCase.java  |   44 +-
 .../amazon/ion/SystemProcessingTests.java     |   16 +-
 .../amazon/ion/TestUtils.java                 |   56 +-
 ...ByteArrayIteratorSystemProcessingTest.java |   20 +-
 .../ion/TextIteratorSystemProcessingTest.java |   20 +-
 .../ion/TextReaderSystemProcessingTest.java   |   19 +-
 ...extStreamIteratorSystemProcessingTest.java |   20 +-
 .../amazon/ion/TextTestCase.java              |   20 +-
 .../amazon/ion/TimestampBadTest.java          |   30 +-
 .../amazon/ion/TimestampGoodTest.java         |   32 +-
 .../amazon/ion/TimestampTest.java             |  274 +-
 .../amazon/ion/TrBwBrProcessingTest.java      |   20 +-
 .../amazon/ion/TrueSequenceTestCase.java      |   42 +-
 .../amazon/ion/ValueFactorySequenceTest.java  |   41 +-
 .../amazon/ion/facet/FacetsTest.java          |   24 +-
 .../amazon/ion/impl/BinaryWriterTest.java     |   39 +-
 .../BinaryWriterWithLocalSymtabsTest.java     |   36 +-
 test/com/amazon/ion/impl/ByteBufferTest.java  |  399 +++
 .../amazon/ion/impl/CharacterReaderTest.java  |  248 ++
 .../com/amazon/ion/impl/EscapingCallback.java |  128 +
 .../com/amazon/ion/impl/IonImplUtilsTest.java |   40 +
 .../ion/impl/IonMarkupWriterFilesTest.java    |   81 +
 .../amazon/ion/impl/IonMarkupWriterTest.java  |  143 +
 .../amazon/ion/impl/IonUTF8Test.java          |   17 +-
 .../amazon/ion/impl/IonWriterTestCase.java    |  125 +-
 .../amazon/ion/impl/IonWriterTests.java       |   17 +-
 .../amazon/ion/impl/IterationTest.java        |   23 +-
 .../amazon/ion/impl/LocalSymbolTableTest.java |   38 +-
 .../amazon/ion/impl/OldBinaryWriterTest.java  |   57 +
 ...timizedBinaryWriterLengthPatchingTest.java |   37 +-
 .../OptimizedBinaryWriterSymbolTableTest.java |   38 +-
 .../impl/OptimizedBinaryWriterTestCase.java   |   60 +-
 .../ion/impl/OutputStreamWriterTestCase.java  |   42 +-
 .../ion/impl/RawValueSpanReaderTest.java      |  325 ++
 .../ion/impl/SharedSymbolTableTest.java       |   49 +-
 .../amazon/ion/impl/SymbolTableTest.java      |  107 +-
 .../amazon/ion/impl/Symtabs.java              |   56 +-
 .../amazon/ion/impl/TestMarkupCallback.java   |  148 +
 .../amazon/ion/impl/TextWriterTest.java       |   56 +-
 .../amazon/ion/impl/TreeReaderTest.java       |   34 +-
 .../ion/impl/UnifiedInputStreamXTest.java     |   15 +-
 .../amazon/ion/impl/ValueWriterTest.java      |   36 +-
 .../amazon/ion/impl/VarIntTest.java           |   27 +-
 .../impl/_Private_ScalarConversionsTest.java  |   44 +
 .../impl/bin/IonManagedBinaryWriterTest.java  |   45 +-
 .../ion/impl/bin/IonRawBinaryWriterTest.java  |  160 +-
 .../bin/PooledBlockAllocatorProviderTest.java |   18 +-
 .../amazon/ion/impl/bin/WriteBufferTest.java  |   20 +-
 .../BaseIonSequenceLiteSublistTestCase.java   |   29 +-
 .../lite/BaseIonSequenceLiteTestCase.java     |   35 +-
 .../amazon/ion/impl/lite/IonContextTest.java  |   49 +-
 .../impl/lite/IonDatagramLiteSublistTest.java |   31 +
 .../ion/impl/lite/IonDatagramLiteTest.java    |   25 +
 .../amazon/ion/impl/lite/IonListLiteTest.java |   25 +
 .../impl/lite/IonListSexpLiteSublistTest.java |   29 +-
 .../amazon/ion/impl/lite/IonSexpLiteTest.java |   25 +
 .../impl/lite/SIDPresentLifecycleTest.java    |   71 +-
 .../amazon/ion/junit/Injected.java            |   32 +-
 .../amazon/ion/junit/IonAssert.java           |  121 +-
 .../amazon/ion/profile/IteratorTiming.java    |   22 +-
 .../ion/streaming/BadIonStreamingTest.java    |   71 +
 .../ion/streaming/BinaryStreamingTest.java    |  200 +-
 .../ion/streaming/GoodIonStreamingTest.java   |   33 +-
 .../ion/streaming/InputStreamReaderTest.java  |   28 +-
 .../ion/streaming/MiscStreamingTest.java      |   63 +-
 .../streaming/NonOffsetSpanReaderTest.java    |   23 +-
 .../ion/streaming/NonSeekableReaderTest.java  |   21 +-
 .../ion/streaming/NonSpanReaderTest.java      |   21 +-
 .../amazon/ion/streaming/NonTextSpanTest.java |   23 +-
 .../streaming/OffsetSpanBinaryReaderTest.java |   30 +-
 .../ion/streaming/OffsetSpanReaderTest.java   |   29 +-
 .../amazon/ion/streaming/ReaderCompare.java   |   50 +-
 .../ion/streaming/ReaderDomCopyTest.java      |   33 +-
 .../ion/streaming/ReaderFacetTestCase.java    |   36 +-
 .../ion/streaming/ReaderIntegerSizeTest.java  |   27 +-
 .../ion/streaming/ReaderSkippingTest.java     |   37 +-
 .../amazon/ion/streaming/ReaderTest.java      |   38 +-
 .../amazon/ion/streaming/ReaderTestCase.java  |   30 +-
 .../ion/streaming/RoundTripStreamingTest.java |   78 +-
 .../ion/streaming/SeekableReaderTest.java     |   33 +-
 .../amazon/ion/streaming/SpanReaderTest.java  |   27 +-
 .../amazon/ion/streaming/SpanTests.java       |   18 +-
 .../amazon/ion/streaming/TextSpanTest.java    |   29 +-
 .../system/IonBinaryWriterBuilderTest.java    |   66 +-
 .../ion/system/IonReaderBuilderTest.java      |   27 +-
 .../ion/system/IonSystemBuilderTest.java      |   39 +-
 .../ion/system/IonTextWriterBuilderTest.java  |   46 +-
 .../amazon/ion/system/SimpleCatalogTest.java  |   31 +-
 .../amazon/ion/util/EquivalenceTest.java      |   28 +-
 .../amazon/ion/util/IonStreamUtilsTest.java   |   21 +-
 .../amazon/ion/util/JarInfoTest.java          |   35 +-
 .../amazon/ion/util/NullOutputStream.java     |   15 +-
 test/com/amazon/ion/util/PrinterTest.java     |  678 ++++
 .../amazon/ion/util/RepeatInputStream.java    |   15 +-
 .../amazon/ion/util/SpansTest.java            |   21 +-
 .../amazon/ion/util/TextTest.java             |   39 +-
 .../amazon/ion/BinaryTestGenerator.py         |  271 --
 test/software/amazon/ion/EquivsTest.java      |   34 -
 test/software/amazon/ion/NonEquivsTest.java   |   34 -
 .../amazon/ion/impl/IonImplUtilsTest.java     |   39 -
 .../impl/PrivateScalarConversionsTest.java    |   33 -
 .../impl/lite/IonDatagramLiteSublistTest.java |   16 -
 .../ion/impl/lite/IonDatagramLiteTest.java    |   10 -
 .../amazon/ion/impl/lite/IonListLiteTest.java |   10 -
 .../amazon/ion/impl/lite/IonSexpLiteTest.java |   10 -
 .../ion/streaming/BadIonStreamingTest.java    |   88 -
 411 files changed, 24143 insertions(+), 7425 deletions(-)
 delete mode 100644 .classpath
 delete mode 100644 .project
 delete mode 100644 .settings/AllTests.launch
 delete mode 100644 .settings/de.loskutov.anyedit.AnyEditTools.prefs
 delete mode 100644 .settings/org.eclipse.jdt.core.prefs
 delete mode 100644 .settings/org.eclipse.jdt.ui.prefs
 delete mode 100644 .settings/org.eclipse.wst.validation.prefs
 create mode 100644 src/com/amazon/ion/ContainedValueException.java
 rename src/{software => com}/amazon/ion/Decimal.java (90%)
 create mode 100644 src/com/amazon/ion/EmptySymbolException.java
 rename src/{software => com}/amazon/ion/IntegerSize.java (55%)
 create mode 100644 src/com/amazon/ion/InvalidSystemSymbolException.java
 create mode 100644 src/com/amazon/ion/IonBinaryWriter.java
 rename src/{software => com}/amazon/ion/IonBlob.java (72%)
 rename src/{software => com}/amazon/ion/IonBool.java (75%)
 rename src/{software => com}/amazon/ion/IonCatalog.java (88%)
 rename src/{software => com}/amazon/ion/IonClob.java (79%)
 rename src/{software => com}/amazon/ion/IonContainer.java (88%)
 rename src/{software => com}/amazon/ion/IonDatagram.java (71%)
 rename src/{software => com}/amazon/ion/IonDecimal.java (87%)
 rename src/{software => com}/amazon/ion/IonException.java (90%)
 rename src/{software => com}/amazon/ion/IonFloat.java (88%)
 rename src/{software => com}/amazon/ion/IonInt.java (84%)
 rename src/{software => com}/amazon/ion/IonList.java (59%)
 rename src/{software => com}/amazon/ion/IonLoader.java (93%)
 rename src/{software => com}/amazon/ion/IonLob.java (85%)
 rename src/{software => com}/amazon/ion/IonMutableCatalog.java (64%)
 rename src/{software => com}/amazon/ion/IonNull.java (63%)
 rename src/{software => com}/amazon/ion/IonNumber.java (55%)
 rename src/{software => com}/amazon/ion/IonReader.java (88%)
 rename src/{software => com}/amazon/ion/IonSequence.java (97%)
 rename src/{software => com}/amazon/ion/IonSexp.java (60%)
 rename src/{software => com}/amazon/ion/IonString.java (70%)
 rename src/{software => com}/amazon/ion/IonStruct.java (96%)
 rename src/{software => com}/amazon/ion/IonSymbol.java (58%)
 rename src/{software => com}/amazon/ion/IonSystem.java (92%)
 rename src/{software => com}/amazon/ion/IonText.java (73%)
 create mode 100644 src/com/amazon/ion/IonTextReader.java
 rename src/{software => com}/amazon/ion/IonTimestamp.java (95%)
 rename src/{software => com}/amazon/ion/IonType.java (81%)
 rename src/{software => com}/amazon/ion/IonValue.java (94%)
 rename src/{software => com}/amazon/ion/IonWriter.java (88%)
 rename src/{software => com}/amazon/ion/NullValueException.java (52%)
 rename src/{software => com}/amazon/ion/OffsetSpan.java (77%)
 create mode 100644 src/com/amazon/ion/RawValueSpanProvider.java
 rename src/{software => com}/amazon/ion/ReadOnlyValueException.java (63%)
 rename src/{software => com}/amazon/ion/SeekableReader.java (89%)
 rename src/{software => com}/amazon/ion/Span.java (82%)
 rename src/{software => com}/amazon/ion/SpanProvider.java (76%)
 rename src/{software => com}/amazon/ion/SubstituteSymbolTableException.java (61%)
 rename src/{software => com}/amazon/ion/SymbolTable.java (95%)
 rename src/{software => com}/amazon/ion/SymbolToken.java (82%)
 rename src/{software => com}/amazon/ion/SystemSymbols.java (88%)
 rename src/{software => com}/amazon/ion/TextSpan.java (80%)
 rename src/{software => com}/amazon/ion/Timestamp.java (95%)
 rename src/{software => com}/amazon/ion/UnexpectedEofException.java (70%)
 rename src/{software => com}/amazon/ion/UnknownSymbolException.java (75%)
 rename src/{software => com}/amazon/ion/UnsupportedIonVersionException.java (69%)
 rename src/{software => com}/amazon/ion/ValueFactory.java (86%)
 rename src/{software => com}/amazon/ion/ValueVisitor.java (58%)
 rename src/{software => com}/amazon/ion/apps/BaseApp.java (91%)
 create mode 100644 src/com/amazon/ion/apps/EncodeApp.java
 rename src/{software => com}/amazon/ion/apps/PrintApp.java (87%)
 rename src/{software => com}/amazon/ion/apps/SymtabApp.java (86%)
 rename src/{software => com}/amazon/ion/facet/Faceted.java (81%)
 rename src/{software => com}/amazon/ion/facet/Facets.java (90%)
 rename src/{software => com}/amazon/ion/facet/UnsupportedFacetException.java (76%)
 rename src/{software => com}/amazon/ion/facet/package-info.java (83%)
 rename src/{software => com}/amazon/ion/impl/AppendableFastAppendable.java (77%)
 rename src/{software => com}/amazon/ion/impl/Base64Encoder.java (97%)
 create mode 100644 src/com/amazon/ion/impl/BlockedBuffer.java
 create mode 100644 src/com/amazon/ion/impl/ByteBuffer.java
 create mode 100644 src/com/amazon/ion/impl/ByteReader.java
 create mode 100644 src/com/amazon/ion/impl/ByteWriter.java
 rename src/{software => com}/amazon/ion/impl/DowncastingFaceted.java (57%)
 create mode 100644 src/com/amazon/ion/impl/IonBinary.java
 create mode 100644 src/com/amazon/ion/impl/IonCharacterReader.java
 rename src/{software => com}/amazon/ion/impl/IonIteratorImpl.java (86%)
 create mode 100644 src/com/amazon/ion/impl/IonMessages.java
 rename src/{software => com}/amazon/ion/impl/IonReaderBinaryRawX.java (88%)
 rename src/{software => com}/amazon/ion/impl/IonReaderBinarySystemX.java (83%)
 rename src/{software => com}/amazon/ion/impl/IonReaderBinaryUserX.java (69%)
 rename src/{software => com}/amazon/ion/impl/IonReaderTextRawTokensX.java (98%)
 rename src/{software => com}/amazon/ion/impl/IonReaderTextRawX.java (97%)
 rename src/{software => com}/amazon/ion/impl/IonReaderTextSystemX.java (94%)
 rename src/{software => com}/amazon/ion/impl/IonReaderTextUserX.java (91%)
 rename src/{software => com}/amazon/ion/impl/IonReaderTreeSystem.java (86%)
 rename src/{software => com}/amazon/ion/impl/IonReaderTreeUserX.java (83%)
 create mode 100644 src/com/amazon/ion/impl/IonTextBufferedStream.java
 rename src/{software => com}/amazon/ion/impl/IonTokenConstsX.java (98%)
 create mode 100644 src/com/amazon/ion/impl/IonTokenReader.java
 rename src/{software => com}/amazon/ion/impl/IonUTF8.java (98%)
 rename src/{software => com}/amazon/ion/impl/IonWriterSystem.java (79%)
 create mode 100644 src/com/amazon/ion/impl/IonWriterSystemBinary.java
 rename src/{software => com}/amazon/ion/impl/IonWriterSystemText.java (90%)
 create mode 100644 src/com/amazon/ion/impl/IonWriterSystemTextMarkup.java
 rename src/{software => com}/amazon/ion/impl/IonWriterSystemTree.java (81%)
 rename src/{software => com}/amazon/ion/impl/IonWriterUser.java (91%)
 create mode 100644 src/com/amazon/ion/impl/IonWriterUserBinary.java
 rename src/{software => com}/amazon/ion/impl/LocalSymbolTable.java (92%)
 rename src/{software => com}/amazon/ion/impl/LocalSymbolTableAsStruct.java (86%)
 rename src/{software => com}/amazon/ion/impl/LocalSymbolTableImports.java (93%)
 rename src/{software => com}/amazon/ion/impl/OutputStreamFastAppendable.java (89%)
 rename src/{software => com}/amazon/ion/impl/SharedSymbolTable.java (91%)
 create mode 100644 src/com/amazon/ion/impl/SimpleByteBuffer.java
 rename src/{software => com}/amazon/ion/impl/SubstituteSymbolTable.java (90%)
 rename src/{software => com}/amazon/ion/impl/SymbolTableReader.java (93%)
 create mode 100644 src/com/amazon/ion/impl/SymbolTokenImpl.java
 create mode 100644 src/com/amazon/ion/impl/SystemValueIterator.java
 rename src/{software => com}/amazon/ion/impl/UnifiedDataPageX.java (95%)
 rename src/{software => com}/amazon/ion/impl/UnifiedInputBufferX.java (96%)
 rename src/{software => com}/amazon/ion/impl/UnifiedInputStreamX.java (97%)
 rename src/{software => com}/amazon/ion/impl/UnifiedSavePointManagerX.java (97%)
 create mode 100644 src/com/amazon/ion/impl/_Private_ByteTransferReader.java
 rename src/{software/amazon/ion/impl/PrivateByteTransferSink.java => com/amazon/ion/impl/_Private_ByteTransferSink.java} (53%)
 create mode 100644 src/com/amazon/ion/impl/_Private_CallbackBuilder.java
 rename src/{software/amazon/ion/impl/PrivateCommandLine.java => com/amazon/ion/impl/_Private_CommandLine.java} (72%)
 rename src/{software/amazon/ion/impl/PrivateCurriedValueFactory.java => com/amazon/ion/impl/_Private_CurriedValueFactory.java} (82%)
 rename src/{software/amazon/ion/impl/PrivateFastAppendableDecorator.java => com/amazon/ion/impl/_Private_FastAppendableDecorator.java} (69%)
 create mode 100644 src/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java
 rename src/{software/amazon/ion/impl/PrivateIonBinaryWriterBuilder.java => com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java} (56%)
 create mode 100644 src/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java
 rename src/{software/amazon/ion/impl/PrivateIonConstants.java => com/amazon/ion/impl/_Private_IonConstants.java} (92%)
 create mode 100644 src/com/amazon/ion/impl/_Private_IonContainer.java
 create mode 100644 src/com/amazon/ion/impl/_Private_IonDatagram.java
 rename src/{software/amazon/ion/impl/PrivateIonReaderFactory.java => com/amazon/ion/impl/_Private_IonReaderFactory.java} (75%)
 rename src/{software/amazon/ion/impl/PrivateIonSymbol.java => com/amazon/ion/impl/_Private_IonSymbol.java} (50%)
 rename src/{software/amazon/ion/impl/PrivateIonSystem.java => com/amazon/ion/impl/_Private_IonSystem.java} (58%)
 rename src/{software/amazon/ion/impl/PrivateIonTextAppender.java => com/amazon/ion/impl/_Private_IonTextAppender.java} (92%)
 create mode 100644 src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
 rename src/{software/amazon/ion/impl/PrivateIonValue.java => com/amazon/ion/impl/_Private_IonValue.java} (80%)
 rename src/{software/amazon/ion/impl/PrivateIonWriter.java => com/amazon/ion/impl/_Private_IonWriter.java} (65%)
 rename src/{software/amazon/ion/impl/PrivateIonWriterBase.java => com/amazon/ion/impl/_Private_IonWriterBase.java} (89%)
 rename src/{software/amazon/ion/impl/PrivateIonWriterFactory.java => com/amazon/ion/impl/_Private_IonWriterFactory.java} (71%)
 rename src/{software/amazon/ion/impl/PrivateListWriter.java => com/amazon/ion/impl/_Private_ListWriter.java} (60%)
 rename src/{software/amazon/ion/impl/PrivateLocalSymbolTableFactory.java => com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java} (81%)
 create mode 100644 src/com/amazon/ion/impl/_Private_MarkupCallback.java
 create mode 100644 src/com/amazon/ion/impl/_Private_ReaderWriter.java
 rename src/{software/amazon/ion/impl/PrivateScalarConversions.java => com/amazon/ion/impl/_Private_ScalarConversions.java} (97%)
 create mode 100644 src/com/amazon/ion/impl/_Private_SymbolToken.java
 rename src/{software/amazon/ion/impl/PrivateSymtabExtendsCache.java => com/amazon/ion/impl/_Private_SymtabExtendsCache.java} (69%)
 rename src/{software/amazon/ion/impl/PrivateUtils.java => com/amazon/ion/impl/_Private_Utils.java} (90%)
 rename src/{software/amazon/ion/impl/PrivateValueFactory.java => com/amazon/ion/impl/_Private_ValueFactory.java} (50%)
 rename src/{software => com}/amazon/ion/impl/bin/AbstractIonWriter.java (66%)
 rename src/{software => com}/amazon/ion/impl/bin/AbstractSymbolTable.java (73%)
 rename src/{software => com}/amazon/ion/impl/bin/Block.java (79%)
 rename src/{software => com}/amazon/ion/impl/bin/BlockAllocator.java (77%)
 rename src/{software => com}/amazon/ion/impl/bin/BlockAllocatorProvider.java (72%)
 rename src/{software => com}/amazon/ion/impl/bin/BlockAllocatorProviders.java (78%)
 create mode 100644 src/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java
 rename src/{software => com}/amazon/ion/impl/bin/IonManagedBinaryWriter.java (92%)
 rename src/{software => com}/amazon/ion/impl/bin/IonRawBinaryWriter.java (90%)
 rename src/{software => com}/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java (86%)
 rename src/{software => com}/amazon/ion/impl/bin/Symbols.java (83%)
 rename src/{software => com}/amazon/ion/impl/bin/WriteBuffer.java (98%)
 create mode 100644 src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
 rename src/{software/amazon/ion/impl/bin/PrivateIonManagedBinaryWriterBuilder.java => com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java} (62%)
 create mode 100644 src/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java
 create mode 100644 src/com/amazon/ion/impl/bin/_Private_IonRawWriter.java
 create mode 100644 src/com/amazon/ion/impl/bin/package-info.java
 rename src/{software => com}/amazon/ion/impl/lite/ContainerlessContext.java (72%)
 rename src/{software => com}/amazon/ion/impl/lite/IonBlobLite.java (73%)
 rename src/{software => com}/amazon/ion/impl/lite/IonBoolLite.java (81%)
 rename src/{software => com}/amazon/ion/impl/lite/IonClobLite.java (75%)
 rename src/{software => com}/amazon/ion/impl/lite/IonContainerLite.java (91%)
 rename src/{software => com}/amazon/ion/impl/lite/IonContext.java (80%)
 rename src/{software => com}/amazon/ion/impl/lite/IonDatagramLite.java (94%)
 rename src/{software => com}/amazon/ion/impl/lite/IonDecimalLite.java (86%)
 rename src/{software => com}/amazon/ion/impl/lite/IonFloatLite.java (83%)
 rename src/{software => com}/amazon/ion/impl/lite/IonIntLite.java (90%)
 rename src/{software => com}/amazon/ion/impl/lite/IonListLite.java (75%)
 rename src/{software => com}/amazon/ion/impl/lite/IonLoaderLite.java (77%)
 rename src/{software => com}/amazon/ion/impl/lite/IonLobLite.java (87%)
 rename src/{software => com}/amazon/ion/impl/lite/IonNullLite.java (72%)
 rename src/{software => com}/amazon/ion/impl/lite/IonSequenceLite.java (95%)
 rename src/{software => com}/amazon/ion/impl/lite/IonSexpLite.java (73%)
 rename src/{software => com}/amazon/ion/impl/lite/IonStringLite.java (75%)
 rename src/{software => com}/amazon/ion/impl/lite/IonStructLite.java (95%)
 rename src/{software => com}/amazon/ion/impl/lite/IonSymbolLite.java (77%)
 rename src/{software => com}/amazon/ion/impl/lite/IonSystemLite.java (85%)
 rename src/{software => com}/amazon/ion/impl/lite/IonTextLite.java (74%)
 rename src/{software => com}/amazon/ion/impl/lite/IonTimestampLite.java (87%)
 rename src/{software => com}/amazon/ion/impl/lite/IonValueLite.java (92%)
 rename src/{software => com}/amazon/ion/impl/lite/ReverseBinaryEncoder.java (90%)
 rename src/{software => com}/amazon/ion/impl/lite/TopLevelContext.java (76%)
 rename src/{software => com}/amazon/ion/impl/lite/ValueFactoryLite.java (90%)
 rename src/{software/amazon/ion/impl/lite/PrivateLiteDomTrampoline.java => com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java} (50%)
 rename src/{software => com}/amazon/ion/overview.html (65%)
 create mode 100644 src/com/amazon/ion/package-info.java
 rename src/{software => com}/amazon/ion/system/IonBinaryWriterBuilder.java (92%)
 rename src/{software => com}/amazon/ion/system/IonReaderBuilder.java (91%)
 rename src/{software => com}/amazon/ion/system/IonSystemBuilder.java (89%)
 rename src/{software => com}/amazon/ion/system/IonTextWriterBuilder.java (94%)
 rename src/{software => com}/amazon/ion/system/IonWriterBuilder.java (86%)
 rename src/{software => com}/amazon/ion/system/IonWriterBuilderBase.java (91%)
 rename src/{software => com}/amazon/ion/system/SimpleCatalog.java (92%)
 create mode 100644 src/com/amazon/ion/system/SystemFactory.java
 create mode 100644 src/com/amazon/ion/system/package-info.java
 rename src/{software => com}/amazon/ion/util/AbstractValueVisitor.java (67%)
 rename src/{software => com}/amazon/ion/util/Equivalence.java (92%)
 rename src/{software => com}/amazon/ion/util/GzipOrRawInputStream.java (87%)
 rename src/{software => com}/amazon/ion/util/IonStreamUtils.java (84%)
 rename src/{software => com}/amazon/ion/util/IonTextUtils.java (93%)
 rename src/{software => com}/amazon/ion/util/IonValueUtils.java (59%)
 rename src/{software => com}/amazon/ion/util/JarInfo.java (89%)
 create mode 100644 src/com/amazon/ion/util/Printer.java
 rename src/{software => com}/amazon/ion/util/Spans.java (71%)
 rename src/{software/amazon/ion/util/PrivateFastAppendable.java => com/amazon/ion/util/_Private_FastAppendable.java} (76%)
 create mode 100644 src/com/amazon/ion/util/package-info.java
 delete mode 100644 src/software/amazon/ion/ContainedValueException.java
 delete mode 100644 src/software/amazon/ion/EmptySymbolException.java
 delete mode 100644 src/software/amazon/ion/InvalidSystemSymbolException.java
 delete mode 100644 src/software/amazon/ion/impl/IonMessages.java
 delete mode 100644 src/software/amazon/ion/impl/PrivateByteTransferReader.java
 delete mode 100644 src/software/amazon/ion/impl/PrivateFastAppendableTrampoline.java
 delete mode 100644 src/software/amazon/ion/impl/PrivateIonContainer.java
 delete mode 100644 src/software/amazon/ion/impl/PrivateIonDatagram.java
 delete mode 100644 src/software/amazon/ion/impl/PrivateIonTextWriterBuilder.java
 delete mode 100644 src/software/amazon/ion/impl/PrivateReaderWriter.java
 delete mode 100644 src/software/amazon/ion/impl/SymbolTokenImpl.java
 delete mode 100644 src/software/amazon/ion/impl/bin/PrivateIonHashTrampoline.java
 delete mode 100644 src/software/amazon/ion/impl/bin/package-info.java
 delete mode 100644 src/software/amazon/ion/package-info.java
 delete mode 100644 src/software/amazon/ion/system/package-info.java
 delete mode 100644 src/software/amazon/ion/util/package-info.java
 rename test/{software => com}/amazon/ion/AnnotationEscapesTest.java (55%)
 rename test/{software => com}/amazon/ion/AssertionsEnabledTest.java (66%)
 rename test/{software => com}/amazon/ion/BadIonTest.java (75%)
 rename test/{software => com}/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java (66%)
 rename test/{software => com}/amazon/ion/BinaryReaderSystemProcessingTest.java (63%)
 rename test/{software => com}/amazon/ion/BinaryReaderWrappedValueLengthTest.java (76%)
 rename test/{software => com}/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java (69%)
 rename test/{software => com}/amazon/ion/BinaryTest.java (91%)
 rename test/{software => com}/amazon/ion/BitUtils.java (74%)
 rename test/{software => com}/amazon/ion/BlobTest.java (92%)
 rename test/{software => com}/amazon/ion/BoolTest.java (86%)
 rename test/{software => com}/amazon/ion/Checker.java (65%)
 rename test/{software => com}/amazon/ion/ClobTest.java (88%)
 rename test/{software => com}/amazon/ion/CloneTest.java (80%)
 rename test/{software => com}/amazon/ion/ContainerTestCase.java (90%)
 rename test/{software => com}/amazon/ion/DatagramIteratorSystemProcessingTest.java (56%)
 rename test/{software => com}/amazon/ion/DatagramMaker.java (80%)
 rename test/{software => com}/amazon/ion/DatagramTest.java (88%)
 rename test/{software => com}/amazon/ion/DatagramTreeReaderSystemProcessingTest.java (77%)
 rename test/{software => com}/amazon/ion/DecimalTest.java (91%)
 rename test/{software => com}/amazon/ion/EquivTimelineTest.java (75%)
 create mode 100644 test/com/amazon/ion/EquivsTest.java
 rename test/{software => com}/amazon/ion/EquivsTestCase.java (90%)
 rename test/{software => com}/amazon/ion/ExtendedDecimalTest.java (93%)
 rename test/{software => com}/amazon/ion/FakeSymbolToken.java (62%)
 rename test/{software => com}/amazon/ion/FieldNameEscapesTest.java (54%)
 rename test/{software => com}/amazon/ion/FloatTest.java (92%)
 rename test/{software => com}/amazon/ion/GoodIonTest.java (70%)
 rename test/{software => com}/amazon/ion/HashCodeCorrectnessTest.java (97%)
 rename test/{software => com}/amazon/ion/HashCodeDeltaCollisionTest.java (89%)
 rename test/{software => com}/amazon/ion/HashCodeDistributionTest.java (94%)
 rename test/{software => com}/amazon/ion/InputStreamWrapper.java (53%)
 rename test/{software => com}/amazon/ion/IntTest.java (97%)
 rename test/{software => com}/amazon/ion/IonExceptionTest.java (86%)
 create mode 100644 test/com/amazon/ion/IonRawWriterBasicTest.java
 create mode 100644 test/com/amazon/ion/IonRawWriterSymbolsTest.java
 rename test/{software => com}/amazon/ion/IonReaderToIonValueTest.java (62%)
 rename test/{software => com}/amazon/ion/IonSystemTest.java (89%)
 rename test/{software => com}/amazon/ion/IonTestCase.java (86%)
 rename test/{software => com}/amazon/ion/IonValueChecker.java (81%)
 rename test/{software => com}/amazon/ion/IonValueDeltaGenerator.java (90%)
 rename test/{software => com}/amazon/ion/IonValueTest.java (88%)
 rename test/{software => com}/amazon/ion/IteratorSystemProcessingTestCase.java (84%)
 rename test/{software => com}/amazon/ion/JavaNumericsTest.java (91%)
 rename test/{software => com}/amazon/ion/JavaReaderIteratorSystemProcessingTest.java (65%)
 rename test/{software => com}/amazon/ion/ListTest.java (89%)
 rename test/{software => com}/amazon/ion/LoadBinaryBytesSystemProcessingTest.java (61%)
 rename test/{software => com}/amazon/ion/LoadBinaryStreamSystemProcessingTest.java (64%)
 rename test/{software => com}/amazon/ion/LoadTextBytesSystemProcessingTest.java (53%)
 rename test/{software => com}/amazon/ion/LoadTextStreamSystemProcessingTest.java (57%)
 rename test/{software => com}/amazon/ion/LoaderTest.java (93%)
 rename test/{software => com}/amazon/ion/LongStringTest.java (56%)
 rename test/{software => com}/amazon/ion/NewDatagramIteratorSystemProcessingTest.java (79%)
 create mode 100644 test/com/amazon/ion/NonEquivsTest.java
 rename test/{software => com}/amazon/ion/NopPaddingTest.java (91%)
 rename test/{software => com}/amazon/ion/NullTest.java (78%)
 create mode 100644 test/com/amazon/ion/RawValueSpanReaderBasicTest.java
 rename test/{software => com}/amazon/ion/ReaderChecker.java (85%)
 rename test/{software => com}/amazon/ion/ReaderMaker.java (90%)
 rename test/{software => com}/amazon/ion/ReaderSystemProcessingTestCase.java (91%)
 rename test/{software => com}/amazon/ion/RoundTripTest.java (79%)
 rename test/{software => com}/amazon/ion/SequenceTestCase.java (95%)
 rename test/{software => com}/amazon/ion/SexpTest.java (89%)
 rename test/{software => com}/amazon/ion/SharedSymtabMaker.java (68%)
 rename test/{software => com}/amazon/ion/StringFieldNameEscapesTest.java (59%)
 rename test/{software => com}/amazon/ion/StringTest.java (94%)
 rename test/{software => com}/amazon/ion/StructTest.java (97%)
 rename test/{software => com}/amazon/ion/SurrogateEscapeTest.java (74%)
 rename test/{software => com}/amazon/ion/SymbolTest.java (87%)
 rename test/{software => com}/amazon/ion/SystemProcessingTestCase.java (96%)
 rename test/{software => com}/amazon/ion/SystemProcessingTests.java (74%)
 rename test/{software => com}/amazon/ion/TestUtils.java (90%)
 rename test/{software => com}/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java (58%)
 rename test/{software => com}/amazon/ion/TextIteratorSystemProcessingTest.java (61%)
 rename test/{software => com}/amazon/ion/TextReaderSystemProcessingTest.java (61%)
 rename test/{software => com}/amazon/ion/TextStreamIteratorSystemProcessingTest.java (62%)
 rename test/{software => com}/amazon/ion/TextTestCase.java (79%)
 rename test/{software => com}/amazon/ion/TimestampBadTest.java (60%)
 rename test/{software => com}/amazon/ion/TimestampGoodTest.java (68%)
 rename test/{software => com}/amazon/ion/TimestampTest.java (93%)
 rename test/{software => com}/amazon/ion/TrBwBrProcessingTest.java (66%)
 rename test/{software => com}/amazon/ion/TrueSequenceTestCase.java (91%)
 rename test/{software => com}/amazon/ion/ValueFactorySequenceTest.java (77%)
 rename test/{software => com}/amazon/ion/facet/FacetsTest.java (87%)
 rename test/{software => com}/amazon/ion/impl/BinaryWriterTest.java (90%)
 rename test/{software => com}/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java (89%)
 create mode 100644 test/com/amazon/ion/impl/ByteBufferTest.java
 create mode 100644 test/com/amazon/ion/impl/CharacterReaderTest.java
 create mode 100644 test/com/amazon/ion/impl/EscapingCallback.java
 create mode 100644 test/com/amazon/ion/impl/IonImplUtilsTest.java
 create mode 100644 test/com/amazon/ion/impl/IonMarkupWriterFilesTest.java
 create mode 100644 test/com/amazon/ion/impl/IonMarkupWriterTest.java
 rename test/{software => com}/amazon/ion/impl/IonUTF8Test.java (92%)
 rename test/{software => com}/amazon/ion/impl/IonWriterTestCase.java (92%)
 rename test/{software => com}/amazon/ion/impl/IonWriterTests.java (58%)
 rename test/{software => com}/amazon/ion/impl/IterationTest.java (77%)
 rename test/{software => com}/amazon/ion/impl/LocalSymbolTableTest.java (89%)
 create mode 100644 test/com/amazon/ion/impl/OldBinaryWriterTest.java
 rename test/{software => com}/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java (90%)
 rename test/{software => com}/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java (89%)
 rename test/{software => com}/amazon/ion/impl/OptimizedBinaryWriterTestCase.java (72%)
 rename test/{software => com}/amazon/ion/impl/OutputStreamWriterTestCase.java (90%)
 create mode 100644 test/com/amazon/ion/impl/RawValueSpanReaderTest.java
 rename test/{software => com}/amazon/ion/impl/SharedSymbolTableTest.java (90%)
 rename test/{software => com}/amazon/ion/impl/SymbolTableTest.java (94%)
 rename test/{software => com}/amazon/ion/impl/Symtabs.java (81%)
 create mode 100644 test/com/amazon/ion/impl/TestMarkupCallback.java
 rename test/{software => com}/amazon/ion/impl/TextWriterTest.java (89%)
 rename test/{software => com}/amazon/ion/impl/TreeReaderTest.java (69%)
 rename test/{software => com}/amazon/ion/impl/UnifiedInputStreamXTest.java (69%)
 rename test/{software => com}/amazon/ion/impl/ValueWriterTest.java (81%)
 rename test/{software => com}/amazon/ion/impl/VarIntTest.java (83%)
 create mode 100644 test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java
 rename test/{software => com}/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java (83%)
 rename test/{software => com}/amazon/ion/impl/bin/IonRawBinaryWriterTest.java (75%)
 rename test/{software => com}/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java (81%)
 rename test/{software => com}/amazon/ion/impl/bin/WriteBufferTest.java (97%)
 rename test/{software => com}/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java (95%)
 rename test/{software => com}/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java (68%)
 rename test/{software => com}/amazon/ion/impl/lite/IonContextTest.java (91%)
 create mode 100644 test/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
 create mode 100644 test/com/amazon/ion/impl/lite/IonDatagramLiteTest.java
 create mode 100644 test/com/amazon/ion/impl/lite/IonListLiteTest.java
 rename test/{software => com}/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java (77%)
 create mode 100644 test/com/amazon/ion/impl/lite/IonSexpLiteTest.java
 rename test/{software => com}/amazon/ion/impl/lite/SIDPresentLifecycleTest.java (81%)
 rename test/{software => com}/amazon/ion/junit/Injected.java (88%)
 rename test/{software => com}/amazon/ion/junit/IonAssert.java (82%)
 rename test/{software => com}/amazon/ion/profile/IteratorTiming.java (77%)
 create mode 100644 test/com/amazon/ion/streaming/BadIonStreamingTest.java
 rename test/{software => com}/amazon/ion/streaming/BinaryStreamingTest.java (88%)
 rename test/{software => com}/amazon/ion/streaming/GoodIonStreamingTest.java (53%)
 rename test/{software => com}/amazon/ion/streaming/InputStreamReaderTest.java (72%)
 rename test/{software => com}/amazon/ion/streaming/MiscStreamingTest.java (87%)
 rename test/{software => com}/amazon/ion/streaming/NonOffsetSpanReaderTest.java (60%)
 rename test/{software => com}/amazon/ion/streaming/NonSeekableReaderTest.java (58%)
 rename test/{software => com}/amazon/ion/streaming/NonSpanReaderTest.java (60%)
 rename test/{software => com}/amazon/ion/streaming/NonTextSpanTest.java (59%)
 rename test/{software => com}/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java (76%)
 rename test/{software => com}/amazon/ion/streaming/OffsetSpanReaderTest.java (75%)
 rename test/{software => com}/amazon/ion/streaming/ReaderCompare.java (82%)
 rename test/{software => com}/amazon/ion/streaming/ReaderDomCopyTest.java (55%)
 rename test/{software => com}/amazon/ion/streaming/ReaderFacetTestCase.java (82%)
 rename test/{software => com}/amazon/ion/streaming/ReaderIntegerSizeTest.java (85%)
 rename test/{software => com}/amazon/ion/streaming/ReaderSkippingTest.java (84%)
 rename test/{software => com}/amazon/ion/streaming/ReaderTest.java (91%)
 rename test/{software => com}/amazon/ion/streaming/ReaderTestCase.java (74%)
 rename test/{software => com}/amazon/ion/streaming/RoundTripStreamingTest.java (88%)
 rename test/{software => com}/amazon/ion/streaming/SeekableReaderTest.java (88%)
 rename test/{software => com}/amazon/ion/streaming/SpanReaderTest.java (86%)
 rename test/{software => com}/amazon/ion/streaming/SpanTests.java (60%)
 rename test/{software => com}/amazon/ion/streaming/TextSpanTest.java (60%)
 rename test/{software => com}/amazon/ion/system/IonBinaryWriterBuilderTest.java (86%)
 rename test/{software => com}/amazon/ion/system/IonReaderBuilderTest.java (83%)
 rename test/{software => com}/amazon/ion/system/IonSystemBuilderTest.java (80%)
 rename test/{software => com}/amazon/ion/system/IonTextWriterBuilderTest.java (90%)
 rename test/{software => com}/amazon/ion/system/SimpleCatalogTest.java (87%)
 rename test/{software => com}/amazon/ion/util/EquivalenceTest.java (93%)
 rename test/{software => com}/amazon/ion/util/IonStreamUtilsTest.java (78%)
 rename test/{software => com}/amazon/ion/util/JarInfoTest.java (82%)
 rename test/{software => com}/amazon/ion/util/NullOutputStream.java (63%)
 create mode 100644 test/com/amazon/ion/util/PrinterTest.java
 rename test/{software => com}/amazon/ion/util/RepeatInputStream.java (82%)
 rename test/{software => com}/amazon/ion/util/SpansTest.java (61%)
 rename test/{software => com}/amazon/ion/util/TextTest.java (84%)
 delete mode 100755 test/software/amazon/ion/BinaryTestGenerator.py
 delete mode 100644 test/software/amazon/ion/EquivsTest.java
 delete mode 100644 test/software/amazon/ion/NonEquivsTest.java
 delete mode 100644 test/software/amazon/ion/impl/IonImplUtilsTest.java
 delete mode 100644 test/software/amazon/ion/impl/PrivateScalarConversionsTest.java
 delete mode 100644 test/software/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
 delete mode 100644 test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
 delete mode 100644 test/software/amazon/ion/impl/lite/IonListLiteTest.java
 delete mode 100644 test/software/amazon/ion/impl/lite/IonSexpLiteTest.java
 delete mode 100644 test/software/amazon/ion/streaming/BadIonStreamingTest.java

diff --git a/.classpath b/.classpath
deleted file mode 100644
index aee63273dc..0000000000
--- a/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path=".eclipseout"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index 708300db93..c6d00a25a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,7 +136,7 @@ flycheck_*.el
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-.idea 
+.idea
 
 # User-specific stuff
 .idea/**/workspace.xml
@@ -263,4 +263,3 @@ gradle-app.setting
 **/build/
 
 # End of https://www.gitignore.io/api/vim,emacs,maven,gradle,eclipse,intellij
-
diff --git a/.gitmodules b/.gitmodules
index 776319e243..38171e6698 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,3 @@
 [submodule "ion-tests"]
 	path = ion-tests
 	url = https://github.com/amzn/ion-tests.git
-	branch = master
diff --git a/.project b/.project
deleted file mode 100644
index 333d659778..0000000000
--- a/.project
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>IonJava</name>
-	<comment></comment>
-        <buildSpec>
-                <buildCommand>
-                        <name>org.eclipse.jdt.core.javabuilder</name>
-                        <arguments>
-                        </arguments>
-                </buildCommand>
-        </buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/.settings/AllTests.launch b/.settings/AllTests.launch
deleted file mode 100644
index 1cab7f7578..0000000000
--- a/.settings/AllTests.launch
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
-<stringAttribute key="bad_container_name" value="/ion-java/.se"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/ion-java/test/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ion-java"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
-</launchConfiguration>
diff --git a/.settings/de.loskutov.anyedit.AnyEditTools.prefs b/.settings/de.loskutov.anyedit.AnyEditTools.prefs
deleted file mode 100644
index 13aed0422b..0000000000
--- a/.settings/de.loskutov.anyedit.AnyEditTools.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Sun Apr 29 18:50:10 PDT 2007
-activeContentFilterList=*.makefile,makefile,*.Makefile,Makefile,Makefile.*,*.mk
-convertActionOnSaave=AnyEdit.CnvrtTabToSpaces
-eclipse.preferences.version=1
-inActiveContentFilterList=
-javaTabWidthForJava=true
-org.eclipse.jdt.ui.editor.tab.width=4
-projectPropsEnabled=false
-removeTrailingSpaces=true
-replaceAllTabs=false
-saveAndConvert=true
-saveAndTrim=true
-useModulo4Tabs=false
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2298a99ff3..0000000000
--- a/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,354 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=protected
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=18
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=18
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=82
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=18
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=18
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=18
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=17
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=17
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=32
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=32
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=2
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=2
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=next_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=next_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=79
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=8
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=79
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=space
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=warning
diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 266ef3e388..0000000000
--- a/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,116 +0,0 @@
-#Fri Feb 13 19:25:41 PST 2009
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.format_source_code=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_Custom
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_CPT
-formatter_settings_version=11
-instance/org.eclipse.core.net/org.eclipse.core.net.hasMigrated=true
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=;
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.ondemandthreshold=99
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return Returns the ${bare_field_name}.\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} The ${bare_field_name} to set.\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">// Copyright (c) ${year} Amazon.com, Inc.  All rights reserved.\n</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment"></template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=false
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=false
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=false
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
deleted file mode 100644
index 5522cbf3b0..0000000000
--- a/.settings/org.eclipse.wst.validation.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Feb 20 16:42:38 PST 2007
-DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
diff --git a/.travis.yml b/.travis.yml
index a8b579c681..f1dd7898a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,28 +1,28 @@
 sudo: false
 language: java
 jdk:
-- openjdk8
-- openjdk9
-- openjdk10
-- openjdk11
-- oraclejdk8
-- oraclejdk9
-- oraclejdk11
+  - openjdk8
+  - openjdk9
+  - openjdk10
+  - openjdk11
+  - oraclejdk8
+  - oraclejdk9
+  - oraclejdk11
 
-script: mvn test 
+script: mvn test
 
-jobs: 
-  include: 
-    stage: report generation 
-    jdk: openjdk11 
-    script: mvn test site 
+jobs:
+  include:
+    stage: report generation
+    jdk: openjdk11
+    script: mvn test site
     after_success:
-      - bash <(curl -s https://codecov.io/bash) 
-    deploy: 
+      - bash <(curl -s https://codecov.io/bash)
+    deploy:
       provider: pages
       local-dir: "./target/site/"
       skip-cleanup: true
       github-token: "$GITHUB_TOKEN"
       keep-history: true # keeps commit history of gh-pages branch
       on:
-        branch: master
+        branch: master
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 3b64466870..a0ea08c6ac 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,4 +1,4 @@
 ## Code of Conduct
-This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). 
-For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact 
-opensource-codeofconduct@amazon.com with any additional questions or comments.
+This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
+For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
+opensource-codeofconduct@amazon.com with any additional questions or comments.
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e5289c5300..f226f24d2d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,9 +1,9 @@
 # Contributing Guidelines
 
-Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional 
+Thank you for your interest in contributing to our project. Whether it's a bug report, new feature, correction, or additional
 documentation, we greatly value feedback and contributions from our community.
 
-Please read through this document before submitting any issues or pull requests to ensure we have all the necessary 
+Please read through this document before submitting any issues or pull requests to ensure we have all the necessary
 information to effectively respond to your bug report or contribution.
 
 
@@ -11,7 +11,7 @@ information to effectively respond to your bug report or contribution.
 
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-When filing an issue, please check [existing open](https://github.com/amzn/ion-java/issues), or [recently closed](https://github.com/amzn/ion-java/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already 
+When filing an issue, please check [existing open](https://github.com/amzn/ion-java/issues), or [recently closed](https://github.com/amzn/ion-java/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 * A reproducible test case or series of steps
@@ -36,17 +36,17 @@ To send us a pull request, please:
 5. Send us a pull request, answering any default questions in the pull request interface.
 6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
 
-GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and 
+GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
 [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
 
 
 ## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/amzn/ion-java/labels/help%20wanted) issues is a great place to start. 
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/amzn/ion-java/labels/help%20wanted) issues is a great place to start.
 
 
 ## Code of Conduct
-This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct). 
-For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact 
+This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
+For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
 opensource-codeofconduct@amazon.com with any additional questions or comments.
 
 
@@ -58,4 +58,4 @@ If you discover a potential security issue in this project we ask that you notif
 
 See the [LICENSE](https://github.com/amzn/ion-java/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
-We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
+We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index d9a10c0d8e..2bb9ad240f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -173,4 +173,4 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
-   END OF TERMS AND CONDITIONS
+   END OF TERMS AND CONDITIONS
\ No newline at end of file
diff --git a/NOTICE b/NOTICE
index 2225c71e25..884a507a45 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,2 +1,2 @@
 Amazon Ion Java
-Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
+Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
\ No newline at end of file
diff --git a/README.md b/README.md
index 8a9da762ad..5c27014596 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,8 @@
 A Java implementation of the [Ion data notation](http://amzn.github.io/ion-docs).
 
 [![Build Status](https://travis-ci.org/amzn/ion-java.svg?branch=master)](https://travis-ci.org/amzn/ion-java)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/software.amazon.ion/ion-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/software.amazon.ion/ion-java)
-[![Javadoc](https://javadoc-badge.appspot.com/software.amazon.ion/ion-java.svg?label=javadoc)](http://www.javadoc.io/doc/software.amazon.ion/ion-java)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.amazon.ion/ion-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.amazon.ion/ion-java)
+[![Javadoc](https://javadoc-badge.appspot.com/com.amazon.ion/ion-java.svg?label=javadoc)](http://www.javadoc.io/doc/com.amazon.ion/ion-java)
 
 ## Setup
 This repository contains a [git submodule](https://git-scm.com/docs/git-submodule)
@@ -58,7 +58,7 @@ dependency into your project's `pom.xml`:
 
 ```
 <dependency>
-  <groupId>software.amazon.ion</groupId>
+  <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
   <version>1.3.1</version>
 </dependency>
@@ -66,5 +66,5 @@ dependency into your project's `pom.xml`:
 
 ## Using the Library
 A great way to get started is to use the [Ion cookbook](http://amzn.github.io/ion-docs/cookbook.html).
-The [API documentation](http://www.javadoc.io/doc/software.amazon.ion/ion-java) will give a lot
-of detailed information about how to use the library.
+The [API documentation](http://www.javadoc.io/doc/com.amazon.ion/ion-java) will give a lot
+of detailed information about how to use the library.
\ No newline at end of file
diff --git a/ion-tests b/ion-tests
index 0281240a90..48a63157b2 160000
--- a/ion-tests
+++ b/ion-tests
@@ -1 +1 @@
-Subproject commit 0281240a9039a1f609fc8e289721efff489956be
+Subproject commit 48a63157b28b81ed72c71789dac7d7f0ffe87038
diff --git a/pom.xml b/pom.xml
index 9550562224..33792c29df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,22 @@
+<!--
+  ~ Copyright 2007 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License").
+  ~ You may not use this file except in compliance with the License.
+  ~ A copy of the License is located at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ or in the "license" file accompanying this file. This file is distributed
+  ~ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+  ~ express or implied. See the License for the specific language governing
+  ~ permissions and limitations under the License.
+  -->
+
 <project>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>software.amazon.ion</groupId>
+  <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
   <version>1.3.1</version>
   <packaging>bundle</packaging>
@@ -20,13 +35,13 @@
   </licenses>
 
   <developers>
-     <developer>
-       <name>Amazon Ion Team</name>
-       <email>ion-team@amazon.com</email>
-       <organization>Amazon Labs</organization>
-       <organizationUrl>https://github.com/amzn</organizationUrl>
-     </developer>
-   </developers>
+    <developer>
+      <name>Amazon Ion Team</name>
+      <email>ion-team@amazon.com</email>
+      <organization>Amazon</organization>
+      <organizationUrl>https://github.com/amzn</organizationUrl>
+    </developer>
+  </developers>
 
   <scm>
     <connection>scm:git:git@github.com:amzn/ion-java.git</connection>
@@ -111,16 +126,16 @@
         <configuration>
           <instructions>
             <Export-Package>
-              !software.amazon.ion.apps.*,
-              !software.amazon.ion.impl.*,
-              software.amazon.ion.*,
+              !com.amazon.ion.apps.*,
+              !com.amazon.ion.impl.*,
+              com.amazon.ion.*,
             </Export-Package>
             <!-- This can be used to retrieve the compiled JarInfo. -->
-            <Main-Class>software.amazon.ion.impl.PrivateCommandLine</Main-Class>
+            <Main-Class>com.amazon.ion.impl.PrivateCommandLine</Main-Class>
             <!-- Add these properties to the manifest so they may be retrieved at runtime. -->
             <Ion-Java-Build-Time>${build.time}</Ion-Java-Build-Time>
             <Ion-Java-Project-Version>${project.version}</Ion-Java-Project-Version>
-            <Automatic-Module-Name>software.amazon.ion</Automatic-Module-Name>
+            <Automatic-Module-Name>com.amazon.ion</Automatic-Module-Name>
           </instructions>
         </configuration>
       </plugin>
@@ -192,11 +207,11 @@
         <reportSets>
           <reportSet>
             <configuration>
-              <excludePackageNames>software.amazon.ion.apps:software.amazon.ion.impl</excludePackageNames>
+              <excludePackageNames>com.amazon.ion.apps:com.amazon.ion.impl</excludePackageNames>
               <sourceFileExcludes>
                 <exclude>**/*Private*</exclude>
               </sourceFileExcludes>
-              <overview>${project.basedir}/src/software/amazon/ion/overview.html</overview>
+              <overview>${project.basedir}/src/com/amazon/ion/overview.html</overview>
               <doctitle>Amazon Ion Java ${project.version} API Reference</doctitle>
               <windowtitle>Ion Java ${project.version}</windowtitle>
               <header>Amazon Ion Java ${project.version} API Reference</header>
@@ -262,11 +277,11 @@
             <artifactId>maven-javadoc-plugin</artifactId>
             <version>2.10.3</version>
             <configuration>
-              <excludePackageNames>software.amazon.ion.apps:software.amazon.ion.impl</excludePackageNames>
+              <excludePackageNames>com.amazon.ion.apps:com.amazon.ion.impl</excludePackageNames>
               <sourceFileExcludes>
                 <exclude>**/*Private*</exclude>
               </sourceFileExcludes>
-              <overview>${project.basedir}/src/software/amazon/ion/overview.html</overview>
+              <overview>${project.basedir}/src/com/amazon/ion/overview.html</overview>
               <doctitle>Amazon Ion Java ${project.version} API Reference</doctitle>
               <windowtitle>Ion Java ${project.version}</windowtitle>
               <header>Amazon Ion Java ${project.version} API Reference</header>
@@ -316,4 +331,4 @@
     </profile>
   </profiles>
 
-</project>
+</project>
\ No newline at end of file
diff --git a/src/com/amazon/ion/ContainedValueException.java b/src/com/amazon/ion/ContainedValueException.java
new file mode 100644
index 0000000000..a7c5deea20
--- /dev/null
+++ b/src/com/amazon/ion/ContainedValueException.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+/**
+ * An error caused by adding an {@link IonValue} into a container when it's
+ * already contained elsewhere.
+ */
+public class ContainedValueException
+    extends IonException
+{
+    private static final long serialVersionUID = 1L;
+
+
+    public ContainedValueException()
+    {
+        super();
+    }
+
+    /**
+     * @param message
+     */
+    public ContainedValueException(String message)
+    {
+        super(message);
+    }
+}
diff --git a/src/software/amazon/ion/Decimal.java b/src/com/amazon/ion/Decimal.java
similarity index 90%
rename from src/software/amazon/ion/Decimal.java
rename to src/com/amazon/ion/Decimal.java
index a92dc06644..bde45ee1f1 100644
--- a/src/software/amazon/ion/Decimal.java
+++ b/src/com/amazon/ion/Decimal.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -68,14 +69,16 @@ private NegativeZero(int scale, MathContext mc)
         public float floatValue()
         {
             float v = super.floatValue();
-            return Float.compare(0f, v) <= 0 ? -1 * v : v;
+            if (Float.compare(0f, v) <= 0) v = -1 * v;
+            return v;
         }
 
         @Override
         public double doubleValue()
         {
             double v = super.doubleValue();
-            return Double.compare(0d, v) <= 0 ? -1 * v : v;
+            if (Double.compare(0d, v) <= 0) v = -1 * v;
+            return v;
         }
 
 
@@ -157,8 +160,12 @@ public static boolean isNegativeZero(BigDecimal val)
      */
     public static BigDecimal bigDecimalValue(BigDecimal val)
     {
-        return val == null || val.getClass() == BigDecimal.class ?
-            val : new BigDecimal(val.unscaledValue(), val.scale());
+        if (val == null
+            || val.getClass() == BigDecimal.class)
+        {
+            return val;
+        }
+        return new BigDecimal(val.unscaledValue(), val.scale());
     }
 
     /**
@@ -263,12 +270,17 @@ public static Decimal valueOf(double val)
 
     public static Decimal valueOf(double val, MathContext mc)
     {
-        return Double.compare(val, -0d) == 0 ? new NegativeZero(1, mc) : new Decimal(Double.toString(val), mc);
+        if (Double.compare(val, -0d) == 0)
+        {
+            return new NegativeZero(1, mc);
+        }
+        return new Decimal(Double.toString(val), mc);
     }
 
     public static Decimal valueOf(BigDecimal val)
     {
-        return val == null || val instanceof Decimal ? (Decimal) val : new Decimal(val.unscaledValue(), val.scale());
+        if (val == null || val instanceof Decimal) return (Decimal) val;
+        return new Decimal(val.unscaledValue(), val.scale());
     }
 
     public static Decimal valueOf(BigDecimal val, MathContext mc)
@@ -410,6 +422,7 @@ public final boolean isNegativeZero()
      */
     public final BigDecimal bigDecimalValue()
     {
+
         return new BigDecimal(unscaledValue(), scale());
     }
 }
diff --git a/src/com/amazon/ion/EmptySymbolException.java b/src/com/amazon/ion/EmptySymbolException.java
new file mode 100644
index 0000000000..eb1351906f
--- /dev/null
+++ b/src/com/amazon/ion/EmptySymbolException.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+/**
+ * An error caused by a symbol not containing at least one character for
+ * its text.
+ *
+ * @deprecated this exception is not used as empty symbols are valid. In cases where null is used as the symbol value it was
+ * replaced by {@link NullPointerException}
+ */
+@Deprecated
+public class EmptySymbolException
+    extends IonException
+{
+    private static final long serialVersionUID = -7801632953459636349L;
+
+    public EmptySymbolException()
+    {
+        super("Symbols must contain at least one character.");
+    }
+}
diff --git a/src/software/amazon/ion/IntegerSize.java b/src/com/amazon/ion/IntegerSize.java
similarity index 55%
rename from src/software/amazon/ion/IntegerSize.java
rename to src/com/amazon/ion/IntegerSize.java
index 732dab211a..7ced059a0f 100644
--- a/src/software/amazon/ion/IntegerSize.java
+++ b/src/com/amazon/ion/IntegerSize.java
@@ -1,6 +1,19 @@
-// Copyright (c) 2016 Amazon.com, Inc.  All rights reserved.
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * Indicates the smallest-possible Java type of an Ion {@code int} value.
diff --git a/src/com/amazon/ion/InvalidSystemSymbolException.java b/src/com/amazon/ion/InvalidSystemSymbolException.java
new file mode 100644
index 0000000000..c718ba46e4
--- /dev/null
+++ b/src/com/amazon/ion/InvalidSystemSymbolException.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+
+/**
+ * An error caused by use of an invalid symbol starting with
+ * <code>"$ion_"</code>.
+ */
+public class InvalidSystemSymbolException
+    extends IonException
+{
+    private static final long serialVersionUID = 2206499395645594047L;
+
+    private String myBadSymbol;
+
+
+    public InvalidSystemSymbolException(String badSymbol)
+    {
+        super("Invalid system symbol '" + badSymbol + "'");
+        myBadSymbol = badSymbol;
+    }
+
+
+    public String getBadSymbol()
+    {
+        return myBadSymbol;
+    }
+}
diff --git a/src/com/amazon/ion/IonBinaryWriter.java b/src/com/amazon/ion/IonBinaryWriter.java
new file mode 100644
index 0000000000..fcbf94edaa
--- /dev/null
+++ b/src/com/amazon/ion/IonBinaryWriter.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * An {@link IonWriter} that encodes Ion binary data.
+ *
+ * @deprecated Use {@link IonSystem#newBinaryWriter(OutputStream, SymbolTable...)} instead.
+ */
+@Deprecated
+public interface IonBinaryWriter
+    extends IonWriter
+{
+
+    /**
+     * Gets the size in bytes of this binary data.
+     * This is generally needed before calling {@link #getBytes()} or
+     * {@link #getBytes(byte[], int, int)}.
+     *
+     * @return the size in bytes.
+     */
+    @Deprecated
+    public int byteSize();
+
+    /**
+     * Copies the current contents of this writer as a new byte array holding
+     * Ion binary-encoded data.
+     * This allocates an array of the size needed to exactly
+     * hold the output and copies the entire value to it.
+     *
+     * @return the byte array with the writers output
+     * @throws IOException
+     */
+    @Deprecated
+    public byte[] getBytes()
+        throws IOException;
+
+
+    /**
+     * Copies the current contents of the writer to a given byte array
+     * array.  This starts writing to the array at offset and writes
+     * up to maxlen bytes.
+     * If this writer is not able to stop in the middle of its
+     * work this may overwrite the array and later throw and exception.
+     *
+     * @param bytes users byte array to write into
+     * @param offset initial offset in the array to write into
+     * @param maxlen maximum number of bytes to write
+     * @return number of bytes written
+     * @throws IOException
+     */
+    @Deprecated
+    public int getBytes(byte[] bytes, int offset, int maxlen)
+        throws IOException;
+
+    /**
+     * Writes the current contents of the writer to the output
+     * stream.  This is only valid if the writer is not in the
+     * middle of writing a container.
+     *
+     * @param userstream OutputStream to write the bytes to
+     * @return int length of bytes written
+     * @throws IOException
+     */
+    @Deprecated
+    public int writeBytes(OutputStream userstream)
+        throws IOException;
+
+}
diff --git a/src/software/amazon/ion/IonBlob.java b/src/com/amazon/ion/IonBlob.java
similarity index 72%
rename from src/software/amazon/ion/IonBlob.java
rename to src/com/amazon/ion/IonBlob.java
index f90468e703..503a865579 100644
--- a/src/software/amazon/ion/IonBlob.java
+++ b/src/com/amazon/ion/IonBlob.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.io.IOException;
 
diff --git a/src/software/amazon/ion/IonBool.java b/src/com/amazon/ion/IonBool.java
similarity index 75%
rename from src/software/amazon/ion/IonBool.java
rename to src/com/amazon/ion/IonBool.java
index 9bbd928fac..4ed612194e 100644
--- a/src/software/amazon/ion/IonBool.java
+++ b/src/com/amazon/ion/IonBool.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 
 
diff --git a/src/software/amazon/ion/IonCatalog.java b/src/com/amazon/ion/IonCatalog.java
similarity index 88%
rename from src/software/amazon/ion/IonCatalog.java
rename to src/com/amazon/ion/IonCatalog.java
index a852ae080b..cf79390d92 100644
--- a/src/software/amazon/ion/IonCatalog.java
+++ b/src/com/amazon/ion/IonCatalog.java
@@ -1,21 +1,22 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import software.amazon.ion.system.IonSystemBuilder;
-import software.amazon.ion.system.SimpleCatalog;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.SimpleCatalog;
 
 
 /**
@@ -71,7 +72,7 @@
  * Binary <em>decoding</em> prefers an exact match, and in a couple edge cases,
  * requires it. Therefore a single "get latest version" method is insufficient.
  * See the
- * <a href="http://amzn.github.io/ion-docs/symbols.html">Ion Symbols page</a>
+ * <a href="http://amzn.github.io/ion-docs/docs/symbols.html">Ion Symbols page</a>
  * for more details on this topic.
  * <p>
  * It's expected that many if not most applications will implement a dynamic
diff --git a/src/software/amazon/ion/IonClob.java b/src/com/amazon/ion/IonClob.java
similarity index 79%
rename from src/software/amazon/ion/IonClob.java
rename to src/com/amazon/ion/IonClob.java
index 9ca6b5fe30..9004337913 100644
--- a/src/software/amazon/ion/IonClob.java
+++ b/src/com/amazon/ion/IonClob.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.io.Reader;
 import java.nio.charset.Charset;
diff --git a/src/software/amazon/ion/IonContainer.java b/src/com/amazon/ion/IonContainer.java
similarity index 88%
rename from src/software/amazon/ion/IonContainer.java
rename to src/com/amazon/ion/IonContainer.java
index 8c1f621975..12805d8ea4 100644
--- a/src/software/amazon/ion/IonContainer.java
+++ b/src/com/amazon/ion/IonContainer.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/src/software/amazon/ion/IonDatagram.java b/src/com/amazon/ion/IonDatagram.java
similarity index 71%
rename from src/software/amazon/ion/IonDatagram.java
rename to src/com/amazon/ion/IonDatagram.java
index fad4c6ce62..72394b35d3 100644
--- a/src/software/amazon/ion/IonDatagram.java
+++ b/src/com/amazon/ion/IonDatagram.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -41,11 +42,11 @@ public interface IonDatagram
     /**
      * This inherited method is not yet supported by datagrams.
      * <p>
-     * Vote for issue amzn/ion-java#48 if you need this.
+     * Vote for issue amzn/ion-java/issues/48 if you need this.
      *
      * @throws UnsupportedOperationException at every call.
      *
-     * @see <a href="https://github.com/amzn/ion-java/issues/48">amzn/ion-java#48</a>
+     * @see <a href="https://github.com/amzn/ion-java/issues/48">amzn/ion-java/issues/48</a>
      */
     public void add(int index, IonValue element)
         throws ContainedValueException, NullPointerException;
@@ -53,11 +54,11 @@ public void add(int index, IonValue element)
     /**
      * This inherited method is not yet supported by datagrams.
      * <p>
-     * Vote for issue amzn/ion-java#48 if you need this.
+     * Vote for issue amzn/ion-java/issues/48 if you need this.
      *
      * @throws UnsupportedOperationException at every call.
      *
-     * @see <a href="https://github.com/amzn/ion-java/issues/48">amzn/ion-java#48</a>
+     * @see <a href="https://github.com/amzn/ion-java/issues/48">amzn/ion-java/issues/48</a>
      */
     public ValueFactory add(int index)
         throws ContainedValueException, NullPointerException;
@@ -65,22 +66,22 @@ public ValueFactory add(int index)
     /**
      * This inherited method is not yet supported by datagrams.
      * <p>
-     * Vote for issue amzn/ion-java#47 if you need this.
+     * Vote for issue amzn/ion-java/issues/47 if you need this.
      *
      * @throws UnsupportedOperationException at every call.
      *
-     * @see <a href="https://github.com/amzn/ion-java/issues/47">amzn/ion-java#47</a>
+     * @see <a href="https://github.com/amzn/ion-java/issues/47">amzn/ion-java/issues/47</a>
      */
     public boolean addAll(int index, Collection<? extends IonValue> c);
 
     /**
      * This inherited method is not yet supported by datagrams.
      * <p>
-     * Vote for issue amzn/ion-java#50 if you need this.
+     * Vote for issue amzn/ion-java/issues/50 if you need this.
      *
      * @throws UnsupportedOperationException at every call.
      *
-     * @see <a href="https://github.com/amzn/ion-java/issues/50">amzn/ion-java#50</a>
+     * @see <a href="https://github.com/amzn/ion-java/issues/50">amzn/ion-java/issues/50</a>
      */
     public IonValue set(int index, IonValue element);
 
@@ -188,6 +189,19 @@ public int byteSize()
         throws IonException;
 
 
+    /**
+     * Copies the binary-encoded form of this datagram into a new byte array.
+     *
+     * @return a new, non-empty byte array containing the encoded datagram.
+     *
+     * @throws IonException if there's an error encoding the data.
+     *
+     * @deprecated Use {@link #getBytes()} instead, which is renamed for consistency with other interfaces.
+     */
+    @Deprecated
+    public byte[] toBytes()
+        throws IonException;
+
     /**
      * Copies the binary-encoded form of this datagram into a new byte array.
      *
@@ -199,6 +213,54 @@ public byte[] getBytes()
         throws IonException;
 
 
+    /**
+     * Copies the binary-encoded form of this datagram into a given array.
+     * <p>
+     * The given array must be large enough to contain all the bytes of this
+     * datagram.
+     * <p>
+     * An invocation of this method of the form {@code dg.get(a)} behaves in
+     * exactly the same way as the invocation:
+     *<pre>
+     *    dg.get(a, 0)
+     *</pre>
+     *
+     * @param dst the array into which bytes are to be written.
+     *
+     * @return the number of bytes copied into {@code dst}.
+     *
+     * @throws IonException if there's an error encoding the data.
+     * @throws IndexOutOfBoundsException if {@code dst.length} is
+     * smaller than the result of {@link #byteSize()}.
+     *
+     * @see #getBytes(byte[],int)
+     */
+    @Deprecated
+    public int getBytes(byte[] dst)
+        throws IonException;
+
+
+    /**
+     * Copies the binary-encoded form of this datagram into a given sub-array.
+     * <p>
+     * The given subarray must be large enough to contain all the bytes of this
+     * datagram.
+     *
+     * @param dst the array into which bytes are to be written.
+     * @param offset the offset within the array of the first byte to be
+     *   written; must be non-negative and no larger than {@code dst.length}
+     *
+     * @return the number of bytes copied into {@code dst}.
+     *
+     * @throws IonException if there's an error encoding the data.
+     * @throws IndexOutOfBoundsException if {@code (dst.length - offset)} is
+     * smaller than the result of {@link #byteSize()}.
+     */
+    @Deprecated
+    public int getBytes(byte[] dst, int offset)
+        throws IonException;
+
+
     /**
      * Copies the binary-encoded form of this datagram to a specified stream.
      *
diff --git a/src/software/amazon/ion/IonDecimal.java b/src/com/amazon/ion/IonDecimal.java
similarity index 87%
rename from src/software/amazon/ion/IonDecimal.java
rename to src/com/amazon/ion/IonDecimal.java
index 827b4749f3..40871bb2a3 100644
--- a/src/software/amazon/ion/IonDecimal.java
+++ b/src/com/amazon/ion/IonDecimal.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.math.BigDecimal;
 
diff --git a/src/software/amazon/ion/IonException.java b/src/com/amazon/ion/IonException.java
similarity index 90%
rename from src/software/amazon/ion/IonException.java
rename to src/com/amazon/ion/IonException.java
index 6410f0dfb1..f4d577f8ea 100644
--- a/src/software/amazon/ion/IonException.java
+++ b/src/com/amazon/ion/IonException.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.io.IOException;
 import java.util.IdentityHashMap;
diff --git a/src/software/amazon/ion/IonFloat.java b/src/com/amazon/ion/IonFloat.java
similarity index 88%
rename from src/software/amazon/ion/IonFloat.java
rename to src/com/amazon/ion/IonFloat.java
index c8db2cef40..e4fa2be69d 100644
--- a/src/software/amazon/ion/IonFloat.java
+++ b/src/com/amazon/ion/IonFloat.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 import java.math.BigDecimal;
 
 
diff --git a/src/software/amazon/ion/IonInt.java b/src/com/amazon/ion/IonInt.java
similarity index 84%
rename from src/software/amazon/ion/IonInt.java
rename to src/com/amazon/ion/IonInt.java
index d2eabbca77..2270b0a918 100644
--- a/src/software/amazon/ion/IonInt.java
+++ b/src/com/amazon/ion/IonInt.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.math.BigInteger;
 
diff --git a/src/software/amazon/ion/IonList.java b/src/com/amazon/ion/IonList.java
similarity index 59%
rename from src/software/amazon/ion/IonList.java
rename to src/com/amazon/ion/IonList.java
index 4834f0926a..0b697fb368 100644
--- a/src/software/amazon/ion/IonList.java
+++ b/src/com/amazon/ion/IonList.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.Collection;
 
diff --git a/src/software/amazon/ion/IonLoader.java b/src/com/amazon/ion/IonLoader.java
similarity index 93%
rename from src/software/amazon/ion/IonLoader.java
rename to src/com/amazon/ion/IonLoader.java
index fe91b340ef..aaab75938a 100644
--- a/src/software/amazon/ion/IonLoader.java
+++ b/src/com/amazon/ion/IonLoader.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/software/amazon/ion/IonLob.java b/src/com/amazon/ion/IonLob.java
similarity index 85%
rename from src/software/amazon/ion/IonLob.java
rename to src/com/amazon/ion/IonLob.java
index 3245ca327c..780b3a61a2 100644
--- a/src/software/amazon/ion/IonLob.java
+++ b/src/com/amazon/ion/IonLob.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.io.InputStream;
 
diff --git a/src/software/amazon/ion/IonMutableCatalog.java b/src/com/amazon/ion/IonMutableCatalog.java
similarity index 64%
rename from src/software/amazon/ion/IonMutableCatalog.java
rename to src/com/amazon/ion/IonMutableCatalog.java
index 6d14f05384..18c528812c 100644
--- a/src/software/amazon/ion/IonMutableCatalog.java
+++ b/src/com/amazon/ion/IonMutableCatalog.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * An {@link IonCatalog} that can be updated.
diff --git a/src/software/amazon/ion/IonNull.java b/src/com/amazon/ion/IonNull.java
similarity index 63%
rename from src/software/amazon/ion/IonNull.java
rename to src/com/amazon/ion/IonNull.java
index 477fcd3909..a841a2901d 100644
--- a/src/software/amazon/ion/IonNull.java
+++ b/src/com/amazon/ion/IonNull.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * The Ion <code>null</code> value, also known as <code>null.null</code>.
diff --git a/src/software/amazon/ion/IonNumber.java b/src/com/amazon/ion/IonNumber.java
similarity index 55%
rename from src/software/amazon/ion/IonNumber.java
rename to src/com/amazon/ion/IonNumber.java
index 593cb1d336..dd17c55975 100644
--- a/src/software/amazon/ion/IonNumber.java
+++ b/src/com/amazon/ion/IonNumber.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * The IonNumber interface is a fore runner of a common base for the
@@ -23,7 +24,7 @@
  * <b>WARNING:</b> This interface should not be implemented or extended by
  * code outside of this library.
  */
-public interface IonNumber // TODO amzn/ion-java#53 Complete this interface
+public interface IonNumber // TODO amzn/ion-java/issues/53 Complete this interface
     extends IonValue
 {
 }
diff --git a/src/software/amazon/ion/IonReader.java b/src/com/amazon/ion/IonReader.java
similarity index 88%
rename from src/software/amazon/ion/IonReader.java
rename to src/com/amazon/ion/IonReader.java
index b849f36f36..7675b4b436 100644
--- a/src/software/amazon/ion/IonReader.java
+++ b/src/com/amazon/ion/IonReader.java
@@ -1,26 +1,27 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.facet.Faceted;
 import java.io.Closeable;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.Iterator;
-import software.amazon.ion.facet.Faceted;
 
 /* One design goal is for the readers and writers to be independent of an
  * IonSystem or ValueFactory and thus independent of particular implementations
@@ -40,7 +41,7 @@
  * <b>WARNING:</b> This interface should not be implemented or extended by
  * code outside of this library.
  * We still have some work to do before this interface is stable.
- * See <a href="https://github.com/amzn/ion-java/issues/11">issue amzn/ion-java#11</a>
+ * See <a href="https://github.com/amzn/ion-java/issues/11">issue amzn/ion-java/issues/11</a>
  * <p>
  * An {@code IonReader} has a "cursor" tracking the <em>current value</em> on
  * which the reader is positioned. Generally, newly created readers are not
@@ -87,7 +88,7 @@
  * <h3>The {@link SeekableReader} Facet</h3>
  * This facet is available on all readers <em>except</em> those created from
  * an {@link java.io.InputStream InputStream}.
- * (See <a href="https://github.com/amzn/ion-java/issues/17">issue amzn/ion-java#17</a>.)
+ * (See <a href="https://github.com/amzn/ion-java/issues/17">issue amzn/ion-java/issues/17</a>.)
  * It allows the user to reposition the reader to a {@link Span} over the
  * same reader instance or another reader with the same source.
  *
@@ -104,6 +105,24 @@
 public interface IonReader
     extends Closeable, Faceted
 {
+
+    /**
+     * Determines whether there is another value at the current depth;
+     * in other words whether there is a sibling value that may be reached
+     * using {@link #next()}.
+     * This method may be
+     * called multiple times, which does not move the current position.
+     * <p>
+     * <b>WARNING:</b> this method alters the internal state of the reader such
+     * that you cannot reliably get values from the "current" element. The only
+     * thing you should call after {@code hasNext()} is {@link #next()}!
+     *
+     * @deprecated Applications should detect the end of the current level by
+     * checking for a {@code null} response from {@link #next()}.
+     */
+    @Deprecated
+    public boolean hasNext();
+
     /**
      * Positions this reader on the next sibling after the current value,
      * returning the type of that value.  Once so positioned the contents of
@@ -213,6 +232,24 @@ public interface IonReader
      */
     public Iterator<String> iterateTypeAnnotations();
 
+    /**
+
+    /**
+     * Gets the symbol ID of the field name attached to the current value.
+     * <p>
+     * <b>This is an "expert method": correct use requires deep understanding
+     * of the Ion binary format. You almost certainly don't want to use it.</b>
+     *
+     * @return the symbol ID of the field name, if the current value is a
+     * field within a struct.
+     * If the current value is not a field, or if the symbol ID cannot be
+     * determined, this method returns a value <em>less than one</em>.
+     *
+     * @deprecated Use {@link #getFieldNameSymbol()} instead.
+     */
+    @Deprecated
+    public int getFieldId();
+
     /**
      * Return the field name of the current value. Or null if there is no valid
      * current value or if the current value is not a field of a struct.
@@ -233,6 +270,7 @@ public interface IonReader
      * @return null if there is no current value or if the current value is
      *  not a field of a struct.
      *
+
      */
     public SymbolToken getFieldNameSymbol();
 
@@ -355,6 +393,7 @@ public interface IonReader
      *
      * @return null if {@link #isNullValue()}
      *
+
      */
     public SymbolToken symbolValue();
 
diff --git a/src/software/amazon/ion/IonSequence.java b/src/com/amazon/ion/IonSequence.java
similarity index 97%
rename from src/software/amazon/ion/IonSequence.java
rename to src/com/amazon/ion/IonSequence.java
index f42a9c6dfe..9621859e59 100644
--- a/src/software/amazon/ion/IonSequence.java
+++ b/src/com/amazon/ion/IonSequence.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/src/software/amazon/ion/IonSexp.java b/src/com/amazon/ion/IonSexp.java
similarity index 60%
rename from src/software/amazon/ion/IonSexp.java
rename to src/com/amazon/ion/IonSexp.java
index 4003d1b9e7..961d5a5354 100644
--- a/src/software/amazon/ion/IonSexp.java
+++ b/src/com/amazon/ion/IonSexp.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.Collection;
 
diff --git a/src/software/amazon/ion/IonString.java b/src/com/amazon/ion/IonString.java
similarity index 70%
rename from src/software/amazon/ion/IonString.java
rename to src/com/amazon/ion/IonString.java
index 6c6c311844..c7d471610e 100644
--- a/src/software/amazon/ion/IonString.java
+++ b/src/com/amazon/ion/IonString.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * An Ion <code>string</code> value.
diff --git a/src/software/amazon/ion/IonStruct.java b/src/com/amazon/ion/IonStruct.java
similarity index 96%
rename from src/software/amazon/ion/IonStruct.java
rename to src/com/amazon/ion/IonStruct.java
index f554fdc05f..6ebb0be081 100644
--- a/src/software/amazon/ion/IonStruct.java
+++ b/src/com/amazon/ion/IonStruct.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.Map;
 
diff --git a/src/software/amazon/ion/IonSymbol.java b/src/com/amazon/ion/IonSymbol.java
similarity index 58%
rename from src/software/amazon/ion/IonSymbol.java
rename to src/com/amazon/ion/IonSymbol.java
index e0f4170869..78fc2b711d 100644
--- a/src/software/amazon/ion/IonSymbol.java
+++ b/src/com/amazon/ion/IonSymbol.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * An Ion <code>symbol</code> value.
@@ -35,6 +36,21 @@ public String stringValue()
         throws UnknownSymbolException;
 
 
+    /**
+     * Gets the integer symbol id used in the binary encoding of this symbol.
+     *
+     * @return an integer greater than zero, if this value has an associated
+     * symbol table.  Otherwise, return {@link SymbolTable#UNKNOWN_SYMBOL_ID}.
+     *
+     * @throws NullValueException if this is <code>null.symbol</code>.
+     *
+     * @deprecated Use {@link #symbolValue()} instead.
+     */
+    @Deprecated
+    public int getSymbolId()
+        throws NullValueException;
+
+
     /**
      * Returns this value as a symbol token (text + ID).
      *
diff --git a/src/software/amazon/ion/IonSystem.java b/src/com/amazon/ion/IonSystem.java
similarity index 92%
rename from src/software/amazon/ion/IonSystem.java
rename to src/com/amazon/ion/IonSystem.java
index 57c2e92987..56871c9ec7 100644
--- a/src/software/amazon/ion/IonSystem.java
+++ b/src/com/amazon/ion/IonSystem.java
@@ -1,27 +1,28 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Reader;
 import java.util.Date;
 import java.util.Iterator;
-import software.amazon.ion.system.IonSystemBuilder;
-import software.amazon.ion.system.IonTextWriterBuilder;
 
 /**
  * Entry point to all things Ion.
@@ -38,7 +39,7 @@
  * {@link #clone(IonValue)}.
  * <p>
  * To create an {@code IonSystem},
- * see {@link software.amazon.ion.system.IonSystemBuilder}.
+ * see {@link com.amazon.ion.system.IonSystemBuilder}.
  * <p>
  * <b>Implementations of this interface are safe for use by multiple
  * threads.</b>
@@ -93,7 +94,7 @@ public SymbolTable getSystemSymbolTable(String ionVersionId)
      * or if any but the first is a system table.
      * @throws NullPointerException if any import is null.
      */
-    // TODO amzn/ion-java#38 Should we allow substituted imports as valid args?
+    // TODO amzn/ion-java/issues/38 Should we allow substituted imports as valid args?
     public SymbolTable newLocalSymbolTable(SymbolTable... imports);
 
 
@@ -218,7 +219,7 @@ public SymbolTable newSharedSymbolTable(String name,
      * schema.
      * <p>
      * Applications should generally use {@link #iterate(InputStream)}
-     * whenever possible, since this library has much faster UTF-8 decoding
+     * whenever possible, since this library has much faster Unicode decoding
      * than the Java IO framework.
      * <p>
      * Because this library performs its own buffering, it's recommended that
@@ -394,7 +395,8 @@ public SymbolTable newSharedSymbolTable(String name,
      *
      * @param ionText must not be null.
      */
-    public IonReader newReader(String ionText);
+    @SuppressWarnings("deprecation")
+    public IonTextReader newReader(String ionText);
 
     /**
      * Creates an new {@link IonReader} instance over a block of Ion data,
@@ -447,7 +449,7 @@ public SymbolTable newSharedSymbolTable(String name,
      * Creates an new {@link IonReader} instance over Ion text data.
      * <p>
      * Applications should generally us {@link #newReader(InputStream)}
-     * whenever possible, since this library has much faster UTF-8 decoding
+     * whenever possible, since this library has much faster Unicode decoding
      * than the Java IO framework.
      * <p>
      * Because this library performs its own buffering, it's recommended that
@@ -569,6 +571,32 @@ public IonWriter newTextWriter(Appendable out, SymbolTable... imports)
      */
     public IonWriter newBinaryWriter(OutputStream out, SymbolTable... imports);
 
+    /**
+     * Creates a new writer that will encode binary Ion data.
+     *
+     * @return a new {@link IonBinaryWriter} instance; not {@code null}.
+     *
+     * @deprecated Use {@link #newBinaryWriter(OutputStream, SymbolTable...)} instead.
+     */
+    @Deprecated
+    public IonBinaryWriter newBinaryWriter();
+
+    /**
+     * Creates a new writer that will encode binary Ion data,
+     * using the given shared symbol tables as imports.
+     * <p>
+     * The output stream will be start with an Ion Version Marker and a
+     * local symbol table that uses the given {@code imports}.
+     *
+     * @param imports a sequence of shared symbol tables
+     *
+     * @return a new {@link IonBinaryWriter} instance; not {@code null}.
+     *
+     * @deprecated Use {@link #newBinaryWriter(OutputStream, SymbolTable...)} instead.
+     */
+    @Deprecated
+    public IonBinaryWriter newBinaryWriter(SymbolTable... imports);
+
 
     //-------------------------------------------------------------------------
     // DOM creation
@@ -602,8 +630,8 @@ public IonWriter newTextWriter(Appendable out, SymbolTable... imports)
 
     /**
      * Creates a new datagram, bootstrapped with imported symbol tables.
-     * Generally an application will use this to acquire a datagram, then adds
-     * values to it, then calls {@link IonDatagram#getBytes()}
+     * Generally an application will use this to aquire a datagram, then adds
+     * values to it, then calls {@link IonDatagram#getBytes(byte[])}
      * (or similar) to extract binary data.
      *
      * @param imports the set of shared symbol tables to import.
diff --git a/src/software/amazon/ion/IonText.java b/src/com/amazon/ion/IonText.java
similarity index 73%
rename from src/software/amazon/ion/IonText.java
rename to src/com/amazon/ion/IonText.java
index d8057f8179..efb510c521 100644
--- a/src/software/amazon/ion/IonText.java
+++ b/src/com/amazon/ion/IonText.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * Common functionality of Ion <code>string</code> and <code>symbol</code>
diff --git a/src/com/amazon/ion/IonTextReader.java b/src/com/amazon/ion/IonTextReader.java
new file mode 100644
index 0000000000..3a41c6cdda
--- /dev/null
+++ b/src/com/amazon/ion/IonTextReader.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+import com.amazon.ion.util.Spans;
+
+/**
+ * Extends {@link IonReader} with capabilites specialized to Ion text data
+ * streams.
+ *
+ * @deprecated Use {@link TextSpan} instead.
+ *
+ * @see SpanProvider
+ * @see TextSpan
+ * @see Spans#currentSpan(Class, Object)
+ */
+@Deprecated
+public interface IonTextReader
+    extends IonReader
+{
+
+}
diff --git a/src/software/amazon/ion/IonTimestamp.java b/src/com/amazon/ion/IonTimestamp.java
similarity index 95%
rename from src/software/amazon/ion/IonTimestamp.java
rename to src/com/amazon/ion/IonTimestamp.java
index af3fdd3ba7..63bb78c5bc 100644
--- a/src/software/amazon/ion/IonTimestamp.java
+++ b/src/com/amazon/ion/IonTimestamp.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -28,7 +29,7 @@
 public interface IonTimestamp
     extends IonValue
 {
-    // TODO amzn/ion-java#33 Deprecate setters and getters
+    // TODO amzn/ion-java/issues/223 Deprecate setters and getters
 
     /**
      * Gets the value of this <code>timestamp</code> in a form suitable for
diff --git a/src/software/amazon/ion/IonType.java b/src/com/amazon/ion/IonType.java
similarity index 81%
rename from src/software/amazon/ion/IonType.java
rename to src/com/amazon/ion/IonType.java
index dd7edd29d1..1a2e112168 100644
--- a/src/software/amazon/ion/IonType.java
+++ b/src/com/amazon/ion/IonType.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 
 /**
@@ -63,6 +64,7 @@ public static boolean isContainer(IonType t)
      *
      * @return true when {@code t} is {@link #STRING} or {@link #SYMBOL}.
      *
+
      */
     public static boolean isText(IonType t)
     {
@@ -77,6 +79,7 @@ public static boolean isText(IonType t)
      *
      * @return true when {@code t} is {@link #BLOB} or {@link #CLOB}.
      *
+
      */
     public static boolean isLob(IonType t)
     {
diff --git a/src/software/amazon/ion/IonValue.java b/src/com/amazon/ion/IonValue.java
similarity index 94%
rename from src/software/amazon/ion/IonValue.java
rename to src/com/amazon/ion/IonValue.java
index d22a58ed43..74e8285886 100644
--- a/src/software/amazon/ion/IonValue.java
+++ b/src/com/amazon/ion/IonValue.java
@@ -1,22 +1,23 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.system.IonTextWriterBuilder;
 import java.util.Collections;
 import java.util.concurrent.CountDownLatch;
-import software.amazon.ion.system.IonTextWriterBuilder;
 
 /**
  * Base type for all Ion data nodes.
@@ -214,7 +215,7 @@ public interface IonValue
      * local or system symbol table (or null).
      *
      * @return the symbol table, or <code>null</code> if this value is not
-     * currently backed by a symbol table.
+     * currently backed by binary-encoded data.
      */
     public SymbolTable getSymbolTable();
 
@@ -238,6 +239,19 @@ public interface IonValue
     public SymbolToken getFieldNameSymbol();
 
 
+    /**
+     * Gets the symbol ID of the field name attached to this value.
+     *
+     * @return the symbol ID of the field name, if this is part of an
+     * {@link IonStruct}. If this is not a field, or if the symbol ID cannot be
+     * determined, this method returns a value <em>less than one</em>.
+     *
+     * @deprecated Use {@link #getFieldNameSymbol()} instead.
+     */
+    @Deprecated
+    public int getFieldId();
+
+
     /**
      * Gets the container of this value,
      * or <code>null</code> if this is not part of one.
@@ -264,6 +278,7 @@ public interface IonValue
      *
      * @throws UnsupportedOperationException if this is an {@link IonDatagram}.
      *
+
      */
     public IonValue topLevelValue();
 
@@ -285,6 +300,7 @@ public interface IonValue
      * @return the (ordered) annotations on the current value, or an empty
      * array (not {@code null}) if there are none.
      *
+
      */
     public SymbolToken[] getTypeAnnotationSymbols();
 
@@ -306,6 +322,7 @@ public interface IonValue
      *
      * @throws NullPointerException if any of the annotations are null
      *
+
      */
     public void setTypeAnnotations(String... annotations);
 
@@ -321,6 +338,7 @@ public interface IonValue
      * If null or empty array, then all annotations are removed.
      * Any duplicates are preserved.
      *
+
      */
     public void setTypeAnnotationSymbols(SymbolToken... annotations);
 
@@ -358,6 +376,7 @@ public interface IonValue
      * and performs a deep write, including the contents of
      * any containers encountered.
      *
+
      */
     public void writeTo(IonWriter writer);
 
@@ -428,7 +447,7 @@ public IonValue clone()
      * two strings returned by this method.
      * <p>
      * For more configurable rendering, see
-     * {@link software.amazon.ion.system.IonTextWriterBuilder}.
+     * {@link com.amazon.ion.system.IonTextWriterBuilder}.
      * <p>
      * This is <em>not</em> the correct way to retrieve the content of an
      * {@link IonString} or {@link IonSymbol}!
@@ -460,6 +479,7 @@ public IonValue clone()
      *
      * @return Ion text data equivalent to this value.
      *
+
      */
     public String toPrettyString();
 
@@ -473,6 +493,7 @@ public IonValue clone()
      *
      * @return Ion text data equivalent to this value.
      *
+
      */
     public String toString(IonTextWriterBuilder writerBuilder);
 
@@ -484,7 +505,7 @@ public IonValue clone()
      * traverses the hierarchy, and as such it should be considered an
      * expensive operation.
      *
-     * @see software.amazon.ion.util.Equivalence
+     * @see com.amazon.ion.util.Equivalence
      *
      * @param   other   The value to compare with.
      *
diff --git a/src/software/amazon/ion/IonWriter.java b/src/com/amazon/ion/IonWriter.java
similarity index 88%
rename from src/software/amazon/ion/IonWriter.java
rename to src/com/amazon/ion/IonWriter.java
index 3dc1588692..fe1e0e960d 100644
--- a/src/software/amazon/ion/IonWriter.java
+++ b/src/com/amazon/ion/IonWriter.java
@@ -1,27 +1,30 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.facet.Faceted;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.util.IonStreamUtils;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
 import java.io.Flushable;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import software.amazon.ion.system.IonTextWriterBuilder;
-import software.amazon.ion.util.IonStreamUtils;
+import java.util.Date;
 
 /**
  * Writes Ion data to an output source.
@@ -32,7 +35,7 @@
  * <b>WARNING:</b> This interface should not be implemented or extended by
  * code outside of this library.
  * We still have some work to do before this interface is stable.
- * See <a href="https://github.com/amzn/ion-java/issues/10">issue amzn/ion-java#10</a>
+ * See <a href="https://github.com/amzn/ion-java/issues/10">issue amzn/ion-java/issues/10</a>
  * <p>
  * A value is written via the set of typed {@code write*()} methods such as
  * {@link #writeBool(boolean)} and {@link #writeInt(long)}.
@@ -75,7 +78,7 @@
  * @see IonTextWriterBuilder
  */
 public interface IonWriter
-    extends Closeable, Flushable
+    extends Closeable, Flushable, Faceted
 {
     /**
      * Gets the symbol table that is currently in use by the writer.
@@ -138,7 +141,7 @@ public interface IonWriter
      * as if it were preceded by an Ion version marker, resetting the stream
      * context as if this were a new stream. (Whether or not an IVM is written
      * may depend upon the writer's configuration; see
-     * {@link software.amazon.ion.system.IonWriterBuilder.IvmMinimizing
+     * {@link com.amazon.ion.system.IonWriterBuilder.IvmMinimizing
      * IvmMinimizing}.)
      * <p>
      * This feature can be used to flush reliably before writing more values.
@@ -242,6 +245,7 @@ public interface IonWriter
      * @param annotations
      * If null or empty, any pending annotations are cleared.
      *
+
      */
     public void setTypeAnnotationSymbols(SymbolToken... annotations);
 
@@ -297,6 +301,19 @@ public interface IonWriter
     //=========================================================================
     // Value writing
 
+    /**
+     * writes the contents of the passed in Ion value to the output.
+     * <p>
+     * This method also writes annotations and field names (if in a struct),
+     * and performs a deep write, including the contents of
+     * any containers encountered.
+     *
+     * @param value may be null, in which case this method does nothing.
+     *
+     * @deprecated Use {@link IonValue#writeTo(IonWriter)} instead.
+     */
+    @Deprecated
+    public void writeValue(IonValue value) throws IOException;
 
     /**
      * Writes the current value from a reader.
@@ -391,6 +408,19 @@ public interface IonWriter
      */
     public void writeTimestamp(Timestamp value) throws IOException;
 
+    /**
+     * writes the passed in Date (in milliseconds since the epoch) as an
+     * IonTimestamp.  The Date value is treated as a UTC value with an
+     * unknown timezone offset (a z value).
+     * @param value java.util Date holding the UTC timestamp;
+     * may be null to represent {@code null.timestamp}.
+     *
+     * @deprecated Use {@link #writeTimestamp(Timestamp)
+     * IonWriter.writeTimestamp(}{@link Timestamp#forDateZ(Date) Timestamp.forDateZ(Date))} instead.
+     */
+    @Deprecated
+    public void writeTimestampUTC(Date value) throws IOException;
+
     /**
      * Writes the text of an Ion symbol value.
      *
@@ -403,17 +433,32 @@ public interface IonWriter
 
     /**
      * Writes the content of an Ion symbol value.
-     * If the token has text, it is considered canonical and any SID in the
-     * token may be ignored or reassigned.
      *
      * @param content may be null to represent {@code null.symbol}.
      *
      * @throws IllegalArgumentException if the value contains an invalid UTF-16
      * surrogate pair.
      *
+
      */
     public void writeSymbolToken(SymbolToken content) throws IOException;
 
+    /**
+     * Write an Ion version marker symbol to the output.  This
+     * is the $ion_1_0 value currently (in later versions the
+     * number may change).  In text output this appears as the
+     * text symbol.  In binary this will be the symbol id if
+     * the writer is in a list, sexp or struct.  If the writer
+     * is currently at the top level this will write the
+     * "magic cookie" value.
+     *
+     *  Writing a version marker will reset the symbol table
+     *  to be the system symbol table.
+     *
+     * @throws IOException
+     */
+//    public void writeIonVersionMarker() throws IOException;
+
     /**
      * Writes a {@link java.lang.String} as an Ion string. Since Ion strings are
      * UTF-8 and Java Strings are Unicode 16.  As such the resulting
diff --git a/src/software/amazon/ion/NullValueException.java b/src/com/amazon/ion/NullValueException.java
similarity index 52%
rename from src/software/amazon/ion/NullValueException.java
rename to src/com/amazon/ion/NullValueException.java
index 3b2225b626..ac43f07e0b 100644
--- a/src/software/amazon/ion/NullValueException.java
+++ b/src/com/amazon/ion/NullValueException.java
@@ -1,8 +1,19 @@
 /*
- * Copyright (c) 2007 Amazon.com, Inc.  All rights reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 
 /**
@@ -14,6 +25,7 @@ public class NullValueException
 {
     private static final long serialVersionUID = 1L;
 
+
     public NullValueException()
     {
         super();
diff --git a/src/software/amazon/ion/OffsetSpan.java b/src/com/amazon/ion/OffsetSpan.java
similarity index 77%
rename from src/software/amazon/ion/OffsetSpan.java
rename to src/com/amazon/ion/OffsetSpan.java
index a4341ee890..6ed135351b 100644
--- a/src/software/amazon/ion/OffsetSpan.java
+++ b/src/com/amazon/ion/OffsetSpan.java
@@ -1,22 +1,23 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.facet.Faceted;
+import com.amazon.ion.facet.Facets;
 import java.io.InputStream;
-import software.amazon.ion.facet.Faceted;
-import software.amazon.ion.facet.Facets;
 
 /**
  * Exposes the positions of a {@link Span} in the form of zero-based offsets
diff --git a/src/com/amazon/ion/RawValueSpanProvider.java b/src/com/amazon/ion/RawValueSpanProvider.java
new file mode 100644
index 0000000000..5179d7eda7
--- /dev/null
+++ b/src/com/amazon/ion/RawValueSpanProvider.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+/**
+ * Provide the ability to retrieve {@link Span}s (abstract value positions)
+ * of raw Ion values, excluding type and length octets.
+ * <p>
+ * <b>WARNING:</b> This interface should not be implemented or extended by
+ * code outside of this library.
+ * <p>
+ * This functionality may be accessed as a facet of binary {@link IonReader}s.
+ *
+ * @deprecated This is a private API subject to change without notice.
+ */
+@Deprecated
+public interface RawValueSpanProvider
+{
+
+    /**
+     * Constructs a Span, which may be faceted as an {@link OffsetSpan}, that
+     * provides the start and end byte positions of the current value.
+     * <p>
+     * NOTE: for Ion {@code int} values, users should not use these byte positions to
+     * determine which primitive (if any) the value can fit into, because the
+     * sign of Ion {@code int} values is encoded into the type ID byte, which is
+     * not included in this span.
+     * <p>
+     * <b>WARNING:</b> Spans provided by this method are not compatible with the
+     * {@link SeekableReader} facet, because they lack the type ID and length
+     * bytes that are important when reconstructing the context on seek. For
+     * {@link SpanProvider#currentSpan()} should be used to retrieve seekable
+     * Spans.
+     * @return the constructed Span
+     */
+    public Span valueSpan();
+
+    /**
+     * @return the byte[] that backs this span. This span's start and end positions
+     * may be used as indices into the returned buffer. NOTE: does NOT perform
+     * a copy of the buffer; care must be taken not to mutate and corrupt the
+     * data.
+     */
+    public byte[] buffer();
+
+}
diff --git a/src/software/amazon/ion/ReadOnlyValueException.java b/src/com/amazon/ion/ReadOnlyValueException.java
similarity index 63%
rename from src/software/amazon/ion/ReadOnlyValueException.java
rename to src/com/amazon/ion/ReadOnlyValueException.java
index e9f98daa70..daa3ed3763 100644
--- a/src/software/amazon/ion/ReadOnlyValueException.java
+++ b/src/com/amazon/ion/ReadOnlyValueException.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 
 /**
diff --git a/src/software/amazon/ion/SeekableReader.java b/src/com/amazon/ion/SeekableReader.java
similarity index 89%
rename from src/software/amazon/ion/SeekableReader.java
rename to src/com/amazon/ion/SeekableReader.java
index 59a6f9edd2..0603e6c4d8 100644
--- a/src/software/amazon/ion/SeekableReader.java
+++ b/src/com/amazon/ion/SeekableReader.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * An {@link IonReader} facet providing the ability to retrieve
diff --git a/src/software/amazon/ion/Span.java b/src/com/amazon/ion/Span.java
similarity index 82%
rename from src/software/amazon/ion/Span.java
rename to src/com/amazon/ion/Span.java
index d3c7ec9e7f..c40bb6173e 100644
--- a/src/software/amazon/ion/Span.java
+++ b/src/com/amazon/ion/Span.java
@@ -1,21 +1,22 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import software.amazon.ion.facet.Faceted;
-import software.amazon.ion.util.Spans;
+import com.amazon.ion.facet.Faceted;
+import com.amazon.ion.util.Spans;
 
 /**
  * An immutable reference to a consecutive sequence of values (perhaps
diff --git a/src/software/amazon/ion/SpanProvider.java b/src/com/amazon/ion/SpanProvider.java
similarity index 76%
rename from src/software/amazon/ion/SpanProvider.java
rename to src/com/amazon/ion/SpanProvider.java
index 3b22b1c1df..a506a6e719 100644
--- a/src/software/amazon/ion/SpanProvider.java
+++ b/src/com/amazon/ion/SpanProvider.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * Provide the ability to retrieve {@link Span}s (abstract value positions)
diff --git a/src/software/amazon/ion/SubstituteSymbolTableException.java b/src/com/amazon/ion/SubstituteSymbolTableException.java
similarity index 61%
rename from src/software/amazon/ion/SubstituteSymbolTableException.java
rename to src/com/amazon/ion/SubstituteSymbolTableException.java
index 70e56e0cf9..7472ec8657 100644
--- a/src/software/amazon/ion/SubstituteSymbolTableException.java
+++ b/src/com/amazon/ion/SubstituteSymbolTableException.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * An error caused by an operation that requires an exact match on an import
@@ -20,7 +21,7 @@
  *
  * @see SymbolTable#isSubstitute()
  */
-// TODO amzn/ion-java#40 Provide some useful info to assist callers with handling this
+// TODO amzn/ion-java/issues/40 Provide some useful info to assist callers with handling this
 //      exception. E.g. reference to the substitute import in violation.
 public class SubstituteSymbolTableException
     extends IonException
diff --git a/src/software/amazon/ion/SymbolTable.java b/src/com/amazon/ion/SymbolTable.java
similarity index 95%
rename from src/software/amazon/ion/SymbolTable.java
rename to src/com/amazon/ion/SymbolTable.java
index e9651e22e4..e73e1da738 100644
--- a/src/software/amazon/ion/SymbolTable.java
+++ b/src/com/amazon/ion/SymbolTable.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.io.IOException;
 import java.util.Iterator;
@@ -42,7 +43,7 @@
  * <b>Implementations of this interface are safe for use by multiple
  * threads.</b>
  *
- * @see <a href="http://amzn.github.io/ion-docs/symbols.html">Ion Symbols page</a>
+ * @see <a href="http://amzn.github.io/ion-docs/docs/symbols.html">Ion Symbols page</a>
  */
 public interface SymbolTable
 {
@@ -123,6 +124,7 @@ public interface SymbolTable
      *
      * @see #makeReadOnly()
      *
+
      */
     public boolean isReadOnly();
 
@@ -135,6 +137,7 @@ public interface SymbolTable
      *
      * @see #isReadOnly()
      *
+
      */
     public void makeReadOnly();
 
@@ -224,6 +227,7 @@ public interface SymbolTable
      *
      * @see #find(String)
      *
+
      */
     public SymbolToken intern(String text);
 
@@ -241,6 +245,7 @@ public interface SymbolTable
      *
      * @see #intern(String)
      *
+
      */
     public SymbolToken find(String text);
 
diff --git a/src/software/amazon/ion/SymbolToken.java b/src/com/amazon/ion/SymbolToken.java
similarity index 82%
rename from src/software/amazon/ion/SymbolToken.java
rename to src/com/amazon/ion/SymbolToken.java
index 3a88a02c58..a531823081 100644
--- a/src/software/amazon/ion/SymbolToken.java
+++ b/src/com/amazon/ion/SymbolToken.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 
 /**
diff --git a/src/software/amazon/ion/SystemSymbols.java b/src/com/amazon/ion/SystemSymbols.java
similarity index 88%
rename from src/software/amazon/ion/SystemSymbols.java
rename to src/com/amazon/ion/SystemSymbols.java
index 62e50c69e6..57d5745947 100644
--- a/src/software/amazon/ion/SystemSymbols.java
+++ b/src/com/amazon/ion/SystemSymbols.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * Constants for symbols defined by the Ion specification.
diff --git a/src/software/amazon/ion/TextSpan.java b/src/com/amazon/ion/TextSpan.java
similarity index 80%
rename from src/software/amazon/ion/TextSpan.java
rename to src/com/amazon/ion/TextSpan.java
index db76c60e39..c81772913f 100644
--- a/src/software/amazon/ion/TextSpan.java
+++ b/src/com/amazon/ion/TextSpan.java
@@ -1,21 +1,22 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import software.amazon.ion.facet.Faceted;
-import software.amazon.ion.util.Spans;
+import com.amazon.ion.facet.Faceted;
+import com.amazon.ion.util.Spans;
 
 /**
  * Exposes the positions of a {@link Span} in the form of <em>one-based</em>
diff --git a/src/software/amazon/ion/Timestamp.java b/src/com/amazon/ion/Timestamp.java
similarity index 95%
rename from src/software/amazon/ion/Timestamp.java
rename to src/com/amazon/ion/Timestamp.java
index 1dcd2587f2..39df6e0827 100644
--- a/src/software/amazon/ion/Timestamp.java
+++ b/src/com/amazon/ion/Timestamp.java
@@ -1,22 +1,25 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.impl.PrivateUtils.safeEquals;
-import static software.amazon.ion.util.IonTextUtils.printCodePointAsString;
+import static com.amazon.ion.impl._Private_Utils.safeEquals;
+import static com.amazon.ion.util.IonTextUtils.printCodePointAsString;
 
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.util.IonTextUtils;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -24,9 +27,6 @@
 import java.util.Date;
 import java.util.GregorianCalendar;
 
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.util.IonTextUtils;
-
 /**
  * An immutable representation of a point in time. Ion defines a simple
  * representation of time based on Coordinated Universal Time (UTC).
@@ -121,7 +121,16 @@ public static enum Precision {
         DAY     (FLAG_YEAR | FLAG_MONTH | FLAG_DAY),
         // HOUR is not a supported precision per https://www.w3.org/TR/NOTE-datetime
         MINUTE  (FLAG_YEAR | FLAG_MONTH | FLAG_DAY | FLAG_MINUTE),
-        SECOND  (FLAG_YEAR | FLAG_MONTH | FLAG_DAY | FLAG_MINUTE | FLAG_SECOND);
+        SECOND  (FLAG_YEAR | FLAG_MONTH | FLAG_DAY | FLAG_MINUTE | FLAG_SECOND),
+
+        /**
+         * DEPRECATED! Treating the fractional part of seconds separate from
+         * the integer part has led to countless bugs. We intend to combine
+         * the two under the SECOND precision.
+         *
+         */
+        @Deprecated
+        FRACTION(FLAG_YEAR | FLAG_MONTH | FLAG_DAY | FLAG_MINUTE | FLAG_SECOND);
 
         /** Bit flags for the precision. */
         private final int flags;
@@ -131,15 +140,11 @@ private Precision(int flags)
             this.flags = flags;
         }
 
-        private boolean alwaysUnknownOffset()
-        {
-            return this.ordinal() <= DAY.ordinal();
-        }
-
         public boolean includes(Precision isIncluded)
         {
             switch (isIncluded)
             {
+                case FRACTION:
                 case SECOND:    return (flags & FLAG_SECOND)   != 0;
                 case MINUTE:    return (flags & FLAG_MINUTE)   != 0;
                 case DAY:       return (flags & FLAG_DAY)      != 0;
@@ -149,6 +154,11 @@ public boolean includes(Precision isIncluded)
             }
             throw new IllegalStateException("unrecognized precision" + isIncluded);
         }
+
+        private boolean alwaysUnknownOffset()
+        {
+            return this.ordinal() <= DAY.ordinal();
+        }
     }
 
     private static final int HASH_SIGNATURE =
@@ -354,6 +364,7 @@ private void set_fields_from_calendar(Calendar cal,
         boolean calendarHasMilliseconds = cal.isSet(Calendar.MILLISECOND);
 
         switch (this._precision) {
+            case FRACTION:
             case SECOND:
                 this._second = checkAndCastSecond(cal.get(Calendar.SECOND));
                 if (calendarHasMilliseconds) {
@@ -431,9 +442,11 @@ private Timestamp(int zyear, int zmonth)
      * Creates a new Timestamp, precise to the day, with unknown local offset.
      * <p>
      * This is equivalent to the corresponding Ion value {@code YYYY-MM-DD}.
+     *
+     * @deprecated Use {@link #forDay(int, int, int)} instead.
      */
     @Deprecated
-    private Timestamp(int zyear, int zmonth, int zday)
+    public Timestamp(int zyear, int zmonth, int zday)
     {
         this(Precision.DAY, zyear, zmonth, zday, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO);
     }
@@ -450,9 +463,11 @@ private Timestamp(int zyear, int zmonth, int zday)
      * @param offset
      *          the local offset from UTC, measured in minutes;
      *          may be {@code null} to represent an unknown local offset
+     *
+     * @deprecated Use {@link #forMinute(int, int, int, int, int, Integer)} instead.
      */
     @Deprecated
-    private Timestamp(int year, int month, int day,
+    public Timestamp(int year, int month, int day,
                      int hour, int minute,
                      Integer offset)
     {
@@ -470,15 +485,46 @@ private Timestamp(int year, int month, int day,
      * @param offset
      *          the local offset from UTC, measured in minutes;
      *          may be {@code null} to represent an unknown local offset.
+     *
+     * @deprecated Use {@link #forSecond(int, int, int, int, int, int, Integer)} instead.
      */
     @Deprecated
-    private Timestamp(int year, int month, int day,
+    public Timestamp(int year, int month, int day,
                      int hour, int minute, int second,
                      Integer offset)
     {
         this(Precision.SECOND, year, month, day, hour, minute, second, NO_FRACTIONAL_SECONDS, offset, APPLY_OFFSET_YES);
     }
 
+    /**
+     * Creates a new Timestamp, precise to the second or fractional second,
+     * with a given local offset.
+     * <p>
+     * This is equivalent to the corresponding Ion value
+     * {@code YYYY-MM-DDThh:mm:ss.fff+-oo:oo}, where {@code oo:oo} represents
+     * the hour and minutes of the local offset from UTC, and {@code fff}
+     * represents the fractional seconds.
+     *
+     * @param frac
+     *          the fractional seconds; must not be {@code null}; if negative,
+     *          its absolute value is used
+     * @param offset
+     *          the local offset from UTC, measured in minutes;
+     *          may be {@code null} to represent an unknown local offset
+     *
+     * @throws NullPointerException if {@code frac} is {@code null}
+     *
+     * @deprecated Use {@link #forSecond(int, int, int, int, int, BigDecimal, Integer)}
+     * instead.
+     */
+    @Deprecated
+    public Timestamp(int year, int month, int day,
+                     int hour, int minute, int second, BigDecimal frac,
+                     Integer offset)
+    {
+        this(Precision.SECOND, year, month, day, hour, minute, second, frac, offset, APPLY_OFFSET_YES);
+    }
+
     /**
      * Creates a new Timestamp from the individual time components. The
      * individual time components are expected to be in UTC,
@@ -506,6 +552,7 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
         switch (p) {
         default:
             throw new IllegalArgumentException("invalid Precision passed to constructor");
+        case FRACTION:
         case SECOND:
             if (frac == null || frac.equals(BigDecimal.ZERO))
             {
@@ -587,8 +634,6 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
      * @param offset
      *          the local offset from UTC, measured in minutes;
      *          may be {@code null} to represent an unknown local offset.
-     *
-     * @deprecated This is an internal API that is subject to change without notice.
      */
     @Deprecated
     public static Timestamp
@@ -620,9 +665,11 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
      *
      * @throws IllegalArgumentException
      *          if {@code cal} has no appropriate calendar fields set.
+     *
+     * @deprecated Use {@link #forCalendar(Calendar)} instead.
      */
     @Deprecated
-    private Timestamp(Calendar cal)
+    public Timestamp(Calendar cal)
     {
         Precision precision;
 
@@ -686,6 +733,7 @@ private Timestamp(BigDecimal millis, Precision precision, Integer localOffset)
             case MINUTE:
                 _second = 0;
             case SECOND:
+            case FRACTION:
         }
 
         _offset = localOffset;
@@ -693,7 +741,7 @@ private Timestamp(BigDecimal millis, Precision precision, Integer localOffset)
         // a Calendar can handle. Set the _fraction here so that extra precision (if any) is not lost.
         // However, don't set the fraction if the given BigDecimal does not have precision at least to the tenth of
         // a second.
-        if (precision.includes(Precision.SECOND) && millis.scale() > -3) {
+        if ((precision.includes(Precision.SECOND)) && millis.scale() > -3) {
             BigDecimal secs = millis.movePointLeft(3);
             BigDecimal secsDown = fastRoundZeroFloor(secs);
             _fraction = secs.subtract(secsDown);
@@ -735,9 +783,11 @@ private Timestamp(BigDecimal millis, Precision precision, Integer localOffset)
      *          may be {@code null} to represent an unknown local offset
      *
      * @throws NullPointerException if {@code millis} is {@code null}
+     *
+     * @deprecated Use {@link #forMillis(BigDecimal, Integer)} instead.
      */
     @Deprecated
-    private Timestamp(BigDecimal millis, Integer localOffset)
+    public Timestamp(BigDecimal millis, Integer localOffset)
     {
         if (millis == null) throw new NullPointerException("millis is null");
 
@@ -801,9 +851,11 @@ private static void throwTimestampOutOfRangeError(Number millis) {
      * @param localOffset
      *          the local offset from UTC, measured in minutes;
      *          may be {@code null} to represent an unknown local offset.
+     *
+     * @deprecated Use {@link #forMillis(long, Integer)} instead.
      */
     @Deprecated
-    private Timestamp(long millis, Integer localOffset)
+    public Timestamp(long millis, Integer localOffset)
     {
         if(millis < MINIMUM_TIMESTAMP_IN_MILLIS || millis >= MAXIMUM_TIMESTAMP_IN_MILLIS) {
             throwTimestampOutOfRangeError(millis);
@@ -861,7 +913,7 @@ private static IllegalArgumentException fail(CharSequence input)
      * @return
      *          {@code null} if the {@code CharSequence} is "null.timestamp"
      *
-     * @see <a href="http://amzn.github.io/ion-docs/spec.html#timestamp">Ion Timestamp Page</a>
+     * @see <a href="http://amzn.github.io/ion-docs/docs/spec.html#timestamp">Ion Timestamp Page</a>
      * @see <a href="http://www.w3.org/TR/NOTE-datetime">W3C Note on Date and Time Formats</a>
      */
     public static Timestamp valueOf(CharSequence ionFormattedTimestamp)
@@ -970,7 +1022,6 @@ public static Timestamp valueOf(CharSequence ionFormattedTimestamp)
             {
                 break;
             }
-            precision = Precision.SECOND;
             pos = END_OF_SECONDS + 1;
             while (length > pos && Character.isDigit(in.charAt(pos))) {
                 pos++;
@@ -1212,6 +1263,7 @@ public static Timestamp forDay(int yearZ, int monthZ, int dayZ)
      *          the local offset from UTC, measured in minutes;
      *          may be {@code null} to represent an unknown local offset
      *
+
      */
     public static Timestamp forMinute(int year, int month, int day,
                                       int hour, int minute,
@@ -1232,6 +1284,7 @@ public static Timestamp forMinute(int year, int month, int day,
      *          the local offset from UTC, measured in minutes;
      *          may be {@code null} to represent an unknown local offset
      *
+
      */
     public static Timestamp forSecond(int year, int month, int day,
                                       int hour, int minute, int second,
@@ -1255,6 +1308,7 @@ public static Timestamp forSecond(int year, int month, int day,
      *          the local offset from UTC, measured in minutes;
      *          may be {@code null} to represent an unknown local offset
      *
+
      */
     public static Timestamp forSecond(int year, int month, int day,
                                       int hour, int minute, BigDecimal second,
@@ -1280,6 +1334,7 @@ public static Timestamp forSecond(int year, int month, int day,
      *          the local offset from UTC, measured in minutes;
      *          may be {@code null} to represent an unknown local offset.
      *
+
      */
     public static Timestamp forMillis(long millis, Integer localOffset)
     {
@@ -1319,6 +1374,7 @@ public static Timestamp forMillis(long millis, Integer localOffset)
      *
      * @throws NullPointerException if {@code millis} is {@code null}
      *
+
      */
     public static Timestamp forMillis(BigDecimal millis, Integer localOffset)
     {
@@ -1335,6 +1391,7 @@ public static Timestamp forMillis(BigDecimal millis, Integer localOffset)
      *   field set in the {@code Calendar};
      *   or {@code null} if {@code calendar} is {@code null}
      *
+
      */
     public static Timestamp forCalendar(Calendar calendar)
     {
@@ -1353,6 +1410,7 @@ public static Timestamp forCalendar(Calendar calendar)
      *          a new Timestamp instance, in UTC, precise to the millisecond;
      *          {@code null} if {@code date} is {@code null}
      *
+
      */
     public static Timestamp forDateZ(Date date)
     {
@@ -1375,6 +1433,7 @@ public static Timestamp forDateZ(Date date)
      *          nanosecond
      *          {@code null} if {@code sqlTimestamp} is {@code null}
      *
+
      */
     public static Timestamp forSqlTimestampZ(java.sql.Timestamp sqlTimestamp)
     {
@@ -1414,6 +1473,7 @@ public static Timestamp now()
      *          a new Timestamp instance, in UTC, representing the current
      *          time.
      *
+
      */
     public static Timestamp nowZ()
     {
@@ -1450,10 +1510,11 @@ public Date dateValue()
      *
      * @return a new {@code Calendar} instance, in its local time.
      *
+
      */
     public Calendar calendarValue()
     {
-        Calendar cal = new GregorianCalendar(PrivateUtils.UTC);
+        Calendar cal = new GregorianCalendar(_Private_Utils.UTC);
 
         long millis = getMillis();
         Integer offset = _offset;
@@ -1537,6 +1598,7 @@ public BigDecimal getDecimalMillis()
         case DAY:
         case MINUTE:
         case SECOND:
+        case FRACTION:
             long millis = Date.UTC(this._year - 1900, this._month - 1, this._day, this._hour, this._minute, this._second);
             BigDecimal dec = BigDecimal.valueOf(millis);
             if (_fraction != null) {
@@ -1721,6 +1783,29 @@ public BigDecimal getDecimalSecond()
     }
 
 
+    /**
+     * Returns the fractional second of this Timestamp.
+     * <p>
+     * Fractional seconds are not affected by local offsets.
+     * As such, this method produces the same output as
+     * {@link #getZFractionalSecond()}.
+     *
+     * @return
+     *          a BigDecimal within the range [0, 1);
+     *          {@code null} is returned if the Timestamp isn't
+     *          precise to the fractional second
+     *
+     * @see #getZFractionalSecond()
+     *
+     * Use {@link #getDecimalSecond()} instead.
+     */
+    @Deprecated
+    public BigDecimal getFractionalSecond()
+    {
+        return this._fraction;
+    }
+
+
     /**
      * Returns the year of this Timestamp, in UTC.
      *
@@ -1831,13 +1916,17 @@ public BigDecimal getZDecimalSecond()
      * Returns the fractional second of this Timestamp.
      * <p>
      * Fractional seconds are not affected by local offsets.
+     * As such, this method produces the same output as
+     * {@link #getFractionalSecond()}.
      *
      * @return
      *          a BigDecimal within the range [0, 1);
      *          {@code null} is returned if the Timestamp isn't
      *          precise to the fractional second
      *
-     * @deprecated This is an internal API that is subject to change without notice.
+     * @see #getFractionalSecond()
+     *
+     * @deprecated Use {@link #getZDecimalSecond()} instead.
      */
     @Deprecated
     public BigDecimal getZFractionalSecond()
@@ -1904,6 +1993,7 @@ public String toString()
         return buffer.toString();
     }
 
+
     /**
      * Returns the string representation (in Ion format) of this Timestamp
      * in UTC.
@@ -1921,11 +2011,12 @@ public String toZString()
         catch (IOException e)
         {
             throw new RuntimeException("Exception printing to StringBuilder",
-                e);
+                                       e);
         }
         return buffer.toString();
     }
 
+
     /**
      * Prints to an {@code Appendable} the string representation (in Ion format)
      * of this Timestamp in its local time.
@@ -1954,6 +2045,7 @@ public void print(Appendable out)
         print(out, adjusted);
     }
 
+
     /**
      * Prints to an {@code Appendable} the string representation (in Ion format)
      * of this Timestamp in UTC.
@@ -1982,6 +2074,7 @@ public void printZ(Appendable out)
             }
             case MINUTE:
             case SECOND:
+            case FRACTION:
             {
                 Timestamp ztime = this.clone();
                 ztime._offset = UTC_OFFSET;
@@ -1991,6 +2084,7 @@ public void printZ(Appendable out)
         }
     }
 
+
     /**
      * helper for print(out) and printZ(out) so that printZ can create
      * a zulu time and pass it directly and print can apply the local
@@ -2124,6 +2218,7 @@ private static void print_fractional_digits(Appendable out, BigDecimal value)
     public final Timestamp adjustMillis(long amount) {
         if (amount == 0) return this;
         Timestamp ts = addMillisForPrecision(amount, _precision, false);
+        //ts._precision = _precision;
         ts.clearUnusedPrecision();
         if (ts._precision.includes(Precision.SECOND)) {
             // Maintain the same amount of fractional precision.
@@ -2152,7 +2247,8 @@ public final Timestamp adjustMillis(long amount) {
      *
      * @param amount a number of milliseconds.
      */
-    public final Timestamp addMillis(long amount) {
+    public final Timestamp addMillis(long amount)
+    {
         if (amount == 0 && _precision.includes(Precision.SECOND) && _fraction != null && _fraction.scale() >= 3) {
             // Zero milliseconds are to be added, and the precision does not need to be increased.
             return this;
@@ -2465,7 +2561,8 @@ public int hashCode()
 
         result ^= (result << 19) ^ (result >> 13);
 
-        result = prime * result + this._precision.toString().hashCode();
+        Precision precision = this._precision == Precision.FRACTION ? Precision.SECOND : this._precision;
+        result = prime * result + precision.toString().hashCode();
 
         result ^= (result << 19) ^ (result >> 13);
 
@@ -2608,9 +2705,13 @@ public boolean equals(Timestamp t)
         if (this == t) return true;
         if (t == null) return false;
 
+        // FRACTION precision is equivalent to SECOND precision.
+        Precision thisPrecision = this._precision.includes(Precision.SECOND) ? Precision.SECOND : this._precision;
+        Precision thatPrecision = t._precision.includes(Precision.SECOND) ? Precision.SECOND : t._precision;
+
         // if the precisions are not the same the values are not
         // precision doesn't matter WRT equality
-        if (this._precision != t._precision) return false;
+        if (thisPrecision != thatPrecision) return false;
 
         // if the local offset are not the same the values are not
         if (this._offset == null) {
@@ -2635,7 +2736,7 @@ public boolean equals(Timestamp t)
 
         // we only look at the fraction if we know that it's actually there
         if ((this._fraction != null && t._fraction == null)
-            || (this._fraction == null && t._fraction != null)) {
+                || (this._fraction == null && t._fraction != null)) {
             // one of the fractions are null
             return false;
         }
diff --git a/src/software/amazon/ion/UnexpectedEofException.java b/src/com/amazon/ion/UnexpectedEofException.java
similarity index 70%
rename from src/software/amazon/ion/UnexpectedEofException.java
rename to src/com/amazon/ion/UnexpectedEofException.java
index a509009899..95280cb7a3 100644
--- a/src/software/amazon/ion/UnexpectedEofException.java
+++ b/src/com/amazon/ion/UnexpectedEofException.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 
 /**
@@ -24,6 +25,7 @@ public class UnexpectedEofException
 {
     private static final long serialVersionUID = 1L;
 
+
     public UnexpectedEofException()
     {
         super();
diff --git a/src/software/amazon/ion/UnknownSymbolException.java b/src/com/amazon/ion/UnknownSymbolException.java
similarity index 75%
rename from src/software/amazon/ion/UnknownSymbolException.java
rename to src/com/amazon/ion/UnknownSymbolException.java
index e3cba54630..9cc7a50ec9 100644
--- a/src/software/amazon/ion/UnknownSymbolException.java
+++ b/src/com/amazon/ion/UnknownSymbolException.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * An error caused by a symbol ID that could not be translated into text
diff --git a/src/software/amazon/ion/UnsupportedIonVersionException.java b/src/com/amazon/ion/UnsupportedIonVersionException.java
similarity index 69%
rename from src/software/amazon/ion/UnsupportedIonVersionException.java
rename to src/com/amazon/ion/UnsupportedIonVersionException.java
index 96102070f7..275381eee2 100644
--- a/src/software/amazon/ion/UnsupportedIonVersionException.java
+++ b/src/com/amazon/ion/UnsupportedIonVersionException.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 /**
  * An error caused by a request for an Ion version that is not supported by
diff --git a/src/software/amazon/ion/ValueFactory.java b/src/com/amazon/ion/ValueFactory.java
similarity index 86%
rename from src/software/amazon/ion/ValueFactory.java
rename to src/com/amazon/ion/ValueFactory.java
index 7b9f5d9b07..a74f7c0f19 100644
--- a/src/software/amazon/ion/ValueFactory.java
+++ b/src/com/amazon/ion/ValueFactory.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -249,17 +250,42 @@ public interface ValueFactory
      */
     public IonList newEmptyList();
 
+    /**
+     * Constructs a new <code>list</code> with given children.
+     *
+     * @param values
+     *  the initial set of children.  If <code>null</code>, then the new
+     *  instance will have <code>{@link IonValue#isNullValue()} == true</code>.
+     *
+     * @throws ContainedValueException
+     *  if any value in {@code values}
+     *  has <code>{@link IonValue#getContainer()} != null</code>.
+     * @throws NullPointerException
+     *   if any value in {@code values} is null.
+     * @throws IllegalArgumentException
+     *   if any value in {@code values} is an {@link IonDatagram}.
+     *
+     * @deprecated This method can be invoked
+     *  (accidentally and incorrectly) with an {@link IonSequence}!
+     *  Use either {@link #newList(IonValue...)}
+     *  or {@link #newList(IonValue...) newList()}{@link
+     *  IonSequence#addAll(Collection) .addAll(Collection)}.
+     */
+    @Deprecated
+    public IonList newList(Collection<? extends IonValue> values)
+        throws ContainedValueException, NullPointerException;
+
 
     /**
      * Constructs a new {@code list} with the given child.
-     *
-     * @param child the initial child of the new list.
      * <p>
-     * <b>This method is temporary</b> until "newList(Collection)" is
+     * <b>This method is temporary</b> until {@link #newList(Collection)} is
      * removed.  It's sole purpose is to avoid the doomed attempt to add all
      * of the parameter's children to the new list; that will always throw
      * {@link ContainedValueException}.
      *
+     * @param child the initial child of the new list.
+     *
      * @throws NullPointerException if {@code child} is null.
      * @throws IllegalArgumentException if {@code child} is an {@link IonDatagram}.
      * @throws ContainedValueException
@@ -357,10 +383,36 @@ public IonList newList(IonValue... children)
      */
     public IonSexp newEmptySexp();
 
+
+    /**
+     * Constructs a new <code>sexp</code> with given child elements.
+     *
+     * @param values
+     *  the initial set of children.  If <code>null</code>, then the new
+     *  instance will have <code>{@link IonValue#isNullValue()} == true</code>.
+     *
+     * @throws ContainedValueException
+     *  if any value in {@code values}
+     *  has <code>{@link IonValue#getContainer()} != null</code>.
+     * @throws NullPointerException
+     *   if any value in {@code values} is null.
+     * @throws IllegalArgumentException
+     *   if any value in {@code values} is an {@link IonDatagram}.
+     *
+     * @deprecated This method can be invoked
+     *  (accidentally and incorrectly) with an {@link IonSequence}!
+     *  Use either {@link #newSexp(IonValue...)}
+     *  or {@link #newSexp(IonValue...) newSexp()}{@link
+     *  IonSequence#addAll(Collection) .addAll(Collection)}.
+     */
+    @Deprecated
+    public IonSexp newSexp(Collection<? extends IonValue> values)
+        throws ContainedValueException, NullPointerException;
+
     /**
      * Constructs a new {@code sexp} with the given child.
      * <p>
-     * <b>This method is temporary</b> until "newSexp(Collection)" is
+     * <b>This method is temporary</b> until {@link #newSexp(Collection)} is
      * removed.  It's sole purpose is to avoid the doomed attempt to add all
      * of the parameter's children to the new sequence; that will always throw
      * {@link ContainedValueException}.
diff --git a/src/software/amazon/ion/ValueVisitor.java b/src/com/amazon/ion/ValueVisitor.java
similarity index 58%
rename from src/software/amazon/ion/ValueVisitor.java
rename to src/com/amazon/ion/ValueVisitor.java
index b9b761e01e..2aa3043dff 100644
--- a/src/software/amazon/ion/ValueVisitor.java
+++ b/src/com/amazon/ion/ValueVisitor.java
@@ -1,10 +1,21 @@
 /*
- * Copyright (c) 2007-2013 Amazon.com, Inc.  All rights reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import software.amazon.ion.util.AbstractValueVisitor;
+import com.amazon.ion.util.AbstractValueVisitor;
 
 /**
  * A Visitor for the Ion value hierarchy.
diff --git a/src/software/amazon/ion/apps/BaseApp.java b/src/com/amazon/ion/apps/BaseApp.java
similarity index 91%
rename from src/software/amazon/ion/apps/BaseApp.java
rename to src/com/amazon/ion/apps/BaseApp.java
index 2f635e30d2..d5890bb5ae 100644
--- a/src/software/amazon/ion/apps/BaseApp.java
+++ b/src/com/amazon/ion/apps/BaseApp.java
@@ -1,19 +1,27 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.apps;
+package com.amazon.ion.apps;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.SimpleCatalog;
 import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -21,13 +29,6 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.system.IonSystemBuilder;
-import software.amazon.ion.system.SimpleCatalog;
 
 /**
  *   ion_encode  ion_print
diff --git a/src/com/amazon/ion/apps/EncodeApp.java b/src/com/amazon/ion/apps/EncodeApp.java
new file mode 100644
index 0000000000..40045b6d43
--- /dev/null
+++ b/src/com/amazon/ion/apps/EncodeApp.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.apps;
+
+import com.amazon.ion.IonBinaryWriter;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.SymbolTable;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+
+
+public class EncodeApp
+    extends BaseApp
+{
+    private SymbolTable[] myImports;
+    private File myOutputDir;
+    private String myOutputFile;
+
+
+    //=========================================================================
+    // Static methods
+
+    public static void main(String[] args)
+    {
+        EncodeApp app = new EncodeApp();
+        app.doMain(args);
+    }
+
+
+    //=========================================================================
+    // Construction and Configuration
+
+    public EncodeApp()
+    {
+    }
+
+
+    //=========================================================================
+
+
+    /**
+     *
+     * @param args
+     * @return the next index to process
+     */
+    @Override
+    protected int processOptions(String[] args)
+    {
+        ArrayList<SymbolTable> imports = new ArrayList<SymbolTable>();
+
+        int i;
+        for (i = 0; i < args.length; i++)
+        {
+            String arg = args[i];
+            if ("--catalog".equals(arg))
+            {
+                String symtabPath = args[++i];
+                loadCatalog(symtabPath);
+            }
+            else if ("--import".equals(arg))
+            {
+                // We'll use the latest version available.
+                String name = args[++i];
+                SymbolTable symtab = getLatestSharedSymtab(name);
+                imports.add(symtab);
+            }
+            else if ("--output-dir".equals(arg))
+            {
+                String path = args[++i];
+                myOutputDir = new File(path);
+                if (! myOutputDir.isDirectory() || ! myOutputDir.canWrite())
+                {
+                    throw new RuntimeException("Not a writeable directory: "
+                                               + path);
+                }
+            }
+            else if ("--output".equals(arg))
+	    {
+		String path = args[++i];
+                myOutputFile = path;
+                myOutputDir = new File(path).getParentFile();
+                if (! myOutputDir.isDirectory() || ! myOutputDir.canWrite())
+                {
+                    throw new RuntimeException("Not a writeable directory: "
+                                               + path);
+                }
+            }
+            else
+            {
+                // this arg is not an option, we're done here
+                break;
+            }
+        }
+
+        myImports = imports.toArray(new SymbolTable[0]);
+
+        return i;
+    }
+
+
+    @Override
+    protected void process(File inputFile, IonReader reader)
+        throws IOException, IonException
+    {
+        IonBinaryWriter writer = mySystem.newBinaryWriter(myImports);
+
+        writer.writeValues(reader);
+
+        byte[] binaryBytes = writer.getBytes();
+
+        if (myOutputDir != null)
+        {
+            String fileName = inputFile.getName();
+            File outputFile = new File(myOutputDir, fileName);
+            FileOutputStream out = new FileOutputStream(outputFile);
+            try
+            {
+                out.write(binaryBytes);
+            }
+            finally
+            {
+                out.close();
+            }
+        }
+        else
+        {
+            System.out.write(binaryBytes);
+        }
+    }
+
+    @Override
+    protected void process(IonReader reader)
+        throws IOException, IonException
+    {
+        IonBinaryWriter writer = mySystem.newBinaryWriter(myImports);
+
+        writer.writeValues(reader);
+
+        byte[] binaryBytes = writer.getBytes();
+
+        if (myOutputDir != null)
+        {
+            File outputFile = new File(myOutputFile);
+            FileOutputStream out = new FileOutputStream(outputFile);
+            try
+            {
+                out.write(binaryBytes);
+            }
+            finally
+            {
+                out.close();
+            }
+        }
+        else
+        {
+            System.out.write(binaryBytes);
+        }
+    }
+}
diff --git a/src/software/amazon/ion/apps/PrintApp.java b/src/com/amazon/ion/apps/PrintApp.java
similarity index 87%
rename from src/software/amazon/ion/apps/PrintApp.java
rename to src/com/amazon/ion/apps/PrintApp.java
index 260f29a855..ae9980e1a9 100644
--- a/src/software/amazon/ion/apps/PrintApp.java
+++ b/src/com/amazon/ion/apps/PrintApp.java
@@ -1,27 +1,28 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.apps;
+package com.amazon.ion.apps;
 
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonWriter;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonWriter;
 
 /**
  * TODO pretty-print on/off and configure
diff --git a/src/software/amazon/ion/apps/SymtabApp.java b/src/com/amazon/ion/apps/SymtabApp.java
similarity index 86%
rename from src/software/amazon/ion/apps/SymtabApp.java
rename to src/com/amazon/ion/apps/SymtabApp.java
index 1d57441790..63216a53b7 100644
--- a/src/software/amazon/ion/apps/SymtabApp.java
+++ b/src/com/amazon/ion/apps/SymtabApp.java
@@ -1,29 +1,31 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.apps;
+package com.amazon.ion.apps;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Iterator;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
+
 
 public class SymtabApp
     extends BaseApp
@@ -187,9 +189,13 @@ public void processFiles(String[] filePaths)
     protected void process(IonReader reader)
         throws IonException
     {
-        IonType type;
-        while ((type = reader.next()) != null)
+        while (reader.hasNext())
         {
+            IonType type = reader.next();
+
+//            System.err.println("Next: " + type);
+//            System.err.println("isInStruct=" + reader.isInStruct());
+
             String fieldName = reader.getFieldName();
             intern(fieldName);
 
@@ -206,6 +212,7 @@ protected void process(IonReader reader)
                 case SEXP:
                 case STRUCT:
                 {
+//                    System.err.println("stepping in");
                     reader.stepIn();
                     break;
                 }
@@ -216,8 +223,9 @@ protected void process(IonReader reader)
                 }
             }
 
-            while (reader.next() != null && reader.getDepth() > 0)
+            while (! reader.hasNext() && reader.getDepth() > 0)
             {
+//                System.err.println("stepping out");
                 reader.stepOut();
             }
         }
diff --git a/src/software/amazon/ion/facet/Faceted.java b/src/com/amazon/ion/facet/Faceted.java
similarity index 81%
rename from src/software/amazon/ion/facet/Faceted.java
rename to src/com/amazon/ion/facet/Faceted.java
index 2e3d172548..087d821909 100644
--- a/src/software/amazon/ion/facet/Faceted.java
+++ b/src/com/amazon/ion/facet/Faceted.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.facet;
+package com.amazon.ion.facet;
 
 /**
  * Provides access to optional extension interfaces of a subject instance.
diff --git a/src/software/amazon/ion/facet/Facets.java b/src/com/amazon/ion/facet/Facets.java
similarity index 90%
rename from src/software/amazon/ion/facet/Facets.java
rename to src/com/amazon/ion/facet/Facets.java
index bfec7aabbc..ba5036dc70 100644
--- a/src/software/amazon/ion/facet/Facets.java
+++ b/src/com/amazon/ion/facet/Facets.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.facet;
+package com.amazon.ion.facet;
 
 /**
  * Utility methods for working with facets.
diff --git a/src/software/amazon/ion/facet/UnsupportedFacetException.java b/src/com/amazon/ion/facet/UnsupportedFacetException.java
similarity index 76%
rename from src/software/amazon/ion/facet/UnsupportedFacetException.java
rename to src/com/amazon/ion/facet/UnsupportedFacetException.java
index 052d07adca..f8f807d618 100644
--- a/src/software/amazon/ion/facet/UnsupportedFacetException.java
+++ b/src/com/amazon/ion/facet/UnsupportedFacetException.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.facet;
+package com.amazon.ion.facet;
 
 
 /**
diff --git a/src/software/amazon/ion/facet/package-info.java b/src/com/amazon/ion/facet/package-info.java
similarity index 83%
rename from src/software/amazon/ion/facet/package-info.java
rename to src/com/amazon/ion/facet/package-info.java
index c7cf02c639..1f05ee0161 100644
--- a/src/software/amazon/ion/facet/package-info.java
+++ b/src/com/amazon/ion/facet/package-info.java
@@ -1,15 +1,16 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
 /**
@@ -36,7 +37,7 @@
  * to support different sets of facets, based on its particular state.
  * <p>
  * The central focus of the pattern is the
- * {@link software.amazon.ion.facet.Faceted#asFacet(Class)} method.
+ * {@link com.amazon.ion.facet.Faceted#asFacet(Class)} method.
  * Subjects that wish to support facets implement it to allow users to request
  * the desired facet.
  * This method returns null when the subject doesn't support the facet.
@@ -56,10 +57,10 @@
  * especially when the subject is a decorator, adaptor, or similar wrapper
  * around the actual provider of the facet.
  * <p>
- * Given a concrete {@link software.amazon.ion.facet.Faceted} class, it may be that
+ * Given a concrete {@link com.amazon.ion.facet.Faceted} class, it may be that
  * some instances support a particular facet while others do not, depending on
  * the state of the subject or the way it was constructed. In such cases
- * {@link software.amazon.ion.facet.Faceted#asFacet asFacet} should choose whether
+ * {@link com.amazon.ion.facet.Faceted#asFacet asFacet} should choose whether
  * to return the facet based on the subject's state.
  * Such classes should <em>not</em> extend the facet interface (directly or
  * indirectly), since that allows clients to bypass {@code asfacet} and
@@ -73,4 +74,4 @@
  * Erich Gamma.  It was primarily inspired by ISO C++ {@code locale} facets.
  *
  */
-package software.amazon.ion.facet;
+package com.amazon.ion.facet;
diff --git a/src/software/amazon/ion/impl/AppendableFastAppendable.java b/src/com/amazon/ion/impl/AppendableFastAppendable.java
similarity index 77%
rename from src/software/amazon/ion/impl/AppendableFastAppendable.java
rename to src/com/amazon/ion/impl/AppendableFastAppendable.java
index ac06cbb4dd..a7f2c1e8fc 100644
--- a/src/software/amazon/ion/impl/AppendableFastAppendable.java
+++ b/src/com/amazon/ion/impl/AppendableFastAppendable.java
@@ -1,29 +1,30 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.util._Private_FastAppendable;
 import java.io.Closeable;
 import java.io.Flushable;
 import java.io.IOException;
-import software.amazon.ion.util.PrivateFastAppendable;
 
 /**
- * Adapts an {@link Appendable} to implement {@link PrivateFastAppendable}.
+ * Adapts an {@link Appendable} to implement {@link _Private_FastAppendable}.
  */
 final class AppendableFastAppendable
-    implements PrivateFastAppendable, Closeable, Flushable
+    implements _Private_FastAppendable, Closeable, Flushable
 {
     private final Appendable _out;
 
diff --git a/src/software/amazon/ion/impl/Base64Encoder.java b/src/com/amazon/ion/impl/Base64Encoder.java
similarity index 97%
rename from src/software/amazon/ion/impl/Base64Encoder.java
rename to src/com/amazon/ion/impl/Base64Encoder.java
index 0e4e9160b1..ac01dcb575 100644
--- a/src/software/amazon/ion/impl/Base64Encoder.java
+++ b/src/com/amazon/ion/impl/Base64Encoder.java
@@ -1,33 +1,32 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import software.amazon.ion.IonException;
-import software.amazon.ion.util.IonTextUtils;
-
-/**
+/*
  * This is a class that supports encoding and decoding binary
  * data in base 64 encodings.
+ *
  * <p>
  * The default encoding is the URL Safe encoding variant specified
  * in http://tools.ietf.org/html/rfc4648
+ * </p>
+ *
  * <p>
  * It's character translation table is:
+ *
  * <pre>
  *    Table 2: The "URL and Filename safe" Base 64 Alphabet
  *
@@ -52,7 +51,16 @@
  *       15 P            32 g            49 x
  *       16 Q            33 h            50 y            (pad) =
  * </pre>
+ * </p>
  */
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.util.IonTextUtils;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+
+
 final class Base64Encoder
 {
     static class EL {  // EncoderLetter
diff --git a/src/com/amazon/ion/impl/BlockedBuffer.java b/src/com/amazon/ion/impl/BlockedBuffer.java
new file mode 100644
index 0000000000..06bd00f4c3
--- /dev/null
+++ b/src/com/amazon/ion/impl/BlockedBuffer.java
@@ -0,0 +1,1778 @@
+
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+import com.amazon.ion.IonException;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.SortedSet;
+import java.util.TreeSet;
+/**
+ * This implements a blocked byte buffer and both an input and output stream
+ * that operates over it. It is designed to be able to be randomly accessed.
+ * The output steam supports both inserting data (with "stretching") in the
+ * middle of the stream and over-write.  The output steam also supports remove
+ * which shrinks the overall data buffer. The underlying buffer is backed by
+ * one or more byte arrays to minimize data movement.
+ * <p>
+ * It is also meant to be reused, so that it does not have to pressure the
+ * GC, if that is desirable.
+ */
+final class BlockedBuffer
+{
+    ///////////////////////////////////////////////////////////////////////////////
+    //
+    // updatable, insertable, and possibly fragmented byte buffer
+    //
+    // these manage the set of memory (byte) buffers
+    ArrayList<bbBlock>  _blocks;
+    int                 _next_block_position;   // next position in _blocks for active block, may be less than _blocks.size()
+    int                 _lastCapacity;          // used to allocate new blocks
+    int                 _buf_limit;             // high water mark of _position
+    int                 _version;
+    int                 _mutation_version;
+    Object              _mutator;
+// BUGBUG - this is just a test, it shouldn't be in checked in code
+static final boolean test_with_no_version_checking = false;
+    void start_mutate(Object caller, int version) {
+        if (test_with_no_version_checking) return;
+        if (_mutation_version != 0 || _mutator != null)
+            throw new BlockedBufferException("lock conflict");
+        if (version != _version)
+            throw new BlockedBufferException("version conflict on update");
+        _mutator = caller;
+        _mutation_version = version;
+    }
+    int end_mutate(Object caller) {
+        if (test_with_no_version_checking) return _version;
+        if (_version != _mutation_version)
+            throw new BlockedBufferException("version mismatch failure");
+        if (caller != _mutator)
+            throw new BlockedBufferException("caller mismatch failure");
+        _version = _mutation_version + 1;
+        _mutation_version = 0;
+        _mutator = null;
+        return _version;
+    }
+    boolean mutation_in_progress(Object caller, int version) {
+        if (test_with_no_version_checking) return false;
+        if (_mutation_version != version)
+            throw new BlockedBufferException("unexpected update lock conflict");
+        if (caller != _mutator)
+            throw new BlockedBufferException("caller mismatch failure");
+        return true;
+    }
+    int getVersion() {
+        return _version;
+    }
+    static boolean debugValidation = false;
+    static int _defaultBlockSizeMin;
+    static int _defaultBlockSizeUpperLimit;
+    static {
+        resetParameters();
+    }
+    public static void resetParameters() {
+        debugValidation = false;
+        _defaultBlockSizeMin = 4096 * 8;
+        _defaultBlockSizeUpperLimit = 4096 * 8;
+    }
+    public int _blockSizeMin = _defaultBlockSizeMin;
+    public int _blockSizeUpperLimit = _defaultBlockSizeUpperLimit;
+    static void setBlockSizeParameters(int min, int max,
+                                              boolean intenseValidation) {
+        debugValidation = intenseValidation;
+        setBlockSizeParameters(min, max);
+    }
+    public static void setBlockSizeParameters(int min, int max) {
+        if (min < 0 || max < min) {
+            throw new IllegalArgumentException();
+        }
+        _defaultBlockSizeMin           = min;
+        _defaultBlockSizeUpperLimit    = max;
+        return;
+    }
+    ///////////////////////////////////////////////////////////////////////////
+    /**
+     * Creates a new buffer without preallocating any space.
+     */
+    public BlockedBuffer() {
+        start_mutate(this, 0);
+        init(0, null);
+        end_mutate(this);
+    }
+    /**
+     * Creates a new buffer, preallocating some initial capacity.
+     *
+     * @param initialSize the number of bytes to allocate.
+     */
+    public BlockedBuffer(int initialSize) {
+        start_mutate(this, 0);
+        init(initialSize, null);
+        end_mutate(this);
+    }
+    /**
+     * Creates a new buffer, assuming ownership of given data.
+     * <em>This method assumes ownership of the <code>data</code> array</em>
+     * and will modify it at will.
+     *
+     * @param data the initial data to be buffered.
+     *
+     * @throws NullPointerException if buffer is null.
+     */
+    public BlockedBuffer(byte[] data) {
+        start_mutate(this, 0);
+        init(0, new bbBlock(data));
+        _buf_limit = data.length;
+        end_mutate(this);
+    }
+    /**
+     * Creates a new buffer containing all data remaining on an
+     * {@link InputStream}.  The stream is closed before returning.
+     *
+     * @param data must not be null.
+     *
+     * @throws IOException
+     */
+    public BlockedBuffer(InputStream data)
+        throws IOException
+    {
+        IonBinary.Writer writer = new IonBinary.Writer(this);
+        try {
+            writer.write(data);
+        }
+        finally {
+            data.close();
+        }
+    }
+    /**
+     * creates a logical copy of the buffer.  This does not preserve
+     * the position state and is equivalent to constructing a new
+     * buffer from the old by getting the bytes from the original
+     * and writing them to a new buffer.
+     */
+    @Override
+    public BlockedBuffer clone()
+    {
+        BlockedBuffer clone = new BlockedBuffer(this._buf_limit);
+        int end = this._buf_limit;
+        bbBlock dst_block = clone._blocks.get(0);
+        int dst_offset = 0;
+        int dst_limit = dst_block.blockCapacity();
+        for (int ii=0; ii<this._blocks.size(); ii++) {
+            bbBlock src_block = this._blocks.get(ii);
+            if (src_block._limit < 1) continue; // see if there's any interesting data in this block
+            int src_end = src_block._limit + src_block._offset;
+            int to_copy = src_block._limit;
+            if (to_copy > dst_limit - dst_offset) {
+                to_copy = dst_limit - dst_offset;
+            }
+            System.arraycopy(src_block._buffer, 0, dst_block._buffer, dst_offset, to_copy);
+            dst_offset += to_copy;
+            // the cloned BlockedBuffer should be able to hold all the data
+            // in it's single block
+            assert dst_offset <= dst_limit;
+            // see if we're done (and break out in that case)
+            if (src_end >= end) break;
+        }
+        dst_block._limit = dst_offset;
+        clone._buf_limit = dst_offset;
+        return clone;
+    }
+    /**
+     * Initializes the various members such as the block arraylist
+     * the initial block and the various values like the block size upper limit.
+     * @param initialSize or 0
+     * @param initialBlock or null
+     * @return bbBlock the initial current block
+     */
+    private bbBlock init(int initialSize, bbBlock initialBlock)
+    {
+        this._lastCapacity = BlockedBuffer._defaultBlockSizeMin;
+        this._blockSizeUpperLimit = BlockedBuffer._defaultBlockSizeUpperLimit;
+        while (this._lastCapacity < initialSize &&
+               this._lastCapacity < this._blockSizeUpperLimit)
+        {
+            this.nextBlockSize(this, 0);
+        }
+        int count = initialSize / this._lastCapacity;
+        if (initialBlock != null) count = 1;
+        this._blocks = new ArrayList<bbBlock>(count);
+        if (initialBlock == null) {
+            initialBlock = new bbBlock(this.nextBlockSize(this, 0));
+        }
+        this._blocks.add(initialBlock);
+        this._next_block_position = 1;
+        // create any preallocated blocks (following _next_block_position)
+        bbBlock b;
+        for (int need = initialSize - initialBlock.blockCapacity()
+           ; need > 0
+           ; need -= b.blockCapacity()
+        ) {
+            b = new bbBlock(this.nextBlockSize(this, 0));
+            b._idx = -1;
+            this._blocks.add(b);
+        }
+        return initialBlock;
+    }
+    /**
+     * Gets the number of bytes of content in this buffer.
+     * This isn't the same as its capacity.
+     */
+    public final int size() {
+        return _buf_limit;
+    }
+    /**
+     * empties the entire contents of the buffer
+     */
+    private void clear(Object caller, int version) {
+        assert mutation_in_progress(caller, version);
+        _buf_limit = 0;
+        for (int ii=0; ii<_blocks.size(); ii++) {
+            _blocks.get(ii).clearBlock();
+            // _blocks.get(ii)._idx = -1; this is done in clearBlock()
+        }
+        bbBlock first = _blocks.get(0);
+        first._idx = 0;                        // cas: 26 dec 2008
+        first._offset = 0;
+        first._limit = 0;
+        _next_block_position = 1;
+        return;
+    }
+    /**
+     * treat the limit as the end of file
+     */
+    bbBlock truncate(Object caller, int version, int pos) {
+        assert mutation_in_progress(caller, version);
+        if (0 > pos || pos > this._buf_limit )
+            throw new IllegalArgumentException();
+        // clear out all the blocks in use from the last in use
+        // to the block where the eof will be located
+        bbBlock b = null;
+        for (int idx = this._next_block_position - 1; idx >= 0; idx--) {
+            b = this._blocks.get(idx);
+            if (b._offset <= pos) break;
+            b.clearBlock();
+        }
+        if (b == null) {
+            throw new IllegalStateException("block missing at position "+pos);
+        }
+        // reset the next block position to account for this.
+        this._next_block_position = b._idx + 1;
+        // on the block where eof is, set it's limit appropriately
+        b._limit = pos - b._offset;
+        // set the overall buffer limits
+        this._buf_limit = pos;
+        b = this.findBlockForRead(pos, version, b, pos);
+        return b;
+    }
+    private bbBlock addBlock(Object caller, int version, int idx, int offset,
+                             int needed)
+    {
+        assert mutation_in_progress(caller, version);
+        bbBlock newblock = null;
+        for (int ii=this._next_block_position; ii < this._blocks.size(); ii++)
+        {
+            bbBlock tmpblock = this._blocks.get(this._next_block_position);
+            if (tmpblock._buffer.length >= needed) {
+                this._blocks.remove(this._next_block_position);
+                newblock = tmpblock;
+                break;
+            }
+        }
+        if (newblock == null) {
+            // if there's nothing big enough to recycle
+            // so we have to really make more space
+            int bufcapacity = 0;
+            if (needed > _blockSizeUpperLimit) {
+                bufcapacity = needed;
+            }
+            else {
+                while (bufcapacity < needed) {
+                    bufcapacity = this.nextBlockSize(caller, version);
+                }
+            }
+            newblock = new bbBlock(bufcapacity);
+        }
+        // if the caller didn't specify an index
+        // we'll have to find out where this goes
+        if (idx == -1) {
+            for (idx = 0; idx < this._next_block_position; idx++) {
+                if (this._blocks.get(idx)._offset < 0) {
+                    break;
+                }
+                if (offset >= this._blocks.get(idx)._offset) {
+                    break;
+                }
+            }
+        }
+        // initialize the buffer and add it to the list in the right spot
+        newblock._idx = idx;
+        newblock._offset = offset;
+        _blocks.add(idx, newblock);
+        _next_block_position++;
+        // if this isn't the last buffer, bump the idx of the trailing buffers
+        for (int ii = idx + 1; ii < _next_block_position; ii++) {
+            this._blocks.get(ii)._idx = ii;
+        }
+        return newblock;
+    }
+    private int nextBlockSize(Object caller, int version)
+    {
+        assert mutation_in_progress(caller, version);
+        if (_lastCapacity == 0) {
+            _lastCapacity = _blockSizeMin;
+        }
+        else if (_lastCapacity < _blockSizeUpperLimit) {
+            _lastCapacity *= 2;
+        }
+        return _lastCapacity;
+    }
+    // starts with (pos, 0, _next_block_position) so we're really
+    // looking in blocks with indices from lo to (hi-1) inclusive
+    final bbBlock findBlockHelper(int pos, int lo, int hi)
+    {
+        bbBlock block;
+        int     ii;
+        if ((hi - lo) <= 3) {
+            for (ii=lo; ii<hi; ii++) {
+                block = this._blocks.get(ii);
+                if (pos > block._offset + block._limit) continue;
+                if (block.containsForRead(pos)) {
+                    return block;
+                }
+                if (block._offset >= pos) break;
+            }
+            return this._blocks.get(ii - 1);    // this will always be > 0
+        }
+        int mid = (hi + lo) / 2;
+        block = this._blocks.get(mid);
+        assert block != null;
+        if (block._offset > pos) {
+            return findBlockHelper(pos, lo, mid);
+        }
+        return findBlockHelper(pos, mid, hi);
+    }
+    /**
+     * find the block where this offset (newPosition) has already
+     * been written. Typically the caller will set _curr to be the
+     * returned block.
+     * @param pos global position to be read from
+     * @return curr block ready to be read from
+     */
+    bbBlock findBlockForRead(Object caller, int version, bbBlock curr, int pos)
+    {
+        assert pos >= 0 && "buffer positions are never negative".length() > 0;
+        if (pos > this._buf_limit) {
+            throw new BlockedBufferException("invalid position");
+        }
+        assert _validate();
+        if (curr != null) {
+            if (curr.containsForRead(pos)) {
+                return curr;
+            }
+            if (pos == this._buf_limit && (pos - curr._offset) == curr._limit) {
+                return curr;
+            }
+        }
+        boolean at_eof = (pos == this._buf_limit);
+        if (at_eof) {
+            // if this is the last block actually in use
+            // and we're looking for the eof position then
+            // we can check for the "last byte not quite
+            // written yet" case, which is fine
+            bbBlock block = this._blocks.get(this._next_block_position - 1);
+            if (block.containsForWrite(pos)) return block;
+        }
+        else {
+            bbBlock block = this.findBlockHelper(pos, 0, this._next_block_position);
+            return block;
+        }
+        throw new BlockedBufferException("valid position can't be found!");
+    }
+        /**
+     * find the block where this offset (newPosition) should be written.
+     * typicall the caller will set _curr to be the returned block.
+     * @param pos global position to be written to
+     * @return curr block ready to be written to
+     */
+    bbBlock findBlockForWrite(Object caller, int version, bbBlock curr, int pos)
+    {
+        assert mutation_in_progress(caller, version);
+        assert (pos >= 0 && "invalid position, positions must be >= 0".length() > 0);
+        if (pos > this._buf_limit + 1) {
+            throw new BlockedBufferException("writes must be contiguous");
+        }
+        assert _validate();
+        if (curr != null && curr.hasRoomToWrite(pos, 1) == true) {
+            if (curr._offset + curr._limit == pos && curr._idx < this._next_block_position) {
+                bbBlock b = this._blocks.get(curr._idx + 1);
+                if (b.containsForWrite(pos)) {
+                    curr = b;
+                }
+            }
+            return curr;
+        }
+        // we're not going to write into curr, so find out the right block
+        bbBlock block;
+        if (pos == this._buf_limit) {
+            // if we're at the limit the only possible (existing) block
+            // will be the very last block - shortcut to optimize append
+            assert this._next_block_position > 0;
+            block = this._blocks.get(this._next_block_position - 1);
+        }
+        else if (curr != null && pos == curr._offset + curr._limit) {
+            // if our current position is exactly at the end (and we already know
+            // we can't write into this block if we can write at all we'll have
+            // to write into the next block (inner blocks can't be 0 bytes long)
+            block = this._blocks.get(curr._idx + 1);
+        }
+        else {
+            // since we're not at the limit and we don't have a current block
+            // we'll go find the block in the list (this is an abnormal case)
+            // since append if usual for writing
+            block = findBlockHelper(pos, 0, this._next_block_position);
+        }
+        assert block != null;
+        assert block.containsForWrite(pos);
+        // chech our candidate block to see if it's the one we'd write into
+        if (block.hasRoomToWrite(pos, 1)) {
+            return block;
+        }
+        // at this point, we can't use _curr in any event so we can just
+        // move on to the next block since findHelper will have returned
+        // either the right block (which it didn't) or the one just in
+        // front of the right block - so let's see if there is an allocated
+        // block just following this
+        if (block._idx < this._next_block_position - 1) {
+            block = this._blocks.get(block._idx + 1);
+            return block;
+        }
+        // there wasn't a following block (actually a common case when
+        // you're appending) so we have to go ahead an actually add a new block
+        int newIdx = block._idx + 1;
+        assert newIdx == this._next_block_position;
+        bbBlock ret =  this.addBlock(caller
+                            ,version
+                            ,newIdx
+                            ,pos
+                            ,this.nextBlockSize(caller, version)
+               );
+        return ret;
+    }
+    /**
+     * dispatcher for the various forms of insert we encounter
+     * calls one of the four helpers depending on the case
+     * that is needed to inser here
+     * @param len number of bytes to make space for
+     * @return int number of bytes inserted
+     */
+    int insert(Object caller, int version, bbBlock curr, int pos, int len)
+    {
+        assert mutation_in_progress(caller, version);
+        // DEBUG: int amountMoved = 0;
+        // DEBUG: int before = this._buf_limit;
+        // DEBUG: assert _validate();
+        // if there's room in the current block - just
+        // move the "trailing" bytes down and we're done
+        int neededSpace = len - curr.unusedBlockCapacity();
+        if (neededSpace <= 0) {
+            // we have all the space we need in the current block
+            // DEBUG: amountMoved =
+            insertInCurrOnly(caller, version, curr, pos, len);
+        }
+        else {
+            // we'll need at least some additional space beyond the curr
+            // block, see if there's room in the
+            // next one, otherwise we'll make more (blocks)
+            bbBlock next = null;
+            if (curr._idx < this._next_block_position - 1) {
+                // if there is another block
+                next = this._blocks.get(curr._idx + 1);
+            }
+            if (next != null &&
+                (neededSpace <= next.unusedBlockCapacity())
+            ) {
+                // with the addition of the free space in the following block we have enough
+                // DEBUG: amountMoved =
+                insertInCurrAndNext(caller, version, curr, pos, len, next);
+            }
+            else {
+                // we'll have to make one or more new blocks
+                // first figure out much will be in the first
+                // and last blocks (i.e. ignoring the whole
+                // blocks
+                int lenNeededInLastAddedBlock = neededSpace % _blockSizeUpperLimit;
+                int tailLen = curr.bytesAvailableToRead(pos);
+                if (lenNeededInLastAddedBlock < tailLen) lenNeededInLastAddedBlock = tailLen;
+                if (lenNeededInLastAddedBlock < neededSpace
+                 && neededSpace < this._blockSizeUpperLimit) {
+                    // if we need less than the largest block then we should
+                    // make *one* block with all of the needed space
+                    lenNeededInLastAddedBlock = neededSpace;
+                }
+                bbBlock newblock = insertMakeNewTailBlock(caller, version, curr, lenNeededInLastAddedBlock);
+                // now see if the curr block and this newblock have enough
+                // available space to do the job, and if there's some trailing
+                // data from curr that will end up staying in curr
+                if (len <= (curr.unusedBlockCapacity()
+                           + newblock.unusedBlockCapacity())
+                ) {
+                    // insert this as a zero length block immediately  after _curr
+                    // insertBlock also adjusts the trailing blocks idx values
+                    insertBlock(newblock);
+                    // now pretend we just have the "push into the next block" case
+                    // DEBUG: amountMoved =
+                    insertInCurrAndNext(caller, version, curr, pos, len, newblock);
+                }
+                else {
+                    // and last we have the case of having to insert more than 1 block
+                    // which means all of the trailing bytes in _curr move into the last
+                    // block
+                    // DEBUG: amountMoved =
+                    insertAsManyBlocksAsNeeded(caller, version, curr, pos, len, newblock);
+                }
+            }
+        }
+        // DEBUG: if (this._buf_limit - before != len
+        // DEBUG: || amountMoved != len) {
+        // DEBUG: throw new BlockedBufferException("insert went wrong #1 !!!");
+        // DEBUG: }
+        assert _validate();
+        return len;
+    }
+    /**
+     *  this handles insert when there's enough room in the
+     *  current block
+     */
+    private int insertInCurrOnly(Object caller, int version, bbBlock curr, int pos, int len)
+    {
+        assert mutation_in_progress(caller, version);
+        // the space we need is available right in the block
+        assert curr.unusedBlockCapacity() >= len;
+        System.arraycopy(curr._buffer, curr.blockOffsetFromAbsolute(pos)
+                         ,curr._buffer, curr.blockOffsetFromAbsolute(pos) + len, curr.bytesAvailableToRead(pos));
+        curr._limit += len;
+        this.adjustOffsets(curr._idx, len, 0);
+        notifyInsert(pos, len);
+        return len;
+    }
+    private int insertInCurrAndNext(Object caller, int version, bbBlock curr, int pos, int len, bbBlock next)
+    {
+        assert mutation_in_progress(caller, version);
+        // DEBUG: int amountMoved = 0;
+        // all the space we need (len) fits in these two blocks
+        assert curr.unusedBlockCapacity() + next.unusedBlockCapacity() >= len;
+        // and we need to use space in both of these blocks
+        assert curr.unusedBlockCapacity() < len;
+        int availableToRead = curr.bytesAvailableToRead(pos);
+        int tailInCurr = availableToRead;
+        int deltaOfNextData = len - curr.unusedBlockCapacity();
+        int tailCopiedToNext = deltaOfNextData;
+        if (tailCopiedToNext > availableToRead) {
+            tailCopiedToNext = availableToRead;
+        }
+        // first we copy the data in the next block down to make room
+        // for data we're pushing off the end of the _curr block
+        // if we need to, there may not be any data in the next block
+        if (next._limit > 0) {
+            System.arraycopy(next._buffer, 0, next._buffer, deltaOfNextData, next._limit);
+        }
+        next._limit += deltaOfNextData;
+        // DEBUG: amountMoved += deltaOfNextData;
+        // next we copy the data from the tail of _curr into the front of next
+        // since we don't have room for it any longer in the _curr block
+        // but it is possible that there is not tail at all (pos == limit)
+        if (tailCopiedToNext > 0) {
+            System.arraycopy(curr._buffer, curr._limit - tailCopiedToNext
+                            , next._buffer, deltaOfNextData - tailCopiedToNext, tailCopiedToNext);
+        }
+        // finally if there's any tail left in the _curr block we copy that
+        // down to the end of the _curr block (if all of the tail moved into
+        // the next block nothing happens here
+        int leftInCurr = tailInCurr - tailCopiedToNext;
+        if (leftInCurr > 0) {
+            int blockPosition = curr.blockOffsetFromAbsolute(pos);
+            System.arraycopy(curr._buffer, blockPosition
+                            ,curr._buffer, blockPosition + len, leftInCurr);
+        }
+        // finally if we reused from space in _curr (between _limit and the unreserved capacity)
+        // we adjust for that as well as the space adjusted in the newblock
+        int addedInCurr = curr.unusedBlockCapacity();
+        if (addedInCurr > 0) {
+            curr._limit += addedInCurr;
+            // DEBUG: amountMoved += addedInCurr;
+            next._offset += addedInCurr;
+        }
+        assert (curr.blockOffsetFromAbsolute(pos) + tailCopiedToNext + addedInCurr + leftInCurr) == curr._limit;
+        this.adjustOffsets(next._idx, len, 0);
+        notifyInsert(pos, len);
+        // DEBUG: if (amountMoved != len) {
+        // DEBUG: throw new BlockedBufferException("insert went wrong #4 !!!");
+        // DEBUG: }
+        return len;
+    }
+    private bbBlock insertMakeNewTailBlock(Object caller, int version, bbBlock curr, int minimumBlockSize)
+    {
+        assert mutation_in_progress(caller, version);
+        // needed is the amount of data we'll put into the
+        // final added block (which is actually added first)
+        int newblocksize = minimumBlockSize;
+        if (newblocksize < _blockSizeUpperLimit) {
+            // if we don't need an oversize block then find a block
+            // size that will be big enough
+            while ((newblocksize = this.nextBlockSize(caller, version)) < minimumBlockSize) {
+                // bump up requested block capacity until we get
+                // at least enough to hold the request, or we
+                // hit the max blocksize whichever comes first
+            }
+        }
+        // allocate and initialize a new block that will be the
+        // tail of our interesting blocks
+        bbBlock newblock = new bbBlock(newblocksize);
+        newblock._idx = curr._idx + 1;
+        newblock._offset = curr._offset + curr._limit; // we'll adjust this later like any existing block
+        return newblock;
+    }
+    private int insertAsManyBlocksAsNeeded(Object caller, int version, bbBlock curr, int pos, int len, bbBlock newLastBlock)
+    {
+        assert mutation_in_progress(caller, version);
+        // DEBUG: int amountAllocated = 0;
+        // DEBUG: int origPos = this._buf_position;
+        // this is the case where the old tail is pushed entirely out of the
+        // old block into a new trailing block and then as many whole new
+        // blocks as needed (which maybe none) are inserted between these two
+        bbBlock oldCurr = curr;
+        int   oldPosition = curr.blockOffsetFromAbsolute(pos);
+        int   oldBlockTail = curr._limit - oldPosition;
+        int   newSpaceInCurr = curr.unusedBlockCapacity();
+        // adjust the curr blocks limit
+        curr._limit += newSpaceInCurr;
+        // DEBUG: amountAllocated += newSpaceInCurr;
+        int   newoffset = curr._offset + curr._limit;
+        int   spaceNeededInMiddle = len - newSpaceInCurr - newLastBlock._buffer.length;
+        int   addedblocks = 0;
+        bbBlock newblock = null;
+        assert (spaceNeededInMiddle > 0);  // this is the "as many as needed" case not "this and next"
+        // add blocks until we're ready for the last block
+        while (spaceNeededInMiddle > 0) {
+            addedblocks++;
+            newblock = new bbBlock(this.nextBlockSize(caller, version));
+            newblock._limit = newblock._buffer.length;
+            if (newblock._limit > spaceNeededInMiddle) newblock._limit = spaceNeededInMiddle;
+            // DEBUG: amountAllocated += newblock._limit;
+            newblock._idx = curr._idx + addedblocks;
+            newblock._offset = newoffset;
+            this._blocks.add(newblock._idx, newblock);
+            spaceNeededInMiddle -= newblock._limit;
+            newoffset += newblock._limit;
+        }
+        // add the last block
+        addedblocks++;
+        newblock = newLastBlock;
+        newblock._limit = newblock._buffer.length;
+        // DEBUG: amountAllocated += newblock._limit;
+        newblock._idx = curr._idx + addedblocks;
+        newblock._offset = newoffset;
+        this._blocks.add(newblock._idx, newblock);
+        // DEBUG: assert (amountAllocated == len);
+        // now adjust the trailing blocks
+        adjustOffsets(newblock._idx, len, addedblocks);
+        notifyInsert(pos, len);
+        // now we copy the tail of the _curr block to the end of the space
+        // note that this only works because the tail is being copied to
+        // an altogether different block in the buffer, so it can't overlap
+        if (oldBlockTail > 0) {
+            System.arraycopy(oldCurr._buffer, oldPosition, newLastBlock._buffer, newLastBlock._limit - oldBlockTail, oldBlockTail);
+        }
+        // DEBUG: assert this.position() == origPos;
+        // DEBUG: assert (amountAllocated == len);
+        return len;
+    }
+    private void insertBlock(bbBlock newblock) {
+        // in both cases we need to insert the new block after _curr
+        // and adjust the idx values to go with that
+        this._blocks.add(newblock._idx, newblock);
+        _next_block_position++;
+        for (int ii=newblock._idx + 1; ii < this._next_block_position; ii++) {
+            this._blocks.get(ii)._idx++;
+        }
+    }
+    private void adjustOffsets(int lastidx, int addedBytes, int addedBlocks) {
+        bbBlock b;
+        // now we adjust the trailing offsets
+        if (addedBytes != 0 || addedBlocks != 0) {
+            this._next_block_position += addedBlocks;
+            for (int ii=lastidx + 1; ii < this._next_block_position; ii++) {
+                b = this._blocks.get(ii);
+                b._offset += addedBytes;
+                b._idx += addedBlocks;
+            }
+            this._buf_limit += addedBytes;
+        }
+    }
+    bbBlock remove(Object caller, int version, bbBlock curr, int pos, int len)
+    {
+        assert mutation_in_progress(caller, version);
+        if (len == 0) return curr;
+        if (len < 0 || (pos + len) > this._buf_limit) {
+            throw new IllegalArgumentException();
+        }
+        int     amountToRemove = len;
+        int     removedBlocks = 0;
+        int     startingIdx = curr._idx;
+        int     currIdx = curr._idx;
+        bbBlock currBlock = curr;
+        assert (curr._offset <= pos);
+        assert (pos - curr._offset <= curr._limit);
+        assert _validate();
+        // this is to simply eliminate a big edge case
+        if (pos == 0 && len == this._buf_limit) {
+            this.clear(caller, version);
+            notifyRemove(0, len);
+            return null;
+        }
+        // remove from the initial block
+        int currBlockPosition = currBlock.blockOffsetFromAbsolute(pos);
+        int removedFromThisBlock = currBlock._limit - currBlockPosition;
+        if (removedFromThisBlock > amountToRemove) removedFromThisBlock = amountToRemove;
+        if (removedFromThisBlock == currBlock._limit) {
+            // we'll be removing the whole block in the whole block loop below
+            startingIdx--;  // so we have to back up on to fix the next block that will
+                            // "fall" down into the soon to be emptied slot here
+        }
+        else {
+            // we always copy into position, and we copy whatever is still
+            // left in the end of the block
+            int moveAmount = currBlock._limit - currBlockPosition - removedFromThisBlock;
+            if (moveAmount > 0) {
+                System.arraycopy(currBlock._buffer, currBlock._limit - moveAmount
+                                ,currBlock._buffer, currBlockPosition, moveAmount);
+            }
+            amountToRemove -= removedFromThisBlock;
+            currBlock._limit -= removedFromThisBlock;
+            if (amountToRemove > 0) {
+                // when we're on the last block, there'll be nothing to remove,
+                // and no block to get either
+                currIdx = currBlock._idx + 1;
+                currBlock = this._blocks.get(currIdx);
+            }
+        }
+        while (amountToRemove > 0 && amountToRemove >= currBlock._limit) {
+            amountToRemove -= currBlock._limit;
+            // remove the whole block - so first hang onto a reference
+            bbBlock temp = currBlock;
+            this._blocks.remove(currIdx);
+            removedBlocks++;
+            temp.clearBlock();
+            this._blocks.add(temp); // dump it at the end (marked as not in use)
+            // and we don't move currIdx because we bumped it out of the whole array
+            if (currIdx < this._next_block_position - removedBlocks) {
+                currBlock = this._blocks.get(currIdx);
+            }
+            else if (currIdx > 0) {
+                currIdx--;
+                currBlock = this._blocks.get(currIdx);
+            }
+            else {
+                throw new BlockedBufferException("fatal - no current block!");
+            }
+        }
+        if (amountToRemove > 0) {
+            assert amountToRemove < currBlock._limit;
+            System.arraycopy(currBlock._buffer, amountToRemove
+                            ,currBlock._buffer, 0, currBlock._limit - amountToRemove);
+            assert amountToRemove < currBlock._limit;
+            currBlock._limit -= amountToRemove;
+            currBlock._offset += amountToRemove;
+        }
+        // we'll even adjust the offset of the first block (if it's the last as well)
+        adjustOffsets(startingIdx, -len, -removedBlocks);
+        notifyRemove(pos, len);
+        // DEBUG: int shouldBe = 0;
+        // DEBUG: int is = currBlock._offset;
+        // DEBUG: if (currBlock._idx > 0) {
+        // DEBUG:     shouldBe = this._blocks.get(currBlock._idx - 1)._offset + this._blocks.get(currBlock._idx - 1)._limit;
+        // DEBUG:     if (currIdx != startingIdx) assert (shouldBe == this._buf_position);
+        // DEBUG: }
+        // DEBUG: int delta = shouldBe - is;
+        // DEBUG: assert(delta == 0);
+        assert _validate();
+        return currBlock;
+    }
+    static int _validate_count;
+    public boolean _validate() {
+        int pos = 0;
+        int idx;
+        boolean err = false;
+        _validate_count++;
+        if ((_validate_count % 128) != 0) return true;
+        // you can change the 0 below (in from of the -2) to be the validation counter
+        // which reported the failure and the test will be true when _validate() is
+        // called on the last GOOD check.
+        if (_validate_count == 30 -2) {
+            // used to set breakpoints on particular calls for validation
+            err = (_validate_count < 0);
+        }
+        for (idx=0; idx<this._blocks.size(); idx++) {
+            bbBlock b = this._blocks.get(idx);
+            if (b._idx == -1) break;
+            if (b._idx != idx) {
+                System.out.println("block "+idx+": index is wrong" +
+                                   ", it is "+b._idx+
+                                   " it should be "+idx);
+                err = true;
+            }
+            if (b._offset != pos) {
+                System.out.println("block "+idx+": starting offset is wrong"+
+                                   ", it is "+b._offset+
+                                   " should be "+pos);
+                err = true;
+            }
+            // else because there's no point in using a bad reserved value to check the limit
+            else if (b._limit < 0 || b._limit > b._buffer.length /* - b._reserved */ ) {
+                System.out.println("block "+idx+": "+
+                                   "limit is out of range"+
+                                   ", it is "+b._limit+
+                                   " should be between 0 and "+ (b._buffer.length /* - b._reserved */));
+                err = true;
+            }
+            else if (b._limit == 0) {
+                if ( ! (b._idx == (this._next_block_position - 1)
+                     && b._offset == this._buf_limit)
+                ) {
+                    System.out.println("block "+idx+": "+
+                                       "has a ZERO limit");
+                    err = true;
+                }
+            }
+            pos += b._limit;
+        }
+        if (idx != this._next_block_position) {
+            System.out.println("next block position is wrong, is "+this._next_block_position+" should be "+idx);
+            err = true;
+        }
+        for (idx++; idx<this._blocks.size(); idx++) {
+            bbBlock b = this._blocks.get(idx);
+            if (b._offset != -1) {
+                System.out.println("block "+idx+": (in freed range) has non -1 offset, offset is "+b._offset);
+                err = true;
+            }
+        }
+        if (pos != this._buf_limit) {
+            System.out.println("buffer _buf_limit: "+
+                               "limit is incorrect"+
+                               ", it is "+this._buf_limit+
+                               " should be "+ pos);
+            err = true;
+        }
+        if (this._next_block_position > 0) {
+            bbBlock last = this._blocks.get(this._next_block_position - 1);
+            if (last._offset + last._limit != this._buf_limit){
+                System.out.println("last block "+last._idx+" limit isn't "+
+                                   "_buf_limit ("+this._buf_limit+"): "+
+                                   " calc'd last block limit is "
+                                   +       last._offset +" + "+ last._limit
+                                   +" = "+(last._offset + last._limit)
+                                   );
+                err = true;
+            }
+        }
+        if (this._buf_limit < 0 || (this._buf_limit > 0 && this._next_block_position < 1)){
+            System.out.println("this._buf_limit "+ this._buf_limit+ " is invalid");
+            err = true;
+        }
+        if (err == true) {
+            System.out.println("failed with validation count = " + _validate_count);
+        }
+        return err == false;  // validate is true if all is ok so that assert _validate(); works as expected
+    }
+    final static class bbBlock {
+        public int     _idx;
+        public int     _offset;
+        public int     _limit;
+        public byte[]  _buffer;
+        public bbBlock(int capacity) {
+            _buffer = new byte[capacity];
+        }
+        /**
+         * Assumes ownership of an array to create a new block.  The data
+         * within the buffer is maintained.
+         *
+         * @param buffer contains the data for the block.
+         *
+         * @throws NullPointerException if buffer is null.
+         */
+        bbBlock(byte[] buffer) {
+            _buffer = buffer;
+            _limit = buffer.length;
+        }
+        public bbBlock clearBlock() {
+            _idx = -1;
+            _offset = -1;
+            _limit = 0;
+            return this;
+        }
+        /**
+         * maximimum number of bytes that can be held in this block.
+         */
+        final int blockCapacity() {
+            assert this._offset >= 0;
+            return this._buffer.length ;
+        }
+        /**
+         * maximimum number of bytes that can be appended in this block currently.
+         */
+        final int unusedBlockCapacity() {
+            assert this._offset >= 0;
+            return this._buffer.length - this._limit;
+        }
+        /**
+         * Gets the number of bytes between the current position and the
+         * writable capacity of this block.
+         * @param pos absolute position
+         */
+        final int bytesAvailableToWrite(int pos) {
+            assert this._offset >= 0;
+            return this._buffer.length - (pos - _offset);
+        }
+        /**
+         * Gets the number of, as yet, unused bytes in this block.  That's the number
+         * of bytes that can be inserted into this block without overflowing, or the
+         * number of bytes between the current position and the end of the written bytes
+         * in this block
+         * @param pos absolute position
+         */
+        public final int bytesAvailableToRead(int pos) {
+            assert this._offset >= 0;
+            return this._limit - (pos - _offset);
+        }
+        /**
+         * is there space between position and capacity?
+         * @param pos absolute position
+         * @param needed
+         * @return boolean
+         */
+        final boolean hasRoomToWrite(int pos, int needed) {
+            assert this._offset >= 0;
+            return (needed <= (this._buffer.length - (pos - _offset)));
+        }
+        final boolean containsForRead(int pos) {
+            assert this._offset >= 0;
+            return (pos >= _offset && pos < _offset + _limit);
+        }
+        final boolean containsForWrite(int pos) {
+            assert this._offset >= 0;
+            return (pos >= _offset && pos <= _offset + _limit);
+        }
+        final int blockOffsetFromAbsolute(int pos) {
+            assert this._offset >= 0;
+            return pos - _offset;
+        }
+    }
+    public interface Monitor
+    {
+        public boolean notifyInsert(int pos, int len);
+        public boolean notifyRemove(int pos, int len);
+        public int     getMemberIdOffset();
+    }
+    private final static class PositionMonitor implements Monitor
+    {
+        int _pos;
+        PositionMonitor(int pos) { _pos = pos; }
+        public int getMemberIdOffset() { return _pos; }
+        public boolean notifyInsert(int pos, int len) { return false; }
+        public boolean notifyRemove(int pos, int len) { return false; }
+    }
+    private final static class CompareMonitor implements Comparator<Monitor> {
+        static CompareMonitor instance = new CompareMonitor();
+        private CompareMonitor() {}
+        static CompareMonitor getComparator()
+        {
+            return instance;
+        }
+        public int compare(Monitor arg0, Monitor arg1)
+        {
+            return arg0.getMemberIdOffset() - arg1.getMemberIdOffset();
+        }
+    }
+    TreeSet<Monitor> _updatelist = new TreeSet<Monitor>(CompareMonitor.getComparator());
+    public void notifyRegister(Monitor item) {
+        _updatelist.add(item);
+    }
+    public void notifyUnregister(Monitor item) {
+        _updatelist.remove(item);
+    }
+    public void notifyInsert(int pos, int len) {
+        if (len == 0) return;
+        PositionMonitor pm = new PositionMonitor(pos);
+        SortedSet<Monitor> follows = _updatelist.tailSet(pm);
+        for (Monitor m : follows) {
+            if (m.notifyInsert(pos, len)) {
+                follows.remove(m);
+            }
+        }
+    }
+    public void notifyRemove(int pos, int len) {
+        if (len == 0) return;
+        PositionMonitor pm = new PositionMonitor(pos);
+        SortedSet<Monitor> follows = _updatelist.tailSet(pm);
+        for (Monitor m : follows) {
+            if (m.notifyRemove(pos, len)) {
+                follows.remove(m);
+            }
+        }
+    }
+    /**
+     * Reads data from a byte buffer, keeps a local position and
+     * a current block.  Snaps a buffer length on creation;
+     */
+    public static class BlockedByteInputStream extends java.io.InputStream
+    {
+        BlockedBuffer _buf;
+        int           _pos;
+        int           _mark;
+        bbBlock       _curr;
+        int           _blockPosition;
+        int           _version;
+        /**
+         * @param bb blocked buffer to read from
+         */
+        public BlockedByteInputStream(BlockedBuffer bb)
+        {
+            this(0, bb);
+        }
+        /**
+         * @param bb blocked buffer to read from
+         * @param pos initial offset to read
+         */
+        public BlockedByteInputStream(BlockedBuffer bb, int pos)
+        {
+            this(pos, bb);
+        }
+        /**
+         * @param pos initial offset to read
+         * @param end is the local limit, or -1 (_end_unspecified)
+         * @param bb blocked buffer to read from
+          */
+        private BlockedByteInputStream(int pos, BlockedBuffer bb)
+        {
+            if (bb == null) throw new IllegalArgumentException();
+            _version = bb.getVersion();
+            _buf = bb;
+            _set_position(pos);
+            _mark = -1;
+        }
+        @Override
+        public final void mark(int readlimit) {
+            this._mark = this._pos;
+        }
+        @Override
+        public final void reset() throws IOException {
+            if (this._mark == -1) throw new IOException("mark not set");
+            _set_position(this._mark);
+        }
+        /**
+         * the current offset in the buffer
+         */
+        public final int position() {
+            return this._pos;
+        }
+        /**
+         * this forces a version sync with the underlying blocked buffer.
+         * The current position is lost during this call.
+         *
+         */
+        public final void sync() throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            _version = _buf.getVersion();
+            _curr = null;
+            _pos = 0;
+        }
+        /**
+         * debug api to force check for internal validity of the
+         * underlying buffer
+         */
+        public final boolean _validate() {
+            return this._buf._validate();
+        }
+        /**
+         * sets the position of the stream to be pos. The next operation
+         * (such as read) will return the byte at that offset.
+         * @param pos new offset to read from
+         * @return this stream
+         */
+        public final BlockedByteInputStream setPosition(int pos) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            fail_on_version_change();
+            if (pos < 0 || pos > _buf.size()) {
+                throw new IllegalArgumentException();
+            }
+            // call our unfailing private method to do the real work
+            _set_position(pos);
+            fail_on_version_change();
+            return this;
+        }
+        private final void _set_position(int pos)
+        {
+            _pos = pos;
+            _curr = _buf.findBlockForRead(this, _version, _curr, pos);
+            _blockPosition = _pos - _curr._offset;
+        }
+        /**
+         * closes the steam and clears its reference to the
+         * byte buffer.  Once closed it cannot be used.
+         */
+        @Override
+        public final void close() throws IOException
+        {
+            this._buf = null;
+            this._pos = -1;
+        }
+        public final int writeTo(OutputStream out, int len) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            fail_on_version_change();
+            if (_pos > _buf.size()) throw new IllegalArgumentException();
+
+            int startingPos = _pos;
+            int localEnd = _pos + len;
+            if (localEnd > _buf.size()) localEnd = _buf.size();
+            assert(_curr.blockOffsetFromAbsolute(_pos) == _blockPosition);
+
+            while (_pos < localEnd) {
+                int available = _curr._limit - _blockPosition;
+                boolean partial_read = available > localEnd - _pos;
+                if (partial_read) {
+                    available = localEnd - _pos;
+                }
+
+                out.write(_curr._buffer, _blockPosition, available);
+                _pos += available;
+                if (partial_read) {
+                    _blockPosition += available;
+                    break;
+                }
+                _curr = _buf.findBlockForRead(this, _version, _curr, _pos);
+                _blockPosition =_curr.blockOffsetFromAbsolute(_pos);
+            }
+
+            fail_on_version_change();
+            return _pos - startingPos;
+        }
+
+        public final int writeTo(ByteWriter out, int len) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            fail_on_version_change();
+            if (_pos > _buf.size()) throw new IllegalArgumentException();
+
+            int startingPos = _pos;
+            int localEnd = _pos + len;
+            if (localEnd > _buf.size()) localEnd = _buf.size();
+            assert(_curr.blockOffsetFromAbsolute(_pos) == _blockPosition);
+
+            while (_pos < localEnd) {
+                int available = _curr._limit - _blockPosition;
+                boolean partial_read = available > localEnd - _pos;
+                if (partial_read) {
+                    available = localEnd - _pos;
+                }
+                out.write(_curr._buffer, _blockPosition, available);
+                _pos += available;
+                if (partial_read) {
+                    _blockPosition += available;
+                    break;
+                }
+                _curr = _buf.findBlockForRead(this, _version, _curr, _pos);
+                _blockPosition =_curr.blockOffsetFromAbsolute(_pos);
+            }
+
+            fail_on_version_change();
+            return _pos - startingPos;
+        }
+
+        /**
+         * reads (up to) {@code len} bytes from the buffer and copies them into
+         * the user supplied byte array (bytes) starting at offset
+         * off in the users array.  This returns the number of bytes
+         * read, which may be less than the number requested if
+         * there is not enough data available in the buffer.
+         *
+         * @throws IndexOutOfBoundsException
+         *   if {@code (dst.length - offset) < len}
+         */
+        @Override
+        public final int read(byte[] bytes, int offset, int len) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            fail_on_version_change();
+            if (_pos > _buf.size()) throw new IllegalArgumentException();
+            int startingPos = _pos;
+            int localEnd = _pos + len;
+            if (localEnd > _buf.size()) localEnd = _buf.size();
+            while (_pos < localEnd) {
+                bbBlock block = _curr;
+                int block_offset = _blockPosition;
+                int available = block._limit - _blockPosition;
+                if (available > localEnd - _pos) {
+                    // we aren't emptying this block so adjust our location
+                    available = localEnd - _pos;
+                    _blockPosition += available;
+                }
+                else {
+                    // TODO can't we just move to the next block?
+                    _curr = _buf.findBlockForRead(this, _version, _curr, _pos + available);
+                    _blockPosition = 0;
+                }
+                System.arraycopy(block._buffer, block_offset, bytes, offset, available);
+                _pos += available;
+                offset += available;
+            }
+            fail_on_version_change();
+            return _pos - startingPos;
+        }
+        /**
+         * reads the next byte in the buffer.  This returns -1
+         * if there is no data available to be read.
+         */
+        @Override
+        public final int read() throws IOException
+        {
+            if (_buf == null) {
+                throw new IOException("input stream is closed");
+            }
+            fail_on_version_change();
+            if (_pos >= _buf.size()) return -1;
+            if (_blockPosition >= _curr._limit) {
+                _curr = this._buf.findBlockForRead(this, _version, _curr, _pos);
+                _blockPosition = 0;
+            }
+            int nextByte = (0xff & _curr._buffer[_blockPosition]);
+            _blockPosition++;
+            _pos++;
+            fail_on_version_change();
+            return nextByte;
+        }
+        private final void fail_on_version_change() throws IOException
+        {
+            if (_buf.getVersion() != _version) {
+                this.close();
+                throw new BlockedBufferException("buffer has been changed!");
+            }
+        }
+        @Override
+        public final long skip(long n) throws IOException
+        {
+            if (n < 0 || n > Integer.MAX_VALUE) throw new IllegalArgumentException("we only handle buffer less than "+Integer.MAX_VALUE+" bytes in length");
+            if (_buf == null) throw new IOException("stream is closed");
+            fail_on_version_change();
+            if (_pos >= _buf.size()) return -1;
+            int len = (int)n;
+            if (len == 0) return 0;
+            int startingPos = _pos;
+            int localEnd = _pos + len;
+            if (localEnd > _buf.size()) localEnd = _buf.size();
+            // if we run off the end of this block, we need to update
+            // our current block ( _curr ) we'll update the block position
+            // in any event (once we know the right block, of course)
+            if (localEnd > _blockPosition + _curr._offset) {
+                _curr = _buf.findBlockForRead(this, _version, _curr, localEnd);
+            }
+            _blockPosition = localEnd - _curr._offset;
+            _pos = localEnd;
+            fail_on_version_change();
+            return _pos - startingPos;
+        }
+    }
+    /**
+     * Reads data from a byte buffer, keeps a local position and
+     * a current block.  Snaps a buffer length on creation;
+     */
+    public static class BlockedByteOutputStream extends java.io.OutputStream
+    {
+        BlockedBuffer _buf;
+        int           _pos;
+        bbBlock       _curr;
+        int           _blockPosition;
+        int           _version;
+        /**
+         * creates writable stream (OutputStream) that writes
+         * to a fresh blocked buffer.  The stream is initially
+         * position at offset 0.
+         */
+        public BlockedByteOutputStream() {
+            _buf = new BlockedBuffer();
+            _version = _buf.getVersion();
+            _set_position(0);
+        }
+        /**
+         * creates writable stream (OutputStream) that writes
+         * to the supplied byte buffer.  The stream is initially
+         * position at offset 0.
+         * @param bb blocked buffer to write to
+         */
+        public BlockedByteOutputStream(BlockedBuffer bb) {
+            _buf = bb;
+            _version = _buf.getVersion();
+            _set_position(0);
+        }
+        /**
+         * creates writable stream (OutputStream) that can write
+         * to the supplied byte buffer.  The stream is initially
+         * position at offset off.
+         * @param bb blocked buffer to write to
+         * @param off initial offset to write to
+         */
+        public BlockedByteOutputStream(BlockedBuffer bb, int off) {
+            if (bb == null || off < 0 || off > bb.size() ) {
+                throw new IllegalArgumentException();
+            }
+            _buf = bb;
+            _version = _buf.getVersion();
+            _set_position(0);
+        }
+        /**
+         * the current offset in the buffer
+         */
+        public final int position() {
+            return this._pos;
+        }
+        /**
+         * this forces a version sync with the underlying blocked buffer.
+         * The current position is lost during this call.
+         *
+         */
+        public final void sync() throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            _version = _buf.getVersion();
+            _pos = 0;
+            _curr = null;
+        }
+        /**
+         * debug api to force check for internal validity of the
+         * underlying buffer
+         */
+        public final boolean _validate() {
+            return this._buf._validate();
+        }
+        /**
+         * repositions this stream in the buffer.  The next
+         * read, write, or insert operation will take place
+         * at the specified position.  The position must
+         * be within the contiguous range of written bytes,
+         * including the pseudo end of file character just
+         * past the end, which can be written on and returns
+         * -1 if read.
+         */
+        public final BlockedByteOutputStream setPosition(int pos) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            fail_on_version_change();
+            if (pos < 0 || pos > _buf.size()) {
+                throw new IllegalArgumentException();
+            }
+            this._set_position(pos);
+            fail_on_version_change();
+            return this;
+        }
+        private final void _set_position(int pos)
+        {
+            _pos = pos;
+            _curr = _buf.findBlockForRead(this, _version, _curr, pos);
+            _blockPosition = _pos - _curr._offset;
+            return;
+        }
+        /**
+         * closes the steam and clears its reference to the
+         * byte buffer.  Once closed it cannot be used.
+         */
+        @Override
+        public final void close() throws IOException
+        {
+            this._buf = null;
+            this._pos = -1;
+            return;
+        }
+        /**
+         * Inserts space and writes 1 byte to the current
+         * position in this output stream.  Only the low
+         * order byte of the passed in int is written the
+         * high order bits are ignored.
+         */
+        @Override
+        public final void write(int b) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            _buf.start_mutate(this, _version);
+            _write(b);
+            _version = _buf.end_mutate(this);
+            return;
+        }
+        final void start_write() {
+            _buf.start_mutate(this, _version);
+        }
+        final void end_write() {
+            _version = _buf.end_mutate(this);
+        }
+        final void _write(int b) throws IOException
+        {
+            if (bytesAvailableToWriteInCurr(_pos) < 1) {
+                _curr = _buf.findBlockForWrite(this, _version, _curr, _pos);
+                assert _curr._offset == _pos;
+                _blockPosition = 0;
+            }
+            _curr._buffer[_blockPosition++] = (byte)(b & 0xff);
+            _pos++;
+            if (_blockPosition > _curr._limit) {
+                _curr._limit = _blockPosition;
+                if (_pos > _buf._buf_limit ) _buf._buf_limit = _pos;
+            }
+        }
+        private final int bytesAvailableToWriteInCurr(int pos) {
+            assert _curr != null;
+            assert _curr._offset <= pos;
+            assert _curr._offset + _curr._limit >= pos;
+            if (_curr._idx < this._buf._next_block_position - 1) {
+                return _curr.bytesAvailableToRead(pos);
+            }
+            int ret = _curr._buffer.length - (pos - _curr._offset);
+            return ret; // _curr.bytesAvailableToWrite(pos);
+        }
+        /**
+         * Writes len bytes from the specified byte array starting
+         * at in the user array at offset off to the current position
+         * in this output stream.
+         */
+        @Override
+        public final void write(byte[] b, int off, int len) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            _buf.start_mutate(this, _version);
+            _write(b, off, len);
+            _version = _buf.end_mutate(this);
+        }
+        private final void _write(byte[] b, int off, int len)
+        {
+            int end_b = off + len;
+            while (off < end_b)
+            {
+                int writeInThisBlock = bytesAvailableToWriteInCurr(_pos);
+                if (writeInThisBlock > end_b - off) {
+                    writeInThisBlock = end_b - off;
+                }
+                assert writeInThisBlock >= 0;
+                if (writeInThisBlock > 0) {
+                    System.arraycopy(b, off, _curr._buffer, _blockPosition, writeInThisBlock);
+                    off += writeInThisBlock;
+                    _pos += writeInThisBlock;
+                    _blockPosition += writeInThisBlock;
+                    if (_blockPosition > _curr._limit) {
+                        _curr._limit = _blockPosition;
+                        if (_pos > _buf._buf_limit) _buf._buf_limit = _pos;
+                    }
+                    else {
+                        assert _pos <= _buf._buf_limit;
+                    }
+                }
+                if (off >= end_b) break;
+
+                _curr = _buf.findBlockForWrite(this, _version, _curr, _pos);
+                _blockPosition = _curr.blockOffsetFromAbsolute(_pos);
+                assert _curr._offset == _pos || off >= end_b;
+            }
+        }
+        /**
+         * Writes bytes from the specified byte stream from its current
+         * stream position to the end of the stream.  Writing the bytes
+         * to the current position in this output stream.
+         * @throws IOException
+         */
+        public final void write(InputStream bytestream) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            _buf.start_mutate(this, _version);
+            _write(bytestream, -1);
+            _version = _buf.end_mutate(this);
+        }
+        /**
+         * Writes bytes from the specified byte stream from its current
+         * stream position up to length bytes from the stream.  Writing the
+         * bytes to the current position in this output stream.
+         * @throws IOException
+         */
+        public final void write(InputStream bytestream, int len) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            _buf.start_mutate(this, _version);
+            _write(bytestream, len);
+            _version = _buf.end_mutate(this);
+        }
+        /**
+         * helper to write data.  This does not check input arguments.
+         * @param bytestream source of the data
+         * @param len number of bytes to read from the input stream, -1 for all
+         * @throws IOException
+         */
+        private final void _write(InputStream bytestream, int len) throws IOException
+        {
+            if (len == 0) return;
+
+            int written = 0;
+            boolean read_all = (len == -1);
+
+            for (;;)
+            {
+                int writeInThisBlock = bytesAvailableToWriteInCurr(_pos);
+                assert writeInThisBlock >= 0;
+
+                int to_read = read_all ? writeInThisBlock : len;
+                if (to_read > writeInThisBlock) {
+                    to_read = writeInThisBlock;
+                }
+                int len_read = bytestream.read(_curr._buffer, _blockPosition, to_read);
+                if (len_read == -1) break;
+                if (len_read > 0) {
+                    _pos += len_read;
+                    _blockPosition += len_read;
+                    if (_blockPosition > _curr._limit) {
+                        _curr._limit = _blockPosition;
+                        if (_pos > _buf._buf_limit) _buf._buf_limit = _pos;
+                    }
+                    else {
+                        assert _pos <= _buf._buf_limit;
+                    }
+                }
+
+                if (len_read == writeInThisBlock) {
+                    _curr = _buf.findBlockForWrite(this, _version, _curr, _pos);
+                    _blockPosition = _curr.blockOffsetFromAbsolute(_pos);
+                    assert _curr._offset == _pos || written < len_read;
+                }
+                else {
+                    assert len_read < writeInThisBlock;
+                }
+                if (!read_all) {
+                    len -= len_read;
+                    if (len < 1) break;
+                }
+            }
+        }
+        /**
+         * Inserts the amount space requested at the current
+         * position in this output stream.  No data is written
+         * into the output stream.
+         */
+        public final void insert(int len) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            if (len < 0) {
+                throw new IllegalArgumentException();
+            }
+            if (len > 0) {
+                _buf.start_mutate(this, _version);
+                _buf.insert(this, _version, _curr, _pos, len);
+                _version = _buf.end_mutate(this);
+            }
+            return;
+        }
+        /**
+         * Inserts space and writes 1 byte to the current
+         * position in this output stream.  Only the low
+         * order byte of the passed in int is written the
+         * high order bits are ignored.
+         */
+        public final void insert(byte b) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            _buf.start_mutate(this, _version);
+            _buf.insert(this, _version, _curr, _pos, 1);
+            _write(b);
+            _version = _buf.end_mutate(this);
+        }
+        /**
+         * Inserts space and writes len bytes from the specified
+         * byte array starting at in the user array at offset off
+         * to the current position in this output stream.
+         */
+        public final void insert(byte[] b, int off, int len) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            _buf.start_mutate(this, _version);
+            _buf.insert(this, _version, _curr, _pos, len);
+            _write(b, off, len);
+            _version = _buf.end_mutate(this);
+        }
+        /**
+         * Inserts space and writes len bytes from the specified
+         * byte array starting at in the user array at offset off
+         * to the current position in this output stream.
+         */
+        public final void remove(int len) throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            _buf.start_mutate(this, _version);
+            _curr = _buf.remove(this, _version, _curr, _pos, len);
+            _version = _buf.end_mutate(this);
+        }
+        /**
+         * trucates the buffer at the current location after this
+         * call the last previously written or read byte will be
+         * the end of the buffer.
+         */
+        public final void truncate() throws IOException
+        {
+            if (_buf == null) throw new IOException("stream is closed");
+            if (this._buf._buf_limit == _pos) return;
+            _buf.start_mutate(this, _version);
+            _curr = _buf.truncate(this, _version, _pos);
+            _version = _buf.end_mutate(this);
+        }
+        private final void fail_on_version_change() throws IOException
+        {
+            if (_buf.getVersion() != _version) {
+                this.close();
+                throw new BlockedBufferException("buffer has been changed!");
+            }
+        }
+    }
+    public static class BlockedBufferException extends IonException
+    {
+        private static final long serialVersionUID = 1582507845614969389L;
+        public BlockedBufferException() { super(); }
+        public BlockedBufferException(String message) { super(message); }
+        public BlockedBufferException(String message, Throwable cause) {
+            super(message, cause);
+        }
+        public BlockedBufferException(Throwable cause) { super(cause); }
+    }
+    public static class BufferedOutputStream
+        extends OutputStream
+    {
+        BlockedBuffer           _buffer;
+        BlockedByteOutputStream _writer;
+        public BufferedOutputStream() {
+            this(new BlockedBuffer());
+        }
+        public BufferedOutputStream(BlockedBuffer buffer) {
+            _buffer = buffer;
+            _writer = new BlockedByteOutputStream(_buffer);
+        }
+        /**
+         * Gets the size in bytes of this binary data.
+         * This is generally needed before calling {@link #getBytes()} or
+         * {@link #getBytes(byte[], int, int)}.
+         *
+         * @return the size in bytes.
+         */
+        public int byteSize()
+        {
+            return _buffer.size();
+        }
+        /**
+         * Copies the current contents of this writer as a new byte array holding
+         * Ion binary-encoded data.
+         * This allocates an array of the size needed to exactly
+         * hold the output and copies the entire value to it.
+         *
+         * @return the byte array with the writers output
+         * @throws IOException
+         */
+        public byte[] getBytes()
+            throws IOException
+        {
+            int size = byteSize();
+            ByteArrayOutputStream byteStream = new ByteArrayOutputStream(size);
+            writeBytes(byteStream);
+            byte[] bytes = byteStream.toByteArray();
+            return bytes;
+        }
+        /**
+         * Copies the current contents of the writer to a given byte array
+         * array.  This starts writing to the array at offset and writes
+         * up to len bytes.
+         * If this writer is not able to stop in the middle of its
+         * work this may overwrite the array and later throw and exception.
+         *
+         * @param bytes users byte array to write into
+         * @param offset initial offset in the array to write into
+         * @param len maximum number of bytes to write from offset on
+         * @return number of bytes written
+         * @throws IOException
+         */
+        public int getBytes(byte[] bytes, int offset, int len)
+            throws IOException
+        {
+            SimpleByteBuffer outbuf = new SimpleByteBuffer(bytes, offset, len);
+            OutputStream     writer = (OutputStream)outbuf.getWriter();
+            int              written = writeBytes(writer);
+            return written;
+        }
+        /**
+         * Writes the current contents of the writer to the output
+         * stream.  This is only valid if the writer is not in the
+         * middle of writing a container.
+         *
+         * @param userstream OutputStream to write the bytes to
+         * @return int length of bytes written
+         * @throws IOException
+         */
+        public int writeBytes(OutputStream userstream)
+            throws IOException
+        {
+            int limit = _buffer.size();
+            int pos = 0;
+            int version = _buffer.getVersion();
+            bbBlock curr = null;
+            _buffer.start_mutate(this, version);
+            while (pos < limit) {
+                curr = _buffer.findBlockForRead(this, version, curr, pos);
+                if (curr == null) {
+                    throw new IOException("buffer missing expected bytes");
+                }
+                int len = curr.bytesAvailableToRead(pos);
+                if (len <= 0) {
+                    throw new IOException("buffer missing expected bytes");
+                }
+                userstream.write(curr._buffer, 0, len);
+                pos += len;
+            }
+            _buffer.end_mutate(this);
+            return pos;
+        }
+        @Override
+        public void write(int b) throws IOException
+        {
+            _writer.write(b);
+        }
+        @Override
+        public void write(byte[] bytes) throws IOException
+        {
+            write(bytes, 0, bytes.length);
+        }
+        @Override
+        public void write(byte[] bytes, int off, int len) throws IOException
+        {
+            _writer.write(bytes, off, len);
+        }
+    }
+}
diff --git a/src/com/amazon/ion/impl/ByteBuffer.java b/src/com/amazon/ion/impl/ByteBuffer.java
new file mode 100644
index 0000000000..941ea7bf27
--- /dev/null
+++ b/src/com/amazon/ion/impl/ByteBuffer.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * This is a general purpose interface to support operations
+ * over byte sources for Ion operations.  The implementations
+ * are resposible for managing container state during operations
+ * as well as the underlying data in the buffer itself.
+ */
+interface ByteBuffer
+{
+    /**
+     * creates a reader and sets it to the beginning of the buffer
+     * under managment here for use.
+     * @return a new reader
+     */
+    public abstract ByteReader getReader();
+
+    /**
+     * creates a writer and sets it to the beginning of the buffer
+     * under managment here for use.
+     * @return a new writer
+     */
+    public abstract ByteWriter getWriter();
+
+    /**
+     * wraps up the current buffer as a new byte array and passed
+     * ownership of the copy to the caller.
+     * @return a copy of the buffer in a new byte array
+     */
+    public abstract byte[]     getBytes();
+
+    /**
+     * copies the contents of the buffer into a user supplied
+     * byte array.  It copies into the user buffer starting at
+     * the supplied offset and attempts to copy no more than
+     * length bytes.  If the implmentation cannot determine the
+     * length to be copied before copying it may overwrite some
+     * of the user buffer and will throw at the end of the copy.
+     * (note that is may throw an out of bounds exception if
+     * the write extends beyond the length of the callers array)
+     * @param buffer users byte array to copy into
+     * @param offset first byte of the array to use
+     * @param length length of the byte array available to copy into
+     * @return number of bytes actually copied
+     */
+    public abstract int        getBytes(byte[] buffer, int offset, int length);
+
+    /**
+     * copies the contents of the buffer into and output stream.
+     * @param out stream to write into
+     * @throws IOException
+     */
+    public abstract void       writeBytes(OutputStream out) throws IOException;
+}
diff --git a/src/com/amazon/ion/impl/ByteReader.java b/src/com/amazon/ion/impl/ByteReader.java
new file mode 100644
index 0000000000..3bf0e2a771
--- /dev/null
+++ b/src/com/amazon/ion/impl/ByteReader.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.Timestamp;
+import java.io.IOException;
+/**
+ * Interface to read bytes over a variety of sources.
+ * Avoiding the Java standard overhead in so far as possible.
+ * This requires the ability to access any part of the underlying
+ * data source randomly.  However forward access is expected to be
+ * the standard direction.
+ */
+interface ByteReader
+{
+    /**
+     * yet another definition of eof of file as -1
+     */
+    public static final int EOF = -1;
+
+    /**
+     * returns the current position of the reader in the underlying
+     * byte buffer
+     * @return offset of the next byte to read
+     */
+    public int  position();
+    /**
+     * sets the position of the reader so that it will read the
+     * byte at the passed in offset (newPosition) on the next call
+     * to read()
+     * @param newPosition offset to position the reader to
+     */
+    public void position(int newPosition);
+    /**
+     * moves the reader forward length bytes.  This is typically
+     * faster than read as it has no need to actually move any
+     * bytes of data.  It may error if the skip would take the
+     * current position off the end of the buffer.
+     * @param length number of bytes to skip
+     */
+    public void skip(int length);
+
+    /**
+     * reads a single byte and returns it as an unsigned value,
+     * that is from 0 to 255.  This returns a ByteReader.EOF (-1)
+     * if there is not data to read.
+     * @return next byte of data
+     * @throws IOException
+     */
+    public int  read() throws IOException;
+    /**
+     * reads a number of bytes into the callers supplied buffer (dst).
+     * This will return the number of bytes read, if any.
+     * @param dst callers destination byte array
+     * @param start offset of the first destination array element to write into
+     * @param len maximum number of bytes to copy
+     * @return number of bytes actually copied
+     * @throws IOException
+     */
+    public int  read(byte[] dst, int start, int len) throws IOException;
+
+    /**
+     * reads the next byte as a typedesc bytes
+     * @return typedesc byte
+     * @throws IOException
+     */
+    public int  readTypeDesc() throws IOException;
+
+    /**
+     * reads the upcoming bytes as a signed long.  This uses
+     * 7 bits per byte, expects the bytes in bigendian order, and
+     * looks for the high order bit (0x80) to be set to mark the
+     * end of the value. It expects the 2nd bit (0x40 of the first
+     * byte) to be the sign of the value.  The remaining bits are
+     * the absolute value of the orginal value. It
+     * returns the aggregated bytes as a Java long (signed 64 bit
+     * value) correctly signed.
+     * @return long value read
+     * @throws IOException
+     */
+    public long readVarLong() throws IOException;
+    /**
+     * reads the upcoming bytes as a unsigned long.  This uses
+     * 7 bits per byte, expects the bytes in bigendian order, and
+     * looks for the high order bit (0x80) to be set to mark the
+     * end of the value. It does not include a sign bit so all 7 bits
+     * in the first byte are treated as positive. It
+     * returns the aggregated bytes as a Java long (signed 64 bit
+     * value).
+     * @return long value read
+     * @throws IOException
+     */
+    public long readVarULong() throws IOException;
+    /**
+     * reads the next len bytes as a signed long.  This uses
+     * 8 bits per byte and expects the bytes in bigendian order. It
+     * returns the aggregated bytes as a Java long (signed 64 bit
+     * value).
+     * @param len number of bytes to read into the long
+     * @return long value read
+     * @throws IOException
+     */
+    public long readULong(int len) throws IOException;
+
+    /**
+     * reads the upcoming bytes as a signed int.  This uses
+     * 7 bits per byte, expects the bytes in bigendian order, and
+     * looks for the high order bit (0x80) to be set to mark the
+     * end of the value. It expects the 2nd bit (0x40 of the first
+     * byte) to be the sign of the value.  The remaining bits are
+     * the absolute value of the orginal value. It
+     * returns the aggregated bytes as a Java long (signed 32 bit
+     * value) correctly signed.
+     * @return int value read
+     * @throws IOException
+     */
+    public int  readVarInt() throws IOException;
+    /**
+     * reads the upcoming bytes as a unsigned int.  This uses
+     * 7 bits per byte, expects the bytes in bigendian order, and
+     * looks for the high order bit (0x80) to be set to mark the
+     * end of the value. It does not include a sign bit so all 7 bits
+     * in the first byte are treated as positive. It
+     * returns the aggregated bytes as a Java long (signed 32 bit
+     * value).
+     * @return int value read
+     * @throws IOException
+     */
+    public int  readVarUInt() throws IOException;
+
+    /**
+     * reads len bytes and treats them as an IEEE 64 binary
+     * floating point value.  Currently the only valid values for
+     * len are 0 (which returns 0.0e1) or 8 which is treated
+     * as a 64 bit binary float and returned.
+     * @param len 0 or 8
+     * @return 0.0 or the double represented by the next 8 bytes
+     * @throws IOException
+     */
+    public double readFloat(int len) throws IOException;
+    /**
+     * reads the next len bytes and converts them to a {@link Decimal} value.
+     * @param len number of bytes over which the value extends
+     * @return Decimal object initialized to the represented value; not null.
+     * @throws IOException
+     */
+    public Decimal readDecimal(int len) throws IOException;
+
+    /**
+     * Reads the next len bytes and returns them as a {@link Timestamp}
+     * object.  This contains an UTC date and time value and a
+     * timezone offset of the original value.
+     *
+     * @param len
+     * @return a new {@link Timestamp} instance,
+     * or {@code null} if the encoded value is {@code null.timestamp}.
+     * @throws IOException
+     */
+    public Timestamp readTimestamp(int len) throws IOException;
+
+    /** reads the next len bytes and converts them from UTF-8 into Java
+     * characters and returns those characters as a String.  This may throw
+     * an exception in the event it encounters byte sequences that are not
+     * value UTF-8.  This converts some Unicode values into character pairs
+     * when the value requires the use of surrogate pairs in Unicode 16.
+     * @param len number of bytes to read
+     * @return resultant Java string
+     * @throws IOException
+     */
+    public String readString(int len) throws IOException;
+}
diff --git a/src/com/amazon/ion/impl/ByteWriter.java b/src/com/amazon/ion/impl/ByteWriter.java
new file mode 100644
index 0000000000..b1f9251aab
--- /dev/null
+++ b/src/com/amazon/ion/impl/ByteWriter.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+
+/**
+ * Interface to write Ion value to bytes over a variety of destinations.
+ * Avoiding the Java standard overhead in so far as possible.
+ * This requires the ability to access any part of the underlying
+ * data source randomly and insert space at any position.  However forward
+ * access is expected to be the standard direction.
+ */
+interface ByteWriter
+{
+        public void write(byte b) throws IOException;
+        public void write(byte[] dst, int start, int len) throws IOException;
+        public int  position();
+        public void position(int newPosition);
+
+        public void insert(int length);
+        public void remove(int length);
+
+        public void writeTypeDesc(int typeDescByte) throws IOException;
+        public int  writeTypeDescWithLength(int typeid, int lenOfLength, int valueLength) throws IOException;
+        public int  writeTypeDescWithLength(int typeid, int valueLength) throws IOException;
+
+        public int  writeIonInt(long value, int len) throws IOException;
+        public int  writeVarInt(long value, int len, boolean force_zero_write) throws IOException;
+        public int  writeVarUInt(long value, int len, boolean force_zero_write) throws IOException;
+
+        public int  writeIonInt(int value, int len) throws IOException;
+        public int  writeVarInt(int value, int len, boolean force_zero_write) throws IOException;
+        public int  writeVarUInt(int value, int len, boolean force_zero_write) throws IOException;
+
+        public int  writeFloat(double value) throws IOException;
+        public int  writeDecimal(BigDecimal value) throws IOException;
+        public int  writeString(String value) throws IOException;
+}
diff --git a/src/software/amazon/ion/impl/DowncastingFaceted.java b/src/com/amazon/ion/impl/DowncastingFaceted.java
similarity index 57%
rename from src/software/amazon/ion/impl/DowncastingFaceted.java
rename to src/com/amazon/ion/impl/DowncastingFaceted.java
index 13a37e1452..171f7b1f77 100644
--- a/src/software/amazon/ion/impl/DowncastingFaceted.java
+++ b/src/com/amazon/ion/impl/DowncastingFaceted.java
@@ -1,19 +1,22 @@
+
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion.impl;
 
-import software.amazon.ion.facet.Faceted;
+package com.amazon.ion.impl;
+
+import com.amazon.ion.facet.Faceted;
 
 /**
  * Provides a simple implementation of {@link Faceted}
diff --git a/src/com/amazon/ion/impl/IonBinary.java b/src/com/amazon/ion/impl/IonBinary.java
new file mode 100644
index 0000000000..956d49212c
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonBinary.java
@@ -0,0 +1,2942 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_SIZE;
+import static com.amazon.ion.impl._Private_Utils.EMPTY_BYTE_ARRAY;
+import static com.amazon.ion.impl._Private_Utils.readFully;
+import static com.amazon.ion.util.IonStreamUtils.isIonBinary;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.Timestamp.Precision;
+import com.amazon.ion.UnexpectedEofException;
+import com.amazon.ion.impl._Private_IonConstants.HighNibble;
+import com.amazon.ion.util.IonTextUtils;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PushbackReader;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.MathContext;
+import java.util.ArrayList;
+import java.util.Stack;
+
+final class IonBinary
+{
+    static boolean debugValidation = false;
+
+    private static final BigInteger MAX_LONG_VALUE = new BigInteger(Long.toString(Long.MAX_VALUE));
+    private static final int SIZE_OF_LONG = 8;
+
+    final static int _ib_TOKEN_LEN           =    1;
+    final static int _ib_VAR_INT32_LEN_MAX   =    5; // 31 bits (java limit) / 7 bits per byte =  5 bytes
+    final static int _ib_VAR_INT64_LEN_MAX   =   10; // 63 bits (java limit) / 7 bits per byte = 10 bytes
+    final static int _ib_INT64_LEN_MAX       =    8;
+    final static int _ib_FLOAT64_LEN         =    8;
+
+    private static final Double DOUBLE_POS_ZERO = Double.valueOf(0.0);
+
+    static final int ZERO_DECIMAL_TYPEDESC =
+        _Private_IonConstants.makeTypeDescriptor(_Private_IonConstants.tidDecimal,
+            _Private_IonConstants.lnNumericZero);
+
+    static final int NULL_DECIMAL_TYPEDESC =
+        _Private_IonConstants.makeTypeDescriptor(_Private_IonConstants.tidDecimal,
+            _Private_IonConstants.lnIsNullAtom);
+
+    private IonBinary() { }
+
+
+    /**
+     * Verifies that a reader starts with a valid Ion cookie, throwing an
+     * exception if it does not.
+     *
+     * @param reader must not be null.
+     * @throws IonException if there's a problem reading the cookie, or if the
+     * data does not start with {@link _Private_IonConstants#BINARY_VERSION_MARKER_1_0}.
+     */
+    public static void verifyBinaryVersionMarker(Reader reader)
+        throws IonException
+    {
+        try
+        {
+            int pos = reader.position();
+            //reader.sync();
+            //reader.setPosition(0);
+            byte[] bvm = new byte[BINARY_VERSION_MARKER_SIZE];
+            int len = readFully(reader, bvm);
+            if (len < BINARY_VERSION_MARKER_SIZE)
+            {
+                String message =
+                    "Binary data is too short: at least " +
+                    BINARY_VERSION_MARKER_SIZE +
+                    " bytes are required, but only " + len + " were found.";
+                throw new IonException(message);
+
+            }
+
+            if (! isIonBinary(bvm))
+            {
+                StringBuilder buf = new StringBuilder();
+                buf.append("Binary data has unrecognized header");
+                for (int i = 0; i < bvm.length; i++)
+                {
+                    int b = bvm[i] & 0xFF;
+                    buf.append(" 0x");
+                    buf.append(Integer.toHexString(b).toUpperCase());
+                }
+                throw new IonException(buf.toString());
+            }
+
+            //reader.setPosition(0); // cas 19 apr 2008
+            reader.setPosition(pos); // cas 5 may 2009 :)
+        }
+        catch (IOException e)
+        {
+            throw new IonException(e);
+        }
+    }
+
+    /* imported from SimpleByteBuffer.SimpleByteWriter */
+
+    static public int writeTypeDescWithLength(OutputStream userstream, int typeid, int lenOfLength, int valueLength) throws IOException
+    {
+        int written_len = 1;
+
+        int td = ((typeid & 0xf) << 4);
+        if (valueLength >= _Private_IonConstants.lnIsVarLen) {
+            td |= _Private_IonConstants.lnIsVarLen;
+            userstream.write((byte)(td & 0xff));
+            written_len += writeVarUInt(userstream, (long)valueLength, lenOfLength, true);
+        }
+        else {
+            td |= (valueLength & 0xf);
+            userstream.write((byte)(td & 0xff));
+        }
+        return written_len;
+    }
+
+    static public int writeTypeDescWithLength(OutputStream userstream, int typeid, int valueLength) throws IOException
+    {
+        int written_len = 1;
+        int td = ((typeid & 0xf) << 4);
+
+        if (valueLength >= _Private_IonConstants.lnIsVarLen) {
+            td |= _Private_IonConstants.lnIsVarLen;
+            userstream.write((byte)(td & 0xff));
+            int lenOfLength = IonBinary.lenVarUInt(valueLength);
+            written_len += writeVarUInt(userstream, (long)valueLength, lenOfLength, true);
+        }
+        else {
+            td |= (valueLength & 0xf);
+            userstream.write((byte)(td & 0xff));
+        }
+        return written_len;
+    }
+
+    static public int writeIonInt(OutputStream userstream, long value, int len) throws IOException
+    {
+        // we shouldn't be writing out 0's as an Ion int value
+        if (value == 0) {
+            assert len == 0;
+            return len;  // aka 0
+        }
+
+        // figure out how many we have bytes we have to write out
+        long mask = 0xffL;
+        boolean is_negative = (value < 0);
+
+        assert len == IonBinary.lenIonInt(value);
+
+        if (is_negative) {
+            value = -value;
+            // note for Long.MIN_VALUE the negation returns
+            // itself as a value, but that's also the correct
+            // "positive" value to write out anyway, so it
+            // all works out
+        }
+
+        // write the rest
+        switch (len) {  // we already wrote 1 byte
+        case 8: userstream.write((byte)((value >> (8*7)) & mask));
+        case 7: userstream.write((byte)((value >> (8*6)) & mask));
+        case 6: userstream.write((byte)((value >> (8*5)) & mask));
+        case 5: userstream.write((byte)((value >> (8*4)) & mask));
+        case 4: userstream.write((byte)((value >> (8*3)) & mask));
+        case 3: userstream.write((byte)((value >> (8*2)) & mask));
+        case 2: userstream.write((byte)((value >> (8*1)) & mask));
+        case 1: userstream.write((byte)(value & mask));
+        }
+
+        return len;
+    }
+
+    static public int writeVarUInt(OutputStream userstream, long value)
+        throws IOException
+    {
+        int len = IonBinary.lenVarUInt(value);
+        writeVarUInt(userstream, value, len, false);
+        return len;
+    }
+
+    static public int writeVarUInt(OutputStream userstream, long value, int len,
+                                   boolean force_zero_write)
+        throws IOException
+    {
+        int mask = 0x7F;
+        assert len == IonBinary.lenVarUInt(value);
+        assert value >= 0;
+
+        switch (len - 1) {
+        case 9: userstream.write((byte)((value >> (7*9)) & mask));
+        case 8: userstream.write((byte)((value >> (7*8)) & mask));
+        case 7: userstream.write((byte)((value >> (7*7)) & mask));
+        case 6: userstream.write((byte)((value >> (7*6)) & mask));
+        case 5: userstream.write((byte)((value >> (7*5)) & mask));
+        case 4: userstream.write((byte)((value >> (7*4)) & mask));
+        case 3: userstream.write((byte)((value >> (7*3)) & mask));
+        case 2: userstream.write((byte)((value >> (7*2)) & mask));
+        case 1: userstream.write((byte)((value >> (7*1)) & mask));
+        case 0: userstream.write((byte)((value & mask) | 0x80L));
+                break;
+        case -1: // or len == 0
+            if (force_zero_write) {
+                userstream.write((byte)0x80);
+                assert len == 1;
+            }
+            else {
+                assert len == 0;
+            }
+            break;
+        }
+        return len;
+    }
+
+    static public int writeString(OutputStream userstream, String value)
+        throws IOException
+    {
+        int len = 0;
+        for (int ii=0; ii<value.length(); ii++) {
+            int c = value.charAt(ii);
+            if (c < 128) {
+                userstream.write((byte)c);
+                ++len;
+                continue;
+            }
+            // multi-byte utf8
+            if (c >= 0xD800 && c <= 0xDFFF) {
+                if (_Private_IonConstants.isHighSurrogate(c)) {
+                    // houston we have a high surrogate (let's hope it has a partner
+                    if (++ii >= value.length()) {
+                        throw new IllegalArgumentException("invalid string, unpaired high surrogate character");
+                    }
+                    int c2 = value.charAt(ii);
+                    if (!_Private_IonConstants.isLowSurrogate(c2)) {
+                        throw new IllegalArgumentException("invalid string, unpaired high surrogate character");
+                    }
+                    c = _Private_IonConstants.makeUnicodeScalar(c, c2);
+                }
+                else if (_Private_IonConstants.isLowSurrogate(c)) {
+                    // it's a loner low surrogate - that's an error
+                    throw new IllegalArgumentException("invalid string, unpaired low surrogate character");
+                }
+            }
+
+            for (c = makeUTF8IntFromScalar(c); (c & 0xffffff00) != 0; ++len) {
+                userstream.write((byte)(c & 0xff));
+                c = c >>> 8;
+            }
+        }
+        return len;
+    }
+
+    // TODO: move this to IonConstants or IonUTF8
+    static final public int makeUTF8IntFromScalar(int c) throws IOException
+    {
+        // TO DO: check this encoding, it is from:
+        //      http://en.wikipedia.org/wiki/UTF-8
+        // we probably should use some sort of Java supported
+        // library for this.  this class might be of interest:
+        //     CharsetDecoder(Charset cs, float averageCharsPerByte, float maxCharsPerByte)
+        // in: java.nio.charset.CharsetDecoder
+
+        int value = 0;
+
+        // first the quick, easy and common case - ascii
+        if (c < 0x80) {
+            value = (0xff & c );
+        }
+        else if (c < 0x800) {
+            // 2 bytes characters from 0x000080 to 0x0007FF
+            value  = ( 0xff & (0xC0 | (c >> 6)        ) );
+            value |= ( 0xff & (0x80 | (c       & 0x3F)) ) <<  8;
+        }
+        else if (c < 0x10000) {
+            // 3 byte characters from 0x800 to 0xFFFF
+            // but only 0x800...0xD7FF and 0xE000...0xFFFF are valid
+            if (c > 0xD7FF && c < 0xE000) {
+                throwUTF8Exception();
+            }
+            value  = ( 0xff & (0xE0 |  (c >> 12)       ) );
+            value |= ( 0xff & (0x80 | ((c >>  6) & 0x3F)) ) <<  8;
+            value |= ( 0xff & (0x80 |  (c        & 0x3F)) ) << 16;
+
+        }
+        else if (c <= 0x10FFFF) {
+            // 4 byte characters 0x010000 to 0x10FFFF
+            // these are are valid
+            value  = ( 0xff & (0xF0 |  (c >> 18)) );
+            value |= ( 0xff & (0x80 | ((c >> 12) & 0x3F)) ) <<  8;
+            value |= ( 0xff & (0x80 | ((c >>  6) & 0x3F)) ) << 16;
+            value |= ( 0xff & (0x80 |  (c        & 0x3F)) ) << 24;
+        }
+        else {
+            throwUTF8Exception();
+        }
+        return value;
+    }
+    static void throwUTF8Exception() throws IOException
+    {
+        throw new IOException("Invalid UTF-8 character encountered");
+    }
+
+
+    public static class BufferManager
+    {
+        BlockedBuffer    _buf;
+        IonBinary.Reader _reader;
+        IonBinary.Writer _writer;
+
+        public BufferManager() {
+            _buf = new BlockedBuffer();
+            this.openReader();
+            this.openWriter();
+        }
+        public BufferManager(BlockedBuffer buf) {
+            _buf = buf;
+            this.openReader();
+            this.openWriter();
+        }
+
+        /**
+         * Creates a new buffer containing the entire content of an
+         * {@link InputStream}.
+         *
+         * @param bytestream a stream interface the byte image to buffer
+         *
+         * @throws IonException wrapping any {@link IOException}s thrown by the
+         * stream.
+         */
+        public BufferManager(InputStream bytestream)
+        {
+            this(); // this will create a fresh buffer
+                    // as well as a reader and writer
+
+            // now we move the data from the input stream to the buffer
+            // more or less as fast as we can.  I am (perhaps foolishly)
+            // assuming the "available()" is a useful size.
+            try
+            {
+                _writer.write(bytestream);
+            }
+            catch (IOException e)
+            {
+                throw new IonException(e);
+            }
+        }
+
+        /**
+         * Creates a new buffer containing the entire content of an
+         * {@link InputStream}.
+         *
+         * @param bytestream a stream interface the byte image to buffer
+         *
+         * @throws IonException wrapping any {@link IOException}s thrown by the
+         * stream.
+         */
+        public BufferManager(InputStream bytestream, int len)
+        {
+            this(); // this will create a fresh buffer
+                    // as well as a reader and writer
+
+            // now we move the data from the input stream to the buffer
+            // more or less as fast as we can.  I am (perhaps foolishly)
+            // assuming the "available()" is a useful size.
+            try
+            {
+                _writer.write(bytestream, len);
+            }
+            catch (IOException e)
+            {
+                throw new IonException(e);
+            }
+        }
+
+        @Override
+        public BufferManager clone() throws CloneNotSupportedException
+        {
+            BlockedBuffer buffer_clone = this._buf.clone();
+            BufferManager clone = new BufferManager(buffer_clone);
+            return clone;
+        }
+
+        public IonBinary.Reader openReader() {
+            if (_reader == null) {
+                _reader = new IonBinary.Reader(_buf);
+            }
+            return _reader;
+        }
+        public IonBinary.Writer openWriter() {
+            if (_writer == null) {
+                _writer = new IonBinary.Writer(_buf);
+            }
+            return _writer;
+        }
+
+        public BlockedBuffer    buffer() { return _buf; }
+        public IonBinary.Reader reader() { return _reader; }
+        public IonBinary.Writer writer() { return _writer; }
+
+        public IonBinary.Reader reader(int pos) throws IOException
+        {
+            _reader.setPosition(pos);
+            return _reader;
+        }
+        public IonBinary.Writer writer(int pos) throws IOException
+        {
+            _writer.setPosition(pos);
+            return _writer;
+        }
+        public static BufferManager makeReadManager(BlockedBuffer buf) {
+            BufferManager bufmngr = new BufferManager(buf);
+            bufmngr.openReader();
+            return bufmngr;
+        }
+        public static BufferManager makeReadWriteManager(BlockedBuffer buf) {
+            BufferManager bufmngr = new BufferManager(buf);
+            bufmngr.openReader();
+            bufmngr.openWriter();
+            return bufmngr;
+        }
+    }
+
+    /**
+     * Variable-length, high-bit-terminating integer, 7 data bits per byte.
+     */
+    public static int lenVarUInt(long longVal) {
+        assert longVal >= 0;
+        if (longVal < (1L << (7 * 1))) return 1;  // 7  bits
+        if (longVal < (1L << (7 * 2))) return 2;  // 14 bits
+        if (longVal < (1L << (7 * 3))) return 3;  // 21 bits
+        if (longVal < (1L << (7 * 4))) return 4;  // 28 bits
+        if (longVal < (1L << (7 * 5))) return 5;  // 35 bits
+        if (longVal < (1L << (7 * 6))) return 6;  // 42 bits
+        if (longVal < (1L << (7 * 7))) return 7;  // 49 bits
+        if (longVal < (1L << (7 * 8))) return 8;  // 56 bits
+        if (longVal < (1L << (7 * 9))) return 9;  // 63 bits
+        return 10;
+    }
+
+    // TODO maybe add lenVarInt(int) to micro-optimize, or?
+
+    public static int lenVarInt(long longVal) {
+        if (longVal == 0) {
+            return 0;
+        }
+        if (longVal <  0) longVal = -longVal;
+        if (longVal < (1L << (7 * 1 - 1))) return 1;  // 6  bits
+        if (longVal < (1L << (7 * 2 - 1))) return 2;  // 13 bits
+        if (longVal < (1L << (7 * 3 - 1))) return 3;  // 20 bits
+        if (longVal < (1L << (7 * 4 - 1))) return 4;  // 27 bits
+        if (longVal < (1L << (7 * 5 - 1))) return 5;  // 34 bits
+        if (longVal < (1L << (7 * 6 - 1))) return 6;  // 41 bits
+        if (longVal < (1L << (7 * 7 - 1))) return 7;  // 48 bits
+        if (longVal < (1L << (7 * 8 - 1))) return 8;  // 55 bits
+        if (longVal < (1L << (7 * 9 - 1))) return 9;  // 62 bits
+        return 10;
+    }
+
+    /**
+     * @return zero if input is zero
+     */
+    public static int lenUInt(long longVal) {
+        if (longVal == 0) {
+            return 0;
+        }
+        if (longVal < 0) {
+            throw new BlockedBuffer.BlockedBufferException("fatal signed long where unsigned was promised");
+        }
+        if (longVal < (1L << (8 * 1))) return 1;  // 8  bits
+        if (longVal < (1L << (8 * 2))) return 2;  // 16 bits
+        if (longVal < (1L << (8 * 3))) return 3;  // 24 bits
+        if (longVal < (1L << (8 * 4))) return 4;  // 32 bits
+        if (longVal < (1L << (8 * 5))) return 5;  // 40 bits
+        if (longVal < (1L << (8 * 6))) return 6;  // 48 bits
+        if (longVal < (1L << (8 * 7))) return 7;  // 56 bits
+        return 8;
+    }
+
+    public static int lenUInt(BigInteger bigVal)
+    {
+        if (bigVal.signum() < 0) {
+            throw new IllegalArgumentException("lenUInt expects a non-negative a value");
+        }
+        final int bits = bigVal.bitLength();
+        // determine the number of octets needed to represent this bit pattern
+        // (div 8)
+        int bytes = bits >> 3;
+        // if we have a bit more than what can fit in an octet, we need to add
+        // an extra octet (mod 8)
+        if ((bits & 0x7) != 0)
+        {
+            bytes++;
+        }
+        return bytes;
+    }
+
+    // TODO maybe add lenInt(int) to micro-optimize, or?
+
+    public static int lenInt(long longVal) {
+        if (longVal != 0) {
+            return 0;
+        }
+        if (longVal < 0) longVal = -longVal;
+        if (longVal < (1L << (8 * 1 - 1))) return 1;   // 7  bits
+        if (longVal < (1L << (8 * 2 - 1))) return 2;   // 15 bits
+        if (longVal < (1L << (8 * 3 - 1))) return 3;   // 23 bits
+        if (longVal < (1L << (8 * 4 - 1))) return 4;   // 31 bits
+        if (longVal < (1L << (8 * 5 - 1))) return 5;   // 39 bits
+        if (longVal < (1L << (8 * 6 - 1))) return 6;   // 47 bits
+        if (longVal < (1L << (8 * 7 - 1))) return 7;   // 55 bits
+        if (longVal == Long.MIN_VALUE) return 9;
+        return 8;
+    }
+
+    public static int lenInt(BigInteger bi, boolean force_zero_writes)
+    {
+        int len = bi.abs().bitLength() + 1; // add 1 for the sign bit (which must always be present)
+        int bytelen = 0;
+
+        switch (bi.signum()) {
+        case 0:
+            bytelen = force_zero_writes ? 1 : 0;
+            break;
+        case 1:
+        case -1:
+            bytelen = ((len-1) / 8) + 1;
+            break;
+        }
+
+        return bytelen;
+    }
+
+    public static int lenIonInt(long v) {
+        if (v < 0) {
+            // note that for Long.MIN_VALUE (0x8000000000000000) the negative
+            //      is the same, but that's also the bit pattern we need to
+            //      write out, but the UInt method won't like it, so we just
+            //      return then value that we actually know.
+            if (v == Long.MIN_VALUE) return SIZE_OF_LONG;
+            return IonBinary.lenUInt(-v);
+        }
+        else if (v > 0) {
+            return IonBinary.lenUInt(v);
+        }
+        return 0; // CAS UPDATE, was 1
+    }
+
+    public static int lenIonInt(BigInteger v)
+    {
+        if (v.signum() < 0)
+        {
+            v = v.negate();
+        }
+        int len = lenUInt(v);
+        return len;
+    }
+
+    /**
+     * The size of length value when short lengths are recorded in the
+     * typedesc low-nibble.
+     * @param valuelen
+     * @return zero if valuelen < 14
+     */
+    public static int lenLenFieldWithOptionalNibble(int valuelen) {
+        if (valuelen < _Private_IonConstants.lnIsVarLen) {
+            return 0;
+        }
+        return lenVarUInt(valuelen);
+    }
+
+    public static int lenTypeDescWithAppropriateLenField(int type, int valuelen)
+    {
+        switch (type) {
+        case _Private_IonConstants.tidNull: // null(0)
+        case _Private_IonConstants.tidBoolean: // boolean(1)
+            return _Private_IonConstants.BB_TOKEN_LEN;
+
+        case _Private_IonConstants.tidPosInt: // 2
+        case _Private_IonConstants.tidNegInt: // 3
+        case _Private_IonConstants.tidFloat: // float(4)
+        case _Private_IonConstants.tidDecimal: // decimal(5)
+        case _Private_IonConstants.tidTimestamp: // timestamp(6)
+        case _Private_IonConstants.tidSymbol: // symbol(7)
+        case _Private_IonConstants.tidString: // string (8)
+        case _Private_IonConstants.tidClob: // clob(9)
+        case _Private_IonConstants.tidBlob: // blob(10)
+        case _Private_IonConstants.tidList:   // 11        -- cas mar 6 2008, moved containers
+        case _Private_IonConstants.tidSexp:   // 12        -- up heresince they now use the same
+        case _Private_IonConstants.tidStruct: // 13        -- length encodings as scalars
+        case _Private_IonConstants.tidTypedecl: // 14
+            if (valuelen < _Private_IonConstants.lnIsVarLen) {
+                return _Private_IonConstants.BB_TOKEN_LEN;
+            }
+            return _Private_IonConstants.BB_TOKEN_LEN + lenVarUInt(valuelen);
+
+        case _Private_IonConstants.tidUnused: // unused(15)
+        default:
+            throw new IonException("invalid type");
+        }
+    }
+
+    public static int lenIonFloat(double value) {
+        if (Double.valueOf(value).equals(DOUBLE_POS_ZERO))
+        {
+            // pos zero special case
+            return 0;
+        }
+
+        // always 8-bytes for IEEE-754 64-bit
+        return _ib_FLOAT64_LEN;
+    }
+
+    /**
+     * Would this value have a zero length-nibble?  That is: is it 0d0 ?
+     */
+    public static boolean isNibbleZero(BigDecimal bd)
+    {
+        if (Decimal.isNegativeZero(bd)) return false;
+        if (bd.signum() != 0) return false;
+        int scale = bd.scale();
+        return (scale == 0);
+    }
+
+    /**
+     * @param bd must not be null.
+     */
+    public static int lenIonDecimal(BigDecimal bd)
+    {
+        // first check for the special cases of null
+        // and 0d0 which are encoded in the nibble
+        if (bd == null) return 0;
+        if (isNibbleZero(bd)) return 0;
+
+        // otherwise do this the hard way
+        BigInteger mantissa = bd.unscaledValue();
+
+        // negative zero mantissa must be written, positive zero does not
+        boolean forceMantissa = Decimal.isNegativeZero(bd);
+        int mantissaByteCount = lenInt(mantissa, forceMantissa);
+
+        // We really need the length of the exponent (-scale) but in our
+        // representation the length is the same regardless of sign.
+        int scale = bd.scale();
+        int exponentByteCount = lenVarInt(scale);
+
+        // Exponent is always at least one byte.
+        if (exponentByteCount == 0) exponentByteCount = 1;
+
+        return exponentByteCount + mantissaByteCount;
+    }
+
+
+    /**
+     * this method computes the output length of this timestamp value
+     * in the Ion binary format.  It does not include the length of
+     * the typedesc byte that preceeds the actual value.  The output
+     * length of a null value is 0, as a result this this.
+     * @param di may be null
+     */
+    public static int lenIonTimestamp(Timestamp di)
+    {
+        if (di == null) return 0;
+
+        int len = 0;
+        switch (di.getPrecision()) {
+        case FRACTION:
+        case SECOND:
+        {
+            BigDecimal fraction = di.getFractionalSecond();
+            if (fraction != null)
+            {
+                assert fraction.signum() >=0 && ! fraction.equals(BigDecimal.ZERO)
+                    : "Bad timestamp fraction: " + fraction;
+
+                // Since the fraction is not 0d0, at least one subfield of the
+                // exponent and mantissa is non-zero, so this will always write at
+                // least one byte.
+                int fracLen = IonBinary.lenIonDecimal(fraction);
+                assert fracLen > 0;
+                len += fracLen;
+            }
+
+            len++; // len of seconds < 60
+        }
+        case MINUTE:
+            len += 2; // len of hour and minutes (both < 127)
+        case DAY:
+            len += 1; // len of month and day (both < 127)
+        case MONTH:
+            len += 1; // len of month and day (both < 127)
+        case YEAR:
+            len += IonBinary.lenVarUInt(di.getZYear());
+        }
+        Integer offset = di.getLocalOffset();
+        if (offset == null) {
+            len++; // room for the -0 (i.e. offset is "no specified offset")
+        }
+        else if (offset == 0) {
+            len++;
+        }
+        else {
+            len += IonBinary.lenVarInt(offset.longValue());
+        }
+        return len;
+    }
+
+    /**
+     * @param v may be null.
+     * @throws IllegalArgumentException if the text contains bad UTF-16 data.
+     */
+    public static int lenIonString(String v)
+    {
+        if (v == null) return 0;
+        int len = 0;
+
+        for (int ii=0; ii<v.length(); ii++) {
+            int c = v.charAt(ii);
+
+            // handle the cheap characters quickly
+            if (c < 128) {
+                len++;
+                continue;
+            }
+            // multi-byte utf8
+            if (c >= 0xD800 && c <= 0xDFFF) {
+                // look for surrogate pairs and merge them (and throw on bad data)
+                if (_Private_IonConstants.isHighSurrogate(c)) {
+                    ii++;
+                    if (ii >= v.length()) {
+                        String message =
+                            "Text ends with unmatched UTF-16 surrogate " +
+                            IonTextUtils.printCodePointAsString(c);
+                        throw new IllegalArgumentException(message);
+                    }
+                    int c2 = v.charAt(ii);
+                    if (!_Private_IonConstants.isLowSurrogate(c2)) {
+                        String message =
+                            "Text contains unmatched UTF-16 high surrogate " +
+                            IonTextUtils.printCodePointAsString(c) +
+                            " at index " + (ii-1);
+                        throw new IllegalArgumentException(message);
+                    }
+                    c = _Private_IonConstants.makeUnicodeScalar(c, c2);
+                }
+                else if (_Private_IonConstants.isLowSurrogate(c)) {
+                    String message =
+                        "Text contains unmatched UTF-16 low surrogate " +
+                        IonTextUtils.printCodePointAsString(c) +
+                        " at index " + ii;
+                    throw new IllegalArgumentException(message);
+                }
+            }
+            // no need to check the 0x10FFFF overflow as it is checked in lenUnicodeScalarAsUTF8
+
+            // and now figure out how long this "complicated" (non-ascii) character is
+            if (c < 0x80) {
+                ++len;
+            }
+            else if (c < 0x800) {
+                len += 2;
+            }
+            else if (c < 0x10000) {
+                len += 3;
+            }
+            else if (c <= 0x10FFFF) { // just about as cheap as & == 0 and checks for some out of range values
+                len += 4;
+            } else {
+                // TODO how is this possible?
+                throw new IllegalArgumentException("invalid string, illegal Unicode scalar (character) encountered");
+            }
+        }
+
+        return len;
+    }
+
+    public static int lenAnnotationListWithLen(String[] annotations,
+                                               SymbolTable symbolTable)
+    {
+        int annotationLen = 0;
+
+        if (annotations != null) {
+            // add up the length of the encoded symbols
+            for (int ii=0; ii<annotations.length; ii++) {
+                int symid = symbolTable.findSymbol(annotations[ii]);
+                assert symid > 0; // TODO amzn/ion-java/issues/12
+                annotationLen += IonBinary.lenVarUInt(symid);
+            }
+
+            // now the len of the list
+            annotationLen += IonBinary.lenVarUInt(annotationLen);
+        }
+        return annotationLen;
+    }
+
+    public static int lenAnnotationListWithLen(ArrayList<Integer> annotations)
+    {
+        int annotationLen = 0;
+
+        // add up the length of the encoded symbols
+        for (Integer ii : annotations) {
+            int symid = ii.intValue();
+            annotationLen += IonBinary.lenVarUInt(symid);
+        }
+
+        // now the len of the list
+        annotationLen += IonBinary.lenVarUInt(annotationLen);
+
+        return annotationLen;
+    }
+
+    public static int lenIonNullWithTypeDesc() {
+        return _ib_TOKEN_LEN;
+    }
+    public static int lenIonBooleanWithTypeDesc(Boolean v) {
+        return _ib_TOKEN_LEN;
+    }
+    public static int lenIonIntWithTypeDesc(Long v) {
+        int len = 0;
+        if (v != null) {
+            long vl = v.longValue();
+            int vlen = lenIonInt(vl);
+            len += vlen;
+            len += lenLenFieldWithOptionalNibble(vlen);
+        }
+        return len + _ib_TOKEN_LEN;
+    }
+    public static int lenIonFloatWithTypeDesc(Double v) {
+        int len = 0;
+        if (v != null) {
+            int vlen = lenIonFloat(v);
+            len += vlen;
+            len += lenLenFieldWithOptionalNibble(vlen);
+        }
+        return len + _ib_TOKEN_LEN;
+    }
+    public static int lenIonDecimalWithTypeDesc(BigDecimal v) {
+        int len = 0;
+        if (v != null) {
+            int vlen = lenIonDecimal(v);
+            len += vlen;
+            len += lenLenFieldWithOptionalNibble(vlen);
+        }
+        return len + _ib_TOKEN_LEN;
+    }
+    public static int lenIonTimestampWithTypeDesc(Timestamp di) {
+        int len = 0;
+        if (di != null) {
+            int vlen = IonBinary.lenIonTimestamp(di);
+            len += vlen;
+            len += lenLenFieldWithOptionalNibble(vlen);
+        }
+        return len + _ib_TOKEN_LEN;
+    }
+    public static int lenIonStringWithTypeDesc(String v) {
+        int len = 0;
+        if (v != null) {
+            int vlen = lenIonString(v);
+            if (vlen < 0) return -1;
+            len += vlen;
+            len += lenLenFieldWithOptionalNibble(vlen);
+        }
+        return len + _ib_TOKEN_LEN;
+    }
+    public static int lenIonClobWithTypeDesc(String v) {
+        return lenIonStringWithTypeDesc(v);
+    }
+    public static int lenIonBlobWithTypeDesc(byte[] v) {
+        int len = 0;
+        if (v != null) {
+            int vlen = v.length;
+            len += vlen;
+            len += lenLenFieldWithOptionalNibble(vlen);
+        }
+        return len + _ib_TOKEN_LEN;
+    }
+
+
+    /** Utility method to convert an unsigned magnitude stored as a long to a {@link BigInteger}. */
+    public static BigInteger unsignedLongToBigInteger(int signum, long val)
+    {
+        byte[] magnitude = {
+            (byte) ((val >> 56) & 0xFF),
+            (byte) ((val >> 48) & 0xFF),
+            (byte) ((val >> 40) & 0xFF),
+            (byte) ((val >> 32) & 0xFF),
+            (byte) ((val >> 24) & 0xFF),
+            (byte) ((val >> 16) & 0xFF),
+            (byte) ((val >>  8) & 0xFF),
+            (byte) (val & 0xFF),
+        };
+        return new BigInteger(signum, magnitude);
+    }
+
+    /**
+     * Uses {@link InputStream#read(byte[], int, int)} until the entire length is read.
+     * This method will block until the request is satisfied.
+     *
+     * @param in        The stream to read from.
+     * @param buf       The buffer to read to.
+     * @param offset    The offset of the buffer to read from.
+     * @param len       The length of the data to read.
+     */
+    public static void readAll(InputStream in, byte[] buf, int offset, int len) throws IOException
+    {
+        int rem = len;
+        while (rem > 0)
+        {
+            int amount = in.read(buf, offset, rem);
+            if (amount <= 0)
+            {
+                // try to throw a useful exception
+                if (in instanceof Reader)
+                {
+                    ((Reader) in).throwUnexpectedEOFException();
+                }
+                // defer to a plain exception
+                throw new IonException("Unexpected EOF");
+            }
+            rem -= amount;
+            offset += amount;
+        }
+    }
+
+    public static final class Reader
+        extends BlockedBuffer.BlockedByteInputStream
+    {
+        /**
+         * @param bb blocked buffer to read from
+         */
+        public Reader(BlockedBuffer bb)
+        {
+            super(bb);
+        }
+        /**
+         * @param bb blocked buffer to read from
+         * @param pos initial offset to read
+         */
+        public Reader(BlockedBuffer bb, int pos)
+        {
+            super(bb, pos);
+        }
+
+        /**
+         * return the underlying bytes as a single buffer
+         *
+         * @return bytes[]
+         * @throws IOException
+         * @throws UnexpectedEofException if end of file is hit.
+         * @throws IOException if there's other problems reading input.
+         */
+        public byte[] getBytes() throws IOException {
+            if (this._buf == null) return null;
+            this.sync();
+            this.setPosition(0);
+            int len = _buf.size();
+            byte[] buf = new byte[len];
+            if (readFully(this, buf) != len) {
+                throw new UnexpectedEofException();
+            }
+            return buf;
+        }
+
+
+        /**
+         * Read exactly one byte of input.
+         *
+         * @return 0x00 through 0xFF as a positive int.
+         * @throws UnexpectedEofException if end of file is hit.
+         * @throws IOException if there's other problems reading input.
+         */
+        public int readToken() throws UnexpectedEofException, IOException
+        {
+            int c = read();
+            if (c < 0) throwUnexpectedEOFException();
+            return c;
+        }
+
+        public int readActualTypeDesc() throws IOException
+        {
+            int c = read();
+            if (c < 0) throwUnexpectedEOFException();
+            int typeid = _Private_IonConstants.getTypeCode(c);
+            if (typeid == _Private_IonConstants.tidTypedecl) {
+                int lownibble = _Private_IonConstants.getLowNibble(c);
+                if (lownibble == 0) {
+                    // 0xE0 is the first byte of the IonVersionMarker
+                    // so we'll return it as is, the caller has to
+                    // verify the remaining bytes and handle them
+                    // appropriately - so here we do nothing
+                }
+                else {
+                    this.readLength(typeid, lownibble);
+                    int alen = this.readVarIntAsInt();
+                    // TODO add skip(int) method instead of this loop.
+                    while (alen > 0) {
+                        if (this.read() < 0) throwUnexpectedEOFException();
+                        alen--;
+                    }
+                    c = read();
+                    if (c < 0) throwUnexpectedEOFException();
+                }
+            }
+            return c;
+        }
+
+        public int[] readAnnotations() throws IOException
+        {
+            int[] annotations = null;
+
+            int annotationLen = this.readVarUIntAsInt();
+            int annotationPos = this.position(); // pos at the first ann sid
+            int annotationEnd = annotationPos + annotationLen;
+            int annotationCount = 0;
+
+            // first we read through and count
+            while(this.position() < annotationEnd) {
+                // read the annotation symbol id itself
+                // and for this first pass we just throw that
+                // value away, since we're just counting
+                this.readVarUIntAsInt();
+                annotationCount++;
+            }
+            if (annotationCount > 0) {
+                // then, if there are any there, we
+                // allocate the array, and re-read the sids
+                // look them up and fill in the array
+                annotations = new int[annotationCount];
+                int annotationIdx = 0;
+                this.setPosition(annotationPos);
+                while(this.position() < annotationEnd) {
+                    // read the annotation symbol id itself
+                    int sid = this.readVarUIntAsInt();
+                    annotations[annotationIdx++] = sid;
+                }
+            }
+
+            return annotations;
+        }
+
+
+        public int readLength(int td, int ln) throws IOException
+        {
+            // TODO check for invalid lownibbles
+            switch (td) {
+            case _Private_IonConstants.tidNull: // null(0)
+            case _Private_IonConstants.tidBoolean: // boolean(1)
+                return 0;
+            case _Private_IonConstants.tidPosInt: // 2
+            case _Private_IonConstants.tidNegInt: // 3
+            case _Private_IonConstants.tidFloat: // float(4)
+            case _Private_IonConstants.tidDecimal: // decimal(5)
+            case _Private_IonConstants.tidTimestamp: // timestamp(6)
+            case _Private_IonConstants.tidSymbol: // symbol(7)
+            case _Private_IonConstants.tidString: // string (8)
+            case _Private_IonConstants.tidClob: // clob(9)
+            case _Private_IonConstants.tidBlob: // blob(10)
+            case _Private_IonConstants.tidList:     // 11
+            case _Private_IonConstants.tidSexp:     // 12
+            case _Private_IonConstants.tidTypedecl: // 14
+                switch (ln) {
+                case 0:
+                case _Private_IonConstants.lnIsNullAtom:
+                    return 0;
+                case _Private_IonConstants.lnIsVarLen:
+                    return readVarUIntAsInt();
+                default:
+                    return ln;
+                }
+            case _Private_IonConstants.tidNopPad:   // 99
+                switch (ln) {
+                    case _Private_IonConstants.lnIsVarLen:
+                        return readVarUIntAsInt();
+                    default:
+                        return ln;
+                }
+            case _Private_IonConstants.tidStruct: // 13
+                switch (ln) {
+                case _Private_IonConstants.lnIsEmptyContainer:
+                case _Private_IonConstants.lnIsNullStruct:
+                    return 0;
+                case _Private_IonConstants.lnIsOrderedStruct:
+                case _Private_IonConstants.lnIsVarLen:
+                    return readVarUIntAsInt();
+                default:
+                    return ln;
+                }
+            case _Private_IonConstants.tidUnused: // unused(15)
+            default:
+                // TODO use InvalidBinaryDataException
+                throw new BlockedBuffer.BlockedBufferException("invalid type id encountered: " + td);
+            }
+        }
+
+        /*
+        public long readFixedIntLongValue(int len) throws IOException {
+            long retvalue = 0;
+            int b;
+
+            switch (len) {
+            case 8:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (7*8);
+            case 7:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (6*8);
+            case 6:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (5*8);
+            case 5:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (4*8);
+            case 4:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (3*8);
+            case 3:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (2*8);
+            case 2:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (1*8);
+            case 1:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (0*8);
+            }
+            return retvalue;
+        }
+        public int readFixedIntIntValue(int len) throws IOException {
+            int retvalue = 0;
+            int b;
+
+            switch (len) {
+            case 4:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (3*8);
+            case 3:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (2*8);
+            case 2:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (1*8);
+            case 1:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue |= b << (0*8);
+            }
+            return retvalue;
+        }
+        */
+        public long readIntAsLong(int len) throws IOException {
+            long    retvalue = 0;
+            boolean is_negative = false;
+            int     b;
+
+            if (len > 0) {
+                // read the first byte
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (b & 0x7F);
+                is_negative = ((b & 0x80) != 0);
+
+                switch (len - 1) {  // we read 1 already
+                case 8: // even after reading the 1st byte we may have 8 remaining
+                        // bytes of value when the value is Long.MIN_VALUE since it
+                        // has all 8 bytes for data and the ninth for the sign bit
+                        // all by itself (which we read above)
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    retvalue = (retvalue << 8) | b;
+                case 7:
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    retvalue = (retvalue << 8) | b;
+                case 6:
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    retvalue = (retvalue << 8) | b;
+                case 5:
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    retvalue = (retvalue << 8) | b;
+                case 4:
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    retvalue = (retvalue << 8) | b;
+                case 3:
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    retvalue = (retvalue << 8) | b;
+                case 2:
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    retvalue = (retvalue << 8) | b;
+                case 1:
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    retvalue = (retvalue << 8) | b;
+                default:
+                }
+                if (is_negative) {
+                    // this is correct even when retvalue == Long.MIN_VALUE
+                    retvalue = -retvalue;
+                }
+            }
+            return retvalue;
+        }
+        /** @throws IOException
+         * @deprecated */
+        @Deprecated
+        public int readIntAsInt(int len) throws IOException {
+            int retvalue = 0;
+            boolean is_negative = false;
+            int b;
+
+            if (len > 0) {
+                // read the first byte
+                b = read();
+                if (b < 0) throwUnexpectedEOFException();
+                retvalue = (b & 0x7F);
+                is_negative = ((b & 0x80) != 0);
+
+                switch (len - 1) {  // we read 1 already
+                case 7:
+                case 6:
+                case 5:
+                case 4:
+                    throw new IonException("overflow attempt to read long value into an int");
+                case 3:
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    retvalue = (retvalue << 8) | b;
+                case 2:
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    retvalue = (retvalue << 8) | b;
+
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    retvalue = (retvalue << 8) | b;
+                }
+                if (is_negative) {
+                    // this is correct even when retvalue == Integer.MIN_VALUE
+                    retvalue = -retvalue;
+                }
+            }
+            return retvalue;
+        }
+
+        /**
+         * Reads the specified magnitude as a {@link BigInteger}.
+         *
+         * @param len           The length of the UInt octets to read.
+         * @param signum        The sign as per {@link BigInteger#BigInteger(int, byte[])}.
+         * @return              The signed {@link BigInteger}.
+         *
+         * @throws IOException  Thrown if there are an I/O errors on the underlying stream.
+         */
+        public BigInteger readUIntAsBigInteger(int len, int signum) throws IOException {
+            byte[] magnitude = new byte[len];
+            for (int i = 0; i < len; i++) {
+                int octet = read();
+                if (octet < 0) {
+                    throwUnexpectedEOFException();
+                }
+                magnitude[i] = (byte) octet;
+            }
+
+            // both BigInteger and ion store this magnitude as big-endian
+            return new BigInteger(signum, magnitude);
+        }
+
+        public long readUIntAsLong(int len) throws IOException {
+            long    retvalue = 0;
+            int b;
+
+            switch (len) {
+            default:
+                throw new IonException("overflow attempt to read long value into an int");
+            case 8:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 7:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 6:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 5:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 4:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 3:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 2:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 1:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 0:
+            }
+            return retvalue;
+        }
+        public int readUIntAsInt(int len) throws IOException {
+            int retvalue = 0;
+            int b;
+
+            switch (len) {
+            default:
+                throw new IonException("overflow attempt to read long value into an int");
+            case 4:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = b;
+            case 3:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 2:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 1:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 0:
+            }
+            return retvalue;
+        }
+        public long readVarUIntAsLong() throws IOException {
+            long retvalue = 0;
+            int  b;
+
+            for (;;) {
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                if ((retvalue & 0xFE00000000000000L) != 0) {
+                    // if any of the top 7 bits are set at this point there's
+                    // a problem, because we'll be shifting the into oblivian
+                    // just below, so ...
+                    throw new IonException("overflow attempt to read long value into a long");
+                }
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+            }
+            return retvalue;
+        }
+        public int readVarUIntAsInt() throws IOException {
+            int retvalue = 0;
+            int  b;
+
+            for (;;) { // fake loop to create a "goto done"
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+
+                // if we get here we have more bits than we have room for :(
+                throw new IonException("var int overflow at: "+this.position());
+            }
+            return retvalue;
+        }
+        public long readVarIntAsLong() throws IOException
+        {
+            long    retvalue = 0;
+            boolean is_negative = false;
+            int     b;
+
+            // synthetic label "done" (yuck)
+done:       for (;;) {
+                // read the first byte - it has the sign bit
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                if ((b & 0x40) != 0) {
+                    is_negative = true;
+                }
+                retvalue = (b & 0x3F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the second byte we shift our eariler bits just as much,
+                // but there are fewer of them there to shift
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                for (;;) {
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    if ((retvalue & 0xFE00000000000000L) != 0) {
+                        // if any of the top 7 bits are set at this point there's
+                        // a problem, because we'll be shifting the into oblivian
+                        // just below, so ...
+                        throw new IonException("overflow attempt to read long value into a long");
+                    }
+                    retvalue = (retvalue << 7) | (b & 0x7F);
+                    if ((b & 0x80) != 0) break done;
+                }
+            }
+            if (is_negative) {
+                // this is correct even when retvalue == Long.MIN_VALUE
+                retvalue = -retvalue;
+            }
+            return retvalue;
+        }
+        public int readVarIntAsInt() throws IOException
+        {
+            int     retvalue = 0;
+            boolean is_negative = false;
+            int     b;
+
+            // synthetic label "done" (yuck)
+done:       for (;;) {
+                // read the first byte - it has the sign bit
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                if ((b & 0x40) != 0) {
+                    is_negative = true;
+                }
+                retvalue = (b & 0x3F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the second byte we shift our eariler bits just as much,
+                // but there are fewer of them there to shift
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // if we get here we have more bits than we have room for :(
+                throw new IonException("var int overflow at: "+this.position());
+            }
+            if (is_negative) {
+                // this is correct even when retvalue == Integer.MIN_VALUE
+                retvalue = -retvalue;
+            }
+            return retvalue;
+        }
+
+        /**
+         * Reads an integer value, returning null to mean -0.
+         * @throws IOException
+         */
+        public Integer readVarIntWithNegativeZero() throws IOException
+        {
+            int     retvalue = 0;
+            boolean is_negative = false;
+            int     b;
+
+            // sythetic label "done" (yuck)
+done:       for (;;) {
+                // read the first byte - it has the sign bit
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                if ((b & 0x40) != 0) {
+                    is_negative = true;
+                }
+                retvalue = (b & 0x3F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the second byte we shift our eariler bits just as much,
+                // but there are fewer of them there to shift
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // if we get here we have more bits than we have room for :(
+                throw new IonException("var int overflow at: "+this.position());
+            }
+
+            Integer retInteger = null;
+            if (is_negative) {
+                if (retvalue != 0) {
+                    // this is correct even when retvalue == Long.MIN_VALUE
+                    retvalue = -retvalue;
+                    retInteger = new Integer(retvalue);
+                }
+            }
+            else {
+                retInteger = new Integer(retvalue);
+            }
+            return retInteger;
+        }
+
+        public double readFloatValue(int len) throws IOException
+        {
+            if (len == 0)
+            {
+                // special case, return pos zero
+                return 0.0d;
+            }
+
+            if (len != 8)
+            {
+                throw new IonException("Length of float read must be 0 or 8");
+            }
+
+            long dBits = readUIntAsLong(len);
+            return Double.longBitsToDouble(dBits);
+        }
+
+
+        /**
+         * Near clone of {@link SimpleByteBuffer.SimpleByteReader#readDecimal(int)}
+         * and {@link IonReaderBinaryRawX#readDecimal(int)}
+         * so keep them in sync!
+         */
+        public Decimal readDecimalValue(int len) throws IOException
+        {
+            MathContext mathContext = MathContext.UNLIMITED;
+
+            Decimal bd;
+
+            // we only write out the '0' value as the nibble 0
+            if (len == 0) {
+                bd = Decimal.valueOf(0, mathContext);
+            }
+            else {
+                // otherwise we to it the hard way ....
+                int         startpos = this.position();
+                int         exponent = this.readVarIntAsInt();
+                int         bitlen = len - (this.position() - startpos);
+
+                BigInteger value;
+                int        signum;
+                if (bitlen > 0)
+                {
+                    byte[] bits = new byte[bitlen];
+                    readAll(this, bits, 0, bitlen);
+
+                    signum = 1;
+                    if (bits[0] < 0)
+                    {
+                        // value is negative, clear the sign
+                        bits[0] &= 0x7F;
+                        signum = -1;
+                    }
+                    value = new BigInteger(signum, bits);
+                }
+                else {
+                    signum = 0;
+                    value = BigInteger.ZERO;
+                }
+
+                // Ion stores exponent, BigDecimal uses the negation "scale"
+                int scale = -exponent;
+                if (value.signum() == 0 && signum == -1)
+                {
+                    assert value.equals(BigInteger.ZERO);
+                    bd = Decimal.negativeZero(scale, mathContext);
+                }
+                else
+                {
+                    bd = Decimal.valueOf(value, scale, mathContext);
+                }
+            }
+
+            return bd;
+        }
+
+        /**
+         * @see IonReaderBinaryRawX#readTimestamp
+         */
+        public Timestamp readTimestampValue(int len) throws IOException
+        {
+            if (len < 1) {
+                // nothing to do here - and the timestamp will be NULL
+                return null;
+            }
+
+            int        year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0;
+            Decimal    frac = null;
+            int        end = this.position() + len;
+
+            // first up is the offset, which requires a special int reader
+            // to return the -0 as a null Integer
+            Integer offset = this.readVarIntWithNegativeZero();
+
+            // now we'll read the struct values from the input stream
+
+            // year is from 0001 to 9999
+            // or 0x1 to 0x270F or 14 bits - 1 or 2 bytes
+            year  = readVarUIntAsInt();
+            Precision p = Precision.YEAR; // our lowest significant option
+
+            if (position() < end) {
+                month = readVarUIntAsInt();
+                p = Precision.MONTH; // our lowest significant option
+
+                if (position() < end) {
+                    day   = readVarUIntAsInt();
+                    p = Precision.DAY; // our lowest significant option
+
+                    // now we look for hours and minutes
+                    if (position() < end) {
+                        hour   = readVarUIntAsInt();
+                        minute = readVarUIntAsInt();
+                        p = Precision.MINUTE;
+
+                        if (position() < end) {
+                            second = readVarUIntAsInt();
+                            p = Precision.SECOND;
+
+                            int remaining = end - position();
+                            if (remaining > 0) {
+                                // now we read in our actual "milliseconds since the epoch"
+                                frac = this.readDecimalValue(remaining);
+                            }
+                        }
+                    }
+                }
+            }
+
+            // now we let timestamp put it all together
+            try {
+                Timestamp val =
+                    Timestamp.createFromUtcFields(p, year, month, day,
+                                                  hour, minute, second,
+                                                  frac, offset);
+                return val;
+            }
+            catch (IllegalArgumentException e) {
+                throw new IonException(e.getMessage() + " at: " + position());
+            }
+        }
+
+        public String readString(int len) throws IOException
+        {
+            char[] cb = new char[len]; // since we know the length in bytes (which must be
+                                    // greater than or equal to chars) there's no need
+                                    // for a stringbuffer (even surrgated char's are ok)
+            int ii=0;
+            int c;
+            int endPosition = this.position() + len;
+
+            while (this.position() < endPosition) {
+                c = readUnicodeScalar();
+                if (c < 0) throwUnexpectedEOFException();
+                //sb.append((char)c);
+                if (c < 0x10000) {
+                    cb[ii++] = (char)c;
+                }
+                else {
+                    cb[ii++] = (char)_Private_IonConstants.makeHighSurrogate(c);
+                    cb[ii++] = (char)_Private_IonConstants.makeLowSurrogate(c);
+                }
+            }
+
+            if (this.position() < endPosition) throwUnexpectedEOFException();
+
+            return new String(cb, 0, ii); // sb.toString();
+        }
+        public int readUnicodeScalar() throws IOException {
+            int c = -1, b;
+
+            b = read();
+            if (b < 0) return -1;
+
+            // ascii is all good
+            if ((b & 0x80) == 0) {
+                return b;
+            }
+
+            // now we start gluing the multi-byte value together
+            if ((b & 0xe0) == 0xc0) {
+                // for values from 0x80 to 0x7FF (all legal)
+                c = (b & ~0xe0);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+            }
+            else if ((b & 0xf0) == 0xe0) {
+                // for values from 0x800 to 0xFFFFF (NOT all legal)
+                c = (b & ~0xf0);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+                if (c > 0x00D7FF && c < 0x00E000) {
+                    throw new IonException("illegal surrgate value encountered in input utf-8 stream");
+                }
+            }
+            else if ((b & 0xf8) == 0xf0) {
+                // for values from 0x010000 to 0x1FFFFF (NOT all legal)
+                c = (b & ~0xf8);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+                if (c > 0x10FFFF) {
+                    throw new IonException("illegal surrgate value encountered in input utf-8 stream");
+                }
+            }
+            else {
+                throwUTF8Exception();
+            }
+            return c;
+        }
+        void throwUTF8Exception()
+        {
+            throw new IonException("Invalid UTF-8 character encounter in a string at pos " + this.position());
+        }
+        void throwUnexpectedEOFException() {
+            throw new BlockedBuffer.BlockedBufferException("unexpected EOF in value at offset " + this.position());
+        }
+
+        public String readString() throws IOException {
+            int td = read();
+            if (_Private_IonConstants.getTypeCode(td) != _Private_IonConstants.tidString) {
+                throw new IonException("readString helper only works for string(7) not "+((td >> 4 & 0xf)));
+            }
+            int len = (td & 0xf);
+            if (len == _Private_IonConstants.lnIsNullAtom) {
+                return null;
+            }
+            else if (len == _Private_IonConstants.lnIsVarLen) {
+                len = this.readVarUIntAsInt();
+            }
+            return readString(len);
+        }
+
+        /**
+         * Skips through a NOP pad if there is one. Must be called at the beginning of type description
+         *
+         * It's no-op if there is no Nop pad to skip through at the current position
+         *
+         * @return true if it skipped through a nop pad
+         */
+        boolean skipThroughNopPad() throws IOException
+        {
+            int originalPosition = this._pos;
+
+            // check to see if there is a type declaration as it's not valid to annotate nop pads
+            int c = this.read();
+            boolean hasTypedecl = _Private_IonConstants.getTypeCode(c) == _Private_IonConstants.tidTypedecl;
+            this.setPosition(originalPosition);
+
+            int typeDesc = this.readActualTypeDesc();
+            int tid = _Private_IonConstants.getTypeCode(typeDesc);
+            int len = _Private_IonConstants.getLowNibble(typeDesc);
+
+            if(tid == _Private_IonConstants.tidNull && len != _Private_IonConstants.lnIsNull){
+                if(hasTypedecl) {
+                    throw new IonException("NOP padding is not allowed within annotation wrappers.");
+                }
+
+                int toSkip = this.readLength(_Private_IonConstants.tidNopPad, len);
+                long skipped = this.skip(toSkip);
+                if(toSkip > 0 && toSkip != skipped) {
+                    throw new IonException("Nop pad too short declared length: " + toSkip + " pad actual size: " + skipped);
+                }
+
+                return true;
+            }
+
+            // resets the reader if it wasn't a NOP pad
+            this.setPosition(originalPosition);
+
+            return false;
+        }
+    }
+
+    public static final class Writer
+        extends BlockedBuffer.BlockedByteOutputStream
+    {
+        /**
+         * creates writable stream (OutputStream) that writes
+         * to a fresh blocked buffer.  The stream is initially
+         * position at offset 0.
+         */
+        public Writer() { super(); }
+        /**
+         * creates writable stream (OutputStream) that writes
+         * to the supplied byte buffer.  The stream is initially
+         * position at offset 0.
+         * @param bb blocked buffer to write to
+         */
+        public Writer(BlockedBuffer bb) { super(bb); }
+        /**
+         * creates writable stream (OutputStream) that can write
+         * to the supplied byte buffer.  The stream is initially
+         * position at offset off.
+         * @param bb blocked buffer to write to
+         * @param off initial offset to write to
+         */
+        public Writer(BlockedBuffer bb, int off) { super(bb, off); }
+
+        Stack<PositionMarker> _pos_stack;
+        Stack<Integer>        _pending_high_surrogate_stack;
+        int                   _pending_high_surrogate;
+        public void pushPosition(Object o)
+        {
+            PositionMarker pm = new PositionMarker(this.position(), o);
+            if (_pos_stack == null) {
+                _pos_stack = new Stack<PositionMarker>();
+                _pending_high_surrogate_stack = new Stack<Integer>();
+            }
+            _pos_stack.push(pm);
+            _pending_high_surrogate_stack.push(_pending_high_surrogate);
+            _pending_high_surrogate = 0;
+        }
+        public PositionMarker popPosition()
+        {
+            if (_pending_high_surrogate != 0) {
+                throw new IonException("unmatched high surrogate encountered in input, illegal utf-16 character sequence");
+            }
+            PositionMarker pm = _pos_stack.pop();
+            _pending_high_surrogate = _pending_high_surrogate_stack.pop();
+            return pm;
+        }
+
+        /*****************************************************************************
+        *
+        * These routines work together to write very long values from an input
+        * reader where we don't know how long the value is going to be in advance.
+        *
+        * Basically it tries to write a short value (len <= BB_SHORT_LEN_MAX) and if
+        * that fails it moves the data around in the buffers and moves buffers worth
+        * of data at a time.
+        *
+        */
+        static class lhNode
+        {
+           int     _hn;
+           int     _lownibble;
+           boolean _length_follows;
+
+           lhNode(int hn
+                 ,int lownibble
+                 ,boolean length_follows
+           ) {
+               _hn = hn;
+               _lownibble = lownibble;
+               _length_follows = length_follows;
+           }
+        }
+
+        public void startLongWrite(int hn) throws IOException
+        {
+            if (debugValidation) _validate();
+
+            pushLongHeader(hn, 0, false);
+
+            this.writeCommonHeader(hn, 0);
+
+            if (debugValidation) _validate();
+        }
+
+        public void pushLongHeader(int  hn
+                                  ,int lownibble
+                                  ,boolean length_follows
+        ) {
+           lhNode n = new lhNode(hn, lownibble, length_follows);
+           pushPosition(n);
+        }
+
+
+        /**
+         * Update the TD/LEN header of a value.
+         *
+         * @param hn high nibble value (or type id)
+         * @param lownibble is the low nibble value.
+         * If -1, then the low nibble is pulled from the header node pushed
+         * previously.  If the header node had lengthFollows==false then this
+         * is ignored and the LN is computed from what was actually written.
+         */
+        public void patchLongHeader(int hn, int lownibble) throws IOException
+        {
+           int currpos = this.position();
+
+           if (debugValidation) _validate();
+
+           // get the header description we pushed on the stack a while ago
+           // pop also checks to make sure we don't have a dangling high
+           // surrogate pending
+           PositionMarker pm = this.popPosition();
+           lhNode n = (lhNode)pm.getUserData();
+           int totallen = currpos - pm.getPosition();
+
+           // fix up the low nibble if we need to
+           if (lownibble == -1) {
+               lownibble = n._lownibble;
+           }
+
+           // calculate the length just the value itself
+           // we don't count the type descriptor in the value len
+           int writtenValueLen = totallen - _Private_IonConstants.BB_TOKEN_LEN;
+
+           // now we can figure out how long the value is going to be
+
+           // This is the length of the length (it does NOT
+           // count the typedesc byte however)
+           int len_o_len = IonBinary.lenVarUInt(writtenValueLen);
+
+           // TODO cleanup this logic.  lengthFollows == is struct
+           if (n._length_follows) {
+               assert hn == _Private_IonConstants.tidStruct;
+
+               if (lownibble == _Private_IonConstants.lnIsOrderedStruct)
+               {
+                   // leave len_o_len alone
+               }
+               else
+               {
+                   if (writtenValueLen < _Private_IonConstants.lnIsVarLen) {
+                       lownibble = writtenValueLen;
+                       len_o_len = 0;
+                   }
+                   else {
+                       lownibble = _Private_IonConstants.lnIsVarLen;
+                   }
+                   assert lownibble != _Private_IonConstants.lnIsOrderedStruct;
+               }
+           }
+           else {
+               if (writtenValueLen < _Private_IonConstants.lnIsVarLen) {
+                   lownibble = writtenValueLen;
+                   len_o_len = 0;
+               }
+               else {
+                   lownibble = _Private_IonConstants.lnIsVarLen;
+               }
+           }
+
+           // first we go back to the beginning
+           this.setPosition(pm.getPosition());
+
+           // figure out if we need to move the trailing data to make
+           // room for the variable length length
+           int needed = len_o_len;
+           if (needed > 0) {
+               // insert does the heavy lifting of making room for us
+               // at the current position for "needed" additional bytes
+               insert(needed);
+           }
+
+           // so, we have room (or already had enough) now we can write
+           // replacement type descriptor and the length and the reset the pos
+           this.writeByte(_Private_IonConstants.makeTypeDescriptor(hn, lownibble));
+           if (len_o_len > 0) {
+               this.writeVarUIntValue(writtenValueLen, true);
+           }
+
+           if (needed < 0) {
+               // in the unlikely event we wrote more than we needed, now
+               // is the time to remove it.  (which does happen from time to time)
+               this.remove(-needed);
+           }
+
+           // return the cursor to it's correct location,
+           // taking into account the added length data
+           this.setPosition(currpos + needed);
+
+           if (debugValidation) _validate();
+
+        }
+
+        // TODO - this may have problems with unicode utf16/utf8 conversions
+        // note that this reads characters that have already had the escape
+        // sequence processed (so we don't want to do that a second time)
+        // the chars here were filled by the IonTokenReader which already
+        // de-escaped the escaped sequences from the input, so all chars are "real"
+        public void appendToLongValue(CharSequence chars, boolean onlyByteSizedCharacters) throws IOException
+        {
+            if (debugValidation) _validate();
+
+            int len = chars.length(); // TODO is this ever >0 for clob?
+
+            for (int ii = 0; ii < len; ii++)
+            {
+                int c = chars.charAt(ii);
+                if (onlyByteSizedCharacters) {
+                    if (c > 255) {
+                        throw new IonException("escaped character value too large in clob (0 to 255 only)");
+                    }
+                    write((byte)(0xff & c));
+                }
+                else {
+                    if (_pending_high_surrogate != 0) {
+                        if ((c & _Private_IonConstants.surrogate_mask) != _Private_IonConstants.low_surrogate_value) {
+                            throw new IonException("unmatched high surrogate character encountered, invalid utf-16");
+                        }
+                        c = _Private_IonConstants.makeUnicodeScalar(_pending_high_surrogate, c);
+                        _pending_high_surrogate = 0;
+                    }
+                    else if ((c & _Private_IonConstants.surrogate_mask) == _Private_IonConstants.high_surrogate_value) {
+                        ii++;
+                        if (ii >= len) {
+                            // a trailing high surrogate, we just remember it for later
+                            // and (hopefully, and usually, the low surrogate will be
+                            // appended shortly
+                            _pending_high_surrogate = c;
+                            break;
+                        }
+                        int c2 = chars.charAt(ii);
+                        if ((c2 & _Private_IonConstants.surrogate_mask) != _Private_IonConstants.low_surrogate_value) {
+                            throw new IonException("unmatched high surrogate character encountered, invalid utf-16");
+                    }
+                        c = _Private_IonConstants.makeUnicodeScalar(c, c2);
+                    }
+                    else if ((c & _Private_IonConstants.surrogate_mask) == _Private_IonConstants.low_surrogate_value) {
+                        throw new IonException("unmatched low surrogate character encountered, invalid utf-16");
+                    }
+                    writeUnicodeScalarAsUTF8(c);
+                }
+            }
+
+            if (debugValidation) _validate();
+        }
+
+        // helper for appendToLongValue below - this never cares about surrogates
+        // as it only consumes terminators which are ascii
+        final boolean isLongTerminator(int terminator, PushbackReader r) throws IOException {
+            int c;
+
+            // look for terminator 2 - if it's not there put back what we saw
+            c = r.read();
+            if (c != terminator) {
+                r.unread(c);
+                return false;
+            }
+
+            // look for terminator 3 - otherwise put back what we saw and the
+            // preceeding terminator we found above
+            c = r.read();
+            if (c != terminator) {
+                r.unread(c);
+                r.unread(terminator);
+                return false;
+            }
+            // we found 3 in a row - now that's a long terminator
+            return true;
+        }
+
+        /**
+        * Reads the remainder of a quoted string/symbol into this buffer.
+        * The closing quotes are consumed from the reader.
+        * <p>
+        * XXX  WARNING  XXX
+        * Almost identical logic is found in
+        * {@link IonTokenReader#finishScanString(boolean)}
+        *
+        * @param terminator the closing quote character.
+        * @param longstring
+        * @param r
+        * @throws IOException
+        */
+        public void appendToLongValue(int terminator
+                                     ,boolean longstring
+                                     ,boolean onlyByteSizedCharacters
+                                     ,boolean decodeEscapeSequences
+                                     ,PushbackReader r
+                                     )
+           throws IOException, UnexpectedEofException
+        {
+            int c;
+
+            if (debugValidation) {
+                if (terminator == -1 && longstring) {
+                    throw new IllegalStateException("longstrings have to have a terminator, no eof termination");
+                }
+                _validate();
+            }
+
+            assert(terminator != '\\');
+            for (;;) {
+                c = r.read();  // we put off the surrogate logic as long as possible (so not here)
+
+                if (c == terminator) {
+                    if (!longstring || isLongTerminator(terminator, r)) {
+                        // if it's not a long string one quote is enough otherwise look ahead
+                        break;
+                    }
+                }
+                else if (c == -1) {
+                    throw new UnexpectedEofException();
+                }
+                else if (c == '\n' || c == '\r') {
+                    // here we'll handle embedded new line detection and escaped characters
+                    if ((terminator != -1) && !longstring) {
+                        throw new IonException("unexpected line terminator encountered in quoted string");
+                    }
+                        }
+                else if (decodeEscapeSequences && c == '\\') {
+                    // if this is an escape sequence we need to process it now
+                    // since we allow a surrogate to be encoded using \ u (or \ U)
+                    // encoding
+                    c = IonTokenReader.readEscapedCharacter(r, onlyByteSizedCharacters);
+                    if (c == IonTokenReader.EMPTY_ESCAPE_SEQUENCE) {
+                        continue;
+                    }
+                }
+
+                if (onlyByteSizedCharacters) {
+                    assert(_pending_high_surrogate == 0); // if it's byte sized only, then we shouldn't have a dangling surrogate
+                    if ((c & (~0xff)) != 0) {
+                        throw new IonException("escaped character value too large in clob (0 to 255 only)");
+                    }
+                    write((byte)(0xff & c));
+                }
+                else {
+                    // for larger characters we have to glue together surrogates, regardless
+                    // of how they were encoded.  If we have a high surrogate and go to peek
+                    // for the low surrogate and hit the end of a segment of a long string
+                    // (triple quoted multi-line string) we leave a dangling high surrogate
+                    // that will get picked up on the next call into this routine when the
+                    // next segment of the long string is processed
+                    if (_pending_high_surrogate != 0) {
+                        if ((c & _Private_IonConstants.surrogate_mask) != _Private_IonConstants.low_surrogate_value) {
+                            String message =
+                                "Text contains unmatched UTF-16 high surrogate " +
+                                IonTextUtils.printCodePointAsString(_pending_high_surrogate);
+                            throw new IonException(message);
+                        }
+                        c = _Private_IonConstants.makeUnicodeScalar(_pending_high_surrogate, c);
+                        _pending_high_surrogate = 0;
+                    }
+                    else if ((c & _Private_IonConstants.surrogate_mask) == _Private_IonConstants.high_surrogate_value) {
+                        int c2 = r.read();
+                        if (c2 == terminator) {
+                            if (longstring && isLongTerminator(terminator, r)) {
+                                // if it's a long string termination we'll hang onto the current c as the pending surrogate
+                                _pending_high_surrogate = c;
+                                c = terminator;
+                                break;
+                            }
+                            // otherwise this is an error
+                            String message =
+                                "Text contains unmatched UTF-16 high surrogate " +
+                                IonTextUtils.printCodePointAsString(c);
+                            throw new IonException(message);
+                        }
+                        else if (c2 == -1) {
+                            // eof is also an error - really two errors
+                            throw new UnexpectedEofException();
+                        }
+                        //here we convert escape sequences into characters and continue until
+                        //we encounter a non-newline escape (typically immediately)
+                        while (decodeEscapeSequences && c2 == '\\') {
+                            c2 = IonTokenReader.readEscapedCharacter(r, onlyByteSizedCharacters);
+                            if (c2 != IonTokenReader.EMPTY_ESCAPE_SEQUENCE) break;
+                            c2 = r.read();
+                            if (c2 == terminator) {
+                                if (longstring && isLongTerminator(terminator, r)) {
+                                    // if it's a long string termination we'll hang onto the current c as the pending surrogate
+                                    _pending_high_surrogate = c;
+                                    c = c2; // we'll be checking this below
+                                    break;
+                                }
+                                // otherwise this is an error
+                                String message =
+                                    "Text contains unmatched UTF-16 high surrogate " +
+                                    IonTextUtils.printCodePointAsString(c);
+                                throw new IonException(message);
+                            }
+                            else if (c2 == -1) {
+                                // eof is also an error - really two errors
+                                throw new UnexpectedEofException();
+                            }
+                        }
+                        // check to see how we broke our of the while loop above, we may be "done"
+                        if (_pending_high_surrogate != 0) {
+                            break;
+                        }
+
+                        if ((c2 & _Private_IonConstants.surrogate_mask) != _Private_IonConstants.low_surrogate_value) {
+                            String message =
+                                "Text contains unmatched UTF-16 high surrogate " +
+                                IonTextUtils.printCodePointAsString(c);
+                            throw new IonException(message);
+                        }
+                        c = _Private_IonConstants.makeUnicodeScalar(c, c2);
+                    }
+                    else if ((c & _Private_IonConstants.surrogate_mask) == _Private_IonConstants.low_surrogate_value) {
+                        String message =
+                            "Text contains unmatched UTF-16 low surrogate " +
+                            IonTextUtils.printCodePointAsString(c);
+                        throw new IonException(message);
+                    }
+                    writeUnicodeScalarAsUTF8(c);
+                }
+            }
+
+            if (c != terminator) {
+                // TODO determine if this can really happen.
+                throw new UnexpectedEofException();
+            }
+            if (debugValidation) _validate();
+
+            return;
+        }
+
+
+        /*
+         * this is a set of routines that put data into an Ion buffer
+         * using the various type encodeing techniques
+         *
+         * these are the "high" level write routines (and read as well,
+         * in the fullness of time)
+         *
+         *
+         * methods with names of the form:
+         *     void write<type>Value( value ... )
+         * only write the value portion of the data
+         *
+         * methods with name like:
+         *     int(len) write<type>WithLength( ... value ... )
+         * write the trailing length and the value they return the
+         * length written in case it is less than BB_SHORT_LEN_MAX (13)
+         * so that the caller can backpatch the type descriptor if they
+         * need to
+         *
+         * methods with names of the form:
+         *     void write<type>( nibble, ..., value )
+         * write the type descriptor the length if needed and the value
+         *
+         * methods with a name like:
+         *     int <type>ValueLength( ... )
+         * return the number of bytes that will be needed to write
+         * the value out
+         *
+         */
+
+
+        /**
+         * Buffer for decoding (un)signed VarInt's and Int's
+         */
+        private byte[] numberBuffer = new byte[10];
+
+        public int writeVarUIntValue(long value, boolean force_zero_write) throws IOException
+        {
+            assert value >= 0;
+            int len = 0;
+            if (value == 0) {
+                if (force_zero_write) {
+                    write((byte)0x80);
+                    len = 1;
+                }
+            } else {
+                int i = numberBuffer.length;
+                // write every 7 bits of the value
+                while (value > 0) {
+                    numberBuffer[--i] = (byte)(value & 0x7f);
+                    value = value >>> 7;
+                }
+                // set the end bit
+                numberBuffer[numberBuffer.length - 1] |= 0x80;
+                len = numberBuffer.length - i;
+                write(numberBuffer, i, len);
+            }
+            return len;
+        }
+
+        /**
+         * Writes a uint field of maximum length 8.
+         * Note that this will write from the lowest to highest
+         * order bits in the long value given.
+         */
+        public int writeUIntValue(long value) throws IOException
+        {
+            int i = numberBuffer.length;
+            // even if value is Long.MIN_VALUE we will still serialize it correctly :)
+            while (value != 0) {
+                numberBuffer[--i] = (byte)(value & 0xff);
+                value = value >>> 8;
+            }
+            int len = numberBuffer.length - i;
+            write(numberBuffer, i, len);
+            return len;
+        }
+
+        /**
+         * Writes a uint field at given length
+         * Note that this will write from the lowest to highest
+         * order bits in the long value given.
+         */
+        public int writeUIntValue(long value, int len) throws IOException
+        {
+            int i = numberBuffer.length;
+            for (int j = 0; j < len; ++j) {
+                numberBuffer[--i] = (byte)(value & 0xff);
+                value = value >>> 8;
+            }
+            write(numberBuffer, i, len);
+            return len;
+        }
+
+        /**
+         * Writes a uint field of arbitary length.  It does
+         * check the value to see if a simpler routine can
+         * handle the work;
+         * Note that this will write from the lowest to highest
+         * order bits in the long value given.
+         */
+        public int writeUIntValue(BigInteger value, int len) throws IOException
+        {
+            int returnlen = 0;
+            int signum = value.signum();
+
+            if (signum == 0) {
+                // Zero has no bytes of data at all!  Nothing to write.
+            }
+            else if (signum < 0) {
+                throw new IllegalArgumentException("value must be greater than or equal to 0");
+            }
+            else if (value.compareTo(MAX_LONG_VALUE) == -1) {
+                long lvalue = value.longValue();
+                returnlen = writeUIntValue(lvalue, len);
+            }
+            else {
+                assert(signum > 0);
+                byte[] bits = value.toByteArray();
+                // BigInteger will pad this with a null byte sometimes
+                // for negative numbers...let's skip past any leading null bytes
+                int offset = 0;
+                while (offset < bits.length && bits[offset] == 0) {
+                    offset++;
+                }
+                int bitlen = bits.length - offset;
+                this.write(bits, offset, bitlen);
+                returnlen += bitlen;
+            }
+            assert(returnlen == len);
+            return len;
+        }
+
+
+        public int writeVarIntValue(long value, boolean force_zero_write) throws IOException
+        {
+            int len = 0;
+            if (value == 0) {
+                if (force_zero_write) {
+                    write((byte)0x80);
+                    len = 1;
+                }
+            } else {
+                int i = numberBuffer.length;
+                boolean negative = value < 0;
+                if (negative) {
+                    value = -value;
+                }
+                // write every 7 bits of the value
+                while (value > 0) {
+                    numberBuffer[--i] = (byte)(value & 0x7f);
+                    value = value >>> 7;
+                }
+                // set the end bit
+                numberBuffer[numberBuffer.length - 1] |= 0x80;
+                // increase the length of VarInt if the sign bit is 'occupied'
+                // by the value to properly flag it
+                if ((numberBuffer[i] & 0x40) == 0x40) {
+                    numberBuffer[--i] = 0x00;
+                }
+                // set the sign bit
+                if (negative) {
+                    // add the sign bit to MSB
+                    numberBuffer[i] |= 0x40;
+                }
+                len = numberBuffer.length - i;
+                write(numberBuffer, i, len);
+            }
+            return len;
+        }
+
+        public int writeIntValue(long value) throws IOException {
+            int i = numberBuffer.length;
+            boolean negative = value < 0;
+            if (negative) {
+                value = -value;
+            }
+            while (value > 0) {
+                numberBuffer[--i] = (byte)(value & 0xff);
+                value = value >>> 8;
+            }
+            // increase the length of Int if the sign bit is 'occupied'
+            // by the value to properly flag it
+            if ((numberBuffer[i] & 0x80) == 0x40) {
+                numberBuffer[--i] = 0x00;
+            }
+            // set the sign bit
+            if (negative) {
+                // add the sign bit to MSB
+                numberBuffer[i] |= 0x80;
+            }
+            int len = numberBuffer.length - i;
+            write(numberBuffer, i, len);
+            return len;
+        }
+        public int writeFloatValue(double d) throws IOException
+        {
+            if (Double.valueOf(d).equals(DOUBLE_POS_ZERO))
+            {
+                // pos zero special case
+                return 0;
+            }
+
+            // TODO write "custom" serialization or verify that
+            //      the java routine is doing the right thing
+            long dBits = Double.doubleToRawLongBits(d);
+            return writeUIntValue(dBits, _ib_FLOAT64_LEN);
+        }
+
+        byte[] singleCodepointUtf8Buffer = new byte[4];
+        public int writeUnicodeScalarAsUTF8(int c) throws IOException
+        {
+            int len;
+            if (c < 0x80) {
+                len = 1;
+                this.start_write();
+                _write((byte)(c & 0xff));
+                this.end_write();
+            } else {
+                len = _writeUnicodeScalarToByteBuffer(c, singleCodepointUtf8Buffer, 0);
+                this.write(singleCodepointUtf8Buffer, 0, len);
+            }
+            return len;
+        }
+
+        // this will write at least 2 byte unicode scalar to buffer
+        private final int _writeUnicodeScalarToByteBuffer(int c, byte[] buffer, int offset) throws IOException
+        {
+            int len = -1;
+
+            assert offset + 4 <= buffer.length;
+
+            // first the quick, easy and common case - ascii
+            if (c < 0x800) {
+                // 2 bytes characters from 0x000080 to 0x0007FF
+                buffer[offset] = (byte)( 0xff & (0xC0 | (c >> 6)) );
+                buffer[++offset] = (byte)( 0xff & (0x80 | (c & 0x3F)) );
+                len = 2;
+            }
+            else if (c < 0x10000) {
+                // 3 byte characters from 0x800 to 0xFFFF
+                // but only 0x800...0xD7FF and 0xE000...0xFFFF are valid
+                if (c > 0xD7FF && c < 0xE000) {
+                    this.throwUTF8Exception();
+                }
+                buffer[offset] = (byte)( 0xff & (0xE0 |  (c >> 12)) );
+                buffer[++offset] = (byte)( 0xff & (0x80 | ((c >> 6) & 0x3F)) );
+                buffer[++offset] = (byte)( 0xff & (0x80 |  (c & 0x3F)) );
+                len = 3;
+            }
+            else if (c <= 0x10FFFF) {
+                // 4 byte characters 0x010000 to 0x10FFFF
+                // these are are valid
+                buffer[offset] = (byte)( 0xff & (0xF0 |  (c >> 18)) );
+                buffer[++offset] = (byte)( 0xff & (0x80 | ((c >> 12) & 0x3F)) );
+                buffer[++offset] = (byte)( 0xff & (0x80 | ((c >> 6) & 0x3F)) );
+                buffer[++offset] = (byte)( 0xff & (0x80 | (c & 0x3F)) );
+                len = 4;
+            }
+            else {
+                this.throwUTF8Exception();
+            }
+            return len;
+        }
+
+        /******************************
+         *
+         * These are the "write typed value with header" routines
+         * they all are of the form:
+         *
+         *     void write<type>(nibble, ...)
+         */
+        public int writeByte(HighNibble hn, int len) throws IOException
+        {
+            if (len < 0) {
+                throw new IonException("negative token length encountered");
+            }
+            if (len > 13) len = 14; // TODO remove magic numbers
+            int t = _Private_IonConstants.makeTypeDescriptor( hn.value(), len );
+            write(t);
+            return 1;
+        }
+
+        /**
+         * Write one byte.
+         *
+         * @param b the byte to write.
+         * @return the number of bytes written (always 1).
+         * @throws IOException
+         */
+        public int writeByte(byte b) throws IOException
+        {
+            write(b);
+            return 1;
+        }
+
+        /**
+         * Write one byte.
+         *
+         * @param b integer containing the byte to write; only the 8 low-order
+         * bits are written.
+         *
+         * @return the number of bytes written (always 1).
+         * @throws IOException
+         */
+        public int writeByte(int b) throws IOException
+        {
+            write(b);
+            return 1;
+        }
+
+        public int writeAnnotations(SymbolToken[] annotations,
+                                    SymbolTable symbolTable) throws IOException
+        {
+            int startPosition = this.position();
+
+            int annotationLen = 0;
+            for (int ii=0; ii<annotations.length; ii++) {
+                int sid = annotations[ii].getSid();
+                assert sid != SymbolTable.UNKNOWN_SYMBOL_ID;
+                annotationLen += IonBinary.lenVarUInt(sid);
+            }
+
+            // write the len of the list
+            this.writeVarUIntValue(annotationLen, true);
+
+            // write the symbol id's
+            for (int ii=0; ii<annotations.length; ii++) {
+                int sid = annotations[ii].getSid();
+                this.writeVarUIntValue(sid, true);
+            }
+
+            return this.position() - startPosition;
+        }
+
+        public int writeAnnotations(ArrayList<Integer> annotations)
+            throws IOException
+        {
+            int startPosition = this.position();
+
+            int annotationLen = 0;
+            for (Integer ii : annotations) {
+                annotationLen += IonBinary.lenVarUInt(ii.intValue());
+            }
+
+            // write the len of the list
+            this.writeVarUIntValue(annotationLen, true);
+
+            // write the symbol id's
+            for (Integer ii : annotations) {
+                this.writeVarUIntValue(ii.intValue(), true);
+            }
+
+            return this.position() - startPosition;
+        }
+
+
+        public void writeStubStructHeader(int hn, int ln)
+            throws IOException
+        {
+            // write the hn and ln as the typedesc, we'll patch it later.
+            writeByte(_Private_IonConstants.makeTypeDescriptor(hn, ln));
+        }
+
+        /**
+         * Write typedesc and length for the common case.
+         */
+        public int writeCommonHeader(int hn, int len)
+            throws IOException
+        {
+            int returnlen = 0;
+
+            // write then len in low nibble
+            if (len < _Private_IonConstants.lnIsVarLen) {
+                returnlen += writeByte(_Private_IonConstants.makeTypeDescriptor(hn, len));
+            }
+            else {
+                returnlen += writeByte(_Private_IonConstants.makeTypeDescriptor(hn, _Private_IonConstants.lnIsVarLen));
+                returnlen += writeVarUIntValue(len, false);
+            }
+            return returnlen;
+        }
+
+
+        /***************************************
+         *
+         * Here are the write type value with type descriptor and everything
+         * family of methods, these depend on the others to do much of the work
+         *
+         */
+
+        /**
+         * @param sid must be valid id (>=1)
+         */
+        public int writeSymbolWithTD(int sid) // was: (String s, SymbolTable symtab)
+            throws IOException
+        {
+            // was: int sid = symtab.addSymbol(s);
+            assert sid > 0;
+
+            int vlen = lenUInt(sid);
+            int len = this.writeCommonHeader(
+                                 _Private_IonConstants.tidSymbol
+                                ,vlen
+                           );
+            len += this.writeUIntValue(sid, vlen);
+
+            return len;
+        }
+
+
+        /**
+         * Writes the full string header + data.
+         */
+        public int writeStringWithTD(String s) throws IOException
+        {
+            // first we have to see how long this will be in the output
+            /// buffer - part of the cost of length prefixed values
+            int len = IonBinary.lenIonString(s);
+            if (len < 0) this.throwUTF8Exception();
+
+            // first we write the type desc and length
+            len += this.writeCommonHeader(_Private_IonConstants.tidString, len);
+
+            // now we write just the value out
+            writeStringData(s);
+            //for (int ii=0; ii<s.length(); ii++) {
+            //    char c = s.charAt(ii);
+            //    this.writeCharValue(c);
+            //}
+
+            return len;
+        }
+
+        static final int stringBufferLen = 128;
+        byte[] stringBuffer = new byte[stringBufferLen];
+        public int writeStringData(String s) throws IOException
+        {
+            int len = 0;
+            int bufPos = 0;
+            for (int ii=0; ii<s.length(); ii++) {
+                int c = s.charAt(ii);
+                if (bufPos > stringBufferLen - 4) { // 4 is the max UTF-8 encoding size
+                    this.write(stringBuffer, 0, bufPos);
+                    bufPos = 0;
+                }
+                // at this point stringBuffer contains enough space for UTF-8 encoded code point
+                if (c < 128) {
+                    // don't even both to call the "utf8" converter for ascii
+                    stringBuffer[bufPos++] = (byte)c;
+                    len++;
+                    continue;
+                }
+                // multi-byte utf8
+
+                if (c >= 0xD800 && c <= 0xDFFF) {
+                    if (_Private_IonConstants.isHighSurrogate(c)) {
+                        // houston we have a high surrogate (let's hope it has a partner
+                        if (++ii >= s.length()) {
+                            throw new IllegalArgumentException("invalid string, unpaired high surrogate character");
+                        }
+                        int c2 = s.charAt(ii);
+                        if (!_Private_IonConstants.isLowSurrogate(c2)) {
+                            throw new IllegalArgumentException("invalid string, unpaired high surrogate character");
+                        }
+                        c = _Private_IonConstants.makeUnicodeScalar(c, c2);
+                    }
+                    else if (_Private_IonConstants.isLowSurrogate(c)) {
+                        // it's a loner low surrogate - that's an error
+                        throw new IllegalArgumentException("invalid string, unpaired low surrogate character");
+                    }
+                    // from 0xE000 up the _writeUnicodeScalar will check for us
+                }
+                int utf8len = this._writeUnicodeScalarToByteBuffer(c, stringBuffer, bufPos);
+                bufPos += utf8len;
+                len += utf8len;
+            }
+            if (bufPos > 0) {
+                this.write(stringBuffer, 0, bufPos);
+            }
+
+            return len;
+        }
+
+        public int writeNullWithTD(HighNibble hn) throws IOException
+        {
+            writeByte(hn, _Private_IonConstants.lnIsNullAtom);
+            return 1;
+        }
+
+        public int writeTimestampWithTD(Timestamp di)
+            throws IOException
+        {
+            int  returnlen;
+
+            if (di == null) {
+                returnlen = this.writeCommonHeader(
+                                                   _Private_IonConstants.tidTimestamp
+                                                   ,_Private_IonConstants.lnIsNullAtom);
+            }
+            else {
+                int vlen = IonBinary.lenIonTimestamp(di);
+
+                returnlen = this.writeCommonHeader(
+                                                   _Private_IonConstants.tidTimestamp
+                                                   ,vlen);
+
+                int wroteLen = writeTimestamp(di);
+                assert wroteLen == vlen;
+                returnlen += wroteLen;
+            }
+            return returnlen;
+        }
+
+        public int writeTimestamp(Timestamp di)
+            throws IOException
+        {
+            if (di == null) return 0;
+            int returnlen = 0;
+            Precision precision = di.getPrecision();
+
+            Integer offset = di.getLocalOffset();
+            if (offset == null) {
+                // TODO don't use magic numbers!
+                this.write((byte)(0xff & (0x80 | 0x40))); // negative 0 (no timezone)
+                returnlen ++;
+            }
+            else {
+                returnlen += this.writeVarIntValue(offset.intValue(), true);
+            }
+
+            // now the date - year, month, day as VarUInts
+            // if we have a non-null value we have at least the date
+            if (precision.includes(Precision.YEAR)) {
+                returnlen += this.writeVarUIntValue(di.getZYear(), true);
+            }
+            if (precision.includes(Precision.MONTH)) {
+                returnlen += this.writeVarUIntValue(di.getZMonth(), true);
+            }
+            if (precision.includes(Precision.DAY)) {
+                returnlen += this.writeVarUIntValue(di.getZDay(), true);
+            }
+
+            // now the time portion
+            if (precision.includes(Precision.MINUTE)) {
+                returnlen += this.writeVarUIntValue(di.getZHour(), true);
+                returnlen += this.writeVarUIntValue(di.getZMinute(), true);
+            }
+            if (precision.includes(Precision.SECOND)) {
+                returnlen += this.writeVarUIntValue(di.getZSecond(), true);
+                // and, finally, any fractional component that is known
+                BigDecimal fraction = di.getZFractionalSecond();
+                if (fraction != null) {
+                    assert !fraction.equals(BigDecimal.ZERO);
+                    returnlen += this.writeDecimalContent(fraction);
+                }
+            }
+            return returnlen;
+        }
+
+        public int writeDecimalWithTD(BigDecimal bd) throws IOException
+        {
+            int returnlen;
+
+            // we only write out the '0' value as the nibble 0
+            if (bd == null) {
+                returnlen =
+                    this.writeByte(NULL_DECIMAL_TYPEDESC);
+            }
+            else if (isNibbleZero(bd)) {
+                returnlen =
+                    this.writeByte(ZERO_DECIMAL_TYPEDESC);
+            }
+            else {
+                // otherwise we to it the hard way ....
+                int len = IonBinary.lenIonDecimal(bd);
+
+                if (len < _Private_IonConstants.lnIsVarLen) {
+                    returnlen = this.writeByte(
+                            _Private_IonConstants.makeTypeDescriptor(
+                                    _Private_IonConstants.tidDecimal
+                                    , len
+                            )
+                        );
+                }
+                else {
+                    returnlen = this.writeByte(
+                            _Private_IonConstants.makeTypeDescriptor(
+                                    _Private_IonConstants.tidDecimal
+                                    , _Private_IonConstants.lnIsVarLen
+                            )
+                        );
+                    this.writeVarIntValue(len, false);
+                }
+                int wroteDecimalLen = writeDecimalContent(bd);
+                assert wroteDecimalLen == len;
+                returnlen += wroteDecimalLen;
+            }
+            return returnlen;
+        }
+
+        private static final byte[] negativeZeroBitArray = new byte[] { (byte)0x80 };
+
+        /** Zero-length byte array. */
+        private static final byte[] positiveZeroBitArray = EMPTY_BYTE_ARRAY;
+
+
+        /**
+         * @see com.amazon.ion.impl.lite.ReverseBinaryEncoder#writeIonDecimalContent
+         */
+        public int writeDecimalContent(BigDecimal bd)
+            throws IOException
+        {
+            // check for null and 0. which are encoded in the nibble itself.
+            if (bd == null) return 0;
+
+            if (isNibbleZero(bd)) return 0;
+
+            // Ion stores exponent, BigDecimal uses the negation "scale"
+            int exponent = -bd.scale();
+
+            // The exponent isn't optional (except for the 0d0 case above).
+            int returnlen = writeVarIntValue(exponent,
+                                             /* force_zero_write*/ true);
+
+            BigInteger mantissa = bd.unscaledValue();
+
+            byte[] mantissaBits;
+            switch (mantissa.signum()) {
+            case 0:
+                if (Decimal.isNegativeZero(bd)) {
+                    mantissaBits = negativeZeroBitArray;
+                }
+                else {
+                    mantissaBits = positiveZeroBitArray;
+                }
+                break;
+            case -1:
+                // Obtain the unsigned value of the BigInteger
+                // We cannot use the twos complement representation of a
+                // negative BigInteger as this is different from the encoding
+                // of basic field Int.
+                mantissaBits = mantissa.negate().toByteArray();
+                // Set the sign on the highest order bit of the first octet
+                mantissaBits[0] |= 0x80;
+                break;
+            case 1:
+                mantissaBits = mantissa.toByteArray();
+                break;
+            default:
+                throw new IllegalStateException("mantissa signum out of range");
+            }
+
+            this.write(mantissaBits, 0, mantissaBits.length);
+            returnlen += mantissaBits.length;
+
+            return returnlen;
+        }
+
+
+        void throwUTF8Exception()
+        {
+            throwException("Invalid UTF-8 character encounter in a string at pos " + this.position());
+        }
+
+        void throwException(String s)
+        {
+            throw new BlockedBuffer.BlockedBufferException(s);
+        }
+    }
+
+    public static class PositionMarker
+    {
+        int     _pos;
+        Object  _userData;
+
+        public PositionMarker() {}
+        public PositionMarker(int pos, Object o) {
+            _pos = pos;
+            _userData = o;
+        }
+
+        public int getPosition()       { return _pos; }
+        public Object getUserData()    { return _userData; }
+
+        public void setPosition(int pos) {
+            _pos = pos;
+        }
+        public void setUserData(Object o) {
+            _userData = o;
+        }
+    }
+}
diff --git a/src/com/amazon/ion/impl/IonCharacterReader.java b/src/com/amazon/ion/impl/IonCharacterReader.java
new file mode 100644
index 0000000000..d4590c723f
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonCharacterReader.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import java.io.IOException;
+import java.io.PushbackReader;
+import java.io.Reader;
+import java.util.LinkedList;
+
+/**
+ * Extension of the {@link java.io.PushbackReader} to abstract line/offset counting
+ * and push back support.
+ *
+ * Note that this class does not leverage {@link java.io.LineNumberReader} as we
+ * need to un-roll the line number on push back and we need to have the logic to
+ * deal with newline combinations anyhow.
+ */
+final class IonCharacterReader extends PushbackReader {
+
+    /**
+     * The default buffer size
+     *
+     * @see _Private_Utils#MAX_LOOKAHEAD_UTF16
+     */
+    public static final int DEFAULT_BUFFER_SIZE = 12;
+
+    /**
+     * The additional buffer padding--this is to add to the fact that the
+     * pushback buffer may have to be larger than user specified characters
+     * a CR/LF combo is 2 characters, but logically one newline.
+     *
+     * FIXME does this properly account for surrogates?
+     *
+     * @see _Private_Utils#MAX_LOOKAHEAD_UTF16
+     */
+    public static final int BUFFER_PADDING = 1;
+
+    private long m_consumed;
+    private int  m_line;
+    private int  m_column;
+    private int  m_size;
+
+    // our offset stack--really, for efficiency this should
+    // be a linked list of primitive ints to avoid boxing costs
+    // however, pursue this only if it is really a performance
+    // issue.  Also, we are not using the List interface for code
+    // clarity as this is used as a deque. (Java 6 has java.util.Deque)
+
+    /**
+     * This offset stack is for pushing back characters that unroll lines
+     * and keeps our offset/line number counts correct.  This is essentially
+     * a pushback stack for character offsets.
+     */
+    private LinkedList<Integer> m_columns;
+
+    /**
+     * Constructs a character reader with an explicit buffer size.  Note that this
+     * is a minimum and the implementation is allowed to make it larger for
+     * internal operations.
+     *
+     * @param in    The underlying reader to wrap.
+     * @param size  The size of the push back buffer.
+     */
+    public IonCharacterReader( final Reader in, final int size ) {
+        super( in, size + BUFFER_PADDING );
+
+        assert size > 0;
+
+        m_consumed = 0;
+        m_line = 1;
+        m_column = 0;
+        m_columns = new LinkedList<Integer>();
+        m_size = size + BUFFER_PADDING;
+    }
+
+    /**
+     * Constructs a character reader with the default buffer size.
+     *
+     * @param in    The underlying reader to wrap.
+     */
+    public IonCharacterReader( final Reader in ) {
+        this( in, DEFAULT_BUFFER_SIZE );
+    }
+
+    /**
+     * Returns the logical number of consumed characters.
+     * This does not necessarily equal to the number of
+     * actual characters read as newline combinations are
+     * treated as one.
+     *
+     * @return The logical number of consumed characters.
+     */
+    public final long getConsumedAmount() {
+        return m_consumed;
+    }
+
+    /**
+     * Returns the current line number in the stream based on the last call
+     * to read().
+     *
+     * @return  The line number, 1-based.
+     */
+    public final int getLineNumber() {
+        return m_line;
+    }
+
+    /**
+     * Returns the offset within the line based on the last call to read().
+     *
+     * @return  The offset, 1-based.
+     */
+    public final int getColumn() {
+        return m_column;
+    }
+
+    /**
+     * Uses the push back implementation but normalizes newlines to "\n".
+     */
+    @Override
+    public int read() throws IOException {
+        int nextChar = super.read();
+
+        // process the character
+        if ( nextChar != -1 ) {
+            if ( nextChar == '\n' ) {
+                m_line++;
+                pushColumn( m_column );
+                m_column = 0;
+            }
+            else if ( nextChar == '\r') {
+                int aheadChar = super.read();
+
+                // if the lookahead is not a newline combo, unread it
+                if ( aheadChar != '\n' ) {
+                    // no need to unread it with line/offset update.
+                    unreadImpl( aheadChar, false );
+                }
+
+                m_line++;
+                pushColumn( m_column );
+                m_column = 0;
+
+                // normalize
+                nextChar = '\n';
+            } else {
+                m_column++;
+            }
+            m_consumed++;
+        }
+
+        return nextChar;
+    }
+
+    private final void pushColumn( final int offset ) {
+        // constrain the offset stack
+        // to the buffer size
+        if ( m_columns.size() == m_size ) {
+            m_columns.removeFirst();
+        }
+
+        // box into collection
+        m_columns.addLast( offset );
+    }
+
+    private final int popColumn() throws IOException {
+        if ( m_columns.isEmpty() ) {
+            throw new IOException( "Cannot unread past buffer" );
+        }
+
+        // unbox out of collection
+        return m_columns.removeLast();
+    }
+
+    /**
+     * Readers a buffer's worth of data.  This implementation
+     * simply leverages {@link #read()} over the buffer.
+     */
+    @Override
+    public int read( char[] cbuf, int off, int len ) throws IOException {
+        assert len >= 0;
+        assert off >= 0;
+
+        int amountRead = 0;
+        final int endIndex = off + len;
+        for ( int index = off; index < endIndex; index++ ) {
+            int readChar = read();
+            if ( readChar == -1 ) {
+                break;
+            }
+
+            cbuf[ index ] = ( char ) readChar;
+            amountRead++;
+        }
+
+        return amountRead == 0 ? -1 : amountRead;
+    }
+
+    /**
+     * Skips over some number of characters.
+     * This is implemented as a series of {@link #read()} calls.
+     */
+    @Override
+    public long skip( final long n ) throws IOException {
+        assert n > 0;
+
+        long charsLeft = n;
+        // note the read side effect
+        while ( charsLeft > 0 && read() != -1 ) {
+            charsLeft--;
+        }
+        return n - charsLeft;
+    }
+
+    /**
+     * Delegates to {@link #unread(int)}.
+     */
+    @Override
+    public void unread( char[] cbuf, int off, int len ) throws IOException {
+        assert len >= 0;
+        assert off >= 0;
+
+        final int endIndex = off + len;
+        for ( int index = endIndex - 1; index >= off; index-- ) {
+            unread( cbuf[ index ] );
+        }
+    }
+
+    /**
+     * Delegates to {@link #unread(char[],int,int)}.
+     */
+    @Override
+    public void unread( char[] cbuf ) throws IOException {
+        unread( cbuf, 0, cbuf.length );
+    }
+
+    /**
+     * Will unread a character and update the line number if necessary.  This will throw an
+     * exception if a carriage return is given as this character is never yielded from
+     * this stream.
+     */
+    @Override
+    public void unread( int c ) throws IOException {
+        if ( c == '\r' ) {
+            throw new IOException( "Cannot unread a carriage return" );
+        }
+
+        unreadImpl( c, true );
+    }
+
+    /**
+     * Performs ths actual unread operation.
+     *
+     * @param c the character to unread.
+     * @param updateCounts Whether or not we actually update the line number.
+     */
+    private void unreadImpl(int c, boolean updateCounts ) throws IOException {
+        if ( c != -1 ) {
+            if ( updateCounts ) {
+                if ( c == '\n' ) {
+                    m_line--;
+                    m_column = popColumn();
+                } else {
+                    m_column--;
+                }
+                m_consumed--;
+            }
+            super.unread( c );
+        }
+    }
+
+}
diff --git a/src/software/amazon/ion/impl/IonIteratorImpl.java b/src/com/amazon/ion/impl/IonIteratorImpl.java
similarity index 86%
rename from src/software/amazon/ion/impl/IonIteratorImpl.java
rename to src/com/amazon/ion/impl/IonIteratorImpl.java
index 184d5a8b05..2083575f07 100644
--- a/src/software/amazon/ion/impl/IonIteratorImpl.java
+++ b/src/com/amazon/ion/impl/IonIteratorImpl.java
@@ -1,30 +1,31 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonLob;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.ValueFactory;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import software.amazon.ion.IonLob;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.ValueFactory;
 
 
 final class IonIteratorImpl
@@ -186,10 +187,10 @@ private IonValue readValue()
         // TODO this is too late in the case of system reading
         // when v is a local symtab (it will get itself, not the prior symtab)
         SymbolTable symtab = _reader.getSymbolTable();
-        ((PrivateIonValue)v).setSymbolTable(symtab);
+        ((_Private_IonValue)v).setSymbolTable(symtab);
 
         if (annotations.length != 0) {
-            ((PrivateIonValue)v).setTypeAnnotationSymbols(annotations);
+            ((_Private_IonValue)v).setTypeAnnotationSymbols(annotations);
         }
 
         return v;
diff --git a/src/com/amazon/ion/impl/IonMessages.java b/src/com/amazon/ion/impl/IonMessages.java
new file mode 100644
index 0000000000..c34b11c3fb
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonMessages.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+
+final class IonMessages
+{
+    static final String CANNOT_STEP_OUT =
+        "Cannot stepOut any further, already at top level.";
+
+}
diff --git a/src/software/amazon/ion/impl/IonReaderBinaryRawX.java b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
similarity index 88%
rename from src/software/amazon/ion/impl/IonReaderBinaryRawX.java
rename to src/com/amazon/ion/impl/IonReaderBinaryRawX.java
index aca36e5de9..1ef4ffde21 100644
--- a/src/software/amazon/ion/impl/IonReaderBinaryRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
@@ -1,35 +1,36 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
+import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
 
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.Timestamp.Precision;
+import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
+import com.amazon.ion.impl._Private_ScalarConversions.AS_TYPE;
+import com.amazon.ion.impl._Private_ScalarConversions.ValueVariant;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.MathContext;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.Timestamp.Precision;
-import software.amazon.ion.impl.PrivateScalarConversions.AS_TYPE;
-import software.amazon.ion.impl.PrivateScalarConversions.ValueVariant;
-import software.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
 
 
 /**
@@ -51,7 +52,6 @@ abstract class IonReaderBinaryRawX
     static final int DEFAULT_CONTAINER_STACK_SIZE = 12; // a multiple of 3
     static final int DEFAULT_ANNOTATION_SIZE = 10;
     static final int NO_LIMIT = Integer.MIN_VALUE;
-
     protected enum State {
         S_INVALID,
         S_BEFORE_FIELD, // only true in structs
@@ -77,6 +77,7 @@ protected enum State {
     int                 _value_field_id;
     int                 _value_tid;
     int                 _value_len;
+    long                _value_start;
     int                 _value_lob_remaining;
     boolean             _value_lob_is_ready;
 
@@ -120,7 +121,7 @@ protected final void init_raw(UnifiedInputStreamX uis) {
 
     final void re_init_raw() {
         _local_remaining = NO_LIMIT;
-        _parent_tid = PrivateIonConstants.tidDATAGRAM;
+        _parent_tid = _Private_IonConstants.tidDATAGRAM;
         _value_field_id = SymbolTable.UNKNOWN_SYMBOL_ID;
         _state = State.S_BEFORE_TID; // this is where we always start
         _has_next_needed = true;
@@ -131,6 +132,7 @@ final void re_init_raw() {
         _value_is_true = false;
 
         _value_len = 0;
+        _value_start = 0;
         _value_lob_remaining = 0;
         _value_lob_is_ready = false;
 
@@ -179,7 +181,7 @@ private final int get_top_type() {
         assert(_container_top > 0);
         long type_limit = _container_stack[(_container_top - POS_STACK_STEP) + TYPE_LIMIT_OFFSET];
         int type = (int)(type_limit & TYPE_MASK);
-        if (type < 0 || type > PrivateIonConstants.tidDATAGRAM) {
+        if (type < 0 || type > _Private_IonConstants.tidDATAGRAM) {
             throwErrorAt("invalid type id in parent stack");
         }
         return type;
@@ -194,8 +196,7 @@ private final void pop() {
         assert(_container_top > 0);
         _container_top -= POS_STACK_STEP;
     }
-
-    boolean hasNext()
+    public boolean hasNext()
     {
         if (!_eof && _has_next_needed) {
             try {
@@ -225,14 +226,14 @@ public IonType next()
         assert( _value_type != null || _eof == true);
         return _value_type;
     }
-    // from IonConstants
-    // public static final byte[] BINARY_VERSION_MARKER_1_0 =
+    //from IonConstants
+    //public static final byte[] BINARY_VERSION_MARKER_1_0 =
     //    { (byte) 0xE0,
     //      (byte) 0x01,
     //      (byte) 0x00,
     //      (byte) 0xEA };
-    private static final int BINARY_VERSION_MARKER_TID = PrivateIonConstants.getTypeCode(PrivateIonConstants.BINARY_VERSION_MARKER_1_0[0] & 0xff);
-    private static final int BINARY_VERSION_MARKER_LEN = PrivateIonConstants.getLowNibble(PrivateIonConstants.BINARY_VERSION_MARKER_1_0[0] & 0xff);
+    private static final int BINARY_VERSION_MARKER_TID = _Private_IonConstants.getTypeCode(_Private_IonConstants.BINARY_VERSION_MARKER_1_0[0] & 0xff);
+    private static final int BINARY_VERSION_MARKER_LEN = _Private_IonConstants.getLowNibble(_Private_IonConstants.BINARY_VERSION_MARKER_1_0[0] & 0xff);
     private final void has_next_helper_raw() throws IOException
     {
         clear_value();
@@ -256,13 +257,13 @@ private final void has_next_helper_raw() throws IOException
                     _eof = true;
                     break;
                 }
-                if (_value_tid == PrivateIonConstants.tidNopPad) {
+                if (_value_tid == _Private_IonConstants.tidNopPad) {
                     // skips size of pad and resets State machine
                     skip(_value_len);
                     clear_value();
                     break;
                 }
-                else if (_value_tid == PrivateIonConstants.tidTypedecl) {
+                else if (_value_tid == _Private_IonConstants.tidTypedecl) {
                     assert (_value_tid == (BINARY_VERSION_MARKER_TID & 0xff)); // the bvm tid happens to be type decl
                     if (_value_len == BINARY_VERSION_MARKER_LEN ) {
                         // this isn't valid for any type descriptor except the first byte
@@ -320,16 +321,17 @@ else if (_value_tid == PrivateIonConstants.tidTypedecl) {
     }
     private final void load_version_marker() throws IOException
     {
-        for (int ii=1; ii<PrivateIonConstants.BINARY_VERSION_MARKER_1_0.length; ii++) {
+        for (int ii=1; ii<_Private_IonConstants.BINARY_VERSION_MARKER_1_0.length; ii++) {
             int b = read();
-            if (b != (PrivateIonConstants.BINARY_VERSION_MARKER_1_0[ii] & 0xff)) {
+            if (b != (_Private_IonConstants.BINARY_VERSION_MARKER_1_0[ii] & 0xff)) {
                 throwErrorAt("invalid binary image");
             }
         }
         // so it's a 4 byte version marker - make it look like
         // the symbol $ion_1_0 ...
-        _value_tid = PrivateIonConstants.tidSymbol;
+        _value_tid = _Private_IonConstants.tidSymbol;
         _value_len = 0; // so skip will go the right place - here
+        _value_start = 0;
         _v.setValue(ION_1_0_SID);
         _v.setAuthoritativeType(AS_TYPE.int_value);
         // _value_type = IonType.SYMBOL;  we do this in the caller so it's easier to see
@@ -358,13 +360,13 @@ private final IonType load_annotation_start_with_value_type() throws IOException
         // length as well (over-writing the len + annotations value
         // that is there now, before the call)
         _value_tid = read_type_id();
-        if (_value_tid == PrivateIonConstants.tidNopPad) {
+        if (_value_tid == _Private_IonConstants.tidNopPad) {
             throwErrorAt("NOP padding is not allowed within annotation wrappers.");
         }
         if (_value_tid == UnifiedInputStreamX.EOF) {
             throwErrorAt("unexpected EOF encountered where a type descriptor byte was expected");
         }
-        if (_value_tid == PrivateIonConstants.tidTypedecl) {
+        if (_value_tid == _Private_IonConstants.tidTypedecl) {
             throwErrorAt("An annotation wrapper may not contain another annotation wrapper.");
         }
 
@@ -449,37 +451,37 @@ private final int read_type_id() throws IOException
         if (td < 0) {
             return UnifiedInputStreamX.EOF;
         }
-        int tid = PrivateIonConstants.getTypeCode(td);
-        int len = PrivateIonConstants.getLowNibble(td);
+        int tid = _Private_IonConstants.getTypeCode(td);
+        int len = _Private_IonConstants.getLowNibble(td);
 
         // NOP Padding
-        if (tid == PrivateIonConstants.tidNull && len != PrivateIonConstants.lnIsNull) {
-            if (len == PrivateIonConstants.lnIsVarLen) {
+        if (tid == _Private_IonConstants.tidNull && len != _Private_IonConstants.lnIsNull) {
+            if (len == _Private_IonConstants.lnIsVarLen) {
                 len = readVarUInt();
             }
             _state = _is_in_struct ? State.S_BEFORE_FIELD : State.S_BEFORE_TID;
-            tid = PrivateIonConstants.tidNopPad; // override typeId to use Pad marker
+            tid = _Private_IonConstants.tidNopPad; // override typeId to use Pad marker
         }
-        else if (len == PrivateIonConstants.lnIsVarLen) {
+        else if (len == _Private_IonConstants.lnIsVarLen) {
             len = readVarUInt();
             start_of_value = _input.getPosition();
         }
-        else if (tid == PrivateIonConstants.tidNull) {
+        else if (tid == _Private_IonConstants.tidNull) {
             _value_is_null = true;
             len = 0;
             _state = State.S_AFTER_VALUE;
         }
-        else if (len == PrivateIonConstants.lnIsNull) {
+        else if (len == _Private_IonConstants.lnIsNull) {
             _value_is_null = true;
             len = 0;
             _state = State.S_AFTER_VALUE;
         }
-        else if (tid == PrivateIonConstants.tidBoolean) {
+        else if (tid == _Private_IonConstants.tidBoolean) {
             switch (len) {
-                case PrivateIonConstants.lnBooleanFalse:
+                case _Private_IonConstants.lnBooleanFalse:
                     _value_is_true = false;
                     break;
-                case PrivateIonConstants.lnBooleanTrue:
+                case _Private_IonConstants.lnBooleanTrue:
                     _value_is_true = true;
                     break;
                 default:
@@ -489,7 +491,7 @@ else if (tid == PrivateIonConstants.tidBoolean) {
             len = 0;
             _state = State.S_AFTER_VALUE;
         }
-        else if (tid == PrivateIonConstants.tidStruct) {
+        else if (tid == _Private_IonConstants.tidStruct) {
             if ((_struct_is_ordered = (len == 1))) {
                 // special case of an ordered struct, it gets the
                 // otherwise impossible to have length of 1
@@ -502,56 +504,66 @@ else if (tid == PrivateIonConstants.tidStruct) {
         }
         _value_tid = tid;
         _value_len = len;
+        // TODO Keeping track of _value_start is only necessary because top-level
+        // symbol values are treated differently than all other values: they
+        // are read during has_next_helper_user in order to compare them
+        // against the IVM (symbol 2). This behavior is actually contrary to
+        // the spec, and leads to the reader position being advanced PAST
+        // the value BEFORE a *Value() method is even called. Once that is fixed,
+        // _value_start can be removed, and _input._pos can be used to find the
+        // start of the value at the current valid position.
+        // amzn/ion-java/issues/88 tracks the fix for bringing IVM handling up to
+        // spec.
+        _value_start = start_of_value;
         _position_len = len + (start_of_value - start_of_tid);
         _position_start = start_of_tid;
         return tid;
     }
-
     private final IonType get_iontype_from_tid(int tid)
     {
         IonType t = null;
         switch (tid) {
-        case PrivateIonConstants.tidNull:      // 0
+        case _Private_IonConstants.tidNull:      // 0
             t = IonType.NULL;
             break;
-        case PrivateIonConstants.tidBoolean:   // 1
+        case _Private_IonConstants.tidBoolean:   // 1
             t = IonType.BOOL;
             break;
-        case PrivateIonConstants.tidPosInt:    // 2
-        case PrivateIonConstants.tidNegInt:    // 3
+        case _Private_IonConstants.tidPosInt:    // 2
+        case _Private_IonConstants.tidNegInt:    // 3
             t = IonType.INT;
             break;
-        case PrivateIonConstants.tidFloat:     // 4
+        case _Private_IonConstants.tidFloat:     // 4
             t = IonType.FLOAT;
             break;
-        case PrivateIonConstants.tidDecimal:   // 5
+        case _Private_IonConstants.tidDecimal:   // 5
             t = IonType.DECIMAL;
             break;
-        case PrivateIonConstants.tidTimestamp: // 6
+        case _Private_IonConstants.tidTimestamp: // 6
             t = IonType.TIMESTAMP;
             break;
-        case PrivateIonConstants.tidSymbol:    // 7
+        case _Private_IonConstants.tidSymbol:    // 7
             t = IonType.SYMBOL;
             break;
-        case PrivateIonConstants.tidString:    // 8
+        case _Private_IonConstants.tidString:    // 8
             t = IonType.STRING;
             break;
-        case PrivateIonConstants.tidClob:      // 9
+        case _Private_IonConstants.tidClob:      // 9
             t = IonType.CLOB;
             break;
-        case PrivateIonConstants.tidBlob:      // 10 A
+        case _Private_IonConstants.tidBlob:      // 10 A
             t = IonType.BLOB;
             break;
-        case PrivateIonConstants.tidList:      // 11 B
+        case _Private_IonConstants.tidList:      // 11 B
             t = IonType.LIST;
             break;
-        case PrivateIonConstants.tidSexp:      // 12 C
+        case _Private_IonConstants.tidSexp:      // 12 C
             t = IonType.SEXP;
             break;
-        case PrivateIonConstants.tidStruct:    // 13 D
+        case _Private_IonConstants.tidStruct:    // 13 D
             t = IonType.STRUCT;
             break;
-        case PrivateIonConstants.tidTypedecl:  // 14 E
+        case _Private_IonConstants.tidTypedecl:  // 14 E
             t = null;  // we don't know yet
             break;
         default:
@@ -594,7 +606,7 @@ public void stepIn()
             }
         }
         push(_parent_tid, next_position, next_remaining);
-        _is_in_struct = (_value_tid == PrivateIonConstants.tidStruct);
+        _is_in_struct = (_value_tid == _Private_IonConstants.tidStruct);
         _local_remaining = _value_len;
         _state = _is_in_struct ? State.S_BEFORE_FIELD : State.S_BEFORE_TID;
         _parent_tid = _value_tid;
@@ -615,7 +627,7 @@ public void stepOut()
         _eof = false;
         _parent_tid = parent_tid;
         // later, only after we've skipped to our new location: _local_remaining = local_remaining;
-        if (_parent_tid == PrivateIonConstants.tidStruct) {
+        if (_parent_tid == _Private_IonConstants.tidStruct) {
             _is_in_struct = true;
             _state = State.S_BEFORE_FIELD;
         }
@@ -889,12 +901,10 @@ protected final BigInteger readBigInteger(int len, boolean is_negative) throws I
         }
         return value;
     }
-
     protected final int readVarInt() throws IOException
     {
         return readVarInt(read());
     }
-
     /**
      * Reads an integer value, returning null to mean -0.
      * @throws IOException
@@ -910,7 +920,6 @@ protected final Integer readVarInteger() throws IOException
 
         return readVarInt(firstByte);
     }
-
     /**
      * reads a varInt after the first byte was read. The first byte is used to specify the sign and -0 has different
      * representation on the protected API that was called
@@ -930,10 +939,10 @@ private int readVarInt(int firstByte) throws IOException {
 
         for (;;) {
             if (b < 0) throwUnexpectedEOFException();
-
             if ((b & 0x40) != 0) {
                 isNegative = true;
             }
+
             retValue = (b & 0x3F);
             if ((b & 0x80) != 0) break;
 
@@ -942,6 +951,7 @@ private int readVarInt(int firstByte) throws IOException {
             if ((b & 0x80) != 0) break;
             // for the rest, they're all the same
 
+
             if ((b = read()) < 0) throwUnexpectedEOFException();
             retValue = (retValue << 7) | (b & 0x7F);
             if ((b & 0x80) != 0) break;
@@ -974,7 +984,7 @@ private int readVarInt(int firstByte) throws IOException {
 
     protected final int readVarUIntOrEOF() throws IOException
     {
-        // VarUInt uses the high-order bit of the last octet as a marker; some (but not all) 5-byte VarUInt can fit
+// VarUInt uses the high-order bit of the last octet as a marker; some (but not all) 5-byte VarUInt can fit
         // into a Java int.
         // To validate overflows we accumulate the VarInt in a long and then check if it can be represented by an int
         //
@@ -1016,7 +1026,6 @@ protected final int readVarUIntOrEOF() throws IOException
 
         return retValueAsInt;
     }
-
     protected final int readVarUInt() throws IOException
     {
         int varUInt = readVarUIntOrEOF();
@@ -1093,6 +1102,9 @@ protected final Decimal readDecimal(int len) throws IOException
         return bd;
     }
 
+    /**
+     * @see IonBinary.Reader#readTimestampValue
+     */
     protected final Timestamp readTimestamp(int len) throws IOException
     {
         if (len < 1) {
@@ -1138,8 +1150,8 @@ protected final Timestamp readTimestamp(int len) throws IOException
                             frac = readDecimal(_local_remaining);
                             if (frac.compareTo(BigDecimal.ZERO) < 0 || frac.compareTo(BigDecimal.ONE) >= 0) {
                                 throwErrorAt(
-                                    "The fractional seconds value in a timestamp must be greater than or "
-                                        + "equal to zero and less than one."
+                                        "The fractional seconds value in a timestamp must be greater than or "
+                                              + "equal to zero and less than one."
                                 );
                             }
                         }
@@ -1151,7 +1163,6 @@ protected final Timestamp readTimestamp(int len) throws IOException
         _local_remaining  = save_limit;
         // now we let timestamp put it all together
         try {
-            @SuppressWarnings("deprecation")
             Timestamp val =
                 Timestamp.createFromUtcFields(p, year, month, day, hour,
                                               minute, second, frac, offset);
@@ -1180,8 +1191,8 @@ protected final String readString(int len) throws IOException
                 chars[ii++] = (char)c;
             }
             else { // when c is >= 0x10000 we need surrogate encoding
-                chars[ii++] = (char)PrivateIonConstants.makeHighSurrogate(c);
-                chars[ii++] = (char)PrivateIonConstants.makeLowSurrogate(c);
+                chars[ii++] = (char)_Private_IonConstants.makeHighSurrogate(c);
+                chars[ii++] = (char)_Private_IonConstants.makeLowSurrogate(c);
             }
         }
         _local_remaining = save_limit;
diff --git a/src/software/amazon/ion/impl/IonReaderBinarySystemX.java b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
similarity index 83%
rename from src/software/amazon/ion/impl/IonReaderBinarySystemX.java
rename to src/com/amazon/ion/impl/IonReaderBinarySystemX.java
index f28361e7e8..614ef7f5a1 100644
--- a/src/software/amazon/ion/impl/IonReaderBinarySystemX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
@@ -1,49 +1,57 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.IonType.SYMBOL;
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonSystem;
+import static com.amazon.ion.IonType.SYMBOL;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonType;
+import com.amazon.ion.NullValueException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.impl._Private_ScalarConversions.AS_TYPE;
+import com.amazon.ion.impl._Private_ScalarConversions.ValueVariant;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.Iterator;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IntegerSize;
-import software.amazon.ion.IonType;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.impl.PrivateScalarConversions.AS_TYPE;
-import software.amazon.ion.impl.PrivateScalarConversions.ValueVariant;
+
 
 class IonReaderBinarySystemX
     extends IonReaderBinaryRawX
-    implements PrivateReaderWriter
+    implements _Private_ReaderWriter
 {
     SymbolTable _symbols;
 
+    @Deprecated
+    IonReaderBinarySystemX(byte[] bytes, int offset, int length) {
+        this(UnifiedInputStreamX.makeStream(bytes, offset, length));
+    }
+
     IonReaderBinarySystemX(UnifiedInputStreamX in)
     {
         super();
         init_raw(in);
-        // TODO check IVM to determine version: amznlabs/ion-java#19, amznlabs/ion-java#24
+        // TODO check IVM to determine version: amzn/ion-java#19, amzn/ion-java#24
         _symbols = SharedSymbolTable.getSystemSymbolTable(1);
     }
 
@@ -54,6 +62,11 @@ class IonReaderBinarySystemX
     // or the user reader.  Here they just fail.
     //
 
+    public final int getFieldId()
+    {
+        return _value_field_id;
+    }
+
     public SymbolToken[] getTypeAnnotationSymbols()
     {
         load_annotations();
@@ -100,9 +113,9 @@ protected final void prepare_value(int as_type) {
 
             if (!_v.can_convert(as_type)) {
                 String message = "can't cast from "
-                    +PrivateScalarConversions.getValueTypeName(_v.getAuthoritativeType())
+                    +_Private_ScalarConversions.getValueTypeName(_v.getAuthoritativeType())
                     +" to "
-                    +PrivateScalarConversions.getValueTypeName(as_type);
+                    +_Private_ScalarConversions.getValueTypeName(as_type);
                 throw new IllegalStateException(message);
             }
             int fnid = _v.get_conversion_fnid(as_type);
@@ -128,22 +141,8 @@ protected final void load_cached_value(int value_type) throws IOException
         }
     }
 
-    /** Utility method to convert an unsigned magnitude stored as a long to a {@link BigInteger}. */
-    private static BigInteger unsignedLongToBigInteger(int signum, long val)
-    {
-        byte[] magnitude = {
-            (byte) ((val >> 56) & 0xFF),
-            (byte) ((val >> 48) & 0xFF),
-            (byte) ((val >> 40) & 0xFF),
-            (byte) ((val >> 32) & 0xFF),
-            (byte) ((val >> 24) & 0xFF),
-            (byte) ((val >> 16) & 0xFF),
-            (byte) ((val >>  8) & 0xFF),
-            (byte) (val & 0xFF),
-        };
-        return new BigInteger(signum, magnitude);
-    }
-
+    static final int MAX_BINARY_LENGTH_INT = 4;
+    static final int MAX_BINARY_LENGTH_LONG = 8;
     static final BigInteger MIN_LONG_VALUE = BigInteger.valueOf(Long.MIN_VALUE);
     static final BigInteger MAX_LONG_VALUE = BigInteger.valueOf(Long.MAX_VALUE);
 
@@ -180,24 +179,23 @@ private final void load_scalar_value() throws IOException
             _v.setAuthoritativeType(AS_TYPE.boolean_value);
             break;
         case INT:
-            boolean is_negative = _value_tid == PrivateIonConstants.tidNegInt;
+            boolean is_negative = _value_tid == _Private_IonConstants.tidNegInt;
 
             if (_value_len == 0) {
                 if (is_negative) {
                     throwIllegalNegativeZeroException();
                 }
-
                 int v = 0;
                 _v.setValue(v);
                 _v.setAuthoritativeType(AS_TYPE.int_value);
             }
-            else if (_value_len <= Long.BYTES) {
+            else if (_value_len <= MAX_BINARY_LENGTH_LONG) {
                 long v = readULong(_value_len);
 
                 if (v < 0) {
                     // we probably can't fit this magnitude properly into a Java long
                     int signum = !is_negative ? 1 : -1;
-                    BigInteger big = unsignedLongToBigInteger(signum, v);
+                    BigInteger big = IonBinary.unsignedLongToBigInteger(signum, v);
                     _v.setValue(big);
                     // boundary condition
                     if (big.compareTo(MIN_LONG_VALUE) < 0 || big.compareTo(MAX_LONG_VALUE) > 0) {
@@ -376,7 +374,6 @@ public Timestamp timestampValue()
         return _v.getTimestamp();
     }
 
-    @Override
     public IntegerSize getIntegerSize()
     {
         load_once();
@@ -384,12 +381,10 @@ public IntegerSize getIntegerSize()
         {
             return null;
         }
-        return PrivateScalarConversions.getIntegerSize(_v.getAuthoritativeType());
+        return _Private_ScalarConversions.getIntegerSize(_v.getAuthoritativeType());
     }
 
-    // TODO amzn/ion-java#63 this needs to use the appropriate symbol table for user values
-
-    public final String stringValue()
+    public String stringValue()
     {
         if (! IonType.isText(_value_type)) throw new IllegalStateException();
         if (_value_is_null) return null;
@@ -431,7 +426,11 @@ int getSymbolId()
         return _v.getInt();
     }
 
-    public final String getFieldName()
+    //
+    // unsupported public methods that require a symbol table
+    // to operate - which is only supported on a user reader
+    //
+    public String getFieldName()
     {
         String name;
         if (_value_field_id == SymbolTable.UNKNOWN_SYMBOL_ID) {
@@ -457,7 +456,7 @@ public SymbolToken getFieldNameSymbol()
     public final Iterator<String> iterateTypeAnnotations()
     {
         String[] annotations = getTypeAnnotations();
-        return PrivateUtils.stringIterator(annotations);
+        return _Private_Utils.stringIterator(annotations);
     }
 
     public final String[] getTypeAnnotations()
@@ -465,7 +464,7 @@ public final String[] getTypeAnnotations()
         load_annotations();
         String[] anns;
         if (_annotation_count < 1) {
-            anns = PrivateUtils.EMPTY_STRING_ARRAY;
+            anns = _Private_Utils.EMPTY_STRING_ARRAY;
         }
         else {
             anns = new String[_annotation_count];
@@ -479,7 +478,7 @@ public final String[] getTypeAnnotations()
         return anns;
     }
 
-    public final SymbolTable getSymbolTable()
+    public SymbolTable getSymbolTable()
     {
         return _symbols;
     }
diff --git a/src/software/amazon/ion/impl/IonReaderBinaryUserX.java b/src/com/amazon/ion/impl/IonReaderBinaryUserX.java
similarity index 69%
rename from src/software/amazon/ion/impl/IonReaderBinaryUserX.java
rename to src/com/amazon/ion/impl/IonReaderBinaryUserX.java
index 16c04d6192..31d3d775be 100644
--- a/src/software/amazon/ion/impl/IonReaderBinaryUserX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryUserX.java
@@ -1,39 +1,44 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
-
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonSystem;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
+
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonType;
+import com.amazon.ion.OffsetSpan;
+import com.amazon.ion.RawValueSpanProvider;
+import com.amazon.ion.SeekableReader;
+import com.amazon.ion.Span;
+import com.amazon.ion.SpanProvider;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.impl.UnifiedInputStreamX.FromByteArray;
+import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
+import com.amazon.ion.impl._Private_ScalarConversions.AS_TYPE;
 import java.io.IOException;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonType;
-import software.amazon.ion.OffsetSpan;
-import software.amazon.ion.SeekableReader;
-import software.amazon.ion.Span;
-import software.amazon.ion.SpanProvider;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.impl.PrivateScalarConversions.AS_TYPE;
-import software.amazon.ion.impl.UnifiedInputStreamX.FromByteArray;
-import software.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
+import java.util.Iterator;
 
 final class IonReaderBinaryUserX
     extends IonReaderBinarySystemX
-    implements PrivateReaderWriter
+    implements _Private_ReaderWriter
 {
     /**
      * This is the physical start-of-stream offset when this reader was created.
@@ -41,14 +46,22 @@ final class IonReaderBinaryUserX
      * {@link OffsetSpan}s.
      */
     private final int _physical_start_offset;
-    private final PrivateLocalSymbolTableFactory _lstFactory;
+    private final _Private_LocalSymbolTableFactory _lstFactory;
 
     IonCatalog  _catalog;
 
-    private static final class IonReaderBinarySpan
+    private static class IonReaderBinarySpan
         extends DowncastingFaceted
         implements Span, OffsetSpan
     {
+        private final boolean _isSeekable;
+
+        public IonReaderBinarySpan(boolean isSeekable)
+        {
+            _isSeekable = isSeekable;
+        }
+
+        State       _state;
         long        _offset;
         long        _limit;
         SymbolTable _symbol_table;
@@ -62,10 +75,16 @@ public long getFinishOffset()
         {
             return _limit;
         }
+
+        public boolean isSeekable()
+        {
+            return _isSeekable;
+        }
+
     }
 
     public IonReaderBinaryUserX(IonCatalog catalog,
-                                PrivateLocalSymbolTableFactory lstFactory,
+                                _Private_LocalSymbolTableFactory lstFactory,
                                 UnifiedInputStreamX userBytes,
                                 int physicalStartOffset)
     {
@@ -83,7 +102,6 @@ final void init_user(IonCatalog catalog)
         _catalog = catalog;
     }
 
-
     /**
      * Determines the abstract position of the reader, such that one can
      * later {@link #seek} back to it.
@@ -92,38 +110,39 @@ final void init_user(IonCatalog catalog)
      * a value (not before, between, or after values). In other words, one
      * should only call this method when {@link #getType()} is non-null.
      *
+     * @param beforeTid -
+     *          When true, the position returned starts before the
+     *          type/length octet.
+     *          When false, the position returned starts after the
+     *          type/length octet and any optional length octets.
+     *
      * @return the current position; not null.
      *
      * @throws IllegalStateException if the reader doesn't have a current
      * value.
      */
-    public Span getCurrentPosition()
+    public Span getCurrentPosition(boolean beforeTid)
     {
-        IonReaderBinarySpan pos = new IonReaderBinarySpan();
-
         if (getType() == null)
         {
-            String message = "IonReader isn't positioned on a value";
-            throw new IllegalStateException(message);
+            throw new IllegalStateException("IonReader isn't positioned on a value");
         }
-
-        if (_position_start == -1)  // TODO remove? should be unreachable.
-        {
-            // special case of the position before the first call to next
-            pos._offset = _input._pos;
-            pos._limit = _input._limit;
-            pos._symbol_table = _symbols;
-        }
-        else
-        {
-            pos._offset = _position_start - _physical_start_offset;
-            pos._limit = pos._offset + _position_len;
-            pos._symbol_table = _symbols;
-        }
-
+        // Only spans that include the TID octet are seekable.
+        IonReaderBinarySpan pos = new IonReaderBinarySpan(beforeTid);
+        long start = beforeTid ?  _position_start : _value_start;
+        long len = beforeTid ? _position_len : _value_len;
+        pos._offset = start - _physical_start_offset;
+        pos._limit = pos._offset + len;
+        pos._symbol_table = _symbols;
+        pos._state = _state;
         return pos;
     }
 
+    public byte[] getCurrentBuffer()
+    {
+        return _input._bytes;
+    }
+
 
     public void seek(IonReaderBinarySpan position)
     {
@@ -166,6 +185,19 @@ public void seek(IonReaderBinarySpan position)
 
         // now we need to set our symbol table
         _symbols = pos._symbol_table;
+
+        // and the other misc state variables we had
+        // read past before getPosition gets called
+        //           Don't do this, we'll re-read the data from the stream.
+        //           Otherwise, this reader will be in the wrong state.
+        //           For example, getType() will return non-null but that
+        //           shouldn't happen until the user calls next().
+//        _state         = pos._state;
+//        _value_type    = pos._value_type;
+//        _value_is_null = pos._value_is_null;
+//        _value_is_true = pos._value_is_true;
+
+//        _is_in_struct = false;
     }
 
 
@@ -181,7 +213,7 @@ public IonType next()
     }
 
     @Override
-    boolean hasNext()
+    public boolean hasNext()
     {
         if (!_eof && _has_next_needed) {
             clear_system_value_stack();
@@ -202,7 +234,7 @@ private final void has_next_helper_user() throws IOException
     {
         super.hasNext();
         if (getDepth() == 0 && !_value_is_null) {
-            if (_value_tid == PrivateIonConstants.tidSymbol) {
+            if (_value_tid == _Private_IonConstants.tidSymbol) {
                 if (load_annotations() == 0) {
                     // $ion_1_0 is read as an IVM only if it is not annotated
                     load_cached_value(AS_TYPE.int_value);
@@ -214,7 +246,7 @@ private final void has_next_helper_user() throws IOException
                     }
                 }
             }
-            else if (_value_tid == PrivateIonConstants.tidStruct) {
+            else if (_value_tid == _Private_IonConstants.tidStruct) {
                 int count = load_annotations();
                 if (count > 0 && _annotation_ids[0] == ION_SYMBOL_TABLE_SID) {
                     _symbols = _lstFactory.newLocalSymtab(_catalog, this, false);
@@ -223,7 +255,7 @@ else if (_value_tid == PrivateIonConstants.tidStruct) {
                 }
             }
             else {
-                assert (_value_tid != PrivateIonConstants.tidTypedecl);
+                assert (_value_tid != _Private_IonConstants.tidTypedecl);
             }
         }
     }
@@ -259,7 +291,6 @@ public final SymbolToken symbolValue() {
         return symbol;
     }
 
-    //
     //  This code handles the skipped symbol table
     //  support - it is cloned in IonReaderTextUserX,
     //  IonReaderBinaryUserX and _Private_IonWriterBase
@@ -312,22 +343,26 @@ public <T> T asFacet(Class<T> facetType)
             return facetType.cast(new SpanProviderFacet());
         }
 
-        // TODO amzn/ion-java#17 support seeking over InputStream
+        // TODO amzn/ion-java/issues/17 support seeking over InputStream
         if (_input instanceof FromByteArray)
         {
             if (facetType == SeekableReader.class)
             {
                 return facetType.cast(new SeekableReaderFacet());
             }
+            if (facetType == RawValueSpanProvider.class)
+            {
+                return facetType.cast(new RawValueSpanProviderFacet());
+            }
         }
 
-        if (facetType == PrivateByteTransferReader.class)
+        if (facetType == _Private_ByteTransferReader.class)
         {
             // This is a rather sketchy use of Facets, since the availability
             // of the facet depends upon the current state of this subject,
             // and that can change over time.
 
-            // TODO amzn/ion-java#16 Our {@link #transferCurrentValue} doesn't handle
+            // TODO amzn/ion-java/issues/16 Our {@link #transferCurrentValue} doesn't handle
             //  field names and annotations.
 
             // Ensure there's a contiguous buffer we can copy.
@@ -347,30 +382,46 @@ private class SpanProviderFacet implements SpanProvider
     {
         public Span currentSpan()
         {
-            return getCurrentPosition();
+            return getCurrentPosition(true);
         }
     }
 
+    private class RawValueSpanProviderFacet implements RawValueSpanProvider
+    {
+
+        public Span valueSpan()
+        {
+            return getCurrentPosition(false);
+        }
+
+        public byte[] buffer()
+        {
+            return getCurrentBuffer();
+        }
+
+    }
 
     private class SeekableReaderFacet
         extends SpanProviderFacet
         implements SeekableReader
     {
+
         public void hoist(Span span)
         {
-            if (! (span instanceof IonReaderBinarySpan))
+            if (! (span instanceof IonReaderBinarySpan) || !((IonReaderBinarySpan)span).isSeekable())
             {
                 throw new IllegalArgumentException("Span isn't compatible with this reader.");
             }
 
             seek((IonReaderBinarySpan) span);
         }
+
     }
 
 
-    private class ByteTransferReaderFacet implements PrivateByteTransferReader
+    private class ByteTransferReaderFacet implements _Private_ByteTransferReader
     {
-        public void transferCurrentValue(PrivateByteTransferSink sink)
+        public void transferCurrentValue(_Private_ByteTransferSink sink)
             throws IOException
         {
             // Ensure there's a contiguous buffer we can copy.
@@ -380,7 +431,7 @@ public void transferCurrentValue(PrivateByteTransferSink sink)
                 throw new UnsupportedOperationException();
             }
 
-            // TODO amzn/ion-java#16 wrong if current value has a field name or
+            // TODO amzn/ion-java/issues/16 wrong if current value has a field name or
             //   annotations since the position is in the wrong place.
             // TODO when implementing that, be careful to handle the case where
             //   the writer already holds a pending field name or annotations!
diff --git a/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java b/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java
similarity index 98%
rename from src/software/amazon/ion/impl/IonReaderTextRawTokensX.java
rename to src/com/amazon/ion/impl/IonReaderTextRawTokensX.java
index 4e815ebb0d..bdf3462fb4 100644
--- a/src/software/amazon/ion/impl/IonReaderTextRawTokensX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java
@@ -1,34 +1,35 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_ESCAPED_NEWLINE_SEQUENCE_1;
-import static software.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_ESCAPED_NEWLINE_SEQUENCE_2;
-import static software.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_ESCAPED_NEWLINE_SEQUENCE_3;
-import static software.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_NEWLINE_SEQUENCE_1;
-import static software.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_NEWLINE_SEQUENCE_2;
-import static software.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_NEWLINE_SEQUENCE_3;
-import static software.amazon.ion.util.IonTextUtils.printCodePointAsString;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_ESCAPED_NEWLINE_SEQUENCE_1;
+import static com.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_ESCAPED_NEWLINE_SEQUENCE_2;
+import static com.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_ESCAPED_NEWLINE_SEQUENCE_3;
+import static com.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_NEWLINE_SEQUENCE_1;
+import static com.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_NEWLINE_SEQUENCE_2;
+import static com.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_NEWLINE_SEQUENCE_3;
+import static com.amazon.ion.util.IonTextUtils.printCodePointAsString;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonType;
+import com.amazon.ion.UnexpectedEofException;
+import com.amazon.ion.impl.IonTokenConstsX.CharacterSequence;
+import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
+import com.amazon.ion.util.IonTextUtils;
 import java.io.IOException;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonType;
-import software.amazon.ion.UnexpectedEofException;
-import software.amazon.ion.impl.IonTokenConstsX.CharacterSequence;
-import software.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
-import software.amazon.ion.util.IonTextUtils;
 
 /**
  * Tokenizer for the Ion text parser in IonTextIterator. This
@@ -2351,10 +2352,10 @@ private final int read_large_char_sequence(int c) throws IOException
         if (_stream._is_byte_data) {
             return read_ut8_sequence(c);
         }
-        if (PrivateIonConstants.isHighSurrogate(c)) {
+        if (_Private_IonConstants.isHighSurrogate(c)) {
             int c2 = read_char();
-            if (PrivateIonConstants.isLowSurrogate(c2)) {
-                c = PrivateIonConstants.makeUnicodeScalar(c, c2);
+            if (_Private_IonConstants.isLowSurrogate(c2)) {
+                c = _Private_IonConstants.makeUnicodeScalar(c, c2);
             }
             else {
                 // we don't always pair up surrogates here
diff --git a/src/software/amazon/ion/impl/IonReaderTextRawX.java b/src/com/amazon/ion/impl/IonReaderTextRawX.java
similarity index 97%
rename from src/software/amazon/ion/impl/IonReaderTextRawX.java
rename to src/com/amazon/ion/impl/IonReaderTextRawX.java
index d0b1369713..9a9049aa4f 100644
--- a/src/software/amazon/ion/impl/IonReaderTextRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextRawX.java
@@ -1,36 +1,37 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.impl.IonTokenConstsX.TOKEN_CLOSE_BRACE;
-import static software.amazon.ion.impl.IonTokenConstsX.TOKEN_CLOSE_PAREN;
-import static software.amazon.ion.impl.IonTokenConstsX.TOKEN_CLOSE_SQUARE;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.impl.IonTokenConstsX.TOKEN_CLOSE_BRACE;
+import static com.amazon.ion.impl.IonTokenConstsX.TOKEN_CLOSE_PAREN;
+import static com.amazon.ion.impl.IonTokenConstsX.TOKEN_CLOSE_SQUARE;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonTextReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
+import com.amazon.ion.impl._Private_ScalarConversions.AS_TYPE;
+import com.amazon.ion.impl._Private_ScalarConversions.ValueVariant;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.util.Iterator;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.impl.PrivateScalarConversions.AS_TYPE;
-import software.amazon.ion.impl.PrivateScalarConversions.ValueVariant;
-import software.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
 
 /**
  * Reader implementation that reads the token stream and validates
@@ -49,7 +50,7 @@
  *
  * This reader scan skip values and in doing so it does not
  * materialize the contents and it does not validate the contents.
- * TODO amzn/ion-java#7 We may want to make validation on skip optional.
+ * TODO amzn/ion-java/issues/7 We may want to make validation on skip optional.
  *
  * This manages the value buffer (_v ValueVariant) and the lob
  * content (_lob_*) which is cached in some cases.  It's main
@@ -69,7 +70,7 @@
  *
  */
 abstract class IonReaderTextRawX
-    implements IonReader
+    implements IonTextReader
 {
     public abstract BigInteger bigIntegerValue();
 
@@ -405,7 +406,7 @@ private final void current_value_is_null(IonType null_type)
         clear_current_value_buffer();
         _value_type = _null_type;
         _v.setValueToNull(null_type);
-        _v.setAuthoritativeType(PrivateScalarConversions.AS_TYPE.null_value);
+        _v.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.null_value);
     }
 
     private final void current_value_is_bool(boolean value)
@@ -413,7 +414,7 @@ private final void current_value_is_bool(boolean value)
         clear_current_value_buffer();
         _value_type = IonType.BOOL;
         _v.setValue(value);
-        _v.setAuthoritativeType(PrivateScalarConversions.AS_TYPE.boolean_value);
+        _v.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.boolean_value);
     }
 
     private final void set_fieldname(SymbolToken sym) {
@@ -450,7 +451,7 @@ private final void clear_annotation_list() {
      * but the user has chosen not to step into the collection).
      * @return true if more data remains, false on eof
      */
-    boolean hasNext()
+    public boolean hasNext()
     {
         boolean has_next = has_next_raw_value();
         return has_next;
@@ -1297,7 +1298,7 @@ final String getRawFieldName()
         return _field_name;
     }
 
-    int getFieldId()
+    public int getFieldId()
     {
         // For hoisting
         if (getDepth() == 0 && is_in_struct_internal()) return UNKNOWN_SYMBOL_ID;
@@ -1317,12 +1318,12 @@ public SymbolToken getFieldNameSymbol()
 
     public Iterator<String> iterateTypeAnnotations()
     {
-        return PrivateUtils.stringIterator(getTypeAnnotations());
+        return _Private_Utils.stringIterator(getTypeAnnotations());
     }
 
     public String[] getTypeAnnotations()
     {
-        return PrivateUtils.toStrings(_annotations, _annotation_count);
+        return _Private_Utils.toStrings(_annotations, _annotation_count);
     }
 
 
diff --git a/src/software/amazon/ion/impl/IonReaderTextSystemX.java b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
similarity index 94%
rename from src/software/amazon/ion/impl/IonReaderTextSystemX.java
rename to src/com/amazon/ion/impl/IonReaderTextSystemX.java
index 07c5668365..c876386b72 100644
--- a/src/software/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
@@ -1,46 +1,47 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.impl.PrivateScalarConversions.getValueTypeName;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.impl._Private_ScalarConversions.getValueTypeName;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonBlob;
+import com.amazon.ion.IonClob;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonSexp;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.impl.IonReaderTextRawTokensX.IonReaderTextTokenException;
+import com.amazon.ion.impl.IonTokenConstsX.CharacterSequence;
+import com.amazon.ion.impl._Private_ScalarConversions.AS_TYPE;
+import com.amazon.ion.impl._Private_ScalarConversions.CantConvertException;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IntegerSize;
-import software.amazon.ion.IonBlob;
-import software.amazon.ion.IonClob;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonSexp;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.impl.IonReaderTextRawTokensX.IonReaderTextTokenException;
-import software.amazon.ion.impl.IonTokenConstsX.CharacterSequence;
-import software.amazon.ion.impl.PrivateScalarConversions.AS_TYPE;
-import software.amazon.ion.impl.PrivateScalarConversions.CantConvertException;
 import java.lang.Character;
 
 /**
@@ -55,7 +56,7 @@
  */
 class IonReaderTextSystemX
     extends IonReaderTextRawX
-    implements PrivateReaderWriter
+    implements _Private_ReaderWriter
 {
     private static int UNSIGNED_BYTE_MAX_VALUE = 255;
 
@@ -63,7 +64,7 @@ class IonReaderTextSystemX
 
     protected IonReaderTextSystemX(UnifiedInputStreamX iis)
     {
-        _system_symtab = PrivateUtils.systemSymtab(1); // TODO check IVM to determine version: amznlabs/ion-java#19, amznlabs/ion-java#24
+        _system_symtab = _Private_Utils.systemSymtab(1); // TODO check IVM to determine version: amzn/ion-java/issues/19
         init_once();
         init(iis, IonType.DATAGRAM);
     }
@@ -72,7 +73,6 @@ protected IonReaderTextSystemX(UnifiedInputStreamX iis)
     // be consolidated into a single location, but that would have to be part
     // of a larger refactor of common logic from both IonReader*SystemX classes
     // into a base class (the *Value() methods also share a lot of similarity).
-    @Override
     public IntegerSize getIntegerSize()
     {
         load_once();
@@ -80,7 +80,7 @@ public IntegerSize getIntegerSize()
         {
             return null;
         }
-        return PrivateScalarConversions.getIntegerSize(_v.getAuthoritativeType());
+        return _Private_ScalarConversions.getIntegerSize(_v.getAuthoritativeType());
     }
 
     private void load_once()
@@ -486,7 +486,7 @@ public SymbolToken[] getTypeAnnotationSymbols()
         for (int i = 0; i < count; i++)
         {
             SymbolToken sym = _annotations[i];
-            SymbolToken updated = PrivateUtils.localize(symbols, sym);
+            SymbolToken updated = _Private_Utils.localize(symbols, sym);
             if (updated != sym) _annotations[i] = updated;
             result[i] = updated;
         }
@@ -615,7 +615,7 @@ public SymbolTable getSymbolTable()
 
 
     @Override
-    final int getFieldId()
+    public final int getFieldId()
     {
         // Superclass handles hoisting logic
         int id = super.getFieldId();
@@ -658,7 +658,7 @@ public SymbolToken getFieldNameSymbol()
         SymbolToken sym = super.getFieldNameSymbol();
         if (sym != null)
         {
-            sym = PrivateUtils.localize(getSymbolTable(), sym);
+            sym = _Private_Utils.localize(getSymbolTable(), sym);
         }
         return sym;
     }
@@ -874,7 +874,7 @@ private int readBytes(byte[] buffer, int offset, int len)
                 buffer[offset++] = (byte)c;
             }
             break;
-        // CLOB 
+        // CLOB
         case IonTokenConstsX.TOKEN_STRING_TRIPLE_QUOTE:
             while (len-- > 0) {
                 c = _scanner.read_triple_quoted_char(true);
diff --git a/src/software/amazon/ion/impl/IonReaderTextUserX.java b/src/com/amazon/ion/impl/IonReaderTextUserX.java
similarity index 91%
rename from src/software/amazon/ion/impl/IonReaderTextUserX.java
rename to src/com/amazon/ion/impl/IonReaderTextUserX.java
index b1dfc8d5a4..1b0d0dcd7d 100644
--- a/src/software/amazon/ion/impl/IonReaderTextUserX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextUserX.java
@@ -1,34 +1,35 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonType;
+import com.amazon.ion.OffsetSpan;
+import com.amazon.ion.SeekableReader;
+import com.amazon.ion.Span;
+import com.amazon.ion.SpanProvider;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.TextSpan;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.UnsupportedIonVersionException;
 import java.util.regex.Pattern;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonType;
-import software.amazon.ion.OffsetSpan;
-import software.amazon.ion.SeekableReader;
-import software.amazon.ion.Span;
-import software.amazon.ion.SpanProvider;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.TextSpan;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.UnsupportedIonVersionException;
 
 /**
  *    The text user reader add support for symbols and recognizes,
@@ -49,10 +50,11 @@
  *    symbol is a system symbol or if there is a local symbol
  *    table in the input stream.  Otherwise it return the
  *    undefined symbol value.
+ *
  */
 class IonReaderTextUserX
     extends IonReaderTextSystemX
-    implements PrivateReaderWriter
+    implements _Private_ReaderWriter
 {
     private static final Pattern ION_VERSION_MARKER_REGEX = Pattern.compile("^\\$ion_[0-9]+_[0-9]+$");
 
@@ -62,7 +64,7 @@ class IonReaderTextUserX
      * {@link OffsetSpan}s.
      */
     private final int _physical_start_offset;
-    private final PrivateLocalSymbolTableFactory _lstFactory;
+    private final _Private_LocalSymbolTableFactory _lstFactory;
 
     // IonSystem   _system; now in IonReaderTextSystemX where it could be null
     IonCatalog  _catalog;
@@ -70,7 +72,7 @@ class IonReaderTextUserX
 
 
     protected IonReaderTextUserX(IonCatalog catalog,
-                                 PrivateLocalSymbolTableFactory lstFactory,
+                                 _Private_LocalSymbolTableFactory lstFactory,
                                  UnifiedInputStreamX uis,
                                  int physicalStartOffset)
     {
@@ -82,7 +84,7 @@ protected IonReaderTextUserX(IonCatalog catalog,
     }
 
     protected IonReaderTextUserX(IonCatalog catalog,
-                                 PrivateLocalSymbolTableFactory lstFactory,
+                                 _Private_LocalSymbolTableFactory lstFactory,
                                  UnifiedInputStreamX uis) {
         this(catalog, lstFactory, uis, 0);
     }
@@ -103,7 +105,7 @@ protected IonReaderTextUserX(IonCatalog catalog,
      * @return true if more data remains, false on eof
      */
     @Override
-    boolean hasNext()
+    public boolean hasNext()
     {
         boolean has_next = has_next_user_value();
         return has_next;
diff --git a/src/software/amazon/ion/impl/IonReaderTreeSystem.java b/src/com/amazon/ion/impl/IonReaderTreeSystem.java
similarity index 86%
rename from src/software/amazon/ion/impl/IonReaderTreeSystem.java
rename to src/com/amazon/ion/impl/IonReaderTreeSystem.java
index 55cb5b5245..f8a12181b0 100644
--- a/src/software/amazon/ion/impl/IonReaderTreeSystem.java
+++ b/src/com/amazon/ion/impl/IonReaderTreeSystem.java
@@ -1,59 +1,61 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.impl.PrivateUtils.readFully;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.impl._Private_Utils.readFully;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonBool;
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonDecimal;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonFloat;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonLob;
+import com.amazon.ion.IonNull;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonText;
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl._Private_IonValue.SymbolTableProvider;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.Iterator;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IntegerSize;
-import software.amazon.ion.IonBool;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonLob;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonText;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.impl.PrivateIonValue.SymbolTableProvider;
+
 
 class IonReaderTreeSystem
-    implements IonReader, PrivateReaderWriter
+    implements IonReader, _Private_ReaderWriter
 {
     protected final SymbolTable   _system_symtab;
     protected Iterator<IonValue>  _iter;
     protected IonValue            _parent;
-    protected PrivateIonValue   _next;
-    protected PrivateIonValue   _curr;
+    protected _Private_IonValue   _next;
+    protected _Private_IonValue   _curr;
     protected boolean             _eof;
 
     /** Holds pairs: IonValue parent, Iterator<IonValue> cursor */
@@ -103,7 +105,7 @@ void re_init(IonValue value, boolean hoisted)
         if (value instanceof IonDatagram) {
             // datagrams interacting with these readers must be
             // IonContainerPrivate containers
-            assert(value instanceof PrivateIonContainer);
+            assert(value instanceof _Private_IonContainer);
             IonDatagram dg = (IonDatagram) value;
             _parent = dg;
             _next = null;
@@ -111,7 +113,7 @@ void re_init(IonValue value, boolean hoisted)
         }
         else {
             _parent = (hoisted ? null : value.getContainer());
-            _next = (PrivateIonValue) value;
+            _next = (_Private_IonValue) value;
         }
     }
 
@@ -148,9 +150,15 @@ private void pop() {
         _eof = false;
     }
 
+    public boolean hasNext()
+    {
+        IonType next_type = next_helper_system();
+        return (next_type != null);
+    }
+
     public IonType next()
     {
-        if (this._next == null && next_helper_system() == null) {
+        if (this._next == null && !this.hasNext()) {
             this._curr = null;
             return null;
         }
@@ -166,7 +174,7 @@ IonType next_helper_system()
         if (this._next != null) return this._next.getType();
 
         if (this._iter != null && this._iter.hasNext()) {
-            this._next = (PrivateIonValue) this._iter.next();
+            this._next = (_Private_IonValue) this._iter.next();
         }
 
         if ((this._eof =(this._next == null)) == true) {
@@ -230,7 +238,7 @@ public final SymbolToken[] getTypeAnnotationSymbols()
     public final Iterator<String> iterateTypeAnnotations()
     {
         String [] annotations = getTypeAnnotations();
-        return PrivateUtils.stringIterator(annotations);
+        return _Private_Utils.stringIterator(annotations);
     }
 
 
@@ -249,6 +257,12 @@ public boolean isNullValue()
         return _curr.isNullValue();
     }
 
+    public int getFieldId()
+    {
+        // FIXME IonValueImpl.getFieldId doesn't return -1 as specced here!
+        return (_curr == null || _top == 0) ? SymbolTable.UNKNOWN_SYMBOL_ID : _curr.getFieldId();
+    }
+
     public String getFieldName()
     {
         return (_curr == null || _top == 0) ? null : _curr.getFieldName();
@@ -445,13 +459,13 @@ private static final class Children implements Iterator<IonValue>
     {
         boolean             _eof;
         int                 _next_idx;
-        PrivateIonContainer _parent;
+        _Private_IonContainer _parent;
         IonValue            _curr;
 
         Children(IonContainer parent)
         {
-            if (parent instanceof PrivateIonContainer) {
-                _parent = (PrivateIonContainer)parent;
+            if (parent instanceof _Private_IonContainer) {
+                _parent = (_Private_IonContainer) parent;
                 _next_idx = 0;
                 _curr = null;
                 if (_parent.isNullValue()) {
@@ -519,7 +533,6 @@ public SymbolTable pop_passed_symbol_table()
     }
 
 
-    @Override
     public IntegerSize getIntegerSize()
     {
         if(_curr instanceof IonInt)
diff --git a/src/software/amazon/ion/impl/IonReaderTreeUserX.java b/src/com/amazon/ion/impl/IonReaderTreeUserX.java
similarity index 83%
rename from src/software/amazon/ion/impl/IonReaderTreeUserX.java
rename to src/com/amazon/ion/impl/IonReaderTreeUserX.java
index 9b24511825..1ed1c31bfe 100644
--- a/src/software/amazon/ion/impl/IonReaderTreeUserX.java
+++ b/src/com/amazon/ion/impl/IonReaderTreeUserX.java
@@ -1,46 +1,48 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SeekableReader;
+import com.amazon.ion.Span;
+import com.amazon.ion.SpanProvider;
+import com.amazon.ion.SymbolTable;
 
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SeekableReader;
-import software.amazon.ion.Span;
-import software.amazon.ion.SpanProvider;
-import software.amazon.ion.SymbolTable;
 
 final class IonReaderTreeUserX
     extends IonReaderTreeSystem
-    implements PrivateReaderWriter
+    implements _Private_ReaderWriter
 {
 
-    private final PrivateLocalSymbolTableFactory _lstFactory;
+    private final _Private_LocalSymbolTableFactory _lstFactory;
 
     IonCatalog _catalog;
     private SymbolTable _symbols;
 
-    public IonReaderTreeUserX(IonValue value, IonCatalog catalog, PrivateLocalSymbolTableFactory lstFactory)
+    public IonReaderTreeUserX(IonValue value, IonCatalog catalog, _Private_LocalSymbolTableFactory lstFactory)
     {
         super(value); // calls re_init
         _catalog = catalog;
@@ -62,6 +64,12 @@ public SymbolTable getSymbolTable()
         return _symbols;
     }
 
+    @Override
+    public boolean hasNext()
+    {
+        return next_helper_user();
+    }
+
     @Override
     public IonType next()
     {
@@ -74,7 +82,7 @@ public IonType next()
         return this._curr.getType();
     }
 
-    private boolean next_helper_user()
+    boolean next_helper_user()
     {
         if (_eof) return false;
         if (_next != null) return true;
@@ -97,7 +105,7 @@ private boolean next_helper_user()
                         // there are no null values we will consume here
                         break;
                     }
-                    int sid = sym.symbolValue().getSid();
+                    int sid = sym.getSymbolId();
                     if (sid == UNKNOWN_SYMBOL_ID) {
                         String name = sym.stringValue();
                         if (name != null) {
diff --git a/src/com/amazon/ion/impl/IonTextBufferedStream.java b/src/com/amazon/ion/impl/IonTextBufferedStream.java
new file mode 100644
index 0000000000..2be9e8f4ab
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonTextBufferedStream.java
@@ -0,0 +1,311 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * InputStream implementations over a number of types (byte[] and String)
+ * that do not handle character decoding.  Each byte is treated as just
+ * a character from 0 to 255.  These are used internally to wire up some
+ * of the Iterator code to some of the base64 encoding (or decoding)
+ * routins in ion.impl.
+ */
+abstract class IonTextBufferedStream extends InputStream
+{
+    public static IonTextBufferedStream makeStream(byte[] bytes) {
+        return new SimpleBufferStream(bytes);
+    }
+    public static IonTextBufferedStream makeStream(byte[] bytes, int offset, int len) {
+        return new OffsetBufferStream(bytes, offset, len);
+    }
+    public static IonTextBufferedStream makeStream(String text) {
+        return new StringStream(text);
+    }
+    /*** FIXME: REMOVE OR FINISH
+    public static IonTextBufferedStream makeStream(InputStream stream) {
+        return new StreamStream(stream);
+    }
+    */
+    public abstract int getByte(int pos);
+    public abstract int position();
+    public abstract IonTextBufferedStream setPosition(int pos);
+
+    /*** FIXME: REMOVE OR FINISH
+    static final class StreamStream extends IonTextBufferedStream
+    {
+        static final int DEFAULT_BUFFER_SIZE = (32*1024);
+
+        InputStream _stream;
+        byte []     _buffer1;
+        byte []     _buffer2;
+        long        _file_pos1;
+        long        _file_pos2;
+        int         _len;
+        int         _pos;
+
+        public StreamStream (InputStream stream)
+        {
+            _stream = stream;
+            _buffer1 = new byte[DEFAULT_BUFFER_SIZE];
+            _buffer2 = new byte[DEFAULT_BUFFER_SIZE];
+            _pos = 0;
+            _file_pos1 = 0;
+            _file_pos2 = -1;
+            _len = load(_buffer1);
+        }
+        int load(byte[] buffer) {
+
+        }
+
+        @Override
+        public final int getByte(int pos) {
+            if (pos < 0 || pos >= _len) return -1;
+            return _buffer[pos] & 0xff;
+        }
+
+        @Override
+        public final int read()
+            throws IOException
+        {
+            if (_pos >= _len) return -1;
+            return _buffer[_pos++];
+        }
+
+        @Override
+        public final int read(byte[] bytes, int offset, int len) throws IOException
+        {
+            int copied = 0;
+            if (offset < 0) throw new IllegalArgumentException();
+            copied = len;
+            if (_pos + len >= _len) copied = _len - _pos;
+            System.arraycopy(_buffer, _pos, bytes, offset, copied);
+            _pos += copied;
+            return copied;
+        }
+
+        @Override
+        public final int position() {
+            return _pos;
+        }
+
+        @Override
+        public final SimpleBufferStream setPosition(int pos)
+        {
+            if (_pos < 0 || _pos > _len) throw new IllegalArgumentException();
+            _pos = pos;
+            return this;
+        }
+
+        @Override
+        public void close() throws IOException
+        {
+            _stream.close();
+            super.close();
+        }
+    }
+    */
+
+    static final class SimpleBufferStream extends IonTextBufferedStream
+    {
+        byte [] _buffer;
+        int     _len;
+        int     _pos;
+
+        public SimpleBufferStream(byte[] buffer)
+        {
+            _buffer = buffer;
+            _pos = 0;
+            _len = buffer.length;
+        }
+
+        @Override
+        public final int getByte(int pos) {
+            if (pos < 0 || pos >= _len) return -1;
+            return _buffer[pos] & 0xff;
+        }
+
+        @Override
+        public final int read()
+            throws IOException
+        {
+            if (_pos >= _len) return -1;
+            return _buffer[_pos++];
+        }
+
+        @Override
+        public final int read(byte[] bytes, int offset, int len) throws IOException
+        {
+            int copied = 0;
+            if (offset < 0) throw new IllegalArgumentException();
+            copied = len;
+            if (_pos + len >= _len) copied = _len - _pos;
+            System.arraycopy(_buffer, _pos, bytes, offset, copied);
+            _pos += copied;
+            return copied;
+        }
+
+        @Override
+        public final int position() {
+            return _pos;
+        }
+
+        @Override
+        public final SimpleBufferStream setPosition(int pos)
+        {
+            if (_pos < 0 || _pos > _len) throw new IllegalArgumentException();
+            _pos = pos;
+            return this;
+        }
+
+        @Override
+        public void close()
+            throws IOException
+        {
+            _pos = _len;
+            super.close();
+        }
+    }
+
+    static final class StringStream extends IonTextBufferedStream
+    {
+
+        String _string;
+        int    _end;
+        int    _pos;
+
+        public StringStream(String text)
+        {
+            _string = text;
+            _pos = 0;
+            _end = text.length();
+        }
+
+        @Override
+        public final int getByte(int pos) {
+            if (pos < 0) return -1;
+            if (pos >= _end) return -1;
+            return _string.charAt(pos);
+        }
+
+        @Override
+        public final int read()
+            throws IOException
+        {
+            if (_pos >= _end) return -1;
+            char c = _string.charAt(_pos++);
+            return c;
+        }
+
+        @Override
+        public final int read(byte[] bytes, int offset, int len) throws IOException
+        {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public final int position() {
+            return _pos;
+        }
+
+        @Override
+        public final StringStream setPosition(int pos)
+        {
+            if (pos < 0) throw new IllegalArgumentException();
+            if (pos > _end) throw new IllegalArgumentException();
+            _pos = pos;
+            return this;
+        }
+
+        @Override
+        public void close()
+            throws IOException
+        {
+            _pos = _end;
+            super.close();
+        }
+    }
+
+    static final class OffsetBufferStream extends IonTextBufferedStream
+    {
+        byte [] _buffer;
+        int     _start;
+        int     _end;
+        int     _pos;
+
+        public OffsetBufferStream(byte[] buffer, int start, int max)
+        {
+            _buffer = buffer;
+            _pos = start;
+            _start = start;
+            _end = start + max;
+        }
+
+        @Override
+        public final int getByte(int pos) {
+            if (pos < 0) return -1;
+            pos += _start;
+            if (pos >= _end) return -1;
+            return _buffer[pos] & 0xff;
+        }
+
+        @Override
+        public final int read()
+            throws IOException
+        {
+            int c;
+            if (_pos >= _end) return -1;
+            c = (((int)_buffer[_pos++]) & 0xFF);  // trim sign extension bits
+            return c;
+        }
+
+        @Override
+        public final int read(byte[] bytes, int offset, int len) throws IOException
+        {
+            int copied = 0;
+            if (offset < 0) throw new IllegalArgumentException();
+            copied = len;
+            if (_pos + len >= _end) copied = _end - _pos;
+            System.arraycopy(_buffer, _pos, bytes, offset, copied);
+            _pos += copied;
+            return copied;
+        }
+
+        @Override
+        public final int position() {
+            return _pos - _start;
+        }
+
+        @Override
+        public final OffsetBufferStream setPosition(int pos)
+        {
+            if (pos < 0) throw new IllegalArgumentException();
+            pos += _start;
+            if (pos > _end) throw new IllegalArgumentException();
+            _pos = pos;
+            return this;
+        }
+
+        @Override
+        public void close()
+            throws IOException
+        {
+            _pos = _end;
+            super.close();
+        }
+    }
+}
diff --git a/src/software/amazon/ion/impl/IonTokenConstsX.java b/src/com/amazon/ion/impl/IonTokenConstsX.java
similarity index 98%
rename from src/software/amazon/ion/impl/IonTokenConstsX.java
rename to src/com/amazon/ion/impl/IonTokenConstsX.java
index 670bdf3183..c361606636 100644
--- a/src/software/amazon/ion/impl/IonTokenConstsX.java
+++ b/src/com/amazon/ion/impl/IonTokenConstsX.java
@@ -1,22 +1,23 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonType;
-import software.amazon.ion.impl.PrivateScalarConversions.CantConvertException;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonType;
+import com.amazon.ion.impl._Private_ScalarConversions.CantConvertException;
 
 
 /**
diff --git a/src/com/amazon/ion/impl/IonTokenReader.java b/src/com/amazon/ion/impl/IonTokenReader.java
new file mode 100644
index 0000000000..34bf32f921
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonTokenReader.java
@@ -0,0 +1,1623 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.util.IonTextUtils.isDigit;
+import static com.amazon.ion.util.IonTextUtils.isOperatorPart;
+import static com.amazon.ion.util.IonTextUtils.isWhitespace;
+import static com.amazon.ion.util.IonTextUtils.printCodePointAsString;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonException;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.UnexpectedEofException;
+import com.amazon.ion.impl._Private_IonConstants.HighNibble;
+import com.amazon.ion.util.IonTextUtils;
+import java.io.IOException;
+import java.io.PushbackReader;
+import java.io.Reader;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Stack;
+
+/**
+ *  This class is responsible for breaking the input stream into Tokens.
+ *  It does both the token recognition (aka the scanner) and the state
+ *  management needed to use the value underlying some of these tokens.
+ */
+final class IonTokenReader
+{
+    // TODO clean up, many of these are unused.
+    public static int isPunctuation = 0x0001;
+    public static int isKeyword     = 0x0002;
+    public static int isTypeName    = 0x0004;
+    public static int isConstant    = 0x0008;
+    private static int isPosInt     = 0x0010;
+    private static int isNegInt     = 0x0020;
+    public static int isFloat       = 0x0040;
+    public static int isDecimal     = 0x0080;
+    public static int isTag         = 0x0100;
+
+    static public enum Type {
+
+        eof                 (isPunctuation,         "<eof>"    ),
+        tOpenParen          (isPunctuation,         "("        ),
+        tCloseParen         (isPunctuation,         ")"        ),
+        tOpenSquare         (isPunctuation,         "["        ),
+        tCloseSquare        (isPunctuation,         "["        ),
+        tOpenCurly          (isPunctuation,         "{"        ),
+        tCloseCurly         (isPunctuation,         "}"        ),
+        tOpenDoubleCurly    (isPunctuation,         "{{"    ),
+        //tCloseDoubleCurly (isPunctuation,         "}}"    ), // only valid at end of blob, not recognized in token read
+        tSingleQuote        (isPunctuation,         "'"        ),
+        tDoubleQuote        (isPunctuation,         "\""    ),
+        //tColon            (isPunctuation,         ":"        ), // filled in during identifier scan with lookahead
+        //tDoubleColon      (isPunctuation,         "::"    ), // ditto
+        tComma              (isPunctuation,         ","        ),
+
+        kwTrue            ((isConstant + isTag + isKeyword),  "true",           HighNibble.hnBoolean),
+        kwFalse           ((isConstant + isTag + isKeyword),  "false",          HighNibble.hnBoolean),
+        kwNull            ((isConstant + isTag + isKeyword),  "null",           HighNibble.hnNull),
+
+        kwNullNull        ((isConstant + isTag + isKeyword),  "null.null",      HighNibble.hnNull),
+        kwNullInt         ((isConstant + isTag + isKeyword),  "null.int",       HighNibble.hnPosInt),
+        kwNullList        ((isConstant + isTag + isKeyword),  "null.list",      HighNibble.hnList),
+        kwNullSexp        ((isConstant + isTag + isKeyword),  "null.sexp",      HighNibble.hnSexp),
+        kwNullFloat       ((isConstant + isTag + isKeyword),  "null.float",     HighNibble.hnFloat),
+        kwNullBlob        ((isConstant + isTag + isKeyword),  "null.blob",      HighNibble.hnBlob),
+        kwNullClob        ((isConstant + isTag + isKeyword),  "null.clob",      HighNibble.hnClob),
+        kwNullString      ((isConstant + isTag + isKeyword),  "null.string",    HighNibble.hnString),
+        kwNullStruct      ((isConstant + isTag + isKeyword),  "null.struct",    HighNibble.hnStruct),  // LN
+        kwNullSymbol      ((isConstant + isTag + isKeyword),  "null.symbol",    HighNibble.hnSymbol),
+        kwNullBoolean     ((isConstant + isTag + isKeyword),  "null.bool",      HighNibble.hnBoolean),
+        kwNullDecimal     ((isConstant + isTag + isKeyword),  "null.decimal",   HighNibble.hnDecimal),
+        kwNullTimestamp   ((isConstant + isTag + isKeyword),  "null.timestamp", HighNibble.hnTimestamp),
+
+        kwNan             ((isConstant + isKeyword),          "nan",            HighNibble.hnFloat),
+        kwPosInf          ((isConstant + isKeyword),          "+inf",           HighNibble.hnFloat),
+        kwNegInf          ((isConstant + isKeyword),          "-inf",           HighNibble.hnFloat),
+
+        constNegInt       ((isConstant + isNegInt),           "cNegInt",        HighNibble.hnNegInt),
+        constPosInt       ((isConstant + isPosInt),           "cPosInt",        HighNibble.hnPosInt),
+        constFloat        ((isConstant + isFloat),            "cFloat",         HighNibble.hnFloat),
+        constDecimal      ((isConstant + isDecimal),          "cDec",           HighNibble.hnDecimal),
+        constTime         ((isConstant),                      "cTime",          HighNibble.hnTimestamp),
+        constString       ((isConstant + isTag),              "cString",        HighNibble.hnString),
+        constSymbol       ((isConstant + isTag),              "cSymbol",        HighNibble.hnSymbol),
+        constMemberName   ((isConstant + isTag),              "cMemberName",    HighNibble.hnSymbol),
+        constUserTypeDecl ((isConstant + isTag),              "cUserTypeDecl",  HighNibble.hnSymbol),
+
+        none(0);
+
+        private int            flags;
+        private String        image;
+        private HighNibble    highNibble;
+
+        Type() {}
+        Type(int v) {
+            this.flags = v;
+        }
+        Type(int v, String name) {
+            flags = v;
+            image = name;
+        }
+        Type(int v, String name, HighNibble ln) {
+            flags = v;
+            image = name;
+            highNibble = ln;
+        }
+
+        /**
+         * TODO why this class exists at all.  We should store
+         * this stuff directly in IonTimestampImpl as a BigDecimal (time) and
+         * int (offset, -1==unknown) and avoid constructing more objects.
+         * <p>
+         * Also, we probably don't need the DateFormats.  The parser already
+         * matches against a regex, so we should be able to pull the data
+         * straight from the string to compute the value.
+         */
+        public static class timeinfo {  // TODO remove vestigial class timeinfo
+
+            static public Timestamp parse(String s) {
+                Timestamp t = null;
+                s = s.trim(); // TODO why is this necessary?
+                try {
+                    t = Timestamp.valueOf(s);  // TODO should Timestamp just throw an IonException?
+                }
+                catch (IllegalArgumentException e) {
+                    throw new IonException(e);
+                }
+                return t;
+            }
+
+        }
+
+        // TODO move out of this class into TR.
+        public Type setNumericValue(IonTokenReader tr, String s) {
+            switch (this) {
+            case kwNan:
+                tr.doubleValue = Double.NaN;
+                return this;
+            case kwPosInf:
+                tr.doubleValue = Double.POSITIVE_INFINITY;
+                return this;
+            case kwNegInf:
+                tr.doubleValue = Double.NEGATIVE_INFINITY;
+                return this;
+            case constNegInt:
+            case constPosInt:
+                if (NumberType.NT_HEX.equals(tr.numberType)) {
+                    tr.intValue = new BigInteger(s, 16);
+                    // In hex case we've discarded the prefix [+-]?0x so
+                    // reconstruct the sign
+                    if (this == constNegInt) tr.intValue = tr.intValue.negate();
+                }
+                else {
+                    tr.intValue = new BigInteger(s, 10);
+
+                    // Make sure that sign aligns with type.
+                    // Note that this allows negative zero.
+                    assert (BigInteger.ZERO.equals(tr.intValue)
+                             ? true
+                             : this == (tr.intValue.signum() < 0 ? constNegInt : constPosInt));
+                }
+                return this;
+            case constFloat:
+                tr.doubleValue = Double.parseDouble(s);
+                return this;
+            case constDecimal:
+                // BigDecimal parses using e instead of d or D
+                String eFormat = s.replace('d', 'e');
+                if (eFormat == s) {
+                    // No match for 'd' but look for 'D'
+                    eFormat = s.replace('D', 'e');
+                }
+                tr.decimalValue = Decimal.valueOf(eFormat);
+                return this;
+            case constTime:
+                tr.dateValue = timeinfo.parse(s);
+                return this;
+            default:
+                throw new  AssertionError("Unknown op for numeric case: " + this);
+            }
+        }
+
+        public boolean isKeyword()     { return ((flags & isKeyword) != 0); }
+        public boolean isConstant()    { return ((flags & isConstant) != 0); }
+        public boolean isNumeric()     { return ((flags & (isPosInt + isNegInt + isFloat + isDecimal)) != 0); }
+
+        public String  getImage()      { return (image == null) ? this.name() : image; }
+
+        public HighNibble getHighNibble() { return highNibble; }
+
+        @Override
+        public String toString() {
+            if (this.getImage() != null) return this.getImage();
+            return super.toString();
+        }
+    }
+
+    //
+    // this is a temp reader we use when converting blob's into
+    // blob values
+    //
+    static class LocalReader extends Reader {
+
+        IonTokenReader _tr;
+        int            _sboffset;
+        int            _sbavailable;
+
+        LocalReader(IonTokenReader tr) {
+            _tr = tr;
+        }
+
+        @Override
+        public void close() throws IOException {
+            _tr = null;
+            return;
+        }
+
+        @Override
+        public void reset() {
+            _sboffset = 0;
+            _sbavailable = _tr.value.length();
+        }
+
+        @Override
+        public int read() throws IOException {
+            int c = -1;
+
+            if (_sbavailable > 0) {
+                c = _tr.value.charAt(_sboffset++);
+                _sbavailable--;
+            }
+            else {
+                c = _tr.read();
+            }
+            return c;
+        }
+
+        @Override
+        public int read(char[] dst, int dstoffset, int len) throws IOException {
+            int needed = len;
+
+            while (needed-- > 0) {
+                int c = this.read();
+                if (c < 0) break;
+                dst[dstoffset++] = (char)c;
+            }
+            return len - needed;
+        }
+    }
+
+    // easy to use number types
+    static enum NumberType {
+        NT_POSINT,
+        NT_NEGINT,
+        NT_HEX, // pos or neg
+        NT_FLOAT,
+        NT_DECIMAL,
+        NT_DECIMAL_NEGATIVE_ZERO
+    }
+
+    /**
+     * Magic "character" to represent an escape sequence with an empty expansion.
+     * (or, in other words, a non-eof character that should be ignored)
+     */
+    static final int EMPTY_ESCAPE_SEQUENCE = -2;
+
+
+    //--------------------------------------------------------------------
+    //
+    // this is the parsing context to manage the in list, in struct,
+    // waiting for identifier tag (usertypedecl or member name) vs value
+    //
+    //
+    static public enum Context {
+        NONE,
+        STRING,
+        BLOB,
+        CLOB,
+        EXPRESSION,
+        DATALIST,
+        STRUCT;
+    }
+    public Stack<Context> contextStack = new Stack<Context>();
+    public Context context = Context.NONE;
+
+    public  void pushContext(Context newcontext) {
+        contextStack.push(newcontext);
+        context = newcontext;
+    }
+    public Context popContext() {
+        context = contextStack.pop();
+        return context;
+    }
+
+    //--------------------------------------------------------------------
+    //
+    // state that keeps us on track ...
+    //
+
+    private IonCharacterReader  in;
+    private LocalReader         localReader;
+    private PushbackReader      pushbackReader;
+
+    public boolean          inQuotedContent;
+    public boolean          isIncomplete;
+    public boolean          isLongString;
+    public boolean          quotedIdentifier;
+    public int              embeddedSlash;
+    public int              endquote;
+
+
+    public Type             t        = Type.none;
+    public Type             keyword  = Type.none;
+    public StringBuilder    value    = new StringBuilder();
+
+    public String           stringValue;
+    public Double           doubleValue;
+    public BigInteger       intValue;
+
+    public Timestamp        dateValue;
+    public BigDecimal       decimalValue;
+    public boolean          isNegative;
+    public NumberType       numberType;
+
+    public IonTokenReader(final Reader r) {
+        this.in = new IonCharacterReader( r );
+    }
+
+    public long getConsumedAmount() {
+        return in.getConsumedAmount();
+    }
+
+    public int getLineNumber() {
+        return in.getLineNumber();
+    }
+
+    public int getColumn() {
+        return in.getColumn();
+    }
+
+    public String position() {
+        return "line " + this.getLineNumber() + " column " + this.getColumn();
+    }
+
+    public String getValueString(boolean is_in_expression) throws IOException {
+        if (this.isIncomplete) {
+            finishScanString(is_in_expression);
+            stringValue = value.toString();  // TODO combine with below?
+            this.inQuotedContent = false;
+        }
+        else if (stringValue == null) {
+            stringValue = value.toString();
+        }
+        return stringValue;
+    }
+
+    void resetValue() {
+        isIncomplete = false;
+        stringValue = null;
+        doubleValue = null;
+        intValue = null;
+        dateValue = null;
+        decimalValue = null;
+        isNegative = false;
+        numberType = null;
+        t = null;
+        value.setLength(0);
+    }
+
+    public PushbackReader getPushbackReader() {
+        if (localReader == null) {
+            localReader = new LocalReader(this);
+            pushbackReader =
+                new PushbackReader(localReader,
+                                   _Private_Utils.MAX_LOOKAHEAD_UTF16);
+        }
+        localReader.reset();
+        return pushbackReader ;
+    }
+
+    /**
+     * Reads the next character using the underlying stream.
+     * @return -1 on end of stream.
+     * @throws IOException
+     */
+    final int read() throws IOException {
+        final int ch = in.read();
+        assert ch != '\r';
+        return ch;
+    }
+
+
+    int readIgnoreWhitespace() throws IOException {
+        assert !inQuotedContent;
+
+        int c;
+
+        // read through comments - this detects and rejects double slash
+        // and slash star style comments and their contents
+        for (;;) {
+            c = read();
+
+            if (c == '/') { // possibly a start of a comment
+                int c2 = read();
+
+                if (c2 == '/') {
+                    // we have a // comment, scan for the terminating new line
+                    while (c2 != '\n' && c2 != -1) {
+                        c2 = read();
+                    }
+                    c = c2;
+                }
+                else if (c2 == '*') {
+                    // we have a /* */ comment scan for closing */
+                    scancomment:
+                    while (c2 != -1) {
+                        c2 = read();
+
+                        if (c2 == '*') {
+                            c2 = read();
+
+                            if (c2 == '/') {
+                                break scancomment;
+                            }
+                            unread(c2); // in case this was the '*' we're looking for
+                        }
+                    }
+                    c = read();
+                }
+                else {
+                    // it wasn't a comment start, throw it back
+                    unread(c2);
+                }
+            }
+            if (/* inContent ||*/ !isWhitespace(c)) {
+                break;
+            }
+        }
+        return c;
+    }
+    void unread(int c) throws IOException {
+        this.in.unread(c);
+    }
+
+    // TODO clone the body of next(c) here, later , for perf, we
+    //      don't really want TWO methods calls per character, or
+    //      mostly we don't want an extra one. (and I doubt that
+    //      Java handles the tail optimization)
+    public Type next(boolean is_in_expression) throws IOException {
+        inQuotedContent = false;
+        int c = this.readIgnoreWhitespace();
+        return next(c, is_in_expression);
+    }
+
+    private Type next(int c, boolean is_in_expression) throws IOException {
+        int c2;
+        t = Type.none;
+
+        isIncomplete = false;
+        switch (c) {
+        case -1:
+            return (t = Type.eof);
+        case '{':
+            c2 = read();
+            if (c2 == '{') {
+                return (t = Type.tOpenDoubleCurly);
+            }
+            unread(c2);
+            return (t = Type.tOpenCurly);
+        case '}':
+            return (t = Type.tCloseCurly);
+        case '[':
+            return (t = Type.tOpenSquare);
+        case ']':
+            return (t = Type.tCloseSquare);
+        case '(':
+            return (t = Type.tOpenParen);
+        case ')':
+            return (t = Type.tCloseParen);
+        case ',':
+            return (t = Type.tComma);
+        case '0': case '1': case '2': case '3': case '4':
+        case '5': case '6': case '7': case '8': case '9':
+            return readNumber(c);
+        case '\"':
+            inQuotedContent = true;
+            this.keyword = Type.none; // anything in quotes isn't a keyword
+            return scanString(c, _Private_IonConstants.lnIsVarLen - 1);
+        case '\'':
+            c2 = read();
+            if (c2 == '\'') {
+                c2 = read();
+                if (c2 == '\'') {
+                    return scanLongString();
+                }
+                this.unread(c2);
+                c2 = '\''; // restore c2 for the next unread
+            }
+            this.unread(c2);
+            inQuotedContent = true;
+            return scanIdentifier(c);
+        case '+':
+            c2 = read();
+            if (c2 == 'i') {
+                c2 = read();
+                if (c2 == 'n') {
+                    c2 = read();
+                    if (c2 == 'f') {
+                        return (t = Type.kwPosInf);
+                    }
+                    this.unread(c2);
+                    c2 = 'n';
+                }
+                this.unread(c2);
+                c2 = 'i';
+            }
+            this.unread(c2);
+            if (is_in_expression) {
+                return scanOperator(c);
+            }
+            break; // break to error
+        case '-':
+            c2 = read();
+            if (c2 >= '0' && c2 <= '9') {
+                this.unread(c2);
+                return readNumber(c);
+            }
+            if (c2 == 'i') {
+                c2 = read();
+                if (c2 == 'n') {
+                    c2 = read();
+                    if (c2 == 'f') {
+                        return (t = Type.kwNegInf);
+                    }
+                    this.unread(c2);
+                    c2 = 'n';
+                }
+                this.unread(c2);
+                c2 = 'i';
+            }
+            this.unread(c2);
+            if (is_in_expression) {
+                return scanOperator(c);
+            }
+            break; // break to error
+        default:
+            if (IonTextUtils.isIdentifierStart(c)) {
+                return scanIdentifier(c);
+            }
+            if (is_in_expression && isOperatorPart(c)) {
+                return scanOperator(c);
+            }
+        }
+
+        String message =
+            "Unexpected character " + printCodePointAsString(c) +
+            " encountered at line " + this.getLineNumber() +
+            " column " + this.getColumn();
+        throw new IonException(message);
+    }
+
+
+    public Type scanIdentifier(int c) throws IOException
+    {
+        // reset our local value buffer
+        resetValue();
+
+        // we don't have an identifier type any longer, just string
+        this.t = Type.constSymbol;
+
+        // some strings are keywords, most are not
+        // mostly we'll guess that it's not a keyword
+        this.keyword = null;
+
+        // first we read the identifier content into our value buffer
+        // if the value is quoted, use the escape char loop, otherwise
+        // look for the non-identifier character (and throw it back)
+
+        if (!readIdentifierContents(c)) { // not quoted (true is quoted)
+            // anything in quotes (even single quotes) is not a keyword
+            // and here we're not in quoted content (that is handled above)
+            // so see if it's also a keyword
+            this.keyword = IonTokenReader.matchKeyword(value, 0, value.length());
+            if (this.keyword != null) {
+                if (this.keyword == Type.kwNull) {
+                    c = this.read();
+                    if (c == '.') {
+                        int dot = value.length();
+                        value.append((char)c);
+                        c = this.read();
+                        int added = readIdentifierContents(c, IonTokenConstsX.TN_MAX_NAME_LENGTH + 1); // +1 is "enough roap" so if there are extra letters at the end of the keyword we keep at least 1
+                        int kw = IonTokenConstsX.keyword(value, dot+1, dot+added+1);
+                        switch (kw) {
+                        case IonTokenConstsX.KEYWORD_NULL:
+                        case IonTokenConstsX.KEYWORD_BOOL:
+                        case IonTokenConstsX.KEYWORD_INT:
+                        case IonTokenConstsX.KEYWORD_FLOAT:
+                        case IonTokenConstsX.KEYWORD_DECIMAL:
+                        case IonTokenConstsX.KEYWORD_TIMESTAMP:
+                        case IonTokenConstsX.KEYWORD_SYMBOL:
+                        case IonTokenConstsX.KEYWORD_STRING:
+                        case IonTokenConstsX.KEYWORD_BLOB:
+                        case IonTokenConstsX.KEYWORD_CLOB:
+                        case IonTokenConstsX.KEYWORD_LIST:
+                        case IonTokenConstsX.KEYWORD_SEXP:
+                        case IonTokenConstsX.KEYWORD_STRUCT:
+                            this.keyword = setNullType(value, dot + 1, value.length() - dot - 1);
+                            break;
+                        default:
+                            // not a valid type name - so we have to unread back to the dot
+                            for (int ii=value.length(); ii>dot; ) {
+                                ii--;
+                                char uc = value.charAt(ii);
+                                unread(uc);
+                            }
+
+                            String message =
+                                position()
+                                + ": Expected Ion type after 'null.' but found: "
+                                + value;
+                            throw new IonException(message);
+                        }
+                    }
+                    else {
+                        unread(c);
+                    }
+                }
+                this.t = this.keyword;
+                return this.t;
+            }
+        }
+
+        // see if we're a user type of a member name
+        c = this.readIgnoreWhitespace();
+        if (c != ':') {
+            unread(c);
+        }
+        else {
+            c = read();
+            if (c != ':') {
+                unread(c);
+                this.t = Type.constMemberName;
+            }
+            else {
+                this.t = Type.constUserTypeDecl;
+            }
+        }
+        return this.t;
+    }
+
+    boolean readIdentifierContents(int c) throws IOException {
+
+        int quote = c;
+        inQuotedContent = (quote == '\'' || quote == '\"');
+
+        if ((quotedIdentifier = inQuotedContent) == true) {
+            for (;;) {
+                c = read();
+                if (c < 0 || c == quote) break;
+                if (c == '\\') {
+                    c = readEscapedCharacter(this.in, false /*not clob*/);
+                }
+                if (c != EMPTY_ESCAPE_SEQUENCE) {
+                    value.appendCodePoint(c);
+                }
+            }
+            if (c == -1) { // TODO throw UnexpectedEofException
+                throw new IonException("end encountered before closing quote '\\" + (char)endquote+ "'");
+            }
+            // c, at this point is a single quote, which we don't append
+            inQuotedContent = false;
+        }
+        else {
+            value.append((char)c);
+            for (;;) {
+                c = read();
+                if (!IonTextUtils.isIdentifierPart(c)) {
+                    break;
+                }
+                value.append((char)c);
+            }
+            unread(c);  // we throw back our terminator here
+        }
+        return quotedIdentifier;
+    }
+    int readIdentifierContents(int c, int max_length) throws IOException {
+        assert(c != '\'' && c != '\"');
+
+        value.append((char)c);
+        int count = 1;
+
+        while (count < max_length) {
+            c = read();
+            if (!IonTextUtils.isIdentifierPart(c)) {
+                unread(c);  // we throw back our terminator here
+                break;
+            }
+            value.append((char)c);
+            count++;
+        }
+
+        return count;
+    }
+
+    static Type matchKeyword(StringBuilder sb, int pos, int valuelen) throws IOException
+    {
+        Type keyword = null;
+
+        switch (sb.charAt(pos++)) { // there has to be at least 1 chacter or we wouldn't be here
+        case 'f':
+            if (valuelen == 5 //    "f"
+             && sb.charAt(pos++) == 'a'
+             && sb.charAt(pos++) == 'l'
+             && sb.charAt(pos++) == 's'
+             && sb.charAt(pos++) == 'e'
+            ) {
+                keyword = Type.kwFalse;
+            }
+            break;
+        case 'n':
+            if (valuelen == 4 //    'n'
+             && sb.charAt(pos++) == 'u'
+             && sb.charAt(pos++) == 'l'
+             && sb.charAt(pos++) == 'l'
+            ) {
+                keyword = Type.kwNull;
+            }
+            else if (valuelen == 3 //   'n'
+                 && sb.charAt(pos++) == 'a'
+                 && sb.charAt(pos++) == 'n'
+            ) {
+                keyword = Type.kwNan;
+            }
+            break;
+        case 't':
+            if (valuelen == 4 //    "t"
+             && sb.charAt(pos++) == 'r'
+             && sb.charAt(pos++) == 'u'
+             && sb.charAt(pos++) == 'e'
+            ) {
+                keyword =  Type.kwTrue;
+            }
+            break;
+        }
+
+        return keyword;
+    }
+
+    public Type setNullType(StringBuilder sb, int pos, int valuelen)
+    {
+        switch (valuelen) {
+        case 3:
+            //int
+            if (sb.charAt(pos++) == 'i'
+             && sb.charAt(pos++) == 'n'
+             && sb.charAt(pos++) == 't'
+            ) {
+                return Type.kwNullInt;
+            }
+            break;
+        case 4:
+            //bool, blob, list, null, clob, sexp
+            switch (sb.charAt(pos++)) {
+            case 'b':
+                //bool, blob
+                switch (sb.charAt(pos++)) {
+                    case 'o':
+                        // bool
+                        if (sb.charAt(pos++) == 'o'
+                         && sb.charAt(pos++) == 'l'
+                        ) {
+                            return Type.kwNullBoolean;
+                        }
+                        break;
+                    case 'l':
+                        //blob
+                        if (sb.charAt(pos++) == 'o'
+                         && sb.charAt(pos++) == 'b'
+                        ) {
+                            return Type.kwNullBlob;
+                        }
+                        break;
+                }
+                break;
+            case 'l':
+                if (sb.charAt(pos++) == 'i'
+                 && sb.charAt(pos++) == 's'
+                 && sb.charAt(pos++) == 't'
+                ) {
+                    return Type.kwNullList;
+                }
+                break;
+            case 'n':
+                if (sb.charAt(pos++) == 'u'
+                 && sb.charAt(pos++) == 'l'
+                 && sb.charAt(pos++) == 'l'
+                ) {
+                    return Type.kwNullNull;
+                }
+                break;
+            case 'c':
+                //clob
+                if (sb.charAt(pos++) == 'l'
+                 && sb.charAt(pos++) == 'o'
+                 && sb.charAt(pos++) == 'b'
+                ) {
+                    return Type.kwNullClob;
+                }
+                break;
+            case 's':
+                //sexp
+                if (sb.charAt(pos++) == 'e'
+                 && sb.charAt(pos++) == 'x'
+                 && sb.charAt(pos++) == 'p'
+                ) {
+                    return Type.kwNullSexp;
+                }
+                break;
+            }
+            break;
+        case 5:
+            //float
+            if (sb.charAt(pos++) == 'f'
+             && sb.charAt(pos++) == 'l'
+             && sb.charAt(pos++) == 'o'
+             && sb.charAt(pos++) == 'a'
+             && sb.charAt(pos++) == 't'
+            ) {
+                return Type.kwNullFloat;
+            }
+            break;
+        case 6:
+            switch (sb.charAt(pos++)) {
+            case 's':
+                //string
+                //struct
+                //symbol
+                switch(sb.charAt(pos++)) {
+                case 't':
+                    if (sb.charAt(pos++) == 'r') {
+                        switch (sb.charAt(pos++)) {
+                        case 'i':
+                            if (sb.charAt(pos++) == 'n' && sb.charAt(pos++) == 'g') {
+                                return Type.kwNullString;
+                            }
+                            break;
+                        case 'u':
+                            if (sb.charAt(pos++) == 'c' && sb.charAt(pos++) == 't') {
+                                return Type.kwNullStruct;
+                            }
+                            break;
+                        }
+                    }
+                    break;
+                case 'y':
+                    if (sb.charAt(pos++) == 'm'
+                     && sb.charAt(pos++) == 'b'
+                     && sb.charAt(pos++) == 'o'
+                     && sb.charAt(pos++) == 'l'
+                    ) {
+                        return Type.kwNullSymbol;
+                    }
+                    break;
+                }
+            }
+            break;
+        case 7:
+            //decimal
+            if (sb.charAt(pos++) == 'd'
+             && sb.charAt(pos++) == 'e'
+             && sb.charAt(pos++) == 'c'
+             && sb.charAt(pos++) == 'i'
+             && sb.charAt(pos++) == 'm'
+             && sb.charAt(pos++) == 'a'
+             && sb.charAt(pos++) == 'l'
+            ) {
+                return Type.kwNullDecimal;
+            }
+            break;
+        case 9:
+            //timestamp
+            if (sb.charAt(pos++) == 't'
+             && sb.charAt(pos++) == 'i'
+             && sb.charAt(pos++) == 'm'
+             && sb.charAt(pos++) == 'e'
+             && sb.charAt(pos++) == 's'
+             && sb.charAt(pos++) == 't'
+             && sb.charAt(pos++) == 'a'
+             && sb.charAt(pos++) == 'm'
+             && sb.charAt(pos++) == 'p'
+            ) {
+                return Type.kwNullTimestamp;
+            }
+            break;
+        }
+        String nullimage = sb.toString();
+        throw new IonException("invalid null value '"+nullimage+"' at " + this.position());
+    }
+
+    public Type scanOperator(int c) throws IOException
+    {
+        // reset our local value buffer
+        resetValue();
+
+        // we don't have an identifier type any longer, just string
+        this.t = Type.constSymbol;
+
+        // some strings are keywords, most are not
+        // mostly we'll guess that it's not a keyword
+        this.keyword = null;
+
+        // first we read the identifier content into our value buffer
+        // if the value is quoted, use the escape char loop, otherwise
+        // look for the non-identifier character (and throw it back)
+
+        value.append((char)c);
+        for (;;) {
+            c = read();
+            if (!IonTextUtils.isOperatorPart(c)) {
+                break;
+            }
+            value.append((char)c);
+        }
+        unread(c);  // we throw back our terminator here
+
+        return this.t;
+    }
+
+
+    public Type scanString(int c, int maxlookahead) throws IOException
+    {
+        // reset out local value buffer
+        resetValue();
+
+        if (c != '\"') {
+            throw new IonException("Programmer error! Only a quote should get you here.");
+        }
+        endquote = '\"';
+
+        sizedloop:
+        while (maxlookahead-- > 0) {
+            switch ((c = this.read())) {
+            case -1:   break sizedloop; // TODO deoptimize, throw exception
+            case '\"': break sizedloop;
+            case '\n':
+                throw new IonException("unexpected line terminator encountered in quoted string");
+            case '\\':
+                c = readEscapedCharacter(this.in, false /*not clob*/);
+                //    throws UnexpectedEofException on EOF
+                if (c != EMPTY_ESCAPE_SEQUENCE) {
+                    value.appendCodePoint(c);
+                }
+                break;
+            default:
+                // c could be part of a surrogate pair so we can't use
+                // appendCodePoint()
+                value.append((char)c);
+                break;
+            }
+        }
+
+        if (maxlookahead != -1 && c == '\"') {
+            // this is the normal, non-longline case so we're just done
+            closeString();
+        }
+        else {
+            // we're not at the closing quote, so this is an incomplete
+            // string which will have to be read to the end ... later
+            leaveOpenString(c, false);
+        }
+        return Type.constString;
+    }
+    void leaveOpenString(int c, boolean longstring) {
+        if (c == -1) {
+            throw new UnexpectedEofException();
+        }
+
+        this.isIncomplete = true;
+        this.inQuotedContent = true;
+        this.isLongString = longstring;
+    }
+
+    /**
+     * Scans the rest of the string through {@link #endquote}.
+     * <p>
+       XXX  WARNING  XXX
+     * Almost identical logic is found in
+     * {@link IonBinary#appendToLongValue(int, boolean, boolean, PushbackReader)}
+     *
+     * @param is_in_expression
+     * @throws UnexpectedEofException if we hit EOF before the endquote.
+     */
+    void finishScanString(boolean is_in_expression) throws IOException
+    {
+        assert isIncomplete;
+        assert inQuotedContent;
+
+        for (;;)
+        {
+            int c = this.read();
+            if (c == -1) {
+                throw new UnexpectedEofException();
+            }
+            if (c == endquote) break;  // endquote == -1 during long strings
+            if (c == '\\') {
+                c = readEscapedCharacter(this.in, false /*not clob*/);
+                if (c != EMPTY_ESCAPE_SEQUENCE) {
+                    value.appendCodePoint(c);
+                }
+            }
+            else if (c == '\'' && isLongString) {
+                // This happens while handling triple-quote field names
+                if (twoMoreSingleQuotes()) {
+                    // At the end of a long string.  Look for another one.
+                    inQuotedContent = false;
+                    c = readIgnoreWhitespace();
+
+                    if (c == '\'' && twoMoreSingleQuotes()) {
+                        // Yep, another triple-quote.  We've consumed all three
+                        // so just keep reading.
+                        inQuotedContent = true;
+                    }
+                    else {
+                        // Something else, we are done.
+                        unread(c);
+                        break;
+                    }
+                }
+                else {
+                    // Still inside the long string
+                    value.append((char)c);
+                }
+            }
+            else if (!isLongString && (c == '\n')) {
+                throw new IonException("unexpected line terminator encountered in quoted string");
+            }
+            else {
+                value.append((char)c);
+            }
+        }
+        return;
+    }
+
+    /**
+     * If two single quotes are next on the input, consume them and return
+     * true.  Otherwise, leave them on the input and return false.
+     * @return true when there are two pending single quotes.
+     * @throws IOException
+     */
+    private boolean twoMoreSingleQuotes() throws IOException
+    {
+        int c = read();
+        if (c == '\'') {
+            int c2 = read();
+            if (c2 == '\'') {
+                return true;
+            }
+            unread(c2);
+        }
+        unread(c);
+        return false;
+    }
+
+
+    void closeString() {
+        this.isIncomplete = false;
+        this.inQuotedContent = false;
+        this.isLongString = false;
+    }
+
+    public Type scanLongString() throws IOException
+    {
+        // reset out local value buffer
+        resetValue();
+
+        endquote = -1;
+
+        // we're not at the closing quote, so this is an incomplete
+        // string which will have to be read to the end ... later
+        leaveOpenString(EMPTY_ESCAPE_SEQUENCE, true);
+
+        return Type.constString;
+    }
+    /**
+     * Closes parsing of a triple-quote string, remembering that there may be
+     * more to come.
+     */
+    void closeLongString() {
+        this.isIncomplete = true;
+        this.inQuotedContent = false;
+        this.isLongString = true;
+    }
+
+
+    /**
+     * @return the translated escape sequence.  Will not return -1 since EOF is
+     * not legal in this context. May return {@link #EMPTY_ESCAPE_SEQUENCE} to
+     * indicate a zero-length sequence such as BS-NL.
+     * @throws UnexpectedEofException if the EOF is encountered in the middle
+     * of the escape sequence.
+     * */
+    public static int readEscapedCharacter(PushbackReader r, boolean inClob)
+        throws IOException, UnexpectedEofException
+    {
+        //    \\ The backslash character
+        //    \0 The character 0 (nul terminator char, for some)
+        //    \xhh The character with hexadecimal value 0xhh
+        //    \ u hhhh The character with hexadecimal value 0xhhhh
+        //    \t The tab character ('\u0009')
+        //    \n The newline (line feed) character ('\ u 000A')
+        //    \v The vertical tab character ('\u000B')
+        //    \r The carriage-return character ('\ u 000D')
+        //    \f The form-feed character ('\ u 000C')
+        //    \a The alert (bell) character ('\ u 0007')
+        //    \" The double quote character
+        //    \' The single quote character
+        //    \? The question mark character
+
+        int c2 = 0, c = r.read();
+        switch (c) {
+            case -1:
+                throw new UnexpectedEofException();
+            case 't':  return '\t';
+            case 'n':  return '\n';
+            case 'v':  return '\u000B';
+            case 'r':  return '\r';
+            case 'f':  return '\f';
+            case 'b':  return '\u0008';
+            case 'a':  return '\u0007';
+            case '\\': return '\\';
+            case '\"': return '\"';
+            case '\'': return '\'';
+            case '/':  return '/';
+            case '?':  return '?';
+
+            case 'U':
+                // Expecting 8 hex digits
+                if (inClob) {
+                    throw new IonException("Unicode escapes \\U not allowed in clob");
+                }
+                c = readDigit(r, 16, true);
+                if (c < 0) break;  // TODO throw UnexpectedEofException
+                c2 = c << 28;
+                c = readDigit(r, 16, true);
+                if (c < 0) break;
+                c2 += c << 24;
+                c = readDigit(r, 16, true);
+                if (c < 0) break;
+                c2 += c << 20;
+                c = readDigit(r, 16, true);
+                if (c < 0) break;
+                c2 += c << 16;
+                // ... fall through...
+            case 'u':
+                // Expecting 4 hex digits
+                if (inClob) {
+                    throw new IonException("Unicode escapes \\u not allowed in clob");
+                }
+                c = readDigit(r, 16, true);
+                if (c < 0) break;
+                c2 += c << 12;
+                c = readDigit(r, 16, true);
+                if (c < 0) break;
+                c2 += c << 8;
+                // ... fall through...
+            case 'x':
+                // Expecting 2 hex digits
+                c = readDigit(r, 16, true);
+                if (c < 0) break;
+                c2 += c << 4;
+                c = readDigit(r, 16, true);
+                if (c < 0) break;
+                return c2 + c;
+
+            case '0':
+                return 0;
+            case '\n':
+                return EMPTY_ESCAPE_SEQUENCE;
+            default:
+                break;
+        }
+        throw new IonException("invalid escape sequence \"\\"
+                               + (char) c + "\" [" + c + "]");
+    }
+
+    public static int readDigit(/*EscapedCharacterReader*/PushbackReader r, int radix, boolean isRequired) throws IOException {
+        int c = r.read();
+        if (c < 0) {
+            r.unread(c);
+            return -1;
+        }
+
+        int c2 =  Character.digit(c, radix);
+        if (c2 < 0) {
+            if (isRequired) {
+                throw new IonException("bad digit in escaped character '"+((char)c)+"'");
+            }
+            // if it's not a required digit, we just throw it back
+            r.unread(c);
+            return -1;
+        }
+        return c2;
+    }
+
+
+    private void checkAndUnreadNumericStopper(int c) throws IOException
+    {
+        // Ignore EOF, so we don't "unread" it - EOF is a terminator
+        if (c != -1) {
+            if ( ! this.isValueTerminatingCharacter(c) ) {
+                final String message =
+                    position() + ": Numeric value followed by invalid character "
+                    + printCodePointAsString(c);
+                throw new IonException(message);
+            }
+            this.unread(c);
+        }
+    }
+
+    private final boolean isValueTerminatingCharacter(int c) throws IOException
+    {
+        boolean isTerminator;
+
+        if (c == '/') {
+            // this is terminating only if it starts a comment of some sort
+            c = this.read();
+            this.unread(c);  // we never "keep" this character
+            isTerminator = (c == '/' || c == '*');
+        }
+        else {
+            isTerminator = IonTextUtils.isNumericStop(c);
+        }
+
+        return isTerminator;
+    }
+
+    public Type readNumber(int c) throws IOException {
+        // clear out our string buffer
+        resetValue();
+
+        // process the initial sign character, if its there.
+        boolean explicitPlusSign = false;
+        switch (c) {
+        case '-':
+            value.append((char)c);
+            c = this.read();
+            t = Type.constNegInt;
+            this.numberType = NumberType.NT_NEGINT;
+            this.isNegative = true;
+            break;
+        case '+':
+            // we eat the plus sign, but remember we saw one
+            explicitPlusSign = true;
+            c = this.read();
+            t = Type.constPosInt;
+            this.isNegative = false;
+            this.numberType = NumberType.NT_POSINT;
+            break;
+        default:
+            t = Type.constPosInt;
+            this.numberType = NumberType.NT_POSINT;
+            this.isNegative = false;
+            break;
+        }
+
+        // process the initial digit.  Caller has checked that it's a digit.
+        assert isDigit(c, 10);
+        value.append((char)c);
+        boolean isZero = (c == '0');
+        boolean leadingZero = isZero;
+
+        // process the next character after the initial digit.
+        switch((c = this.read())) {
+        case 'x':
+        case 'X':
+            if (!isZero) {
+                throw new IonException("badly formed number encountered at " + position());
+            }
+            this.numberType = NumberType.NT_HEX;
+            // We don't need to append the char because we're going to wipe
+            // the value anyway to accumulate just the hex digits.
+            return scanHexNumber();
+        case '.':
+        case 'd':
+        case 'D':
+            t = Type.constDecimal;
+            this.numberType = NumberType.NT_DECIMAL;
+            value.append((char)c);
+            break;
+        case 'e':
+        case 'E':
+            t = Type.constFloat;
+            this.numberType = NumberType.NT_FLOAT;
+            value.append((char)c);
+            break;
+        default:
+            if (!isDigit(c, 10)) {
+                checkAndUnreadNumericStopper(c);
+                if (isZero && NumberType.NT_NEGINT.equals(this.numberType)) {
+                    t = Type.constPosInt;
+                    this.numberType = NumberType.NT_POSINT;
+                }
+                return t;
+            }
+            value.append((char)c);
+            isZero &= (c == '0');
+            break;
+        }
+
+        // see if see can continue find leading digits
+        if (NumberType.NT_NEGINT.equals(numberType)
+         || NumberType.NT_POSINT.equals(numberType)
+        ) {
+            // We've now scanned at least two digits.
+            // read in the remaining whole number digits
+            for (;;) {
+                c = this.read();
+                if (!isDigit(c, 10)) break;
+                value.append((char)c);
+                isZero &= (c == '0');
+            }
+
+            // and see what we ran aground on ..
+            switch (c) {
+            case '.':
+            case 'd':
+            case 'D':
+                if (leadingZero) {
+                    throw new IonException(position() + ": Invalid leading zero on numeric");
+                }
+                t = Type.constDecimal;
+                this.numberType = NumberType.NT_DECIMAL;
+                value.append((char)c);
+                break;
+            case 'e':
+            case 'E':
+                if (leadingZero) {
+                    throw new IonException(position() + ": Invalid leading zero on numeric");
+                }
+                t = Type.constFloat;
+                this.numberType = NumberType.NT_FLOAT;
+                value.append((char)c);
+                break;
+            case 'T':  // same as '-' it's a timestamp
+            case '-':
+                if (NumberType.NT_POSINT.equals(this.numberType) && !explicitPlusSign) {
+                    return scanTimestamp(c);
+                }
+                // otherwise fall through to "all other" processing
+            default:
+                // Hit the end of our integer.  Make sure its a valid stopper.
+                checkAndUnreadNumericStopper(c);
+
+                if (leadingZero && !isZero) {
+                    throw new IonException(position() + ": Invalid leading zero on numeric");
+                }
+                if (isZero && NumberType.NT_NEGINT.equals(this.numberType)) {
+                    t = Type.constPosInt;
+                    this.numberType = NumberType.NT_POSINT;
+                }
+                return t;
+            }
+        }
+
+        // now we must have just decimal or float
+        // if it's decimal we ended on a DOT, so get the trailing
+        // (fractional) digits
+        if (NumberType.NT_DECIMAL.equals(this.numberType)) {
+            for (;;) {
+                c = this.read();
+                if (!isDigit(c, 10)) break;
+                value.append((char)c);
+            }
+            // and see what we ran aground on this time..
+            switch (c) {
+            case '-':
+            case '+':
+                // We'll handle exponent below.
+                this.unread(c);
+                break;
+            case 'e':
+            case 'E':
+                // this is the only viable option now
+                t = Type.constFloat;
+                this.numberType = NumberType.NT_FLOAT;
+                value.append((char)c);
+                break;
+            case 'd':
+            case 'D':
+                // this is the only viable option now
+                assert t == Type.constDecimal;
+                assert NumberType.NT_DECIMAL.equals(this.numberType);
+                value.append((char)c);
+                break;
+            default:
+                checkAndUnreadNumericStopper(c);
+                return t;
+            }
+        }
+
+        // now we have the exponent part to read
+        // reading the first character of the exponent, it can be
+        // a sign character or a digit (this is the only place
+        // the sign is valid) and we're for sure a float at this point
+        switch ((c = this.read())) {
+        case '-':
+            value.append((char)c);
+            break;
+        case '+':
+            // we eat the plus sign
+            break;
+        default:
+            if (!isDigit(c, 10)) {
+                // this they said 'e' then they better put something valid after it!
+                throw new IonException("badly formed number encountered at " + position());
+            }
+            this.unread(c);
+            // we'll re-read this in just a bit, but we had to check
+            break;
+        }
+
+        // read in the remaining whole number digits and then quit
+        for (;;) {
+            c = this.read();
+            if (!isDigit(c, 10)) break;
+            value.append((char)c);
+        }
+
+        checkAndUnreadNumericStopper(c);
+
+        return t;
+    }
+
+    Type scanHexNumber() throws IOException
+    {
+        boolean anydigits = false;
+        int c;
+
+        boolean isZero = true;
+
+        // Leave the 0x in the buffer since we'll need it to parse the content.
+        // first get clear out our string buffer, we're starting over
+        value.setLength(0);  // resetValue() wipes out too much
+
+        // read in the remaining whole number digits and then quit
+        for (;;) {
+            c = this.read();
+            if (!isDigit(c, 16)) break;
+            anydigits = true;
+            isZero &= (c == '0');
+            value.append((char)c);
+        }
+        if (!anydigits) {
+            throw new IonException("badly formed hexadecimal number encountered at " + position());
+        }
+
+        checkAndUnreadNumericStopper(c);
+        if (isZero && t == Type.constNegInt) {
+            t = Type.constPosInt;
+        }
+
+        // as long as we saw any digit, we're good
+        return t;
+    }
+
+    /**
+     * Scans a timestamp after reading <code>yyyy-</code>.
+     *
+     * We can be a little lenient here since the result will be reparsed and
+     * validated more thoroughly by {@link Timestamp#valueOf(CharSequence)}.
+     *
+     * @param c the last character scanned; must be <code>'-'</code>.
+     * @return {@link Type#constTime}
+     */
+    Type scanTimestamp(int c) throws IOException {
+
+endofdate:
+        for (;;) {  // fake for loop to create a label we can jump out of,
+                    // because 4 or 5 levels of nested if's is just ugly
+
+            // at this point we will have read leading digits and exactly 1 dash
+            // in other words, we'll have read the year
+            if (c == 'T') {
+                // yearT is a valid timestamp value
+                value.append((char)c);
+                c = this.read(); // because we'll unread it before we return
+                break endofdate;
+            }
+            if (c != '-') {
+                // not a dash or a T after the year - so this is a bad value
+                throw new IllegalStateException("invalid timestamp, expecting a dash here at " + this.position());
+            }
+
+            // append the dash and then read the month field
+            value.append((char)c); // so append it, because we haven't already
+            c = readDigits(2, "month");
+            if (c == 'T') {
+                // year-monthT is a valid timestamp value
+                value.append((char)c);
+                c = this.read(); // because we'll unread it before we return
+                break endofdate;
+            }
+            if (c != '-') {
+                // if the month isn't followed by a dash or a T it's an invalid month
+                throw new IonException("invalid timestamp, expecting month at " + this.position());
+            }
+
+            // append the dash and read the day (or day-of-month) field
+            value.append((char)c);
+            c = readDigits(2, "day of month");
+            if (c == 'T') {
+
+check4timezone:
+                for (;;) { // another fake label/ for=goto
+
+                    // attach the 'T' to the value we're collecting
+                    value.append((char)c);
+
+                    // we're going to "watch" how many digits we read in the hours
+                    // field.  It's 0 that's actually ok, since we can end at the
+                    // 'T' we just read
+                    int length_before_reading_hours = value.length();
+                    // so read the hours
+                    c = readDigits(2, "hours");
+                    if (length_before_reading_hours == value.length()) {
+                        // FIXME I don't think there should be a timezone here
+                        break check4timezone;
+                    }
+                    if (c != ':') {
+                        throw new IonException("invalid timestamp, expecting hours at " + this.position());
+                    }
+                    value.append((char)c);
+                    // so read the minutes
+                    c = readDigits(2, "minutes");
+                    if (c != ':') {
+                        if (c == '-' || c == '+' || c == 'Z') {
+                            break check4timezone;
+                        }
+                        break endofdate;
+                    }
+                    value.append((char)c);
+                    // so read the seconds
+                    c = readDigits(2, "seconds");
+                    if (c != '.') {
+                        if (c == '-' || c == '+' || c == 'Z') {
+                            break check4timezone;
+                        }
+                        break endofdate;
+                    }
+                    value.append((char)c);
+                    // so read the fractional seconds
+                    c = readDigits(32, "fractional seconds");
+                    break check4timezone;
+                }//check4timezone
+
+                // now check to see if it's a timezone offset we're looking at
+                if (c == '-' || c == '+') {
+                    value.append((char)c);
+                    // so read the timezone offset
+                    c = readDigits(2, "timezone offset");
+                    if (c != ':') break endofdate;
+                    value.append((char)c);
+                    c = readDigits(2, "timezone offset");
+                }
+                else if (c == 'Z') {
+                    value.append((char)c);
+                    c = this.read(); // because we'll unread it before we return
+                }
+            }
+            break endofdate;
+        }//endofdate
+
+        checkAndUnreadNumericStopper(c);
+
+        return Type.constTime;
+    }
+
+    int readDigits(int limit, String field) throws IOException {
+        int c, len = 0;
+        // read in the remaining whole number digits and then quit
+        for (;;) {
+            c = this.read();
+            if (!isDigit(c, 10)) break;
+            len++;
+            if (len > limit) {
+                throw new IonException("invalid format " + field + " too long at " + this.position());
+            }
+            value.append((char)c);
+        }
+        return c;
+    }
+
+    public boolean makeValidNumeric(Type castto) throws IOException {
+        String  s = getValueString(false);
+
+        try
+        {
+            this.t = castto.setNumericValue(this, s);
+        }
+        catch (NumberFormatException e)
+        {
+            throw new IonException(this.position() + ": invalid numeric value " + s, e);
+        }
+
+        return this.t.isNumeric();
+    }
+
+}
diff --git a/src/software/amazon/ion/impl/IonUTF8.java b/src/com/amazon/ion/impl/IonUTF8.java
similarity index 98%
rename from src/software/amazon/ion/impl/IonUTF8.java
rename to src/com/amazon/ion/impl/IonUTF8.java
index 14d12ebfcc..4b1c718bc0 100644
--- a/src/software/amazon/ion/impl/IonUTF8.java
+++ b/src/com/amazon/ion/impl/IonUTF8.java
@@ -1,23 +1,24 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.IonException;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.OutputStream;
-import software.amazon.ion.IonException;
 
 /**
  * this class holds the various constants and helper functions Ion uses
diff --git a/src/software/amazon/ion/impl/IonWriterSystem.java b/src/com/amazon/ion/impl/IonWriterSystem.java
similarity index 79%
rename from src/software/amazon/ion/impl/IonWriterSystem.java
rename to src/com/amazon/ion/impl/IonWriterSystem.java
index 6237a7c58a..02890c0a85 100644
--- a/src/software/amazon/ion/impl/IonWriterSystem.java
+++ b/src/com/amazon/ion/impl/IonWriterSystem.java
@@ -1,35 +1,38 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.impl.PrivateUtils.newSymbolToken;
-import static software.amazon.ion.impl.PrivateUtils.newSymbolTokens;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
+import static com.amazon.ion.impl._Private_Utils.newSymbolTokens;
 
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
+import com.amazon.ion.system.IonWriterBuilder.IvmMinimizing;
 import java.io.IOException;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
-import software.amazon.ion.system.IonWriterBuilder.IvmMinimizing;
+
 
 
 abstract class IonWriterSystem
-    extends PrivateIonWriterBase
+    extends _Private_IonWriterBase
 {
     /**
      * The system symtab used when resetting the stream.
@@ -119,7 +122,7 @@ public final SymbolTable getSymbolTable()
     public final void setSymbolTable(SymbolTable symbols)
         throws IOException
     {
-        if (symbols == null || PrivateUtils.symtabIsSharedNotSystem(symbols)) {
+        if (symbols == null || _Private_Utils.symtabIsSharedNotSystem(symbols)) {
             throw new IllegalArgumentException("symbol table must be local or system to be set, or reset");
         }
         if (getDepth() > 0) {
@@ -136,20 +139,20 @@ boolean shouldWriteIvm()
         }
         if (_initial_ivm_handling == InitialIvmHandling.SUPPRESS)
         {
-            // TODO amzn/ion-java#24 Must write IVM if given system != 1.0
+            // TODO amzn/ion-java/issues/24 Must write IVM if given system != 1.0
             return false;
         }
-        // TODO amzn/ion-java#24 Add SUPPRESS_ALL to suppress non 1.0 IVMs
+        // TODO amzn/ion-java/issues/24 Add SUPPRESS_ALL to suppress non 1.0 IVMs
 
         if (_ivm_minimizing == IvmMinimizing.ADJACENT)
         {
-            // TODO amzn/ion-java#24 Write IVM if current system version != given system
+            // TODO amzn/ion-java/issues/24 Write IVM if current system version != given system
             // For now we assume that it's the same since we only support 1.0
             return ! _previous_value_was_ivm;
         }
         if (_ivm_minimizing == IvmMinimizing.DISTANT)
         {
-            // TODO amzn/ion-java#24 Write IVM if current system version != given system
+            // TODO amzn/ion-java/issues/24 Write IVM if current system version != given system
             // For now we assume that it's the same since we only support 1.0
             return ! _anything_written;
         }
@@ -288,7 +291,7 @@ final void writeSymbol(int symbolId) throws IOException
             && getDepth() == 0
             && _annotation_count == 0) {
             // $ion_1_0 is written as an IVM only if it is not annotated
-            // TODO amzn/ion-java#24 Make sure to get the right symtab, default may differ.
+            // TODO amzn/ion-java/issues/24 Make sure to get the right symtab, default may differ.
             writeIonVersionMarker();
         }
         else
@@ -303,7 +306,7 @@ public final void writeSymbol(String value) throws IOException
             && getDepth() == 0
             && _annotation_count == 0) {
             // $ion_1_0 is written as an IVM only if it is not annotated
-            // TODO amzn/ion-java#24 Make sure to get the right symtab, default may differ.
+            // TODO amzn/ion-java/issues/24 Make sure to get the right symtab, default may differ.
             writeIonVersionMarker();
         }
         else {
@@ -343,7 +346,7 @@ public final boolean isFieldNameSet()
             case STRING:
                 return _field_name != null;
             case INT:
-                return _field_name_sid > 0;
+                return _field_name_sid >= 0;
             default:
                 break;
             }
@@ -399,6 +402,40 @@ public final void setFieldNameSymbol(SymbolToken name)
         }
     }
 
+    /**
+     * Returns the symbol id of the current field name, if the field name
+     * has been set.  If the name has not been set, either as either a String
+     * or a symbol id value, this returns -1 (undefined symbol).
+     * @return symbol id of the name of the field about to be written or -1 if
+     * it is not set
+     */
+    final int getFieldId()
+    {
+        int id;
+
+        if (_field_name_type == null) {
+            throw new IllegalStateException("the field has not be set");
+        }
+        switch (_field_name_type) {
+        case STRING:
+                try {
+                    id = add_symbol(_field_name);
+                }
+                catch (IOException e) {
+                    throw new IonException(e);
+                }
+                // TODO cache the sid?
+            break;
+        case INT:
+            id = _field_name_sid;
+            break;
+        default:
+            throw new IllegalStateException("the field has not be set");
+        }
+
+        return id;
+    }
+
     final SymbolToken assumeFieldNameSymbol()
     {
         if (_field_name_type == null)  {
@@ -435,11 +472,38 @@ final void ensureAnnotationCapacity(int length) {
     }
 
 
+    final int[] internAnnotationsAndGetSids() throws IOException
+    {
+        int count = _annotation_count;
+        if (count == 0) return _Private_Utils.EMPTY_INT_ARRAY;
+
+        int[] sids = new int[count];
+        for (int i = 0; i < count; i++)
+        {
+            SymbolToken sym = _annotations[i];
+            int sid = sym.getSid();
+            if (sid == UNKNOWN_SYMBOL_ID)
+            {
+                String text = sym.getText();
+                sid = add_symbol(text);
+                _annotations[i] = new SymbolTokenImpl(text, sid);
+            }
+            sids[i] = sid;
+        }
+        return sids;
+    }
+
+
     final boolean hasAnnotations()
     {
         return _annotation_count != 0;
     }
 
+    final int annotationCount()
+    {
+        return _annotation_count;
+    }
+
     final void clearAnnotations()
     {
         _annotation_count = 0;
@@ -487,7 +551,7 @@ public final void setTypeAnnotationSymbols(SymbolToken... annotations)
                 if (sym.getText() == null) {
                     validateSymbolId(sym.getSid());
                 }
-                sym = PrivateUtils.localize(symtab, sym);
+                sym = _Private_Utils.localize(symtab, sym);
                 _annotations[i] = sym;
             }
             _annotation_count = count;
@@ -497,7 +561,7 @@ public final void setTypeAnnotationSymbols(SymbolToken... annotations)
     @Override
     final String[] getTypeAnnotations()
     {
-        return PrivateUtils.toStrings(_annotations, _annotation_count);
+        return _Private_Utils.toStrings(_annotations, _annotation_count);
     }
 
     public final void setTypeAnnotations(String... annotations)
@@ -529,6 +593,12 @@ public final void addTypeAnnotation(String annotation)
     @Override
     final int[] getTypeAnnotationIds()
     {
-        return PrivateUtils.toSids(_annotations, _annotation_count);
+        return _Private_Utils.toSids(_annotations, _annotation_count);
+    }
+
+    public <T> T asFacet(Class<T> facetType)
+    {
+        // This implementation has no facets.
+        return null;
     }
 }
diff --git a/src/com/amazon/ion/impl/IonWriterSystemBinary.java b/src/com/amazon/ion/impl/IonWriterSystemBinary.java
new file mode 100644
index 0000000000..51073cfb31
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonWriterSystemBinary.java
@@ -0,0 +1,1050 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.impl._Private_IonConstants.tidDATAGRAM;
+import static com.amazon.ion.impl._Private_IonConstants.tidList;
+import static com.amazon.ion.impl._Private_IonConstants.tidSexp;
+import static com.amazon.ion.impl._Private_IonConstants.tidStruct;
+import static com.amazon.ion.impl.lite._Private_LiteDomTrampoline.reverseEncode;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl.BlockedBuffer.BlockedByteInputStream;
+import com.amazon.ion.impl.IonBinary.BufferManager;
+import com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
+import com.amazon.ion.system.IonWriterBuilder.IvmMinimizing;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.LinkedList;
+import java.util.Queue;
+
+
+final class IonWriterSystemBinary
+    extends IonWriterSystem
+    implements _Private_ListWriter
+{
+
+    /**
+     * Implements patching of the internal OutputStream with actual value
+     * lengths and types. Every instance of this class represents a container
+     * (including the datagram). Information about the children of the container
+     * is stored in _types/_positions/_lengths arrays.
+     *
+     * The patching mechanism works as follows. For every primitive value, we store
+     * its type, position in internal OutputStream and the serialized lengths
+     * in this class. With every value insertion, its length is then summed to the
+     * length of the @_parent. Upon seeing a container, a new PatchedValue is created
+     * and inserted into @_children queue, then all subsequent values are written
+     * as described above. As the container is finished, its @_parent becomes active
+     * and values are continued to be written. In the end, a general tree is created
+     * with information about all the values in the datagram. The values themselves
+     * are serialized into internal OutputStream
+     *
+     * To finalize the internal OutputStream into a user stream, the arrays in
+     * PatchedValues are traversed from the beginning. For every value in
+     * in @_types[i], it's type descriptor is written into user stream. If the type
+     * is primitive, content of the internal OutputStream is copied starting
+     * from @_positions[i] with length @_lengths[i]. If @_types[i] is a container,
+     * a child is popped from the @_children queue and recursively written as
+     * described above. Whenever TID_SYMBOL_TABLE_PATCH is seen in @_types, the
+     * current symbol table gets reset with the one on the top of @_symtabs queue.
+     */
+    static class PatchedValues {
+
+        private final static int DEFAULT_PATCH_COUNT    = 10;
+
+        /** first free position in the _types/_positions/_lengths arrays */
+        int _freePos;
+        /** types of the container */
+        int[] _types;
+        /** positions where values start in buffer */
+        int[] _positions;
+        /**
+         * lengths of the values. The high 32bits of this value store the length
+         * of the field name, the low 32bits store the actual value length. We need the
+         * field name length to properly adjust the total @_parent length in @endPatch
+         */
+        long[] _lengths;
+        // the parent
+        PatchedValues _parent;
+        Queue<PatchedValues> _children;
+        Queue<SymbolTable> _symtabs;
+
+        PatchedValues() {
+            _freePos = -1;
+            _types = new int[DEFAULT_PATCH_COUNT];
+            _positions = new int[DEFAULT_PATCH_COUNT];
+            _lengths = new long[DEFAULT_PATCH_COUNT];
+        }
+
+        void reset() {
+            _freePos = -1;
+            _children = null;
+            _symtabs = null;
+        }
+
+        /**
+         * Add a new PatchedValues instance to _children and return it
+         */
+        PatchedValues addChild() {
+            PatchedValues pv = new PatchedValues();
+            pv._parent = this;
+            if (_children == null) {
+                _children = new LinkedList<PatchedValues>();
+            }
+            _children.add(pv);
+            return pv;
+        }
+
+        /**
+         * Inject a symbol table at the specified position in internal OutputStream. Most of the
+         * times, the injection will happen upon seeing the first non-system symbol. At that point
+         * the information about the symbol is already stored here by @startPatch call, so we need
+         * to be able to inject a symtab before this value (injectBeforeCurrent)
+         *
+         * @param st
+         * @param injectBeforeCurrent Flags if symbol table must be injected before the current value
+         *                            which essentially shifts the array by 1
+         * @throws IllegalStateException if the PatchedValues is not a top-level one
+         */
+        void injectSymbolTable(SymbolTable st, boolean injectBeforeCurrent) {
+            if (_parent != null) {
+                // we're not on top-level
+                throw new IllegalStateException("Cannot inject a symbol table when not on top-level");
+            }
+            if (_symtabs == null) {
+                _symtabs = new LinkedList<SymbolTable>();
+            }
+            ++_freePos;
+            if (_freePos == _positions.length) {
+                grow();
+            }
+            if (injectBeforeCurrent) {
+                // move current value to the right
+                _types[_freePos] = _types[_freePos - 1];
+                _lengths[_freePos] = _lengths[_freePos - 1];
+                // set previous value to symbol table type
+                _types[_freePos - 1] = TID_SYMBOL_TABLE_PATCH;
+                _lengths[_freePos - 1] = 0;
+            } else {
+                // add symbol table to the next free position as a usual value
+                _types[_freePos] = TID_SYMBOL_TABLE_PATCH;
+                _lengths[_freePos] = 0;
+            }
+            // inject the symbol table to the current position on the top
+            _symtabs.add(st);
+        }
+
+        int getType() {
+            return _types[_freePos];
+        }
+
+        PatchedValues getParent() {
+            return _parent;
+        }
+
+        /** Start the patch for given @type at given @pos */
+        void startPatch(int type, int pos) {
+            ++_freePos;
+            if (_freePos == _positions.length) {
+                grow();
+            }
+            _types[_freePos] = type;
+            _lengths[_freePos] = 0;
+            _positions[_freePos] = pos;
+        }
+
+        /** Set the field name length as high 32bits of @_lengths item */
+        void patchFieldName(int fieldNameLength) {
+            _lengths[_freePos] = ((long)fieldNameLength) << 32;
+        }
+
+        /**
+         * Set the value length as low 32bits of @_lengths item. The low 32bits will be
+         * summed with the given value (say, it's a list that is in struct)
+         * @param len
+         */
+        void patchValue(int len) {
+            long memLen = (_lengths[_freePos] & 0xFFFFFFFF00000000L);
+            long curLen = (_lengths[_freePos] & 0x00000000FFFFFFFFL);
+            _lengths[_freePos] = memLen | (curLen + len);
+        }
+
+        /**
+         * End this patch. If there's a @_parent available, it's @_length will be summed
+         * with the length of current patched value
+         */
+        void endPatch() {
+            if (_parent != null) {
+                int memberLen = (int)(_lengths[_freePos] >> 32);
+                int valueLen = (int)(_lengths[_freePos] & 0xFFFFFFFF);
+                int totalLen = memberLen + valueLen;
+                switch (_types[_freePos]) {
+                case TID_SYMBOL_TABLE_PATCH:
+                case TID_RAW:
+                    break;
+                case TID_ANNOTATION_PATCH:
+                    totalLen += IonBinary.lenVarUInt(valueLen);
+                    break;
+                default:
+                    // add the type if it's specified
+                    ++totalLen;
+                    // add actual length of @totalLen :)
+                    if (valueLen >= _Private_IonConstants.lnIsVarLen) {
+                        totalLen += IonBinary.lenVarUInt(valueLen);
+                    }
+                }
+                _parent.patchValue(totalLen);
+            }
+        }
+
+        // grow all related arrays
+        private void grow() {
+            int newSize = _positions.length * 2;
+            _types = growOne(_types, newSize);
+            _positions = growOne(_positions, newSize);
+            _lengths = growOne(_lengths, newSize);
+        }
+        // grow single array and return the result
+        static int[] growOne(int[] source, int newSize) {
+            int[] dest = new int[newSize];
+            System.arraycopy(source, 0, dest, 0, source.length);
+            return dest;
+        }
+        // grow single array and return the result
+        static long[] growOne(long[] source, int newSize) {
+            long[] dest = new long[newSize];
+            System.arraycopy(source, 0, dest, 0, source.length);
+            return dest;
+        }
+    }
+
+    // top-level patch
+    PatchedValues _patch = new PatchedValues();
+
+    private final static int TID_ANNOTATION_PATCH = _Private_IonConstants.tidDATAGRAM + 1;
+    private final static int TID_SYMBOL_TABLE_PATCH = _Private_IonConstants.tidDATAGRAM + 2;
+    private final static int TID_RAW = _Private_IonConstants.tidDATAGRAM + 3;
+
+    // private static final boolean _verbose_debug = false;
+
+    static final int UNKNOWN_LENGTH = -1;
+
+    BufferManager     _manager;
+    IonBinary.Writer  _writer;
+
+    /** Not null */
+    private final OutputStream _user_output_stream;
+
+    /**
+     * Do we {@link #flush()} after each top-level value?
+     * @see #closeValue()
+     */
+    private final boolean _auto_flush;
+
+    boolean           _in_struct;
+
+    /** Ensure we don't use a closed {@link #output} stream. */
+    private boolean _closed;
+
+    private final static int TID_FOR_SYMBOL_TABLE_PATCH = _Private_IonConstants.tidDATAGRAM + 1;
+    private final static int DEFAULT_PATCH_COUNT        = 10;
+    private final static int DEFAULT_PATCH_DEPTH        = 10;
+    private final static int NOT_A_SYMBOL_TABLE_IDX     = -1;
+
+    // Patch:
+    //          offset in data stream
+    //          accumulated length    -- combine w offset in long? offset:len (allows len+=more)
+    //          type of data (should this be in the data stream?
+    //          patched value's parent is struct flag (low nibble in data stream?)
+    //
+    // the patches are the accumulated list of patch points and are
+    // in position order (which is conveniently the order they are
+    // encountered and created).
+    int        _patch_count     = 0;
+    int []     _patch_lengths   = new int[DEFAULT_PATCH_COUNT];     // TODO: should these be merged? (since array access is expensive)
+    int []     _patch_offsets   = new int[DEFAULT_PATCH_COUNT];     // should patch lengths and patch offsets be longs?
+    int []     _patch_table_idx = new int[DEFAULT_PATCH_COUNT];
+    int []     _patch_types     = new int[DEFAULT_PATCH_COUNT];
+    boolean [] _patch_in_struct = new boolean[DEFAULT_PATCH_COUNT];
+
+    // this is only loaded by the User writer, but it is read
+    // by the "get byte" operations and must be coordinated
+    // with the patch list that the system writer maintains here.
+    int           _patch_symbol_table_count = 0;
+    SymbolTable[] _patch_symbol_tables      = new SymbolTable[DEFAULT_PATCH_COUNT];
+
+    // the patch stack is the list of patch points that currently
+    // need updating.  The value is the index into the patch arrays.
+    // As a value requiring patches is closed its patch idx is removed
+    // from the stack.
+    int    _top;
+    int [] _patch_stack = new int[DEFAULT_PATCH_DEPTH];
+
+    /**
+     * This is the depth as seen by the user.  Since there are cases where we
+     * don't push onto the patch stack and cases where we push non-user
+     * containers onto the patch stack we compute this separately during
+     * stepIn and stepOut.
+     */
+    private int _user_depth;
+
+
+    /**
+     * @param out OutputStream the users output byte stream, if specified
+     * @param autoFlush when true the writer flushes to the output stream
+     *  between top level values
+     * @param ensureInitialIvm when true, an initial IVM will be emitted even
+     *  when the user doesn't explicitly write one. When false, an initial IVM
+     *  won't be emitted unless the user does it. That can result in an invalid
+     *  Ion stream if not used carefully.
+     * @throws NullPointerException if any parameter is null.
+     */
+    IonWriterSystemBinary(SymbolTable defaultSystemSymtab,
+                          OutputStream out,
+                          boolean autoFlush,
+                          boolean ensureInitialIvm)
+    {
+        super(defaultSystemSymtab,
+              (ensureInitialIvm ? InitialIvmHandling.ENSURE : null),
+              IvmMinimizing.ADJACENT);
+
+        out.getClass(); // Efficient null check
+        _user_output_stream = out;
+
+        // the buffer manager and writer
+        // are used to hold the buffered
+        // binary values pending flush().
+        _manager = new BufferManager();
+        _writer = _manager.openWriter();
+        _auto_flush = autoFlush;
+    }
+
+    /**
+     * Empty our buffers, assuming it is safe to do so.
+     * This is called by {@link #flush()} and {@link #finish()}.
+     */
+    private void writeAllBufferedData()
+        throws IOException
+    {
+        writeBytes(_user_output_stream);
+
+        clearFieldName();
+        clearAnnotations();
+
+        _in_struct = false;
+        _patch_count = 0;
+        _patch_symbol_table_count = 0;
+        _top = 0;
+        try {
+            _writer.setPosition(0);
+            _writer.truncate();
+        }
+        catch (IOException e) {
+            throw new IonException(e);
+        }
+    }
+
+    @Override
+    public void finish() throws IOException
+    {
+        if (getDepth() != 0) {
+            throw new IllegalStateException(ERROR_FINISH_NOT_AT_TOP_LEVEL);
+        }
+
+        writeAllBufferedData();
+        super.finish();
+    }
+
+    final OutputStream getOutputStream()
+    {
+        return _user_output_stream;
+    }
+
+    public final boolean isInStruct()
+    {
+        return _in_struct;
+    }
+
+    private final boolean topInStruct() {
+        if (_top == 0) return false;
+        boolean in_struct = _patch_in_struct[_patch_stack[_top - 1]];
+        return in_struct;
+    }
+    protected final boolean atDatagramLevel()
+    {
+        return (topType() == _Private_IonConstants.tidDATAGRAM);
+//        return is_datagram;
+    }
+
+    @Override
+    public final int getDepth()
+    {
+        return _user_depth;
+    }
+
+    protected final IonType getContainer()
+    {
+        IonType type;
+        int tid = parentType();
+        switch (tid) {
+        case tidList:
+            type = IonType.LIST;
+            break;
+        case tidSexp:
+            type = IonType.SEXP;
+            break;
+        case tidStruct:
+            type = IonType.STRUCT;
+            break;
+        case tidDATAGRAM:
+            type = IonType.DATAGRAM;
+            break;
+        default:
+            throw new IonException("unexpected parent type "+tid+" does not represent a container");
+        }
+        return type;
+    }
+
+    @Override
+    final SymbolTable inject_local_symbol_table() throws IOException
+    {
+        SymbolTable symbols = super.inject_local_symbol_table();
+        PatchedValues top;
+        // find the parent
+        for (top = _patch; top.getParent() != null; top = top.getParent()) {}
+        // inject the symbol table; if @_patch is not the top element, then inject
+        // the symtab before this top-level value begins
+        super.startValue();
+        top.injectSymbolTable(symbols, _patch.getParent() != null);
+        super.endValue();
+        return symbols;
+    }
+
+    private final int topLength() {
+        return _patch_lengths[_patch_stack[_top - 1]];
+    }
+
+    private final int topType() {
+        if (_top == 0) return _Private_IonConstants.tidDATAGRAM;
+        return _patch_types[_patch_stack[_top - 1]];
+    }
+
+    private final int parentType() {
+        int ii = _top - 2;
+        while (ii >= 0) {
+            int type = _patch_types[_patch_stack[ii]];
+            if (type != _Private_IonConstants.tidTypedecl) return type;
+            ii--;
+        }
+        return _Private_IonConstants.tidDATAGRAM;
+    }
+
+    private final void startValue(int value_type)
+        throws IOException
+    {
+        super.startValue();
+
+        int[] sids = null;
+        int sid_count = annotationCount();
+        if (sid_count > 0) {
+            // prepare the SIDs of annotations before doing the patch as this may
+            // fail and leave the Writer in undefined state
+            sids = super.internAnnotationsAndGetSids();
+            _patch.startPatch(_Private_IonConstants.tidTypedecl, _writer.position());
+        } else {
+            _patch.startPatch(value_type, _writer.position());
+        }
+        // write field name
+        if (_in_struct) {
+            if (!isFieldNameSet()) {
+                throw new IllegalStateException(ERROR_MISSING_FIELD_NAME);
+            }
+            int sid = super.getFieldId();
+            if (sid < 0) {
+                throw new UnsupportedOperationException("symbol resolution must be handled by the user writer");
+            }
+            int fieldNameLength = _writer.writeVarUIntValue(sid, true);
+            _patch.patchFieldName(fieldNameLength);
+            clearFieldName();
+        }
+
+        // write annotations
+        if (sid_count > 0) {
+            _patch = _patch.addChild();
+            // add all annotations as if it's a value with type = -1
+            _patch.startPatch(TID_ANNOTATION_PATCH, _writer.position());
+            int len = 0;
+            for (int ii=0; ii<sid_count; ii++) {
+                len += _writer.writeVarUIntValue(sids[ii], true);
+            }
+            _patch.patchValue(len);
+            _patch.endPatch();
+            clearAnnotations();
+            // add the actual value now
+            _patch.startPatch(value_type, _writer.position());
+        }
+    }
+
+    private final void closeValue()
+        throws IOException
+    {
+        super.endValue();
+        _patch.endPatch();
+        if (_patch.getParent() != null
+            && _patch.getParent().getType() == _Private_IonConstants.tidTypedecl)
+        {
+            // this is an annotated value, gotta get out
+            _patch = _patch.getParent();
+            _patch.endPatch();
+            assert _patch != null;
+        }
+    }
+
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * The {@link OutputStream} spec is mum regarding the behavior of flush on
+     * a closed stream, so we shouldn't assume that our stream can handle that.
+     */
+    public final void flush() throws IOException
+    {
+        if (! _closed)
+        {
+            if (atDatagramLevel() && ! hasAnnotations())
+            {
+                SymbolTable symtab = getSymbolTable();
+
+                if (symtab != null &&
+                    symtab.isReadOnly() &&
+                    symtab.isLocalTable())
+                {
+                    // It's no longer possible to add more symbols to the local
+                    // symtab, so we can safely write everything out.
+                    writeAllBufferedData();
+                }
+            }
+
+            _user_output_stream.flush();
+        }
+    }
+
+    public final void close() throws IOException
+    {
+        if (! _closed) {
+            try
+            {
+                if (getDepth() == 0) {
+                    finish();
+                }
+            }
+            finally
+            {
+                // Do this first so we are closed even if the call below throws.
+                _closed = true;
+
+                _user_output_stream.close();
+            }
+        }
+    }
+
+
+
+    @Override
+    void writeIonVersionMarkerAsIs(SymbolTable systemSymtab)
+        throws IOException
+    {
+        if (_user_depth != 0) {
+            throw new IllegalStateException("IVM not on top-level");
+        }
+        super.startValue();
+        _patch.startPatch(TID_RAW, _writer.position());
+        _patch.patchValue(4);
+        _writer.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+        _patch.endPatch();
+        super.endValue();
+    }
+
+    @Override
+    void writeLocalSymtab(SymbolTable symbols)
+        throws IOException
+    {
+        // this method *should* be called when @_patch is a top-level value, but
+        // we cannot be sure, so try to find the top-level anyway
+        PatchedValues top;
+        // find the parent
+        for (top = _patch; top.getParent() != null; top = top.getParent()) {}
+        super.startValue();
+        top.injectSymbolTable(symbols, _patch.getParent() != null);
+        super.endValue();
+        super.writeLocalSymtab(symbols);
+    }
+
+    public final void stepIn(IonType containerType) throws IOException
+    {
+        int tid;
+        switch (containerType)
+        {
+            case LIST:   tid = tidList;   break;
+            case SEXP:   tid = tidSexp;   break;
+            case STRUCT: tid = tidStruct; break;
+            default:
+                throw new IllegalArgumentException();
+        }
+        startValue(tid);
+        _patch = _patch.addChild();
+        _in_struct = (tid == tidStruct);
+        ++_user_depth;
+    }
+
+    public final void stepOut() throws IOException
+    {
+        if (_patch.getParent() == null) {
+            throw new IllegalStateException(IonMessages.CANNOT_STEP_OUT);
+        }
+        // container is over, getting out
+        _patch = _patch.getParent();
+        // now close current value
+        closeValue();
+        if (_patch.getParent() == null) {
+            _in_struct = false;
+            // we're on top-level
+            if (_auto_flush) {
+                flush();
+            }
+        } else {
+            _in_struct = (_patch.getParent().getType() == _Private_IonConstants.tidStruct);
+        }
+        --_user_depth;
+    }
+
+
+    public void writeNull(IonType type) throws IOException
+    {
+        int tid;
+        switch (type) {
+        case NULL:      tid = _Private_IonConstants.tidNull;      break;
+        case BOOL:      tid = _Private_IonConstants.tidBoolean;   break;
+        case INT:       tid = _Private_IonConstants.tidPosInt;    break;
+        case FLOAT:     tid = _Private_IonConstants.tidFloat;     break;
+        case DECIMAL:   tid = _Private_IonConstants.tidDecimal;   break;
+        case TIMESTAMP: tid = _Private_IonConstants.tidTimestamp; break;
+        case SYMBOL:    tid = _Private_IonConstants.tidSymbol;    break;
+        case STRING:    tid = _Private_IonConstants.tidString;    break;
+        case BLOB:      tid = _Private_IonConstants.tidBlob;      break;
+        case CLOB:      tid = _Private_IonConstants.tidClob;      break;
+        case SEXP:      tid = _Private_IonConstants.tidSexp;      break;
+        case LIST:      tid = _Private_IonConstants.tidList;      break;
+        case STRUCT:    tid = _Private_IonConstants.tidStruct;    break;
+        default:
+            throw new IllegalArgumentException("Invalid type: " + type);
+        }
+        startValue(TID_RAW);
+        _writer.write((tid << 4) | _Private_IonConstants.lnIsNull);
+        _patch.patchValue(1);
+        closeValue();
+    }
+
+    public void writeBool(boolean value) throws IOException
+    {
+        int ln = value ? _Private_IonConstants.lnBooleanTrue : _Private_IonConstants.lnBooleanFalse;
+        startValue(TID_RAW);
+        _writer.write((_Private_IonConstants.tidBoolean << 4) | ln);
+        _patch.patchValue(1);
+        closeValue();
+    }
+    public void writeInt(long value) throws IOException
+    {
+        int len;
+        if (value < 0) {
+            startValue(_Private_IonConstants.tidNegInt);
+            len = _writer.writeUIntValue(-value);
+        } else {
+            startValue(_Private_IonConstants.tidPosInt);
+            len = _writer.writeUIntValue(value);
+        }
+        _patch.patchValue(len);
+        closeValue();
+    }
+
+    public void writeInt(BigInteger value) throws IOException
+    {
+        if (value == null) {
+            writeNull(IonType.INT);
+            return;
+        }
+
+        boolean     is_negative = (value.signum() < 0);
+        BigInteger  positive = value;
+
+        if (is_negative) {
+            positive = value.negate();
+        }
+
+        int len = IonBinary.lenIonInt(positive);
+        startValue(is_negative ? _Private_IonConstants.tidNegInt : _Private_IonConstants.tidPosInt);
+        _writer.writeUIntValue(positive, len);
+        _patch.patchValue(len);
+
+        closeValue();
+    }
+
+    public void writeFloat(double value) throws IOException
+    {
+        int len = IonBinary.lenIonFloat(value);
+        startValue(_Private_IonConstants.tidFloat); // int's are always less than varlen long
+        len = _writer.writeFloatValue(value);
+        _patch.patchValue(len);
+        closeValue();
+    }
+
+    @Override
+    public void writeDecimal(BigDecimal value) throws IOException
+    {
+        if (value == null) {
+            writeNull(IonType.DECIMAL);
+            return;
+        }
+        startValue(_Private_IonConstants.tidDecimal);
+        int len = _writer.writeDecimalContent(value);
+        _patch.patchValue(len);
+        closeValue();
+    }
+
+    public void writeTimestamp(Timestamp value) throws IOException
+    {
+        if (value == null) {
+            writeNull(IonType.TIMESTAMP);
+            return;
+        }
+        startValue(_Private_IonConstants.tidTimestamp);
+        int len = _writer.writeTimestamp(value);
+        _patch.patchValue(len);
+        closeValue();
+    }
+
+    public void writeString(String value) throws IOException
+    {
+        if (value == null) {
+            writeNull(IonType.STRING);
+            return;
+        }
+        startValue(_Private_IonConstants.tidString);
+        int len = _writer.writeStringData(value);
+        _patch.patchValue(len);
+        closeValue();
+    }
+
+    @Override
+    void writeSymbolAsIs(int symbolId) throws IOException
+    {
+        startValue(_Private_IonConstants.tidSymbol);
+        int len = _writer.writeUIntValue(symbolId);
+        _patch.patchValue(len);
+        closeValue();
+    }
+
+    @Override
+    public void writeSymbolAsIs(String value) throws IOException
+    {
+        if (value == null) {
+            writeNull(IonType.SYMBOL);
+            return;
+        }
+        int sid = add_symbol(value);
+        writeSymbolAsIs(sid);
+    }
+
+    public void writeClob(byte[] value, int start, int len) throws IOException
+    {
+        if (value == null) {
+            writeNull(IonType.CLOB);
+            return;
+        }
+        if (start < 0 || len < 0 || start+len > value.length) {
+            throw new IllegalArgumentException("the start and len must be contained in the byte array");
+        }
+        startValue(_Private_IonConstants.tidClob);
+        _writer.write(value, start, len);
+        _patch.patchValue(len);
+        closeValue();
+    }
+
+    public void writeBlob(byte[] value, int start, int len) throws IOException
+    {
+        if (value == null) {
+            writeNull(IonType.BLOB);
+            return;
+        }
+        if (start < 0 || len < 0 || start+len > value.length) {
+            throw new IllegalArgumentException("the start and len must be contained in the byte array");
+        }
+        startValue(_Private_IonConstants.tidBlob);
+        _writer.write(value, start, len);
+        _patch.patchValue(len);
+        closeValue();
+    }
+
+    // just transfer the bytes into the current patch as 'proper' ion binary serialization
+    public void writeRaw(byte[] value, int start, int len) throws IOException
+    {
+        startValue(TID_RAW);
+        _writer.write(value, start, len);
+        _patch.patchValue(len);
+        closeValue();
+    }
+
+    public void writeBoolList(boolean[] values) throws IOException
+    {
+        stepIn(IonType.LIST);
+        for (boolean b : values) {
+            writeBool(b);
+        }
+        stepOut();
+    }
+
+    public void writeIntList(byte[] values) throws IOException
+    {
+        stepIn(IonType.LIST);
+        for (byte b : values) {
+            writeInt(b);
+        }
+        stepOut();
+    }
+
+    public void writeIntList(short[] values) throws IOException
+    {
+        stepIn(IonType.LIST);
+        for (short s : values) {
+            writeInt(s);
+        }
+        stepOut();
+    }
+
+    public void writeIntList(int[] values) throws IOException
+    {
+        stepIn(IonType.LIST);
+        for (int i : values) {
+            writeInt(i);
+        }
+        stepOut();
+    }
+
+    public void writeIntList(long[] values) throws IOException
+    {
+        stepIn(IonType.LIST);
+        for (long l : values) {
+            writeInt(l);
+        }
+        stepOut();
+    }
+
+    public void writeFloatList(float[] values) throws IOException
+    {
+        stepIn(IonType.LIST);
+        for (float f : values) {
+            writeFloat(f);
+        }
+        stepOut();
+    }
+
+    public void writeFloatList(double[] values) throws IOException
+    {
+        stepIn(IonType.LIST);
+        for (double d : values) {
+            writeFloat(d);
+        }
+        stepOut();
+    }
+
+    public void writeStringList(String[] values) throws IOException
+    {
+        stepIn(IonType.LIST);
+        for (String s : values) {
+            writeString(s);
+        }
+        stepOut();
+    }
+
+    // TODO make private after IonBinaryWriter is removed
+    /**
+     * Writes everything we've got into the output stream, performing all
+     * necessary patches along the way.
+     *
+     * This implements {@link com.amazon.ion.IonBinaryWriter#writeBytes(OutputStream)}
+     * via our subclass {@link IonWriterBinaryCompatibility.System}.
+     */
+    int writeBytes(OutputStream userstream) throws IOException {
+        if (_patch.getParent() != null) {
+            throw new IllegalStateException("Tried to flush while not on top-level");
+        }
+
+        try {
+            BlockedByteInputStream datastream =
+                new BlockedByteInputStream(_manager.buffer());
+            int size = writeRecursive(datastream, userstream, _patch);
+            return size;
+        } finally {
+            _patch.reset();
+        }
+    }
+
+    int writeRecursive(BlockedByteInputStream datastream, OutputStream userstream, PatchedValues p) throws IOException {
+        int totalSize = 0;
+        for (int i = 0; i <= p._freePos; ++i) {
+            int type = p._types[i];
+            int pos = p._positions[i];
+            int fnlen = (int)(p._lengths[i] >> 32);
+            int vallen = (int)(p._lengths[i] & 0xFFFFFFFF);
+            if (p.getParent() == null) {
+                if (pos > totalSize) {
+                    // write whatever data that we have in the datastream (eg external data)
+                    datastream.writeTo(userstream, pos - totalSize);
+                    totalSize = pos;
+                }
+                totalSize += fnlen + vallen;
+            }
+            // write member name
+            if (fnlen > 0) {
+                datastream.writeTo(userstream, fnlen);
+            }
+            switch (type) {
+            case TID_ANNOTATION_PATCH:
+                IonBinary.writeVarUInt(userstream, vallen);
+                datastream.writeTo(userstream, vallen);
+                break;
+
+            case TID_SYMBOL_TABLE_PATCH:
+                SymbolTable symtab = p._symtabs.remove();
+                if (!symtab.isSystemTable()) {
+                    byte[] symtabBytes = reverseEncode(1024, symtab);
+                    userstream.write(symtabBytes);
+                    totalSize += symtabBytes.length;
+                }
+                break;
+
+            case TID_RAW:
+                datastream.writeTo(userstream, vallen);
+                break;
+
+            default:
+                // write type
+                if (vallen >= _Private_IonConstants.lnIsVarLen) {
+                    int typeByte = (type << 4) | _Private_IonConstants.lnIsVarLen;
+                    userstream.write(typeByte);
+                    IonBinary.writeVarUInt(userstream, vallen);
+                } else {
+                    int typeByte = (type << 4) | vallen;
+                    userstream.write(typeByte);
+                }
+                switch (type) {
+                case _Private_IonConstants.tidList:
+                case _Private_IonConstants.tidSexp:
+                case _Private_IonConstants.tidStruct:
+                case _Private_IonConstants.tidTypedecl:
+                    // write the container
+                    assert p._children != null;
+                    writeRecursive(datastream, userstream, p._children.remove());
+                    break;
+
+                default:
+                    datastream.writeTo(userstream, vallen);
+                }
+            }
+        }
+        return totalSize;
+    }
+
+    static class CountingStream extends OutputStream
+    {
+        private final OutputStream _wrapped;
+        private       int          _written;
+
+        CountingStream(OutputStream userstream) {
+            _wrapped = userstream;
+        }
+
+        public int getBytesWritten() {
+            return _written;
+        }
+
+        @Override
+        public void write(int b) throws IOException
+        {
+            _wrapped.write(b);
+            _written++;
+        }
+        @Override
+        public void write(byte[] bytes) throws IOException
+        {
+            _wrapped.write(bytes);
+            _written += bytes.length;
+        }
+        @Override
+        public void write(byte[] bytes, int off, int len) throws IOException
+        {
+            _wrapped.write(bytes, off, len);
+            _written += len;
+        }
+
+    }
+
+    protected int write_symbol_table(OutputStream userstream,
+                                     SymbolTable symtab) throws IOException
+    {
+        CountingStream cs = new CountingStream(userstream);
+        // TODO this is assuming the symtab needed here, broken for open content.
+        IonWriterSystemBinary writer =
+            new IonWriterSystemBinary(_default_system_symbol_table,
+                                      cs,
+                                      false /* autoflush */ ,
+                                      false /* ensureInitialIvm */);
+        symtab.writeTo(writer);
+        writer.finish();
+        int symtab_len = cs.getBytesWritten();
+        return symtab_len;
+    }
+
+    protected int XXX_get_pending_length_with_no_symbol_tables()
+    {
+        int buffer_length = _manager.buffer().size();
+        int patch_amount = 0;
+
+        for (int patch_idx = 0; patch_idx < _patch_count; patch_idx ++) {
+            // int vlen = _patch_list[patch_idx + IonBinaryWriter.POSITION_OFFSET];
+            int vlen = _patch_lengths[patch_idx];
+            if (vlen >= _Private_IonConstants.lnIsVarLen) {
+                int ln = IonBinary.lenVarUInt(vlen);
+                patch_amount += ln;
+            }
+        }
+
+        int symbol_table_length = 0;
+
+        int total_length = 0;
+        total_length += buffer_length
+                     +  patch_amount
+                     +  symbol_table_length;
+
+        return total_length;
+    }
+}
diff --git a/src/software/amazon/ion/impl/IonWriterSystemText.java b/src/com/amazon/ion/impl/IonWriterSystemText.java
similarity index 90%
rename from src/software/amazon/ion/impl/IonWriterSystemText.java
rename to src/com/amazon/ion/impl/IonWriterSystemText.java
index ea30350ab5..0e78e95ccd 100644
--- a/src/software/amazon/ion/impl/IonWriterSystemText.java
+++ b/src/com/amazon/ion/impl/IonWriterSystemText.java
@@ -1,48 +1,50 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.SystemSymbols.SYMBOLS;
-import static software.amazon.ion.impl.PrivateIonConstants.tidList;
-import static software.amazon.ion.impl.PrivateIonConstants.tidSexp;
-import static software.amazon.ion.impl.PrivateIonConstants.tidStruct;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.SystemSymbols.SYMBOLS;
+import static com.amazon.ion.impl._Private_IonConstants.tidList;
+import static com.amazon.ion.impl._Private_IonConstants.tidSexp;
+import static com.amazon.ion.impl._Private_IonConstants.tidStruct;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.system.IonTextWriterBuilder.LstMinimizing;
+import com.amazon.ion.util.IonTextUtils;
+import com.amazon.ion.util.IonTextUtils.SymbolVariant;
+import com.amazon.ion.util._Private_FastAppendable;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.system.IonTextWriterBuilder.LstMinimizing;
-import software.amazon.ion.util.IonTextUtils;
-import software.amazon.ion.util.PrivateFastAppendable;
-import software.amazon.ion.util.IonTextUtils.SymbolVariant;
+
 
 class IonWriterSystemText
     extends IonWriterSystem
 {
     /** Not null. */
-    private final PrivateIonTextWriterBuilder _options;
+    private final _Private_IonTextWriterBuilder _options;
     /** At least one. */
     private final int _long_string_threshold;
 
-    private final PrivateIonTextAppender _output;
+    private final _Private_IonTextAppender _output;
 
     /** Ensure we don't use a closed {@link #output} stream. */
     private boolean _closed;
@@ -75,15 +77,15 @@ class IonWriterSystemText
      * @throws NullPointerException if any parameter is null.
      */
     protected IonWriterSystemText(SymbolTable defaultSystemSymtab,
-                                  PrivateIonTextWriterBuilder options,
-                                  PrivateFastAppendable out)
+                                  _Private_IonTextWriterBuilder options,
+                                  _Private_FastAppendable out)
     {
         super(defaultSystemSymtab,
               options.getInitialIvmHandling(),
               options.getIvmMinimizing());
 
         _output =
-            PrivateIonTextAppender.forFastAppendable(out,
+            _Private_IonTextAppender.forFastAppendable(out,
                                                        options.getCharset());
         _options = options;
 
@@ -100,7 +102,7 @@ protected IonWriterSystemText(SymbolTable defaultSystemSymtab,
     }
 
 
-    PrivateIonTextWriterBuilder getBuilder()
+    _Private_IonTextWriterBuilder getBuilder()
     {
         return _options;
     }
@@ -122,16 +124,16 @@ protected IonType getContainer()
         }
         else {
             switch(_stack_parent_type[_top-1]) {
-            case PrivateIonConstants.tidDATAGRAM:
+            case _Private_IonConstants.tidDATAGRAM:
                 container = IonType.DATAGRAM;
                 break;
-            case PrivateIonConstants.tidSexp:
+            case _Private_IonConstants.tidSexp:
                 container = IonType.SEXP;
                 break;
-            case PrivateIonConstants.tidList:
+            case _Private_IonConstants.tidList:
                 container = IonType.LIST;
                 break;
-            case PrivateIonConstants.tidStruct:
+            case _Private_IonConstants.tidStruct:
                 container = IonType.STRUCT;
                 break;
             default:
@@ -148,11 +150,11 @@ void push(int typeid)
         _stack_parent_type[_top] = typeid;
         _stack_pending_comma[_top] = _pending_separator;
         switch (typeid) {
-        case PrivateIonConstants.tidSexp:
+        case _Private_IonConstants.tidSexp:
             _separator_character = ' ';
             break;
-        case PrivateIonConstants.tidList:
-        case PrivateIonConstants.tidStruct:
+        case _Private_IonConstants.tidList:
+        case _Private_IonConstants.tidStruct:
             _separator_character = ',';
             break;
         default:
@@ -180,15 +182,15 @@ int pop() {
         int parentid = (_top > 0) ? _stack_parent_type[_top - 1] : -1;
         switch (parentid) {
         case -1:
-        case PrivateIonConstants.tidSexp:
+        case _Private_IonConstants.tidSexp:
             _in_struct = false;
             _separator_character = ' ';
             break;
-        case PrivateIonConstants.tidList:
+        case _Private_IonConstants.tidList:
             _in_struct = false;
             _separator_character = ',';
             break;
-        case PrivateIonConstants.tidStruct:
+        case _Private_IonConstants.tidStruct:
             _in_struct = true;
             _separator_character = ',';
             break;
@@ -660,7 +662,7 @@ public void writeString(String value)
             && ! _following_long_string
             && _long_string_threshold < value.length())
         {
-            // TODO amzn/ion-java#57 This can lead to mixed newlines in the output.
+            // TODO amzn/ion-java/issues/57 This can lead to mixed newlines in the output.
             // It assumes NL line separators, but _options could use CR+NL
             _output.printLongString(value);
 
diff --git a/src/com/amazon/ion/impl/IonWriterSystemTextMarkup.java b/src/com/amazon/ion/impl/IonWriterSystemTextMarkup.java
new file mode 100644
index 0000000000..0925429566
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonWriterSystemTextMarkup.java
@@ -0,0 +1,266 @@
+
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.util._Private_FastAppendable;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+class IonWriterSystemTextMarkup extends IonWriterSystemText {
+
+    /**
+     * myTypeBeingWritten is used to communicate the type of the data that was
+     * requested to be written via a write<Type> to the subsequent methods that
+     * need to know the type for calling callbacks.
+     * It is not used when writing containers, or separators, since the type of
+     * container is passed in by the user, or can be obtained via
+     * getContainer().
+     */
+    private IonType               myTypeBeingWritten;
+    private final _Private_MarkupCallback  myCallback;
+
+    public IonWriterSystemTextMarkup(SymbolTable defaultSystemSymtab,
+                                     _Private_IonTextWriterBuilder options,
+                                     _Private_FastAppendable out)
+    {
+        this(defaultSystemSymtab, options, out, options.getCallbackBuilder());
+    }
+
+    private IonWriterSystemTextMarkup(SymbolTable defaultSystemSymtab,
+                                     _Private_IonTextWriterBuilder options,
+                                     _Private_FastAppendable out,
+                                     _Private_CallbackBuilder builder)
+    {
+        this(defaultSystemSymtab, options, builder.build(out));
+    }
+
+    private IonWriterSystemTextMarkup(SymbolTable defaultSystemSymtab,
+                                     _Private_IonTextWriterBuilder options,
+                                     _Private_MarkupCallback callback)
+    {
+        super(defaultSystemSymtab, options, callback.getAppendable());
+        myCallback = callback;
+    }
+
+    @Override
+    void startValue()
+        throws IOException
+    {
+        super.startValue();
+        myCallback.beforeValue(myTypeBeingWritten);
+    }
+
+    @Override
+    void closeValue()
+        throws IOException
+    {
+        myCallback.afterValue(myTypeBeingWritten);
+        super.closeValue();
+    }
+
+    @Override
+    protected void writeFieldNameToken(SymbolToken sym)
+        throws IOException
+    {
+        myCallback.beforeFieldName(myTypeBeingWritten, sym);
+        super.writeFieldNameToken(sym);
+        myCallback.afterFieldName(myTypeBeingWritten, sym);
+    }
+
+    @Override
+    protected void writeAnnotations(SymbolToken[] annotations)
+        throws IOException
+    {
+        myCallback.beforeAnnotations(myTypeBeingWritten);
+        super.writeAnnotations(annotations);
+        myCallback.afterAnnotations(myTypeBeingWritten);
+    }
+
+    @Override
+    protected void writeAnnotationToken(SymbolToken sym)
+        throws IOException
+    {
+        myCallback.beforeEachAnnotation(myTypeBeingWritten, sym);
+        super.writeAnnotationToken(sym);
+        myCallback.afterEachAnnotation(myTypeBeingWritten, sym);
+    }
+
+    @Override
+    protected boolean writeSeparator(boolean followingLongString)
+        throws IOException
+    {
+        // Determine the type of the container.
+        IonType containerType = getContainer();
+        // Don't set beingWritten, because writeSeparator is called during the
+        // writing of another value, and it would mess up the other callbacks
+
+        if (_pending_separator) {
+            myCallback.beforeSeparator(containerType);
+        }
+
+        followingLongString = super.writeSeparator(followingLongString);
+
+        if (_pending_separator) {
+            myCallback.afterSeparator(containerType);
+        }
+        return followingLongString;
+    }
+
+    @Override
+    public void stepIn(IonType containerType)
+        throws IOException
+    {
+        myTypeBeingWritten = containerType;
+        super.stepIn(containerType);
+        myCallback.afterStepIn(containerType);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void stepOut()
+        throws IOException
+    {
+        myTypeBeingWritten = getContainer();
+        myCallback.beforeStepOut(myTypeBeingWritten);
+        super.stepOut();
+        myTypeBeingWritten = null;
+    }
+
+    // ================ Customer Methods for writing Ion data. ================
+
+    @Override
+    public void writeBlob(byte[] value, int start, int len)
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.BLOB;
+        super.writeBlob(value, start, len);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeBool(boolean value)
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.BOOL;
+        super.writeBool(value);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeClob(byte[] value, int start, int len)
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.CLOB;
+        super.writeClob(value, start, len);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeDecimal(BigDecimal value)
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.DECIMAL;
+        super.writeDecimal(value);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeFloat(double value)
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.FLOAT;
+        super.writeFloat(value);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeInt(long value)
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.INT;
+        super.writeInt(value);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeInt(BigInteger value)
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.INT;
+        super.writeInt(value);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeNull()
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.NULL;
+        super.writeNull();
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeNull(IonType type)
+        throws IOException
+    {
+        myTypeBeingWritten = type;
+        super.writeNull(type);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeString(String value)
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.STRING;
+        super.writeString(value);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeSymbolAsIs(String value)
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.SYMBOL;
+        super.writeSymbolAsIs(value);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeSymbolAsIs(int value)
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.SYMBOL;
+        super.writeSymbolAsIs(value);
+        myTypeBeingWritten = null;
+    }
+
+    @Override
+    public void writeTimestamp(Timestamp value)
+        throws IOException
+    {
+        myTypeBeingWritten = IonType.TIMESTAMP;
+        super.writeTimestamp(value);
+        myTypeBeingWritten = null;
+    }
+}
diff --git a/src/software/amazon/ion/impl/IonWriterSystemTree.java b/src/com/amazon/ion/impl/IonWriterSystemTree.java
similarity index 81%
rename from src/software/amazon/ion/impl/IonWriterSystemTree.java
rename to src/com/amazon/ion/impl/IonWriterSystemTree.java
index 663008a768..ff3bf30d14 100644
--- a/src/software/amazon/ion/impl/IonWriterSystemTree.java
+++ b/src/com/amazon/ion/impl/IonWriterSystemTree.java
@@ -1,45 +1,46 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.impl.PrivateUtils.valueIsLocalSymbolTable;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.impl._Private_Utils.valueIsLocalSymbolTable;
+
+import com.amazon.ion.IonBlob;
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonClob;
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonDecimal;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonFloat;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.ValueFactory;
+import com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
+import com.amazon.ion.system.IonWriterBuilder.IvmMinimizing;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import software.amazon.ion.IonBlob;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonClob;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.ValueFactory;
-import software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
-import software.amazon.ion.system.IonWriterBuilder.IvmMinimizing;
 
 
 /**
@@ -51,9 +52,8 @@ final class IonWriterSystemTree
     extends IonWriterSystem
 {
 
-     /** Factory for constructing local symbol tables. Not null. */
-     private final LocalSymbolTableAsStruct.Factory _lst_factory;
-
+    /** Factory for constructing local symbol tables. Not null. */
+    private final LocalSymbolTableAsStruct.Factory _lst_factory;
 
     private final ValueFactory _factory;
 
@@ -87,7 +87,7 @@ protected IonWriterSystemTree(SymbolTable defaultSystemSymbolTable,
               IvmMinimizing.ADJACENT);
 
         _factory = rootContainer.getSystem();
-        _lst_factory = (LocalSymbolTableAsStruct.Factory)((PrivateValueFactory)_factory).getLstFactory();
+        _lst_factory = (LocalSymbolTableAsStruct.Factory)((_Private_ValueFactory)_factory).getLstFactory();
         _catalog = catalog;
         _current_parent = rootContainer;
         _in_struct = (_current_parent instanceof IonStruct);
@@ -186,7 +186,7 @@ private void append(IonValue value)
         if (hasAnnotations()) {
             SymbolToken[] annotations = getTypeAnnotationSymbols();
             // TODO this makes an extra copy of the array
-            ((PrivateIonValue)value).setTypeAnnotationSymbols(annotations);
+            ((_Private_IonValue)value).setTypeAnnotationSymbols(annotations);
             this.clearAnnotations();
         }
 
@@ -219,7 +219,7 @@ public void stepIn(IonType containerType) throws IOException
 
     public void stepOut() throws IOException
     {
-        PrivateIonValue prior = (PrivateIonValue)_current_parent;
+        _Private_IonValue prior = (_Private_IonValue)_current_parent;
         popParent();
 
         if (_current_parent instanceof IonDatagram
@@ -238,7 +238,7 @@ void writeIonVersionMarkerAsIs(SymbolTable systemSymtab)
     {
         startValue();
         IonValue root = get_root();
-        ((PrivateIonDatagram)root).appendTrailingSymbolTable(systemSymtab);
+        ((_Private_IonDatagram)root).appendTrailingSymbolTable(systemSymtab);
         endValue();
     }
 
@@ -248,7 +248,7 @@ void writeLocalSymtab(SymbolTable symtab)
         throws IOException
     {
         IonValue root = get_root();
-        ((PrivateIonDatagram)root).appendTrailingSymbolTable(symtab);
+        ((_Private_IonDatagram)root).appendTrailingSymbolTable(symtab);
 
         super.writeLocalSymtab(symtab);
     }
diff --git a/src/software/amazon/ion/impl/IonWriterUser.java b/src/com/amazon/ion/impl/IonWriterUser.java
similarity index 91%
rename from src/software/amazon/ion/impl/IonWriterUser.java
rename to src/com/amazon/ion/impl/IonWriterUser.java
index b5b3fd2dca..22acb7eac7 100644
--- a/src/software/amazon/ion/impl/IonWriterUser.java
+++ b/src/com/amazon/ion/impl/IonWriterUser.java
@@ -1,43 +1,49 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.ValueFactory;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.ValueFactory;
 
 /**
+ * <p>
  * This writer handles the symbol table processing and
  * provides default implementations for the list forms
  * of the write methods as often the list form is not
  * susceptible to optimization.
+ * </p>
+ *
  * <p>
  * This writer has a ({@link #_system_writer}) to which the actual data is
  * written, but data flows through the {@link #_current_writer} most of the
  * time.
+ * </p>
+ *
  * <p>
  * The critical responsibility here is the recognition of IVMs and local symbol
  * tables. When the user starts writing a local symtab, the stream is diverted
@@ -45,10 +51,11 @@
  * collects the symtab data into an {@link IonStruct} instance.  When that
  * struct is stepped-out, the diversion is stopped and the new
  * {@link SymbolTable} is installed.
+ * </p>
  */
 class IonWriterUser
-    extends PrivateIonWriterBase
-    implements PrivateIonWriter
+    extends _Private_IonWriterBase
+    implements _Private_IonWriter
 {
     /** Factory for constructing the DOM of local symtabs. Not null. */
     private final ValueFactory _symtab_value_factory;
@@ -216,16 +223,20 @@ private boolean symbol_table_being_collected()
     }
 
     /**
+     * <p>
      * Diverts the data stream to a temporary tree writer which collects
      * local symtab data into an IonStruct from which we'll later construct a
      * {@link SymbolTable} instance.
+     * </p>
      * <p>
      * Once the value image of the symbol table is complete (which
      * happens when the caller steps out of the containing struct)
      * the diverted stream is abandonded and the symbol table gets constructed.
+     * </p>
      * <p>
      * If there was a makeSymbolTable(Reader) this copy might be,
      * at least partially, avoided.
+     * </p>
      */
     private void open_local_symbol_table_copy()
     {
@@ -255,7 +266,7 @@ private void close_local_symbol_table_copy() throws IOException
         // convert the struct we just wrote with the TreeWriter to a
         // local symbol table
         LocalSymbolTableAsStruct.Factory lstFactory =
-            (LocalSymbolTableAsStruct.Factory)((PrivateValueFactory)_symtab_value_factory).getLstFactory();
+            (LocalSymbolTableAsStruct.Factory)((_Private_ValueFactory)_symtab_value_factory).getLstFactory();
         SymbolTable symtab = lstFactory.newLocalSymtab(_catalog, _symbol_table_value);
 
         _symbol_table_value = null;
@@ -271,7 +282,7 @@ public final void setSymbolTable(SymbolTable symbols)
         throws IOException
     {
         if (symbols == null ||
-            PrivateUtils.symtabIsSharedNotSystem(symbols))
+            _Private_Utils.symtabIsSharedNotSystem(symbols))
         {
             String message =
                 "symbol table must be local or system to be set, or reset";
diff --git a/src/com/amazon/ion/impl/IonWriterUserBinary.java b/src/com/amazon/ion/impl/IonWriterUserBinary.java
new file mode 100644
index 0000000000..8d9a7823dd
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonWriterUserBinary.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.impl._Private_Utils.isNonSymbolScalar;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.util.IonStreamUtils;
+import java.io.IOException;
+
+
+class IonWriterUserBinary
+    extends IonWriterUser
+    implements _Private_ListWriter
+{
+    /**
+     * This is null if the writer is not stream copy optimized.
+     */
+    private final _Private_SymtabExtendsCache mySymtabExtendsCache;
+
+    /**
+     * This is null if the writer is not stream copy optimized.
+     */
+    private final _Private_ByteTransferSink myCopySink;
+
+    // If we wanted to we could keep an extra reference to the
+    // system writer which was correctly typed as an
+    // IonBinaryWriter and avoid the casting in the 3 "overridden"
+    // methods.  However those are sufficiently expensive that
+    // the cost of the cast should be lost in the noise.
+
+    IonWriterUserBinary(_Private_IonBinaryWriterBuilder options,
+                        IonWriterSystemBinary           systemWriter)
+    {
+        super(options.getCatalog(),
+              options.getSymtabValueFactory(),
+              systemWriter,
+              options.buildContextSymbolTable());
+
+        if (options.isStreamCopyOptimized())
+        {
+            mySymtabExtendsCache = new _Private_SymtabExtendsCache();
+            myCopySink = new _Private_ByteTransferSink()
+            {
+                public void writeBytes(byte[] data, int off, int len) throws IOException
+                {
+                    ((IonWriterSystemBinary) _current_writer).writeRaw(data, off, len);
+                }
+            };
+        }
+        else
+        {
+            mySymtabExtendsCache = null;
+            myCopySink = null;
+        }
+    }
+
+
+    @Override
+    public boolean isStreamCopyOptimized()
+    {
+        return mySymtabExtendsCache != null;
+    }
+
+    @Override
+    public void writeValue(IonReader reader)
+        throws IOException
+    {
+        // If reader is not on a value, type is null, and NPE will be thrown
+        // by calls below
+        IonType type = reader.getType();
+
+        // See if we can copy bytes directly from the source. This test should
+        // only happen at the outermost call, not recursively down the tree.
+
+        if (isStreamCopyOptimized() &&
+            _current_writer instanceof IonWriterSystemBinary)
+        {
+            _Private_ByteTransferReader transfer =
+                reader.asFacet(_Private_ByteTransferReader.class);
+
+            if (transfer != null &&
+                (isNonSymbolScalar(type) ||
+                 mySymtabExtendsCache.symtabsCompat(getSymbolTable(),
+                                                    reader.getSymbolTable())))
+            {
+                // TODO amzn/ion-java/issues/16 Doesn't copy annotations or field names.
+                transfer.transferCurrentValue(myCopySink);
+                return;
+            }
+        }
+
+        // From here on, we won't call back into this method, so we won't
+        // bother doing all those checks again.
+        writeValueRecursively(type, reader);
+    }
+
+
+    public void writeBoolList(boolean[] values) throws IOException
+    {
+        IonStreamUtils.writeBoolList(_current_writer, values);
+    }
+
+
+    public void writeFloatList(float[] values) throws IOException
+    {
+        IonStreamUtils.writeFloatList(_current_writer, values);
+    }
+
+
+    public void writeFloatList(double[] values) throws IOException
+    {
+        IonStreamUtils.writeFloatList(_current_writer, values);
+    }
+
+
+    public void writeIntList(byte[] values) throws IOException
+    {
+        IonStreamUtils.writeIntList(_current_writer, values);
+    }
+
+
+    public void writeIntList(short[] values) throws IOException
+    {
+        IonStreamUtils.writeIntList(_current_writer, values);
+    }
+
+
+    public void writeIntList(int[] values) throws IOException
+    {
+        IonStreamUtils.writeIntList(_current_writer, values);
+    }
+
+
+    public void writeIntList(long[] values) throws IOException
+    {
+        IonStreamUtils.writeIntList(_current_writer, values);
+    }
+
+
+    public void writeStringList(String[] values) throws IOException
+    {
+        IonStreamUtils.writeStringList(_current_writer, values);
+    }
+}
diff --git a/src/software/amazon/ion/impl/LocalSymbolTable.java b/src/com/amazon/ion/impl/LocalSymbolTable.java
similarity index 92%
rename from src/software/amazon/ion/impl/LocalSymbolTable.java
rename to src/com/amazon/ion/impl/LocalSymbolTable.java
index d221661400..dde4bb8d67 100644
--- a/src/software/amazon/ion/impl/LocalSymbolTable.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTable.java
@@ -1,31 +1,41 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.SystemSymbols.IMPORTS;
-import static software.amazon.ion.SystemSymbols.IMPORTS_SID;
-import static software.amazon.ion.SystemSymbols.ION;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.MAX_ID_SID;
-import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.SystemSymbols.SYMBOLS_SID;
-import static software.amazon.ion.SystemSymbols.VERSION_SID;
-import static software.amazon.ion.impl.PrivateUtils.copyOf;
-import static software.amazon.ion.impl.PrivateUtils.getSidForSymbolTableField;
-import static software.amazon.ion.impl.PrivateUtils.safeEquals;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.SystemSymbols.IMPORTS;
+import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
+import static com.amazon.ion.SystemSymbols.ION;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.MAX_ID_SID;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.SystemSymbols.SYMBOLS_SID;
+import static com.amazon.ion.SystemSymbols.VERSION_SID;
+import static com.amazon.ion.impl._Private_Utils.copyOf;
+import static com.amazon.ion.impl._Private_Utils.getSidForSymbolTableField;
+import static com.amazon.ion.impl._Private_Utils.safeEquals;
+
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.ReadOnlyValueException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.util.IonTextUtils;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,15 +44,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.util.IonTextUtils;
 
 /**
  * A local symbol table.
@@ -53,12 +54,11 @@ class LocalSymbolTable
     implements SymbolTable
 {
 
-    static class Factory implements PrivateLocalSymbolTableFactory
+    static class Factory implements _Private_LocalSymbolTableFactory
     {
 
         private Factory(){} // Should be accessed through the singleton
 
-        @Override
         public SymbolTable newLocalSymtab(IonCatalog catalog,
                                           IonReader reader,
                                           boolean alreadyInStruct)
@@ -67,11 +67,11 @@ public SymbolTable newLocalSymtab(IonCatalog catalog,
             LocalSymbolTableImports imports = readLocalSymbolTable(reader,
                                                                    catalog,
                                                                    alreadyInStruct,
-                                                                   symbolsList);
+                                                                   symbolsList,
+                                                                   reader.getSymbolTable());
             return new LocalSymbolTable(imports, symbolsList);
         }
 
-        @Override
         public SymbolTable newLocalSymtab(SymbolTable defaultSystemSymtab,
                                           SymbolTable... imports)
         {
@@ -86,7 +86,6 @@ public SymbolTable newLocalSymtab(SymbolTable defaultSystemSymtab,
 
     static final Factory DEFAULT_LST_FACTORY = new Factory();
 
-
     /**
      * The initial length of {@link #mySymbolNames}.
      */
@@ -157,7 +156,7 @@ protected LocalSymbolTable(LocalSymbolTableImports imports, List<String> symbols
         if (symbolsList == null || symbolsList.isEmpty())
         {
             mySymbolsCount = 0;
-            mySymbolNames  = PrivateUtils.EMPTY_STRING_ARRAY;
+            mySymbolNames  = _Private_Utils.EMPTY_STRING_ARRAY;
         }
         else
         {
@@ -202,7 +201,8 @@ protected LocalSymbolTable(LocalSymbolTable other, int maxId)
     protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader,
                                                                   IonCatalog catalog,
                                                                   boolean isOnStruct,
-                                                                  List<String> symbolsListOut)
+                                                                  List<String> symbolsListOut,
+                                                                  SymbolTable symbolTable)
     {
         if (! isOnStruct)
         {
@@ -242,7 +242,7 @@ protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader,
                 sid = getSidForSymbolTableField(fieldName);
             }
 
-            // TODO amzn/ion-java#36 Switching over SIDs doesn't cover the case
+            // TODO amzn/ion-java/issues/36 Switching over SIDs doesn't cover the case
             //      where the relevant field names are defined by a prev LST;
             //      the prev LST could have 'symbols' defined locally with a
             //      different SID!
@@ -291,7 +291,7 @@ protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader,
                     else if (fieldType == IonType.SYMBOL)
                     {
                         // trying to import the current table
-                        if(reader.getSymbolTable().isLocalTable() && ION_SYMBOL_TABLE.equals(reader.stringValue()))
+                        if(symbolTable.isLocalTable() && ION_SYMBOL_TABLE.equals(reader.stringValue()))
                         {
                             SymbolTable currentSymbolTable = reader.getSymbolTable();
                             importsList.addAll(Arrays.asList(currentSymbolTable.getImportedTables()));
@@ -533,6 +533,7 @@ private static final void validateSymbol(String name)
      */
     int putSymbol(String symbolName)
     {
+
         if (isReadOnly)
         {
             throw new ReadOnlyValueException(SymbolTable.class);
@@ -825,7 +826,7 @@ boolean symtabExtends(SymbolTable other)
         // Superset must have same/more known symbols than subset.
         if (getMaxId() < subset.getMaxId()) return false;
 
-        // TODO amzn/ion-java#18 Currently, we check imports by their refs. which
+        // TODO amzn/ion-java/issues/18 Currently, we check imports by their refs. which
         //      might be overly strict; imports which are not the same ref.
         //      but have the same semantic states fails the extension check.
         if (! myImportsList.equalImports(subset.myImportsList))
diff --git a/src/software/amazon/ion/impl/LocalSymbolTableAsStruct.java b/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
similarity index 86%
rename from src/software/amazon/ion/impl/LocalSymbolTableAsStruct.java
rename to src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
index 7cc6f3021e..3ac9e674ae 100644
--- a/src/software/amazon/ion/impl/LocalSymbolTableAsStruct.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
@@ -1,36 +1,37 @@
 /*
- * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.SystemSymbols.IMPORTS;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.MAX_ID;
-import static software.amazon.ion.SystemSymbols.NAME;
-import static software.amazon.ion.SystemSymbols.SYMBOLS;
-import static software.amazon.ion.SystemSymbols.VERSION;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.SystemSymbols.IMPORTS;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.MAX_ID;
+import static com.amazon.ion.SystemSymbols.NAME;
+import static com.amazon.ion.SystemSymbols.SYMBOLS;
+import static com.amazon.ion.SystemSymbols.VERSION;
+
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.ValueFactory;
 import java.util.ArrayList;
 import java.util.List;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.ValueFactory;
 
 /**
  * A LocalSymbolTable that memoizes its IonStruct representation.
@@ -42,7 +43,7 @@ class LocalSymbolTableAsStruct
     extends LocalSymbolTable
 {
 
-    static class Factory implements PrivateLocalSymbolTableFactory
+    static class Factory implements _Private_LocalSymbolTableFactory
     {
 
         private final ValueFactory imageFactory;
@@ -56,7 +57,6 @@ public Factory(ValueFactory imageFactory)
             this.imageFactory = imageFactory;
         }
 
-        @Override
         public SymbolTable newLocalSymtab(IonCatalog catalog,
                                           IonReader reader,
                                           boolean alreadyInStruct)
@@ -65,11 +65,11 @@ public SymbolTable newLocalSymtab(IonCatalog catalog,
             LocalSymbolTableImports imports = readLocalSymbolTable(reader,
                                                                    catalog,
                                                                    alreadyInStruct,
-                                                                   symbolsList);
+                                                                   symbolsList,
+                                                                   reader.getSymbolTable());
             return new LocalSymbolTableAsStruct(imageFactory, imports, symbolsList);
         }
 
-        @Override
         public SymbolTable newLocalSymtab(SymbolTable defaultSystemSymtab,
                                           SymbolTable... imports)
         {
@@ -101,7 +101,8 @@ public SymbolTable newLocalSymtab(IonCatalog catalog,
             LocalSymbolTableImports imports = readLocalSymbolTable(reader,
                                                                    catalog,
                                                                    false,
-                                                                   symbolsList);
+                                                                   symbolsList,
+                                                                   ionRep.getSymbolTable());
 
             LocalSymbolTableAsStruct table = new LocalSymbolTableAsStruct(imageFactory,
                                                                           imports,
diff --git a/src/software/amazon/ion/impl/LocalSymbolTableImports.java b/src/com/amazon/ion/impl/LocalSymbolTableImports.java
similarity index 93%
rename from src/software/amazon/ion/impl/LocalSymbolTableImports.java
rename to src/com/amazon/ion/impl/LocalSymbolTableImports.java
index ca78b9c322..3d9bfe7e58 100644
--- a/src/software/amazon/ion/impl/LocalSymbolTableImports.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTableImports.java
@@ -1,26 +1,26 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import java.util.ArrayList;
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
 import java.util.Arrays;
 import java.util.List;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
 
 /**
  * This class manages the system symbol table and any shared symbol table(s)
@@ -29,7 +29,7 @@
  * <p>
  * This class is <b>immutable</b>, and hence safe for use by multiple threads.
  */
-// TODO amzn/ion-java#37 Create specialized class to handle the common case where
+// TODO amzn/ion-java/issues/37 Create specialized class to handle the common case where
 //      there are zero or one imported non-system shared symtab(s).
 final class LocalSymbolTableImports
 {
diff --git a/src/software/amazon/ion/impl/OutputStreamFastAppendable.java b/src/com/amazon/ion/impl/OutputStreamFastAppendable.java
similarity index 89%
rename from src/software/amazon/ion/impl/OutputStreamFastAppendable.java
rename to src/com/amazon/ion/impl/OutputStreamFastAppendable.java
index c3335f7553..9da49d08bf 100644
--- a/src/software/amazon/ion/impl/OutputStreamFastAppendable.java
+++ b/src/com/amazon/ion/impl/OutputStreamFastAppendable.java
@@ -1,33 +1,34 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.impl.PrivateIonConstants.makeUnicodeScalar;
+import static com.amazon.ion.impl._Private_IonConstants.makeUnicodeScalar;
 
+import com.amazon.ion.util._Private_FastAppendable;
 import java.io.Closeable;
 import java.io.Flushable;
 import java.io.IOException;
 import java.io.OutputStream;
-import software.amazon.ion.util.PrivateFastAppendable;
 
 /**
- * Adapts an {@link OutputStream} to implement {@link PrivateFastAppendable}.
+ * Adapts an {@link OutputStream} to implement {@link _Private_FastAppendable}.
  * <b>This always outputs UTF-8!</b>
  */
 final class OutputStreamFastAppendable
-    implements PrivateFastAppendable, Closeable, Flushable
+    implements _Private_FastAppendable, Closeable, Flushable
 {
     private static final int MAX_BYTES_LEN = 4096;
 
diff --git a/src/software/amazon/ion/impl/SharedSymbolTable.java b/src/com/amazon/ion/impl/SharedSymbolTable.java
similarity index 91%
rename from src/software/amazon/ion/impl/SharedSymbolTable.java
rename to src/com/amazon/ion/impl/SharedSymbolTable.java
index ae476d73d6..dedb85985f 100644
--- a/src/software/amazon/ion/impl/SharedSymbolTable.java
+++ b/src/com/amazon/ion/impl/SharedSymbolTable.java
@@ -1,26 +1,37 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.SystemSymbols.ION;
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.SystemSymbols.SYMBOLS_SID;
-import static software.amazon.ion.SystemSymbols.VERSION_SID;
-import static software.amazon.ion.impl.PrivateUtils.getSidForSymbolTableField;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.SystemSymbols.ION;
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.SystemSymbols.SYMBOLS_SID;
+import static com.amazon.ion.SystemSymbols.VERSION_SID;
+import static com.amazon.ion.impl._Private_Utils.getSidForSymbolTableField;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.ReadOnlyValueException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.SystemSymbols;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -29,16 +40,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.SystemSymbols;
 
 /**
  * An <em>immutable</em> shared symbol table, supporting (non-system) shared
@@ -68,7 +69,7 @@ final class SharedSymbolTable
     /**
      * The <b>singleton</b> instance of Ion 1.0 system symbol table.
      * <p>
-     * TODO amzn/ion-java#34 Optimize system symtabs by using our custom backing impl.
+     * TODO amzn/ion-java/issues/34 Optimize system symtabs by using our custom backing impl.
      */
     private static final SymbolTable ION_1_0_SYSTEM_SYMTAB;
     static
@@ -237,9 +238,9 @@ static SymbolTable newSharedSymbolTable(IonReader reader,
                 sid = getSidForSymbolTableField(fieldName);
             }
 
-            // TODO amzn/ion-java#35 If there's more than one 'symbols' or 'imports'
+            // TODO amzn/ion-java/issues/35 If there's more than one 'symbols' or 'imports'
             //      field, they will be merged together.
-            // TODO amzn/ion-java#36 Switching over SIDs doesn't cover the case
+            // TODO amzn/ion-java/issues/36 Switching over SIDs doesn't cover the case
             //      where the relevant field names are defined by a prev LST;
             //      the prev LST could have 'symbols' defined locally with a
             //      different SID!
@@ -397,7 +398,7 @@ private static void putToMapIfNotThere(Map<String, Integer> symbolsMap,
         while (symbols.hasNext())
         {
             String text = symbols.next();
-            // TODO amzn/ion-java#12 What about empty symbols?
+            // TODO amzn/ion-java/issues/12 What about empty symbols?
             if (symbolsMap.get(text) == null)
             {
                 putToMapIfNotThere(symbolsMap, text, sid);
diff --git a/src/com/amazon/ion/impl/SimpleByteBuffer.java b/src/com/amazon/ion/impl/SimpleByteBuffer.java
new file mode 100644
index 0000000000..0eb06a97a4
--- /dev/null
+++ b/src/com/amazon/ion/impl/SimpleByteBuffer.java
@@ -0,0 +1,1386 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonException;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.Timestamp.Precision;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.math.MathContext;
+
+/**
+ * Manages a very simple byte buffer that is a single contiguous
+ * byte array, without resize ability.
+ */
+final class SimpleByteBuffer
+    implements ByteBuffer
+{
+    byte[]  _bytes;
+    int     _start;
+    int     _eob;
+    boolean _is_read_only;
+
+
+    /**
+     * Creates a read-write buffer.
+     *
+     * @param bytes assumed to be owned by this new instance.
+     */
+    public SimpleByteBuffer(byte[] bytes) {
+        this(bytes, 0, bytes.length, false);
+    }
+
+    /**
+     *
+     * @param bytes assumed to be owned by this new instance.
+     */
+    public SimpleByteBuffer(byte[] bytes, boolean isReadOnly) {
+        this(bytes, 0, bytes.length, isReadOnly);
+    }
+
+    /**
+     * Creates a read-write buffer.
+     *
+     * @param bytes assumed to be owned by this new instance.
+     */
+    public SimpleByteBuffer(byte[] bytes, int start, int length) {
+        this(bytes, start, length, false);
+    }
+
+    /**
+     *
+     * @param bytes assumed to be owned by this new instance.
+     */
+    public SimpleByteBuffer(byte[] bytes, int start, int length, boolean isReadOnly) {
+        if (bytes == null || start < 0 || start > bytes.length || length < 0 || start + length > bytes.length) {
+            throw new IllegalArgumentException();
+        }
+        _bytes = bytes;
+        _start = start;
+        _eob   = start + length;
+        _is_read_only = isReadOnly;
+    }
+
+    public int getLength()
+    {
+        int length = _eob - _start;
+        return length;
+    }
+
+    /**
+     * Makes a copy of the internal byte array.
+     */
+    public byte[] getBytes()
+    {
+        int length = _eob - _start;
+        byte[] copy = new byte[length];
+        System.arraycopy(_bytes, _start, copy, 0, length);
+        return copy;
+    }
+
+    public int getBytes(byte[] buffer, int offset, int length)
+    {
+        if (buffer == null || offset < 0 || offset > buffer.length || length < 0 || offset + length > buffer.length) {
+            throw new IllegalArgumentException();
+        }
+
+        int datalength = _eob - _start;
+        if (datalength > length) {
+            throw new IllegalArgumentException("insufficient space in destination buffer");
+        }
+
+        System.arraycopy(_bytes, _start, buffer, offset, datalength);
+
+        return datalength;
+
+    }
+    public ByteReader getReader()
+    {
+        ByteReader reader = new SimpleByteReader(this);
+        return reader;
+    }
+
+    public ByteWriter getWriter()
+    {
+        if (_is_read_only) {
+            throw new IllegalStateException("this buffer is read only");
+        }
+        SimpleByteWriter writer = new SimpleByteWriter(this);
+        return writer;
+    }
+
+    public void writeBytes(OutputStream out) throws IOException
+    {
+        int length = _eob - _start;
+        out.write(_bytes, _start, length);
+    }
+
+    static final class SimpleByteReader implements ByteReader
+    {
+        SimpleByteBuffer _buffer;
+        int              _position;
+
+        SimpleByteReader(SimpleByteBuffer bytebuffer) {
+            _buffer = bytebuffer;
+            _position = bytebuffer._start;
+        }
+
+        public int position()
+        {
+            int pos = _position - _buffer._start;
+            return pos;
+        }
+
+        public void position(int newPosition)
+        {
+            if (newPosition < 0) {
+                throw new IllegalArgumentException("position must be non-negative");
+            }
+            int pos = newPosition + _buffer._start;
+            if (pos > _buffer._eob) {
+               throw new IllegalArgumentException("position is past end of buffer");
+            }
+            _position = pos;
+        }
+
+        public void skip(int length)
+        {
+            if (length < 0) {
+                throw new IllegalArgumentException("length to skip must be non-negative");
+            }
+            int pos = _position + length;
+            if (pos > _buffer._eob) {
+               throw new IllegalArgumentException("skip would skip past end of buffer");
+            }
+            _position = pos;
+        }
+
+        public int read()
+        {
+            if (_position >= _buffer._eob) return EOF;
+            int b = _buffer._bytes[_position++];
+            return (b & 0xff);
+        }
+
+        public int read(byte[] dst, int start, int len)
+        {
+            if (dst == null || start < 0 || len < 0 || start + len > dst.length) {
+                // no need to test this start >= dst.length ||
+                // since we test start+len > dst.length which is the correct test
+                throw new IllegalArgumentException();
+            }
+
+            if (_position >= _buffer._eob) return 0;
+            int readlen = len;
+            if (readlen + _position > _buffer._eob) readlen = _buffer._eob - _position;
+            System.arraycopy(_buffer._bytes, _position, dst, start, readlen);
+            _position += readlen;
+            return readlen;
+        }
+
+        public int readTypeDesc()
+        {
+            return read();
+        }
+
+        public long readULong(int len) throws IOException
+        {
+            long    retvalue = 0;
+            int b;
+
+            switch (len) {
+            default:
+                throw new IonException("value too large for Java long");
+            case 8:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 7:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 6:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 5:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 4:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 3:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 2:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 1:
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 8) | b;
+            case 0:
+                // do nothing, it's just a 0 length is a 0 value
+            }
+            return retvalue;
+        }
+
+
+        public int readVarInt() throws IOException
+        {
+            int     retvalue = 0;
+            boolean is_negative = false;
+            int     b;
+
+            // synthetic label "done" (yuck)
+done:       for (;;) {
+                // read the first byte - it has the sign bit
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                if ((b & 0x40) != 0) {
+                    is_negative = true;
+                }
+                retvalue = (b & 0x3F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the second byte we shift our eariler bits just as much,
+                // but there are fewer of them there to shift
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // if we get here we have more bits than we have room for :(
+                throwIntOverflowExeption();
+            }
+            if (is_negative) {
+                retvalue = -retvalue;
+            }
+            return retvalue;
+        }
+
+        public long readVarLong() throws IOException
+        {
+            long    retvalue = 0;
+            boolean is_negative = false;
+            int     b;
+
+            // synthetic label "done" (yuck)
+done:       for (;;) {
+                // read the first byte - it has the sign bit
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                if ((b & 0x40) != 0) {
+                    is_negative = true;
+                }
+                retvalue = (b & 0x3F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the second byte we shift our eariler bits just as much,
+                // but there are fewer of them there to shift
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                for (;;) {
+                    if ((b = read()) < 0) throwUnexpectedEOFException();
+                    if ((retvalue & 0xFE00000000000000L) != 0) throwIntOverflowExeption();
+                    retvalue = (retvalue << 7) | (b & 0x7F);
+                    if ((b & 0x80) != 0) break done;
+                }
+            }
+            if (is_negative) {
+                retvalue = -retvalue;
+            }
+            return retvalue;
+        }
+
+        /**
+         * Reads an integer value, returning null to mean -0.
+         * @throws IOException
+         */
+        public Integer readVarInteger() throws IOException
+        {
+            int     retvalue = 0;
+            boolean is_negative = false;
+            int     b;
+
+            // sythetic label "done" (yuck)
+done:       for (;;) {
+                // read the first byte - it has the sign bit
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                if ((b & 0x40) != 0) {
+                    is_negative = true;
+                }
+                retvalue = (b & 0x3F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the second byte we shift our eariler bits just as much,
+                // but there are fewer of them there to shift
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // for the rest, they're all the same
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break done;
+
+                // if we get here we have more bits than we have room for :(
+                throwIntOverflowExeption();
+            }
+
+            Integer retInteger = null;
+            if (is_negative) {
+                if (retvalue != 0) {
+                    retInteger = new Integer(-retvalue);
+                }
+            }
+            else {
+                retInteger = new Integer(retvalue);
+            }
+            return retInteger;
+        }
+
+        public int readVarUInt() throws IOException
+        {
+            int retvalue = 0;
+            int  b;
+
+            for (;;) { // fake loop to create a "goto done"
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+
+                // if we get here we have more bits than we have room for :(
+                throwIntOverflowExeption();
+            }
+            return retvalue;
+        }
+
+        public double readFloat(int len) throws IOException
+        {
+            if (len == 0)
+            {
+                // special case, return pos zero
+                return 0.0d;
+            }
+
+            if (len != 8)
+            {
+                throw new IOException("Length of float read must be 0 or 8");
+            }
+
+            long dBits = this.readULong(len);
+            return Double.longBitsToDouble(dBits);
+        }
+
+        public long readVarULong() throws IOException
+        {
+            long retvalue = 0;
+            int  b;
+
+            for (;;) {
+                if ((b = read()) < 0) throwUnexpectedEOFException();
+                if ((retvalue & 0xFE00000000000000L) != 0) throwIntOverflowExeption();
+                retvalue = (retvalue << 7) | (b & 0x7F);
+                if ((b & 0x80) != 0) break;
+            }
+            return retvalue;
+        }
+
+        /**
+         * Near clone of {@link IonReaderBinaryRawX#readDecimal(int)}
+         * and {@link IonBinary.Reader#readDecimalValue(IonDecimalImpl, int)}
+         * so keep them in sync!
+         */
+        public Decimal readDecimal(int len) throws IOException
+        {
+            MathContext mathContext = MathContext.UNLIMITED;
+
+            Decimal bd;
+
+            // we only write out the '0' value as the nibble 0
+            if (len == 0) {
+                bd = Decimal.valueOf(0, mathContext);
+            }
+            else {
+                // otherwise we to it the hard way ....
+                int         startpos = this.position();
+                int         exponent = this.readVarInt();
+                int         bitlen = len - (this.position() - startpos);
+
+                BigInteger value;
+                int signum;
+                if (bitlen > 0)
+                {
+                    byte[] bits = new byte[bitlen];
+                    this.read(bits, 0, bitlen);
+
+                    signum = 1;
+                    if (bits[0] < 0)
+                    {
+                        // value is negative, clear the sign
+                        bits[0] &= 0x7F;
+                        signum = -1;
+                    }
+                    value = new BigInteger(signum, bits);
+                }
+                else {
+                    signum = 0;
+                    value = BigInteger.ZERO;
+                }
+
+                // Ion stores exponent, BigDecimal uses the negation "scale"
+                int scale = -exponent;
+                if (value.signum() == 0 && signum == -1)
+                {
+                    assert value.equals(BigInteger.ZERO);
+                    bd = Decimal.negativeZero(scale, mathContext);
+                }
+                else
+                {
+                    bd = Decimal.valueOf(value, scale, mathContext);
+                }
+            }
+            return bd;
+        }
+
+        public Timestamp readTimestamp(int len) throws IOException
+        {
+            if (len < 1) {
+                // nothing to do here - and the timestamp will be NULL
+                return null;
+            }
+
+            Timestamp val;
+            Precision   p = null; // FIXME remove
+            Integer     offset = null;
+            int         year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0;
+            BigDecimal  frac = null;
+            int         remaining, end = this.position() + len;
+
+            // first up is the offset, which requires a special int reader
+            // to return the -0 as a null Integer
+            offset = this.readVarInteger();
+
+            // now we'll read the struct values from the input stream
+            assert position() < end;
+            if (position() < end) {  // FIXME remove
+                // year is from 0001 to 9999
+                // or 0x1 to 0x270F or 14 bits - 1 or 2 bytes
+                year  = readVarUInt();
+                p = Precision.YEAR; // our lowest significant option
+
+                // now we look for hours and minutes
+                if (position() < end) {
+                    month = readVarUInt();
+                    p = Precision.MONTH;
+
+                    // now we look for hours and minutes
+                    if (position() < end) {
+                        day   = readVarUInt();
+                        p = Precision.DAY; // our lowest significant option
+
+                        // now we look for hours and minutes
+                        if (position() < end) {
+                            hour   = readVarUInt();
+                            minute = readVarUInt();
+                            p = Precision.MINUTE;
+
+                            if (position() < end) {
+                                second = readVarUInt();
+                                p = Precision.SECOND;
+
+                                remaining = end - position();
+                                if (remaining > 0) {
+                                    // now we read in our actual "milliseconds since the epoch"
+                                    frac = this.readDecimal(remaining);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            // now we let timestamp put it all together
+            val = Timestamp.createFromUtcFields(p, year, month, day, hour, minute, second, frac, offset);
+            return val;
+        }
+
+        public String readString(int len) throws IOException
+        {
+            // len is bytes, which is greater than or equal to java
+            // chars even after utf8 to utf16 decoding nonsense
+            // the char array is way faster than using string buffer
+            char[] chars = new char[len];
+            int ii = 0;
+            int c;
+            int endPosition = this.position() + len;
+
+            while (this.position() < endPosition) {
+                c = readUnicodeScalar();
+                if (c < 0) throwUnexpectedEOFException();
+                if (c < 0x10000) {
+                    chars[ii++] = (char)c;
+                }
+                else { // when c is >= 0x10000 we need surrogate encoding
+                    chars[ii++] = (char)_Private_IonConstants.makeHighSurrogate(c);
+                    chars[ii++] = (char)_Private_IonConstants.makeLowSurrogate(c);
+                }
+            }
+            if (this.position() < endPosition) throwUnexpectedEOFException();
+
+            return new String(chars, 0, ii);
+        }
+
+        public final int readUnicodeScalar() throws IOException {
+            int b;
+
+            b = read();
+            // ascii is all good, even -1 (eof)
+            if (b >= 0x80) {
+                b = readUnicodeScalar_helper(b);
+
+            }
+            return b;
+        }
+        private final  int readUnicodeScalar_helper(int b) throws IOException
+        {
+            int c = -1;
+
+            // now we start gluing the multi-byte value together
+            if ((b & 0xe0) == 0xc0) {
+                // for values from 0x80 to 0x7FF (all legal)
+                c = (b & ~0xe0);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+            }
+            else if ((b & 0xf0) == 0xe0) {
+                // for values from 0x800 to 0xFFFFF (NOT all legal)
+                c = (b & ~0xf0);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+                if (c > 0x00D7FF && c < 0x00E000) {
+                    throw new IonException("illegal surrogate value encountered in input utf-8 stream");
+                }
+            }
+            else if ((b & 0xf8) == 0xf0) {
+                // for values from 0x010000 to 0x1FFFFF (NOT all legal)
+                c = (b & ~0xf8);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+                b = read();
+                if ((b & 0xc0) != 0x80) throwUTF8Exception();
+                c <<= 6;
+                c |= (b & ~0x80);
+                if (c > 0x10FFFF) {
+                    throw new IonException("illegal utf value encountered in input utf-8 stream");
+                }
+            }
+            else {
+                throwUTF8Exception();
+            }
+            return c;
+        }
+        void throwUTF8Exception() throws IOException
+        {
+            throw new IOException("Invalid UTF-8 character encounter in a string at pos " + this.position());
+        }
+        void throwUnexpectedEOFException() throws IOException {
+            throw new IOException("unexpected EOF in value at offset " + this.position());
+        }
+        void throwIntOverflowExeption() throws IOException {
+            throw new IOException("int in stream is too long for a Java int 32 use readLong()");
+        }
+    }
+
+    static final class UserByteWriter extends OutputStream implements ByteWriter
+    {
+        SimpleByteWriter _simple_writer;
+        OutputStream     _user_stream;
+        int              _position;
+        int              _limit;
+        int              _buffer_size;
+
+        // constants used for the various write routines to verify
+        // sufficient room in the output buffer for writing
+        private final static int MAX_UINT7_BINARY_LENGTH = 5; // (1 + (32 / 7))
+        private final static int MAX_FLOAT_BINARY_LENGTH = 8; // ieee 64 bit float
+
+        private final static int REQUIRED_BUFFER_SPACE   = 8; // max of the required lengths
+
+        UserByteWriter(OutputStream userOuputStream, byte[] buf)
+        {
+            if (buf == null || buf.length < REQUIRED_BUFFER_SPACE) {
+                throw new IllegalArgumentException("requires a buffer at least "+REQUIRED_BUFFER_SPACE+" bytes long");
+            }
+
+            SimpleByteBuffer bytebuffer = new SimpleByteBuffer(buf);
+            _simple_writer =  new SimpleByteWriter(bytebuffer);
+            _user_stream = userOuputStream;
+            _buffer_size = buf.length;
+            _limit = _buffer_size;
+        }
+
+        private final void checkForSpace(int needed) {
+            if (_position + needed > _limit) {
+                flush();
+            }
+        }
+
+        /**
+         * this flushes the current buffer to the users output
+         * stream and resets the buffer.  It is called automatically
+         * as the buffer fills.  It can be called at any time if more
+         * frequent flushing is desired.
+         */
+        @Override
+        public void flush() {
+            // is there anything to flush?
+            if (_position + _buffer_size > _limit) {
+                try {
+                    _simple_writer.flushTo(_user_stream);
+                }
+                catch (IOException e) {
+                    throw new IonException(e);
+                }
+                _limit = _position + _buffer_size;
+            }
+        }
+
+        public void insert(int length)
+        {
+            throw new UnsupportedOperationException("use a SimpleByteWriter if you need to insert");
+        }
+
+        public int position()
+        {
+            return _position;
+        }
+
+        public void position(int newPosition)
+        {
+            throw new UnsupportedOperationException("use a SimpleByteWriter if you need to set your position");
+        }
+
+        public void remove(int length)
+        {
+            throw new UnsupportedOperationException("use a SimpleByteWriter if you need to remove bytes");
+        }
+
+        @Override
+        public void write(int b) throws IOException
+        {
+            write((byte)b);
+        }
+
+        public void write(byte b) throws IOException
+        {
+            checkForSpace(1);
+            _simple_writer.write(b);
+            _position++;
+        }
+
+        // cloned from SimpleByteBuffer as we need to check the
+        // length and this may require flushing more often than
+        // the default writeDecimal supports.
+        public int writeDecimal(BigDecimal value) throws IOException
+        {
+            int returnlen = _simple_writer.writeDecimal(value, this);
+            return returnlen;
+        }
+
+        public int writeFloat(double value) throws IOException
+        {
+            checkForSpace(MAX_FLOAT_BINARY_LENGTH);
+            int returnlen = _simple_writer.writeFloat(value);
+            return returnlen;
+        }
+
+        public int writeIonInt(long value, int len) throws IOException
+        {
+            checkForSpace(len);
+            int returnlen = _simple_writer.writeIonInt(value, len);
+            return returnlen;
+        }
+
+        public int writeIonInt(int value, int len) throws IOException
+        {
+            checkForSpace(len);
+            int returnlen = _simple_writer.writeIonInt(value, len);
+            return returnlen;
+        }
+
+        public int writeString(String value) throws IOException
+        {
+            int returnlen = _simple_writer.writeString(value, this);
+            return returnlen;
+        }
+
+        public void writeTypeDesc(int typeDescByte) throws IOException
+        {
+            checkForSpace(1);
+            _simple_writer.writeTypeDesc(typeDescByte);
+        }
+
+        public int writeTypeDescWithLength(int typeid, int lenOfLength,
+                                           int valueLength) throws IOException
+        {
+            checkForSpace(1 + MAX_UINT7_BINARY_LENGTH);
+            int returnlen = _simple_writer.writeTypeDescWithLength(typeid, lenOfLength, valueLength);
+            return returnlen;
+        }
+
+        public int writeTypeDescWithLength(int typeid, int valueLength) throws IOException
+        {
+            checkForSpace(1 + MAX_UINT7_BINARY_LENGTH);
+            int returnlen = _simple_writer.writeTypeDescWithLength(typeid, valueLength);
+            return returnlen;
+        }
+
+        public int writeVarInt(long value, int len, boolean forceZeroWrite)
+            throws IOException
+        {
+            checkForSpace(len);
+            int returnlen = _simple_writer.writeVarInt(value, len, forceZeroWrite);
+            return returnlen;
+        }
+
+        public int writeVarInt(int value, int len, boolean forceZeroWrite)
+            throws IOException
+        {
+            checkForSpace(len);
+            int returnlen = _simple_writer.writeVarInt(value, len, forceZeroWrite);
+            return returnlen;
+        }
+
+        public int writeVarUInt(int value, int len, boolean forceZeroWrite)
+            throws IOException
+        {
+            checkForSpace(len);
+            int returnlen = _simple_writer.writeVarUInt(value, len, forceZeroWrite);
+            return returnlen;
+        }
+
+        public int writeVarUInt(long value, int len, boolean forceZeroWrite)
+            throws IOException
+        {
+            checkForSpace(len);
+            int returnlen = _simple_writer.writeVarUInt(value, len, forceZeroWrite);
+            return returnlen;
+        }
+    }
+
+    static final class SimpleByteWriter extends OutputStream implements ByteWriter
+    {
+        private static final int _ib_FLOAT64_LEN         =    8;
+        private static final Double DOUBLE_POS_ZERO = Double.valueOf(0.0);
+
+        SimpleByteBuffer _buffer;
+        int              _position;
+
+        SimpleByteWriter(SimpleByteBuffer bytebuffer) {
+            _buffer = bytebuffer;
+            _position = bytebuffer._start;
+        }
+
+        protected void flushTo(OutputStream userOutput) throws IOException {
+            _buffer.writeBytes(userOutput);
+            _position = 0;
+        }
+
+        public int position()
+        {
+            return _position - _buffer._start;
+        }
+
+        public void position(int newPosition)
+        {
+            if (newPosition < 0) {
+                throw new IllegalArgumentException("position must be non-negative");
+            }
+            int pos = newPosition + _buffer._start;
+            if (pos > _buffer._eob) {
+               throw new IllegalArgumentException("position is past end of buffer");
+            }
+            _position = pos;
+        }
+
+        public void insert(int length)
+        {
+            if (length < 0) {
+                throw new IllegalArgumentException("insert length must be non negative");
+            }
+            int remaining = _buffer._eob - _position;
+            System.arraycopy(_buffer._bytes, _position, _buffer._bytes, _position + length, remaining);
+            _buffer._eob += length;
+        }
+
+        public void remove(int length)
+        {
+            if (length < 0) {
+                throw new IllegalArgumentException("remove length must be non negative");
+            }
+            int remaining = _buffer._eob - _position;
+            System.arraycopy(_buffer._bytes, _position + length, _buffer._bytes, _position, remaining);
+            _buffer._eob -= length;
+        }
+
+        @Override
+        final public void write(int arg0)
+            throws IOException
+        {
+            write((byte)arg0);
+        }
+
+        final public void write(byte b)
+        {
+            _buffer._bytes[_position++] = b;
+            if (_position > _buffer._eob) _buffer._eob = _position;
+        }
+
+        @Override
+        public void write(byte[] bytes, int start, int len)
+        {
+            if (bytes == null || start < 0 || start >= bytes.length || len < 0 || start + len > bytes.length) {
+                throw new IllegalArgumentException();
+            }
+
+            System.arraycopy(bytes, start, _buffer._bytes, _position, len);
+            _position += len;
+            if (_position > _buffer._eob) _buffer._eob = _position;
+
+            return;
+        }
+
+        public void writeTypeDesc(int typeDescByte)
+        {
+            write((byte)(typeDescByte & 0xff));
+        }
+
+        public int writeTypeDescWithLength(int typeid, int lenOfLength, int valueLength)
+        {
+            int written_len = 1;
+
+            int td = ((typeid & 0xf) << 4);
+            if (valueLength >= _Private_IonConstants.lnIsVarLen) {
+                td |= _Private_IonConstants.lnIsVarLen;
+                writeTypeDesc(td);
+                written_len += writeVarUInt(valueLength, lenOfLength, true);
+            }
+            else {
+                td |= (valueLength & 0xf);
+                writeTypeDesc(td);
+            }
+            return written_len;
+        }
+
+        public int writeTypeDescWithLength(int typeid, int valueLength)
+        {
+            int written_len = 1;
+
+            int td = ((typeid & 0xf) << 4);
+            if (valueLength >= _Private_IonConstants.lnIsVarLen) {
+                td |= _Private_IonConstants.lnIsVarLen;
+                writeTypeDesc(td);
+                int lenOfLength = IonBinary.lenVarUInt(valueLength);
+                written_len += writeVarUInt(valueLength, lenOfLength, true);
+            }
+            else {
+                td |= (valueLength & 0xf);
+                writeTypeDesc(td);
+            }
+            return written_len;
+        }
+
+        public int writeVarInt(int value, int len, boolean force_zero_write)
+        {
+            // int len = 0;
+
+            if (value != 0) {
+                int mask = 0x7F;
+                boolean is_negative = false;
+
+                assert len == IonBinary.lenVarInt(value);
+                if (is_negative = (value < 0)) {
+                    value = -value;
+                }
+
+                // we write the first "byte" separately as it has the sign
+                // changed shift operator from >> to >>>, we don't want to
+                // sign extend, this is only a problem with MIN_VALUE where
+                // negating the value (above) still results in a negative number
+                int b = (byte)((value >>> (7*(len-1))) & mask);
+                if (is_negative)  b |= 0x40; // the sign bit only on the first byte
+                if (len == 1)     b |= 0x80; // the terminator in case the first "byte" is the last
+                write((byte)b);
+
+                // write the rest
+                switch (len) {  // we already wrote 1 byte
+                case 5: write((byte)((value >> (7*3)) & mask));
+                case 4: write((byte)((value >> (7*2)) & mask));
+                case 3: write((byte)((value >> (7*1)) & mask));
+                case 2: write((byte)((value & mask) | 0x80));
+                case 1: // do nothing
+                }
+            }
+            else if (force_zero_write) {
+                write((byte)0x80);
+                assert len == 1;
+
+            }
+            else {
+                assert len == 0;
+            }
+            return len;
+        }
+
+        public int writeVarInt(int value, boolean force_zero_write)
+        {
+            int len = IonBinary.lenVarInt(value);
+            len = writeVarInt(value, len, force_zero_write);
+            return len;
+        }
+
+        public int writeVarUInt(int value, int len, boolean force_zero_write)
+        {
+            int mask = 0x7F;
+            if (value < 0) {
+                throw new IllegalArgumentException("signed int where unsigned (>= 0) was expected");
+            }
+            assert len == IonBinary.lenVarUInt(value);
+
+            switch (len - 1) {
+            case 4: write((byte)((value >> (7*4)) & mask));
+            case 3: write((byte)((value >> (7*3)) & mask));
+            case 2: write((byte)((value >> (7*2)) & mask));
+            case 1: write((byte)((value >> (7*1)) & mask));
+            case 0: write((byte)((value & mask) | 0x80L));
+                    break;
+            case -1: // or 0
+                if (force_zero_write) {
+                    write((byte)0x80);
+                    len = 1;
+                }
+                break;
+            }
+            return len;
+        }
+
+        public int writeVarUInt(int value, boolean force_zero_write)
+        {
+            int len = IonBinary.lenVarUInt(value);
+            len = writeVarUInt(value, len, force_zero_write);
+            return len;
+        }
+
+        public int writeIonInt(int value, int len)
+        {
+            return writeIonInt((long)value, len);
+        }
+
+        public int writeIonInt(long value, int len)
+        {
+            // we shouldn't be writing out 0's as an Ion int value
+            if (value == 0) {
+                assert len == 0;
+                return len;  // aka 0
+            }
+
+            // figure out how many we have bytes we have to write out
+            long mask = 0xffL;
+            boolean is_negative = (value < 0);
+
+            assert len == IonBinary.lenIonInt(value);
+
+            if (is_negative) {
+                value = -value;
+                // note for Long.MIN_VALUE the negation returns
+                // itself as a value, but that's also the correct
+                // "positive" value to write out anyway, so it
+                // all works out
+            }
+
+            // write the rest
+            switch (len) {  // we already wrote 1 byte
+            case 8: write((byte)((value >> (8*7)) & mask));
+            case 7: write((byte)((value >> (8*6)) & mask));
+            case 6: write((byte)((value >> (8*5)) & mask));
+            case 5: write((byte)((value >> (8*4)) & mask));
+            case 4: write((byte)((value >> (8*3)) & mask));
+            case 3: write((byte)((value >> (8*2)) & mask));
+            case 2: write((byte)((value >> (8*1)) & mask));
+            case 1: write((byte)(value & mask));
+            }
+
+            return len;
+        }
+
+        public int writeVarInt(long value, int len, boolean forceZeroWrite)
+        {
+            //int len = 0;
+
+            if (value != 0) {
+                long mask = 0x7fL;
+                assert len == IonBinary.lenInt(value);
+                int b;
+                if (value < 0) {
+                    value = -value;
+                    // we write the first "byte" separately as it has the sign
+                    // and we have to deal with the oddball MIN_VALUE case
+                    if (value == Long.MIN_VALUE) {
+                        // we use the shift without sign extension as this
+                        // represents a positive value (even though it's neg)
+                        b = (byte)((value >>> (7*len)) & mask);
+                        // len must be greater than 1 so we don't need to set the high bit
+                    }
+                    else {
+                        // here, and hereafter, we don't care about sign extension
+                        b = (byte)((value >>> (7*len)) & mask);
+                        if (len == 1) b |= 0x80; // the terminator in case the first "byte" is the last
+                    }
+                    // we don't worry about stepping on a data bit here as
+                    // we have extra bits at the max size and below that we've
+                    // already taken the sign bit into account
+                    b |= 0x40; // the sign bit
+                    write((byte)b);
+                }
+                else {
+                    // we write the first "byte" separately as it has the sign
+                    b = (byte)((value >>> (7*len)) & mask);
+                    if (len == 1) b |= 0x80; // the terminator in case the first "byte" is the last
+                    write((byte)b);
+                }
+
+                // write the rest
+                switch (len - 1) {  // we already wrote 1 byte
+                case 9: write((byte)((value >>> (7*9)) & mask));
+                case 8: write((byte)((value >> (7*8)) & mask));
+                case 7: write((byte)((value >> (7*7)) & mask));
+                case 6: write((byte)((value >> (7*6)) & mask));
+                case 5: write((byte)((value >> (7*5)) & mask));
+                case 4: write((byte)((value >> (7*4)) & mask));
+                case 3: write((byte)((value >> (7*3)) & mask));
+                case 2: write((byte)((value >> (7*2)) & mask));
+                case 1: write((byte)((value >> (7*1)) & mask));
+                case 0: write((byte)((value & mask) | 0x80L));
+                }
+            }
+            else if (forceZeroWrite) {
+                write((byte)0x80);
+                assert len == 1;
+            }
+            else {
+                assert len == 0;
+            }
+            return len;
+        }
+
+        public int writeVarUInt(long value, int len, boolean force_zero_write)
+        {
+            int mask = 0x7F;
+            assert len == IonBinary.lenVarUInt(value);
+            assert value > 0;
+
+            switch (len - 1) {
+            case 9: write((byte)((value >> (7*9)) & mask));
+            case 8: write((byte)((value >> (7*8)) & mask));
+            case 7: write((byte)((value >> (7*7)) & mask));
+            case 6: write((byte)((value >> (7*6)) & mask));
+            case 5: write((byte)((value >> (7*5)) & mask));
+            case 4: write((byte)((value >> (7*4)) & mask));
+            case 3: write((byte)((value >> (7*3)) & mask));
+            case 2: write((byte)((value >> (7*2)) & mask));
+            case 1: write((byte)((value >> (7*1)) & mask));
+            case 0: write((byte)((value & mask) | 0x80L));
+                    break;
+            case -1: // or len == 0
+                if (force_zero_write) {
+                    write((byte)0x80);
+                    assert len == 1;
+                }
+                else {
+                    assert len == 0;
+                }
+                break;
+            }
+            return len;
+        }
+
+        public int writeULong(long value, int lenToWrite) throws IOException
+        {
+            switch (lenToWrite) {
+            case 8: write((byte)((value >> 56) & 0xffL));
+            case 7: write((byte)((value >> 48) & 0xffL));
+            case 6: write((byte)((value >> 40) & 0xffL));
+            case 5: write((byte)((value >> 32) & 0xffL));
+            case 4: write((byte)((value >> 24) & 0xffL));
+            case 3: write((byte)((value >> 16) & 0xffL));
+            case 2: write((byte)((value >>  8) & 0xffL));
+            case 1: write((byte)((value >>  0) & 0xffL));
+            }
+            return lenToWrite;
+        }
+
+        public int writeFloat(double value) throws IOException
+        {
+            if (Double.valueOf(value).equals(DOUBLE_POS_ZERO))
+            {
+                // pos zero special case
+                return 0;
+            }
+
+            // TODO write "custom" serialization or verify that
+            //      the java routine is doing the right thing
+            long dBits = Double.doubleToRawLongBits(value);
+            return this.writeULong(dBits, _ib_FLOAT64_LEN);
+        }
+
+        public int writeDecimal(BigDecimal value) throws IOException
+        {
+            int returnlen = writeDecimal(value, null);
+            return returnlen;
+        }
+
+        // this is a private version that supports both the buffer write
+        // and the output to the user stream.  This is slower (since there
+        // are extra tests, an extra call, and an extra paramenter), but
+        // it avoids duplicating this code.  And decimals are generally
+        // expensive anyway.
+        private int writeDecimal(BigDecimal value, UserByteWriter userWriter) throws IOException
+        {
+            int returnlen = 0;
+            // we only write out the '0' value as the nibble 0
+            if (value != null && !BigDecimal.ZERO.equals(value)) {
+                // otherwise we do it the hard way ....
+                BigInteger mantissa = value.unscaledValue();
+
+                boolean isNegative = (mantissa.compareTo(BigInteger.ZERO) < 0);
+                if (isNegative) {
+                    mantissa = mantissa.negate();
+                }
+
+                byte[] bits  = mantissa.toByteArray();
+                int    scale = value.scale();
+
+                // Ion stores exponent, BigDecimal uses the negation "scale"
+                int exponent = -scale;
+                if (userWriter != null) {
+                    returnlen += userWriter.writeIonInt(exponent, IonBinary.lenVarUInt(exponent));
+                }
+                else {
+                    returnlen += this.writeIonInt(exponent, IonBinary.lenVarUInt(exponent));
+                }
+
+                // If the first bit is set, we can't use it for the sign,
+                // and we need to write an extra byte to hold it.
+                boolean needExtraByteForSign = ((bits[0] & 0x80) != 0);
+                if (needExtraByteForSign)
+                {
+                    if (userWriter != null) {
+                        userWriter.write((byte)(isNegative ? 0x80 : 0x00));
+                    }
+                    else {
+                        this.write((byte)(isNegative ? 0x80 : 0x00));
+                    }
+                    returnlen++;
+                }
+                else if (isNegative)
+                {
+                    bits[0] |= 0x80;
+                }
+                // if we have a userWriter to write to, we really don't care about
+                // the value in our local buffer.
+                if (userWriter != null) {
+                    userWriter.write(bits, 0, bits.length);
+                }
+                else {
+                    this.write(bits, 0, bits.length);
+                }
+                returnlen += bits.length;
+            }
+            return returnlen;
+        }
+
+        public int writeTimestamp(Timestamp di)
+        throws IOException
+        {
+            if (di == null) return 0;
+
+            int returnlen = 0;
+            Precision precision = di.getPrecision();
+
+            Integer offset = di.getLocalOffset();
+            if (offset == null) {
+                // TODO don't use magic numbers!
+                this.write((byte)(0xff & (0x80 | 0x40))); // negative 0 (no timezone)
+                returnlen ++;
+            }
+            else {
+                int value = offset.intValue();
+                returnlen += this.writeVarInt(value, true);
+            }
+
+            // now the date - year, month, day as varUint7's
+            // if we have a non-null value we have at least the date
+            if (precision.includes(Precision.YEAR)) {
+                returnlen += this.writeVarUInt(di.getZYear(), true);
+            }
+            if (precision.includes(Precision.MONTH)) {
+                returnlen += this.writeVarUInt(di.getZMonth(), true);
+            }
+            if (precision.includes(Precision.DAY)) {
+                returnlen += this.writeVarUInt(di.getZDay(), true);
+            }
+
+            // now the time part
+            if (precision.includes(Precision.MINUTE)) {
+                returnlen += this.writeVarUInt(di.getZHour(), true);
+                returnlen += this.writeVarUInt(di.getZMinute(), true);
+            }
+            if (precision.includes(Precision.SECOND)) {
+                returnlen += this.writeVarUInt(di.getZSecond(), true);
+                BigDecimal fraction = di.getZFractionalSecond();
+                if (fraction != null) {
+                    // and, finally, any fractional component that is known
+                    returnlen += this.writeDecimal(di.getZFractionalSecond());
+                }
+            }
+            return returnlen;
+        }
+
+        final public int writeString(String value) throws IOException
+        {
+            int returnlen = writeString(value, null);
+            return returnlen;
+        }
+
+        final private int writeString(String value, UserByteWriter userWriter) throws IOException
+        {
+            int len = 0;
+
+            for (int ii=0; ii<value.length(); ii++) {
+                int c = value.charAt(ii);
+                if (c > 127) {
+                    if (c >= 0xD800 && c <= 0xDFFF) {
+                        if (_Private_IonConstants.isHighSurrogate(c)) {
+                            ii++;
+                            // houston we have a high surrogate (let's hope it has a partner
+                            if (ii >= value.length()) {
+                                throw new IonException("invalid string, unpaired high surrogate character");
+                            }
+                            int c2 = value.charAt(ii);
+                            if (!_Private_IonConstants.isLowSurrogate(c2)) {
+                                throw new IonException("invalid string, unpaired high surrogate character");
+                            }
+                            c = _Private_IonConstants.makeUnicodeScalar(c, c2);
+                        }
+                        else if (_Private_IonConstants.isLowSurrogate(c)) {
+                            // it's a loner low surrogate - that's an error
+                            throw new IonException("invalid string, unpaired low surrogate character");
+                        }
+                        // from 0xE000 up the _writeUnicodeScalar will check for us
+                    }
+                    c = IonBinary.makeUTF8IntFromScalar(c);
+                }
+
+                // write it here - try to test userWriter as little as possible
+                if (userWriter == null) {
+                    for (;;) {
+                        write((byte)(c & 0xff));
+                        len++;
+                        if ((c & 0xffffff00) == 0) {
+                            break;
+                        }
+                        c = c >>> 8;
+                    }
+                }
+                else {
+                    for (;;) {
+                        userWriter.write((byte)(c & 0xff));
+                        len++;
+                        if ((c & 0xffffff00) == 0) {
+                            break;
+                        }
+                        c = c >>> 8;
+                    }
+                }
+            }
+            return len;
+        }
+        void throwUTF8Exception() throws IOException
+        {
+            throwException("Invalid UTF-8 character encounter in a string at pos " + this.position());
+        }
+        void throwException(String msg) throws IOException {
+            throw new IOException(msg);
+        }
+    }
+}
diff --git a/src/software/amazon/ion/impl/SubstituteSymbolTable.java b/src/com/amazon/ion/impl/SubstituteSymbolTable.java
similarity index 90%
rename from src/software/amazon/ion/impl/SubstituteSymbolTable.java
rename to src/com/amazon/ion/impl/SubstituteSymbolTable.java
index 1189200206..368cfcc1ae 100644
--- a/src/software/amazon/ion/impl/SubstituteSymbolTable.java
+++ b/src/com/amazon/ion/impl/SubstituteSymbolTable.java
@@ -1,27 +1,28 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.ReadOnlyValueException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Iterator;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
 
 /**
  * A symbol table used for an import where no exact match could be found.
diff --git a/src/software/amazon/ion/impl/SymbolTableReader.java b/src/com/amazon/ion/impl/SymbolTableReader.java
similarity index 93%
rename from src/software/amazon/ion/impl/SymbolTableReader.java
rename to src/com/amazon/ion/impl/SymbolTableReader.java
index ba5ab1db8e..08afa1fcbd 100644
--- a/src/software/amazon/ion/impl/SymbolTableReader.java
+++ b/src/com/amazon/ion/impl/SymbolTableReader.java
@@ -1,50 +1,51 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-
-import static software.amazon.ion.SystemSymbols.IMPORTS;
-import static software.amazon.ion.SystemSymbols.IMPORTS_SID;
-import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE_SID;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
-import static software.amazon.ion.SystemSymbols.MAX_ID;
-import static software.amazon.ion.SystemSymbols.MAX_ID_SID;
-import static software.amazon.ion.SystemSymbols.NAME;
-import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.SystemSymbols.SYMBOLS;
-import static software.amazon.ion.SystemSymbols.SYMBOLS_SID;
-import static software.amazon.ion.SystemSymbols.VERSION;
-import static software.amazon.ion.SystemSymbols.VERSION_SID;
-import static software.amazon.ion.impl.PrivateUtils.newSymbolToken;
-
+package com.amazon.ion.impl;
+
+
+import static com.amazon.ion.SystemSymbols.IMPORTS;
+import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
+import static com.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
+import static com.amazon.ion.SystemSymbols.MAX_ID;
+import static com.amazon.ion.SystemSymbols.MAX_ID_SID;
+import static com.amazon.ion.SystemSymbols.NAME;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.SystemSymbols.SYMBOLS;
+import static com.amazon.ion.SystemSymbols.SYMBOLS_SID;
+import static com.amazon.ion.SystemSymbols.VERSION;
+import static com.amazon.ion.SystemSymbols.VERSION_SID;
+import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IntegerSize;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
 
 /**
  *   This is a reader that traverses a {@link SymbolTable}
@@ -547,7 +548,14 @@ final boolean hasLocalSymbols() {
         return flag_state;
     }
 
-    private final boolean has_next()
+
+    public boolean hasNext()
+    {
+        boolean has_next = has_next_helper();
+        return has_next;
+    }
+
+    private final boolean has_next_helper()
     {
         // this just tells us whether or not we have more
         // value coming at our current scanning depth
@@ -752,7 +760,7 @@ private final int stateFollowingLocalSymbols()
      */
     public IonType next()
     {
-        if (has_next() == false) {
+        if (has_next_helper() == false) {
             return null;
         }
         int new_state;
@@ -1072,7 +1080,7 @@ public String[] getTypeAnnotations()
             }
             return new String[] { ION_SHARED_SYMBOL_TABLE };
         }
-        return PrivateUtils.EMPTY_STRING_ARRAY;
+        return _Private_Utils.EMPTY_STRING_ARRAY;
     }
 
     private static final SymbolToken ION_SYMBOL_TABLE_SYM =
@@ -1104,7 +1112,51 @@ public SymbolToken[] getTypeAnnotationSymbols()
     public Iterator<String> iterateTypeAnnotations()
     {
         String[] annotations = getTypeAnnotations();
-        return PrivateUtils.stringIterator(annotations);
+        return _Private_Utils.stringIterator(annotations);
+    }
+
+
+    public int getFieldId()
+    {
+
+        switch (_current_state)
+        {
+        case S_STRUCT:
+        case S_IN_STRUCT:
+        case S_IN_IMPORTS:
+        case S_IMPORT_STRUCT:
+        case S_IN_IMPORT_STRUCT:
+        case S_IMPORT_STRUCT_CLOSE:
+        case S_IMPORT_LIST_CLOSE:
+        case S_AFTER_IMPORT_LIST:
+        case S_IN_SYMBOLS:
+        case S_SYMBOL:
+        case S_SYMBOL_LIST_CLOSE:
+        case S_STRUCT_CLOSE:
+        case S_EOF:
+            return SymbolTable.UNKNOWN_SYMBOL_ID;
+
+        case S_NAME:
+        case S_IMPORT_NAME:
+            return NAME_SID;
+
+        case S_VERSION:
+        case S_IMPORT_VERSION:
+            return VERSION_SID;
+
+        case S_MAX_ID:
+        case S_IMPORT_MAX_ID:
+            return MAX_ID_SID;
+
+        case S_IMPORT_LIST:
+            return IMPORTS_SID;
+
+        case S_SYMBOL_LIST:
+            return SYMBOLS_SID;
+
+        default:
+            throw new IonException("Internal error: UnifiedSymbolTableReader is in an unrecognized state: "+_current_state);
+        }
     }
 
     public String getFieldName()
diff --git a/src/com/amazon/ion/impl/SymbolTokenImpl.java b/src/com/amazon/ion/impl/SymbolTokenImpl.java
new file mode 100644
index 0000000000..91abb3b8b0
--- /dev/null
+++ b/src/com/amazon/ion/impl/SymbolTokenImpl.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.util.IonTextUtils.printString;
+
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.UnknownSymbolException;
+
+
+final class SymbolTokenImpl
+    implements _Private_SymbolToken
+{
+    private final String myText;
+    private final int mySid;
+
+    SymbolTokenImpl(String text, int sid)
+    {
+        assert text != null || sid >= 0 : "Neither text nor sid is defined";
+
+        myText = text;
+        mySid = sid;
+    }
+
+    SymbolTokenImpl(int sid)
+    {
+        assert sid >= 0 : "sid is undefined";
+
+        myText = null;
+        mySid = sid;
+    }
+
+
+    public String getText()
+    {
+        return myText;
+    }
+
+    public String assumeText()
+    {
+        if (myText == null) throw new UnknownSymbolException(mySid);
+        return myText;
+    }
+
+    public int getSid()
+    {
+        return mySid;
+    }
+
+    @Override
+    public String toString()
+    {
+        return "SymbolToken::{text:" + myText + ",id:" + mySid + "}";
+    }
+
+    /*
+     * TODO amzn/ion-java#126
+     *Equals and hashCode must be symmetric.
+     *Two symboltokens are only equal when text1 equals text2 (including null == null)
+     *This is an incomplete solution, needs to be updated as symboltokens are fleshed out.
+     */
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        SymbolTokenImpl other = (SymbolTokenImpl) o;
+        if(myText == null || other.myText == null){
+            return myText == other.myText;
+        }
+        return myText.equals(other.myText);
+    }
+
+    @Override
+    public int hashCode() {
+        if(myText != null) return myText.hashCode();
+        return 0;
+    }
+}
diff --git a/src/com/amazon/ion/impl/SystemValueIterator.java b/src/com/amazon/ion/impl/SystemValueIterator.java
new file mode 100644
index 0000000000..452b4bd6da
--- /dev/null
+++ b/src/com/amazon/ion/impl/SystemValueIterator.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.impl.IonBinary.BufferManager;
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.Iterator;
+
+
+interface SystemValueIterator
+    extends Iterator<IonValue>, Closeable
+{
+    /********************************************************************
+     *
+     *                  Iterator<IonValue>
+     *
+     */
+    public boolean hasNext();
+    public IonValue next();
+    public void remove();
+
+    /********************************************************************
+     *
+     *                  SystemReader
+     *
+     */
+
+    // constructors in original SystemReader:
+    /*  make these static
+    public SystemReader makeSystemReader(IonSystemImpl system, String s);
+    public SystemReader makeSystemReader(IonSystemImpl system,
+                        IonCatalog catalog,
+                        Reader input);
+    public SystemReader makeSystemReader(IonSystemImpl system,
+                        IonCatalog catalog,
+                        SymbolTable initialSymboltable,
+                        Reader input);
+    @Deprecated
+    public SystemReader makeSystemReader(IonSystemImpl system,
+                        IonCatalog catalog,
+                        BufferManager buffer);
+
+    public SystemReader makeSystemReader(IonSystemImpl system,
+                        IonCatalog catalog,
+                        InputStream stream);
+    */
+
+    public IonSystem getSystem();
+    public IonCatalog getCatalog();
+
+    /**
+     * Returns the current symtab, either system or local.
+     * @return may be null.
+     */
+    public SymbolTable getSymbolTable();
+
+    /**
+     * Gets the current symtab if its local, otherwise creates a local symtab
+     * and makes it current.
+     * @return not null.
+     */
+    public SymbolTable getLocalSymbolTable();
+
+    public boolean currentIsHidden();
+//    public boolean canSetLocalSymbolTable();
+//    public void setLocalSymbolTable(SymbolTable symbolTable);
+    public BufferManager getBuffer();
+    public void resetBuffer();
+    public void close() throws IOException;
+}
diff --git a/src/software/amazon/ion/impl/UnifiedDataPageX.java b/src/com/amazon/ion/impl/UnifiedDataPageX.java
similarity index 95%
rename from src/software/amazon/ion/impl/UnifiedDataPageX.java
rename to src/com/amazon/ion/impl/UnifiedDataPageX.java
index 48324c956b..769f4933d4 100644
--- a/src/software/amazon/ion/impl/UnifiedDataPageX.java
+++ b/src/com/amazon/ion/impl/UnifiedDataPageX.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/software/amazon/ion/impl/UnifiedInputBufferX.java b/src/com/amazon/ion/impl/UnifiedInputBufferX.java
similarity index 96%
rename from src/software/amazon/ion/impl/UnifiedInputBufferX.java
rename to src/com/amazon/ion/impl/UnifiedInputBufferX.java
index c0b9854a1e..c8444883cb 100644
--- a/src/software/amazon/ion/impl/UnifiedInputBufferX.java
+++ b/src/com/amazon/ion/impl/UnifiedInputBufferX.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
 
 abstract class UnifiedInputBufferX
diff --git a/src/software/amazon/ion/impl/UnifiedInputStreamX.java b/src/com/amazon/ion/impl/UnifiedInputStreamX.java
similarity index 97%
rename from src/software/amazon/ion/impl/UnifiedInputStreamX.java
rename to src/com/amazon/ion/impl/UnifiedInputStreamX.java
index b78e789e79..f962946191 100644
--- a/src/software/amazon/ion/impl/UnifiedInputStreamX.java
+++ b/src/com/amazon/ion/impl/UnifiedInputStreamX.java
@@ -1,25 +1,26 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.impl.IonReaderTextRawTokensX.IonReaderTextTokenException;
+import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import software.amazon.ion.impl.IonReaderTextRawTokensX.IonReaderTextTokenException;
-import software.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
 
 /**
  * This is a local stream abstraction, and implementation, that
diff --git a/src/software/amazon/ion/impl/UnifiedSavePointManagerX.java b/src/com/amazon/ion/impl/UnifiedSavePointManagerX.java
similarity index 97%
rename from src/software/amazon/ion/impl/UnifiedSavePointManagerX.java
rename to src/com/amazon/ion/impl/UnifiedSavePointManagerX.java
index 46beb6ba2d..aa8bddf0de 100644
--- a/src/software/amazon/ion/impl/UnifiedSavePointManagerX.java
+++ b/src/com/amazon/ion/impl/UnifiedSavePointManagerX.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
 
 /**
diff --git a/src/com/amazon/ion/impl/_Private_ByteTransferReader.java b/src/com/amazon/ion/impl/_Private_ByteTransferReader.java
new file mode 100644
index 0000000000..b1b9d95d35
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_ByteTransferReader.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonReader;
+import java.io.IOException;
+
+/**
+ * An {@link IonReader} {@linkplain com.amazon.ion.facet facet} that can rapidly bulk-copy
+ * Ion binary data under certain circumstances.
+ */
+public interface _Private_ByteTransferReader
+{
+    public void transferCurrentValue(_Private_ByteTransferSink writer)
+        throws IOException;
+}
diff --git a/src/software/amazon/ion/impl/PrivateByteTransferSink.java b/src/com/amazon/ion/impl/_Private_ByteTransferSink.java
similarity index 53%
rename from src/software/amazon/ion/impl/PrivateByteTransferSink.java
rename to src/com/amazon/ion/impl/_Private_ByteTransferSink.java
index 6838f02ccb..1f26745e49 100644
--- a/src/software/amazon/ion/impl/PrivateByteTransferSink.java
+++ b/src/com/amazon/ion/impl/_Private_ByteTransferSink.java
@@ -1,30 +1,28 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
 import java.io.IOException;
 
 
 /**
- * A destination sink that can be fed bytes.  The typical usage is a {@link PrivateByteTransferReader} that funnels data
+ * A destination sink that can be fed bytes.  The typical usage is a {@link _Private_ByteTransferReader} that funnels data
  * to an binary Ion target.
- *
- * @deprecated This is an internal API that is subject to change without notice.
  */
-@Deprecated
-public interface PrivateByteTransferSink
+public interface _Private_ByteTransferSink
 {
     /**
      * Writes the given data to the sink.
diff --git a/src/com/amazon/ion/impl/_Private_CallbackBuilder.java b/src/com/amazon/ion/impl/_Private_CallbackBuilder.java
new file mode 100644
index 0000000000..2184d87829
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_CallbackBuilder.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.util._Private_FastAppendable;
+
+/**
+ * NOT FOR APPLICATION USE!
+ * <p>
+ * Interface used by {@link _Private_IonTextWriterBuilder} to allow
+ * instantiation of a new {@link _Private_MarkupCallback} during every
+ * IonTextWriterBuilder.build;
+ */
+public interface _Private_CallbackBuilder
+{
+    _Private_MarkupCallback build(_Private_FastAppendable rawOutput);
+}
diff --git a/src/software/amazon/ion/impl/PrivateCommandLine.java b/src/com/amazon/ion/impl/_Private_CommandLine.java
similarity index 72%
rename from src/software/amazon/ion/impl/PrivateCommandLine.java
rename to src/com/amazon/ion/impl/_Private_CommandLine.java
index bbe46287e6..2296d400e6 100644
--- a/src/software/amazon/ion/impl/PrivateCommandLine.java
+++ b/src/com/amazon/ion/impl/_Private_CommandLine.java
@@ -1,30 +1,30 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.util.JarInfo;
 import java.io.IOException;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.system.IonTextWriterBuilder;
-import software.amazon.ion.util.JarInfo;
 
 /**
- * @deprecated This is an internal API that is subject to change without notice.
+ * NOT FOR APPLICATION USE!
  */
-@Deprecated
-public final class PrivateCommandLine
+public final class _Private_CommandLine
 {
     static final int argid_VERSION = 2;
     static final int argid_HELP    = 3;
@@ -47,6 +47,7 @@ public static void main(String[] args) throws IOException
         process_command_line(args);
 
         info = new JarInfo();
+
         if (printVersion) {
             doPrintVersion();
         }
@@ -79,11 +80,23 @@ private static void process_command_line(String[] args)
     }
     private static int getArgumentId(String arg)
     {
-        if (arg.equals("help")) {
-            return argid_HELP;
+        if (arg.startsWith("-") && arg.length() == 2) {
+            switch (arg.charAt(1)) {
+            case 'h': case '?':
+                return argid_HELP;
+            case 'v':
+                return argid_VERSION;
+            default:
+                return argid_INVALID;
+            }
         }
-        if (arg.equals("version")) {
-            return argid_VERSION;
+        if (arg.startsWith("--") && arg.length() > 2) {
+            if (arg.equals("help")) {
+                return argid_HELP;
+            }
+            if (arg.equals("version")) {
+                return argid_VERSION;
+            }
         }
         return argid_INVALID;
     }
diff --git a/src/software/amazon/ion/impl/PrivateCurriedValueFactory.java b/src/com/amazon/ion/impl/_Private_CurriedValueFactory.java
similarity index 82%
rename from src/software/amazon/ion/impl/PrivateCurriedValueFactory.java
rename to src/com/amazon/ion/impl/_Private_CurriedValueFactory.java
index 1e3c1e2f8f..eb492f5dc7 100644
--- a/src/software/amazon/ion/impl/PrivateCurriedValueFactory.java
+++ b/src/com/amazon/ion/impl/_Private_CurriedValueFactory.java
@@ -1,51 +1,52 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
+package com.amazon.ion.impl;
+
+import com.amazon.ion.ContainedValueException;
+import com.amazon.ion.IonBlob;
+import com.amazon.ion.IonBool;
+import com.amazon.ion.IonClob;
+import com.amazon.ion.IonDecimal;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonFloat;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonNull;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonSexp;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.ValueFactory;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonBlob;
-import software.amazon.ion.IonBool;
-import software.amazon.ion.IonClob;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonSexp;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.ValueFactory;
+import java.util.Collection;
 
 /**
+ * NOT FOR APPLICATION USE!
+ * <p>
  * Helper for implementing curried container insertion methods such as
  * {@link IonStruct#put(String)}.
- *
- * @deprecated This is an internal API that is subject to change without notice.
  */
-@Deprecated
-public abstract class PrivateCurriedValueFactory
+public abstract class _Private_CurriedValueFactory
     implements ValueFactory
 {
     private final ValueFactory myFactory;
@@ -53,7 +54,7 @@ public abstract class PrivateCurriedValueFactory
     /**
      * @param factory must not be null.
      */
-    protected PrivateCurriedValueFactory(ValueFactory factory)
+    protected _Private_CurriedValueFactory(ValueFactory factory)
     {
         myFactory = factory;
     }
@@ -241,6 +242,15 @@ public IonList newEmptyList()
         return v;
     }
 
+    @Deprecated
+    public IonList newList(Collection<? extends IonValue> values)
+        throws ContainedValueException, NullPointerException
+    {
+        IonList v = myFactory.newList(values);
+        handle(v);
+        return v;
+    }
+
     public IonList newList(IonSequence firstChild)
     throws ContainedValueException, NullPointerException
     {
@@ -303,6 +313,15 @@ public IonSexp newEmptySexp()
         return v;
     }
 
+    @Deprecated
+    public IonSexp newSexp(Collection<? extends IonValue> values)
+        throws ContainedValueException, NullPointerException
+    {
+        IonSexp v = myFactory.newSexp(values);
+        handle(v);
+        return v;
+    }
+
     public IonSexp newSexp(IonSequence firstChild)
     throws ContainedValueException, NullPointerException
     {
diff --git a/src/software/amazon/ion/impl/PrivateFastAppendableDecorator.java b/src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java
similarity index 69%
rename from src/software/amazon/ion/impl/PrivateFastAppendableDecorator.java
rename to src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java
index a501523744..ac1246e4de 100644
--- a/src/software/amazon/ion/impl/PrivateFastAppendableDecorator.java
+++ b/src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java
@@ -1,34 +1,34 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.util._Private_FastAppendable;
 import java.io.Closeable;
 import java.io.Flushable;
 import java.io.IOException;
-import software.amazon.ion.util.PrivateFastAppendable;
 
 /**
- * @deprecated This is an internal API that is subject to change without notice.
+ * NOT FOR APPLICATION USE!
  */
-@Deprecated
-public abstract class PrivateFastAppendableDecorator
-    implements PrivateFastAppendable, Closeable, Flushable
+public abstract class _Private_FastAppendableDecorator
+    implements _Private_FastAppendable, Closeable, Flushable
 {
-    private final PrivateFastAppendable myOutput;
+    private final _Private_FastAppendable myOutput;
 
-    public PrivateFastAppendableDecorator(PrivateFastAppendable output) {
+    public _Private_FastAppendableDecorator(_Private_FastAppendable output) {
         myOutput = output;
     }
 
diff --git a/src/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java b/src/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java
new file mode 100644
index 0000000000..4440c889d6
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.util._Private_FastAppendable;
+import java.io.OutputStream;
+
+
+/**
+ * <b>NOT FOR APPLICATION USE!</b>
+ */
+public final class _Private_FastAppendableTrampoline
+{
+
+    public static _Private_FastAppendable forAppendable(Appendable appendable)
+    {
+        return new AppendableFastAppendable(appendable);
+    }
+
+    public static _Private_FastAppendable forOutputStream(
+            OutputStream outputStream)
+    {
+        return new OutputStreamFastAppendable(outputStream);
+    }
+}
diff --git a/src/software/amazon/ion/impl/PrivateIonBinaryWriterBuilder.java b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
similarity index 56%
rename from src/software/amazon/ion/impl/PrivateIonBinaryWriterBuilder.java
rename to src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
index 96b48e60ba..c92da72b29 100644
--- a/src/software/amazon/ion/impl/PrivateIonBinaryWriterBuilder.java
+++ b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
@@ -1,52 +1,57 @@
 /*
- * Copyright 2014-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.impl._Private_Utils.initialSymtab;
+
+import com.amazon.ion.IonBinaryWriter;
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SubstituteSymbolTableException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.ValueFactory;
+import com.amazon.ion.impl.BlockedBuffer.BufferedOutputStream;
+import com.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder;
+import com.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder.AllocatorMode;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
 import java.io.IOException;
 import java.io.OutputStream;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SubstituteSymbolTableException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.ValueFactory;
-import software.amazon.ion.impl.bin.PrivateIonManagedBinaryWriterBuilder;
-import software.amazon.ion.impl.bin.PrivateIonManagedBinaryWriterBuilder.AllocatorMode;
-import software.amazon.ion.system.IonBinaryWriterBuilder;
-import software.amazon.ion.system.IonSystemBuilder;
 
 /**
- * @deprecated This is an internal API that is subject to change without notice.
+ * NOT FOR APPLICATION USE!
  */
-@Deprecated
-public class PrivateIonBinaryWriterBuilder
+@SuppressWarnings("deprecation")
+public class _Private_IonBinaryWriterBuilder
     extends IonBinaryWriterBuilder
 {
-    // amzn/ion-java#59 expose configuration points properly and figure out deprecation path for the old writer.
-    private final PrivateIonManagedBinaryWriterBuilder myBinaryWriterBuilder;
+    // amzn/ion-java/issues/59 expose configuration points properly and figure out deprecation path for the old writer.
+    private final _Private_IonManagedBinaryWriterBuilder myBinaryWriterBuilder;
     private ValueFactory mySymtabValueFactory;
 
     /** System or local */
     private SymbolTable  myInitialSymbolTable;
 
 
-    private PrivateIonBinaryWriterBuilder()
+    private _Private_IonBinaryWriterBuilder()
     {
         myBinaryWriterBuilder =
-            PrivateIonManagedBinaryWriterBuilder
+            _Private_IonManagedBinaryWriterBuilder
                 .create(AllocatorMode.POOLED)
                 .withPaddedLengthPreallocation(0)
                 ;
@@ -54,7 +59,7 @@ private PrivateIonBinaryWriterBuilder()
 
 
     private
-    PrivateIonBinaryWriterBuilder(PrivateIonBinaryWriterBuilder that)
+    _Private_IonBinaryWriterBuilder(_Private_IonBinaryWriterBuilder that)
     {
         super(that);
 
@@ -67,9 +72,9 @@ private PrivateIonBinaryWriterBuilder()
     /**
      * @return a new mutable builder.
      */
-    public static PrivateIonBinaryWriterBuilder standard()
+    public static _Private_IonBinaryWriterBuilder standard()
     {
-        return new PrivateIonBinaryWriterBuilder.Mutable();
+        return new _Private_IonBinaryWriterBuilder.Mutable();
     }
 
 
@@ -77,19 +82,19 @@ public static PrivateIonBinaryWriterBuilder standard()
 
 
     @Override
-    public final PrivateIonBinaryWriterBuilder copy()
+    public final _Private_IonBinaryWriterBuilder copy()
     {
         return new Mutable(this);
     }
 
     @Override
-    public PrivateIonBinaryWriterBuilder immutable()
+    public _Private_IonBinaryWriterBuilder immutable()
     {
         return this;
     }
 
     @Override
-    public PrivateIonBinaryWriterBuilder mutable()
+    public _Private_IonBinaryWriterBuilder mutable()
     {
         return copy();
     }
@@ -112,10 +117,10 @@ public void setSymtabValueFactory(ValueFactory factory)
         mySymtabValueFactory = factory;
     }
 
-    public PrivateIonBinaryWriterBuilder
+    public _Private_IonBinaryWriterBuilder
     withSymtabValueFactory(ValueFactory factory)
     {
-        PrivateIonBinaryWriterBuilder b = mutable();
+        _Private_IonBinaryWriterBuilder b = mutable();
         b.setSymtabValueFactory(factory);
         return b;
     }
@@ -181,9 +186,9 @@ else if (! symtab.isSystemTable())
      */
     @Override
     public
-    PrivateIonBinaryWriterBuilder withInitialSymbolTable(SymbolTable symtab)
+    _Private_IonBinaryWriterBuilder withInitialSymbolTable(SymbolTable symtab)
     {
-        PrivateIonBinaryWriterBuilder b = mutable();
+        _Private_IonBinaryWriterBuilder b = mutable();
         b.setInitialSymbolTable(symtab);
         return b;
     }
@@ -203,16 +208,16 @@ public void setIsFloatBinary32Enabled(boolean enabled) {
 
     @Override
     public
-    PrivateIonBinaryWriterBuilder withFloatBinary32Enabled() {
-        PrivateIonBinaryWriterBuilder b = mutable();
+    _Private_IonBinaryWriterBuilder withFloatBinary32Enabled() {
+        _Private_IonBinaryWriterBuilder b = mutable();
         b.setIsFloatBinary32Enabled(true);
         return b;
     }
 
     @Override
     public
-    PrivateIonBinaryWriterBuilder withFloatBinary32Disabled() {
-        PrivateIonBinaryWriterBuilder b = mutable();
+    _Private_IonBinaryWriterBuilder withFloatBinary32Disabled() {
+        _Private_IonBinaryWriterBuilder b = mutable();
         b.setIsFloatBinary32Enabled(false);
         return b;
     }
@@ -244,10 +249,10 @@ public void setStreamCopyOptimized(final boolean optimized)
     /**
      * Fills all properties and returns an immutable builder.
      */
-    private PrivateIonBinaryWriterBuilder fillDefaults()
+    private _Private_IonBinaryWriterBuilder fillDefaults()
     {
         // Ensure that we don't modify the user's builder.
-        PrivateIonBinaryWriterBuilder b = copy();
+        _Private_IonBinaryWriterBuilder b = copy();
 
         if (b.getSymtabValueFactory() == null)
         {
@@ -258,6 +263,54 @@ private PrivateIonBinaryWriterBuilder fillDefaults()
         return b.immutable();
     }
 
+    /**
+     * Fills all properties and returns an immutable builder.
+     */
+    private _Private_IonBinaryWriterBuilder fillLegacyDefaults()
+    {
+        // amzn/ion-java/issues/59 Fix this to use the new writer or eliminate it
+
+        // Ensure that we don't modify the user's builder.
+        _Private_IonBinaryWriterBuilder b = copy();
+
+        if (b.getSymtabValueFactory() == null)
+        {
+            IonSystem system = IonSystemBuilder.standard().build();
+            b.setSymtabValueFactory(system);
+        }
+
+        SymbolTable initialSymtab = b.getInitialSymbolTable();
+        if (initialSymtab == null)
+        {
+            initialSymtab = initialSymtab(LocalSymbolTable.DEFAULT_LST_FACTORY,
+                                          _Private_Utils.systemSymtab(1),
+                                          b.getImports());
+            b.setInitialSymbolTable(initialSymtab);
+        }
+        else if (initialSymtab.isSystemTable())
+        {
+            initialSymtab = initialSymtab(LocalSymbolTable.DEFAULT_LST_FACTORY,
+                                          initialSymtab,
+                                          b.getImports());
+            b.setInitialSymbolTable(initialSymtab);
+        }
+
+        return b.immutable();
+    }
+
+
+    private IonWriterSystemBinary buildSystemWriter(OutputStream out)
+    {
+        SymbolTable defaultSystemSymtab =
+            myInitialSymbolTable.getSystemSymbolTable();
+
+        return new IonWriterSystemBinary(defaultSystemSymtab,
+                                         out,
+                                         false /* autoFlush */,
+                                         true /* ensureInitialIvm */);
+    }
+
+
     /**
      * Returns a symtab usable in a local context.
      * This copies {@link #myInitialSymbolTable} if symbols have been added to
@@ -277,7 +330,7 @@ SymbolTable buildContextSymbolTable()
     @Override
     public final IonWriter build(OutputStream out)
     {
-        PrivateIonBinaryWriterBuilder b = fillDefaults();
+        _Private_IonBinaryWriterBuilder b = fillDefaults();
         try
         {
             return b.myBinaryWriterBuilder.newWriter(out);
@@ -288,27 +341,41 @@ public final IonWriter build(OutputStream out)
         }
     }
 
+
+    @Deprecated
+    public final IonBinaryWriter buildLegacy()
+    {
+        // amzn/ion-java/issues/59 Fix this to use the new writer or eliminate it
+        _Private_IonBinaryWriterBuilder b = fillLegacyDefaults();
+
+        IonWriterSystemBinary systemWriter =
+            b.buildSystemWriter(new BufferedOutputStream());
+
+        return new _Private_IonBinaryWriterImpl(b, systemWriter);
+    }
+
+
     //=========================================================================
 
 
     private static final class Mutable
-        extends PrivateIonBinaryWriterBuilder
+        extends _Private_IonBinaryWriterBuilder
     {
         private Mutable() { }
 
-        private Mutable(PrivateIonBinaryWriterBuilder that)
+        private Mutable(_Private_IonBinaryWriterBuilder that)
         {
             super(that);
         }
 
         @Override
-        public PrivateIonBinaryWriterBuilder immutable()
+        public _Private_IonBinaryWriterBuilder immutable()
         {
-            return new PrivateIonBinaryWriterBuilder(this);
+            return new _Private_IonBinaryWriterBuilder(this);
         }
 
         @Override
-        public PrivateIonBinaryWriterBuilder mutable()
+        public _Private_IonBinaryWriterBuilder mutable()
         {
             return this;
         }
diff --git a/src/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java b/src/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java
new file mode 100644
index 0000000000..a5570866a9
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonBinaryWriter;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.impl.BlockedBuffer.BufferedOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * NOT FOR APPLICATION USE!
+ * <p>
+ * Adapts the binary {@link IonWriter} implementation to the deprecated
+ * {@link IonBinaryWriter} interface.
+ */
+@Deprecated
+public final class _Private_IonBinaryWriterImpl
+    extends IonWriterUserBinary
+    implements IonBinaryWriter
+{
+    _Private_IonBinaryWriterImpl(_Private_IonBinaryWriterBuilder options,
+                                 IonWriterSystemBinary           systemWriter)
+    {
+        super(options, systemWriter);
+    }
+
+
+    private BufferedOutputStream getOutputStream()
+    {
+        IonWriterSystemBinary systemWriter =
+            (IonWriterSystemBinary)_system_writer;
+        return (BufferedOutputStream) systemWriter.getOutputStream();
+    }
+
+
+    public int byteSize()
+    {
+        try {
+            finish();
+        }
+        catch (IOException e) {
+            throw new IonException(e);
+        }
+        int size = getOutputStream().byteSize();
+        return size;
+    }
+
+    public byte[] getBytes() throws IOException
+    {
+        finish();
+        byte[] bytes = getOutputStream().getBytes();
+        return bytes;
+    }
+
+    public int getBytes(byte[] bytes, int offset, int len)
+        throws IOException
+    {
+        finish();
+        int written = getOutputStream().getBytes(bytes, offset, len);
+        return written;
+    }
+
+    public int writeBytes(OutputStream userstream) throws IOException
+    {
+        finish();
+        int written = getOutputStream().writeBytes(userstream);
+        return written;
+    }
+}
diff --git a/src/software/amazon/ion/impl/PrivateIonConstants.java b/src/com/amazon/ion/impl/_Private_IonConstants.java
similarity index 92%
rename from src/software/amazon/ion/impl/PrivateIonConstants.java
rename to src/com/amazon/ion/impl/_Private_IonConstants.java
index 505c32695b..38b9b1ee97 100644
--- a/src/software/amazon/ion/impl/PrivateIonConstants.java
+++ b/src/com/amazon/ion/impl/_Private_IonConstants.java
@@ -1,28 +1,28 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import software.amazon.ion.IonException;
+import com.amazon.ion.IonException;
 
 /**
- * @deprecated This is an internal API that is subject to change without notice.
+ * NOT FOR APPLICATION USE!
  */
-@Deprecated
-public final class PrivateIonConstants
+public final class _Private_IonConstants
 {
-    private PrivateIonConstants() { }
+    private _Private_IonConstants() { }
 
 
     public final static int BB_TOKEN_LEN           =    1;
@@ -268,12 +268,12 @@ public static final int getLowNibble(int td)
     }
 
     public static final int True =
-        makeTypeDescriptor(PrivateIonConstants.tidBoolean,
-                           PrivateIonConstants.lnBooleanTrue);
+        makeTypeDescriptor(_Private_IonConstants.tidBoolean,
+                           _Private_IonConstants.lnBooleanTrue);
 
     public static final int False =
-        makeTypeDescriptor(PrivateIonConstants.tidBoolean,
-                           PrivateIonConstants.lnBooleanFalse);
+        makeTypeDescriptor(_Private_IonConstants.tidBoolean,
+                           _Private_IonConstants.lnBooleanFalse);
 
     /**
      * Prefix string used in IonStructs' equality checks.
@@ -291,7 +291,7 @@ public static final int getLowNibble(int td)
      * </pre>
      *
      * <p>
-     * TODO amzn/ion-java#23 However, there is still a potential failure if one of the
+     * TODO amzn/ion-java/issues/23 However, there is still a potential failure if one of the
      * IonStruct's nested value has a field name with text
      * {@code " -- UNKNOWN SYMBOL TEXT -- $123"}, and that another nested value
      * of an IonStruct has a field name with unknown text and sid 123, these
diff --git a/src/com/amazon/ion/impl/_Private_IonContainer.java b/src/com/amazon/ion/impl/_Private_IonContainer.java
new file mode 100644
index 0000000000..a77ab51a81
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_IonContainer.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonValue;
+
+/**
+ * NOT FOR APPLICATION USE!
+ * <p>
+ * Internal, private, interfaces for manipulating
+ * the base child collection of IonContainer
+ */
+public interface _Private_IonContainer
+    extends IonContainer
+{
+    public int      get_child_count();
+    public IonValue get_child(int idx);
+}
diff --git a/src/com/amazon/ion/impl/_Private_IonDatagram.java b/src/com/amazon/ion/impl/_Private_IonDatagram.java
new file mode 100644
index 0000000000..2a9f15f5c5
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_IonDatagram.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.SymbolTable;
+
+/**
+ * NOT FOR APPLICATION USE!
+ */
+public interface _Private_IonDatagram
+    extends _Private_IonValue, IonDatagram
+{
+    void appendTrailingSymbolTable(SymbolTable symtab);
+}
diff --git a/src/software/amazon/ion/impl/PrivateIonReaderFactory.java b/src/com/amazon/ion/impl/_Private_IonReaderFactory.java
similarity index 75%
rename from src/software/amazon/ion/impl/PrivateIonReaderFactory.java
rename to src/com/amazon/ion/impl/_Private_IonReaderFactory.java
index 28f7cc4c31..8239e3ff50 100644
--- a/src/software/amazon/ion/impl/PrivateIonReaderFactory.java
+++ b/src/com/amazon/ion/impl/_Private_IonReaderFactory.java
@@ -1,41 +1,44 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.impl.PrivateIonConstants.BINARY_VERSION_MARKER_SIZE;
-import static software.amazon.ion.impl.UnifiedInputStreamX.makeStream;
-import static software.amazon.ion.util.IonStreamUtils.isIonBinary;
+import static com.amazon.ion.impl.UnifiedInputStreamX.makeStream;
+import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_SIZE;
+import static com.amazon.ion.util.IonStreamUtils.isIonBinary;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonTextReader;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.util.IonStreamUtils;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import java.util.zip.GZIPInputStream;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.util.IonStreamUtils;
 
 /**
- * @deprecated This is an internal API that is subject to change without notice.
+ * NOT FOR APPLICATION USE!
  */
-@Deprecated
-public final class PrivateIonReaderFactory
+@SuppressWarnings("deprecation")
+public final class _Private_IonReaderFactory
 {
+
     public static final IonReader makeReader(IonCatalog catalog,
                                              byte[] bytes)
     {
@@ -44,10 +47,10 @@ public static final IonReader makeReader(IonCatalog catalog,
 
     public static final IonReader makeReader(IonCatalog catalog,
                                              byte[] bytes,
-                                             PrivateLocalSymbolTableFactory lstFactory)
-   {
-       return makeReader(catalog, bytes, 0, bytes.length, lstFactory);
-   }
+                                             _Private_LocalSymbolTableFactory lstFactory)
+    {
+        return makeReader(catalog, bytes, 0, bytes.length, lstFactory);
+    }
 
     public static IonReader makeSystemReader(byte[] bytes)
     {
@@ -75,7 +78,7 @@ public static final IonReader makeReader(IonCatalog catalog,
                                              byte[] bytes,
                                              int offset,
                                              int length,
-                                             PrivateLocalSymbolTableFactory lstFactory)
+                                             _Private_LocalSymbolTableFactory lstFactory)
     {
         try
         {
@@ -95,7 +98,7 @@ public static IonReader makeSystemReader(byte[] bytes,
         try
         {
             UnifiedInputStreamX uis = makeUnifiedStream(bytes, offset, length);
-            return makeSystemReader(uis, offset);
+            return makeSystemReader(uis);
         }
         catch (IOException e)
         {
@@ -104,8 +107,8 @@ public static IonReader makeSystemReader(byte[] bytes,
     }
 
 
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             char[] chars)
+    public static final IonTextReader makeReader(IonCatalog catalog,
+                                                 char[] chars)
     {
         return makeReader(catalog, chars, 0, chars.length);
     }
@@ -117,10 +120,10 @@ public static final IonReader makeSystemReader(char[] chars)
     }
 
 
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             char[] chars,
-                                             int offset,
-                                             int length)
+    public static final IonTextReader makeReader(IonCatalog catalog,
+                                                 char[] chars,
+                                                 int offset,
+                                                 int length)
     {
         UnifiedInputStreamX in = makeStream(chars, offset, length);
         return new IonReaderTextUserX(catalog, LocalSymbolTable.DEFAULT_LST_FACTORY, in, offset);
@@ -135,15 +138,15 @@ public static final IonReader makeSystemReader(char[] chars,
     }
 
 
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             CharSequence chars)
+    public static final IonTextReader makeReader(IonCatalog catalog,
+                                                 CharSequence chars)
     {
         return makeReader(catalog, chars, LocalSymbolTable.DEFAULT_LST_FACTORY);
     }
 
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             CharSequence chars,
-                                             PrivateLocalSymbolTableFactory lstFactory)
+    public static final IonTextReader makeReader(IonCatalog catalog,
+                                                 CharSequence chars,
+                                                 _Private_LocalSymbolTableFactory lstFactory)
     {
         UnifiedInputStreamX in = makeStream(chars);
         return new IonReaderTextUserX(catalog, lstFactory, in);
@@ -156,10 +159,10 @@ public static final IonReader makeSystemReader(CharSequence chars)
     }
 
 
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             CharSequence chars,
-                                             int offset,
-                                             int length)
+    public static final IonTextReader makeReader(IonCatalog catalog,
+                                                 CharSequence chars,
+                                                 int offset,
+                                                 int length)
     {
         UnifiedInputStreamX in = makeStream(chars, offset, length);
         return new IonReaderTextUserX(catalog, LocalSymbolTable.DEFAULT_LST_FACTORY, in, offset);
@@ -173,6 +176,7 @@ public static final IonReader makeSystemReader(CharSequence chars,
         return new IonReaderTextSystemX(in);
     }
 
+
     public static final IonReader makeReader(IonCatalog catalog,
                                              InputStream is)
     {
@@ -181,7 +185,7 @@ public static final IonReader makeReader(IonCatalog catalog,
 
     public static final IonReader makeReader(IonCatalog catalog,
                                              InputStream is,
-                                             PrivateLocalSymbolTableFactory lstFactory)
+                                             _Private_LocalSymbolTableFactory lstFactory)
     {
         try {
             UnifiedInputStreamX uis = makeUnifiedStream(is);
@@ -196,22 +200,23 @@ public static IonReader makeSystemReader(InputStream is)
     {
         try {
             UnifiedInputStreamX uis = makeUnifiedStream(is);
-            return makeSystemReader(uis, 0);
+            return makeSystemReader(uis);
         }
         catch (IOException e) {
             throw new IonException(e);
         }
     }
 
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             Reader chars)
+
+    public static final IonTextReader makeReader(IonCatalog catalog,
+                                                 Reader chars)
     {
         return makeReader(catalog, chars, LocalSymbolTable.DEFAULT_LST_FACTORY);
     }
 
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             Reader chars,
-                                             PrivateLocalSymbolTableFactory lstFactory)
+    public static final IonTextReader makeReader(IonCatalog catalog,
+                                                 Reader chars,
+                                                 _Private_LocalSymbolTableFactory lstFactory)
     {
         try {
             UnifiedInputStreamX in = makeStream(chars);
@@ -233,7 +238,6 @@ public static final IonReader makeSystemReader(Reader chars)
         }
     }
 
-
     public static final IonReader makeReader(IonCatalog catalog,
                                              IonValue value)
     {
@@ -257,7 +261,7 @@ public static final IonReader makeSystemReader(IonSystem system,
     private static IonReader makeReader(IonCatalog catalog,
                                         UnifiedInputStreamX uis,
                                         int offset,
-                                        PrivateLocalSymbolTableFactory lstFactory)
+                                        _Private_LocalSymbolTableFactory lstFactory)
         throws IOException
     {
         IonReader r;
@@ -270,8 +274,7 @@ private static IonReader makeReader(IonCatalog catalog,
         return r;
     }
 
-    private static IonReader makeSystemReader(UnifiedInputStreamX uis,
-                                              int offset)
+    private static IonReader makeSystemReader(UnifiedInputStreamX uis)
         throws IOException
     {
         IonReader r;
diff --git a/src/software/amazon/ion/impl/PrivateIonSymbol.java b/src/com/amazon/ion/impl/_Private_IonSymbol.java
similarity index 50%
rename from src/software/amazon/ion/impl/PrivateIonSymbol.java
rename to src/com/amazon/ion/impl/_Private_IonSymbol.java
index b3c8f77dd6..6e0dbc1cd6 100644
--- a/src/software/amazon/ion/impl/PrivateIonSymbol.java
+++ b/src/com/amazon/ion/impl/_Private_IonSymbol.java
@@ -1,28 +1,28 @@
 /*
- * Copyright 2016-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.impl.PrivateIonValue.SymbolTableProvider;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.impl._Private_IonValue.SymbolTableProvider;
 
 /**
- * @deprecated This is an internal API that is subject to change without notice.
+ * NOT FOR APPLICATION USE!
  */
-@Deprecated
-public interface PrivateIonSymbol
+public interface _Private_IonSymbol
     extends IonSymbol
 {
     /**
diff --git a/src/software/amazon/ion/impl/PrivateIonSystem.java b/src/com/amazon/ion/impl/_Private_IonSystem.java
similarity index 58%
rename from src/software/amazon/ion/impl/PrivateIonSystem.java
rename to src/com/amazon/ion/impl/_Private_IonSystem.java
index f2d55b2f60..d9024761f8 100644
--- a/src/software/amazon/ion/impl/PrivateIonSystem.java
+++ b/src/com/amazon/ion/impl/_Private_IonSystem.java
@@ -1,47 +1,47 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.system.IonSystemBuilder;
 import java.io.InputStream;
 import java.io.Reader;
 import java.util.Iterator;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.system.IonSystemBuilder;
 
 /**
- * @deprecated This is an internal API that is subject to change without notice.
+ * NOT FOR APPLICATION USE!
  */
-@Deprecated
-public interface PrivateIonSystem
+public interface _Private_IonSystem
     extends IonSystem
 {
     public SymbolTable newSharedSymbolTable(IonStruct ionRep);
 
     /**
-     * TODO Must correct amzn/ion-java#14 before exposing this or using from public API.
+     * TODO Must correct amzn/ion-java/issues/63 before exposing this or using from public API.
      */
     public Iterator<IonValue> systemIterate(String ionText);
 
     /**
-     * TODO Must correct amzn/ion-java#14 before exposing this or using from public API.
+     * TODO Must correct amzn/ion-java/issues/63 before exposing this or using from public API.
      */
     public Iterator<IonValue> systemIterate(Reader ionText);
 
diff --git a/src/software/amazon/ion/impl/PrivateIonTextAppender.java b/src/com/amazon/ion/impl/_Private_IonTextAppender.java
similarity index 92%
rename from src/software/amazon/ion/impl/PrivateIonTextAppender.java
rename to src/com/amazon/ion/impl/_Private_IonTextAppender.java
index b251c95b96..4e6f952615 100644
--- a/src/software/amazon/ion/impl/PrivateIonTextAppender.java
+++ b/src/com/amazon/ion/impl/_Private_IonTextAppender.java
@@ -1,24 +1,29 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.impl.PrivateIonConstants.MAX_LONG_TEXT_SIZE;
-import static software.amazon.ion.impl.PrivateIonConstants.isHighSurrogate;
-import static software.amazon.ion.impl.PrivateIonConstants.isLowSurrogate;
-import static software.amazon.ion.impl.PrivateIonConstants.makeUnicodeScalar;
+import static com.amazon.ion.impl._Private_IonConstants.MAX_LONG_TEXT_SIZE;
+import static com.amazon.ion.impl._Private_IonConstants.isHighSurrogate;
+import static com.amazon.ion.impl._Private_IonConstants.isLowSurrogate;
+import static com.amazon.ion.impl._Private_IonConstants.makeUnicodeScalar;
 
+import com.amazon.ion.Decimal;
+import com.amazon.ion.impl.Base64Encoder.TextStream;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.util._Private_FastAppendable;
 import java.io.ByteArrayInputStream;
 import java.io.Closeable;
 import java.io.Flushable;
@@ -28,19 +33,14 @@
 import java.math.BigInteger;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.impl.Base64Encoder.TextStream;
-import software.amazon.ion.system.IonTextWriterBuilder;
-import software.amazon.ion.util.PrivateFastAppendable;
 
 
 /**
+ * NOT FOR APPLICATION USE!
+ * <p>
  * Generic text sink that enables optimized output of both ASCII and UTF-16.
- *
- * @deprecated This is an internal API that is subject to change without notice.
  */
-@Deprecated
-public final class PrivateIonTextAppender
+public final class _Private_IonTextAppender
     implements Closeable, Flushable
 {
     private static boolean is8bitValue(int v)
@@ -220,22 +220,22 @@ public static boolean isOperatorPart(int codePoint) {
     //=========================================================================
 
 
-    private final PrivateFastAppendable myAppendable;
+    private final _Private_FastAppendable myAppendable;
     private final boolean escapeNonAscii;
 
 
-    PrivateIonTextAppender(PrivateFastAppendable out, boolean escapeNonAscii)
+    _Private_IonTextAppender(_Private_FastAppendable out, boolean escapeNonAscii)
     {
         this.myAppendable   = out;
         this.escapeNonAscii = escapeNonAscii;
     }
 
 
-    public static PrivateIonTextAppender
-    forFastAppendable(PrivateFastAppendable out, Charset charset)
+    public static _Private_IonTextAppender
+    forFastAppendable(_Private_FastAppendable out, Charset charset)
     {
-        boolean escapeNonAscii = charset.equals(PrivateUtils.ASCII_CHARSET);
-        return new PrivateIonTextAppender(out, escapeNonAscii);
+        boolean escapeNonAscii = charset.equals(_Private_Utils.ASCII_CHARSET);
+        return new _Private_IonTextAppender(out, escapeNonAscii);
     }
 
 
@@ -245,10 +245,10 @@ public static boolean isOperatorPart(int codePoint) {
      * characters will be escaped. Otherwise, only select code points will be
      * escaped.
      */
-    public static PrivateIonTextAppender forAppendable(Appendable out,
+    public static _Private_IonTextAppender forAppendable(Appendable out,
                                                          Charset charset)
     {
-        PrivateFastAppendable fast = new AppendableFastAppendable(out);
+        _Private_FastAppendable fast = new AppendableFastAppendable(out);
         return forFastAppendable(fast, charset);
     }
 
@@ -256,11 +256,11 @@ public static PrivateIonTextAppender forAppendable(Appendable out,
     /**
      * Doesn't escape non-ASCII characters.
      */
-    public static PrivateIonTextAppender forAppendable(Appendable out)
+    public static _Private_IonTextAppender forAppendable(Appendable out)
     {
-        PrivateFastAppendable fast = new AppendableFastAppendable(out);
+        _Private_FastAppendable fast = new AppendableFastAppendable(out);
         boolean escapeNonAscii = false;
-        return new PrivateIonTextAppender(fast, escapeNonAscii);
+        return new _Private_IonTextAppender(fast, escapeNonAscii);
     }
 
 
@@ -270,10 +270,10 @@ public static PrivateIonTextAppender forAppendable(Appendable out)
      * characters will be escaped. Otherwise, only select code points will be
      * escaped.
      */
-    public static PrivateIonTextAppender forOutputStream(OutputStream out,
+    public static _Private_IonTextAppender forOutputStream(OutputStream out,
                                                            Charset charset)
     {
-        PrivateFastAppendable fast = new OutputStreamFastAppendable(out);
+        _Private_FastAppendable fast = new OutputStreamFastAppendable(out);
         return forFastAppendable(fast, charset);
     }
 
@@ -716,7 +716,7 @@ public void printInt(BigInteger value)
     }
 
 
-    public void printDecimal(PrivateIonTextWriterBuilder _options,
+    public void printDecimal(_Private_IonTextWriterBuilder _options,
                              BigDecimal                    value)
         throws IOException
     {
@@ -864,7 +864,7 @@ public void printFloat(Double value)
     // LOBs
 
 
-    public void printBlob(PrivateIonTextWriterBuilder _options,
+    public void printBlob(_Private_IonTextWriterBuilder _options,
                           byte[] value, int start, int len)
         throws IOException
     {
@@ -935,7 +935,7 @@ private void printClobBytes(byte[] value, int start, int end,
     }
 
 
-    public void printClob(PrivateIonTextWriterBuilder _options,
+    public void printClob(_Private_IonTextWriterBuilder _options,
                           byte[] value, int start, int len)
         throws IOException
     {
diff --git a/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java b/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
new file mode 100644
index 0000000000..5c94c62556
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.impl._Private_Utils.initialSymtab;
+
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.system.SimpleCatalog;
+import com.amazon.ion.util._Private_FastAppendable;
+import java.io.OutputStream;
+
+/**
+ * NOT FOR APPLICATION USE!
+ */
+public class _Private_IonTextWriterBuilder
+    extends IonTextWriterBuilder
+{
+    private final static CharSequence SPACE_CHARACTER = " ";
+    // TODO amzn/ion-java/issues/57 decide if this should be platform-specific
+    private final static CharSequence LINE_SEPARATOR =
+        System.getProperty("line.separator");
+
+
+    public static _Private_IonTextWriterBuilder standard()
+    {
+        return new _Private_IonTextWriterBuilder.Mutable();
+    }
+
+    public static _Private_IonTextWriterBuilder STANDARD =
+        standard().immutable();
+
+
+    //=========================================================================
+
+    private boolean _pretty_print;
+    public boolean _blob_as_string;
+    public boolean _clob_as_string;
+    public boolean _decimal_as_float;
+    public boolean _sexp_as_list;
+    public boolean _skip_annotations;
+    public boolean _string_as_json;
+    public boolean _symbol_as_string;
+    public boolean _timestamp_as_millis;
+    public boolean _timestamp_as_string;
+    public boolean _untyped_nulls;
+    private _Private_CallbackBuilder _callback_builder;
+
+
+    private _Private_IonTextWriterBuilder()
+    {
+        super();
+    }
+
+    private _Private_IonTextWriterBuilder(_Private_IonTextWriterBuilder that)
+    {
+        super(that);
+        this._callback_builder    = that._callback_builder   ;
+        this._pretty_print        = that._pretty_print       ;
+        this._blob_as_string      = that._blob_as_string     ;
+        this._clob_as_string      = that._clob_as_string     ;
+        this._decimal_as_float    = that._decimal_as_float   ;
+        this._sexp_as_list        = that._sexp_as_list       ;
+        this._skip_annotations    = that._skip_annotations   ;
+        this._string_as_json      = that._string_as_json     ;
+        this._symbol_as_string    = that._symbol_as_string   ;
+        this._timestamp_as_millis = that._timestamp_as_millis;
+        this._timestamp_as_string = that._timestamp_as_string;
+        this._untyped_nulls       = that._untyped_nulls      ;
+    }
+
+
+    @Override
+    public final _Private_IonTextWriterBuilder copy()
+    {
+        return new Mutable(this);
+    }
+
+    @Override
+    public _Private_IonTextWriterBuilder immutable()
+    {
+        return this;
+    }
+
+    @Override
+    public _Private_IonTextWriterBuilder mutable()
+    {
+        return copy();
+    }
+
+
+    //=========================================================================
+
+    @Override
+    public final IonTextWriterBuilder withPrettyPrinting()
+    {
+        _Private_IonTextWriterBuilder b = mutable();
+        b._pretty_print = true;
+        return b;
+    }
+
+    @Override
+    public final IonTextWriterBuilder withJsonDowngrade()
+    {
+        _Private_IonTextWriterBuilder b = mutable();
+
+        b.withMinimalSystemData();
+
+        _blob_as_string      = true;
+        _clob_as_string      = true;
+        // datagramAsList    = true; // TODO
+        _decimal_as_float    = true;
+        _sexp_as_list        = true;
+        _skip_annotations    = true;
+        // skipSystemValues  = true; // TODO
+        _string_as_json      = true;
+        _symbol_as_string    = true;
+        _timestamp_as_string = true;  // TODO different from Printer
+        _timestamp_as_millis = false;
+        _untyped_nulls       = true;
+
+        return b;
+    }
+
+
+    final boolean isPrettyPrintOn()
+    {
+        return _pretty_print;
+    }
+
+    final CharSequence lineSeparator()
+    {
+        if (_pretty_print) {
+            return LINE_SEPARATOR;
+        }
+        else {
+            return SPACE_CHARACTER;
+        }
+    }
+
+
+    //=========================================================================
+
+    private _Private_IonTextWriterBuilder fillDefaults()
+    {
+        // Ensure that we don't modify the user's builder.
+        IonTextWriterBuilder b = copy();
+
+        if (b.getCatalog() == null)
+        {
+            b.setCatalog(new SimpleCatalog());
+        }
+
+        if (b.getCharset() == null)
+        {
+            b.setCharset(UTF8);
+        }
+
+        return (_Private_IonTextWriterBuilder) b.immutable();
+    }
+
+
+    /** Assumes that {@link #fillDefaults()} has been called. */
+    private IonWriter build(_Private_FastAppendable appender)
+    {
+        IonCatalog catalog = getCatalog();
+        SymbolTable[] imports = getImports();
+
+        // TODO We shouldn't need a system here
+        IonSystem system =
+            IonSystemBuilder.standard().withCatalog(catalog).build();
+
+        SymbolTable defaultSystemSymtab = system.getSystemSymbolTable();
+
+        IonWriterSystemText systemWriter =
+            (getCallbackBuilder() == null
+                ? new IonWriterSystemText(defaultSystemSymtab,
+                                          this,
+                                          appender)
+                : new IonWriterSystemTextMarkup(defaultSystemSymtab,
+                                                this,
+                                                appender));
+
+        SymbolTable initialSymtab =
+            initialSymtab(((_Private_ValueFactory)system).getLstFactory(), defaultSystemSymtab, imports);
+
+        return new IonWriterUser(catalog, system, systemWriter, initialSymtab);
+    }
+
+
+    @Override
+    public final IonWriter build(Appendable out)
+    {
+        _Private_IonTextWriterBuilder b = fillDefaults();
+
+        _Private_FastAppendable fast = new AppendableFastAppendable(out);
+
+        return b.build(fast);
+    }
+
+
+    @Override
+    public final IonWriter build(OutputStream out)
+    {
+        _Private_IonTextWriterBuilder b = fillDefaults();
+
+        _Private_FastAppendable fast = new OutputStreamFastAppendable(out);
+
+        return b.build(fast);
+    }
+
+    //=========================================================================
+
+    private static final class Mutable
+        extends _Private_IonTextWriterBuilder
+    {
+        private Mutable() { }
+
+        private Mutable(_Private_IonTextWriterBuilder that)
+        {
+            super(that);
+        }
+
+        @Override
+        public _Private_IonTextWriterBuilder immutable()
+        {
+            return new _Private_IonTextWriterBuilder(this);
+        }
+
+        @Override
+        public _Private_IonTextWriterBuilder mutable()
+        {
+            return this;
+        }
+
+        @Override
+        protected void mutationCheck()
+        {
+        }
+    }
+
+    //-------------------------------------------------------------------------
+
+    /**
+     * Gets the {@link _Private_CallbackBuilder} that will be used to create a
+     * {@link _Private_MarkupCallback} when a new writer is built.
+     * @return The builder that will be used to build a new MarkupCallback.
+     * @see #setCallbackBuilder(_Private_CallbackBuilder)
+     * @see #withCallbackBuilder(_Private_CallbackBuilder)
+     */
+    public final _Private_CallbackBuilder getCallbackBuilder()
+    {
+        return this._callback_builder;
+    }
+
+    /**
+     * Sets the {@link _Private_CallbackBuilder} that will be used to create a
+     * {@link _Private_MarkupCallback} when a new writer is built.
+     * @param builder
+     *            The builder that will be used to build a new MarkupCallback.
+     * @see #getCallbackBuilder()
+     * @see #withCallbackBuilder(_Private_CallbackBuilder)
+     * @throws UnsupportedOperationException
+     *             if this is immutable.
+     */
+    public void setCallbackBuilder(_Private_CallbackBuilder builder)
+    {
+        mutationCheck();
+        this._callback_builder = builder;
+    }
+
+    /**
+     * Declares the {@link _Private_CallbackBuilder} to use when building.
+     * @param builder
+     *            The builder that will be used to build a new MarkupCallback.
+     * @return this instance, if mutable; otherwise a mutable copy of this
+     *         instance.
+     * @see #getCallbackBuilder()
+     * @see #setCallbackBuilder(_Private_CallbackBuilder)
+     */
+    public final _Private_IonTextWriterBuilder
+                 withCallbackBuilder(_Private_CallbackBuilder builder)
+    {
+        _Private_IonTextWriterBuilder b = mutable();
+        b.setCallbackBuilder(builder);
+        return b;
+    }
+}
diff --git a/src/software/amazon/ion/impl/PrivateIonValue.java b/src/com/amazon/ion/impl/_Private_IonValue.java
similarity index 80%
rename from src/software/amazon/ion/impl/PrivateIonValue.java
rename to src/com/amazon/ion/impl/_Private_IonValue.java
index cce85f4188..c81648e350 100644
--- a/src/software/amazon/ion/impl/PrivateIonValue.java
+++ b/src/com/amazon/ion/impl/_Private_IonValue.java
@@ -1,30 +1,30 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
 import java.io.PrintWriter;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
 
 /**
- * @deprecated This is an internal API that is subject to change without notice.
+ * NOT FOR APPLICATION USE!
  */
-@Deprecated
-public interface PrivateIonValue
+public interface _Private_IonValue
     extends IonValue
 {
 
diff --git a/src/software/amazon/ion/impl/PrivateIonWriter.java b/src/com/amazon/ion/impl/_Private_IonWriter.java
similarity index 65%
rename from src/software/amazon/ion/impl/PrivateIonWriter.java
rename to src/com/amazon/ion/impl/_Private_IonWriter.java
index d3a48fd423..519a14f3d1 100644
--- a/src/software/amazon/ion/impl/PrivateIonWriter.java
+++ b/src/com/amazon/ion/impl/_Private_IonWriter.java
@@ -1,37 +1,37 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonWriter;
 import java.io.IOException;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonWriter;
 
 /**
- * @deprecated This is an internal API that is subject to change without notice.
+ * NOT FOR APPLICATION USE!
  */
-@Deprecated
-public interface PrivateIonWriter
+public interface _Private_IonWriter
     extends IonWriter
 {
     /** Mostly for testing at this point, but could be useful public API. */
     IonCatalog getCatalog();
 
     /**
-     * Returns true if the field name has been set either through setFieldName.
-     * This is generally more efficient than calling getFieldName and
-     * checking the return type as it does not need to resolve the
+     * Returns true if the field name has been set either through setFieldName or
+     * setFieldId.  This is generally more efficient than calling getFieldName or
+     * getFieldId and checking the return type as it does not need to resolve the
      * name through a symbol table.  This returns false if the field name has not
      * been set.
      *
@@ -60,6 +60,6 @@ public interface PrivateIonWriter
      */
     void writeIonVersionMarker() throws IOException;
 
-    /** Indicates whether the writer is stream copy optimized through {@link #writeValue(software.amazon.ion.IonReader)}. */
+    /** Indicates whether the writer is stream copy optimized through {@link #writeValue(com.amazon.ion.IonReader)}. */
     public boolean isStreamCopyOptimized();
 }
diff --git a/src/software/amazon/ion/impl/PrivateIonWriterBase.java b/src/com/amazon/ion/impl/_Private_IonWriterBase.java
similarity index 89%
rename from src/software/amazon/ion/impl/PrivateIonWriterBase.java
rename to src/com/amazon/ion/impl/_Private_IonWriterBase.java
index a5cdc96716..b04e4e5ef7 100644
--- a/src/software/amazon/ion/impl/PrivateIonWriterBase.java
+++ b/src/com/amazon/ion/impl/_Private_IonWriterBase.java
@@ -1,39 +1,42 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.UnknownSymbolException;
 import java.io.IOException;
 import java.math.BigDecimal;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
+import java.util.Date;
 
 /**
+ * NOT FOR APPLICATION USE!
+ * <p>
  * Base type for Ion writers.  This handles the writeIonEvents and provides default
  * handlers for the list forms of write.  This also resolves symbols if a symbol
  * table is available (which it will not be if the underlying writer is a system
  * writer).
- *
- * @deprecated This is an internal API that is subject to change without notice.
  */
-@Deprecated
-public abstract class PrivateIonWriterBase
-    implements IonWriter, PrivateReaderWriter
+public abstract class _Private_IonWriterBase
+    implements IonWriter, _Private_ReaderWriter
 {
     protected static final String ERROR_MISSING_FIELD_NAME =
         "IonWriter.setFieldName() must be called before writing a value into a struct.";
@@ -111,9 +114,9 @@ public abstract void setSymbolTable(SymbolTable symbols)
 
 
     /**
-     * Returns true if the field name has been set either through setFieldName.
-     * This is generally more efficient than calling getFieldName and
-     * checking the return type as it does not need to resolve the
+     * Returns true if the field name has been set either through setFieldName or
+     * setFieldId.  This is generally more efficient than calling getFieldName or
+     * getFieldId and checking the return type as it does not need to resolve the
      * name through a symbol table.  This returns false if the field name has not
      * been set.
      * @return true if a field name has been set false otherwise
@@ -246,12 +249,29 @@ public final void writeSymbolToken(SymbolToken tok)
     }
 
 
+    public void writeTimestampUTC(Date value) throws IOException
+    {
+        Timestamp time = Timestamp.forDateZ(value);
+        writeTimestamp(time);
+    }
+
+
+
     //
     //  default value and reader implementations.
     //  note that these could be optimized, especially
     //  the reader versions, when the reader is of the
     //  same format as the writer.
     //
+    @Deprecated
+    public void writeValue(IonValue value) throws IOException
+    {
+        if (value != null)
+        {
+            value.writeTo(this);
+        }
+    }
+
     public void writeValues(IonReader reader) throws IOException
     {
         if (reader.getDepth() == 0) {
@@ -260,10 +280,10 @@ public void writeValues(IonReader reader) throws IOException
 
         if (reader.getType() == null) reader.next();
 
-        if (getDepth() == 0 && reader instanceof PrivateReaderWriter) {
+        if (getDepth() == 0 && reader instanceof _Private_ReaderWriter) {
             // Optimize symbol table copying
-            PrivateReaderWriter private_reader =
-                (PrivateReaderWriter)reader;
+            _Private_ReaderWriter private_reader =
+                (_Private_ReaderWriter)reader;
             while (reader.getType() != null) {
                 transfer_symbol_tables(private_reader);
                 writeValue(reader);
@@ -278,7 +298,7 @@ public void writeValues(IonReader reader) throws IOException
         }
     }
 
-    private final void transfer_symbol_tables(PrivateReaderWriter reader)
+    private final void transfer_symbol_tables(_Private_ReaderWriter reader)
         throws IOException
     {
         SymbolTable reader_symbols = reader.pop_passed_symbol_table();
@@ -468,4 +488,10 @@ public final SymbolTable pop_passed_symbol_table()
         _symbol_table_stack[_symbol_table_top] = null;
         return symbols;
     }
+
+    public <T> T asFacet(Class<T> facetType)
+    {
+        // This implementation has no facets.
+        return null;
+    }
 }
diff --git a/src/software/amazon/ion/impl/PrivateIonWriterFactory.java b/src/com/amazon/ion/impl/_Private_IonWriterFactory.java
similarity index 71%
rename from src/software/amazon/ion/impl/PrivateIonWriterFactory.java
rename to src/com/amazon/ion/impl/_Private_IonWriterFactory.java
index 8aaeabcf27..b02b8dfc94 100644
--- a/src/software/amazon/ion/impl/PrivateIonWriterFactory.java
+++ b/src/com/amazon/ion/impl/_Private_IonWriterFactory.java
@@ -1,33 +1,33 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
 
 /**
+ * NOT FOR APPLICATION USE!
+ * <p>
  * This is the factory class for constructing writers with various capabilities.
- *
- * @deprecated This is an internal API that is subject to change without notice.
  */
-@Deprecated
-public final class PrivateIonWriterFactory
+public final class _Private_IonWriterFactory
 {
     /**
      * @param container must not be null.
diff --git a/src/software/amazon/ion/impl/PrivateListWriter.java b/src/com/amazon/ion/impl/_Private_ListWriter.java
similarity index 60%
rename from src/software/amazon/ion/impl/PrivateListWriter.java
rename to src/com/amazon/ion/impl/_Private_ListWriter.java
index 5d65340c08..71eb97c1a8 100644
--- a/src/software/amazon/ion/impl/PrivateListWriter.java
+++ b/src/com/amazon/ion/impl/_Private_ListWriter.java
@@ -1,29 +1,29 @@
 /*
- * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.IonWriter;
 import java.io.IOException;
-import software.amazon.ion.IonWriter;
 
 /**
+ * NOT FOR APPLICATION USE!
+ * <p>
  * An IonWriter that has optimized list-writing.
- *
- * @deprecated This is an internal API that is subject to change without notice.
  */
-@Deprecated
-public interface PrivateListWriter
+public interface _Private_ListWriter
     extends IonWriter
 {
     public void writeBoolList(boolean[] values)throws IOException;
diff --git a/src/software/amazon/ion/impl/PrivateLocalSymbolTableFactory.java b/src/com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java
similarity index 81%
rename from src/software/amazon/ion/impl/PrivateLocalSymbolTableFactory.java
rename to src/com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java
index 2e1121f699..ad6c5f47c4 100644
--- a/src/software/amazon/ion/impl/PrivateLocalSymbolTableFactory.java
+++ b/src/com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java
@@ -1,23 +1,24 @@
 /*
- * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
 
 /**
  * NOT FOR APPLICATION USE
@@ -33,7 +34,7 @@
  * too.
  */
 @SuppressWarnings("javadoc")
-public interface PrivateLocalSymbolTableFactory
+public interface _Private_LocalSymbolTableFactory
 {
     /**
      * Constructs a new local symbol table represented by the current value of
@@ -77,4 +78,4 @@ public SymbolTable newLocalSymtab(IonCatalog catalog,
      */
     public SymbolTable newLocalSymtab(SymbolTable defaultSystemSymtab,
                                       SymbolTable... imports);
-}
+}
\ No newline at end of file
diff --git a/src/com/amazon/ion/impl/_Private_MarkupCallback.java b/src/com/amazon/ion/impl/_Private_MarkupCallback.java
new file mode 100644
index 0000000000..dabbd4e205
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_MarkupCallback.java
@@ -0,0 +1,352 @@
+
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolToken;
+
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.util._Private_FastAppendable;
+import java.io.IOException;
+
+/**
+ * NOT FOR APPLICATION USE!
+ *
+ *
+ * Callback for giving users the ability to inject markup into their Ion
+ * documents.
+ * <p>
+ * Customers who want to inject markup into their Ion documents will need to
+ * extend {@link _Private_MarkupCallback}, implement {@link _Private_CallbackBuilder} to build new
+ * instances, and pass an instance of their {@link _Private_CallbackBuilder} into
+ * {@link IonTextWriterBuilder#setCallbackBuilder(_Private_CallbackBuilder)} or
+ * {@link IonTextWriterBuilder#withCallbackBuilder(_Private_CallbackBuilder)}
+ * </p>
+ * <p>
+ * Note: It is only necessary for subclasses to implement methods they're using
+ * to inject markup.
+ * </p>
+ * <p>
+ * When all method are called, they are called with (at least) an
+ * {@link IonType} that represents either the type of data being written or the
+ * container type that the writer is writing, or currently inside.
+ * before/afterFieldName and before/afterEachAnnotation get, respectively, the
+ * field name and annotation that is being written. Methods can use
+ * {@link #myAppendable} access the output stream.
+ * </p>
+ * <h3>Example Calls</h3>
+ * <p>
+ * Here are some example call patterns, using the following syntax to show where
+ * calls will be executed (whitespace is used to increase readability):
+ *
+ * <pre>
+ * &lt;methodName TYPE&gt;
+ * </pre>
+ *
+ * </p>
+ * <p>
+ * Input:
+ *
+ * <pre>
+ * { cookies:"Chocolate Chip" }
+ * </pre>
+ *
+ * Output:
+ *
+ * <pre>
+ * &lt;beforeData STRUCT&gt;{&lt;afterStepIn STRUCT&gt;
+ *     &lt;beforeFieldName STRING "cookies"&gt; cookies &lt;afterFieldName STRING "cookies"&gt;:&lt;beforeData STRING&gt; "Chocolate Chip" &lt;afterData STRING&gt;
+ * &lt;beforeStepOut STRUCT&gt;}&lt;afterData STRUCT&gt;
+ * </pre>
+ *
+ * </p>
+ * <p>
+ * Input:
+ *
+ * <pre>
+ * anno1::anno2::{
+ *   fname:"John",
+ *   lname:"Smith",
+ *   age:32.785
+ * }
+ * </pre>
+ *
+ * Output:
+ *
+ * <pre>
+ * &lt;beforeAnnotations STRUCT&gt;
+ *   &lt;beforeEachAnnotation STRUCT "anno1"&gt;anno1&lt;afterEachAnnotation STRUCT "anno1"&gt;::
+ *   &lt;beforeEachAnnotation STRUCT "anno2"&gt;anno2&lt;afterEachAnnotation STRUCT "anno2"&gt;::
+ * &lt;afterAnnotations STRUCT&gt;
+ * &lt;beforeData STRUCT&gt;{&lt;afterStepIn STRUCT&gt;
+ *     &lt;beforeFieldName STRING "fname"&gt;fname&lt;afterFieldName STRING "fname"&gt;:&lt;beforeData STRING&gt;"John"&lt;afterData STRING&gt;&lt;beforeSeparator STRUCT&gt;,&lt;afterSeparator STRUCT&gt;
+ *     &lt;beforeFieldName STRING "lname"&gt;lname&lt;afterFieldName STRING "lname"&gt;:&lt;beforeData STRING&gt;"Smith"&lt;afterData STRING&gt;&lt;beforeSeparator STRUCT&gt;,&lt;afterSeparator STRUCT&gt;
+ *     &lt;beforeFieldName DECIMAL "age"&gt;age&lt;afterFieldName DECIMAL "age"&gt;:&lt;beforeData DECIMAL&gt;32.785&lt;afterData DECIMAL&gt;
+ * &lt;beforeStepOut STRUCT&gt;}&lt;afterData STRUCT&gt;
+ * </pre>
+ *
+ * </p>
+ * <p>
+ * Input:
+ *
+ * <pre>
+ * (where (field (this) result) (== (field (curr) majorVersionString) "1.0"))
+ * </pre>
+ *
+ * Output:
+ *
+ * <pre>
+ * &lt;beforeData SEXP&gt;(&lt;afterStepIn SEXP&gt;
+ *     &lt;beforeData SYMBOL&gt;where&lt;afterData SYMBOL&gt;&lt;beforeSeparator SEXP&gt; &lt;afterSeparator SEXP&gt;
+ *     &lt;beforeData SEXP&gt;(&lt;afterStepIn SEXP&gt;
+ *         &lt;beforeData SYMBOL&gt;field&lt;afterData SYMBOL&gt;&lt;beforeSeparator SEXP&gt; &lt;afterSeparator SEXP&gt;
+ *         &lt;beforeData SEXP&gt;(&lt;afterStepIn SEXP&gt;
+ *             &lt;beforeData SYMBOL&gt;this&lt;afterData SYMBOL&gt;
+ *         &lt;beforeStepOut SEXP&gt;)&lt;afterData SEXP&gt;&lt;beforeSeparator SEXP&gt; &lt;afterSeparator SEXP&gt;
+ *         &lt;beforeData SYMBOL&gt;result&lt;afterData SYMBOL&gt;
+ *     &lt;beforeStepOut SEXP&gt;)&lt;afterData SEXP&gt;&lt;beforeSeparator SEXP&gt; &lt;afterSeparator SEXP&gt;
+ *     &lt;beforeData SEXP&gt;(&lt;afterStepIn SEXP&gt;
+ *         &lt;beforeData SYMBOL&gt;==&lt;afterData SYMBOL&gt;&lt;beforeSeparator SEXP&gt; &lt;afterSeparator SEXP&gt;
+ *         &lt;beforeData SEXP&gt;(&lt;afterStepIn SEXP&gt;
+ *             &lt;beforeData SYMBOL&gt;field&lt;afterData SYMBOL&gt;&lt;beforeSeparator SEXP&gt; &lt;afterSeparator SEXP&gt;
+ *             &lt;beforeData SEXP&gt;(&lt;afterStepIn SEXP&gt;
+ *                 &lt;beforeData SYMBOL&gt;curr&lt;afterData SYMBOL&gt;
+ *             &lt;beforeStepOut SEXP&gt;)&lt;afterData SEXP&gt;&lt;beforeSeparator SEXP&gt; &lt;afterSeparator SEXP&gt;
+ *             &lt;beforeData SYMBOL&gt;majorVersionString&lt;afterData SYMBOL&gt;
+ *         &lt;beforeStepOut SEXP&gt;)&lt;afterData SEXP&gt;&lt;beforeSeparator SEXP&gt; &lt;afterSeparator SEXP&gt;
+ *         &lt;beforeData STRING&gt;"1.0"&lt;afterData STRING&gt;
+ *     &lt;beforeStepOut SEXP&gt;)&lt;afterData SEXP&gt;
+ * &lt;beforeStepOut SEXP&gt;)&lt;afterData SEXP&gt;
+ * </pre>
+ *
+ * </p>
+ * <p>
+ * Input:
+ *
+ * <pre>
+ * 1 5 "Cheesecake" 3.2 true null 'baby tigers' 47e1
+ * </pre>
+ *
+ * Output:
+ *
+ * <pre>
+ * &lt;beforeData INT&gt;1&lt;afterData INT&gt;&lt;beforeSeparator DATAGRAM&gt; &lt;afterSeparator DATAGRAM&gt;
+ * &lt;beforeData INT&gt;5&lt;afterData INT&gt;&lt;beforeSeparator DATAGRAM&gt; &lt;afterSeparator DATAGRAM&gt;
+ * &lt;beforeData STRING&gt;"Cheesecake"&lt;afterData STRING&gt;&lt;beforeSeparator DATAGRAM&gt; &lt;afterSeparator DATAGRAM&gt;
+ * &lt;beforeData DECIMAL&gt;3.2&lt;afterData DECIMAL&gt;&lt;beforeSeparator DATAGRAM&gt; &lt;afterSeparator DATAGRAM&gt;
+ * &lt;beforeData BOOL&gt;true&lt;afterData BOOL&gt;&lt;beforeSeparator DATAGRAM&gt; &lt;afterSeparator DATAGRAM&gt;
+ * &lt;beforeData NULL&gt;null&lt;afterData NULL&gt;&lt;beforeSeparator DATAGRAM&gt; &lt;afterSeparator DATAGRAM&gt;
+ * &lt;beforeData SYMBOL&gt;'baby tigers'&lt;afterData SYMBOL&gt;&lt;beforeSeparator DATAGRAM&gt; &lt;afterSeparator DATAGRAM&gt;
+ * &lt;beforeData FLOAT&gt;470.0e0&lt;afterData FLOAT&gt;
+ * </pre>
+ *
+ * </p>
+ * <p>
+ * Input:
+ *
+ * <pre>
+ * [true, 3.4, 3d6, 2.3e8, "string", '''multi-''' '''string''',Symbol, 'qSymbol',
+ *     {{"clob data"}}, {{YmxvYiBkYXRh}}, 1970-06-06, null.struct]
+ * </pre>
+ *
+ * Output:
+ *
+ * <pre>
+ * &lt;beforeData LIST&gt;[&lt;afterStepIn LIST&gt;
+ *     &lt;beforeData BOOL&gt;true&lt;afterData BOOL&gt;&lt;beforeSeparator LIST&gt;,&lt;afterSeparator LIST&gt;
+ *     &lt;beforeData DECIMAL&gt;3.4&lt;afterData DECIMAL&gt;&lt;beforeSeparator LIST&gt;,&lt;afterSeparator LIST&gt;
+ *     &lt;beforeData DECIMAL&gt;3d6&lt;afterData DECIMAL&gt;&lt;beforeSeparator LIST&gt;,&lt;afterSeparator LIST&gt;
+ *     &lt;beforeData FLOAT&gt;2.3E8&lt;afterData FLOAT&gt;&lt;beforeSeparator LIST&gt;,&lt;afterSeparator LIST&gt;
+ *     &lt;beforeData STRING&gt;"string"&lt;afterData STRING&gt;&lt;beforeSeparator LIST&gt;,&lt;afterSeparator LIST&gt;
+ *     &lt;beforeData STRING&gt;"multi-string"&lt;afterData STRING&gt;&lt;beforeSeparator LIST&gt;,&lt;afterSeparator LIST&gt;
+ *     &lt;beforeData SYMBOL&gt;Symbol&lt;afterData SYMBOL&gt;&lt;beforeSeparator LIST&gt;,&lt;afterSeparator LIST&gt;
+ *     &lt;beforeData SYMBOL&gt;qSymbol&lt;afterData SYMBOL&gt;&lt;beforeSeparator LIST&gt;,&lt;afterSeparator LIST&gt;
+ *     &lt;beforeData CLOB&gt;{{"clob data"}}&lt;afterData CLOB&gt;&lt;beforeSeparator LIST&gt;,&lt;afterSeparator LIST&gt;
+ *     &lt;beforeData BLOB&gt;{{YmxvYiBkYXRh}}&lt;afterData BLOB&gt;&lt;beforeSeparator LIST&gt;,&lt;afterSeparator LIST&gt;
+ *     &lt;beforeData TIMESTAMP&gt;1970-06-06&lt;afterData TIMESTAMP&gt;&lt;beforeSeparator LIST&gt;,&lt;afterSeparator LIST&gt;
+ *     &lt;beforeData NULL&gt;null.struct&lt;afterData NULL&gt;
+ * &lt;beforeStepOut LIST&gt;]&lt;afterData LIST&gt;
+ * </pre>
+ */
+public abstract class _Private_MarkupCallback
+{
+    private final _Private_FastAppendable myAppendable;
+
+    public _Private_MarkupCallback(_Private_FastAppendable appendable)
+    {
+        this.myAppendable = appendable;
+    }
+
+    /**
+     * Gets the {@link _Private_FastAppendable} that IonWriter will use to write its
+     * output.
+     */
+    public final _Private_FastAppendable getAppendable()
+    {
+        return myAppendable;
+    }
+
+    /**
+     * Callback to be executed before an Ion value is written. If iType is a
+     * container type, this is executed before the container's opening
+     * delimiter. To write data after the opening delimiter use
+     * {@link #afterStepIn(IonType)}.
+     * @param iType
+     *            The type of data that will be written.
+     */
+    public void beforeValue(IonType iType)
+        throws IOException
+    {
+    }
+
+    /**
+     * Callback to be executed after an Ion value is written. If iType is a
+     * container type, this is executed after the container's closing delimiter.
+     * To write data before the closing delimiter, use
+     * {@link #beforeStepOut(IonType)}.
+     * @param iType
+     *            The type of data that was written.
+     */
+    public void afterValue(IonType iType)
+        throws IOException
+    {
+    }
+
+    /**
+     * Callback to be executed before a field name is written.
+     * @param iType
+     *            The type of data in the field name's corresponding value.
+     * @param name
+     *            The field name that is being written.
+     */
+    public void beforeFieldName(IonType iType, SymbolToken name)
+        throws IOException
+    {
+    }
+
+    /**
+     * Callback to be executed after a field name is written.
+     * @param iType
+     *            The type of data in the field name's corresponding value.
+     * @param name
+     *            The field name that is being written.
+     */
+    public void afterFieldName(IonType iType, SymbolToken name)
+        throws IOException
+    {
+    }
+
+    /**
+     * Callback to be executed after the opening delimiter of a container is
+     * written. To write data before the opening delimiter, use
+     * {@link #beforeValue(IonType)}.
+     * @param containerType
+     *            The type of container that was just stepped into.
+     */
+    public void afterStepIn(IonType containerType)
+        throws IOException
+    {
+    }
+
+    /**
+     * Callback to be executed before the closing delimiter of a container is
+     * written. To write data after the closing delimiter, use
+     * {@link #afterValue(IonType)}.
+     * @param containerType
+     *            The type of container that is about to be stepped out of.
+     */
+    public void beforeStepOut(IonType containerType)
+        throws IOException
+    {
+    }
+
+    /**
+     * Callback to be executed before a separator is written. Called after the
+     * data has been written, and before the separator. It is called when inside
+     * all container types, including Sexp, and when not inside a container. It
+     * is not called after the last element in a container.
+     * @param containerType
+     *            The type of container the writer is currently in. When writing
+     *            top-level values, the type is DATAGRAM.
+     */
+    public void beforeSeparator(IonType containerType)
+        throws IOException
+    {
+    }
+
+    /**
+     * Callback to be executed after a separator has been written. Called just
+     * after the separator is written. It is called when inside all container
+     * types, including Sexp, and when not inside a container. It is not called
+     * after the last element in a container.
+     * @param containerType
+     *            The type of container the writer is currently in. When writing
+     *            top-level values, the type is DATAGRAM.
+     */
+    public void afterSeparator(IonType containerType)
+        throws IOException
+    {
+    }
+
+    /**
+     * Callback to be executed before annotations are written. It is executed
+     * once per set of annotations.
+     * @param iType
+     *            The type of the data whose annotations are being written.
+     */
+    public void beforeAnnotations(IonType iType)
+        throws IOException
+    {
+    }
+
+    /**
+     * Callback to be executed after annotations are written. It is executed
+     * once per set of annotations.
+     * @param iType
+     *            The type of the data whose annotations are being written.
+     */
+    public void afterAnnotations(IonType iType)
+        throws IOException
+    {
+    }
+
+    /**
+     * Callback to be executed before each annotation is written. It is executed
+     * once per annotation.
+     * @param iType
+     *            The type of the data whose annotation is being written.
+     * @param annotation
+     *            The annotation that is being written.
+     */
+    public void beforeEachAnnotation(IonType iType, SymbolToken annotation)
+        throws IOException
+    {
+    }
+
+    /**
+     * Callback to be executed after each annotation is written. It is executed
+     * once per annotation, before the delimiter.
+     * @param iType
+     *            The type of the data whose annotation is being written.
+     * @param annotation
+     *            The annotation that is being written.
+     */
+    public void afterEachAnnotation(IonType iType, SymbolToken annotation)
+        throws IOException
+    {
+    }
+}
diff --git a/src/com/amazon/ion/impl/_Private_ReaderWriter.java b/src/com/amazon/ion/impl/_Private_ReaderWriter.java
new file mode 100644
index 0000000000..aa91f56298
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_ReaderWriter.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.SymbolTable;
+
+/**
+ * NOT FOR APPLICATION USE!
+ */
+public interface _Private_ReaderWriter
+{
+    public SymbolTable pop_passed_symbol_table();
+}
+
diff --git a/src/software/amazon/ion/impl/PrivateScalarConversions.java b/src/com/amazon/ion/impl/_Private_ScalarConversions.java
similarity index 97%
rename from src/software/amazon/ion/impl/PrivateScalarConversions.java
rename to src/com/amazon/ion/impl/_Private_ScalarConversions.java
index 5c71c1586a..b5cf96aa5b 100644
--- a/src/software/amazon/ion/impl/PrivateScalarConversions.java
+++ b/src/com/amazon/ion/impl/_Private_ScalarConversions.java
@@ -1,33 +1,33 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonType;
+import com.amazon.ion.Timestamp;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IntegerSize;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonType;
-import software.amazon.ion.Timestamp;
 
 /**
- * @deprecated This is an internal API that is subject to change without notice.
+ * NOT FOR APPLICATION USE!
  */
-@Deprecated
-public class PrivateScalarConversions
+public class _Private_ScalarConversions
 {
     public static final class AS_TYPE {
 
@@ -605,7 +605,7 @@ public final boolean can_convert(int new_type) {
         }
 
         public final int get_conversion_fnid(int new_type) {
-            return PrivateScalarConversions.getConversionFnid(_authoritative_type_idx, new_type);
+            return _Private_ScalarConversions.getConversionFnid(_authoritative_type_idx, new_type);
         }
 
         public final void cast(int castfnid) {
@@ -868,7 +868,7 @@ private final void fn_from_timestamp_to_date() {
             add_value_type(AS_TYPE.date_value);
         }
         private final void fn_from_date_to_timestamp() {
-            _timestamp_value = Timestamp.forMillis(_date_value.getTime(), null);
+            _timestamp_value = new Timestamp(_date_value.getTime(), null);
             add_value_type(AS_TYPE.timestamp_value);
         }
     }
diff --git a/src/com/amazon/ion/impl/_Private_SymbolToken.java b/src/com/amazon/ion/impl/_Private_SymbolToken.java
new file mode 100644
index 0000000000..5a2f5930bc
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_SymbolToken.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.SymbolToken;
+
+public interface _Private_SymbolToken
+    extends SymbolToken{
+    /**
+     * Hashes the symboltoken for bucketing.
+     */
+    public int hashCode();
+
+    /**
+     * Compares symboltokens for equality.
+     */
+    public boolean equals(Object other);
+}
diff --git a/src/software/amazon/ion/impl/PrivateSymtabExtendsCache.java b/src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java
similarity index 69%
rename from src/software/amazon/ion/impl/PrivateSymtabExtendsCache.java
rename to src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java
index c333b8be4c..1fc47c9572 100644
--- a/src/software/amazon/ion/impl/PrivateSymtabExtendsCache.java
+++ b/src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java
@@ -1,31 +1,30 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.impl.PrivateUtils.symtabExtends;
+import static com.amazon.ion.impl._Private_Utils.symtabExtends;
 
-import software.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolTable;
 
 /**
  * Cache to reduce unnecessary calls to
- * {@link PrivateUtils#symtabExtends(SymbolTable, SymbolTable)}. This is
+ * {@link _Private_Utils#symtabExtends(SymbolTable, SymbolTable)}. This is
  * only used if the writer is stream copy optimized.
- * @deprecated This is an internal API that is subject to change without notice.
  */
-@Deprecated
-public final class PrivateSymtabExtendsCache
+public final class _Private_SymtabExtendsCache
 {
     private SymbolTable myWriterSymtab;
     private SymbolTable myReaderSymtab;
diff --git a/src/software/amazon/ion/impl/PrivateUtils.java b/src/com/amazon/ion/impl/_Private_Utils.java
similarity index 90%
rename from src/software/amazon/ion/impl/PrivateUtils.java
rename to src/com/amazon/ion/impl/_Private_Utils.java
index f047a87a52..62785fa277 100644
--- a/src/software/amazon/ion/impl/PrivateUtils.java
+++ b/src/com/amazon/ion/impl/_Private_Utils.java
@@ -1,33 +1,47 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.SystemSymbols.IMPORTS;
-import static software.amazon.ion.SystemSymbols.IMPORTS_SID;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.MAX_ID;
-import static software.amazon.ion.SystemSymbols.MAX_ID_SID;
-import static software.amazon.ion.SystemSymbols.NAME;
-import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.SystemSymbols.SYMBOLS;
-import static software.amazon.ion.SystemSymbols.SYMBOLS_SID;
-import static software.amazon.ion.SystemSymbols.VERSION;
-import static software.amazon.ion.SystemSymbols.VERSION_SID;
-import static software.amazon.ion.util.IonStreamUtils.isIonBinary;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.SystemSymbols.IMPORTS;
+import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.MAX_ID;
+import static com.amazon.ion.SystemSymbols.MAX_ID_SID;
+import static com.amazon.ion.SystemSymbols.NAME;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.SystemSymbols.SYMBOLS;
+import static com.amazon.ion.SystemSymbols.SYMBOLS_SID;
+import static com.amazon.ion.SystemSymbols.VERSION;
+import static com.amazon.ion.SystemSymbols.VERSION_SID;
+import static com.amazon.ion.util.IonStreamUtils.isIonBinary;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SubstituteSymbolTableException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.ValueFactory;
+import com.amazon.ion.impl.IonBinary.BufferManager;
+import com.amazon.ion.impl.IonBinary.Reader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -45,24 +59,18 @@
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 import java.util.TimeZone;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SubstituteSymbolTableException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.ValueFactory;
 
 /**
- * @deprecated This is an internal API that is subject to change without notice.
+ * NOT FOR APPLICATION USE!
  */
-@Deprecated
-public final class PrivateUtils
+public final class _Private_Utils
 {
+    /**
+     * Marker for code points relevant to removal of IonReader.hasNext().
+     */
+    public static final boolean READER_HASNEXT_REMOVED = false;
+
+
     /** Just a zero-length byte array, used to avoid allocation. */
     public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
 
@@ -72,6 +80,17 @@ public final class PrivateUtils
     /** Just a zero-length int array, used to avoid allocation. */
     public final static int[] EMPTY_INT_ARRAY = new int[0];
 
+    /**
+     * (null.timestamp) requires 11 ASCII chars to distinguish from
+     * (null.timestamps) aka (null '.' 'timestamps')
+     *
+     * @see IonCharacterReader#DEFAULT_BUFFER_SIZE
+     * @see IonCharacterReader#BUFFER_PADDING
+     */
+    public static final int MAX_LOOKAHEAD_UTF16 = 11;
+
+
+
     public static final String ASCII_CHARSET_NAME = "US-ASCII";
 
     public static final Charset ASCII_CHARSET =
@@ -189,7 +208,7 @@ public static SymbolTokenImpl newSymbolToken(int sid)
     public static SymbolToken newSymbolToken(SymbolTable symtab,
                                              String text)
     {
-        // TODO amzn/ion-java#21 symtab should not be null
+        // TODO amzn/ion-java/issues/21 symtab should not be null
         text.getClass(); // quick null check
 
         SymbolToken tok = (symtab == null ? null : symtab.find(text));
@@ -208,7 +227,7 @@ public static SymbolToken newSymbolToken(SymbolTable symtab,
     {
         if (sid < 1) throw new IllegalArgumentException();
 
-        // TODO amzn/ion-java#21 symtab should not be null
+        // TODO amzn/ion-java/issues/21 symtab should not be null
         String text = (symtab == null ? null : symtab.findKnownSymbol(sid));
         return new SymbolTokenImpl(text, sid);
     }
@@ -269,7 +288,7 @@ public static SymbolToken localize(SymbolTable symtab,
         String text = sym.getText();
         int sid = sym.getSid();
 
-        if (symtab != null)  // TODO amzn/ion-java#21 require symtab
+        if (symtab != null)  // TODO amzn/ion-java/issues/21 require symtab
         {
             if (text == null)
             {
@@ -338,7 +357,7 @@ public static void localize(SymbolTable symtab,
      */
     public static String[] toStrings(SymbolToken[] symbols, int count)
     {
-        if (count == 0) return PrivateUtils.EMPTY_STRING_ARRAY;
+        if (count == 0) return _Private_Utils.EMPTY_STRING_ARRAY;
 
         String[] annotations = new String[count];
         for (int i = 0; i < count; i++)
@@ -356,7 +375,7 @@ public static String[] toStrings(SymbolToken[] symbols, int count)
 
     public static int[] toSids(SymbolToken[] symbols, int count)
     {
-        if (count == 0) return PrivateUtils.EMPTY_INT_ARRAY;
+        if (count == 0) return _Private_Utils.EMPTY_INT_ARRAY;
 
         int[] sids = new int[count];
         for (int i = 0; i < count; i++)
@@ -584,11 +603,22 @@ public static byte[] loadFileBytes(File file)
     public static String utf8FileToString(File file)
         throws IonException, IOException
     {
-        byte[] utf8Bytes = PrivateUtils.loadFileBytes(file);
+        byte[] utf8Bytes = _Private_Utils.loadFileBytes(file);
         String s = utf8(utf8Bytes);
         return s;
     }
 
+    public static byte[] loadStreamBytes(InputStream in)
+        throws IOException
+    {
+        BufferManager buffer = new BufferManager(in);
+        Reader bufReader = buffer.reader();
+        bufReader.sync();
+        bufReader.setPosition(0);
+        byte[] bytes = bufReader.getBytes();
+        return bytes;
+    }
+
 
     public static String loadReader(java.io.Reader in)
         throws IOException
@@ -611,10 +641,10 @@ public static boolean streamIsIonBinary(PushbackInputStream pushback)
         throws IonException, IOException
     {
         boolean isBinary = false;
-        byte[] cookie = new byte[PrivateIonConstants.BINARY_VERSION_MARKER_SIZE];
+        byte[] cookie = new byte[_Private_IonConstants.BINARY_VERSION_MARKER_SIZE];
 
         int len = readFully(pushback, cookie);
-        if (len == PrivateIonConstants.BINARY_VERSION_MARKER_SIZE) {
+        if (len == _Private_IonConstants.BINARY_VERSION_MARKER_SIZE) {
             isBinary = isIonBinary(cookie);
         }
         if (len > 0) {
@@ -644,7 +674,7 @@ public static Iterator<IonValue> iterate(ValueFactory valueFactory,
      *
      * @return boolean true if v can be a local symbol table otherwise false
      */
-    public static boolean valueIsLocalSymbolTable(PrivateIonValue v)
+    public static boolean valueIsLocalSymbolTable(_Private_IonValue v)
     {
         return (v instanceof IonStruct
                 && v.findTypeAnnotation(ION_SYMBOL_TABLE) == 0);
@@ -737,13 +767,6 @@ public static SymbolTable newSharedSymtab(String name,
                                                       symbols);
     }
 
-    public static SymbolTable newSubstituteSymtab(SymbolTable original,
-                                                  int version,
-                                                  int maxId)
-    {
-        return new SubstituteSymbolTable(original, version, maxId);
-    }
-
 
     /**
      * Creates a mutable copy of this local symbol table. The cloned table
@@ -805,13 +828,13 @@ public static SymbolTable copyLocalSymbolTable(SymbolTable symtab)
      *             {@value LocalSymbolTable#DEFAULT_LST_FACTORY}.
      */
     @Deprecated
-    public static PrivateLocalSymbolTableFactory newLocalSymbolTableAsStructFactory(ValueFactory imageFactory)
+    public static _Private_LocalSymbolTableFactory newLocalSymbolTableAsStructFactory(ValueFactory imageFactory)
     {
         return new LocalSymbolTableAsStruct.Factory(imageFactory);
     }
 
     /**
-     * Returns a minimal symtab, either system or local depending on the
+     * Returns a minimal symtab that, either system or local depending on the
      * given values, that supports representation as an IonStruct. If the
      * imports are empty, the default system symtab is returned.
      *
@@ -825,7 +848,7 @@ public static PrivateLocalSymbolTableFactory newLocalSymbolTableAsStructFactory(
      * The first (and only the first) may be a system table, in which case the
      * {@code defaultSystemSymtab} is ignored.
      */
-    public static SymbolTable initialSymtab(PrivateLocalSymbolTableFactory lstFactory,
+    public static SymbolTable initialSymtab(_Private_LocalSymbolTableFactory lstFactory,
                                             SymbolTable defaultSystemSymtab,
                                             SymbolTable... imports)
     {
@@ -843,6 +866,7 @@ public static SymbolTable initialSymtab(PrivateLocalSymbolTableFactory lstFactor
     }
 
 
+    @SuppressWarnings("deprecation")
     /**
      * Trampoline to
      * {@link LocalSymbolTableAsStruct#getIonRepresentation()};
@@ -935,7 +959,7 @@ public static boolean symtabExtends(SymbolTable superset, SymbolTable subset)
         // If the subset's symtab is a system symtab, the superset's is always
         // an extension of the subset's as system symtab-ness is irrelevant to
         // the conditions for copy opt. to be safe.
-        // TODO amzn/ion-java#24 System symtab-ness ARE relevant if there's multiple
+        // TODO amzn/ion-java/issues/24 System symtab-ness ARE relevant if there's multiple
         //      versions.
         if (subset.isSystemTable()) return true;
 
@@ -1055,7 +1079,7 @@ public static final Iterator<String> stringIterator(String... values)
     {
         if (values == null || values.length == 0)
         {
-            return PrivateUtils.<String>emptyIterator();
+            return _Private_Utils.<String>emptyIterator();
         }
         return new StringIterator(values, values.length);
     }
@@ -1064,7 +1088,7 @@ public static final Iterator<String> stringIterator(String[] values, int len)
     {
         if (values == null || values.length == 0 || len == 0)
         {
-            return PrivateUtils.<String>emptyIterator();
+            return _Private_Utils.<String>emptyIterator();
         }
         return new StringIterator(values, len);
     }
@@ -1104,7 +1128,7 @@ public static final Iterator<Integer> intIterator(int... values)
     {
         if (values == null || values.length == 0)
         {
-            return PrivateUtils.<Integer>emptyIterator();
+            return _Private_Utils.<Integer>emptyIterator();
         }
         return new IntIterator(values);
     }
@@ -1113,15 +1137,11 @@ public static final Iterator<Integer> intIterator(int[] values, int len)
     {
         if (values == null || values.length == 0 || len == 0)
         {
-            return PrivateUtils.<Integer>emptyIterator();
+            return _Private_Utils.<Integer>emptyIterator();
         }
         return new IntIterator(values, 0, len);
     }
 
-
-    //========================================================================
-
-
     public static void writeAsBase64(InputStream byteStream, Appendable out)
         throws IOException
     {
@@ -1133,4 +1153,12 @@ public static void writeAsBase64(InputStream byteStream, Appendable out)
             out.append((char) c);
         }
     }
+
+    public static SymbolTable newSubstituteSymtab(SymbolTable original,
+                                                  int version,
+                                                  int maxId)
+    {
+        return new SubstituteSymbolTable(original, version, maxId);
+    }
+
 }
diff --git a/src/software/amazon/ion/impl/PrivateValueFactory.java b/src/com/amazon/ion/impl/_Private_ValueFactory.java
similarity index 50%
rename from src/software/amazon/ion/impl/PrivateValueFactory.java
rename to src/com/amazon/ion/impl/_Private_ValueFactory.java
index e4e2517ee5..304123f99b 100644
--- a/src/software/amazon/ion/impl/PrivateValueFactory.java
+++ b/src/com/amazon/ion/impl/_Private_ValueFactory.java
@@ -1,23 +1,24 @@
 /*
- * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.ValueFactory;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.ValueFactory;
 
-public interface PrivateValueFactory extends ValueFactory
+public interface _Private_ValueFactory extends ValueFactory
 {
     /**
      * Gets the {@link LocalSymbolTableAsStruct.Factory} associated with this
@@ -28,5 +29,5 @@ public interface PrivateValueFactory extends ValueFactory
      * @return a LocalSymbolTableAsStruct.Factory; never null.
      */
     @SuppressWarnings("javadoc")
-    public PrivateLocalSymbolTableFactory getLstFactory();
+    public _Private_LocalSymbolTableFactory getLstFactory();
 }
diff --git a/src/software/amazon/ion/impl/bin/AbstractIonWriter.java b/src/com/amazon/ion/impl/bin/AbstractIonWriter.java
similarity index 66%
rename from src/software/amazon/ion/impl/bin/AbstractIonWriter.java
rename to src/com/amazon/ion/impl/bin/AbstractIonWriter.java
index 2728ee05d6..0fe57ed210 100644
--- a/src/software/amazon/ion/impl/bin/AbstractIonWriter.java
+++ b/src/com/amazon/ion/impl/bin/AbstractIonWriter.java
@@ -1,37 +1,39 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
-
+package com.amazon.ion.impl.bin;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl._Private_ByteTransferReader;
+import com.amazon.ion.impl._Private_ByteTransferSink;
+import com.amazon.ion.impl._Private_IonWriter;
+import com.amazon.ion.impl._Private_SymtabExtendsCache;
+import com.amazon.ion.impl._Private_Utils;
 import java.io.IOException;
 import java.math.BigInteger;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.impl.PrivateByteTransferReader;
-import software.amazon.ion.impl.PrivateByteTransferSink;
-import software.amazon.ion.impl.PrivateIonWriter;
-import software.amazon.ion.impl.PrivateSymtabExtendsCache;
-import software.amazon.ion.impl.PrivateUtils;
+import java.util.Date;
 
 /** Common adapter for binary {@link IonWriter} implementations. */
-/*package*/ abstract class AbstractIonWriter implements PrivateIonWriter, PrivateByteTransferSink
+/*package*/ abstract class AbstractIonWriter implements _Private_IonWriter, _Private_ByteTransferSink
 {
     /*package*/ enum WriteValueOptimization
     {
@@ -40,12 +42,12 @@
     }
 
     /** The cache for copy optimization checks--null if not copy optimized. */
-    private final PrivateSymtabExtendsCache symtabExtendsCache;
+    private final _Private_SymtabExtendsCache symtabExtendsCache;
 
     /*package*/ AbstractIonWriter(final WriteValueOptimization optimization)
     {
         this.symtabExtendsCache = optimization == WriteValueOptimization.COPY_OPTIMIZED
-            ? new PrivateSymtabExtendsCache() : null;
+            ? new _Private_SymtabExtendsCache() : null;
     }
 
     public final void writeValue(final IonValue value) throws IOException
@@ -54,7 +56,7 @@ public final void writeValue(final IonValue value) throws IOException
         {
             if (value instanceof IonDatagram)
             {
-                // XXX this is a hack to make the writer consistent with the legacy implementations and flush out an IVM
+                // XXX this is a hack to make the writer consistent with legacy implementations and flush out an IVM
                 finish();
             }
             value.writeTo(this);
@@ -67,11 +69,11 @@ public final void writeValue(final IonReader reader) throws IOException
 
         if (isStreamCopyOptimized())
         {
-            final PrivateByteTransferReader transferReader =
-                reader.asFacet(PrivateByteTransferReader.class);
+            final _Private_ByteTransferReader transferReader =
+                reader.asFacet(_Private_ByteTransferReader.class);
 
             if (transferReader != null
-                && (PrivateUtils.isNonSymbolScalar(type)
+                && (_Private_Utils.isNonSymbolScalar(type)
                  || symtabExtendsCache.symtabsCompat(getSymbolTable(), reader.getSymbolTable())))
             {
                 // we have something we can pipe over
@@ -87,9 +89,6 @@ public final void writeValueRecursive(final IonReader reader) throws IOException
     {
         final IonType type = reader.getType();
 
-        // TODO amzn/ion-java#45 make sure the plumbing symbol tokens do the right thing for
-        //      different symbol contexts in the reader and this writer
-
         final SymbolToken fieldName = reader.getFieldNameSymbol();
         if (fieldName != null && !isFieldNameSet() && isInStruct())
         {
@@ -144,8 +143,8 @@ public final void writeValueRecursive(final IonReader reader) throws IOException
                 writeTimestamp(timestampValue);
                 break;
             case SYMBOL:
-                final SymbolToken symbolValue = reader.symbolValue();
-                writeSymbolToken(symbolValue);
+                final SymbolToken symbolToken = reader.symbolValue();
+                writeSymbolToken(symbolToken);
                 break;
             case STRING:
                 final String stringValue = reader.stringValue();
@@ -187,8 +186,38 @@ public final void writeValues(final IonReader reader) throws IOException
         }
     }
 
+    public final void writeTimestampUTC(final Date value) throws IOException
+    {
+        writeTimestamp(Timestamp.forDateZ(value));
+    }
+
     public final boolean isStreamCopyOptimized()
     {
         return symtabExtendsCache != null;
     }
+
+    @SuppressWarnings("deprecation")
+    public <T> T asFacet(Class<T> facetType)
+    {
+        if (facetType == _Private_IonManagedWriter.class)
+        {
+            return facetType.cast(this);
+        }
+        return null; // Consistent with readers' behavior when requested facet isn't supported
+    }
+
+    /**
+     * Writes a portion of the byte array out as an IonString value.  This
+     * copies the portion of the byte array that is written.
+     *
+     * @param data bytes to be written.
+     * May be {@code null} to represent {@code null.string}.
+     * @param offset offset of the first byte in value to write
+     * @param length number of bytes to write from value
+     * @see IonWriter#writeClob(byte[], int, int)
+     * @see IonWriter#writeBlob(byte[], int, int)
+     */
+    public abstract void writeString(byte[] data, int offset, int length)
+        throws IOException;
+
 }
diff --git a/src/software/amazon/ion/impl/bin/AbstractSymbolTable.java b/src/com/amazon/ion/impl/bin/AbstractSymbolTable.java
similarity index 73%
rename from src/software/amazon/ion/impl/bin/AbstractSymbolTable.java
rename to src/com/amazon/ion/impl/bin/AbstractSymbolTable.java
index 6eb1266ac8..a014440c57 100644
--- a/src/software/amazon/ion/impl/bin/AbstractSymbolTable.java
+++ b/src/com/amazon/ion/impl/bin/AbstractSymbolTable.java
@@ -1,36 +1,36 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
-
-import static software.amazon.ion.IonType.LIST;
-import static software.amazon.ion.IonType.STRUCT;
-import static software.amazon.ion.SystemSymbols.IMPORTS_SID;
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE_SID;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
-import static software.amazon.ion.SystemSymbols.MAX_ID_SID;
-import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.SystemSymbols.SYMBOLS_SID;
-import static software.amazon.ion.SystemSymbols.VERSION_SID;
-import static software.amazon.ion.impl.bin.Symbols.systemSymbol;
+package com.amazon.ion.impl.bin;
 
+import static com.amazon.ion.IonType.LIST;
+import static com.amazon.ion.IonType.STRUCT;
+import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
+import static com.amazon.ion.SystemSymbols.MAX_ID_SID;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.SystemSymbols.SYMBOLS_SID;
+import static com.amazon.ion.SystemSymbols.VERSION_SID;
+import static com.amazon.ion.impl.bin.Symbols.systemSymbol;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
 import java.io.IOException;
 import java.util.Iterator;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
 
 /**
  * Provides the basic implementation bits for {@link SymbolTable}.
diff --git a/src/software/amazon/ion/impl/bin/Block.java b/src/com/amazon/ion/impl/bin/Block.java
similarity index 79%
rename from src/software/amazon/ion/impl/bin/Block.java
rename to src/com/amazon/ion/impl/bin/Block.java
index 75a33c3c8e..9f03d2c252 100644
--- a/src/software/amazon/ion/impl/bin/Block.java
+++ b/src/com/amazon/ion/impl/bin/Block.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
+package com.amazon.ion.impl.bin;
 
 import java.io.Closeable;
 
diff --git a/src/software/amazon/ion/impl/bin/BlockAllocator.java b/src/com/amazon/ion/impl/bin/BlockAllocator.java
similarity index 77%
rename from src/software/amazon/ion/impl/bin/BlockAllocator.java
rename to src/com/amazon/ion/impl/bin/BlockAllocator.java
index 43b5d7f6b0..fe6cf1bb13 100644
--- a/src/software/amazon/ion/impl/bin/BlockAllocator.java
+++ b/src/com/amazon/ion/impl/bin/BlockAllocator.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
+package com.amazon.ion.impl.bin;
 
 import java.io.Closeable;
 
diff --git a/src/software/amazon/ion/impl/bin/BlockAllocatorProvider.java b/src/com/amazon/ion/impl/bin/BlockAllocatorProvider.java
similarity index 72%
rename from src/software/amazon/ion/impl/bin/BlockAllocatorProvider.java
rename to src/com/amazon/ion/impl/bin/BlockAllocatorProvider.java
index 140c7987df..8e6ee59691 100644
--- a/src/software/amazon/ion/impl/bin/BlockAllocatorProvider.java
+++ b/src/com/amazon/ion/impl/bin/BlockAllocatorProvider.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
+package com.amazon.ion.impl.bin;
 
 /**
  * Constructs {@link BlockAllocator} instances.  Such instances returned by {@link #vendAllocator(int)}
diff --git a/src/software/amazon/ion/impl/bin/BlockAllocatorProviders.java b/src/com/amazon/ion/impl/bin/BlockAllocatorProviders.java
similarity index 78%
rename from src/software/amazon/ion/impl/bin/BlockAllocatorProviders.java
rename to src/com/amazon/ion/impl/bin/BlockAllocatorProviders.java
index 8f0636a0d9..d9a17423e4 100644
--- a/src/software/amazon/ion/impl/bin/BlockAllocatorProviders.java
+++ b/src/com/amazon/ion/impl/bin/BlockAllocatorProviders.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
+package com.amazon.ion.impl.bin;
 
 /**
  * Utility implementations of {@link BlockAllocatorProvider}.
diff --git a/src/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java b/src/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java
new file mode 100644
index 0000000000..3a5f3e9abf
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.bin;
+
+import com.amazon.ion.IonBinaryWriter;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * Adapts arbitrary {@link IonWriter} implementations to an {@link IonBinaryWriter} instances.
+ * <p>
+ * This class is provided as a shim for compatibility to allow binary writer implementations to be adaptable to
+ * the legacy interface.
+ */
+@Deprecated
+/*package*/ final class IonBinaryWriterAdapter implements IonBinaryWriter
+{
+    /**
+     * Simple interface for constructing an {@link IonWriter} from an output stream.
+     * Essentially used as a polymorphic constructor.
+     */
+    public interface Factory
+    {
+        IonWriter create(final OutputStream out) throws IOException;
+    }
+
+    /** Internal {@link ByteArrayOutputStream} implementation to get access to the buffer. */
+    private static class InternalByteArrayOutputStream extends ByteArrayOutputStream
+    {
+        public byte[] bytes()
+        {
+            return buf;
+        }
+    }
+
+    private final InternalByteArrayOutputStream buffer;
+    private final IonWriter delegate;
+
+    public IonBinaryWriterAdapter(final Factory factory) throws IOException
+    {
+        this.buffer = new InternalByteArrayOutputStream();
+        this.delegate = factory.create(buffer);
+    }
+
+    /*package*/ IonWriter getDelegate()
+    {
+        return delegate;
+    }
+
+    /*package*/ void reset()
+    {
+        buffer.reset();
+    }
+
+    // Adapter Methods
+
+    public int byteSize()
+    {
+        return buffer.size();
+    }
+
+    public byte[] getBytes() throws IOException
+    {
+        return buffer.toByteArray();
+    }
+
+    public int getBytes(byte[] bytes, int offset, int maxlen) throws IOException
+    {
+        final int amount = Math.min(maxlen, buffer.size());
+        System.arraycopy(buffer.bytes(), 0, bytes, offset, amount);
+        return amount;
+    }
+
+    public int writeBytes(OutputStream userstream) throws IOException
+    {
+        buffer.writeTo(userstream);
+        return buffer.size();
+    }
+
+    // Delegates
+
+    public SymbolTable getSymbolTable()
+    {
+        return delegate.getSymbolTable();
+    }
+
+    public void flush() throws IOException
+    {
+        delegate.flush();
+    }
+
+    public void finish() throws IOException
+    {
+        delegate.finish();
+    }
+
+    public void close() throws IOException
+    {
+        delegate.close();
+    }
+
+    public void setFieldName(String name)
+    {
+        delegate.setFieldName(name);
+    }
+
+    public void setFieldNameSymbol(SymbolToken name)
+    {
+        delegate.setFieldNameSymbol(name);
+    }
+
+    public void setTypeAnnotations(String... annotations)
+    {
+        delegate.setTypeAnnotations(annotations);
+    }
+
+    public void setTypeAnnotationSymbols(SymbolToken... annotations)
+    {
+        delegate.setTypeAnnotationSymbols(annotations);
+    }
+
+    public void addTypeAnnotation(String annotation)
+    {
+        delegate.addTypeAnnotation(annotation);
+    }
+
+    public void stepIn(IonType containerType) throws IOException
+    {
+        delegate.stepIn(containerType);
+    }
+
+    public void stepOut() throws IOException
+    {
+        delegate.stepOut();
+    }
+
+    public boolean isInStruct()
+    {
+        return delegate.isInStruct();
+    }
+
+    // Write Methods
+
+    public void writeValue(IonValue value) throws IOException
+    {
+        delegate.writeValue(value);
+    }
+
+    public void writeValue(IonReader reader) throws IOException
+    {
+        delegate.writeValue(reader);
+    }
+
+    public void writeValues(IonReader reader) throws IOException
+    {
+        delegate.writeValues(reader);
+    }
+
+    public void writeNull() throws IOException
+    {
+        delegate.writeNull();
+    }
+
+    public void writeNull(IonType type) throws IOException
+    {
+        delegate.writeNull(type);
+    }
+
+    public void writeBool(boolean value) throws IOException
+    {
+        delegate.writeBool(value);
+    }
+
+    public void writeInt(long value) throws IOException
+    {
+        delegate.writeInt(value);
+    }
+
+    public void writeInt(BigInteger value) throws IOException
+    {
+        delegate.writeInt(value);
+    }
+
+    public void writeFloat(double value) throws IOException
+    {
+        delegate.writeFloat(value);
+    }
+
+    public void writeDecimal(BigDecimal value) throws IOException
+    {
+        delegate.writeDecimal(value);
+    }
+
+    public void writeTimestamp(Timestamp value) throws IOException
+    {
+        delegate.writeTimestamp(value);
+    }
+
+    public void writeTimestampUTC(Date value) throws IOException
+    {
+        delegate.writeTimestampUTC(value);
+    }
+
+    public void writeSymbol(String content) throws IOException
+    {
+        delegate.writeSymbol(content);
+    }
+
+    public void writeSymbolToken(SymbolToken content) throws IOException
+    {
+        delegate.writeSymbolToken(content);
+    }
+
+    public void writeString(String value) throws IOException
+    {
+        delegate.writeString(value);
+    }
+
+    public void writeClob(byte[] value) throws IOException
+    {
+        delegate.writeClob(value);
+    }
+
+    public void writeClob(byte[] value, int start, int len) throws IOException
+    {
+        delegate.writeClob(value, start, len);
+    }
+
+    public void writeBlob(byte[] value) throws IOException
+    {
+        delegate.writeBlob(value);
+    }
+
+    public void writeBlob(byte[] value, int start, int len) throws IOException
+    {
+        delegate.writeBlob(value, start, len);
+    }
+
+    public <T> T asFacet(Class<T> facetType)
+    {
+        // This implementation has no facets.
+        return null;
+    }
+}
diff --git a/src/software/amazon/ion/impl/bin/IonManagedBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
similarity index 92%
rename from src/software/amazon/ion/impl/bin/IonManagedBinaryWriter.java
rename to src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
index 61d77afbc7..e898f2a16a 100644
--- a/src/software/amazon/ion/impl/bin/IonManagedBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
@@ -1,35 +1,44 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
-
+package com.amazon.ion.impl.bin;
+
+import static com.amazon.ion.IonType.LIST;
+import static com.amazon.ion.IonType.STRUCT;
+import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
+import static com.amazon.ion.SystemSymbols.ION_1_0_MAX_ID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
+import static com.amazon.ion.SystemSymbols.MAX_ID_SID;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.SystemSymbols.SYMBOLS_SID;
+import static com.amazon.ion.SystemSymbols.VERSION_SID;
+import static com.amazon.ion.impl.bin.Symbols.symbol;
+import static com.amazon.ion.impl.bin.Symbols.systemSymbol;
+import static com.amazon.ion.impl.bin.Symbols.systemSymbolTable;
+import static com.amazon.ion.impl.bin.Symbols.systemSymbols;
 import static java.util.Collections.unmodifiableList;
-import static software.amazon.ion.IonType.LIST;
-import static software.amazon.ion.IonType.STRUCT;
-import static software.amazon.ion.SystemSymbols.IMPORTS_SID;
-import static software.amazon.ion.SystemSymbols.ION_1_0_MAX_ID;
-import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
-import static software.amazon.ion.SystemSymbols.MAX_ID_SID;
-import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.SystemSymbols.SYMBOLS_SID;
-import static software.amazon.ion.SystemSymbols.VERSION_SID;
-import static software.amazon.ion.impl.bin.Symbols.symbol;
-import static software.amazon.ion.impl.bin.Symbols.systemSymbol;
-import static software.amazon.ion.impl.bin.Symbols.systemSymbolTable;
-import static software.amazon.ion.impl.bin.Symbols.systemSymbols;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.impl.bin.IonRawBinaryWriter.StreamCloseMode;
+import com.amazon.ion.impl.bin.IonRawBinaryWriter.StreamFlushMode;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
@@ -42,19 +51,10 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.impl.bin.IonRawBinaryWriter.StreamCloseMode;
-import software.amazon.ion.impl.bin.IonRawBinaryWriter.StreamFlushMode;
 
 /** Wraps {@link IonRawBinaryWriter} with symbol table management. */
-/*package*/ final class IonManagedBinaryWriter extends AbstractIonWriter
+@SuppressWarnings("deprecation")
+/*package*/ final class IonManagedBinaryWriter extends AbstractIonWriter implements _Private_IonManagedWriter
 {
     private interface SymbolResolver
     {
@@ -439,13 +439,9 @@ public void afterStepOut(final IonManagedBinaryWriter self)
                                 // in case this is intentional
                                 symbols = Symbols.unknownSharedSymbolTable(desc.name, desc.version, desc.maxId);
                             }
-                            final boolean hasDeclaredMaxId = desc.maxId != -1;
-                            final boolean declaredMaxIdMatches = desc.maxId == symbols.getMaxId();
-                            final boolean declaredVersionMatches = desc.version == symbols.getVersion();
-                            if (hasDeclaredMaxId && (!declaredMaxIdMatches || !declaredVersionMatches))
+                            if (desc.maxId != -1 && desc.maxId != symbols.getMaxId())
                             {
-                                // the max ID doesn't match, so we need a substitute
-                                symbols = PrivateUtils.newSubstituteSymtab(symbols, desc.version, desc.maxId);
+                                throw new IllegalArgumentException("Import doesn't match Max ID: " + desc);
                             }
                             self.userImports.add(symbols);
                         }
@@ -641,10 +637,9 @@ public void makeReadOnly()
     private final List<String>                  userSymbols;
     private final ImportDescriptor              userCurrentImport;
 
-    private boolean                             forceSystemOutput;
     private boolean                             closed;
 
-    /*package*/ IonManagedBinaryWriter(final PrivateIonManagedBinaryWriterBuilder builder,
+    /*package*/ IonManagedBinaryWriter(final _Private_IonManagedBinaryWriterBuilder builder,
                                        final OutputStream out)
                                        throws IOException
     {
@@ -677,8 +672,6 @@ public void makeReadOnly()
         this.localsLocked = false;
         this.localSymbolTableView = new LocalSymbolTableView();
         this.symbolState = SymbolState.SYSTEM_SYMBOLS;
-
-        this.forceSystemOutput = false;
         this.closed = false;
 
         this.userState = UserState.NORMAL;
@@ -715,6 +708,11 @@ public void makeReadOnly()
         }
     }
 
+    public _Private_IonRawWriter getRawWriter()
+    {
+        return user;
+    }
+
     // Compatibility with Implementation Writer Interface
 
     public IonCatalog getCatalog()
@@ -889,6 +887,11 @@ public void setFieldNameSymbol(SymbolToken token)
         user.setFieldNameSymbol(token);
     }
 
+    public void requireLocalSymbolTable() throws IOException
+    {
+        startLocalSymbolTableIfNeeded(true);
+    }
+
     public void setTypeAnnotations(final String... annotations)
     {
         if (annotations == null)
@@ -993,14 +996,11 @@ public void writeTimestamp(final Timestamp value) throws IOException
 
     public void writeSymbol(String content) throws IOException
     {
-        final SymbolToken token = intern(content);
-        writeSymbolToken(token);
+        writeSymbolToken(intern(content));
     }
 
-    public void writeSymbolToken(SymbolToken token) throws IOException
-    {
-        token = intern(token);
-        if (token != null && token.getSid() == ION_1_0_SID && user.getDepth() == 0 && !user.hasAnnotations())
+    private boolean handleIVM(int sid) throws IOException {
+        if (user.isIVM(sid))
         {
             if (user.hasWrittenValuesSinceFinished())
             {
@@ -1009,12 +1009,22 @@ public void writeSymbolToken(SymbolToken token) throws IOException
             }
             else
             {
-                // TODO determine if redundant IVM writes need to actually be surfaced
-                // we need to signal that we need to write out the IVM even if nothing else is written
-                forceSystemOutput = true;
+                // no-op the write--we already wrote the IVM for the user
+                // TODO should this not no-op when called multiple times with IVMs?
+                // TODO integrate with all that IVM configuration-fu
             }
+            return true;
+        }
+        return false;
+    }
+
+    public void writeSymbolToken(SymbolToken token) throws IOException
+    {
+        if (token != null && handleIVM(token.getSid()))
+        {
             return;
         }
+        token = intern(token);
         user.writeSymbolToken(token);
     }
 
@@ -1044,6 +1054,12 @@ public void writeBlob(final byte[] data, final int offset, final int length) thr
         user.writeBlob(data, offset, length);
     }
 
+    @Override
+    public void writeString(byte[] data, int offset, int length) throws IOException
+    {
+        user.writeString(data, offset, length);
+    }
+
     public void writeBytes(byte[] data, int off, int len) throws IOException
     {
         // this is a raw transfer--we basically have to dump the symbol table since we don't have much context
@@ -1063,7 +1079,7 @@ public void flush() throws IOException
 
     private void unsafeFlush() throws IOException
     {
-        if (user.hasWrittenValuesSinceFinished() || forceSystemOutput)
+        if (user.hasWrittenValuesSinceFinished())
         {
             // this implies that we have a local symbol table of some sort and the user locked it
             symbolState.closeTable(symbols);
@@ -1071,7 +1087,6 @@ private void unsafeFlush() throws IOException
 
         // make sure that until the local symbol state changes we no-op the table closing routine
         symbolState = SymbolState.LOCAL_SYMBOLS_FLUSHED;
-        forceSystemOutput = false;
         // push the data out
         symbols.finish();
         user.finish();
@@ -1119,4 +1134,5 @@ public void close() throws IOException
             }
         }
     }
+
 }
diff --git a/src/software/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
similarity index 90%
rename from src/software/amazon/ion/impl/bin/IonRawBinaryWriter.java
rename to src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index b8e13d68aa..25d4e145a5 100644
--- a/src/software/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -1,42 +1,51 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
-
+package com.amazon.ion.impl.bin;
+
+import static com.amazon.ion.Decimal.isNegativeZero;
+import static com.amazon.ion.IonType.BLOB;
+import static com.amazon.ion.IonType.BOOL;
+import static com.amazon.ion.IonType.CLOB;
+import static com.amazon.ion.IonType.DECIMAL;
+import static com.amazon.ion.IonType.FLOAT;
+import static com.amazon.ion.IonType.INT;
+import static com.amazon.ion.IonType.LIST;
+import static com.amazon.ion.IonType.NULL;
+import static com.amazon.ion.IonType.SEXP;
+import static com.amazon.ion.IonType.STRING;
+import static com.amazon.ion.IonType.STRUCT;
+import static com.amazon.ion.IonType.SYMBOL;
+import static com.amazon.ion.IonType.TIMESTAMP;
+import static com.amazon.ion.IonType.isContainer;
+import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
+import static com.amazon.ion.Timestamp.Precision.DAY;
+import static com.amazon.ion.Timestamp.Precision.MINUTE;
+import static com.amazon.ion.Timestamp.Precision.MONTH;
+import static com.amazon.ion.Timestamp.Precision.SECOND;
 import static java.lang.Double.doubleToRawLongBits;
 import static java.lang.Float.floatToRawIntBits;
-import static software.amazon.ion.Decimal.isNegativeZero;
-import static software.amazon.ion.IonType.BLOB;
-import static software.amazon.ion.IonType.BOOL;
-import static software.amazon.ion.IonType.CLOB;
-import static software.amazon.ion.IonType.DECIMAL;
-import static software.amazon.ion.IonType.FLOAT;
-import static software.amazon.ion.IonType.INT;
-import static software.amazon.ion.IonType.LIST;
-import static software.amazon.ion.IonType.NULL;
-import static software.amazon.ion.IonType.SEXP;
-import static software.amazon.ion.IonType.STRING;
-import static software.amazon.ion.IonType.STRUCT;
-import static software.amazon.ion.IonType.SYMBOL;
-import static software.amazon.ion.IonType.TIMESTAMP;
-import static software.amazon.ion.IonType.isContainer;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
-import static software.amazon.ion.Timestamp.Precision.DAY;
-import static software.amazon.ion.Timestamp.Precision.MINUTE;
-import static software.amazon.ion.Timestamp.Precision.MONTH;
-import static software.amazon.ion.Timestamp.Precision.SECOND;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
@@ -46,18 +55,12 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.NoSuchElementException;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
 
 /**
  * Low-level binary {@link IonWriter} that understands encoding concerns but doesn't operate with any sense of symbol table management.
  */
-/*package*/ final class IonRawBinaryWriter extends AbstractIonWriter
+@SuppressWarnings("deprecation")
+/*package*/ final class IonRawBinaryWriter extends AbstractIonWriter implements _Private_IonRawWriter
 {
     /** short-hand for array of bytes--useful for static definitions. */
     private static byte[] bytes(int... vals) {
@@ -468,8 +471,8 @@ public String toString()
     private boolean                             hasWrittenValuesSinceFinished;
     private boolean                             hasWrittenValuesSinceConstructed;
 
-    private SymbolToken                 currentFieldName;
-    private final List<SymbolToken>     currentAnnotations;
+    private Integer                 currentFieldSid;
+    private final List<Integer>     currentAnnotationSids;
     // XXX this is for managed detection of TLV that is a LST--this is easier to track here than at the managed level
     private boolean                     hasTopLevelSymbolTableAnnotation;
 
@@ -504,8 +507,8 @@ public String toString()
         this.hasWrittenValuesSinceFinished    = false;
         this.hasWrittenValuesSinceConstructed = false;
 
-        this.currentFieldName                 = null;
-        this.currentAnnotations               = new ArrayList<SymbolToken>();
+        this.currentFieldSid                  = null;
+        this.currentAnnotationSids            = new ArrayList<Integer>();
         this.hasTopLevelSymbolTableAnnotation = false;
 
         this.closed = false;
@@ -525,12 +528,17 @@ public void setFieldName(final String name)
     }
 
     public void setFieldNameSymbol(final SymbolToken name)
+    {
+        setFieldNameSymbol(name.getSid());
+    }
+
+    public void setFieldNameSymbol(int sid)
     {
         if (!isInStruct())
         {
             throw new IonException("Cannot set field name outside of struct context");
         }
-        currentFieldName = name;
+        currentFieldSid = sid;
     }
 
     public void setTypeAnnotations(final String... annotations)
@@ -538,15 +546,32 @@ public void setTypeAnnotations(final String... annotations)
         throw new UnsupportedOperationException("Cannot set annotations on a low-level binary writer via string");
     }
 
-    public void setTypeAnnotationSymbols(final SymbolToken... annotations)
+    private void clearAnnotations()
     {
-        currentAnnotations.clear();
+        currentAnnotationSids.clear();
         hasTopLevelSymbolTableAnnotation = false;
+    }
+
+    public void setTypeAnnotationSymbols(final SymbolToken... annotations)
+    {
+        clearAnnotations();
         if (annotations != null)
         {
             for (final SymbolToken annotation : annotations)
             {
-                addTypeAnnotationSymbol(annotation);
+                addTypeAnnotationSymbol(annotation.getSid());
+            }
+        }
+    }
+
+    public void setTypeAnnotationSymbols(int... sids)
+    {
+        clearAnnotations();
+        if (sids != null)
+        {
+            for (final int sid : sids)
+            {
+                addTypeAnnotationSymbol(sid);
             }
         }
     }
@@ -560,16 +585,22 @@ public void addTypeAnnotation(final String annotation)
 
     /*package*/ void addTypeAnnotationSymbol(final SymbolToken annotation)
     {
-        if (depth == 0 && annotation.getSid() == ION_SYMBOL_TABLE_SID)
+        addTypeAnnotationSymbol(annotation.getSid());
+
+    }
+
+    public void addTypeAnnotationSymbol(int sid)
+    {
+        if (depth == 0 && sid == ION_SYMBOL_TABLE_SID)
         {
             hasTopLevelSymbolTableAnnotation = true;
         }
-        currentAnnotations.add(annotation);
+        currentAnnotationSids.add(sid);
     }
 
     /*package*/ boolean hasAnnotations()
     {
-        return !currentAnnotations.isEmpty();
+        return !currentAnnotationSids.isEmpty();
     }
 
     /** Returns true if a value has been written since construction or {@link #finish()}. */
@@ -591,7 +622,7 @@ public void addTypeAnnotation(final String annotation)
 
     /*package*/ int getFieldId()
     {
-        return currentFieldName.getSid();
+        return currentFieldSid;
     }
 
     // Compatibility with Implementation Writer Interface
@@ -603,7 +634,7 @@ public IonCatalog getCatalog()
 
     public boolean isFieldNameSet()
     {
-        return currentFieldName != null;
+        return currentFieldSid != null;
     }
 
     public void writeIonVersionMarker() throws IOException
@@ -737,31 +768,30 @@ private void writeVarInt(final long value)
         updateLength(len);
     }
 
-    private static int checkSid(SymbolToken symbol)
+    private static void checkSid(int sid)
     {
-        final int sid = symbol.getSid();
         if (sid < 0)
         {
-            throw new IllegalArgumentException("Invalid symbol: " + symbol.getText() + " SID: " + sid);
+            throw new IllegalArgumentException("Invalid symbol with SID: " + sid);
         }
-        return sid;
     }
 
     /** prepare to write values with field name and annotations. */
     private void prepareValue()
     {
-        if (isInStruct() && currentFieldName == null)
+        if (isInStruct() && currentFieldSid == null)
         {
             throw new IllegalStateException("IonWriter.setFieldName() must be called before writing a value into a struct.");
         }
-        if (currentFieldName != null)
+        if (currentFieldSid != null)
         {
-            writeVarUInt(checkSid(currentFieldName));
+            checkSid(currentFieldSid);
+            writeVarUInt(currentFieldSid);
 
             // clear out field name
-            currentFieldName = null;
+            currentFieldSid = null;
         }
-        if (!currentAnnotations.isEmpty())
+        if (!currentAnnotationSids.isEmpty())
         {
             // we have to push a container context for annotations
             updateLength(preallocationMode.typedLength);
@@ -771,16 +801,16 @@ private void prepareValue()
             final long annotationsLengthPosition = buffer.position();
             buffer.writeVarUInt(0L);
             int annotationsLength = 0;
-            for (final SymbolToken symbol : currentAnnotations)
+            for (final int symbol : currentAnnotationSids)
             {
-                final int sid = checkSid(symbol);
-                final int symbolLength = buffer.writeVarUInt(sid);
+                checkSid(symbol);
+                final int symbolLength = buffer.writeVarUInt(symbol);
                 annotationsLength += symbolLength;
             }
             if (annotationsLength > MAX_ANNOTATION_LENGTH)
             {
                 // TODO deal with side patching if we want to support > 32 4-byte symbols annotations... seems excessive
-                throw new IonException("Annotations too large: " + currentAnnotations);
+                throw new IonException("Annotations too large: " + currentAnnotationSids);
             }
 
             // update the annotations size
@@ -789,7 +819,7 @@ private void prepareValue()
             buffer.writeVarUIntDirect1At(annotationsLengthPosition, annotationsLength);
 
             // clear out annotations
-            currentAnnotations.clear();
+            currentAnnotationSids.clear();
             hasTopLevelSymbolTableAnnotation = false;
         }
     }
@@ -824,11 +854,11 @@ public void stepIn(final IonType containerType) throws IOException
 
     public void stepOut() throws IOException
     {
-        if (currentFieldName != null)
+        if (currentFieldSid != null)
         {
             throw new IonException("Cannot step out with field name set");
         }
-        if (!currentAnnotations.isEmpty())
+        if (!currentAnnotationSids.isEmpty())
         {
             throw new IonException("Cannot step out with field name set");
         }
@@ -1193,7 +1223,6 @@ public void writeDecimal(final BigDecimal value) throws IOException
         finishValue();
     }
 
-    @SuppressWarnings("deprecation")
     public void writeTimestamp(final Timestamp value) throws IOException
     {
         if (value == null)
@@ -1249,11 +1278,13 @@ public void writeTimestamp(final Timestamp value) throws IOException
         {
             final int second = value.getZSecond();
             writeVarUInt(second);
-
             final BigDecimal fraction = value.getZFractionalSecond();
-            if (fraction != null && !BigDecimal.ZERO.equals(fraction) && fraction.scale() > -1)
-            {
-                writeDecimalValue(fraction);
+            if (fraction != null) {
+                final BigInteger mantissaBigInt = fraction.unscaledValue();
+                final int exponent = -fraction.scale();
+                if (!(mantissaBigInt.equals(BigInteger.ZERO) && exponent > -1)) {
+                    writeDecimalValue(fraction);
+                }
             }
         }
 
@@ -1275,7 +1306,26 @@ public void writeSymbolToken(final SymbolToken content) throws IOException
             writeNull(IonType.SYMBOL);
             return;
         }
-        final int sid = checkSid(content);
+        writeSymbolToken(content.getSid());
+    }
+
+    boolean isIVM(int sid)
+    {
+        // When SID 2 occurs at the top level with no annotations, it has the
+        // special properties of an IVM. Otherwise, it's considered a normal
+        // symbol value.
+        // TODO amzn/ion-java/issues/88 requires this behavior to be changed,
+        // such that top-level SID 2 is treated as a symbol value, not an IVM.
+        return depth == 0 && sid == ION_1_0_SID && !hasAnnotations();
+    }
+
+    public void writeSymbolToken(int sid) throws IOException
+    {
+        if (isIVM(sid))
+        {
+            throw new IonException("Direct writing of IVM is not supported in low-level binary writer");
+        }
+        checkSid(sid);
         prepareValue();
         writeTypedUInt(SYMBOL_TYPE, sid);
         finishValue();
@@ -1397,6 +1447,19 @@ public void writeBlob(final byte[] data, final int offset, final int length) thr
         finishValue();
     }
 
+    @Override
+    public void writeString(byte[] data, int offset, int length) throws IOException
+    {
+        if (data == null)
+        {
+            writeNull(IonType.STRING);
+            return;
+        }
+        prepareValue();
+        writeTypedBytes(STRING_TYPE, data, offset, length);
+        finishValue();
+    }
+
     /**
      * Writes a raw value into the buffer, updating lengths appropriately.
      * <p>
@@ -1508,4 +1571,5 @@ public void close() throws IOException
             }
         }
     }
+
 }
diff --git a/src/software/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java b/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
similarity index 86%
rename from src/software/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
rename to src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
index 4cc61f491e..831cb4d2ce 100644
--- a/src/software/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
+++ b/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
+package com.amazon.ion.impl.bin;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
diff --git a/src/software/amazon/ion/impl/bin/Symbols.java b/src/com/amazon/ion/impl/bin/Symbols.java
similarity index 83%
rename from src/software/amazon/ion/impl/bin/Symbols.java
rename to src/com/amazon/ion/impl/bin/Symbols.java
index ec298cf224..77540c9ae7 100644
--- a/src/software/amazon/ion/impl/bin/Symbols.java
+++ b/src/com/amazon/ion/impl/bin/Symbols.java
@@ -1,51 +1,52 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
-
+package com.amazon.ion.impl.bin;
+
+import static com.amazon.ion.SystemSymbols.IMPORTS;
+import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
+import static com.amazon.ion.SystemSymbols.ION;
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SystemSymbols.ION_1_0_MAX_ID;
+import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
+import static com.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE_SID;
+import static com.amazon.ion.SystemSymbols.ION_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
+import static com.amazon.ion.SystemSymbols.MAX_ID;
+import static com.amazon.ion.SystemSymbols.MAX_ID_SID;
+import static com.amazon.ion.SystemSymbols.NAME;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.SystemSymbols.SYMBOLS;
+import static com.amazon.ion.SystemSymbols.SYMBOLS_SID;
+import static com.amazon.ion.SystemSymbols.VERSION;
+import static com.amazon.ion.SystemSymbols.VERSION_SID;
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Collections.unmodifiableMap;
-import static software.amazon.ion.SystemSymbols.IMPORTS;
-import static software.amazon.ion.SystemSymbols.IMPORTS_SID;
-import static software.amazon.ion.SystemSymbols.ION;
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.SystemSymbols.ION_1_0_MAX_ID;
-import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
-import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE_SID;
-import static software.amazon.ion.SystemSymbols.ION_SID;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
-import static software.amazon.ion.SystemSymbols.MAX_ID;
-import static software.amazon.ion.SystemSymbols.MAX_ID_SID;
-import static software.amazon.ion.SystemSymbols.NAME;
-import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.SystemSymbols.SYMBOLS;
-import static software.amazon.ion.SystemSymbols.SYMBOLS_SID;
-import static software.amazon.ion.SystemSymbols.VERSION;
-import static software.amazon.ion.SystemSymbols.VERSION_SID;
 
+import com.amazon.ion.IonException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
-import software.amazon.ion.IonException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
 
 /**
  * Utilities for dealing with {@link SymbolToken} and {@link SymbolTable}.
diff --git a/src/software/amazon/ion/impl/bin/WriteBuffer.java b/src/com/amazon/ion/impl/bin/WriteBuffer.java
similarity index 98%
rename from src/software/amazon/ion/impl/bin/WriteBuffer.java
rename to src/com/amazon/ion/impl/bin/WriteBuffer.java
index b5ddb05b72..e3973c56e4 100644
--- a/src/software/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/com/amazon/ion/impl/bin/WriteBuffer.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
+package com.amazon.ion.impl.bin;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -1073,8 +1074,8 @@ public void writeTo(final OutputStream out) throws IOException
     {
         for (int i = 0; i <= index; i++)
         {
-	    Block block = blocks.get(i);
-	    out.write(block.data, 0, block.limit);
+            Block block = blocks.get(i);
+            out.write(block.data, 0, block.limit);
         }
     }
 
diff --git a/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java b/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
new file mode 100644
index 0000000000..a54da159a1
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.bin;
+
+import com.amazon.ion.IonWriter;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+/**
+ * NOT FOR APPLICATION USE!
+ *
+ * Exposes {@link IonRawBinaryWriter} functionality for use when creating Ion hashes.
+ */
+@Deprecated
+public class _PrivateIon_HashTrampoline
+{
+    public static IonWriter newIonWriter(ByteArrayOutputStream baos) throws IOException
+    {
+        return new IonRawBinaryWriter(
+                new PooledBlockAllocatorProvider(),
+                _Private_IonManagedBinaryWriterBuilder.DEFAULT_BLOCK_SIZE,
+                baos,
+                AbstractIonWriter.WriteValueOptimization.NONE,
+                IonRawBinaryWriter.StreamCloseMode.CLOSE,
+                IonRawBinaryWriter.StreamFlushMode.FLUSH,
+                IonRawBinaryWriter.PreallocationMode.PREALLOCATE_0,
+                false     // force floats to be encoded as binary64
+        );
+    }
+}
diff --git a/src/software/amazon/ion/impl/bin/PrivateIonManagedBinaryWriterBuilder.java b/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
similarity index 62%
rename from src/software/amazon/ion/impl/bin/PrivateIonManagedBinaryWriterBuilder.java
rename to src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
index 2443beeb0a..8c1dd6aab9 100644
--- a/src/software/amazon/ion/impl/bin/PrivateIonManagedBinaryWriterBuilder.java
+++ b/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
@@ -1,35 +1,39 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
+package com.amazon.ion.impl.bin;
 
-import static software.amazon.ion.impl.bin.IonManagedBinaryWriter.ONLY_SYSTEM_IMPORTS;
+import static com.amazon.ion.impl.bin.IonManagedBinaryWriter.ONLY_SYSTEM_IMPORTS;
 
+import com.amazon.ion.IonBinaryWriter;
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SubstituteSymbolTableException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.impl.bin.AbstractIonWriter.WriteValueOptimization;
+import com.amazon.ion.impl.bin.IonBinaryWriterAdapter.Factory;
+import com.amazon.ion.impl.bin.IonManagedBinaryWriter.ImportedSymbolContext;
+import com.amazon.ion.impl.bin.IonManagedBinaryWriter.ImportedSymbolResolverMode;
+import com.amazon.ion.impl.bin.IonRawBinaryWriter.PreallocationMode;
+import com.amazon.ion.system.SimpleCatalog;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.List;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SubstituteSymbolTableException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.impl.bin.AbstractIonWriter.WriteValueOptimization;
-import software.amazon.ion.impl.bin.IonManagedBinaryWriter.ImportedSymbolContext;
-import software.amazon.ion.impl.bin.IonManagedBinaryWriter.ImportedSymbolResolverMode;
-import software.amazon.ion.impl.bin.IonRawBinaryWriter.PreallocationMode;
-import software.amazon.ion.system.SimpleCatalog;
 
 // TODO unify this with the IonWriter builder APIs
 
@@ -37,11 +41,9 @@
  * Constructs instances of binary {@link IonWriter}.
  * <p>
  * This class is thread-safe.
- *
- * @deprecated This is an internal API that is subject to change without notice.
  */
-@Deprecated
-public final class PrivateIonManagedBinaryWriterBuilder
+@SuppressWarnings("deprecation")
+public final class _Private_IonManagedBinaryWriterBuilder
 {
     public enum AllocatorMode
     {
@@ -77,7 +79,7 @@ BlockAllocatorProvider createAllocatorProvider()
     /*package*/ volatile SymbolTable            initialSymbolTable;
     /*package*/ volatile boolean                isFloatBinary32Enabled;
 
-    private PrivateIonManagedBinaryWriterBuilder(final BlockAllocatorProvider provider)
+    private _Private_IonManagedBinaryWriterBuilder(final BlockAllocatorProvider provider)
     {
         this.provider = provider;
         this.symbolsBlockSize = DEFAULT_BLOCK_SIZE;
@@ -89,7 +91,7 @@ private PrivateIonManagedBinaryWriterBuilder(final BlockAllocatorProvider provid
         this.isFloatBinary32Enabled = false;
     }
 
-    private PrivateIonManagedBinaryWriterBuilder(final PrivateIonManagedBinaryWriterBuilder other)
+    private _Private_IonManagedBinaryWriterBuilder(final _Private_IonManagedBinaryWriterBuilder other)
     {
         this.provider           = other.provider;
         this.symbolsBlockSize   = other.symbolsBlockSize;
@@ -102,14 +104,14 @@ private PrivateIonManagedBinaryWriterBuilder(final PrivateIonManagedBinaryWriter
         this.isFloatBinary32Enabled = other.isFloatBinary32Enabled;
     }
 
-    public PrivateIonManagedBinaryWriterBuilder copy()
+    public _Private_IonManagedBinaryWriterBuilder copy()
     {
-        return new PrivateIonManagedBinaryWriterBuilder(this);
+        return new _Private_IonManagedBinaryWriterBuilder(this);
     }
 
     // Parameter Setting Methods
 
-    public PrivateIonManagedBinaryWriterBuilder withSymbolsBlockSize(final int blockSize)
+    public _Private_IonManagedBinaryWriterBuilder withSymbolsBlockSize(final int blockSize)
     {
         if (blockSize < 1)
         {
@@ -119,7 +121,7 @@ public PrivateIonManagedBinaryWriterBuilder withSymbolsBlockSize(final int block
         return this;
     }
 
-    public PrivateIonManagedBinaryWriterBuilder withUserBlockSize(final int blockSize)
+    public _Private_IonManagedBinaryWriterBuilder withUserBlockSize(final int blockSize)
     {
         if (blockSize < 1)
         {
@@ -129,7 +131,7 @@ public PrivateIonManagedBinaryWriterBuilder withUserBlockSize(final int blockSiz
         return this;
     }
 
-    public PrivateIonManagedBinaryWriterBuilder withImports(final SymbolTable... tables)
+    public _Private_IonManagedBinaryWriterBuilder withImports(final SymbolTable... tables)
     {
         if (tables != null)
         {
@@ -138,7 +140,7 @@ public PrivateIonManagedBinaryWriterBuilder withImports(final SymbolTable... tab
         return this;
     }
 
-    public PrivateIonManagedBinaryWriterBuilder withImports(final List<SymbolTable> tables)
+    public _Private_IonManagedBinaryWriterBuilder withImports(final List<SymbolTable> tables)
     {
         return withImports(ImportedSymbolResolverMode.DELEGATE, tables);
     }
@@ -147,7 +149,7 @@ public PrivateIonManagedBinaryWriterBuilder withImports(final List<SymbolTable>
      * Adds imports, flattening them to make lookup more efficient.  This is particularly useful
      * when a builder instance is long lived.
      */
-    public PrivateIonManagedBinaryWriterBuilder withFlatImports(final SymbolTable... tables)
+    public _Private_IonManagedBinaryWriterBuilder withFlatImports(final SymbolTable... tables)
     {
         if (tables != null)
         {
@@ -157,51 +159,51 @@ public PrivateIonManagedBinaryWriterBuilder withFlatImports(final SymbolTable...
     }
 
     /** @see #withFlatImports(SymbolTable...) */
-    public PrivateIonManagedBinaryWriterBuilder withFlatImports(final List<SymbolTable> tables)
+    public _Private_IonManagedBinaryWriterBuilder withFlatImports(final List<SymbolTable> tables)
     {
         return withImports(ImportedSymbolResolverMode.FLAT, tables);
     }
 
-    /*package*/ PrivateIonManagedBinaryWriterBuilder withImports(final ImportedSymbolResolverMode mode, final List<SymbolTable> tables) {
+    /*package*/ _Private_IonManagedBinaryWriterBuilder withImports(final ImportedSymbolResolverMode mode, final List<SymbolTable> tables) {
         imports = new ImportedSymbolContext(mode, tables);
         return this;
     }
 
-    /*package*/ PrivateIonManagedBinaryWriterBuilder withPreallocationMode(final PreallocationMode preallocationMode)
+    /*package*/ _Private_IonManagedBinaryWriterBuilder withPreallocationMode(final PreallocationMode preallocationMode)
     {
         this.preallocationMode = preallocationMode;
         return this;
     }
 
-    public PrivateIonManagedBinaryWriterBuilder withPaddedLengthPreallocation(final int pad)
+    public _Private_IonManagedBinaryWriterBuilder withPaddedLengthPreallocation(final int pad)
     {
         this.preallocationMode = PreallocationMode.withPadSize(pad);
         return this;
     }
 
-    public PrivateIonManagedBinaryWriterBuilder withCatalog(final IonCatalog catalog)
+    public _Private_IonManagedBinaryWriterBuilder withCatalog(final IonCatalog catalog)
     {
         this.catalog = catalog;
         return this;
     }
 
-    public PrivateIonManagedBinaryWriterBuilder withStreamCopyOptimization(boolean optimized)
+    public _Private_IonManagedBinaryWriterBuilder withStreamCopyOptimization(boolean optimized)
     {
         this.optimization = optimized ? WriteValueOptimization.COPY_OPTIMIZED : WriteValueOptimization.NONE;
         return this;
     }
 
-    public PrivateIonManagedBinaryWriterBuilder withFloatBinary32Enabled() {
+    public _Private_IonManagedBinaryWriterBuilder withFloatBinary32Enabled() {
         isFloatBinary32Enabled = true;
         return this;
     }
 
-    public PrivateIonManagedBinaryWriterBuilder withFloatBinary32Disabled() {
+    public _Private_IonManagedBinaryWriterBuilder withFloatBinary32Disabled() {
         isFloatBinary32Enabled = false;
         return this;
     }
 
-    public PrivateIonManagedBinaryWriterBuilder withInitialSymbolTable(SymbolTable symbolTable)
+    public _Private_IonManagedBinaryWriterBuilder withInitialSymbolTable(SymbolTable symbolTable)
     {
         if (symbolTable != null)
         {
@@ -243,6 +245,26 @@ public IonWriter newWriter(final OutputStream out) throws IOException
         return new IonManagedBinaryWriter(this, out);
     }
 
+    public IonBinaryWriter newLegacyWriter()
+    {
+        try
+        {
+            return new IonBinaryWriterAdapter(
+                new Factory()
+                {
+                    public IonWriter create(final OutputStream out) throws IOException
+                    {
+                        return newWriter(out);
+                    }
+                }
+            );
+        }
+        catch (final IOException e)
+        {
+            throw new IonException("I/O error", e);
+        }
+    }
+
     // Static Factories
 
     /**
@@ -251,8 +273,8 @@ public IonWriter newWriter(final OutputStream out) throws IOException
      * Builders generally bind to an allocation pool as defined by {@link AllocatorMode}, so applications should reuse
      * them as much as possible.
      */
-    public static PrivateIonManagedBinaryWriterBuilder create(final AllocatorMode allocatorMode)
+    public static _Private_IonManagedBinaryWriterBuilder create(final AllocatorMode allocatorMode)
     {
-        return new PrivateIonManagedBinaryWriterBuilder(allocatorMode.createAllocatorProvider());
+        return new _Private_IonManagedBinaryWriterBuilder(allocatorMode.createAllocatorProvider());
     }
 }
diff --git a/src/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java b/src/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java
new file mode 100644
index 0000000000..b836315bae
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.bin;
+
+import com.amazon.ion.IonWriter;
+import java.io.IOException;
+
+/**
+ * An {@link IonWriter} that manages local symbol tables, while providing access
+ * to its underlying IonRawWriter.
+ *
+ * @deprecated This is a private API subject to change without notice.
+ */
+@Deprecated
+public interface _Private_IonManagedWriter extends IonWriter
+{
+    /**
+     * Get the underlying raw user value writer. This may be used to directly
+     * write user values, field names, and annotations, bypassing any symbol
+     * table management performed by this IonManagedWriter.
+     * @return the {@link _Private_IonRawWriter} responsible for writing this
+     *         IonManagedWriter's user values.
+     */
+    _Private_IonRawWriter getRawWriter();
+
+    /**
+     * If a local symbol table has not already been started by this writer since
+     * it was constructed or last finished, start writing a local symbol table
+     * by opening the struct and declaring the imports. Any local symbols
+     * subsequently written using this IonManagedWriter will be appended as they
+     * are encountered.
+     *
+     * When using the raw writer, a call to this API is required unless one of
+     * the following applies:
+     * <ul>
+     *     <li>The user won't be writing any symbols.</li>
+     *     <li>The user has manually written the symbol table struct to the
+     *         correct raw writer. In this case, making this call would start a
+     *         new (and probably redundant) symbol table context, which is
+     *         wasteful but not harmful.</li>
+     *     <li>The user definitely will be writing more symbols in this context
+     *         using the managed writer.</li>
+     * </ul>
+     * Failing to call this when required will leave the system symbol table as
+     * the active symbol table context for the subsequently written values, which
+     * will lead to missing symbol ID mappings.
+     * @throws IOException
+     */
+    void requireLocalSymbolTable() throws IOException;
+
+}
diff --git a/src/com/amazon/ion/impl/bin/_Private_IonRawWriter.java b/src/com/amazon/ion/impl/bin/_Private_IonRawWriter.java
new file mode 100644
index 0000000000..23ac04186e
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/_Private_IonRawWriter.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.bin;
+
+import com.amazon.ion.IonWriter;
+import java.io.IOException;
+
+/**
+ * An {@link IonWriter} with no symbol table management.
+ *
+ * @deprecated This is a private API subject to change without notice.
+ */
+@Deprecated
+public interface _Private_IonRawWriter extends IonWriter
+{
+    /**
+     * Sets the current field name to the given symbol ID. It is up to the
+     * caller to make sure the given symbol ID has a mapping in the current
+     * context's symbol table. The pending field name symbol is cleared when the
+     * current value is written via stepIn() or one of the write*() methods.
+     * @param sid - a symbol ID
+     */
+    public void setFieldNameSymbol(int sid);
+
+    /**
+     * Sets the full list of pending annotations to the given symbol IDs. Any
+     * pending annotation symbol IDs are cleared. It is up to the caller to make
+     * sure the given symbol IDs have mappings in the current context's symbol
+     * table. The contents of the given array are copied into this writer, so
+     * the caller does not need to preserve the array. The list of pending
+     * annotation symbol IDs is cleared when the current value is written via
+     * stepIn() or one of the write*() methods.
+     * @param sids - symbol IDs representing the annotation symbols for the
+     *               current value
+     */
+    public void setTypeAnnotationSymbols(int... sids);
+
+    /**
+     * Adds the given symbol ID to the list of pending annotation symbol IDs. It
+     * is up to the caller to make sure the given symbol ID has a mapping in the
+     * current context's symbol table. The list of pending annotation symbol IDs
+     * is cleared when the current value is written via stepIn() or one of the
+     * write*() methods.
+     * @param sid - a symbol ID
+     */
+    public void addTypeAnnotationSymbol(int sid);
+
+    /**
+     * Directly write the given symbol ID to represent a symbol value. It is up
+     * to the caller to make sure the given symbol ID has a mapping in the
+     * current context's symbol table.
+     * @param sid - a symbol ID
+     * @throws IOException
+     */
+    public void writeSymbolToken(int sid) throws IOException;
+
+    /**
+     * Writes a portion of the byte array out as an IonString value.  This
+     * copies the portion of the byte array that is written.
+     *
+     * @param data well-formed UTF-8-encoded bytes to be written.
+     * May be {@code null} to represent {@code null.string}.
+     * @param offset offset of the first byte in value to write
+     * @param length number of bytes to write from value
+     * @see IonWriter#writeClob(byte[], int, int)
+     * @see IonWriter#writeBlob(byte[], int, int)
+     */
+    public void writeString(byte[] data, int offset, int length)
+        throws IOException;
+
+}
diff --git a/src/com/amazon/ion/impl/bin/package-info.java b/src/com/amazon/ion/impl/bin/package-info.java
new file mode 100644
index 0000000000..14ec59635e
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/package-info.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * Provides the implementation for the second-generation Ion binary implementation.
+ * At this time, this is limited to a binary {@link com.amazon.ion.IonWriter}.
+ *
+ * <p>
+ * This package limits most of its APIs to package-level access, the public API of note is contained within
+ * the {@link com.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder} which builds instances of
+ * {@link com.amazon.ion.impl.bin.IonManagedBinaryWriter}.  See the below section for what <i>Managed</i> means
+ * in this context.
+ *
+ * <h2>Block API</h2>
+ * A generalized interface for blocks of heap memory are provided via the {@link com.amazon.ion.impl.bin.Block} API.
+ * There are two factory type APIs to actually get a {@link com.amazon.ion.impl.bin.Block} instance:
+ * {@link com.amazon.ion.impl.bin.BlockAllocator} which vend blocks of a particular fixed size
+ * and {@link com.amazon.ion.impl.bin.BlockAllocatorProvider} which creates {@link com.amazon.ion.impl.bin.BlockAllocator}
+ * instances.
+ * <p>
+ * The primary reason for this level of indirection is flexibility for the underlying implementations of {@link com.amazon.ion.impl.bin.Block}
+ * and {@link com.amazon.ion.impl.bin.BlockAllocator}.  These APIs are not required to be thread-safe, whereas
+ * {@link com.amazon.ion.impl.bin.BlockAllocatorProvider} is required to be thread-safe.
+ * <p>
+ * The APIs for {@link com.amazon.ion.impl.bin.BlockAllocator} and {@link com.amazon.ion.impl.bin.Block}
+ * follow the resource pattern (similar in principle to I/O streams), and should be closed when no longer needed
+ * to allow implementation resources to be released or re-used.
+ *
+ * <h2>Raw Binary Ion Writer</h2>
+ * The {@link com.amazon.ion.impl.bin.IonRawBinaryWriter} deals with the low-level encoding considerations of the
+ * Ion format.  The {@link com.amazon.ion.impl.bin.WriteBuffer} is used closely with this implementation to
+ * deal with the Ion <i>sub-field</i> encodings (e.g. <tt>VarInt</tt>, <tt>VarUInt</tt>, and UTF-8).
+ *
+ * <h2>Managed Binary Ion Writer</h2>
+ * The {@link com.amazon.ion.impl.bin.IonManagedBinaryWriter} is layered on top of the {@link com.amazon.ion.impl.bin.IonRawBinaryWriter}.
+ * In particular, it intercepts symbol, annotation, field names and handles the mechanics of symbol table management
+ * transparently to the user.
+ */
+package com.amazon.ion.impl.bin;
\ No newline at end of file
diff --git a/src/software/amazon/ion/impl/lite/ContainerlessContext.java b/src/com/amazon/ion/impl/lite/ContainerlessContext.java
similarity index 72%
rename from src/software/amazon/ion/impl/lite/ContainerlessContext.java
rename to src/com/amazon/ion/impl/lite/ContainerlessContext.java
index 5e41b5a28d..f71fb21726 100644
--- a/src/software/amazon/ion/impl/lite/ContainerlessContext.java
+++ b/src/com/amazon/ion/impl/lite/ContainerlessContext.java
@@ -1,20 +1,21 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
-import software.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolTable;
 
 /**
  * Context for IonValues that are not contained in any Container or Datagram
diff --git a/src/software/amazon/ion/impl/lite/IonBlobLite.java b/src/com/amazon/ion/impl/lite/IonBlobLite.java
similarity index 73%
rename from src/software/amazon/ion/impl/lite/IonBlobLite.java
rename to src/com/amazon/ion/impl/lite/IonBlobLite.java
index a7f899964a..4373d6dcf2 100644
--- a/src/software/amazon/ion/impl/lite/IonBlobLite.java
+++ b/src/com/amazon/ion/impl/lite/IonBlobLite.java
@@ -1,26 +1,28 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.IonBlob;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.ValueVisitor;
+import com.amazon.ion.impl._Private_Utils;
 import java.io.IOException;
 import java.io.InputStream;
-import software.amazon.ion.IonBlob;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.ValueVisitor;
-import software.amazon.ion.impl.PrivateUtils;
+
 
 final class IonBlobLite
     extends IonLobLite
@@ -73,7 +75,7 @@ public void printBase64(Appendable out)
         InputStream byteStream = newInputStream();
         try
         {
-            PrivateUtils.writeAsBase64(byteStream, out);
+            _Private_Utils.writeAsBase64(byteStream, out);
         }
         finally
         {
diff --git a/src/software/amazon/ion/impl/lite/IonBoolLite.java b/src/com/amazon/ion/impl/lite/IonBoolLite.java
similarity index 81%
rename from src/software/amazon/ion/impl/lite/IonBoolLite.java
rename to src/com/amazon/ion/impl/lite/IonBoolLite.java
index fe85e2165a..7c62a943c1 100644
--- a/src/software/amazon/ion/impl/lite/IonBoolLite.java
+++ b/src/com/amazon/ion/impl/lite/IonBoolLite.java
@@ -1,25 +1,27 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.IonBool;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.NullValueException;
+import com.amazon.ion.ValueVisitor;
 import java.io.IOException;
-import software.amazon.ion.IonBool;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.ValueVisitor;
+
 
 final class IonBoolLite
     extends IonValueLite
diff --git a/src/software/amazon/ion/impl/lite/IonClobLite.java b/src/com/amazon/ion/impl/lite/IonClobLite.java
similarity index 75%
rename from src/software/amazon/ion/impl/lite/IonClobLite.java
rename to src/com/amazon/ion/impl/lite/IonClobLite.java
index f5186d9b16..38d7ec1d16 100644
--- a/src/software/amazon/ion/impl/lite/IonClobLite.java
+++ b/src/com/amazon/ion/impl/lite/IonClobLite.java
@@ -1,29 +1,31 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.IonClob;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.ValueVisitor;
+import com.amazon.ion.impl._Private_Utils;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
 import java.nio.charset.Charset;
-import software.amazon.ion.IonClob;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.ValueVisitor;
-import software.amazon.ion.impl.PrivateUtils;
+
 
 final class IonClobLite
     extends IonLobLite
@@ -84,7 +86,7 @@ public String stringValue(Charset cs)
         byte[] bytes = getBytes();
         if (bytes == null) return null;
 
-        return PrivateUtils.decode(bytes, cs);
+        return _Private_Utils.decode(bytes, cs);
     }
 
     @Override
diff --git a/src/software/amazon/ion/impl/lite/IonContainerLite.java b/src/com/amazon/ion/impl/lite/IonContainerLite.java
similarity index 91%
rename from src/software/amazon/ion/impl/lite/IonContainerLite.java
rename to src/com/amazon/ion/impl/lite/IonContainerLite.java
index d8fe748df1..4efdd23dbb 100644
--- a/src/software/amazon/ion/impl/lite/IonContainerLite.java
+++ b/src/com/amazon/ion/impl/lite/IonContainerLite.java
@@ -1,39 +1,40 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
-
+package com.amazon.ion.impl.lite;
+
+import com.amazon.ion.ContainedValueException;
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.NullValueException;
+import com.amazon.ion.ReadOnlyValueException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.ValueVisitor;
+import com.amazon.ion.impl._Private_IonConstants;
+import com.amazon.ion.impl._Private_IonContainer;
+import com.amazon.ion.impl._Private_Utils;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.ValueVisitor;
-import software.amazon.ion.impl.PrivateIonConstants;
-import software.amazon.ion.impl.PrivateIonContainer;
-import software.amazon.ion.impl.PrivateUtils;
 
 abstract class IonContainerLite
     extends IonValueLite
-    implements PrivateIonContainer, IonContext
+    implements _Private_IonContainer, IonContext
 {
 
     protected int            _child_count;
@@ -153,7 +154,7 @@ public ListIterator<IonValue> listIterator(int index)
         if (isNullValue())
         {
             if (index != 0) throw new IndexOutOfBoundsException();
-            return PrivateUtils.<IonValue> emptyIterator();
+            return _Private_Utils.<IonValue> emptyIterator();
         }
 
         return new SequenceContentIterator(index, isReadOnly());
@@ -409,6 +410,24 @@ void makeReadOnlyInternal()
         _isLocked(true);
     }
 
+
+
+
+    /**
+     * methods from IonValue
+     *
+     *   public void deepMaterialize()
+     *   public IonContainer getContainer()
+     *   public int getFieldId()
+     *   public String getFieldName()
+     *   public String[] getTypeAnnotations()
+     *   public boolean hasTypeAnnotation(String annotation)
+     *   public boolean isNullValue()
+     *   public boolean isReadOnly()
+     *   public void removeTypeAnnotation(String annotation)
+     */
+
+
     /*
      * IonContext methods
      *
@@ -553,20 +572,20 @@ void add(int index, IonValueLite child)
      */
     static final int[] INITIAL_SIZE = make_initial_size_array();
     static int[] make_initial_size_array() {
-        int[] sizes = new int[PrivateIonConstants.tidDATAGRAM + 1];
-        sizes[PrivateIonConstants.tidList]     = 1;
-        sizes[PrivateIonConstants.tidSexp]     = 4;
-        sizes[PrivateIonConstants.tidStruct]   = 5;
-        sizes[PrivateIonConstants.tidDATAGRAM] = 3;
+        int[] sizes = new int[_Private_IonConstants.tidDATAGRAM + 1];
+        sizes[_Private_IonConstants.tidList]     = 1;
+        sizes[_Private_IonConstants.tidSexp]     = 4;
+        sizes[_Private_IonConstants.tidStruct]   = 5;
+        sizes[_Private_IonConstants.tidDATAGRAM] = 3;
         return sizes;
     }
     static final int[] NEXT_SIZE = make_next_size_array();
     static int[] make_next_size_array() {
-        int[] sizes = new int[PrivateIonConstants.tidDATAGRAM + 1];
-        sizes[PrivateIonConstants.tidList]     = 4;
-        sizes[PrivateIonConstants.tidSexp]     = 8;
-        sizes[PrivateIonConstants.tidStruct]   = 8;
-        sizes[PrivateIonConstants.tidDATAGRAM] = 10;
+        int[] sizes = new int[_Private_IonConstants.tidDATAGRAM + 1];
+        sizes[_Private_IonConstants.tidList]     = 4;
+        sizes[_Private_IonConstants.tidSexp]     = 8;
+        sizes[_Private_IonConstants.tidStruct]   = 8;
+        sizes[_Private_IonConstants.tidDATAGRAM] = 10;
         return sizes;
     }
     final protected int initialSize()
diff --git a/src/software/amazon/ion/impl/lite/IonContext.java b/src/com/amazon/ion/impl/lite/IonContext.java
similarity index 80%
rename from src/software/amazon/ion/impl/lite/IonContext.java
rename to src/com/amazon/ion/impl/lite/IonContext.java
index f701a80ee6..2f7089f1ef 100644
--- a/src/software/amazon/ion/impl/lite/IonContext.java
+++ b/src/com/amazon/ion/impl/lite/IonContext.java
@@ -1,21 +1,22 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.SymbolTable;
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.SymbolTable;
 
 /**
  * Provides the parent, system and symbol table definitions that are shared
diff --git a/src/software/amazon/ion/impl/lite/IonDatagramLite.java b/src/com/amazon/ion/impl/lite/IonDatagramLite.java
similarity index 94%
rename from src/software/amazon/ion/impl/lite/IonDatagramLite.java
rename to src/com/amazon/ion/impl/lite/IonDatagramLite.java
index cdc6c62ebd..75645fd862 100644
--- a/src/software/amazon/ion/impl/lite/IonDatagramLite.java
+++ b/src/com/amazon/ion/impl/lite/IonDatagramLite.java
@@ -1,44 +1,45 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
-
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-
+package com.amazon.ion.impl.lite;
+
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+
+import com.amazon.ion.ContainedValueException;
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.ValueFactory;
+import com.amazon.ion.ValueVisitor;
+import com.amazon.ion.impl._Private_CurriedValueFactory;
+import com.amazon.ion.impl._Private_IonDatagram;
+import com.amazon.ion.impl._Private_Utils;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.util.Collection;
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.ValueFactory;
-import software.amazon.ion.ValueVisitor;
-import software.amazon.ion.impl.PrivateCurriedValueFactory;
-import software.amazon.ion.impl.PrivateIonDatagram;
-import software.amazon.ion.impl.PrivateUtils;
 
 /**
  *  The datagram generally behaves as an IonSexp. A list with space
@@ -77,7 +78,7 @@
 
 final class IonDatagramLite
     extends IonSequenceLite
-    implements IonDatagram, IonContext, PrivateIonDatagram
+    implements IonDatagram, IonContext, _Private_IonDatagram
 {
 
     private static final int HASH_SIGNATURE =
@@ -213,7 +214,7 @@ public boolean add(IonValue child)
     @Override
     public ValueFactory add()
     {
-        return new PrivateCurriedValueFactory(this.getSystem())
+        return new _Private_CurriedValueFactory(this.getSystem())
         {
             @Override
             protected void handle(IonValue newValue)
@@ -255,7 +256,7 @@ public void add(int index, IonValue element)
     @Override
     public ValueFactory add(final int index)
     {
-        return new PrivateCurriedValueFactory(getSystem())
+        return new _Private_CurriedValueFactory(getSystem())
         {
             @Override
             protected void handle(IonValue newValue)
@@ -461,6 +462,22 @@ public byte[] getBytes() throws IonException
         return encoder.toNewByteArray();
     }
 
+    public int getBytes(byte[] dst) throws IonException
+    {
+        ReverseBinaryEncoder encoder =
+            new ReverseBinaryEncoder(REVERSE_BINARY_ENCODER_INITIAL_SIZE);
+        encoder.serialize(this);
+        return encoder.toNewByteArray(dst);
+    }
+
+    public int getBytes(byte[] dst, int offset) throws IonException
+    {
+        ReverseBinaryEncoder encoder =
+            new ReverseBinaryEncoder(REVERSE_BINARY_ENCODER_INITIAL_SIZE);
+        encoder.serialize(this);
+        return encoder.toNewByteArray(dst, offset);
+    }
+
     public int getBytes(OutputStream out) throws IOException, IonException
     {
         ReverseBinaryEncoder encoder =
@@ -524,6 +541,11 @@ void setSymbolTableAtIndex(int elementid, SymbolTable symbols)
         }
     }
 
+    public byte[] toBytes() throws IonException
+    {
+        return getBytes();
+    }
+
     //////////////////////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////
 
@@ -1017,7 +1039,8 @@ void load_current_symbol_table(IonValueLite prev_user_value)
                         rep = __iterator.get_datagram_ivm();
                     }
                     else {
-                        rep = PrivateUtils.symtabTree(new_symbol_table);
+                        IonSystem sys = __iterator.get_datagram_system();
+                        rep = _Private_Utils.symtabTree(new_symbol_table);
                     }
                     assert(rep != null && __iterator.get_datagram_system() == rep.getSystem());
 
@@ -1124,7 +1147,7 @@ private static int count_system_values(IonSystem sys,
             int count = 0;
             while (curr.isLocalTable()) {
                 count++;
-                curr = PrivateUtils.symtabTree(curr).getSymbolTable();
+                curr = _Private_Utils.symtabTree(curr).getSymbolTable();
             }
             // we should terminate when the symbol tables symbol table is the system symbol table
             assert(curr != null);
diff --git a/src/software/amazon/ion/impl/lite/IonDecimalLite.java b/src/com/amazon/ion/impl/lite/IonDecimalLite.java
similarity index 86%
rename from src/software/amazon/ion/impl/lite/IonDecimalLite.java
rename to src/com/amazon/ion/impl/lite/IonDecimalLite.java
index 1795226b9a..4a8d71e7a1 100644
--- a/src/software/amazon/ion/impl/lite/IonDecimalLite.java
+++ b/src/com/amazon/ion/impl/lite/IonDecimalLite.java
@@ -1,27 +1,29 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonDecimal;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.NullValueException;
+import com.amazon.ion.ValueVisitor;
 import java.io.IOException;
 import java.math.BigDecimal;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.ValueVisitor;
+
 
 final class IonDecimalLite
     extends IonValueLite
diff --git a/src/software/amazon/ion/impl/lite/IonFloatLite.java b/src/com/amazon/ion/impl/lite/IonFloatLite.java
similarity index 83%
rename from src/software/amazon/ion/impl/lite/IonFloatLite.java
rename to src/com/amazon/ion/impl/lite/IonFloatLite.java
index fdb048d71a..66118c291d 100644
--- a/src/software/amazon/ion/impl/lite/IonFloatLite.java
+++ b/src/com/amazon/ion/impl/lite/IonFloatLite.java
@@ -1,27 +1,29 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonFloat;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.NullValueException;
+import com.amazon.ion.ValueVisitor;
 import java.io.IOException;
 import java.math.BigDecimal;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.ValueVisitor;
+
 
 final class IonFloatLite
     extends IonValueLite
diff --git a/src/software/amazon/ion/impl/lite/IonIntLite.java b/src/com/amazon/ion/impl/lite/IonIntLite.java
similarity index 90%
rename from src/software/amazon/ion/impl/lite/IonIntLite.java
rename to src/com/amazon/ion/impl/lite/IonIntLite.java
index 8d2ce15237..3fce4810aa 100644
--- a/src/software/amazon/ion/impl/lite/IonIntLite.java
+++ b/src/com/amazon/ion/impl/lite/IonIntLite.java
@@ -1,28 +1,30 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.NullValueException;
+import com.amazon.ion.ValueVisitor;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import software.amazon.ion.IntegerSize;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.ValueVisitor;
+
 
 
 final class IonIntLite
@@ -243,7 +245,6 @@ public void accept(ValueVisitor visitor) throws Exception
         visitor.visit(this);
     }
 
-    @Override
     public IntegerSize getIntegerSize()
     {
         if (isNullValue())
diff --git a/src/software/amazon/ion/impl/lite/IonListLite.java b/src/com/amazon/ion/impl/lite/IonListLite.java
similarity index 75%
rename from src/software/amazon/ion/impl/lite/IonListLite.java
rename to src/com/amazon/ion/impl/lite/IonListLite.java
index 41f0a1a435..3d8ad0d0b0 100644
--- a/src/software/amazon/ion/impl/lite/IonListLite.java
+++ b/src/com/amazon/ion/impl/lite/IonListLite.java
@@ -1,25 +1,27 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.ContainedValueException;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.ValueVisitor;
 import java.util.Collection;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.ValueVisitor;
+
 
 final class IonListLite
     extends IonSequenceLite
@@ -46,7 +48,7 @@ final class IonListLite
     }
 
     /**
-     * Constructs a list value <em>not</em> backed by binary.
+     * Constructs a list value
      *
      * @param elements
      *   the initial set of child elements.  If <code>null</code>, then the new
diff --git a/src/software/amazon/ion/impl/lite/IonLoaderLite.java b/src/com/amazon/ion/impl/lite/IonLoaderLite.java
similarity index 77%
rename from src/software/amazon/ion/impl/lite/IonLoaderLite.java
rename to src/com/amazon/ion/impl/lite/IonLoaderLite.java
index 8dd6d5821e..62e963de4c 100644
--- a/src/software/amazon/ion/impl/lite/IonLoaderLite.java
+++ b/src/com/amazon/ion/impl/lite/IonLoaderLite.java
@@ -1,35 +1,37 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
-import static software.amazon.ion.impl.PrivateIonReaderFactory.makeReader;
+import static com.amazon.ion.impl._Private_IonReaderFactory.makeReader;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonLoader;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.impl._Private_IonWriterFactory;
+import com.amazon.ion.impl._Private_LocalSymbolTableFactory;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.impl.PrivateIonWriterFactory;
-import software.amazon.ion.impl.PrivateLocalSymbolTableFactory;
+
 
 final class IonLoaderLite
     implements IonLoader
@@ -39,7 +41,7 @@ final class IonLoaderLite
     /** Not null. */
     private final IonCatalog    _catalog;
 
-    private final PrivateLocalSymbolTableFactory _lstFactory;
+    private final _Private_LocalSymbolTableFactory _lstFactory;
 
     /**
      * @param system must not be null.
@@ -52,7 +54,7 @@ public IonLoaderLite(IonSystemLite system, IonCatalog catalog)
 
         _system = system;
         _catalog = catalog;
-        _lstFactory = system.getLstFactory();
+        _lstFactory = _system.getLstFactory();
     }
 
     public IonSystem getSystem()
@@ -75,7 +77,7 @@ private IonDatagramLite load_helper(IonReader reader)
     throws IOException
     {
         IonDatagramLite datagram = new IonDatagramLite(_system, _catalog);
-        IonWriter writer = PrivateIonWriterFactory.makeWriter(datagram);
+        IonWriter writer = _Private_IonWriterFactory.makeWriter(datagram);
         writer.writeValues(reader);
         return datagram;
     }
diff --git a/src/software/amazon/ion/impl/lite/IonLobLite.java b/src/com/amazon/ion/impl/lite/IonLobLite.java
similarity index 87%
rename from src/software/amazon/ion/impl/lite/IonLobLite.java
rename to src/com/amazon/ion/impl/lite/IonLobLite.java
index 2e7c8872c4..b74033c168 100644
--- a/src/software/amazon/ion/impl/lite/IonLobLite.java
+++ b/src/com/amazon/ion/impl/lite/IonLobLite.java
@@ -1,23 +1,25 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.IonLob;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.zip.CRC32;
-import software.amazon.ion.IonLob;
+
 
 abstract class IonLobLite
     extends IonValueLite
diff --git a/src/software/amazon/ion/impl/lite/IonNullLite.java b/src/com/amazon/ion/impl/lite/IonNullLite.java
similarity index 72%
rename from src/software/amazon/ion/impl/lite/IonNullLite.java
rename to src/com/amazon/ion/impl/lite/IonNullLite.java
index 34da74bfc5..ce6abefabe 100644
--- a/src/software/amazon/ion/impl/lite/IonNullLite.java
+++ b/src/com/amazon/ion/impl/lite/IonNullLite.java
@@ -1,24 +1,26 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.IonNull;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.ValueVisitor;
 import java.io.IOException;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.ValueVisitor;
+
 
 final class IonNullLite
     extends IonValueLite
diff --git a/src/software/amazon/ion/impl/lite/IonSequenceLite.java b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
similarity index 95%
rename from src/software/amazon/ion/impl/lite/IonSequenceLite.java
rename to src/com/amazon/ion/impl/lite/IonSequenceLite.java
index 9fb5db65be..5214b79ec3 100644
--- a/src/software/amazon/ion/impl/lite/IonSequenceLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
@@ -1,19 +1,28 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.ContainedValueException;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.ValueFactory;
+import com.amazon.ion.impl._Private_CurriedValueFactory;
+import com.amazon.ion.impl._Private_IonValue;
 import java.io.IOException;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
@@ -24,14 +33,7 @@
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.ValueFactory;
-import software.amazon.ion.impl.PrivateCurriedValueFactory;
-import software.amazon.ion.impl.PrivateIonValue;
+
 
 abstract class IonSequenceLite
     extends IonContainerLite
@@ -163,7 +165,7 @@ public boolean addAll(int index, Collection<? extends IonValue> c)
 
     public ValueFactory add()
     {
-        return new PrivateCurriedValueFactory(this.getSystem())
+        return new _Private_CurriedValueFactory(this.getSystem())
         {
             @Override
             protected void handle(IonValue newValue)
@@ -182,7 +184,7 @@ public void add(int index, IonValue element)
 
     public ValueFactory add(final int index)
     {
-        return new PrivateCurriedValueFactory(getSystem())
+        return new _Private_CurriedValueFactory(getSystem())
         {
             @Override
             protected void handle(IonValue newValue)
@@ -326,7 +328,7 @@ public int indexOf(Object o)
         if (o == null) {
             throw new NullPointerException();
         }
-        PrivateIonValue v = (PrivateIonValue) o;
+        _Private_IonValue v = (_Private_IonValue) o;
         if (this != v.getContainer()) return -1;
         return v.getElementId();
     }
diff --git a/src/software/amazon/ion/impl/lite/IonSexpLite.java b/src/com/amazon/ion/impl/lite/IonSexpLite.java
similarity index 73%
rename from src/software/amazon/ion/impl/lite/IonSexpLite.java
rename to src/com/amazon/ion/impl/lite/IonSexpLite.java
index d1a61fe56d..42a5625865 100644
--- a/src/software/amazon/ion/impl/lite/IonSexpLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSexpLite.java
@@ -1,25 +1,27 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.ContainedValueException;
+import com.amazon.ion.IonSexp;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.ValueVisitor;
 import java.util.Collection;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonSexp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.ValueVisitor;
+
 
 final class IonSexpLite
     extends IonSequenceLite
@@ -39,7 +41,7 @@ final class IonSexpLite
     }
 
     /**
-     * Constructs a sexp value <em>not</em> backed by binary.
+     * Constructs a sexp value
      *
      * @param elements
      *   the initial set of child elements.  If <code>null</code>, then the new
diff --git a/src/software/amazon/ion/impl/lite/IonStringLite.java b/src/com/amazon/ion/impl/lite/IonStringLite.java
similarity index 75%
rename from src/software/amazon/ion/impl/lite/IonStringLite.java
rename to src/com/amazon/ion/impl/lite/IonStringLite.java
index 87083af9be..e7bd0e945b 100644
--- a/src/software/amazon/ion/impl/lite/IonStringLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStringLite.java
@@ -1,24 +1,26 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.ValueVisitor;
 import java.io.IOException;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.ValueVisitor;
+
 
 final class IonStringLite
     extends IonTextLite
diff --git a/src/software/amazon/ion/impl/lite/IonStructLite.java b/src/com/amazon/ion/impl/lite/IonStructLite.java
similarity index 95%
rename from src/software/amazon/ion/impl/lite/IonStructLite.java
rename to src/com/amazon/ion/impl/lite/IonStructLite.java
index 8d7cb0d814..2f0afd334c 100644
--- a/src/software/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStructLite.java
@@ -1,19 +1,31 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
-
+package com.amazon.ion.impl.lite;
+
+import com.amazon.ion.ContainedValueException;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.ValueFactory;
+import com.amazon.ion.ValueVisitor;
+import com.amazon.ion.impl._Private_CurriedValueFactory;
+import com.amazon.ion.util.Equivalence;
+import com.amazon.ion.UnknownSymbolException;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Arrays;
@@ -23,18 +35,8 @@
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.Map.Entry;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.ValueFactory;
-import software.amazon.ion.ValueVisitor;
-import software.amazon.ion.impl.PrivateCurriedValueFactory;
-import software.amazon.ion.util.Equivalence;
 import java.util.Set;
-import software.amazon.ion.UnknownSymbolException;
+
 
 final class IonStructLite
     extends IonContainerLite
@@ -42,7 +44,7 @@ final class IonStructLite
 {
     private static final int HASH_SIGNATURE =
         IonType.STRUCT.toString().hashCode();
-    // TODO amzn/ion-java#41: add support for _isOrdered
+    // TODO amzn/ion-java/issues/41: add support for _isOrdered
 
     IonStructLite(ContainerlessContext context, boolean isNull)
     {
@@ -458,7 +460,7 @@ public boolean add(IonValue child)
 
     public ValueFactory add(final String fieldName)
     {
-        return new PrivateCurriedValueFactory(_context.getSystem())
+        return new _Private_CurriedValueFactory(_context.getSystem())
         {
             @Override
             protected void handle(IonValue newValue)
@@ -529,7 +531,7 @@ public void add(SymbolToken fieldName, IonValue child)
 
     public ValueFactory put(final String fieldName)
     {
-        return new PrivateCurriedValueFactory(_context.getSystem())
+        return new _Private_CurriedValueFactory(_context.getSystem())
         {
             @Override
             protected void handle(IonValue newValue)
diff --git a/src/software/amazon/ion/impl/lite/IonSymbolLite.java b/src/com/amazon/ion/impl/lite/IonSymbolLite.java
similarity index 77%
rename from src/software/amazon/ion/impl/lite/IonSymbolLite.java
rename to src/com/amazon/ion/impl/lite/IonSymbolLite.java
index 8f13f8eb0a..88ba206756 100644
--- a/src/software/amazon/ion/impl/lite/IonSymbolLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSymbolLite.java
@@ -1,36 +1,39 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
-
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import software.amazon.ion.SymbolToken;
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
-
+package com.amazon.ion.impl.lite;
+
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
+
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.NullValueException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.ValueVisitor;
+import com.amazon.ion.impl._Private_IonSymbol;
+import com.amazon.ion.impl._Private_Utils;
 import java.io.IOException;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.ValueVisitor;
-import software.amazon.ion.impl.PrivateIonSymbol;
-import software.amazon.ion.impl.PrivateUtils;
+
 
 final class IonSymbolLite
     extends IonTextLite
-    implements PrivateIonSymbol
+    implements _Private_IonSymbol
 {
     private static final int HASH_SIGNATURE =
         IonType.SYMBOL.toString().hashCode();
@@ -62,11 +65,11 @@ final class IonSymbolLite
             if (text != null)
             {
                 super.setValue(text);
-                // TODO [ION-320] - needs consistent handling, when to retain SID's vs ignore
+                // TODO [amzn/ion-java/issues/27] - needs consistent handling, when to retain SID's vs ignore
             }
             else
             {
-                // TODO [IONJAVA-579] - needs consistent handling, resolution against context symbol table
+                // TODO [amzn/ion-java/issues/223] - needs consistent handling, resolution against context symbol table
                 _sid = sid;
                 // there *is* an encoding present so we must update
                 _isSymbolIdPresent(true);
@@ -128,51 +131,16 @@ public IonType getType()
         return IonType.SYMBOL;
     }
 
-
-    /**
-     * Get's the text of this NON-NULL symbol, finding it from our symbol
-     * table if it's not yet known (and caching the result if possible).
-     * <p>
-     * Caller must check {@link #isNullValue()}
-     *
-     * @return null if symbol text is unknown.
-     */
-    private String _stringValue()
+    @Deprecated
+    public int getSymbolId()
+        throws NullValueException
     {
-        return _stringValue(new LazySymbolTableProvider(this));
+        return getSymbolId(null);
     }
 
-    private String _stringValue(SymbolTableProvider symbolTableProvider)
+    private int getSymbolId(SymbolTableProvider symbolTableProvider)
+        throws NullValueException
     {
-        String name = _get_value();
-        if (name == null)
-        {
-            assert _sid >= 0;
-
-            SymbolTable symbols = symbolTableProvider.getSymbolTable();
-            name = symbols.findKnownSymbol(_sid);
-            if (name != null)
-            {
-                // if this is a mutable value we'll hang onto
-                // our now known symbol table so we don't have
-                // to look it up again.
-                // If the value is immutable, honor that contract.
-                if (_isLocked() == false) {
-                    _set_value(name);
-                }
-            }
-        }
-        return name;
-    }
-
-    public SymbolToken symbolValue()
-    {
-        return symbolValue(new LazySymbolTableProvider(this));
-    }
-
-    private int resolveSymbolId(SymbolTableProvider symbolTableProvider)
-    {
-
         validateThisNotNull();
 
         if (_sid != UNKNOWN_SYMBOL_ID || isReadOnly()) {
@@ -180,15 +148,15 @@ private int resolveSymbolId(SymbolTableProvider symbolTableProvider)
         }
 
         SymbolTable symtab =
-            symbolTableProvider != null ? symbolTableProvider.getSymbolTable()
-                : getSymbolTable();
+                symbolTableProvider != null ? symbolTableProvider.getSymbolTable()
+                                            : getSymbolTable();
         if (symtab == null) {
             symtab = getSystem().getSystemSymbolTable();
         }
         assert(symtab != null);
 
         String name = _get_value();
-        // TODO [ION-320] - needs consistent handling, when to retain SID's vs ignore (here memoizing SID on read)
+        // TODO [amzn/ion-java/issues/27] - needs consistent handling, when to retain SID's vs ignore (here memoizing SID on read)
         if (!symtab.isLocalTable())
         {
             setSID(symtab.findSymbol(name));
@@ -214,13 +182,55 @@ private void setSID(int sid)
         }
     }
 
+
+    /**
+     * Get's the text of this NON-NULL symbol, finding it from our symbol
+     * table if it's not yet known (and caching the result if possible).
+     * <p>
+     * Caller must check {@link #isNullValue()}
+     *
+     * @return null if symbol text is unknown.
+     */
+    private String _stringValue()
+    {
+        return _stringValue(new LazySymbolTableProvider(this));
+    }
+
+    private String _stringValue(SymbolTableProvider symbolTableProvider)
+    {
+        String name = _get_value();
+        if (name == null)
+        {
+            assert _sid >= 0;
+
+            SymbolTable symbols = symbolTableProvider.getSymbolTable();
+            name = symbols.findKnownSymbol(_sid);
+            if (name != null)
+            {
+                // if this is a mutable value we'll hang onto
+                // our now known symbol table so we don't have
+                // to look it up again.
+                // If the value is immutable, honor that contract.
+                if (_isLocked() == false) {
+                    _set_value(name);
+                }
+            }
+        }
+        return name;
+    }
+
+    public SymbolToken symbolValue()
+    {
+        return symbolValue(new LazySymbolTableProvider(this));
+    }
+
     public SymbolToken symbolValue(SymbolTableProvider symbolTableProvider)
     {
         if (isNullValue()) return null;
 
-        int sid = resolveSymbolId(symbolTableProvider);
+        int sid = getSymbolId(symbolTableProvider);
         String text = _stringValue(symbolTableProvider);
-        return PrivateUtils.newSymbolToken(text, sid);
+        return _Private_Utils.newSymbolToken(text, sid);
     }
 
 
@@ -252,7 +262,7 @@ else if (_stringValue() != null)
         }
         else
         {
-            // TODO [IONJAVA-579] - needs consistent handling, resolution against context symbol table
+            // TODO [amzn/ion-java/issues/223] - needs consistent handling, resolution against context symbol table
             // there is not text, so we can't clear the SID.
             allSymbolIDsCleared = false;
         }
@@ -271,16 +281,17 @@ protected void setIsIonVersionMarker(boolean isIVM)
         _sid = ION_1_0_SID;
     }
 
+
     @Override
     final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
         throws IOException
     {
-        // TODO amzn/ion-java#27 Fix symbol handling
+        // TODO amzn/ion-java/issues/27 Fix symbol handling
         // A million-dollar question is - if text is missing, do
         // we throw (cannot serialize) or do we pass the sid thru???
 
-        SymbolToken symbol = symbolValue(symbolTableProvider);
-        writer.writeSymbolToken(symbol);
+        // NB! This will throw if symbol is not set
+        writer.writeSymbolToken(symbolValue(symbolTableProvider));
     }
 
     @Override
@@ -297,7 +308,7 @@ private String stringValue(SymbolTableProvider symbolTableProvider)
             return null;
         }
         String name = _stringValue(symbolTableProvider);
-        if (name == null) {
+        if (name == null && _sid != 0) {
             assert(_sid > 0);
             throw new UnknownSymbolException(_sid);
         }
diff --git a/src/software/amazon/ion/impl/lite/IonSystemLite.java b/src/com/amazon/ion/impl/lite/IonSystemLite.java
similarity index 85%
rename from src/software/amazon/ion/impl/lite/IonSystemLite.java
rename to src/com/amazon/ion/impl/lite/IonSystemLite.java
index db49fd6688..1e16f7392b 100644
--- a/src/software/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSystemLite.java
@@ -1,29 +1,54 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
-
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.impl.PrivateIonReaderFactory.makeReader;
-import static software.amazon.ion.impl.PrivateIonReaderFactory.makeSystemReader;
-import static software.amazon.ion.impl.PrivateUtils.addAllNonNull;
-import static software.amazon.ion.impl.PrivateUtils.initialSymtab;
-import static software.amazon.ion.impl.PrivateUtils.newSymbolToken;
-import static software.amazon.ion.util.IonTextUtils.printString;
-
+package com.amazon.ion.impl.lite;
+
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.impl._Private_IonReaderFactory.makeReader;
+import static com.amazon.ion.impl._Private_IonReaderFactory.makeSystemReader;
+import static com.amazon.ion.impl._Private_Utils.addAllNonNull;
+import static com.amazon.ion.impl._Private_Utils.initialSymtab;
+import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
+import static com.amazon.ion.util.IonTextUtils.printString;
+
+import com.amazon.ion.IonBinaryWriter;
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonLoader;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonTextReader;
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.UnexpectedEofException;
+import com.amazon.ion.UnsupportedIonVersionException;
+import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
+import com.amazon.ion.impl._Private_IonSystem;
+import com.amazon.ion.impl._Private_IonWriterFactory;
+import com.amazon.ion.impl._Private_ScalarConversions.CantConvertException;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
@@ -33,31 +58,12 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnexpectedEofException;
-import software.amazon.ion.UnsupportedIonVersionException;
-import software.amazon.ion.impl.PrivateIonBinaryWriterBuilder;
-import software.amazon.ion.impl.PrivateIonSystem;
-import software.amazon.ion.impl.PrivateIonWriterFactory;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.system.IonReaderBuilder;
-import software.amazon.ion.system.IonTextWriterBuilder;
 
+
+@SuppressWarnings("deprecation")
 final class IonSystemLite
     extends ValueFactoryLite
-    implements PrivateIonSystem
+    implements _Private_IonSystem
 {
 
     private final SymbolTable _system_symbol_table;
@@ -68,13 +74,14 @@ final class IonSystemLite
     /** Immutable. */
     private final IonTextWriterBuilder myTextWriterBuilder;
     /** Immutable. */
-    private final PrivateIonBinaryWriterBuilder myBinaryWriterBuilder;
+
+    private final _Private_IonBinaryWriterBuilder myBinaryWriterBuilder;
     /** Immutable. **/
     private final IonReaderBuilder myReaderBuilder;
 
     public IonSystemLite(IonTextWriterBuilder twb,
-                         PrivateIonBinaryWriterBuilder bwb,
-                         IonReaderBuilder rb)
+                          _Private_IonBinaryWriterBuilder bwb,
+                          IonReaderBuilder rb)
     {
         IonCatalog catalog = twb.getCatalog();
         assert catalog != null;
@@ -117,7 +124,7 @@ public <T extends IonValue> T clone(T value) throws IonException
         if (value instanceof IonDatagram)
         {
             IonDatagram datagram = newDatagram();
-            IonWriter writer = PrivateIonWriterFactory.makeWriter(datagram);
+            IonWriter writer = _Private_IonWriterFactory.makeWriter(datagram);
             IonReader reader = makeSystemReader(value.getSystem(), value);
 
             try {
@@ -204,6 +211,22 @@ public Iterator<IonValue> iterate(IonReader reader)
         return iterator;
     }
 
+    @Deprecated
+    public IonBinaryWriter newBinaryWriter()
+    {
+        _Private_IonBinaryWriterBuilder b = myBinaryWriterBuilder;
+        return b.buildLegacy();
+    }
+
+    @Deprecated
+    public IonBinaryWriter newBinaryWriter(SymbolTable... imports)
+    {
+        _Private_IonBinaryWriterBuilder b = (_Private_IonBinaryWriterBuilder)
+            myBinaryWriterBuilder.withImports(imports);
+        return b.buildLegacy();
+    }
+
+
     public IonWriter newBinaryWriter(OutputStream out, SymbolTable... imports)
     {
         return myBinaryWriterBuilder.withImports(imports).build(out);
@@ -239,18 +262,18 @@ public SymbolTable newLocalSymbolTable(SymbolTable... imports)
 
     public SymbolTable newSharedSymbolTable(IonStruct ionRep)
     {
-        return PrivateUtils.newSharedSymtab(ionRep);
+        return _Private_Utils.newSharedSymtab(ionRep);
     }
 
     public SymbolTable newSharedSymbolTable(IonReader reader)
     {
-        return PrivateUtils.newSharedSymtab(reader, false);
+        return _Private_Utils.newSharedSymtab(reader, false);
     }
 
     public SymbolTable newSharedSymbolTable(IonReader reader,
                                             boolean isOnStruct)
     {
-        return PrivateUtils.newSharedSymtab(reader, isOnStruct);
+        return _Private_Utils.newSharedSymtab(reader, isOnStruct);
     }
 
     public SymbolTable newSharedSymbolTable(String name,
@@ -284,7 +307,7 @@ public SymbolTable newSharedSymbolTable(String name,
         addAllNonNull(syms, newSymbols);
 
         SymbolTable st =
-            PrivateUtils.newSharedSymtab(name, version, prior,
+            _Private_Utils.newSharedSymtab(name, version, prior,
                                            syms.iterator());
         return st;
     }
@@ -316,7 +339,7 @@ private IonValueLite load_value_helper(IonReader reader, boolean isTopLevel)
                 v = newBool(reader.booleanValue());
                 break;
             case INT:
-                // TODO amzn/ion-java#9  Inefficient since we can't determine the size
+                // TODO amzn/ion-java/issues/9  Inefficient since we can't determine the size
                 // of the integer in order to avoid making BigIntegers.
                 v = newInt(reader.bigIntegerValue());
                 break;
@@ -473,7 +496,7 @@ IonValueLite newValue(IonType valueType)
 
     public IonWriter newWriter(IonContainer container)
     {
-        IonWriter writer = PrivateIonWriterFactory.makeWriter(container);
+        IonWriter writer = _Private_IonWriterFactory.makeWriter(container);
         return writer;
     }
 
@@ -692,7 +715,7 @@ public IonReader newSystemReader(byte[] ionData, int offset, int len)
     }
 
 
-    public IonReader newReader(String ionText)
+    public IonTextReader newReader(String ionText)
     {
         return myReaderBuilder.build(ionText);
     }
@@ -713,23 +736,25 @@ public IonReader newSystemReader(InputStream ionData)
         return makeSystemReader(ionData);
     }
 
+
+    //==========================================================================
+    // methods in IonSystemImpl (now declared in IonSystemPrivate)
+    //==========================================================================
+
     public IonReader newReader(Reader ionText)
     {
         return myReaderBuilder.build(ionText);
     }
 
-    public IonReader newReader(IonValue value)
+    public IonReader newSystemReader(Reader ionText)
     {
-        return myReaderBuilder.build(value);
+        return makeSystemReader(ionText);
     }
 
-    //==========================================================================
-    // methods in _Private_IonSystem
-    //==========================================================================
 
-    public IonReader newSystemReader(Reader ionText)
+    public IonReader newReader(IonValue value)
     {
-        return makeSystemReader(ionText);
+        return myReaderBuilder.build(value);
     }
 
     public IonReader newSystemReader(IonValue value)
@@ -747,7 +772,7 @@ public IonReader newSystemReader(IonValue value)
      */
     public IonWriter newTreeSystemWriter(IonContainer container)
     {
-        IonWriter writer = PrivateIonWriterFactory.makeSystemWriter(container);
+        IonWriter writer = _Private_IonWriterFactory.makeSystemWriter(container);
         return writer;
     }
 
@@ -756,7 +781,7 @@ public IonWriter newTreeSystemWriter(IonContainer container)
      */
     public IonWriter newTreeWriter(IonContainer container)
     {
-        IonWriter writer = PrivateIonWriterFactory.makeWriter(container);
+        IonWriter writer = _Private_IonWriterFactory.makeWriter(container);
         return writer;
     }
 
@@ -764,18 +789,18 @@ public IonWriter newTreeWriter(IonContainer container)
     public Iterator<IonValue> systemIterate(Reader ionText)
     {
         IonReader ir = newSystemReader(ionText);
-        return PrivateUtils.iterate(this, ir);
+        return _Private_Utils.iterate(this, ir);
     }
 
     public Iterator<IonValue> systemIterate(String ionText)
     {
         IonReader ir = newSystemReader(ionText);
-        return PrivateUtils.iterate(this, ir);
+        return _Private_Utils.iterate(this, ir);
     }
 
     public Iterator<IonValue> systemIterate(IonReader reader)
     {
-        return PrivateUtils.iterate(this, reader);
+        return _Private_Utils.iterate(this, reader);
     }
 
 
@@ -788,4 +813,5 @@ public boolean valueIsSharedSymbolTable(IonValue value)
         }
         return false;
     }
+
 }
diff --git a/src/software/amazon/ion/impl/lite/IonTextLite.java b/src/com/amazon/ion/impl/lite/IonTextLite.java
similarity index 74%
rename from src/software/amazon/ion/impl/lite/IonTextLite.java
rename to src/com/amazon/ion/impl/lite/IonTextLite.java
index 0383ffd969..8001300c9f 100644
--- a/src/software/amazon/ion/impl/lite/IonTextLite.java
+++ b/src/com/amazon/ion/impl/lite/IonTextLite.java
@@ -1,20 +1,22 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
+
+import com.amazon.ion.IonText;
 
-import software.amazon.ion.IonText;
 
 abstract class IonTextLite
     extends IonValueLite
diff --git a/src/software/amazon/ion/impl/lite/IonTimestampLite.java b/src/com/amazon/ion/impl/lite/IonTimestampLite.java
similarity index 87%
rename from src/software/amazon/ion/impl/lite/IonTimestampLite.java
rename to src/com/amazon/ion/impl/lite/IonTimestampLite.java
index fc3bddd891..7696d10f4b 100644
--- a/src/software/amazon/ion/impl/lite/IonTimestampLite.java
+++ b/src/com/amazon/ion/impl/lite/IonTimestampLite.java
@@ -1,28 +1,30 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.NullValueException;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.ValueVisitor;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.Date;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.ValueVisitor;
+
 
 final class IonTimestampLite
     extends IonValueLite
@@ -132,12 +134,12 @@ public void setValue(Timestamp timestamp)
 
     public void setValue(BigDecimal millis, Integer localOffset)
     {
-        setValue(Timestamp.forMillis(millis, localOffset));
+        setValue(new Timestamp(millis, localOffset));
     }
 
     public void setValue(long millis, Integer localOffset)
     {
-        setValue(Timestamp.forMillis(millis, localOffset));
+        setValue(new Timestamp(millis, localOffset));
     }
 
     public void setTime(Date value)
diff --git a/src/software/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
similarity index 92%
rename from src/software/amazon/ion/impl/lite/IonValueLite.java
rename to src/com/amazon/ion/impl/lite/IonValueLite.java
index c0245cbcf9..8c58a0dd7b 100644
--- a/src/software/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -1,61 +1,54 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
-
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.impl.PrivateUtils.EMPTY_STRING_ARRAY;
-import static software.amazon.ion.impl.PrivateUtils.newSymbolToken;
-import static software.amazon.ion.util.Equivalence.ionEquals;
-
+package com.amazon.ion.impl.lite;
+
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY;
+import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
+import static com.amazon.ion.util.Equivalence.ionEquals;
+
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.NullValueException;
+import com.amazon.ion.ReadOnlyValueException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.ValueVisitor;
+import com.amazon.ion.impl._Private_IonValue;
+import com.amazon.ion.impl._Private_IonWriter;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.util.Printer;
 import java.io.IOException;
 import java.io.PrintWriter;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.ValueVisitor;
-import software.amazon.ion.impl.PrivateIonValue;
-import software.amazon.ion.impl.PrivateIonWriter;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.system.IonTextWriterBuilder;
 
 /**
  *  Base class of the light weight implementation of
  *  Ion values.
- *
- *  This implementation is not backed by a buffer
- *  and is therefore fully materialized.  If you need
- *  only a few values from a large datagram this
- *  implementation may be more expensive than the
- *  original implementation.
  */
 abstract class IonValueLite
-    implements PrivateIonValue
+    implements _Private_IonValue
 {
     private static final int TYPE_ANNOTATION_HASH_SIGNATURE =
         "TYPE ANNOTATION".hashCode();
 
-    private static final IonTextWriterBuilder TO_STRING_TEXT_WRITER_BUILDER =
-        IonTextWriterBuilder.standard().withCharsetAscii().immutable();
-
     /**
      * this hold all the various boolean flags we have
      * in a single int.  Use set_flag(), clear_flag(), is_true()
@@ -76,8 +69,7 @@ abstract class IonValueLite
      * <i>(e.g. if it is a {@link IonContainerLite} based sub type)</i> contains one or more defined
      * Symbol ID's (SID)'s. This flag is used to track lifecycle, such that operations that require SID's are purged
      * from the IonValueLite and it's contained sub-DOM can conduct a fast evaluation rather than having to do a full
-     * contained graph traversal on each and every invocation. For more detail on impact see
-     * <a href="https://issues.amazon.com/issues/IONPT-8">IONPT-8</a>
+     * contained graph traversal on each and every invocation.
      */
     protected static final int IS_SYMBOL_ID_PRESENT = 0x80;
 
@@ -316,9 +308,9 @@ public SymbolTable getSymbolTable()
                     String text = existingToken.getText();
                     if (text != null) {
                         this._annotations[i] =
-                            PrivateUtils.newSymbolToken(text, UNKNOWN_SYMBOL_ID);
+                            _Private_Utils.newSymbolToken(text, UNKNOWN_SYMBOL_ID);
                     } else {
-                        // TODO - IONJAVA-579 needs consistent handling, should attempt to resolve and if it cant; fail
+                        // TODO - amzn/ion-java/issues/223 needs consistent handling, should attempt to resolve and if it cant; fail
                         this._annotations[i] = existing._annotations[i];
                         hasSIDsRetained |= this._annotations[i].getSid() > UNKNOWN_SYMBOL_ID;
                     }
@@ -333,7 +325,7 @@ public SymbolTable getSymbolTable()
         // existing 'read only' flag - we force the deep-copy back to being mutable
         clear_flag(IS_LOCKED);
         // whilst the clone *should* guarantee symbol context is purged, the annotation behavior existing above
-        // under the TO DO for IONJAVA-579 does mean that SID context can be propogated through a clone, therefore
+        // under the TO DO for amzn/ion-java/issues/223 does mean that SID context can be propogated through a clone, therefore
         // the encoding flag has to reflect this reality
         _isSymbolIdPresent(hasSIDsRetained);
     }
@@ -459,9 +451,23 @@ public final int getElementId()
         return this._elementid();
     }
 
+
+    public final int getFieldId()
+    {
+        if (_fieldId != UNKNOWN_SYMBOL_ID || _fieldName == null)
+        {
+            return _fieldId;
+        }
+
+        SymbolToken tok = getSymbolTable().find(_fieldName);
+
+        return (tok != null ? tok.getSid() : UNKNOWN_SYMBOL_ID);
+    }
+
+
     public SymbolToken getFieldNameSymbol()
     {
-        // TODO amzn/ion-java#27 We should memoize the results of symtab lookups.
+        // TODO amzn/ion-java/issues/27 We should memoize the results of symtab lookups.
         // BUT: that could cause thread-safety problems for read-only values.
         // I think makeReadOnly should populate the tokens fully
         // so that we only need to lookup from mutable instances.
@@ -493,7 +499,7 @@ else if(sid != 0){
             // not a struct field
             return null;
         }
-        return PrivateUtils.newSymbolToken(text, sid);
+        return _Private_Utils.newSymbolToken(text, sid);
     }
 
     public final SymbolToken getKnownFieldNameSymbol()
@@ -607,10 +613,15 @@ public final String getFieldName()
         if (_fieldName != null) return _fieldName;
         if (_fieldId <= 0) return null;
 
-        // TODO amzn/ion-java#27 why no symtab lookup, like getFieldNameSymbol()?
+        // TODO amzn/ion-java/issues/27 why no symtab lookup, like getFieldNameSymbol()?
         throw new UnknownSymbolException(_fieldId);
     }
 
+    public final int getFieldNameId()
+    {
+        return getFieldId();
+    }
+
     /**
      * @return not null, <b>in conflict with the public documentation</b>.
      */
@@ -672,7 +683,7 @@ public final SymbolToken[] getTypeAnnotationSymbols(SymbolTableProvider symbolTa
             String text = token.getText();
             if (text != null && token.getSid() == UNKNOWN_SYMBOL_ID)
             {
-                // TODO amzn/ion-java#27 We should memoize the result of symtab lookups
+                // TODO amzn/ion-java/issues/27 We should memoize the result of symtab lookups
                 // into _annotations.
                 // See getFieldNameSymbol() for challenges doing so.
 
@@ -735,14 +746,14 @@ public final String[] getTypeAnnotations()
             return EMPTY_STRING_ARRAY;
         }
 
-        return PrivateUtils.toStrings(_annotations, count);
+        return _Private_Utils.toStrings(_annotations, count);
     }
 
     public void setTypeAnnotations(String... annotations)
     {
         checkForLock();
 
-        _annotations = PrivateUtils.newSymbolTokens(getSymbolTable(),
+        _annotations = _Private_Utils.newSymbolTokens(getSymbolTable(),
                                                        annotations);
     }
 
@@ -757,7 +768,6 @@ public final boolean hasTypeAnnotation(String annotation)
         return false;
     }
 
-    @Override
     public final int findTypeAnnotation(String annotation)
     {
         assert(annotation != null && annotation.length() > 0);
@@ -815,7 +825,7 @@ protected int hashTypeAnnotations(final int original, SymbolTableProvider symbol
      * Implements equality over values.
      * This is currently defined using the Equivalence class.
      *
-     * @see software.amazon.ion.util.Equivalence
+     * @see com.amazon.ion.util.Equivalence
      *
      * @param   other   The value to compare with.
      *
@@ -913,7 +923,17 @@ public void removeTypeAnnotation(String annotation)
     @Override
     public String toString()
     {
-        return toString(TO_STRING_TEXT_WRITER_BUILDER);
+        StringBuilder buf = new StringBuilder(1024);
+        try
+        {
+            Printer p = new Printer();
+            p.print(this, buf);
+        }
+        catch (IOException e)
+        {
+            throw new IonException(e);
+        }
+        return buf.toString();
     }
 
     public String toString(IonTextWriterBuilder writerBuilder)
@@ -971,7 +991,7 @@ final void writeChildren(IonWriter writer, Iterable<IonValue> container,
     final void writeTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
     {
         if (writer.isInStruct()
-            && ! ((PrivateIonWriter) writer).isFieldNameSet())
+            && ! ((_Private_IonWriter) writer).isFieldNameSet())
         {
             SymbolToken tok = getFieldNameSymbol(symbolTableProvider);
             if (tok == null)
@@ -1176,4 +1196,3 @@ public String validate()
  *   private SymbolTable      _symbolTable;
  *
  */
-
diff --git a/src/software/amazon/ion/impl/lite/ReverseBinaryEncoder.java b/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java
similarity index 90%
rename from src/software/amazon/ion/impl/lite/ReverseBinaryEncoder.java
rename to src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java
index 439128c552..250ca1e0f9 100644
--- a/src/software/amazon/ion/impl/lite/ReverseBinaryEncoder.java
+++ b/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java
@@ -1,74 +1,75 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
-
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.SystemSymbols.IMPORTS_SID;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
-import static software.amazon.ion.SystemSymbols.MAX_ID_SID;
-import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.SystemSymbols.SYMBOLS_SID;
-import static software.amazon.ion.SystemSymbols.VERSION_SID;
-import static software.amazon.ion.impl.PrivateIonConstants.BINARY_VERSION_MARKER_1_0;
-import static software.amazon.ion.impl.PrivateIonConstants.lnBooleanFalse;
-import static software.amazon.ion.impl.PrivateIonConstants.lnBooleanTrue;
-import static software.amazon.ion.impl.PrivateIonConstants.lnIsNull;
-import static software.amazon.ion.impl.PrivateIonConstants.lnIsVarLen;
-import static software.amazon.ion.impl.PrivateIonConstants.tidBlob;
-import static software.amazon.ion.impl.PrivateIonConstants.tidBoolean;
-import static software.amazon.ion.impl.PrivateIonConstants.tidClob;
-import static software.amazon.ion.impl.PrivateIonConstants.tidDecimal;
-import static software.amazon.ion.impl.PrivateIonConstants.tidFloat;
-import static software.amazon.ion.impl.PrivateIonConstants.tidList;
-import static software.amazon.ion.impl.PrivateIonConstants.tidNegInt;
-import static software.amazon.ion.impl.PrivateIonConstants.tidNull;
-import static software.amazon.ion.impl.PrivateIonConstants.tidPosInt;
-import static software.amazon.ion.impl.PrivateIonConstants.tidSexp;
-import static software.amazon.ion.impl.PrivateIonConstants.tidString;
-import static software.amazon.ion.impl.PrivateIonConstants.tidStruct;
-import static software.amazon.ion.impl.PrivateIonConstants.tidSymbol;
-import static software.amazon.ion.impl.PrivateIonConstants.tidTimestamp;
-import static software.amazon.ion.impl.PrivateIonConstants.tidTypedecl;
-
+package com.amazon.ion.impl.lite;
+
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
+import static com.amazon.ion.SystemSymbols.MAX_ID_SID;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.SystemSymbols.SYMBOLS_SID;
+import static com.amazon.ion.SystemSymbols.VERSION_SID;
+import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
+import static com.amazon.ion.impl._Private_IonConstants.lnBooleanFalse;
+import static com.amazon.ion.impl._Private_IonConstants.lnBooleanTrue;
+import static com.amazon.ion.impl._Private_IonConstants.lnIsNull;
+import static com.amazon.ion.impl._Private_IonConstants.lnIsVarLen;
+import static com.amazon.ion.impl._Private_IonConstants.tidBlob;
+import static com.amazon.ion.impl._Private_IonConstants.tidBoolean;
+import static com.amazon.ion.impl._Private_IonConstants.tidClob;
+import static com.amazon.ion.impl._Private_IonConstants.tidDecimal;
+import static com.amazon.ion.impl._Private_IonConstants.tidFloat;
+import static com.amazon.ion.impl._Private_IonConstants.tidList;
+import static com.amazon.ion.impl._Private_IonConstants.tidNegInt;
+import static com.amazon.ion.impl._Private_IonConstants.tidNull;
+import static com.amazon.ion.impl._Private_IonConstants.tidPosInt;
+import static com.amazon.ion.impl._Private_IonConstants.tidSexp;
+import static com.amazon.ion.impl._Private_IonConstants.tidString;
+import static com.amazon.ion.impl._Private_IonConstants.tidStruct;
+import static com.amazon.ion.impl._Private_IonConstants.tidSymbol;
+import static com.amazon.ion.impl._Private_IonConstants.tidTimestamp;
+import static com.amazon.ion.impl._Private_IonConstants.tidTypedecl;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonBlob;
+import com.amazon.ion.IonBool;
+import com.amazon.ion.IonClob;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonDecimal;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonFloat;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonSexp;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.ListIterator;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonBlob;
-import software.amazon.ion.IonBool;
-import software.amazon.ion.IonClob;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonSexp;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
 
 
 /**
@@ -167,6 +168,55 @@ byte[] toNewByteArray()
         return bytes;
     }
 
+    /**
+     * Copies the current contents of the Ion binary-encoded byte array into a
+     * a given byte array.
+     * <p>
+     * The given array must be large enough to contain all the bytes of the
+     * Ion binary-encoded byte array.
+     * <p>
+     * This makes an unchecked assumption that {{@link #serialize(IonDatagram)}
+     * is already called.
+     * <p>
+     * TODO To be deprecated along with {@link IonDatagram#getBytes(byte[])}
+     *
+     * @param dst the byte array into which bytes are to be written
+     *
+     * @return the number of bytes copied into {@code dst}
+     */
+    int toNewByteArray(byte[] dst)
+    {
+        int length = myBuffer.length - myOffset;
+        System.arraycopy(myBuffer, myOffset, dst, 0, length);
+        return length;
+    }
+
+    /**
+     * Copies the current contents of the Ion binary-encoded byte array into a
+     * a given byte sub-array.
+     * <p>
+     * The given sub-array must be large enough to contain all the bytes of the
+     * Ion binary-encoded byte array.
+     * <p>
+     * This makes an unchecked assumption that {{@link #serialize(IonDatagram)}
+     * is already called.
+     * <p>
+     * TODO To be deprecated along with {@link IonDatagram#getBytes(byte[], int)}
+     *
+     * @param dst the byte sub-array into which bytes are to be written
+     * @param offset the offset within the sub-array of the first byte to be
+     *          written; must be non-negative and no larger
+     *          than {@code dst.length}
+     *
+     * @return the number of bytes copied into {@code dst}
+     */
+    int toNewByteArray(byte[] dst, int offset)
+    {
+        int length = myBuffer.length - myOffset;
+        System.arraycopy(myBuffer, myOffset, dst, offset, length);
+        return length;
+    }
+
     /**
      * Copies the current contents of the Ion binary-encoded byte array to a
      * specified stream.
@@ -644,6 +694,10 @@ private void writeIonBoolContent(IonBool val)
         writeByte(encoded);
     }
 
+    /**
+     * @see IonBinary#writeUIntValue(BigInteger value, int len)
+     * @param val
+     */
     private void writeIonIntContent(IonInt val)
     {
         if (val.isNullValue())
@@ -747,7 +801,7 @@ private void writeIonFloatContent(IonFloat val)
     private static final byte[] positiveZeroBitArray = new byte[0];
 
     /**
-     * @see software.amazon.ion.impl.IonBinary.Writer#writeDecimalContent
+     * @see com.amazon.ion.impl.IonBinary.Writer#writeDecimalContent
      */
     private void writeIonDecimalContent(BigDecimal bd)
     {
@@ -821,6 +875,7 @@ private void writeIonTimestampContent(IonTimestamp val)
             switch (t.getPrecision())
             {
                 // Fall through each case - by design
+                case FRACTION:
                 case SECOND:
                 {
                     BigDecimal fraction = t.getZFractionalSecond();
@@ -1106,7 +1161,7 @@ private void writeIonStructContent(IonStruct val)
         {
             final int originalOffset = myBuffer.length - myOffset;
 
-            // TODO amzn/ion-java#31 should not preserve the ordering of fields
+            // TODO amzn/ion-java/issues/31 should not preserve the ordering of fields
             ArrayList<IonValue> values = new ArrayList<IonValue>();
 
             // Fill ArrayList with IonValues, the add() just copies the
@@ -1127,7 +1182,7 @@ private void writeIonStructContent(IonStruct val)
                 writeVarUInt(sid);
             }
 
-            // TODO amzn/ion-java#41 Detect if the struct fields are sorted in ascending
+            // TODO amzn/ion-java/issues/41 Detect if the struct fields are sorted in ascending
             // order of Sids. If so, 1 should be written into 'length' field.
             // Note that this 'length' field is not the same as the four-bit
             // length L in the type descriptor octet.
@@ -1218,7 +1273,7 @@ private int findSid(SymbolToken symToken)
      *    have different Ion versions.
      * </ul>
      *
-     * TODO amzn/ion-java#25 Currently, {@link IonDatagram#systemIterator()} doesn't
+     * TODO amzn/ion-java/issues/25 Currently, {@link IonDatagram#systemIterator()} doesn't
      * retain information about interspersed IVMs within the IonDatagram.
      * As such, we cannot obtain the location of interspersed IVMs, if any.
      *
diff --git a/src/software/amazon/ion/impl/lite/TopLevelContext.java b/src/com/amazon/ion/impl/lite/TopLevelContext.java
similarity index 76%
rename from src/software/amazon/ion/impl/lite/TopLevelContext.java
rename to src/com/amazon/ion/impl/lite/TopLevelContext.java
index 51beee8349..797ff6c9cc 100644
--- a/src/software/amazon/ion/impl/lite/TopLevelContext.java
+++ b/src/com/amazon/ion/impl/lite/TopLevelContext.java
@@ -1,20 +1,21 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
-import software.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolTable;
 
 
 /**
@@ -39,7 +40,7 @@ final class TopLevelContext
      * symbol table and following the parent/owning_context
      * chain will lead to a system object.
      * <p>
-     * TODO amzn/ion-java#19 we cannot assume that the IonSystem knows the proper IVM
+     * TODO amzn/ion-java/issues/19 we cannot assume that the IonSystem knows the proper IVM
      * in this context
      */
     private final SymbolTable _symbols;
diff --git a/src/software/amazon/ion/impl/lite/ValueFactoryLite.java b/src/com/amazon/ion/impl/lite/ValueFactoryLite.java
similarity index 90%
rename from src/software/amazon/ion/impl/lite/ValueFactoryLite.java
rename to src/com/amazon/ion/impl/lite/ValueFactoryLite.java
index a0609d0888..9d9800f9b9 100644
--- a/src/software/amazon/ion/impl/lite/ValueFactoryLite.java
+++ b/src/com/amazon/ion/impl/lite/ValueFactoryLite.java
@@ -1,36 +1,37 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
-
+package com.amazon.ion.impl.lite;
+
+import com.amazon.ion.ContainedValueException;
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonSexp;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl._Private_LocalSymbolTableFactory;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.impl._Private_ValueFactory;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonSexp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.impl.PrivateLocalSymbolTableFactory;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.impl.PrivateValueFactory;
 
 /**
  *  This class handles all of the IonValueLite
@@ -38,14 +39,14 @@
  *
  */
 abstract class ValueFactoryLite
-    implements PrivateValueFactory
+    implements _Private_ValueFactory
 {
-    protected final PrivateLocalSymbolTableFactory _lstFactory;
+    protected final _Private_LocalSymbolTableFactory _lstFactory;
     private ContainerlessContext _context;
 
     ValueFactoryLite()
     {
-        _lstFactory = PrivateUtils.newLocalSymbolTableAsStructFactory(this);
+        _lstFactory = _Private_Utils.newLocalSymbolTableAsStructFactory(this);
     }
 
     protected void set_system(IonSystemLite system) {
@@ -445,8 +446,7 @@ private ArrayList<IonIntLite> newInts(long[] elements)
         return e;
     }
 
-    @Override
-    public PrivateLocalSymbolTableFactory getLstFactory()
+    public _Private_LocalSymbolTableFactory getLstFactory()
     {
         return _lstFactory;
     }
diff --git a/src/software/amazon/ion/impl/lite/PrivateLiteDomTrampoline.java b/src/com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java
similarity index 50%
rename from src/software/amazon/ion/impl/lite/PrivateLiteDomTrampoline.java
rename to src/com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java
index eeeddab03b..d9749aa3ac 100644
--- a/src/software/amazon/ion/impl/lite/PrivateLiteDomTrampoline.java
+++ b/src/com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java
@@ -1,36 +1,36 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
+package com.amazon.ion.impl.lite;
 
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.impl.PrivateIonBinaryWriterBuilder;
-import software.amazon.ion.system.IonReaderBuilder;
-import software.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder;
 
 /**
+ * NOT FOR APPLICATION USE!
+ * <p>
  * Isolates private APIs that are needed from other packages in this library.
- *
- * @deprecated This is an internal API that is subject to change without notice.
+ * The leading _ reduces the chance of somebody finding this via autocomplete.
  */
-@Deprecated
-public final class PrivateLiteDomTrampoline
+public final class _Private_LiteDomTrampoline
 {
-
     public static IonSystem newLiteSystem(IonTextWriterBuilder twb,
-                                          PrivateIonBinaryWriterBuilder bwb,
+                                          _Private_IonBinaryWriterBuilder bwb,
                                           IonReaderBuilder rb)
     {
         return new IonSystemLite(twb, bwb, rb);
diff --git a/src/software/amazon/ion/overview.html b/src/com/amazon/ion/overview.html
similarity index 65%
rename from src/software/amazon/ion/overview.html
rename to src/com/amazon/ion/overview.html
index c62f1e4d7a..cf81a4bda3 100644
--- a/src/software/amazon/ion/overview.html
+++ b/src/com/amazon/ion/overview.html
@@ -1,44 +1,68 @@
-<!-- Copyright (c) 2007-2016 Amazon.com, Inc.  All rights reserved. -->
+<!--
+  ~ Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License").
+  ~ You may not use this file except in compliance with the License.
+  ~ A copy of the License is located at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ or in the "license" file accompanying this file. This file is distributed
+  ~ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+  ~ express or implied. See the License for the specific language governing
+  ~ permissions and limitations under the License.
+  -->
+
 <html>
 <body>
-Amazon Ion Java is the reference implementation of the
-<a href="http://amzn.github.io/ion-docs/spec.html">Ion data notation</a> for the
-Java<sup><font size="-4">TM</font></sup> Platform Standard Edition 8
+ion-java is the reference implementation of the
+<a href="http://amzn.github.io/ion-docs/docs/spec.html">Ion data notation</a> for the
+Java<sup><font size="-4">TM</font></sup> 2 Platform Standard Edition 5.0
 and above.
 <p>
 This document describes all APIs intended for public consumption, limited to
 the packages listed here. The ion-java library distribution includes other
-packages not documented here; use of those packages is not supported.
+packages not documented here; use of those packages is not supported,
+so <b>don't use them</b>!
 <p>
 More generally:
 <b>Any behavior or features not present in this API documentation is
 unsupported, probably untested, and subject to change without notice.</b>
 <p>
 In addition, unless otherwise noted, <b>interfaces and classes listed here
-should not be implemented or extended by code outside of this library</b>. We
+should not be implemented or extended by code outside of this library</b>! We
 may add or remove API(s) of existing interfaces or classes in future releases.
+If your application does not observe these warnings, it will impede the release
+cycle of this library.
 
 <h1>Start at IonSystem</h1>
 
-The central interface in ion-java is {@link software.amazon.ion.IonSystem}, which is
+The central interface in ion-java is {@link com.amazon.ion.IonSystem}, which is
 the main factory and facade for all Ion processing.
 The intended architectural pattern is for your application to build a
 single system instance and use it
 throughout the application.  The {@code IonSystem} interface provides access
 to all other components, including the capability to construct
-{@link software.amazon.ion.IonValue IonValue} hierarchies.
+{@link com.amazon.ion.IonValue IonValue} hierarchies.
 <p>
 What all this means is that your first task is acquiring a system instance, and
 for that we turn to
-{@link software.amazon.ion.system.IonSystemBuilder IonSystemBuilder}.
+{@link com.amazon.ion.system.IonSystemBuilder IonSystemBuilder}.
 Here's the easiest way to bootstrap:
 <pre>
     IonSystem ion = IonSystemBuilder.standard().build();
 </pre>
 That should be sufficient for many, but not all, applications.  Long-running
 services will probably want to use a non-default
-{@linkplain software.amazon.ion.IonCatalog catalog} by configuring the builder
-before calling {@link software.amazon.ion.system.IonSystemBuilder#build() build()}.
+{@linkplain com.amazon.ion.IonCatalog catalog} by configuring the builder
+before calling {@link com.amazon.ion.system.IonSystemBuilder#build() build()}.
+
+<h2>SystemFactory is Deprecated</h2>
+
+As of early 2011, the {@link com.amazon.ion.system.SystemFactory SystemFactory}
+class has been deprecated in favor of {@code IonSystemBuilder}.
+This should be a straightforward application change and we strongly recommend
+that all applications update.
 
 <h2>An Important Caveat</h2>
 Objects returned by one {@code IonSystem} cannot by mixed with objects returned
@@ -55,7 +79,7 @@ <h2>An Important Caveat</h2>
 </pre>
 
 Given any {@code IonValue} instance it is possible to retrieve the relevant
-system via {@link software.amazon.ion.IonValue#getSystem()}.
+system via {@link com.amazon.ion.IonValue#getSystem()}.
 This is generally the best way to ensure
 that you're using the correct system while modifying existing trees.
 You can also use the "Curried" insertion methods to add new values to
@@ -70,14 +94,14 @@ <h1>Getting Data In</h1>
 
 This release defines three mechanisms for accepting Ion data:
 <ul>
-  <li>{@link software.amazon.ion.IonReader IonReader} scans an input stream using a
+  <li>{@link com.amazon.ion.IonReader IonReader} scans an input stream using a
     "pull parsing" paradigm. This is a low-level, high-performance API, and
     the other mechanisms are built on top of it.
   <li>Iteration reads an input stream by
     iterating over its top-level elements.  This "one at a time" input
     mechanism is intended for stream-oriented applications.
-  <li>{@link software.amazon.ion.IonLoader IonLoader} loads an entire input stream
-    into a single {@linkplain software.amazon.ion.IonDatagram datagram}.
+  <li>{@link com.amazon.ion.IonLoader IonLoader} loads an entire input stream
+    into a single {@linkplain com.amazon.ion.IonDatagram datagram}.
     This "all at once" input mechanism is intended for document-oriented
     applications.
 </ul>
@@ -87,42 +111,42 @@ <h1>Getting Data In</h1>
 <p>
 To construct an {@code IonReader}, call one of the {@code newReader} methods
 on {@code IonSystem}; for example
-{@link software.amazon.ion.IonSystem#newReader(InputStream)}.
+{@link com.amazon.ion.IonSystem#newReader(InputStream)}.
 You can then pull data from the reader. Don't forget to
-{@link software.amazon.ion.IonReader#close() close} it when you're done!
+{@link com.amazon.ion.IonReader#close() close} it when you're done!
 <p>
 Ion iterators are extensions of
 {@link java.util.Iterator} so they are used once and then discarded.
 Use the various {@code iterate} methods on {@code IonSystem} to
 create them; for example
-{@link software.amazon.ion.IonSystem#iterate(InputStream)}.
+{@link com.amazon.ion.IonSystem#iterate(InputStream)}.
 <p>
 To construct an {@code IonLoader}, call
-{@link software.amazon.ion.IonSystem#newLoader()} and configure it as necessary.
+{@link com.amazon.ion.IonSystem#newLoader()} and configure it as necessary.
 {@code IonLoaders} are safe for use by multiple threads. The {@code IonSystem}
 also maintains a "default loader" so you don't have to pass one around, see
-{@link software.amazon.ion.IonSystem#getLoader()}.
+{@link com.amazon.ion.IonSystem#getLoader()}.
 
 <h1>Getting Data Out</h1>
 
 There's also several mechanisms for generating Ion data:
 <ul>
-  <li>{@link software.amazon.ion.IonWriter IonWriter} is the low-level API for
+  <li>{@link com.amazon.ion.IonWriter IonWriter} is the low-level API for
     generating Ion data in some form. It's agnostic to the output format; in
     theory the actual output could be some other format entirely.
-  <li>{@link software.amazon.ion.IonValue#toString() IonValue.toString()} will also
+  <li>{@link com.amazon.ion.IonValue#toString() IonValue.toString()} will also
     generate Ion text, but it's primarily intended for debugging purposes and
     cannot be customized.  The particular layout is not specified by contract,
     so don't assume that it will always output the same thing!
-  <li>{@link software.amazon.ion.IonValue#writeTo(IonWriter)} outputs Ion data in
+  <li>{@link com.amazon.ion.IonValue#writeTo(IonWriter)} outputs Ion data in
     the writer's format. This is the best way to output the data model.
-  <li>From an {@link software.amazon.ion.IonDatagram IonDatagram} you can call
-    {@link software.amazon.ion.IonDatagram#getBytes() getBytes()} to get Ion
+  <li>From an {@link com.amazon.ion.IonDatagram IonDatagram} you can call
+    {@link com.amazon.ion.IonDatagram#getBytes() getBytes()} to get Ion
     binary data.
 </ul>
 
 You can create {@code IonWriter}s using methods on {@code IonSystem}, but the
-{@link software.amazon.ion.system.IonTextWriterBuilder} provides more flexibility.
+{@link com.amazon.ion.system.IonTextWriterBuilder} provides more flexibility.
 
 <h2>No Canonical Serialization</h2>
 
@@ -141,25 +165,26 @@ <h2>No Canonical Serialization</h2>
     assertEquals(expectedIonValue.toString(), actualIonValue.toString());
 </pre>
 The same goes for output via any other API, including
-{@link software.amazon.ion.IonWriter IonWriter}s.
+{@link com.amazon.ion.IonWriter IonWriter}s.
 <p>
 The correct approach to performing semantic equivalence checks over Ion data is
 to use documented equivalence APIs such as
-{@link software.amazon.ion.IonValue#equals(Object) IonValue.equals()}. 
+{@link com.amazon.ion.IonValue#equals(Object) IonValue.equals()}.
 
 <h1>JSON Integration</h1>
 The Ion text format is a superset of JSON, so JSON data <em>is</em> Ion data.
 This means that you can read JSON data as-is using the Ion libraries, with a
 caveat:
-<ul>
   <li>JSON numbers with exponents are decoded as Ion float, while those with
       fractions (but not exponents) are decoded as Ion decimal.
 </ul>
 <p>
 To output JSON with this library, Ion data can be "downconverted" to JSON
 format using an
-{@link software.amazon.ion.system.IonTextWriterBuilder IonTextWriterBuilder}.
+{@link com.amazon.ion.system.IonTextWriterBuilder IonTextWriterBuilder}.
 This replaces Ion-only datatypes with more-or-less equivalent JSON values.
+(The {@link com.amazon.ion.util.Printer Printer} can also be used, but it is
+no longer recommended and will be deprecated.)
 
 <h1>Thread Safety</h1>
 
diff --git a/src/com/amazon/ion/package-info.java b/src/com/amazon/ion/package-info.java
new file mode 100644
index 0000000000..9923ef22b4
--- /dev/null
+++ b/src/com/amazon/ion/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * Public interfaces of the core Ion system.
+ */
+package com.amazon.ion;
diff --git a/src/software/amazon/ion/system/IonBinaryWriterBuilder.java b/src/com/amazon/ion/system/IonBinaryWriterBuilder.java
similarity index 92%
rename from src/software/amazon/ion/system/IonBinaryWriterBuilder.java
rename to src/com/amazon/ion/system/IonBinaryWriterBuilder.java
index eddc25b362..c6d6a0e545 100644
--- a/src/software/amazon/ion/system/IonBinaryWriterBuilder.java
+++ b/src/com/amazon/ion/system/IonBinaryWriterBuilder.java
@@ -1,25 +1,26 @@
 /*
- * Copyright 2014-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
 
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SubstituteSymbolTableException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.impl.PrivateIonBinaryWriterBuilder;
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SubstituteSymbolTableException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
 
 
 /**
@@ -33,6 +34,7 @@
  * <p>
  * <b>Instances of this class are not not safe for use by multiple threads
  * unless they are {@linkplain #immutable() immutable}.</b>
+ *
  */
 public abstract class IonBinaryWriterBuilder
     extends IonWriterBuilderBase<IonBinaryWriterBuilder>
@@ -64,7 +66,7 @@ protected IonBinaryWriterBuilder(IonBinaryWriterBuilder that)
      */
     public static IonBinaryWriterBuilder standard()
     {
-        return PrivateIonBinaryWriterBuilder.standard();
+        return _Private_IonBinaryWriterBuilder.standard();
     }
 
 
diff --git a/src/software/amazon/ion/system/IonReaderBuilder.java b/src/com/amazon/ion/system/IonReaderBuilder.java
similarity index 91%
rename from src/software/amazon/ion/system/IonReaderBuilder.java
rename to src/com/amazon/ion/system/IonReaderBuilder.java
index 7366ba52d9..895933b43d 100644
--- a/src/software/amazon/ion/system/IonReaderBuilder.java
+++ b/src/com/amazon/ion/system/IonReaderBuilder.java
@@ -1,30 +1,32 @@
 /*
- * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
 
-import static software.amazon.ion.impl.PrivateIonReaderFactory.makeReader;
+import static com.amazon.ion.impl._Private_IonReaderFactory.makeReader;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonTextReader;
+import com.amazon.ion.IonValue;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonValue;
 
 /**
  * Build a new {@link IonReader} from the given {@link IonCatalog} and data
@@ -268,7 +270,7 @@ public IonReader build(IonValue value)
      *
      * @see IonSystem#newReader(String)
      */
-    public IonReader build(String ionText)
+    public IonTextReader build(String ionText)
     {
         return makeReader(validateCatalog(), ionText);
     }
diff --git a/src/software/amazon/ion/system/IonSystemBuilder.java b/src/com/amazon/ion/system/IonSystemBuilder.java
similarity index 89%
rename from src/software/amazon/ion/system/IonSystemBuilder.java
rename to src/com/amazon/ion/system/IonSystemBuilder.java
index 982f251d1f..22141e83b7 100644
--- a/src/software/amazon/ion/system/IonSystemBuilder.java
+++ b/src/com/amazon/ion/system/IonSystemBuilder.java
@@ -1,28 +1,29 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
 
-import static software.amazon.ion.impl.lite.PrivateLiteDomTrampoline.newLiteSystem;
+import static com.amazon.ion.impl.lite._Private_LiteDomTrampoline.newLiteSystem;
 
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.impl.PrivateIonBinaryWriterBuilder;
-import software.amazon.ion.impl.PrivateUtils;
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
+import com.amazon.ion.impl._Private_Utils;
 
 /**
  * The builder for creating {@link IonSystem}s.
@@ -103,7 +104,10 @@ public static IonSystemBuilder standard()
 
 
     /** You no touchy. */
-    private IonSystemBuilder() {}
+    private IonSystemBuilder()
+    {
+        // empty
+    }
 
     private IonSystemBuilder(IonSystemBuilder that)
     {
@@ -127,6 +131,7 @@ public final IonSystemBuilder copy()
      *
      * @return this instance, if immutable;
      * otherwise an immutable copy of this instance.
+     *
      */
     public IonSystemBuilder immutable()
     {
@@ -138,6 +143,8 @@ public IonSystemBuilder immutable()
      *
      * @return this instance, if mutable;
      * otherwise a mutable copy of this instance.
+     *
+
      */
     public IonSystemBuilder mutable()
     {
@@ -213,6 +220,8 @@ public final IonSystemBuilder withCatalog(IonCatalog catalog)
      *
      * @see #setStreamCopyOptimized(boolean)
      * @see #withStreamCopyOptimized(boolean)
+     *
+
      */
     public final boolean isStreamCopyOptimized()
     {
@@ -231,6 +240,8 @@ public final boolean isStreamCopyOptimized()
      *
      * @see #isStreamCopyOptimized()
      * @see #withStreamCopyOptimized(boolean)
+     *
+
      */
     public final void setStreamCopyOptimized(boolean optimized)
     {
@@ -248,6 +259,8 @@ public final void setStreamCopyOptimized(boolean optimized)
      *
      * @see #isStreamCopyOptimized()
      * @see #setStreamCopyOptimized(boolean)
+     *
+
      */
     public final IonSystemBuilder withStreamCopyOptimized(boolean optimized)
     {
@@ -273,21 +286,22 @@ public final IonSystem build()
             IonTextWriterBuilder.standard().withCharsetAscii();
         twb.setCatalog(catalog);
 
-        PrivateIonBinaryWriterBuilder bwb =
-            PrivateIonBinaryWriterBuilder.standard();
+        _Private_IonBinaryWriterBuilder bwb =
+            _Private_IonBinaryWriterBuilder.standard();
         bwb.setCatalog(catalog);
         bwb.setStreamCopyOptimized(myStreamCopyOptimized);
 
         // TODO Would be nice to remove this since it's implied by the BWB.
         //      However that currently causes problems in the IonSystem
         //      constructors (which get a null initialSymtab).
-        SymbolTable systemSymtab = PrivateUtils.systemSymtab(1);
+        SymbolTable systemSymtab = _Private_Utils.systemSymtab(1);
         bwb.setInitialSymbolTable(systemSymtab);
         // This is what we need, more or less.
 //        bwb = bwb.fillDefaults();
-
         IonReaderBuilder rb = IonReaderBuilder.standard().withCatalog(catalog);
-        return newLiteSystem(twb, bwb, rb);
+        IonSystem sys = newLiteSystem(twb, bwb, rb);
+
+        return sys;
     }
 
     //=========================================================================
diff --git a/src/software/amazon/ion/system/IonTextWriterBuilder.java b/src/com/amazon/ion/system/IonTextWriterBuilder.java
similarity index 94%
rename from src/software/amazon/ion/system/IonTextWriterBuilder.java
rename to src/com/amazon/ion/system/IonTextWriterBuilder.java
index 19035470ca..daa90ff689 100644
--- a/src/software/amazon/ion/system/IonTextWriterBuilder.java
+++ b/src/com/amazon/ion/system/IonTextWriterBuilder.java
@@ -1,28 +1,29 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
 
-import static software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.SUPPRESS;
+import static com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.SUPPRESS;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.impl._Private_IonTextWriterBuilder;
+import com.amazon.ion.impl._Private_Utils;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.impl.PrivateIonTextWriterBuilder;
-import software.amazon.ion.impl.PrivateUtils;
 
 /**
  * The builder for creating {@link IonWriter}s emitting the Ion text syntax.
@@ -65,8 +66,9 @@
  * <p>
  * Currently, there is no configuration point available to disable the
  * auto-flushing mechanism. Please vote on
- * <a href="https://github.com/amzn/ion-java/issues/32">issue amzn/ion-java#32</a>
+ * <a href="https://github.com/amzn/ion-java/issues/32">issue amzn/ion-java/issues/32</a>
  * if you require it.
+ *
  */
 public abstract class IonTextWriterBuilder
     extends IonWriterBuilderBase<IonTextWriterBuilder>
@@ -75,6 +77,8 @@ public abstract class IonTextWriterBuilder
      * A strategy for minimizing the output of local symbol tables.
      * By default, no minimization takes place and the writer outputs all data
      * as-is.
+     *
+
      */
     public enum LstMinimizing
     {
@@ -91,7 +95,7 @@ public enum LstMinimizing
 
         /**
          * Discards everything, collapsing the LST to an IVM.
-         * If {@link software.amazon.ion.system.IonWriterBuilder.IvmMinimizing}
+         * If {@link com.amazon.ion.system.IonWriterBuilder.IvmMinimizing}
          * is also in effect, then even that IVM may be suppressed.
          *
          * @see IonTextWriterBuilder#setIvmMinimizing(IonWriterBuilder.IvmMinimizing)
@@ -102,12 +106,12 @@ public enum LstMinimizing
     /**
      * The {@code "US-ASCII"} charset.
      */
-    public static final Charset ASCII = PrivateUtils.ASCII_CHARSET;
+    public static final Charset ASCII = _Private_Utils.ASCII_CHARSET;
 
     /**
      * The {@code "UTF-8"} charset.
      */
-    public static final Charset UTF8 = PrivateUtils.UTF8_CHARSET;
+    public static final Charset UTF8 = _Private_Utils.UTF8_CHARSET;
 
 
     /**
@@ -124,7 +128,7 @@ public enum LstMinimizing
      */
     public static IonTextWriterBuilder standard()
     {
-        return PrivateIonTextWriterBuilder.standard();
+        return _Private_IonTextWriterBuilder.standard();
     }
 
     /**
@@ -134,6 +138,8 @@ public static IonTextWriterBuilder standard()
      * @return a new, mutable builder instance.
      *
      * @see #withMinimalSystemData()
+     *
+
      */
     public static IonTextWriterBuilder minimal()
     {
@@ -322,6 +328,8 @@ public final IonTextWriterBuilder withCharsetAscii()
      *
      * @return this instance, if mutable;
      * otherwise a mutable copy of this instance.
+     *
+
      */
     public final IonTextWriterBuilder withMinimalSystemData()
     {
@@ -444,6 +452,8 @@ public void setInitialIvmHandling(InitialIvmHandling handling)
      *
      * @see #setIvmMinimizing(IonWriterBuilder.IvmMinimizing)
      * @see #withIvmMinimizing(IonWriterBuilder.IvmMinimizing)
+     *
+
      */
     @Override
     public final IvmMinimizing getIvmMinimizing()
@@ -462,6 +472,8 @@ public final IvmMinimizing getIvmMinimizing()
      * @see #withIvmMinimizing(IonWriterBuilder.IvmMinimizing)
      *
      * @throws UnsupportedOperationException if this is immutable.
+     *
+
      */
     public void setIvmMinimizing(IvmMinimizing minimizing)
     {
@@ -482,6 +494,8 @@ public void setIvmMinimizing(IvmMinimizing minimizing)
      *
      * @see #setIvmMinimizing(IonWriterBuilder.IvmMinimizing)
      * @see #getIvmMinimizing()
+     *
+
      */
     public final IonTextWriterBuilder
     withIvmMinimizing(IvmMinimizing minimizing)
@@ -500,6 +514,8 @@ public void setIvmMinimizing(IvmMinimizing minimizing)
      *
      * @see #setLstMinimizing(LstMinimizing)
      * @see #withLstMinimizing(LstMinimizing)
+     *
+
      */
     public final LstMinimizing getLstMinimizing()
     {
@@ -518,6 +534,8 @@ public final LstMinimizing getLstMinimizing()
      * @see #withLstMinimizing(LstMinimizing)
      *
      * @throws UnsupportedOperationException if this is immutable.
+     *
+
      */
     public void setLstMinimizing(LstMinimizing minimizing)
     {
@@ -538,6 +556,8 @@ public void setLstMinimizing(LstMinimizing minimizing)
      *
      * @see #getLstMinimizing()
      * @see #setLstMinimizing(LstMinimizing)
+     *
+
      */
     public final IonTextWriterBuilder
     withLstMinimizing(LstMinimizing minimizing)
diff --git a/src/software/amazon/ion/system/IonWriterBuilder.java b/src/com/amazon/ion/system/IonWriterBuilder.java
similarity index 86%
rename from src/software/amazon/ion/system/IonWriterBuilder.java
rename to src/com/amazon/ion/system/IonWriterBuilder.java
index d99221e299..f61f170822 100644
--- a/src/software/amazon/ion/system/IonWriterBuilder.java
+++ b/src/com/amazon/ion/system/IonWriterBuilder.java
@@ -1,27 +1,30 @@
 /*
- * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
 
 import java.io.OutputStream;
-import software.amazon.ion.IonWriter;
+import com.amazon.ion.IonWriter;
 
 /**
  * Common options for writing Ion data streams of any form.
  * <p>
  * <b>WARNING:</b> This class should not be extended by code outside of
  * this library.
+ * <p>
+ *
  */
 public abstract class IonWriterBuilder
 {
@@ -37,6 +40,8 @@ public enum InitialIvmHandling
          * Always emits an initial IVM, even when the user hasn't explicitly
          * written one.  If the user <em>does</em> write one, this won't
          * cause an extra to be emitted.
+         *
+
          */
         ENSURE,
 
@@ -55,6 +60,8 @@ public enum InitialIvmHandling
      * stream; that's the job of {@link InitialIvmHandling}.
      *
      * @see IonTextWriterBuilder#setIvmMinimizing(IonWriterBuilder.IvmMinimizing)
+     *
+
      */
     public enum IvmMinimizing
     {
@@ -97,6 +104,8 @@ public enum IvmMinimizing
      * stream; that's the job of {@link InitialIvmHandling}.
      *
      * @return the IVM minimizing strategy.
+     *
+
      */
     public abstract IvmMinimizing getIvmMinimizing();
 
diff --git a/src/software/amazon/ion/system/IonWriterBuilderBase.java b/src/com/amazon/ion/system/IonWriterBuilderBase.java
similarity index 91%
rename from src/software/amazon/ion/system/IonWriterBuilderBase.java
rename to src/com/amazon/ion/system/IonWriterBuilderBase.java
index 9ada86f8b1..a36601e845 100644
--- a/src/software/amazon/ion/system/IonWriterBuilderBase.java
+++ b/src/com/amazon/ion/system/IonWriterBuilderBase.java
@@ -1,22 +1,24 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
+
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
 
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
 
 
 abstract class IonWriterBuilderBase<T extends IonWriterBuilderBase>
diff --git a/src/software/amazon/ion/system/SimpleCatalog.java b/src/com/amazon/ion/system/SimpleCatalog.java
similarity index 92%
rename from src/software/amazon/ion/system/SimpleCatalog.java
rename to src/com/amazon/ion/system/SimpleCatalog.java
index 557ef3487d..7ce65756f0 100644
--- a/src/software/amazon/ion/system/SimpleCatalog.java
+++ b/src/com/amazon/ion/system/SimpleCatalog.java
@@ -1,28 +1,29 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonMutableCatalog;
+import com.amazon.ion.SymbolTable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonMutableCatalog;
-import software.amazon.ion.SymbolTable;
 
 
 /**
diff --git a/src/com/amazon/ion/system/SystemFactory.java b/src/com/amazon/ion/system/SystemFactory.java
new file mode 100644
index 0000000000..fe4d209f5f
--- /dev/null
+++ b/src/com/amazon/ion/system/SystemFactory.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.system;
+
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonSystem;
+
+/**
+ * The factory for creating {@link IonSystem}s.
+ * Most applications will only have one or two system instances;
+ * see {@link IonSystem} for important constraints.
+ * <p>
+ * Most long-lived applications will want to provide a custom
+ * {@link IonCatalog} implementation rather than using the default
+ * {@link SimpleCatalog}.
+ *
+ * @deprecated Use the more configurable {@link IonSystemBuilder} instead.
+ */
+@Deprecated
+public final class SystemFactory
+{
+    /**
+     * Constructs a new system instance with a default configuration.
+     * <p>
+     * The catalog used by the new instance will be a {@link SimpleCatalog}
+     * with no initial entries, so please be aware of the limitations of that
+     * class.
+     *
+     * @return a new {@link IonSystem} instance; not null.
+     *
+     * @deprecated Use {@link IonSystemBuilder IonSystemBuilder.standard().build()} instead.
+     */
+    @Deprecated
+    public static IonSystem newSystem()
+    {
+        return IonSystemBuilder.standard().build();
+    }
+
+    /**
+     * Constructs a new system instance with the given catalog.
+     *
+     * @param catalog the catalog to use in the new system.
+     *   If null, a new {@link SimpleCatalog} will be used.
+     * @return a new {@link IonSystem} instance; not null.
+     *
+     * @deprecated Use {@link IonSystemBuilder IonSystemBuilder.standard().withCatalog(catalog).build()} instead.
+     */
+    @Deprecated
+    public static IonSystem newSystem(IonCatalog catalog)
+    {
+        return IonSystemBuilder.standard().withCatalog(catalog).build();
+    }
+}
diff --git a/src/com/amazon/ion/system/package-info.java b/src/com/amazon/ion/system/package-info.java
new file mode 100644
index 0000000000..c7fc56c746
--- /dev/null
+++ b/src/com/amazon/ion/system/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * Public implementation of the core Ion system.
+ */
+package com.amazon.ion.system;
diff --git a/src/software/amazon/ion/util/AbstractValueVisitor.java b/src/com/amazon/ion/util/AbstractValueVisitor.java
similarity index 67%
rename from src/software/amazon/ion/util/AbstractValueVisitor.java
rename to src/com/amazon/ion/util/AbstractValueVisitor.java
index b0a52754ca..246e8ad8b7 100644
--- a/src/software/amazon/ion/util/AbstractValueVisitor.java
+++ b/src/com/amazon/ion/util/AbstractValueVisitor.java
@@ -1,25 +1,36 @@
 /*
- * Copyright (c) 2007-2013 Amazon.com, Inc.  All rights reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
-
-import software.amazon.ion.IonBlob;
-import software.amazon.ion.IonBool;
-import software.amazon.ion.IonClob;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonSexp;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.ValueVisitor;
+package com.amazon.ion.util;
+
+import com.amazon.ion.IonBlob;
+import com.amazon.ion.IonBool;
+import com.amazon.ion.IonClob;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonDecimal;
+import com.amazon.ion.IonFloat;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonNull;
+import com.amazon.ion.IonSexp;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.ValueVisitor;
 
 /**
  * A base class for extending Ion {@link ValueVisitor}s.
diff --git a/src/software/amazon/ion/util/Equivalence.java b/src/com/amazon/ion/util/Equivalence.java
similarity index 92%
rename from src/software/amazon/ion/util/Equivalence.java
rename to src/com/amazon/ion/util/Equivalence.java
index 644225ddc0..dbbd391b2c 100644
--- a/src/software/amazon/ion/util/Equivalence.java
+++ b/src/com/amazon/ion/util/Equivalence.java
@@ -1,42 +1,43 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
-
-import static software.amazon.ion.impl.PrivateIonConstants.UNKNOWN_SYMBOL_TEXT_PREFIX;
-
+package com.amazon.ion.util;
+
+import static com.amazon.ion.impl._Private_IonConstants.UNKNOWN_SYMBOL_TEXT_PREFIX;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonBool;
+import com.amazon.ion.IonDecimal;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonFloat;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonLob;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonText;
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolToken;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonBool;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonLob;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonText;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolToken;
 
 /**
  * Provides equivalence comparisons between two {@link IonValue}s, following
@@ -48,13 +49,13 @@
  *<pre>
  *    IonValue v1 = ...;
  *    IonValue v2 = ...;
- *    software.amazon.ion.util.Equivalence.ionEquals( v1, v2 );
+ *    com.amazon.ion.util.Equivalence.ionEquals( v1, v2 );
  *</pre>
  *
  * More likely, a static import would make using this class easier.
  *
  *<pre>
- *    import static software.amazon.ion.util.Equivalence.ionEquals;
+ *    import static com.amazon.ion.util.Equivalence.ionEquals;
  *    ...
  *    boolean equivalent = ionEquals( v1, v2 );
  *</pre>
@@ -103,11 +104,12 @@
  * (A, V), where A is an ordered list of annotations, and V is an Ion Primitive
  * Data or Ion Complex Data value. The list of annotations, A is an tuple of Ion
  * Symbols (a specific type of Ion Primitive).
+
  */
 public final class Equivalence {
 
     /**
-     * TODO amzn/ion-java#26 Marker for code that needs to be altered in order to
+     * TODO amzn/ion-java/issues/26 Marker for code that needs to be altered in order to
      * support a public comparison API to determine ordering of values, not
      * just equality.
      */
@@ -335,7 +337,7 @@ static class Field {
             SymbolToken tok = value.getFieldNameSymbol();
             String name = tok.getText();
             if (name == null) {
-                // TODO amzn/ion-java#23 Problematic with unknown field names.
+                // TODO amzn/ion-java/issues/23 Problematic with unknown field names.
                 name = UNKNOWN_SYMBOL_TEXT_PREFIX + tok.getSid();
             }
             this.name = name;
@@ -349,7 +351,7 @@ static class Field {
         @Override
         public int hashCode() {
             return name.hashCode();
-            // TODO amzn/ion-java#58 : implement hash code such that it respects
+            // TODO amzn/ion-java/issues/58 : implement hash code such that it respects
             // 'strict'. The prevously attempted fix is commented out below but
             // is not sufficient because value.hasCode will always include
             // type annotations in the hash computation. Type annotations
@@ -433,14 +435,14 @@ private static int ionCompareToImpl(final IonValue v1,
                                             ((IonFloat) v2).doubleValue());
                     break;
                 case DECIMAL:
-                    assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java#26
+                    assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26
                     result = Decimal.equals(((IonDecimal) v1).decimalValue(),
                                             ((IonDecimal) v2).decimalValue())
                                             ? 0 : 1;
                     break;
                 case TIMESTAMP:
                     if (strict) {
-                        assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java#26
+                        assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26
                         result = (((IonTimestamp) v1).timestampValue().equals(
                                   ((IonTimestamp) v2).timestampValue())
                                   ? 0 : 1);
@@ -468,7 +470,7 @@ private static int ionCompareToImpl(final IonValue v1,
                     result = compareLobContents((IonLob) v1, (IonLob) v2);
                     break;
                 case STRUCT:
-                    assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java#26
+                    assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26
                     result = compareStructs((IonStruct) v1,
                                             (IonStruct) v2,
                                             strict);
diff --git a/src/software/amazon/ion/util/GzipOrRawInputStream.java b/src/com/amazon/ion/util/GzipOrRawInputStream.java
similarity index 87%
rename from src/software/amazon/ion/util/GzipOrRawInputStream.java
rename to src/com/amazon/ion/util/GzipOrRawInputStream.java
index 0a510c97e1..68b60f1e83 100644
--- a/src/software/amazon/ion/util/GzipOrRawInputStream.java
+++ b/src/com/amazon/ion/util/GzipOrRawInputStream.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
diff --git a/src/software/amazon/ion/util/IonStreamUtils.java b/src/com/amazon/ion/util/IonStreamUtils.java
similarity index 84%
rename from src/software/amazon/ion/util/IonStreamUtils.java
rename to src/com/amazon/ion/util/IonStreamUtils.java
index 24945a61d8..798fcfc62a 100644
--- a/src/software/amazon/ion/util/IonStreamUtils.java
+++ b/src/com/amazon/ion/util/IonStreamUtils.java
@@ -1,28 +1,29 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
-import static software.amazon.ion.impl.PrivateIonConstants.BINARY_VERSION_MARKER_1_0;
-import static software.amazon.ion.util.GzipOrRawInputStream.GZIP_HEADER;
+import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
+import static com.amazon.ion.util.GzipOrRawInputStream.GZIP_HEADER;
 
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.impl._Private_ListWriter;
 import java.io.IOException;
 import java.io.InputStream;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.impl.PrivateListWriter;
 
 /**
  * Utility methods for working with the Ion streaming interfaces,
@@ -82,6 +83,7 @@ public static boolean isIonBinary(byte[] buffer, int offset, int length)
      *
      * @return {@code true} if the buffer contains GZIPped data; {@code false}
      * if the buffer is null or if the {@code length} is too short.
+     *
      */
     public static boolean isGzip(byte[] buffer, int offset, int length)
     {
@@ -113,6 +115,7 @@ private static boolean cookieMatches(byte[] cookie,
     /**
      * Returns a stream that decompresses a stream if it contains GZIPped data,
      * otherwise has no effect on the stream (but may wrap it).
+     *
      */
     public static InputStream unGzip(InputStream in)
         throws IOException
@@ -135,8 +138,8 @@ public static InputStream unGzip(InputStream in)
     public static void writeBoolList(IonWriter writer, boolean[] values)
         throws IOException
     {
-        if (writer instanceof PrivateListWriter) {
-            ((PrivateListWriter)writer).writeBoolList(values);
+        if (writer instanceof _Private_ListWriter) {
+            ((_Private_ListWriter)writer).writeBoolList(values);
             return;
         }
 
@@ -160,8 +163,8 @@ public static void writeBoolList(IonWriter writer, boolean[] values)
     public static void writeFloatList(IonWriter writer, float[] values)
         throws IOException
     {
-        if (writer instanceof PrivateListWriter) {
-            ((PrivateListWriter)writer).writeFloatList(values);
+        if (writer instanceof _Private_ListWriter) {
+            ((_Private_ListWriter)writer).writeFloatList(values);
             return;
         }
 
@@ -183,8 +186,8 @@ public static void writeFloatList(IonWriter writer, float[] values)
     public static void writeFloatList(IonWriter writer, double[] values)
         throws IOException
     {
-        if (writer instanceof PrivateListWriter) {
-            ((PrivateListWriter)writer).writeFloatList(values);
+        if (writer instanceof _Private_ListWriter) {
+            ((_Private_ListWriter)writer).writeFloatList(values);
             return;
         }
 
@@ -207,8 +210,8 @@ public static void writeFloatList(IonWriter writer, double[] values)
     public static void writeIntList(IonWriter writer, byte[] values)
         throws IOException
     {
-        if (writer instanceof PrivateListWriter) {
-            ((PrivateListWriter)writer).writeIntList(values);
+        if (writer instanceof _Private_ListWriter) {
+            ((_Private_ListWriter)writer).writeIntList(values);
             return;
         }
 
@@ -230,8 +233,8 @@ public static void writeIntList(IonWriter writer, byte[] values)
     public static void writeIntList(IonWriter writer, short[] values)
         throws IOException
     {
-        if (writer instanceof PrivateListWriter) {
-            ((PrivateListWriter)writer).writeIntList(values);
+        if (writer instanceof _Private_ListWriter) {
+            ((_Private_ListWriter)writer).writeIntList(values);
             return;
         }
 
@@ -253,8 +256,8 @@ public static void writeIntList(IonWriter writer, short[] values)
     public static void writeIntList(IonWriter writer, int[] values)
         throws IOException
     {
-        if (writer instanceof PrivateListWriter) {
-            ((PrivateListWriter)writer).writeIntList(values);
+        if (writer instanceof _Private_ListWriter) {
+            ((_Private_ListWriter)writer).writeIntList(values);
             return;
         }
 
@@ -276,8 +279,8 @@ public static void writeIntList(IonWriter writer, int[] values)
     public static void writeIntList(IonWriter writer, long[] values)
         throws IOException
     {
-        if (writer instanceof PrivateListWriter) {
-            ((PrivateListWriter)writer).writeIntList(values);
+        if (writer instanceof _Private_ListWriter) {
+            ((_Private_ListWriter)writer).writeIntList(values);
             return;
         }
 
@@ -300,8 +303,8 @@ public static void writeIntList(IonWriter writer, long[] values)
     public static void writeStringList(IonWriter writer, String[] values)
         throws IOException
     {
-        if (writer instanceof PrivateListWriter) {
-            ((PrivateListWriter)writer).writeStringList(values);
+        if (writer instanceof _Private_ListWriter) {
+            ((_Private_ListWriter)writer).writeStringList(values);
             return;
         }
 
diff --git a/src/software/amazon/ion/util/IonTextUtils.java b/src/com/amazon/ion/util/IonTextUtils.java
similarity index 93%
rename from src/software/amazon/ion/util/IonTextUtils.java
rename to src/com/amazon/ion/util/IonTextUtils.java
index b86ab29043..47e0d17326 100644
--- a/src/software/amazon/ion/util/IonTextUtils.java
+++ b/src/com/amazon/ion/util/IonTextUtils.java
@@ -1,30 +1,32 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
-import static software.amazon.ion.impl.PrivateIonConstants.isHighSurrogate;
-import static software.amazon.ion.impl.PrivateIonConstants.isLowSurrogate;
-import static software.amazon.ion.impl.PrivateIonConstants.makeUnicodeScalar;
-import static software.amazon.ion.impl.PrivateIonTextAppender.ZERO_PADDING;
-import static software.amazon.ion.impl.PrivateIonTextAppender.isIdentifierKeyword;
-import static software.amazon.ion.impl.PrivateIonTextAppender.symbolNeedsQuoting;
-import static software.amazon.ion.impl.PrivateIonTextWriterBuilder.STANDARD;
+import static com.amazon.ion.impl._Private_IonConstants.isHighSurrogate;
+import static com.amazon.ion.impl._Private_IonConstants.isLowSurrogate;
+import static com.amazon.ion.impl._Private_IonConstants.makeUnicodeScalar;
+import static com.amazon.ion.impl._Private_IonTextAppender.ZERO_PADDING;
+import static com.amazon.ion.impl._Private_IonTextAppender.isIdentifierKeyword;
+import static com.amazon.ion.impl._Private_IonTextAppender.symbolNeedsQuoting;
+import static com.amazon.ion.impl._Private_IonTextWriterBuilder.STANDARD;
 
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.impl._Private_IonTextAppender;
 import java.io.IOException;
 import java.math.BigDecimal;
-import software.amazon.ion.impl.PrivateIonTextAppender;
 
 
 /**
@@ -116,15 +118,15 @@ public static boolean isDigit(int codePoint, int radix)
     }
 
     public static boolean isIdentifierStart(int codePoint) {
-        return PrivateIonTextAppender.isIdentifierStart(codePoint);
+        return _Private_IonTextAppender.isIdentifierStart(codePoint);
     }
 
     public static boolean isIdentifierPart(int codePoint) {
-        return PrivateIonTextAppender.isIdentifierPart(codePoint);
+        return _Private_IonTextAppender.isIdentifierPart(codePoint);
     }
 
     public static boolean isOperatorPart(int codePoint) {
-        return PrivateIonTextAppender.isOperatorPart(codePoint);
+        return _Private_IonTextAppender.isOperatorPart(codePoint);
     }
 
 
@@ -622,6 +624,16 @@ public static String printSymbol(CharSequence text)
     }
 
 
+    /**
+     * @param token the symbolToken to be printed.
+     *
+     * @return a string representing the symboltoken.
+     */
+    public static String printSymbol(SymbolToken token){
+        return String.format("{$%s:%s}",  token.getText(), token.getSid());
+    }
+
+
     /**
      * Prints text as a single-quoted Ion symbol.
      * If the {@code text} is null, this prints {@code null.symbol}.
@@ -812,8 +824,8 @@ else if (isLowSurrogate(c))
     public static void printDecimal(Appendable out, BigDecimal decimal)
         throws IOException
     {
-        PrivateIonTextAppender appender =
-            PrivateIonTextAppender.forAppendable(out);
+        _Private_IonTextAppender appender =
+            _Private_IonTextAppender.forAppendable(out);
         appender.printDecimal(STANDARD, decimal);
     }
 
@@ -841,8 +853,8 @@ public static String printDecimal(BigDecimal decimal)
     public static void printFloat(Appendable out, double value)
         throws IOException
     {
-        PrivateIonTextAppender appender =
-            PrivateIonTextAppender.forAppendable(out);
+        _Private_IonTextAppender appender =
+            _Private_IonTextAppender.forAppendable(out);
         appender.printFloat(value);
     }
 
@@ -865,8 +877,8 @@ public static String printFloat(double value)
     public static void printFloat(Appendable out, Double value)
         throws IOException
     {
-        PrivateIonTextAppender appender =
-            PrivateIonTextAppender.forAppendable(out);
+        _Private_IonTextAppender appender =
+            _Private_IonTextAppender.forAppendable(out);
         appender.printFloat(value);
     }
 
@@ -894,8 +906,8 @@ public static void printBlob(Appendable out, byte[] value)
         }
         else
         {
-            PrivateIonTextAppender appender =
-                PrivateIonTextAppender.forAppendable(out);
+            _Private_IonTextAppender appender =
+                _Private_IonTextAppender.forAppendable(out);
             appender.printBlob(STANDARD, value, 0, value.length);
         }
     }
@@ -930,8 +942,8 @@ public static void printClob(Appendable out, byte[] value)
         }
         else
         {
-            PrivateIonTextAppender appender =
-                PrivateIonTextAppender.forAppendable(out);
+            _Private_IonTextAppender appender =
+                _Private_IonTextAppender.forAppendable(out);
             appender.printClob(STANDARD, value, 0, value.length);
         }
     }
diff --git a/src/software/amazon/ion/util/IonValueUtils.java b/src/com/amazon/ion/util/IonValueUtils.java
similarity index 59%
rename from src/software/amazon/ion/util/IonValueUtils.java
rename to src/com/amazon/ion/util/IonValueUtils.java
index 05278793dc..bd1591cca9 100644
--- a/src/software/amazon/ion/util/IonValueUtils.java
+++ b/src/com/amazon/ion/util/IonValueUtils.java
@@ -1,20 +1,21 @@
 /*
- * Copyright 2014-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
-import software.amazon.ion.IonValue;
+import com.amazon.ion.IonValue;
 
 /**
  * Utility methods for working with {@link IonValue}s.
diff --git a/src/software/amazon/ion/util/JarInfo.java b/src/com/amazon/ion/util/JarInfo.java
similarity index 89%
rename from src/software/amazon/ion/util/JarInfo.java
rename to src/com/amazon/ion/util/JarInfo.java
index 2b8f7786d1..1f0ba4807f 100644
--- a/src/software/amazon/ion/util/JarInfo.java
+++ b/src/com/amazon/ion/util/JarInfo.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
 import java.io.IOException;
 import java.net.URL;
@@ -21,8 +22,8 @@
 import java.util.List;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
-import software.amazon.ion.IonException;
-import software.amazon.ion.Timestamp;
+import com.amazon.ion.IonException;
+import com.amazon.ion.Timestamp;
 
 
 /**
@@ -146,4 +147,4 @@ private boolean tryLoadBuildProperties(Manifest manifest)
         }
         return true;
     }
-}
+}
\ No newline at end of file
diff --git a/src/com/amazon/ion/util/Printer.java b/src/com/amazon/ion/util/Printer.java
new file mode 100644
index 0000000000..cc717b1d7e
--- /dev/null
+++ b/src/com/amazon/ion/util/Printer.java
@@ -0,0 +1,1160 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.util;
+
+import static com.amazon.ion.SystemSymbols.IMPORTS;
+import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.SYMBOLS;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonBlob;
+import com.amazon.ion.IonBool;
+import com.amazon.ion.IonClob;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonDecimal;
+import com.amazon.ion.IonFloat;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonNull;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonSexp;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl._Private_IonSymbol;
+import com.amazon.ion.impl._Private_IonSystem;
+import com.amazon.ion.impl._Private_IonTextWriterBuilder;
+import com.amazon.ion.impl._Private_IonValue;
+import com.amazon.ion.impl._Private_IonValue.SymbolTableProvider;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder.LstMinimizing;
+import com.amazon.ion.system.IonWriterBuilder.IvmMinimizing;
+import com.amazon.ion.util.IonTextUtils.SymbolVariant;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.util.Iterator;
+
+
+/**
+ * Renders {@link IonValue}s to text.
+ * <p>
+ * By default, output is in a compact format with minimal whitespace.
+ * For example:
+ *<pre>
+ *    annot::{f1:["hello","goodbye"],'another field':long::0}
+ *</pre>
+ * The format can be tuned through various properties on the Printer instance,
+ * as well as through the {@link Printer.Options} structure.
+ * <p>
+ * <b>Instances of this class are safe for use by multiple threads.</b>
+ * <p>
+ * While printers are inexpensive to create, their configuration facilities
+ * make them useful as shared resources. Changes to configuration settings
+ * (<em>e.g.</em>, {@link #setJsonMode()}) do not affect concurrently-running
+ * calls to {@link #print}.
+ *
+ * @see IonWriter
+ * @see IonTextWriterBuilder
+ */
+public class Printer
+{
+    public class Options
+        implements Cloneable
+    {
+        public boolean blobAsString;
+        public boolean clobAsString;
+        public boolean datagramAsList;
+        public boolean decimalAsFloat;
+        public boolean sexpAsList;
+        public boolean skipAnnotations;
+        public boolean skipSystemValues;
+        public boolean simplifySystemValues;
+        public boolean stringAsJson;
+        public boolean symbolAsString;
+        public boolean timestampAsString;
+        public boolean timestampAsMillis;
+        public boolean untypedNulls;
+
+
+        @Override
+        public Options clone()
+        {
+            try
+            {
+                return (Options) super.clone();
+            }
+            catch (CloneNotSupportedException e)
+            {
+                throw new InternalError();
+            }
+        }
+    }
+
+
+    protected Options myOptions = new Options();
+
+    public Printer()
+    {
+        myOptions = new Options();
+    }
+
+    public Printer(Options options)
+    {
+        myOptions = options.clone();
+    }
+
+
+    //=========================================================================
+    // Options
+
+    /* Potential printing options:
+     *
+     * - Render all times with a specific offset (what about unknowns?)
+     * - Render all times with long offset (no Z)
+     * - control over decimal-point placement in float and decimal.
+     *   (render 12.00 or 1200d-2)
+     */
+
+
+    /**
+     * Indicates whether this printer skips (<em>i.e.</em>, doesn't print)
+     * system IDs and local symbol tables.
+     * By default, this property is <code>false</code>.
+     */
+    public synchronized boolean getSkipSystemValues()
+    {
+        return myOptions.skipSystemValues;
+    }
+
+    /**
+     * Sets whether this printer skips (<em>i.e.</em>, doesn't print)
+     * system IDs and local symbol tables.
+     * By default, this property is <code>false</code>.
+     */
+    public synchronized void setSkipSystemValues(boolean skip)
+    {
+        myOptions.skipSystemValues = skip;
+    }
+
+
+    /**
+     * Indicates whether this printer skips (<em>i.e.</em>, doesn't print)
+     * annotations.
+     * By default, this property is <code>false</code>.
+     */
+    public synchronized boolean getSkipAnnotations()
+    {
+        return myOptions.skipAnnotations;
+    }
+
+    /**
+     * Sets whether this printer skips (<em>i.e.</em>, doesn't print)
+     * annotations.
+     * By default, this property is <code>false</code>.
+     */
+    public synchronized void setSkipAnnotations(boolean skip)
+    {
+        myOptions.skipAnnotations = skip;
+    }
+
+
+    /**
+     * Indicates whether this printer renders blobs as Base64 strings.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized boolean getPrintBlobAsString()
+    {
+        return myOptions.blobAsString;
+    }
+
+    /**
+     * Sets whether this printer renders blobs as Base64 strings.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized void setPrintBlobAsString(boolean blobAsString)
+    {
+        myOptions.blobAsString = blobAsString;
+    }
+
+
+    /**
+     * Indicates whether this printer renders clobs as ASCII strings.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized boolean getPrintClobAsString()
+    {
+        return myOptions.clobAsString;
+    }
+
+    /**
+     * Sets whether this printer renders clobs as ASCII strings.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized void setPrintClobAsString(boolean clobAsString)
+    {
+        myOptions.clobAsString = clobAsString;
+    }
+
+
+    /**
+     * Indicates whether this printer renders datagrams as lists.
+     * By default, this property is <code>false</code>.
+     */
+    public synchronized boolean getPrintDatagramAsList()
+    {
+        return myOptions.datagramAsList;
+    }
+
+    /**
+     * Sets whether this printer renders datagrams as lists.
+     * By default, this property is <code>false</code>.
+     */
+    public synchronized void setPrintDatagramAsList(boolean datagramAsList)
+    {
+        myOptions.datagramAsList = datagramAsList;
+    }
+
+
+    /**
+     * Indicates whether this printer renders decimals as floats, thus using 'e'
+     * notation for all real values.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized boolean getPrintDecimalAsFloat()
+    {
+        return myOptions.decimalAsFloat;
+    }
+
+    /**
+     * Sets whether this printer renders decimals as floats, thus using 'e'
+     * notation for all real values.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized void setPrintDecimalAsFloat(boolean decimalAsFloat)
+    {
+        myOptions.decimalAsFloat = decimalAsFloat;
+    }
+
+
+    /**
+     * Indicates whether this printer renders sexps as lists.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized boolean getPrintSexpAsList()
+    {
+        return myOptions.sexpAsList;
+    }
+
+    /**
+     * Sets whether this printer renders sexps as lists.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized void setPrintSexpAsList(boolean sexpAsList)
+    {
+        myOptions.sexpAsList = sexpAsList;
+    }
+
+
+    /**
+     * Indicates whether this printer renders strings using JSON escapes.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized boolean getPrintStringAsJson()
+    {
+        return myOptions.stringAsJson;
+    }
+
+    /**
+     * Sets whether this printer renders strings using JSON escapes.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized void setPrintStringAsJson(boolean stringAsJson)
+    {
+        myOptions.stringAsJson = stringAsJson;
+    }
+
+
+    /**
+     * Indicates whether this printer renders symbols as strings.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized boolean getPrintSymbolAsString()
+    {
+        return myOptions.symbolAsString;
+    }
+
+    /**
+     * Sets whether this printer renders symbols as strings.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized void setPrintSymbolAsString(boolean symbolAsString)
+    {
+        myOptions.symbolAsString = symbolAsString;
+    }
+
+
+    /**
+     * Indicates whether this printer renders timestamps as millisecond values.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized boolean getPrintTimestampAsMillis()
+    {
+        return myOptions.timestampAsMillis;
+    }
+
+    /**
+     * Sets whether this printer renders timestamps as millisecond values.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized void setPrintTimestampAsMillis(boolean timestampAsMillis)
+    {
+        myOptions.timestampAsMillis = timestampAsMillis;
+    }
+
+
+    /**
+     * Indicates whether this printer renders timestamps as strings.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized boolean getPrintTimestampAsString()
+    {
+        return myOptions.timestampAsString;
+    }
+
+    /**
+     * Sets whether this printer renders timestamps as strings.
+     * By default, this is <code>false</code>.
+     */
+    public synchronized void setPrintTimestampAsString(boolean timestampAsString)
+    {
+        myOptions.timestampAsString = timestampAsString;
+    }
+
+
+    /**
+     * Indicates whether this printer renders all null values as {@code null}
+     * (<em>i.e.</em>, the same as an {@link IonNull}).
+     * By default, this is <code>false</code>.
+     */
+    public synchronized boolean getPrintUntypedNulls()
+    {
+        return myOptions.untypedNulls;
+    }
+
+    /**
+     * Sets whether this printer renders all null values as {@code null}
+     * (<em>i.e.</em>, the same as an {@link IonNull}).
+     * By default, this is <code>false</code>.
+     */
+    public synchronized void setPrintUntypedNulls(boolean untypedNulls)
+    {
+        myOptions.untypedNulls = untypedNulls;
+    }
+
+
+    /**
+     * Configures this printer's options to render legal JSON text.
+     * The following options are modified so that:
+     * <ul>
+     *   <li>{@link Options#blobAsString} is {@code true}</li>
+     *   <li>{@link Options#clobAsString} is {@code true}</li>
+     *   <li>{@link Options#datagramAsList} is {@code true}</li>
+     *   <li>{@link Options#decimalAsFloat} is {@code true}</li>
+     *   <li>{@link Options#sexpAsList} is {@code true}</li>
+     *   <li>{@link Options#skipAnnotations} is {@code true}</li>
+     *   <li>{@link Options#skipSystemValues} is {@code true}</li>
+     *   <li>{@link Options#stringAsJson} is {@code true}</li>
+     *   <li>{@link Options#symbolAsString} is {@code true}</li>
+     *   <li>{@link Options#timestampAsString} is {@code false}</li>
+     *   <li>{@link Options#timestampAsMillis} is {@code true}</li>
+     *   <li>{@link Options#untypedNulls} is {@code true}</li>
+     * </ul>
+     * All other options are left as is.
+     */
+    public synchronized void setJsonMode()
+    {
+        myOptions.blobAsString      = true;
+        myOptions.clobAsString      = true;
+        myOptions.datagramAsList    = true;
+        myOptions.decimalAsFloat    = true;
+        myOptions.sexpAsList        = true;
+        myOptions.skipAnnotations   = true;
+        myOptions.skipSystemValues  = true;
+        myOptions.stringAsJson      = true;
+        myOptions.symbolAsString    = true;
+        myOptions.timestampAsString = false;
+        myOptions.timestampAsMillis = true;
+        myOptions.untypedNulls      = true;
+    }
+
+
+    //=========================================================================
+    // Print methods
+
+
+    public void print(IonValue value, Appendable out)
+        throws IOException
+    {
+        // Copy the options so visitor won't see changes made while printing.
+        Options options;
+        synchronized (this)  // So we don't clone in the midst of changes
+        {
+            options = myOptions.clone();
+        }
+
+        if (true)
+        {
+            _print(value, makeVisitor(options, out));
+        }
+        else
+        {
+            // Bridge to the configurable text writer. This is here for
+            // testing purposes. It *almost* works except for printing
+            // datagram as list.
+
+            boolean dg = value instanceof IonDatagram;
+
+            _Private_IonTextWriterBuilder o =
+                _Private_IonTextWriterBuilder.standard();
+            o.setCharset(IonTextWriterBuilder.ASCII);
+            if (dg)
+            {
+                if (options.skipSystemValues)
+                {
+                    o.withMinimalSystemData();
+                }
+                else if (options.simplifySystemValues) {
+
+                    o.setIvmMinimizing(IvmMinimizing.DISTANT);
+                    o.setLstMinimizing(LstMinimizing.LOCALS);
+                }
+            }
+
+            o._blob_as_string      = options.blobAsString;
+            o._clob_as_string      = options.clobAsString;
+            o._decimal_as_float    = options.decimalAsFloat;
+            // TODO datagram as list
+            o._sexp_as_list        = options.sexpAsList;
+            o._skip_annotations    = options.skipAnnotations;
+            o._string_as_json      = options.stringAsJson;
+            o._symbol_as_string    = options.symbolAsString;
+            o._timestamp_as_millis = options.timestampAsMillis;
+            o._timestamp_as_string = options.timestampAsString;
+            o._untyped_nulls       = options.untypedNulls;
+
+            IonWriter writer = o.build(out);
+            // TODO doesn't work for datagram since it skips system values
+            // value.writeTo(writer);
+            _Private_IonSystem system = (_Private_IonSystem) value.getSystem();
+            IonReader reader = system.newSystemReader(value);
+            writer.writeValues(reader);
+            writer.finish();
+        }
+    }
+
+    private void _print(IonValue value, PrinterVisitor pv)
+        throws IOException
+    {
+        try
+        {
+            if (! (value instanceof IonDatagram))
+            {
+                pv.setSymbolTableProvider(new BasicSymbolTableProvider(value.getSymbolTable()));
+            }
+            value.accept(pv);
+        }
+        catch (IOException e)
+        {
+            throw e;
+        }
+        catch (RuntimeException e)
+        {
+            throw e;
+        }
+        catch (Exception e)
+        {
+            // Shouldn't happen.
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    /**
+     * Subclasses can override this if they wish to construct a specialization
+     * of the {@link PrinterVisitor}.
+     *
+     * @param options is a fresh copy of the Printer's options instance,
+     * not <code>null</code>.
+     * @param out is not <code>null</code>.
+     * @return the visitor to invoke for printing.
+     */
+    protected PrinterVisitor makeVisitor(Options options, Appendable out)
+    {
+        return new PrinterVisitor(options, out);
+    }
+
+
+    private static class BasicSymbolTableProvider
+        implements SymbolTableProvider
+    {
+        private final SymbolTable symbolTable;
+
+        public BasicSymbolTableProvider(SymbolTable symbolTable)
+        {
+            this.symbolTable = symbolTable;
+        }
+
+        public SymbolTable getSymbolTable()
+        {
+            return symbolTable;
+        }
+
+    }
+
+    //=========================================================================
+    // Print methods
+
+    public static class PrinterVisitor
+        extends AbstractValueVisitor
+    {
+
+        final protected Options    myOptions;
+        final protected Appendable myOut;
+
+        /**
+         * Should we quote operators at the current level of the hierarchy?
+         * As we recurse down into containers, this value is pushed on the
+         * stack by {@link #writeChild(IonValue, boolean)}.
+         */
+        private boolean    myQuoteOperators = true;
+
+        private SymbolTableProvider mySymbolTableProvider = null;
+
+
+        //---------------------------------------------------------------------
+
+        public PrinterVisitor(Options options, Appendable out)
+        {
+            myOptions = options;
+            myOut = out;
+        }
+
+        void setSymbolTableProvider(SymbolTableProvider symbolTableProvider)
+        {
+            mySymbolTableProvider = symbolTableProvider;
+        }
+
+        /**
+         * Recurse down into a container, we push the current value of
+         * {@link #myQuoteOperators} onto the stack and replace it with
+         * the given value.
+         *
+         * @param value
+         * @param quoteOperators replaces the current value of
+         * {@link #myQuoteOperators} during the recursive visitation.
+         * @throws Exception propagated from visitation of <code>value</code>.
+         * @throws NullPointerException if <code>value</code> is null.
+         */
+        protected void writeChild(IonValue value, boolean quoteOperators)
+            throws Exception
+        {
+            boolean oldQuoteOperators = myQuoteOperators;
+            myQuoteOperators = quoteOperators;
+            value.accept(this);
+            myQuoteOperators = oldQuoteOperators;
+        }
+
+
+        public void writeAnnotations(IonValue value) throws IOException
+        {
+            if (! myOptions.skipAnnotations)
+            {
+                SymbolToken[] anns = ((_Private_IonValue)value).getTypeAnnotationSymbols(mySymbolTableProvider);
+                if (anns != null)
+                {
+                    for (SymbolToken ann : anns) {
+                        String text = ann.getText();
+                        if (text == null) {
+                            myOut.append('$');
+                            myOut.append(Integer.toString(ann.getSid()));
+                        }
+                        else {
+                            IonTextUtils.printSymbol(myOut, text);
+                        }
+                        myOut.append("::");
+                    }
+                }
+            }
+        }
+
+        public void writeNull(String type) throws IOException
+        {
+            if (myOptions.untypedNulls)
+            {
+                myOut.append("null");
+            }
+            else
+            {
+                myOut.append("null.");
+                myOut.append(type);
+            }
+        }
+
+
+        public void writeSequenceContent(IonSequence value,
+                                         boolean quoteOperators,
+                                         char open,
+                                         char separator,
+                                         char close)
+            throws IOException, Exception
+        {
+            myOut.append(open);
+
+            boolean hitOne = false;
+            for (IonValue child : value)
+            {
+                if (hitOne)
+                {
+                    myOut.append(separator);
+                }
+                hitOne = true;
+
+                writeChild(child, quoteOperators);
+            }
+
+            myOut.append(close);
+        }
+
+        public void writeSymbolToken(SymbolToken sym) throws IOException
+        {
+            String text = sym.getText();
+            if (text != null)
+            {
+                writeSymbol(text);
+            }
+            else
+            {
+                int sid = sym.getSid();
+                if (sid < 0)
+                {
+                    throw new IllegalArgumentException("Bad SID " + sid);
+                }
+
+                text = "$" + sym.getSid();
+                if (myOptions.symbolAsString)
+                {
+                    writeString(text);
+                }
+                else
+                {
+                    myOut.append(text);  // SID literal is never quoted
+                }
+            }
+        }
+
+        public void writeSymbol(String text) throws IOException
+        {
+            if (myOptions.symbolAsString)
+            {
+                writeString(text);
+            }
+            else
+            {
+                SymbolVariant variant = IonTextUtils.symbolVariant(text);
+                switch (variant)
+                {
+                    case IDENTIFIER:
+                        myOut.append(text);
+                        break;
+                    case OPERATOR:
+                        if (! myQuoteOperators)
+                        {
+                            myOut.append(text);
+                            break;
+                        }
+                        // else fall through...
+                    case QUOTED:
+                        IonTextUtils.printQuotedSymbol(myOut, text);
+                        break;
+                }
+            }
+        }
+
+
+        /**
+         * @param text may be null
+         */
+        public void writeString(String text) throws IOException
+        {
+            if (myOptions.stringAsJson)
+            {
+                IonTextUtils.printJsonString(myOut, text);
+            }
+            else
+            {
+                IonTextUtils.printString(myOut, text);
+            }
+        }
+
+
+        //---------------------------------------------------------------------
+        // AbstractValueVisitor overrides
+
+        @Override
+        protected void defaultVisit(IonValue value)
+        {
+            String message = "cannot print " + value.getClass().getName();
+            throw new UnsupportedOperationException(message);
+        }
+
+        @Override
+        public void visit(IonBlob value) throws IOException
+        {
+            writeAnnotations(value);
+
+            if (value.isNullValue())
+            {
+                writeNull("blob");
+            }
+            else
+            {
+                myOut.append(myOptions.blobAsString ? "\"" : "{{");
+                value.printBase64(myOut);
+                myOut.append(myOptions.blobAsString ? "\"" : "}}");
+            }
+        }
+
+        @Override
+        public void visit(IonBool value)
+            throws IOException
+        {
+            writeAnnotations(value);
+
+            if (value.isNullValue())
+            {
+                writeNull("bool");
+            }
+            else
+            {
+                myOut.append(value.booleanValue() ? "true" : "false");
+            }
+        }
+
+        @Override
+        public void visit(IonClob value) throws IOException
+        {
+            writeAnnotations(value);
+
+            if (value.isNullValue())
+            {
+                writeNull("clob");
+            }
+            else
+            {
+                if (! myOptions.clobAsString)
+                {
+                    myOut.append("{{");
+                }
+                myOut.append('"');
+
+                InputStream byteStream = value.newInputStream();
+                try
+                {
+                    int c;
+                    // if-statement hoisted above loop for efficiency
+                    if (myOptions.stringAsJson)
+                    {
+                        while ((c = byteStream.read()) != -1)
+                        {
+                            IonTextUtils.printJsonCodePoint(myOut, c);
+                        }
+                    }
+                    else
+                    {
+                        while ((c = byteStream.read()) != -1)
+                        {
+                            IonTextUtils.printStringCodePoint(myOut, c);
+                        }
+                    }
+                }
+                finally
+                {
+                    byteStream.close();
+                }
+
+                myOut.append('"');
+                if (! myOptions.clobAsString)
+                {
+                    myOut.append("}}");
+                }
+            }
+        }
+
+        @Override
+        public void visit(IonDatagram value) throws IOException, Exception
+        {
+            Iterator<IonValue> i = (myOptions.skipSystemValues
+                                       ? value.iterator()
+                                       : value.systemIterator());
+
+            final boolean asList = myOptions.datagramAsList;
+            if (asList)
+            {
+                myOut.append('[');
+            }
+
+            boolean hitOne = false;
+
+            // If we're skipping system values at the iterator level,
+            // we don't need to bother trying to simplify them.
+            final boolean simplify_system_values =
+                myOptions.simplifySystemValues && ! myOptions.skipSystemValues;
+
+            SymbolTable previous_symbols = null;
+
+            while (i.hasNext())
+            {
+                IonValue child = i.next();
+                SymbolTable childSymbolTable = child.getSymbolTable();
+                mySymbolTableProvider = new BasicSymbolTableProvider(childSymbolTable); //children of datagrams are top-level values
+                if (simplify_system_values)
+                {
+                    child = simplify(child, previous_symbols);
+                    previous_symbols = childSymbolTable;
+                }
+
+                if (child != null)
+                {
+                    if (hitOne)
+                    {
+                        myOut.append(asList  ?  ','  :  ' ');
+                    }
+                    writeChild(child, true);
+                    hitOne = true; // we've only "hit one" if we wrote it
+                }
+            }
+
+            if (asList)
+            {
+                myOut.append(']');
+            }
+        }
+
+        private final IonValue simplify(IonValue child,
+                                        SymbolTable previous_symbols)
+        {
+            IonType t = child.getType();
+            switch (t) {
+            case STRUCT:
+                if (child.hasTypeAnnotation(ION_SYMBOL_TABLE)) {
+                    if (symbol_table_struct_has_imports(child))
+                    {
+                        return ((IonStruct)child).cloneAndRemove(SYMBOLS);
+                    }
+                    return null;
+                }
+                // fall through to default (print the value)
+                break;
+            case SYMBOL:
+                if (((IonSymbol)child).getSymbolId() == ION_1_0_SID) {
+                    if (previous_symbols != null && previous_symbols.isSystemTable()) {
+                        return null;
+                    }
+                    // fall through to default (print the value)
+                }
+                // fall through to default (print the value)
+                break;
+            default:
+                break;
+            }
+            return child;
+        }
+
+        static final private boolean symbol_table_struct_has_imports(IonValue child) {
+            IonStruct struct = (IonStruct)child;
+            IonValue imports = struct.get(IMPORTS);
+            if (imports instanceof IonList) {
+                return ((IonList)imports).size() != 0;
+            }
+            return false;
+        }
+
+        @Override
+        public void visit(IonDecimal value) throws IOException
+        {
+            writeAnnotations(value);
+
+            if (value.isNullValue())
+            {
+                writeNull("decimal");
+            }
+            else
+            {
+                Decimal decimal = value.decimalValue();
+                BigInteger unscaled = decimal.unscaledValue();
+
+                int signum = decimal.signum();
+                if (signum < 0)
+                {
+                    myOut.append('-');
+                    unscaled = unscaled.negate();
+                }
+                else if (signum == 0 && decimal.isNegativeZero())
+                {
+                    // for the various forms of negative zero we have to
+                    // write the sign ourselves, since neither BigInteger
+                    // nor BigDecimal recognize negative zero, but Ion does.
+                    myOut.append('-');
+                }
+
+
+                final String unscaledText = unscaled.toString();
+                final int significantDigits = unscaledText.length();
+
+                final int scale = decimal.scale();
+                final int exponent = -scale;
+
+                if (myOptions.decimalAsFloat)
+                {
+                    myOut.append(unscaledText);
+                    myOut.append('e');
+                    myOut.append(Integer.toString(exponent));
+                }
+                else if (exponent == 0)
+                {
+                    myOut.append(unscaledText);
+                    myOut.append('.');
+                }
+                else if (0 < scale)
+                {
+                    int wholeDigits;
+                    int remainingScale;
+                    if (significantDigits > scale)
+                    {
+                        wholeDigits = significantDigits - scale;
+                        remainingScale = 0;
+                    }
+                    else
+                    {
+                        wholeDigits = 1;
+                        remainingScale = scale - significantDigits + 1;
+                    }
+
+                    myOut.append(unscaledText, 0, wholeDigits);
+                    if (wholeDigits < significantDigits)
+                    {
+                        myOut.append('.');
+                        myOut.append(unscaledText, wholeDigits,
+                                     significantDigits);
+                    }
+
+                    if (remainingScale != 0)
+                    {
+                        myOut.append("d-");
+                        myOut.append(Integer.toString(remainingScale));
+                    }
+                }
+                else // (exponent > 0)
+                {
+                    // We cannot move the decimal point to the right, adding
+                    // rightmost zeros, because that would alter the precision.
+                    myOut.append(unscaledText);
+                    myOut.append('d');
+                    myOut.append(Integer.toString(exponent));
+                }
+            }
+        }
+
+        @Override
+        public void visit(IonFloat value) throws IOException
+        {
+            writeAnnotations(value);
+
+            if (value.isNullValue())
+            {
+                writeNull("float");
+            }
+            else
+            {
+                double real = value.doubleValue();
+                IonTextUtils.printFloat(myOut, real);
+            }
+        }
+
+        @Override
+        public void visit(IonInt value) throws IOException
+        {
+            writeAnnotations(value);
+
+            if (value.isNullValue())
+            {
+                writeNull("int");
+            }
+            else
+            {
+                myOut.append(value.bigIntegerValue().toString(10));
+            }
+        }
+
+        @Override
+        public void visit(IonList value) throws IOException, Exception
+        {
+            writeAnnotations(value);
+
+            if (value.isNullValue())
+            {
+                writeNull("list");
+            }
+            else
+            {
+                writeSequenceContent(value, true, '[', ',', ']');
+            }
+        }
+
+        @Override
+        public void visit(IonNull value) throws IOException
+        {
+            writeAnnotations(value);
+            myOut.append("null");
+        }
+
+
+        @Override
+        public void visit(IonSexp value) throws IOException, Exception
+        {
+            writeAnnotations(value);
+
+            if (value.isNullValue())
+            {
+                writeNull("sexp");
+            }
+            else if (myOptions.sexpAsList)
+            {
+                writeSequenceContent(value, true, '[', ',', ']');
+            }
+            else
+            {
+                writeSequenceContent(value, false, '(', ' ', ')');
+            }
+        }
+
+
+        @Override
+        public void visit(IonString value) throws IOException
+        {
+            writeAnnotations(value);
+
+            if (value.isNullValue())
+            {
+                writeNull("string");
+            }
+            else
+            {
+                writeString(value.stringValue());
+            }
+        }
+
+
+        @Override
+        public void visit(IonStruct value) throws IOException, Exception
+        {
+            writeAnnotations(value);
+
+            if (value.isNullValue())
+            {
+                writeNull("struct");
+            }
+            else
+            {
+                myOut.append('{');
+
+                boolean hitOne = false;
+                for (IonValue child : value)
+                {
+                    if (hitOne)
+                    {
+                        myOut.append(',');
+                    }
+                    hitOne = true;
+
+                    SymbolToken sym = ((_Private_IonValue)child).getFieldNameSymbol(mySymbolTableProvider);
+                    writeSymbolToken(sym);
+                    myOut.append(':');
+                    writeChild(child, true);
+                }
+                myOut.append('}');
+            }
+        }
+
+
+        @Override
+        public void visit(IonSymbol value) throws IOException
+        {
+            writeAnnotations(value);
+
+            SymbolToken is = ((_Private_IonSymbol)value).symbolValue(mySymbolTableProvider);
+            if (is == null)
+            {
+                writeNull("symbol");
+            }
+            else
+            {
+                writeSymbolToken(is);
+            }
+        }
+
+
+        @Override
+        public void visit(IonTimestamp value) throws IOException
+        {
+            writeAnnotations(value);
+
+            if (value.isNullValue())
+            {
+                writeNull("timestamp");
+            }
+            else if (myOptions.timestampAsMillis)
+            {
+                myOut.append(Long.toString(value.getMillis()));
+            }
+            else
+            {
+                Timestamp ts = value.timestampValue();
+
+                if (myOptions.timestampAsString)
+                {
+                    myOut.append('"');
+                    ts.print(myOut);
+                    myOut.append('"');
+                }
+                else
+                {
+                    ts.print(myOut);
+                }
+            }
+        }
+    }
+}
diff --git a/src/software/amazon/ion/util/Spans.java b/src/com/amazon/ion/util/Spans.java
similarity index 71%
rename from src/software/amazon/ion/util/Spans.java
rename to src/com/amazon/ion/util/Spans.java
index f22cc83c22..4d65750c1a 100644
--- a/src/software/amazon/ion/util/Spans.java
+++ b/src/com/amazon/ion/util/Spans.java
@@ -1,23 +1,24 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
-import static software.amazon.ion.facet.Facets.asFacet;
+import static com.amazon.ion.facet.Facets.asFacet;
 
-import software.amazon.ion.Span;
-import software.amazon.ion.SpanProvider;
+import com.amazon.ion.Span;
+import com.amazon.ion.SpanProvider;
 
 /**
  * Utility methods for working with {@link Span}s.
diff --git a/src/software/amazon/ion/util/PrivateFastAppendable.java b/src/com/amazon/ion/util/_Private_FastAppendable.java
similarity index 76%
rename from src/software/amazon/ion/util/PrivateFastAppendable.java
rename to src/com/amazon/ion/util/_Private_FastAppendable.java
index 9369ee100b..136bdaf43b 100644
--- a/src/software/amazon/ion/util/PrivateFastAppendable.java
+++ b/src/com/amazon/ion/util/_Private_FastAppendable.java
@@ -1,26 +1,24 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
 import java.io.IOException;
 
-/**
- * @deprecated This is an internal API that is subject to change without notice.
- */
-@Deprecated
-public interface PrivateFastAppendable
+
+public interface _Private_FastAppendable
     extends Appendable
 {
     /**
diff --git a/src/com/amazon/ion/util/package-info.java b/src/com/amazon/ion/util/package-info.java
new file mode 100644
index 0000000000..4cda041699
--- /dev/null
+++ b/src/com/amazon/ion/util/package-info.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * Various utilites for working with Ion data.
+ */
+package com.amazon.ion.util;
diff --git a/src/software/amazon/ion/ContainedValueException.java b/src/software/amazon/ion/ContainedValueException.java
deleted file mode 100644
index 34ef2c09cb..0000000000
--- a/src/software/amazon/ion/ContainedValueException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2007 Amazon.com, Inc.  All rights reserved.
- */
-
-package software.amazon.ion;
-
-/**
- * An error caused by adding an {@link IonValue} into a container when it's
- * already contained elsewhere.
- */
-public class ContainedValueException
-    extends IonException
-{
-    private static final long serialVersionUID = 1L;
-
-    public ContainedValueException()
-    {
-        super();
-    }
-
-    /**
-     * @param message
-     */
-    public ContainedValueException(String message)
-    {
-        super(message);
-    }
-}
diff --git a/src/software/amazon/ion/EmptySymbolException.java b/src/software/amazon/ion/EmptySymbolException.java
deleted file mode 100644
index 8934475a78..0000000000
--- a/src/software/amazon/ion/EmptySymbolException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2007-2013 Amazon.com, Inc.  All rights reserved.
- */
-
-package software.amazon.ion;
-
-/**
- * An error caused by a symbol not containing at least one character for
- * its text.
- *
- * @deprecated this exception is not used as empty symbols are valid. In cases where null is used as the symbol value it was
- * replaced by {@link NullPointerException}
- */
-@Deprecated
-public class EmptySymbolException
-    extends IonException
-{
-    private static final long serialVersionUID = -7801632953459636349L;
-
-    public EmptySymbolException()
-    {
-        super("Symbols must contain at least one character.");
-    }
-}
diff --git a/src/software/amazon/ion/InvalidSystemSymbolException.java b/src/software/amazon/ion/InvalidSystemSymbolException.java
deleted file mode 100644
index 3563628cc3..0000000000
--- a/src/software/amazon/ion/InvalidSystemSymbolException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2007-2013 Amazon.com, Inc.  All rights reserved.
- */
-
-package software.amazon.ion;
-
-
-/**
- * An error caused by use of an invalid symbol starting with
- * <code>"$ion_"</code>.
- */
-public class InvalidSystemSymbolException
-    extends IonException
-{
-    private static final long serialVersionUID = 2206499395645594047L;
-    
-    private String myBadSymbol;
-
-
-    public InvalidSystemSymbolException(String badSymbol)
-    {
-        super("Invalid system symbol '" + badSymbol + "'");
-        myBadSymbol = badSymbol;
-    }
-
-
-    public String getBadSymbol()
-    {
-        return myBadSymbol;
-    }
-}
diff --git a/src/software/amazon/ion/impl/IonMessages.java b/src/software/amazon/ion/impl/IonMessages.java
deleted file mode 100644
index c7594ebdaf..0000000000
--- a/src/software/amazon/ion/impl/IonMessages.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package software.amazon.ion.impl;
-
-final class IonMessages
-{
-    static final String CANNOT_STEP_OUT =
-        "Cannot stepOut any further, already at top level.";
-
-}
diff --git a/src/software/amazon/ion/impl/PrivateByteTransferReader.java b/src/software/amazon/ion/impl/PrivateByteTransferReader.java
deleted file mode 100644
index 64a5d282fc..0000000000
--- a/src/software/amazon/ion/impl/PrivateByteTransferReader.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package software.amazon.ion.impl;
-
-import java.io.IOException;
-import software.amazon.ion.IonReader;
-
-/**
- * An {@link IonReader} {@linkplain software.amazon.ion.facet facet} that can rapidly bulk-copy
- * Ion binary data under certain circumstances.
- *
- * @deprecated This is an internal API that is subject to change without notice.
- */
-@Deprecated
-public interface PrivateByteTransferReader
-{
-    public void transferCurrentValue(PrivateByteTransferSink writer)
-        throws IOException;
-}
diff --git a/src/software/amazon/ion/impl/PrivateFastAppendableTrampoline.java b/src/software/amazon/ion/impl/PrivateFastAppendableTrampoline.java
deleted file mode 100644
index 40da4c788e..0000000000
--- a/src/software/amazon/ion/impl/PrivateFastAppendableTrampoline.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2016-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package software.amazon.ion.impl;
-
-import java.io.OutputStream;
-import software.amazon.ion.util.PrivateFastAppendable;
-
-
-/**
- * @deprecated This is an internal API that is subject to change without notice.
- */
-@Deprecated
-public final class PrivateFastAppendableTrampoline
-{
-
-    public static PrivateFastAppendable forAppendable(Appendable appendable)
-    {
-        return new AppendableFastAppendable(appendable);
-    }
-
-    public static PrivateFastAppendable forOutputStream(
-            OutputStream outputStream)
-    {
-        return new OutputStreamFastAppendable(outputStream);
-    }
-}
diff --git a/src/software/amazon/ion/impl/PrivateIonContainer.java b/src/software/amazon/ion/impl/PrivateIonContainer.java
deleted file mode 100644
index 7c83b6e886..0000000000
--- a/src/software/amazon/ion/impl/PrivateIonContainer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package software.amazon.ion.impl;
-
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonValue;
-
-/**
- * Internal, private, interfaces for manipulating
- * the base child collection of IonContainer
- *
- * @deprecated This is an internal API that is subject to change without notice.
- */
-@Deprecated
-public interface PrivateIonContainer
-    extends IonContainer
-{
-    public int      get_child_count();
-    public IonValue get_child(int idx);
-}
diff --git a/src/software/amazon/ion/impl/PrivateIonDatagram.java b/src/software/amazon/ion/impl/PrivateIonDatagram.java
deleted file mode 100644
index 8c5c623b4e..0000000000
--- a/src/software/amazon/ion/impl/PrivateIonDatagram.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package software.amazon.ion.impl;
-
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.SymbolTable;
-
-/**
- * @deprecated This is an internal API that is subject to change without notice.
- */
-@Deprecated
-public interface PrivateIonDatagram
-    extends PrivateIonValue, IonDatagram
-{
-    void appendTrailingSymbolTable(SymbolTable symtab);
-}
diff --git a/src/software/amazon/ion/impl/PrivateIonTextWriterBuilder.java b/src/software/amazon/ion/impl/PrivateIonTextWriterBuilder.java
deleted file mode 100644
index fb3245e420..0000000000
--- a/src/software/amazon/ion/impl/PrivateIonTextWriterBuilder.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.impl.PrivateUtils.initialSymtab;
-
-import java.io.OutputStream;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.system.IonSystemBuilder;
-import software.amazon.ion.system.IonTextWriterBuilder;
-import software.amazon.ion.system.SimpleCatalog;
-import software.amazon.ion.util.PrivateFastAppendable;
-
-/**
- * @deprecated This is an internal API that is subject to change without notice.
- */
-@Deprecated
-public class PrivateIonTextWriterBuilder
-    extends IonTextWriterBuilder
-{
-    private final static CharSequence SPACE_CHARACTER = " ";
-    // TODO amzn/ion-java#57 decide if this should be platform-specific
-    private final static CharSequence LINE_SEPARATOR =
-        System.getProperty("line.separator");
-
-
-    public static PrivateIonTextWriterBuilder standard()
-    {
-        return new PrivateIonTextWriterBuilder.Mutable();
-    }
-
-    public static PrivateIonTextWriterBuilder STANDARD =
-        standard().immutable();
-
-
-    //=========================================================================
-
-    private boolean _pretty_print;
-    public boolean _blob_as_string;
-    public boolean _clob_as_string;
-    public boolean _decimal_as_float;
-    public boolean _sexp_as_list;
-    public boolean _skip_annotations;
-    public boolean _string_as_json;
-    public boolean _symbol_as_string;
-    public boolean _timestamp_as_millis;
-    public boolean _timestamp_as_string;
-    public boolean _untyped_nulls;
-
-    private PrivateIonTextWriterBuilder()
-    {
-        super();
-    }
-
-    private PrivateIonTextWriterBuilder(PrivateIonTextWriterBuilder that)
-    {
-        super(that);
-        this._pretty_print        = that._pretty_print       ;
-        this._blob_as_string      = that._blob_as_string     ;
-        this._clob_as_string      = that._clob_as_string     ;
-        this._decimal_as_float    = that._decimal_as_float   ;
-        this._sexp_as_list        = that._sexp_as_list       ;
-        this._skip_annotations    = that._skip_annotations   ;
-        this._string_as_json      = that._string_as_json     ;
-        this._symbol_as_string    = that._symbol_as_string   ;
-        this._timestamp_as_millis = that._timestamp_as_millis;
-        this._timestamp_as_string = that._timestamp_as_string;
-        this._untyped_nulls       = that._untyped_nulls      ;
-    }
-
-
-    @Override
-    public final PrivateIonTextWriterBuilder copy()
-    {
-        return new Mutable(this);
-    }
-
-    @Override
-    public PrivateIonTextWriterBuilder immutable()
-    {
-        return this;
-    }
-
-    @Override
-    public PrivateIonTextWriterBuilder mutable()
-    {
-        return copy();
-    }
-
-
-    //=========================================================================
-
-    @Override
-    public final IonTextWriterBuilder withPrettyPrinting()
-    {
-        PrivateIonTextWriterBuilder b = mutable();
-        b._pretty_print = true;
-        return b;
-    }
-
-    @Override
-    public final IonTextWriterBuilder withJsonDowngrade()
-    {
-        PrivateIonTextWriterBuilder b = mutable();
-
-        b.withMinimalSystemData();
-
-        _blob_as_string      = true;
-        _clob_as_string      = true;
-        // datagramAsList    = true; // TODO
-        _decimal_as_float    = true;
-        _sexp_as_list        = true;
-        _skip_annotations    = true;
-        // skipSystemValues  = true; // TODO
-        _string_as_json      = true;
-        _symbol_as_string    = true;
-        _timestamp_as_string = true;  // TODO different from Printer
-        _timestamp_as_millis = false;
-        _untyped_nulls       = true;
-
-        return b;
-    }
-
-
-    final boolean isPrettyPrintOn()
-    {
-        return _pretty_print;
-    }
-
-    final CharSequence lineSeparator()
-    {
-        if (_pretty_print) {
-            return LINE_SEPARATOR;
-        }
-        else {
-            return SPACE_CHARACTER;
-        }
-    }
-
-
-    //=========================================================================
-
-    private PrivateIonTextWriterBuilder fillDefaults()
-    {
-        // Ensure that we don't modify the user's builder.
-        IonTextWriterBuilder b = copy();
-
-        if (b.getCatalog() == null)
-        {
-            b.setCatalog(new SimpleCatalog());
-        }
-
-        if (b.getCharset() == null)
-        {
-            b.setCharset(UTF8);
-        }
-
-        return (PrivateIonTextWriterBuilder) b.immutable();
-    }
-
-
-    /** Assumes that {@link #fillDefaults()} has been called. */
-    private IonWriter build(PrivateFastAppendable appender)
-    {
-        IonCatalog catalog = getCatalog();
-        SymbolTable[] imports = getImports();
-
-        // TODO We shouldn't need a system here
-        IonSystem system =
-            IonSystemBuilder.standard().withCatalog(catalog).build();
-
-        SymbolTable defaultSystemSymtab = system.getSystemSymbolTable();
-
-        IonWriterSystemText systemWriter = new IonWriterSystemText(defaultSystemSymtab,
-                                                                   this,
-                                                                   appender);
-
-        SymbolTable initialSymtab =
-            initialSymtab(((PrivateValueFactory)system).getLstFactory(), defaultSystemSymtab, imports);
-
-        return new IonWriterUser(catalog, system, systemWriter, initialSymtab);
-    }
-
-
-    @Override
-    public final IonWriter build(Appendable out)
-    {
-        PrivateIonTextWriterBuilder b = fillDefaults();
-
-        PrivateFastAppendable fast = new AppendableFastAppendable(out);
-
-        return b.build(fast);
-    }
-
-
-    @Override
-    public final IonWriter build(OutputStream out)
-    {
-        PrivateIonTextWriterBuilder b = fillDefaults();
-
-        PrivateFastAppendable fast = new OutputStreamFastAppendable(out);
-
-        return b.build(fast);
-    }
-
-    //=========================================================================
-
-    private static final class Mutable
-        extends PrivateIonTextWriterBuilder
-    {
-        private Mutable() { }
-
-        private Mutable(PrivateIonTextWriterBuilder that)
-        {
-            super(that);
-        }
-
-        @Override
-        public PrivateIonTextWriterBuilder immutable()
-        {
-            return new PrivateIonTextWriterBuilder(this);
-        }
-
-        @Override
-        public PrivateIonTextWriterBuilder mutable()
-        {
-            return this;
-        }
-
-        @Override
-        protected void mutationCheck()
-        {
-        }
-    }
-}
diff --git a/src/software/amazon/ion/impl/PrivateReaderWriter.java b/src/software/amazon/ion/impl/PrivateReaderWriter.java
deleted file mode 100644
index 5b6b4031bf..0000000000
--- a/src/software/amazon/ion/impl/PrivateReaderWriter.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package software.amazon.ion.impl;
-
-import software.amazon.ion.SymbolTable;
-
-/**
- * @deprecated This is an internal API that is subject to change without notice.
- */
-@Deprecated
-public interface PrivateReaderWriter
-{
-    public SymbolTable pop_passed_symbol_table();
-}
-
diff --git a/src/software/amazon/ion/impl/SymbolTokenImpl.java b/src/software/amazon/ion/impl/SymbolTokenImpl.java
deleted file mode 100644
index bd0fc11b41..0000000000
--- a/src/software/amazon/ion/impl/SymbolTokenImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.util.IonTextUtils.printString;
-
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
-
-
-final class SymbolTokenImpl
-    implements SymbolToken
-{
-    private final String myText;
-    private final int mySid;
-
-    SymbolTokenImpl(String text, int sid)
-    {
-        assert text != null || sid >= 0 : "Neither text nor sid is defined";
-
-        myText = text;
-        mySid = sid;
-    }
-
-    SymbolTokenImpl(int sid)
-    {
-        assert sid >= 0 : "sid is undefined";
-
-        myText = null;
-        mySid = sid;
-    }
-
-
-    public String getText()
-    {
-        return myText;
-    }
-
-    public String assumeText()
-    {
-        if (myText == null) throw new UnknownSymbolException(mySid);
-        return myText;
-    }
-
-    public int getSid()
-    {
-        return mySid;
-    }
-
-    @Override
-    public String toString()
-    {
-        String text = (myText == null ? null : printString(myText));
-        return "SymbolToken::{text:" + text + ",id:" + mySid + "}";
-    }
-}
diff --git a/src/software/amazon/ion/impl/bin/PrivateIonHashTrampoline.java b/src/software/amazon/ion/impl/bin/PrivateIonHashTrampoline.java
deleted file mode 100644
index 7440807e22..0000000000
--- a/src/software/amazon/ion/impl/bin/PrivateIonHashTrampoline.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package software.amazon.ion.impl.bin;
-
-import software.amazon.ion.IonWriter;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-/**
- * NOT FOR APPLICATION USE!
- *
- * Exposes {@link IonRawBinaryWriter} functionality for use when creating Ion hashes.
- */
-@Deprecated
-public final class PrivateIonHashTrampoline
-{
-    public static IonWriter newIonWriter(ByteArrayOutputStream baos) throws IOException
-    {
-        return new IonRawBinaryWriter(
-                new PooledBlockAllocatorProvider(),
-                PrivateIonManagedBinaryWriterBuilder.DEFAULT_BLOCK_SIZE,
-                baos,
-                AbstractIonWriter.WriteValueOptimization.NONE,
-                IonRawBinaryWriter.StreamCloseMode.CLOSE,
-                IonRawBinaryWriter.StreamFlushMode.FLUSH,
-                IonRawBinaryWriter.PreallocationMode.PREALLOCATE_0,
-                false     // force floats to be encoded as binary64
-        );
-    }
-}
diff --git a/src/software/amazon/ion/impl/bin/package-info.java b/src/software/amazon/ion/impl/bin/package-info.java
deleted file mode 100644
index 8e2cade484..0000000000
--- a/src/software/amazon/ion/impl/bin/package-info.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2016-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-/**
- * Provides the implementation for the second-generation Ion binary implementation.
- * At this time, this is limited to a binary {@link software.amazon.ion.IonWriter}.
- *
- * <p>
- * This package limits most of its APIs to package-level access, the public API of note is contained within
- * the {@link software.amazon.ion.impl.bin.PrivateIonManagedBinaryWriterBuilder} which builds instances of
- * {@link software.amazon.ion.impl.bin.IonManagedBinaryWriter}.  See the below section for what <i>Managed</i> means
- * in this context.
- *
- * <h2>Block API</h2>
- * A generalized interface for blocks of heap memory are provided via the {@link software.amazon.ion.impl.bin.Block} API.
- * There are two factory type APIs to actually get a {@link software.amazon.ion.impl.bin.Block} instance:
- * {@link software.amazon.ion.impl.bin.BlockAllocator} which vend blocks of a particular fixed size
- * and {@link software.amazon.ion.impl.bin.BlockAllocatorProvider} which creates {@link software.amazon.ion.impl.bin.BlockAllocator}
- * instances.
- * <p>
- * The primary reason for this level of indirection is flexibility for the underlying implementations of {@link software.amazon.ion.impl.bin.Block}
- * and {@link software.amazon.ion.impl.bin.BlockAllocator}.  These APIs are not required to be thread-safe, whereas
- * {@link software.amazon.ion.impl.bin.BlockAllocatorProvider} is required to be thread-safe.
- * <p>
- * The APIs for {@link software.amazon.ion.impl.bin.BlockAllocator} and {@link software.amazon.ion.impl.bin.Block}
- * follow the resource pattern (similar in principle to I/O streams), and should be closed when no longer needed
- * to allow implementation resources to be released or re-used.
- *
- * <h2>Raw Binary Ion Writer</h2>
- * The {@link software.amazon.ion.impl.bin.IonRawBinaryWriter} deals with the low-level encoding considerations of the
- * Ion format.  The {@link software.amazon.ion.impl.bin.WriteBuffer} is used closely with this implementation to
- * deal with the Ion <i>sub-field</i> encodings (e.g. <tt>VarInt</tt>, <tt>VarUInt</tt>, and UTF-8).
- *
- * <h2>Managed Binary Ion Writer</h2>
- * The {@link software.amazon.ion.impl.bin.IonManagedBinaryWriter} is layered on top of the {@link software.amazon.ion.impl.bin.IonRawBinaryWriter}.
- * In particular, it intercepts symbol, annotation, field names and handles the mechanics of symbol table management
- * transparently to the user.
- */
-package software.amazon.ion.impl.bin;
\ No newline at end of file
diff --git a/src/software/amazon/ion/package-info.java b/src/software/amazon/ion/package-info.java
deleted file mode 100644
index cdd31421bc..0000000000
--- a/src/software/amazon/ion/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-/**
- * Public interfaces of the core Ion system.
- */
-package software.amazon.ion;
diff --git a/src/software/amazon/ion/system/package-info.java b/src/software/amazon/ion/system/package-info.java
deleted file mode 100644
index 51df4ab8c2..0000000000
--- a/src/software/amazon/ion/system/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-/**
- * Public implementation of the core Ion system.
- */
-package software.amazon.ion.system;
diff --git a/src/software/amazon/ion/util/package-info.java b/src/software/amazon/ion/util/package-info.java
deleted file mode 100644
index 07c2d717e7..0000000000
--- a/src/software/amazon/ion/util/package-info.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-/**
- * Various utilites for working with Ion data.
- */
-package software.amazon.ion.util;
diff --git a/test/AllTests.java b/test/AllTests.java
index 609b86e896..326611b69a 100644
--- a/test/AllTests.java
+++ b/test/AllTests.java
@@ -1,97 +1,107 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
+import com.amazon.ion.AnnotationEscapesTest;
+import com.amazon.ion.AssertionsEnabledTest;
+import com.amazon.ion.BadIonTest;
+import com.amazon.ion.BinaryReaderWrappedValueLengthTest;
+import com.amazon.ion.BinaryTest;
+import com.amazon.ion.BlobTest;
+import com.amazon.ion.BoolTest;
+import com.amazon.ion.ClobTest;
+import com.amazon.ion.CloneTest;
+import com.amazon.ion.DatagramTest;
+import com.amazon.ion.DecimalTest;
+import com.amazon.ion.EquivTimelineTest;
+import com.amazon.ion.EquivsTest;
+import com.amazon.ion.ExtendedDecimalTest;
+import com.amazon.ion.FieldNameEscapesTest;
+import com.amazon.ion.FloatTest;
+import com.amazon.ion.GoodIonTest;
+import com.amazon.ion.HashCodeCorrectnessTest;
+import com.amazon.ion.HashCodeDeltaCollisionTest;
+import com.amazon.ion.HashCodeDistributionTest;
+import com.amazon.ion.IntTest;
+import com.amazon.ion.IonExceptionTest;
+import com.amazon.ion.IonRawWriterBasicTest;
+import com.amazon.ion.IonRawWriterSymbolsTest;
+import com.amazon.ion.IonReaderToIonValueTest;
+import com.amazon.ion.IonSystemTest;
+import com.amazon.ion.IonValueTest;
+import com.amazon.ion.JavaNumericsTest;
+import com.amazon.ion.ListTest;
+import com.amazon.ion.LoaderTest;
+import com.amazon.ion.LongStringTest;
+import com.amazon.ion.NonEquivsTest;
+import com.amazon.ion.NopPaddingTest;
+import com.amazon.ion.NullTest;
+import com.amazon.ion.RawValueSpanReaderBasicTest;
+import com.amazon.ion.impl.RawValueSpanReaderTest;
+import com.amazon.ion.RoundTripTest;
+import com.amazon.ion.SexpTest;
+import com.amazon.ion.StringFieldNameEscapesTest;
+import com.amazon.ion.StringTest;
+import com.amazon.ion.StructTest;
+import com.amazon.ion.SurrogateEscapeTest;
+import com.amazon.ion.SymbolTest;
+import com.amazon.ion.SystemProcessingTests;
+import com.amazon.ion.TimestampBadTest;
+import com.amazon.ion.TimestampGoodTest;
+import com.amazon.ion.TimestampTest;
+import com.amazon.ion.ValueFactorySequenceTest;
+import com.amazon.ion.facet.FacetsTest;
+import com.amazon.ion.impl.ByteBufferTest;
+import com.amazon.ion.impl.CharacterReaderTest;
+import com.amazon.ion.impl.IonImplUtilsTest;
+import com.amazon.ion.impl.IonMarkupWriterFilesTest;
+import com.amazon.ion.impl.IonMarkupWriterTest;
+import com.amazon.ion.impl.IonWriterTests;
+import com.amazon.ion.impl.IterationTest;
+import com.amazon.ion.impl.LocalSymbolTableTest;
+import com.amazon.ion.impl.SharedSymbolTableTest;
+import com.amazon.ion.impl.SymbolTableTest;
+import com.amazon.ion.impl.TreeReaderTest;
+import com.amazon.ion.impl.bin.IonManagedBinaryWriterTest;
+import com.amazon.ion.impl.bin.IonRawBinaryWriterTest;
+import com.amazon.ion.impl.bin.PooledBlockAllocatorProviderTest;
+import com.amazon.ion.impl.bin.WriteBufferTest;
+import com.amazon.ion.impl.lite.IonContextTest;
+import com.amazon.ion.impl.lite.SIDPresentLifecycleTest;
+import com.amazon.ion.streaming.BadIonStreamingTest;
+import com.amazon.ion.streaming.BinaryStreamingTest;
+import com.amazon.ion.streaming.GoodIonStreamingTest;
+import com.amazon.ion.streaming.InputStreamReaderTest;
+import com.amazon.ion.streaming.MiscStreamingTest;
+import com.amazon.ion.streaming.ReaderDomCopyTest;
+import com.amazon.ion.streaming.ReaderIntegerSizeTest;
+import com.amazon.ion.streaming.ReaderSkippingTest;
+import com.amazon.ion.streaming.ReaderTest;
+import com.amazon.ion.streaming.RoundTripStreamingTest;
+import com.amazon.ion.streaming.SpanTests;
+import com.amazon.ion.system.IonBinaryWriterBuilderTest;
+import com.amazon.ion.system.IonReaderBuilderTest;
+import com.amazon.ion.system.IonSystemBuilderTest;
+import com.amazon.ion.system.IonTextWriterBuilderTest;
+import com.amazon.ion.system.SimpleCatalogTest;
+import com.amazon.ion.util.EquivalenceTest;
+import com.amazon.ion.util.IonStreamUtilsTest;
+import com.amazon.ion.util.JarInfoTest;
+import com.amazon.ion.util.PrinterTest;
+import com.amazon.ion.util.TextTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
-import software.amazon.ion.AnnotationEscapesTest;
-import software.amazon.ion.AssertionsEnabledTest;
-import software.amazon.ion.BadIonTest;
-import software.amazon.ion.BinaryReaderWrappedValueLengthTest;
-import software.amazon.ion.BinaryTest;
-import software.amazon.ion.BlobTest;
-import software.amazon.ion.BoolTest;
-import software.amazon.ion.ClobTest;
-import software.amazon.ion.CloneTest;
-import software.amazon.ion.DatagramTest;
-import software.amazon.ion.DecimalTest;
-import software.amazon.ion.EquivTimelineTest;
-import software.amazon.ion.EquivsTest;
-import software.amazon.ion.ExtendedDecimalTest;
-import software.amazon.ion.FieldNameEscapesTest;
-import software.amazon.ion.FloatTest;
-import software.amazon.ion.GoodIonTest;
-import software.amazon.ion.HashCodeCorrectnessTest;
-import software.amazon.ion.HashCodeDeltaCollisionTest;
-import software.amazon.ion.HashCodeDistributionTest;
-import software.amazon.ion.IntTest;
-import software.amazon.ion.IonExceptionTest;
-import software.amazon.ion.IonReaderToIonValueTest;
-import software.amazon.ion.IonSystemTest;
-import software.amazon.ion.IonValueTest;
-import software.amazon.ion.JavaNumericsTest;
-import software.amazon.ion.ListTest;
-import software.amazon.ion.LoaderTest;
-import software.amazon.ion.LongStringTest;
-import software.amazon.ion.NonEquivsTest;
-import software.amazon.ion.NopPaddingTest;
-import software.amazon.ion.NullTest;
-import software.amazon.ion.RoundTripTest;
-import software.amazon.ion.SexpTest;
-import software.amazon.ion.StringFieldNameEscapesTest;
-import software.amazon.ion.StringTest;
-import software.amazon.ion.StructTest;
-import software.amazon.ion.SurrogateEscapeTest;
-import software.amazon.ion.SymbolTest;
-import software.amazon.ion.SystemProcessingTests;
-import software.amazon.ion.TimestampBadTest;
-import software.amazon.ion.TimestampGoodTest;
-import software.amazon.ion.TimestampTest;
-import software.amazon.ion.ValueFactorySequenceTest;
-import software.amazon.ion.facet.FacetsTest;
-import software.amazon.ion.impl.IonImplUtilsTest;
-import software.amazon.ion.impl.IonWriterTests;
-import software.amazon.ion.impl.IterationTest;
-import software.amazon.ion.impl.LocalSymbolTableTest;
-import software.amazon.ion.impl.SharedSymbolTableTest;
-import software.amazon.ion.impl.SymbolTableTest;
-import software.amazon.ion.impl.TreeReaderTest;
-import software.amazon.ion.impl.bin.IonManagedBinaryWriterTest;
-import software.amazon.ion.impl.bin.IonRawBinaryWriterTest;
-import software.amazon.ion.impl.bin.PooledBlockAllocatorProviderTest;
-import software.amazon.ion.impl.bin.WriteBufferTest;
-import software.amazon.ion.impl.lite.IonContextTest;
-import software.amazon.ion.impl.lite.SIDPresentLifecycleTest;
-import software.amazon.ion.streaming.BadIonStreamingTest;
-import software.amazon.ion.streaming.BinaryStreamingTest;
-import software.amazon.ion.streaming.GoodIonStreamingTest;
-import software.amazon.ion.streaming.InputStreamReaderTest;
-import software.amazon.ion.streaming.MiscStreamingTest;
-import software.amazon.ion.streaming.ReaderDomCopyTest;
-import software.amazon.ion.streaming.ReaderIntegerSizeTest;
-import software.amazon.ion.streaming.ReaderSkippingTest;
-import software.amazon.ion.streaming.ReaderTest;
-import software.amazon.ion.streaming.RoundTripStreamingTest;
-import software.amazon.ion.streaming.SpanTests;
-import software.amazon.ion.system.IonBinaryWriterBuilderTest;
-import software.amazon.ion.system.IonReaderBuilderTest;
-import software.amazon.ion.system.IonSystemBuilderTest;
-import software.amazon.ion.system.IonTextWriterBuilderTest;
-import software.amazon.ion.system.SimpleCatalogTest;
-import software.amazon.ion.util.EquivalenceTest;
-import software.amazon.ion.util.IonStreamUtilsTest;
-import software.amazon.ion.util.JarInfoTest;
-import software.amazon.ion.util.TextTest;
 
 
 /**
@@ -103,7 +113,9 @@
     AssertionsEnabledTest.class,
     IonExceptionTest.class,
     FacetsTest.class,
+    ByteBufferTest.class,
     TextTest.class,
+    CharacterReaderTest.class,
     JavaNumericsTest.class,
     ExtendedDecimalTest.class,
     IonImplUtilsTest.class,
@@ -137,6 +149,10 @@
     StringFieldNameEscapesTest.class,
     SurrogateEscapeTest.class,
 
+    // Markup tests
+    IonMarkupWriterTest.class,
+    IonMarkupWriterFilesTest.class,
+
     NopPaddingTest.class,
 
     // Binary format tests
@@ -146,6 +162,7 @@
     JarInfoTest.class,
     LoaderTest.class,
     IterationTest.class,
+    PrinterTest.class,
     SymbolTableTest.class,
     SharedSymbolTableTest.class,
     LocalSymbolTableTest.class,
@@ -201,9 +218,13 @@
     HashCodeDistributionTest.class,
     HashCodeDeltaCollisionTest.class,
 
+    IonRawWriterBasicTest.class,
+    IonRawWriterSymbolsTest.class,
+    RawValueSpanReaderBasicTest.class,
+    RawValueSpanReaderTest.class,
+
     // DOM Lifecycle / mode tests
-    SIDPresentLifecycleTest.class,
-    HashCodeDeltaCollisionTest.class
+    SIDPresentLifecycleTest.class
 })
 public class AllTests
 {
diff --git a/test/software/amazon/ion/AnnotationEscapesTest.java b/test/com/amazon/ion/AnnotationEscapesTest.java
similarity index 55%
rename from test/software/amazon/ion/AnnotationEscapesTest.java
rename to test/com/amazon/ion/AnnotationEscapesTest.java
index b68ea239e6..672c3a4a5c 100644
--- a/test/software/amazon/ion/AnnotationEscapesTest.java
+++ b/test/com/amazon/ion/AnnotationEscapesTest.java
@@ -1,20 +1,20 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import software.amazon.ion.IonValue;
 
 public class AnnotationEscapesTest
     extends TextTestCase
diff --git a/test/software/amazon/ion/AssertionsEnabledTest.java b/test/com/amazon/ion/AssertionsEnabledTest.java
similarity index 66%
rename from test/software/amazon/ion/AssertionsEnabledTest.java
rename to test/com/amazon/ion/AssertionsEnabledTest.java
index ee782d54fb..786cd8eec0 100644
--- a/test/software/amazon/ion/AssertionsEnabledTest.java
+++ b/test/com/amazon/ion/AssertionsEnabledTest.java
@@ -1,24 +1,26 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 import org.junit.Test;
 
+
 public class AssertionsEnabledTest
 {
     /**
diff --git a/test/software/amazon/ion/BadIonTest.java b/test/com/amazon/ion/BadIonTest.java
similarity index 75%
rename from test/software/amazon/ion/BadIonTest.java
rename to test/com/amazon/ion/BadIonTest.java
index 326066842a..28b3602e2c 100644
--- a/test/software/amazon/ion/BadIonTest.java
+++ b/test/com/amazon/ion/BadIonTest.java
@@ -1,22 +1,26 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion;
 
-import static software.amazon.ion.TestUtils.BAD_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.testdataFiles;
+package com.amazon.ion;
 
+import static com.amazon.ion.TestUtils.BAD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.testdataFiles;
+
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.Injected.Inject;
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -24,8 +28,6 @@
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
 import org.junit.Test;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.junit.Injected.Inject;
 
 
 public class BadIonTest
@@ -73,7 +75,7 @@ public void testLoadString()
             {
                 // This will fail if the file has bad UTF-8 data.
                 // That's OK, the other test will still do the right thing.
-                ionText = PrivateUtils.utf8FileToString(myTestFile);
+                ionText = _Private_Utils.utf8FileToString(myTestFile);
             }
             catch (IonException e)
             {
diff --git a/test/software/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java b/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
similarity index 66%
rename from test/software/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
rename to test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
index 7602be6b37..1bc2fac1a7 100644
--- a/test/software/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
@@ -1,21 +1,21 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.Iterator;
-import software.amazon.ion.IonValue;
 
 
 public class BinaryByteArrayIteratorSystemProcessingTest
diff --git a/test/software/amazon/ion/BinaryReaderSystemProcessingTest.java b/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
similarity index 63%
rename from test/software/amazon/ion/BinaryReaderSystemProcessingTest.java
rename to test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
index a07a0d6259..c1894984bb 100644
--- a/test/software/amazon/ion/BinaryReaderSystemProcessingTest.java
+++ b/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
@@ -1,22 +1,22 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
+
+
 
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.IonReader;
 
 public class BinaryReaderSystemProcessingTest
     extends ReaderSystemProcessingTestCase
diff --git a/test/software/amazon/ion/BinaryReaderWrappedValueLengthTest.java b/test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java
similarity index 76%
rename from test/software/amazon/ion/BinaryReaderWrappedValueLengthTest.java
rename to test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java
index 6b870bf72b..c1c5324abd 100644
--- a/test/software/amazon/ion/BinaryReaderWrappedValueLengthTest.java
+++ b/test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java
@@ -1,29 +1,27 @@
 /*
- * Copyright 2016-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import static com.amazon.ion.BitUtils.bytes;
 import static java.util.Arrays.asList;
 import static java.util.Collections.emptyList;
-import static software.amazon.ion.BitUtils.bytes;
 
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
 
 
 public class BinaryReaderWrappedValueLengthTest
diff --git a/test/software/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java b/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
similarity index 69%
rename from test/software/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
rename to test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
index 9188d92388..a0986d1201 100644
--- a/test/software/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
@@ -1,23 +1,23 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Iterator;
-import software.amazon.ion.IonValue;
 
 
 public class BinaryStreamIteratorSystemProcessingTest
diff --git a/test/software/amazon/ion/BinaryTest.java b/test/com/amazon/ion/BinaryTest.java
similarity index 91%
rename from test/software/amazon/ion/BinaryTest.java
rename to test/com/amazon/ion/BinaryTest.java
index bde270f1e7..e7641ae01f 100644
--- a/test/software/amazon/ion/BinaryTest.java
+++ b/test/com/amazon/ion/BinaryTest.java
@@ -1,27 +1,24 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
 
 import java.util.Arrays;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonValue;
 
 public class BinaryTest extends IonTestCase
 {
diff --git a/test/software/amazon/ion/BitUtils.java b/test/com/amazon/ion/BitUtils.java
similarity index 74%
rename from test/software/amazon/ion/BitUtils.java
rename to test/com/amazon/ion/BitUtils.java
index fc54acca62..c9a1ce72cf 100644
--- a/test/software/amazon/ion/BitUtils.java
+++ b/test/com/amazon/ion/BitUtils.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2016-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 public class BitUtils
 {
diff --git a/test/software/amazon/ion/BlobTest.java b/test/com/amazon/ion/BlobTest.java
similarity index 92%
rename from test/software/amazon/ion/BlobTest.java
rename to test/com/amazon/ion/BlobTest.java
index c19a8c978f..f39fcc210b 100644
--- a/test/software/amazon/ion/BlobTest.java
+++ b/test/com/amazon/ion/BlobTest.java
@@ -1,30 +1,26 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
-
-import static software.amazon.ion.TestUtils.US_ASCII_CHARSET;
-import static software.amazon.ion.impl.PrivateUtils.encode;
+package com.amazon.ion;
 
+import static com.amazon.ion.TestUtils.US_ASCII_CHARSET;
+import static com.amazon.ion.impl._Private_Utils.encode;
+import com.amazon.ion.impl._Private_Utils;
 import java.io.IOException;
 import java.io.InputStream;
 import org.junit.Test;
-import software.amazon.ion.IonBlob;
-import software.amazon.ion.IonType;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.UnexpectedEofException;
-import software.amazon.ion.impl.PrivateUtils;
 
 
 public class BlobTest
@@ -219,7 +215,7 @@ public TestData(int[] bytes, String base64)
 
     private static byte[] EncodeAscii(String ascii)
     {
-        return PrivateUtils.encode(ascii, US_ASCII_CHARSET);
+        return _Private_Utils.encode(ascii, US_ASCII_CHARSET);
     }
 
 
diff --git a/test/software/amazon/ion/BoolTest.java b/test/com/amazon/ion/BoolTest.java
similarity index 86%
rename from test/software/amazon/ion/BoolTest.java
rename to test/com/amazon/ion/BoolTest.java
index 3966352782..208c8724ae 100644
--- a/test/software/amazon/ion/BoolTest.java
+++ b/test/com/amazon/ion/BoolTest.java
@@ -1,23 +1,21 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion;
+
+package com.amazon.ion;
 
 import org.junit.Test;
-import software.amazon.ion.IonBool;
-import software.amazon.ion.IonType;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.ReadOnlyValueException;
 
 
 
diff --git a/test/software/amazon/ion/Checker.java b/test/com/amazon/ion/Checker.java
similarity index 65%
rename from test/software/amazon/ion/Checker.java
rename to test/com/amazon/ion/Checker.java
index d27ab1093b..7e41ffa178 100644
--- a/test/software/amazon/ion/Checker.java
+++ b/test/com/amazon/ion/Checker.java
@@ -1,18 +1,20 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
+
 
 public interface Checker
 {
diff --git a/test/software/amazon/ion/ClobTest.java b/test/com/amazon/ion/ClobTest.java
similarity index 88%
rename from test/software/amazon/ion/ClobTest.java
rename to test/com/amazon/ion/ClobTest.java
index 93bdbea901..07ef4ab300 100644
--- a/test/software/amazon/ion/ClobTest.java
+++ b/test/com/amazon/ion/ClobTest.java
@@ -1,30 +1,28 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion;
 
+package com.amazon.ion;
 
-import static software.amazon.ion.impl.PrivateUtils.UTF8_CHARSET;
 
+import static com.amazon.ion.impl._Private_Utils.UTF8_CHARSET;
+
+import com.amazon.ion.impl._Private_Utils;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
 import org.junit.Test;
-import software.amazon.ion.IonClob;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.impl.PrivateUtils;
 
 
 
@@ -33,7 +31,7 @@ public class ClobTest
 {
     public static final String SAMPLE_ASCII = "Wow!";
     public static final byte[] SAMPLE_ASCII_AS_UTF8 =
-        PrivateUtils.utf8(SAMPLE_ASCII);
+        _Private_Utils.utf8(SAMPLE_ASCII);
 
 
     public void checkNullClob(IonClob value)
diff --git a/test/software/amazon/ion/CloneTest.java b/test/com/amazon/ion/CloneTest.java
similarity index 80%
rename from test/software/amazon/ion/CloneTest.java
rename to test/com/amazon/ion/CloneTest.java
index 0e94379515..b9cb52d253 100644
--- a/test/software/amazon/ion/CloneTest.java
+++ b/test/com/amazon/ion/CloneTest.java
@@ -1,32 +1,26 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.impl.PrivateUtils.newSymbolToken;
+import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
 
+import com.amazon.ion.system.SimpleCatalog;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.system.SimpleCatalog;
 
 
 public class CloneTest
@@ -66,7 +60,7 @@ public void testDifferentValueFactoryCloneWithUnknownSymbolText()
         SymbolToken tok = newSymbolToken(99);
         IonSymbol original = system().newSymbol(tok);
 
-        // TODO amzn/ion-java#30 An UnknownSymbolException is expected here, but
+        // TODO amzn/ion-java/issues/30 An UnknownSymbolException is expected here, but
         // it isn't thrown.
         IonSymbol copy = otherSystem.clone(original);
 
@@ -105,7 +99,7 @@ public void testDifferentValueFactoryCloneWithUnknownAnnotationText()
         IonInt original = system().newInt(5);
         original.setTypeAnnotationSymbols(tok);
 
-        // TODO amzn/ion-java#30 An UnknownSymbolException is expected here, but
+        // TODO amzn/ion-java/issues/30 An UnknownSymbolException is expected here, but
         // it isn't thrown.
         IonInt copy = otherSystem.clone(original);
 
@@ -159,7 +153,7 @@ public void testDifferentValueFactoryCloneWithUnknownFieldNameText()
         // This works since the cloned child doesn't retain its field name.
         otherSystem.clone(child);
 
-        // TODO amzn/ion-java#30 An UnknownSymbolException is expected here, but
+        // TODO amzn/ion-java/issues/30 An UnknownSymbolException is expected here, but
         // it isn't thrown.
         IonStruct copy = otherSystem.clone(original);
 
diff --git a/test/software/amazon/ion/ContainerTestCase.java b/test/com/amazon/ion/ContainerTestCase.java
similarity index 90%
rename from test/software/amazon/ion/ContainerTestCase.java
rename to test/com/amazon/ion/ContainerTestCase.java
index ad3b7ff1c1..6ca1b7626a 100644
--- a/test/software/amazon/ion/ContainerTestCase.java
+++ b/test/com/amazon/ion/ContainerTestCase.java
@@ -1,37 +1,24 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.system.SimpleCatalog;
 import java.util.Iterator;
 import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.system.SimpleCatalog;
 
 
 
@@ -255,7 +242,7 @@ public void testRemoveFromContainer()
     }
 
 
-    /** TODO amzn/ion-java#8 datagram is lazy creating local symtabs */
+    /** TODO amzn/ion-java/issues/8 datagram is lazy creating local symtabs */
     @Test @Ignore
     public void testDetachHasDifferentSymtab()
     {
@@ -365,7 +352,7 @@ public void testRemovingReadOnlyChild()
         assertSame(n, c.iterator().next());
     }
 
-    /** TODO amzn/ion-java#6 */
+    /** TODO amzn/ion-java/issues/6 */
     @Test @Ignore
     public void testSelfContainment()
     {
diff --git a/test/software/amazon/ion/DatagramIteratorSystemProcessingTest.java b/test/com/amazon/ion/DatagramIteratorSystemProcessingTest.java
similarity index 56%
rename from test/software/amazon/ion/DatagramIteratorSystemProcessingTest.java
rename to test/com/amazon/ion/DatagramIteratorSystemProcessingTest.java
index da4da769c4..5831dd9c42 100644
--- a/test/software/amazon/ion/DatagramIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/DatagramIteratorSystemProcessingTest.java
@@ -1,13 +1,22 @@
 /*
- * Copyright (c) 2008 Amazon.com, Inc.  All rights reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.Iterator;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.IonValue;
+
 
 public class DatagramIteratorSystemProcessingTest
     extends IteratorSystemProcessingTestCase
diff --git a/test/software/amazon/ion/DatagramMaker.java b/test/com/amazon/ion/DatagramMaker.java
similarity index 80%
rename from test/software/amazon/ion/DatagramMaker.java
rename to test/com/amazon/ion/DatagramMaker.java
index 552fd91aca..7f2ef82f05 100644
--- a/test/software/amazon/ion/DatagramMaker.java
+++ b/test/com/amazon/ion/DatagramMaker.java
@@ -1,28 +1,26 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.TestUtils.ensureBinary;
-import static software.amazon.ion.TestUtils.ensureText;
+import static com.amazon.ion.TestUtils.ensureBinary;
+import static com.amazon.ion.TestUtils.ensureText;
 
+import com.amazon.ion.impl._Private_Utils;
 import java.util.ArrayList;
 import java.util.Arrays;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.impl.PrivateUtils;
 
 /**
  * Abstracts the various ways that {@link IonDatagram}s can be created, so test
@@ -97,7 +95,7 @@ public boolean sourceIsBinary()
 
     public IonDatagram newDatagram(IonSystem system, String ionText)
     {
-        byte[] utf8 = PrivateUtils.utf8(ionText);
+        byte[] utf8 = _Private_Utils.utf8(ionText);
         return newDatagram(system, utf8);
     }
 
diff --git a/test/software/amazon/ion/DatagramTest.java b/test/com/amazon/ion/DatagramTest.java
similarity index 88%
rename from test/software/amazon/ion/DatagramTest.java
rename to test/com/amazon/ion/DatagramTest.java
index 6491d6fd97..9193cfabac 100644
--- a/test/software/amazon/ion/DatagramTest.java
+++ b/test/com/amazon/ion/DatagramTest.java
@@ -1,51 +1,37 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.SYMBOLS;
-import static software.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
-import static software.amazon.ion.junit.IonAssert.assertIonEquals;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.SYMBOLS;
+import static com.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
+import static com.amazon.ion.junit.IonAssert.assertIonEquals;
 
+import com.amazon.ion.impl.Symtabs;
+import com.amazon.ion.impl._Private_IonSystem;
+import com.amazon.ion.impl._Private_IonValue;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Iterator;
 import org.junit.Before;
 import org.junit.Test;
-import software.amazon.ion.IonBool;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.impl.PrivateIonSystem;
-import software.amazon.ion.impl.PrivateIonValue;
-import software.amazon.ion.impl.Symtabs;
 
 
 public class DatagramTest
@@ -144,7 +130,7 @@ public IonDatagram roundTrip(String text)
     public void testAutomaticIVM()
         throws Exception
     {
-        PrivateIonSystem system = system();
+        _Private_IonSystem system = system();
         SymbolTable      systemSymtab_1_0 = system.getSystemSymbolTable(ION_1_0);
 
         IonDatagram dg = system.newDatagram();
@@ -165,7 +151,7 @@ public void testAutomaticIVM()
     public void testManualIVM()
         throws Exception
     {
-        PrivateIonSystem system = system();
+        _Private_IonSystem system = system();
         SymbolTable      systemSymtab_1_0 = system.getSystemSymbolTable(ION_1_0);
 
         IonDatagram dg = system.newDatagram();
@@ -178,7 +164,7 @@ public void testManualIVM()
 
         assertSame(systemSymtab_1_0, sysId.getSymbolTable());
 
-        // TODO amzn/ion-java#20
+        // TODO amzn/ion-java/issues/20
 //        assertEquals(0, dg.size());
 
         // TODO adding $ion_1_1 should fail: unsupported version
@@ -225,7 +211,7 @@ public void testBinaryData()
         assertSame(symbol, datagram1.get(0));
 
         SymbolTable symtab = symbol.getSymbolTable();
-        assertEquals(symbol.symbolValue().getSid(), symtab.getMaxId());
+        assertEquals(symbol.getSymbolId(), symtab.getMaxId());
 
         // TODO if we keep max_id in the struct, should validate it here.
     }
@@ -280,6 +266,34 @@ public void testGetBytes()
         // check strict data equivalence
         IonDatagram dg2 = myLoader.load(bytes2);
         assertIonEquals(dg, dg2);
+
+        // now check extraction into sub-array
+        final int OFFSET = 5;
+        assertTrue(bytes1.length > OFFSET);
+        bytes2 = new byte[size + OFFSET];
+
+        outLen = dg.getBytes(bytes2, OFFSET);
+        assertEquals(size, outLen);
+
+        for (int i = 0; i < bytes1.length; i++)
+        {
+            if (bytes1[i] != bytes2[i + OFFSET])
+            {
+                fail("Binary data differs at index " + i);
+            }
+        }
+
+        try {
+            dg.getBytes(new byte[3]);
+            fail("Expected IndexOutOfBoundsException");
+        }
+        catch (IndexOutOfBoundsException e) { /* good */ }
+
+        try {
+            dg.getBytes(new byte[size + OFFSET - 1], OFFSET);
+            fail("Expected IndexOutOfBoundsException");
+        }
+        catch (IndexOutOfBoundsException e) { /* good */ }
     }
 
 
@@ -401,7 +415,7 @@ public void testAddingDatagramToDatagram()
         }
         catch (IllegalArgumentException e) { }
 
-        // Cannot insert a datagram  // TODO amzn/ion-java#48
+        // Cannot insert a datagram  // TODO amzn/ion-java/issues/48
 //        try
 //        {
 //            dg1.add(1, dg2);
@@ -484,7 +498,7 @@ public void testNewDatagramWithImports()
     public void testEmptyDatagram()
     {
         IonDatagram dg = loader().load("");
-//        testEmptySequence(dg); // TODO amzn/ion-java#48 implement add(int,v)
+//        testEmptySequence(dg); // TODO amzn/ion-java/issues/48 implement add(int,v)
         dg.add().newInt(1);
         testClearContainer(dg);
     }
@@ -494,7 +508,7 @@ public void testEmptyDatagram()
     @Test
     public void testRemoveViaIteratorThenDirect()
     {
-        // TODO amzn/ion-java#51 implement remove on datagram iterator
+        // TODO amzn/ion-java/issues/51 implement remove on datagram iterator
     }
 
 
@@ -556,7 +570,7 @@ public void testClearAfterClone()
     @Test
     public void testToString()
     {
-        // TODO amzn/ion-java#8 I think this is wrong, the datagram has injected IVM
+        // TODO amzn/ion-java/issues/8 I think this is wrong, the datagram has injected IVM
         IonDatagram dg = loader().load("1");
         assertEquals("$ion_1_0 1", dg.toString());
 
@@ -568,7 +582,7 @@ public void testToString()
                    text.endsWith(" {a:b}"));
 
         // Just force symtab analysis and make sure output is still okay
-        dg.getBytes();
+        dg.getBytes(new byte[dg.byteSize()]);
         text = dg.toString();
         assertTrue("missing version marker",
                    text.startsWith(ION_1_0 + ' '));
@@ -592,6 +606,7 @@ public void testToStringWithSymbols()
         dg.getBytes();  // Force encoding and symtab construction
 
         String result = dg.toString();
+
         assertEquals(ION_1_0 + " x", result);
     }
 
@@ -652,11 +667,11 @@ public void testGetTopLevelValueOfDatagram()
     public void testGetAssignedSymbolTable()
     {
         IonDatagram dg = system().newDatagram();
-        ((PrivateIonValue)dg).getAssignedSymbolTable();
+        ((_Private_IonValue)dg).getAssignedSymbolTable();
     }
 
     /**
-     * TODO amzn/ion-java#50 Datagram.set() should work, but it's documented to throw.
+     * TODO amzn/ion-java/issues/50 Datagram.set() should work, but it's documented to throw
      */
     @Test(expected = UnsupportedOperationException.class)
     public void testSet()
diff --git a/test/software/amazon/ion/DatagramTreeReaderSystemProcessingTest.java b/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
similarity index 77%
rename from test/software/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
rename to test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
index 98ff79ffcd..f8077abb08 100644
--- a/test/software/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
+++ b/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
@@ -1,25 +1,25 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.DatagramMaker.FROM_BYTES_TEXT;
+import static com.amazon.ion.DatagramMaker.FROM_BYTES_TEXT;
 
+import com.amazon.ion.junit.Injected.Inject;
 import org.junit.After;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.junit.Injected.Inject;
+
 
 
 public class DatagramTreeReaderSystemProcessingTest
diff --git a/test/software/amazon/ion/DecimalTest.java b/test/com/amazon/ion/DecimalTest.java
similarity index 91%
rename from test/software/amazon/ion/DecimalTest.java
rename to test/com/amazon/ion/DecimalTest.java
index 6d53a15f75..6d79dacfe7 100644
--- a/test/software/amazon/ion/DecimalTest.java
+++ b/test/com/amazon/ion/DecimalTest.java
@@ -1,25 +1,22 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion;
+
+package com.amazon.ion;
 
 import java.math.BigDecimal;
 import org.junit.Test;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonType;
-import software.amazon.ion.NullValueException;
 
 
 
@@ -200,24 +197,24 @@ public void testPrinting()
         testPrinting("123d0",  "123.");
         testPrinting("123d-1", "12.3");
         testPrinting("123d-2", "1.23");
-        testPrinting("123d-3", "0.123");
-        testPrinting("123d-4", "0.0123");
+        testPrinting("123d-3", "1.23d-1");
+        testPrinting("123d-4", "1.23d-2");
 
         testPrinting("-123d3",  "-123d3");
         testPrinting("-123d1",  "-123d1");
         testPrinting("-123d0",  "-123.");
         testPrinting("-123d-1", "-12.3");
         testPrinting("-123d-2", "-1.23");
-        testPrinting("-123d-3", "-0.123");
-        testPrinting("-123d-4", "-0.0123");
+        testPrinting("-123d-3", "-1.23d-1");
+        testPrinting("-123d-4", "-1.23d-2");
 
         // Zeros are a bit trickier
 //        testPrinting("0.0", "0.0");
 //        testPrinting("0.00", "0.00");
         testPrinting("0d1",   "0d1");
-        testPrinting("0d-1",  "0.0");
+        testPrinting("0d-1",  "0d-1");
         testPrinting("0d2",   "0d2");
-        testPrinting("0d-2",  "0.00"); // should be 0.00 or 0.0d-1 ?
+        testPrinting("0d-2",  "0d-2"); // should be 0.00 or 0.0d-1 ?
     }
 
     public void testPrinting(String input, String output)
diff --git a/test/software/amazon/ion/EquivTimelineTest.java b/test/com/amazon/ion/EquivTimelineTest.java
similarity index 75%
rename from test/software/amazon/ion/EquivTimelineTest.java
rename to test/com/amazon/ion/EquivTimelineTest.java
index c0e4ca614e..58a5b78aa1 100644
--- a/test/software/amazon/ion/EquivTimelineTest.java
+++ b/test/com/amazon/ion/EquivTimelineTest.java
@@ -1,31 +1,28 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.TestUtils.EQUIVS_TIMESTAMP_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.testdataFiles;
+import static com.amazon.ion.TestUtils.EQUIVS_TIMESTAMP_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.testdataFiles;
 
+import com.amazon.ion.junit.Injected.Inject;
 import java.io.File;
 import java.io.IOException;
 
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.junit.Injected.Inject;
-
 public class EquivTimelineTest
     extends EquivsTest
 {
diff --git a/test/com/amazon/ion/EquivsTest.java b/test/com/amazon/ion/EquivsTest.java
new file mode 100644
index 0000000000..4a295b7dc6
--- /dev/null
+++ b/test/com/amazon/ion/EquivsTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+import static com.amazon.ion.TestUtils.EQUIVS_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+
+import com.amazon.ion.junit.Injected.Inject;
+import java.io.File;
+
+public class EquivsTest
+    extends EquivsTestCase
+{
+    @Inject("testFile")
+    public static final File[] FILES = TestUtils.testdataFiles(GLOBAL_SKIP_LIST, EQUIVS_IONTESTS_FILES);
+
+    public EquivsTest()
+    {
+        super(true);
+    }
+}
diff --git a/test/software/amazon/ion/EquivsTestCase.java b/test/com/amazon/ion/EquivsTestCase.java
similarity index 90%
rename from test/software/amazon/ion/EquivsTestCase.java
rename to test/com/amazon/ion/EquivsTestCase.java
index 2c3742625b..7bdce6bb9e 100644
--- a/test/software/amazon/ion/EquivsTestCase.java
+++ b/test/com/amazon/ion/EquivsTestCase.java
@@ -1,31 +1,35 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.IonType.DATAGRAM;
+import static com.amazon.ion.IonType.DATAGRAM;
 
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.IonAssert;
+import java.io.File;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.junit.IonAssert;
-import software.amazon.ion.system.IonBinaryWriterBuilder;
-import software.amazon.ion.system.IonSystemBuilder;
-import software.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.IonAssert;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -245,7 +249,7 @@ public void testEquivsOverString()
     {
         if (myTestFile.getName().endsWith(".ion"))
         {
-            String ionText = PrivateUtils.utf8FileToString(myTestFile);
+            String ionText = _Private_Utils.utf8FileToString(myTestFile);
             IonDatagram dg = loader().load(ionText);
             runEquivalenceChecks(dg, myExpectedEquality);
         }
diff --git a/test/software/amazon/ion/ExtendedDecimalTest.java b/test/com/amazon/ion/ExtendedDecimalTest.java
similarity index 93%
rename from test/software/amazon/ion/ExtendedDecimalTest.java
rename to test/com/amazon/ion/ExtendedDecimalTest.java
index ab369a24bf..7e95771899 100644
--- a/test/software/amazon/ion/ExtendedDecimalTest.java
+++ b/test/com/amazon/ion/ExtendedDecimalTest.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import static com.amazon.ion.Decimal.negativeZero;
 import static java.math.MathContext.DECIMAL64;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static software.amazon.ion.Decimal.negativeZero;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.MathContext;
 import org.junit.Test;
-import software.amazon.ion.Decimal;
 
 
 /**
diff --git a/test/software/amazon/ion/FakeSymbolToken.java b/test/com/amazon/ion/FakeSymbolToken.java
similarity index 62%
rename from test/software/amazon/ion/FakeSymbolToken.java
rename to test/com/amazon/ion/FakeSymbolToken.java
index de6e4e5567..426e95a40e 100644
--- a/test/software/amazon/ion/FakeSymbolToken.java
+++ b/test/com/amazon/ion/FakeSymbolToken.java
@@ -1,21 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
-
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
+package com.amazon.ion;
 
 /**
  * NOT SUITABLE FOR PUBLIC USE since it doesn't enforce correctness.
diff --git a/test/software/amazon/ion/FieldNameEscapesTest.java b/test/com/amazon/ion/FieldNameEscapesTest.java
similarity index 54%
rename from test/software/amazon/ion/FieldNameEscapesTest.java
rename to test/com/amazon/ion/FieldNameEscapesTest.java
index ec4e35049a..708f700bd6 100644
--- a/test/software/amazon/ion/FieldNameEscapesTest.java
+++ b/test/com/amazon/ion/FieldNameEscapesTest.java
@@ -1,21 +1,20 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonValue;
 
 public class FieldNameEscapesTest
     extends TextTestCase
diff --git a/test/software/amazon/ion/FloatTest.java b/test/com/amazon/ion/FloatTest.java
similarity index 92%
rename from test/software/amazon/ion/FloatTest.java
rename to test/com/amazon/ion/FloatTest.java
index 5073344135..da7c273918 100644
--- a/test/software/amazon/ion/FloatTest.java
+++ b/test/com/amazon/ion/FloatTest.java
@@ -1,24 +1,23 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonType;
-import software.amazon.ion.NullValueException;
+
 
 
 
diff --git a/test/software/amazon/ion/GoodIonTest.java b/test/com/amazon/ion/GoodIonTest.java
similarity index 70%
rename from test/software/amazon/ion/GoodIonTest.java
rename to test/com/amazon/ion/GoodIonTest.java
index 0e5406c451..9ee8505c95 100644
--- a/test/software/amazon/ion/GoodIonTest.java
+++ b/test/com/amazon/ion/GoodIonTest.java
@@ -1,44 +1,38 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.testdataFiles;
-import static software.amazon.ion.junit.IonAssert.assertIonIteratorEquals;
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.testdataFiles;
+import static com.amazon.ion.junit.IonAssert.assertIonIteratorEquals;
 
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.streaming.ReaderCompare;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Iterator;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.junit.Injected.Inject;
-import software.amazon.ion.junit.IonAssert;
-import software.amazon.ion.streaming.ReaderCompare;
 
 public class GoodIonTest
     extends IonTestCase
 {
     @Inject("testFile")
-    public static final File[] FILES =
-        testdataFiles(GLOBAL_SKIP_LIST,
-                      GOOD_IONTESTS_FILES);
-
+    public static final File[] FILES = testdataFiles(GLOBAL_SKIP_LIST, GOOD_IONTESTS_FILES);
 
     private File myTestFile;
     private boolean myFileIsBinary;
@@ -102,8 +96,11 @@ public void testLoadString()
     {
         if (! myFileIsBinary)
         {
-            String ionText = PrivateUtils.utf8FileToString(myTestFile);
-            loader().load(ionText);
+            String ionText = _Private_Utils.utf8FileToString(myTestFile);
+            IonDatagram dg = loader().load(ionText);
+
+            // Flush out any encoding problems in the data.
+            forceDeepMaterialization(dg);
         }
     }
 
@@ -111,7 +108,7 @@ public void testLoadString()
     public void testIterateByteArray()
     throws Exception
     {
-        byte[] bytes = PrivateUtils.loadFileBytes(myTestFile);
+        byte[] bytes = _Private_Utils.loadFileBytes(myTestFile);
 
         Iterator<IonValue> i = system().iterate(bytes);
         while (i.hasNext())
@@ -123,12 +120,13 @@ public void testIterateByteArray()
     /**
      * Test files containing values with unknown text for symbols.
      */
-    private static final String[] FILES_WITH_UNKNOWN_SYMBOL_TEXT = { "good" + File.separator + "item1.10n" };
+    private static final String[] FILES_WITH_UNKNOWN_SYMBOL_TEXT =
+                                  { "good" + File.separator + "item1.10n", "good" + File.separator + "symbols.ion" };
 
     /**
      * Skipping test files with unknown text for symbols.
      * This is okay because the appropriate test is covered in
-     * {@link SymbolTest#testClone()}.
+     * SymbolTest
      */
     @Test
     public void testClone()
diff --git a/test/software/amazon/ion/HashCodeCorrectnessTest.java b/test/com/amazon/ion/HashCodeCorrectnessTest.java
similarity index 97%
rename from test/software/amazon/ion/HashCodeCorrectnessTest.java
rename to test/com/amazon/ion/HashCodeCorrectnessTest.java
index 1a48f634fa..d603cea2c7 100644
--- a/test/software/amazon/ion/HashCodeCorrectnessTest.java
+++ b/test/com/amazon/ion/HashCodeCorrectnessTest.java
@@ -1,33 +1,23 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.HashSet;
 import java.util.Set;
 import org.junit.Test;
-import software.amazon.ion.IonBool;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonLob;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonText;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
 
 /**
  * Test cases for {@link IonValue#hashCode()} implementations.
diff --git a/test/software/amazon/ion/HashCodeDeltaCollisionTest.java b/test/com/amazon/ion/HashCodeDeltaCollisionTest.java
similarity index 89%
rename from test/software/amazon/ion/HashCodeDeltaCollisionTest.java
rename to test/com/amazon/ion/HashCodeDeltaCollisionTest.java
index 479065b779..51e9394292 100644
--- a/test/software/amazon/ion/HashCodeDeltaCollisionTest.java
+++ b/test/com/amazon/ion/HashCodeDeltaCollisionTest.java
@@ -1,40 +1,33 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.Timestamp.UTC_OFFSET;
+import static com.amazon.ion.Timestamp.UTC_OFFSET;
 
+import com.amazon.ion.IonValueDeltaGenerator.IonDecimalDeltaType;
+import com.amazon.ion.IonValueDeltaGenerator.IonFloatDeltaType;
+import com.amazon.ion.IonValueDeltaGenerator.IonIntDeltaType;
+import com.amazon.ion.IonValueDeltaGenerator.IonSymbolDeltaType;
+import com.amazon.ion.IonValueDeltaGenerator.IonTimestampDeltaType;
 import java.math.BigDecimal;
 import java.util.HashSet;
 import java.util.Random;
 import java.util.Set;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.IonValueDeltaGenerator.IonDecimalDeltaType;
-import software.amazon.ion.IonValueDeltaGenerator.IonFloatDeltaType;
-import software.amazon.ion.IonValueDeltaGenerator.IonIntDeltaType;
-import software.amazon.ion.IonValueDeltaGenerator.IonSymbolDeltaType;
-import software.amazon.ion.IonValueDeltaGenerator.IonTimestampDeltaType;
 
 
 public class HashCodeDeltaCollisionTest
diff --git a/test/software/amazon/ion/HashCodeDistributionTest.java b/test/com/amazon/ion/HashCodeDistributionTest.java
similarity index 94%
rename from test/software/amazon/ion/HashCodeDistributionTest.java
rename to test/com/amazon/ion/HashCodeDistributionTest.java
index 0ff016ede9..ea36abc6cb 100644
--- a/test/software/amazon/ion/HashCodeDistributionTest.java
+++ b/test/com/amazon/ion/HashCodeDistributionTest.java
@@ -1,24 +1,25 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.IonType.LIST;
-import static software.amazon.ion.IonType.SEXP;
-import static software.amazon.ion.IonType.STRING;
-import static software.amazon.ion.IonType.STRUCT;
-import static software.amazon.ion.IonType.SYMBOL;
+import static com.amazon.ion.IonType.LIST;
+import static com.amazon.ion.IonType.SEXP;
+import static com.amazon.ion.IonType.STRING;
+import static com.amazon.ion.IonType.STRUCT;
+import static com.amazon.ion.IonType.SYMBOL;
 
 import java.io.BufferedInputStream;
 import java.io.File;
@@ -34,10 +35,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
 
 /** Chi-square test for {@link IonValue#hashCode()} implementations.
  * Using selected test data, determine Chi^2 value for various hash table
diff --git a/test/software/amazon/ion/InputStreamWrapper.java b/test/com/amazon/ion/InputStreamWrapper.java
similarity index 53%
rename from test/software/amazon/ion/InputStreamWrapper.java
rename to test/com/amazon/ion/InputStreamWrapper.java
index b547c998c5..5284d40d7d 100644
--- a/test/software/amazon/ion/InputStreamWrapper.java
+++ b/test/com/amazon/ion/InputStreamWrapper.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/test/software/amazon/ion/IntTest.java b/test/com/amazon/ion/IntTest.java
similarity index 97%
rename from test/software/amazon/ion/IntTest.java
rename to test/com/amazon/ion/IntTest.java
index 50d18a85bd..d21e29042c 100644
--- a/test/software/amazon/ion/IntTest.java
+++ b/test/com/amazon/ion/IntTest.java
@@ -1,17 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion;
+
+package com.amazon.ion;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/test/software/amazon/ion/IonExceptionTest.java b/test/com/amazon/ion/IonExceptionTest.java
similarity index 86%
rename from test/software/amazon/ion/IonExceptionTest.java
rename to test/com/amazon/ion/IonExceptionTest.java
index a7dc7a20a3..dd7c18b089 100644
--- a/test/software/amazon/ion/IonExceptionTest.java
+++ b/test/com/amazon/ion/IonExceptionTest.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
@@ -20,7 +21,7 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import org.junit.Test;
-import software.amazon.ion.IonException;
+
 
 public class IonExceptionTest
 {
diff --git a/test/com/amazon/ion/IonRawWriterBasicTest.java b/test/com/amazon/ion/IonRawWriterBasicTest.java
new file mode 100644
index 0000000000..2e66170fa1
--- /dev/null
+++ b/test/com/amazon/ion/IonRawWriterBasicTest.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import com.amazon.ion.facet.Facets;
+import com.amazon.ion.impl.bin._Private_IonManagedWriter;
+import com.amazon.ion.impl.bin._Private_IonRawWriter;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.SimpleCatalog;
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+/**
+ * Tests the raw string writing APIs and basic behavior of the raw symbol ID
+ * writing APIs provided by the {@link _Private_IonRawWriter} and {@link IonBinaryWriter}
+ * facets.
+ * @see IonRawWriterSymbolsTest
+ */
+@SuppressWarnings({"deprecation", "javadoc"})
+public class IonRawWriterBasicTest
+{
+    private static final IonSystem system = IonSystemBuilder.standard().build();
+
+    private static IonWriter writer(OutputStream out, SymbolTable...imports)
+    {
+        // Only the binary writer supports the managed/raw facets.
+        return system.newBinaryWriter(out, imports);
+    }
+
+    static List<String> getStrings(String file)
+    {
+        List<String> strings = new ArrayList<String>();
+        IonReader reader;
+        try
+        {
+            reader = IonReaderBuilder.standard().build(new FileInputStream(IonTestCase.getTestdataFile(file)));
+        }
+        catch (FileNotFoundException e)
+        {
+            // convert to unchecked exception so this plays well in static initializers
+            throw new RuntimeException(e);
+        }
+        while (reader.next() != null)
+        {
+            try
+            {
+                strings.add(reader.stringValue());
+            }
+            catch (UnknownSymbolException e)
+            {
+                // If the input file contains unknown symbol text, e.g. $123,
+                // just skip it.
+            }
+        }
+        return strings;
+    }
+
+    static abstract class Roundtrip {
+
+        private final SymbolTable[] imports;
+        private final SimpleCatalog catalog;
+
+        public Roundtrip(SymbolTable...imports)
+        {
+            this.imports = imports;
+            catalog = new SimpleCatalog();
+            for (SymbolTable imported : imports)
+            {
+                catalog.putTable(imported);
+            }
+        }
+
+        public void test() throws IOException
+        {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            IonWriter writer = writer(out, imports);
+            _Private_IonManagedWriter managedWriter = writer.asFacet(_Private_IonManagedWriter.class);
+            _Private_IonRawWriter rawWriter = managedWriter.getRawWriter();
+            write(managedWriter, rawWriter);
+            writer.close();
+            read(IonReaderBuilder.standard().withCatalog(catalog).build(out.toByteArray()));
+        }
+
+        abstract void write(_Private_IonManagedWriter managedWriter, _Private_IonRawWriter rawWriter) throws IOException;
+        abstract void read(IonReader reader);
+    }
+
+    private void testWriteEncodedString(final String str, final int padding) throws IOException
+    {
+        new Roundtrip()
+        {
+            int written = 0;
+
+            @Override
+            void write(_Private_IonManagedWriter managedWriter, _Private_IonRawWriter rawWriter)
+                throws IOException
+            {
+                byte[] encoded = str.getBytes("UTF-8");
+                int encodedLength = encoded.length;
+
+                rawWriter.writeString(encoded, 0, encodedLength);
+                written++;
+
+                byte[] block = new byte[encodedLength + padding];
+                for (int i = 0; i < 3; i++)
+                {
+                    // Write from buffer with 'padding' extra bytes. 'shift' indicates
+                    // the position at which the actual data starts.
+                    int shift = padding * i / 2;
+                    System.arraycopy(encoded, 0, block, shift, encodedLength);
+                    rawWriter.writeString(block, shift, encodedLength);
+                    written++;
+                }
+            }
+
+            @Override
+            void read(IonReader reader)
+            {
+                int read = 0;
+                while (reader.next() != null)
+                {
+                    assertEquals(IonType.STRING, reader.getType());
+                    assertEquals(str, reader.stringValue());
+                    read++;
+                }
+                assertEquals(written, read);
+            }
+
+        }.test();
+    }
+
+    @Test
+    public void testWriteEncodedStrings() throws IOException
+    {
+        int i = 0;
+        for (String str : getStrings("good/strings.ion"))
+        {
+            testWriteEncodedString(str, i * 2);
+            i++;
+        }
+    }
+
+    @Test
+    public void testWriteNullString() throws IOException
+    {
+        new Roundtrip()
+        {
+
+            @Override
+            void write(_Private_IonManagedWriter managedWriter, _Private_IonRawWriter rawWriter)
+                throws IOException
+            {
+                rawWriter.writeString(null, 1, 2); // position arguments ignored
+            }
+
+            @Override
+            void read(IonReader reader)
+            {
+                assertEquals(IonType.STRING, reader.next());
+                assertTrue(reader.isNullValue());
+                assertNull(reader.stringValue());
+            }
+
+        }.test();
+    }
+
+    private _Private_IonRawWriter basicRawWriter()
+    {
+        IonWriter writer = writer(new ByteArrayOutputStream());
+        _Private_IonManagedWriter managedWriter = Facets.assumeFacet(_Private_IonManagedWriter.class, writer);
+        return managedWriter.getRawWriter();
+    }
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void testRawWriteIVMFails() throws IOException
+    {
+        _Private_IonRawWriter rawWriter = basicRawWriter();
+        rawWriter.addTypeAnnotationSymbol(10);
+        rawWriter.writeSymbolToken(2); // Symbol 2 with an annotation is not IVM
+        rawWriter.stepIn(IonType.STRUCT);
+        rawWriter.setFieldNameSymbol(11);
+        rawWriter.writeSymbolToken(2); // Symbol 2 below top level is not IVM
+        rawWriter.stepOut();
+        thrown.expect(IonException.class);
+        rawWriter.writeSymbolToken(2); // Top-level symbol 2 is IVM
+    }
+
+    @Test
+    public void testRawSetFieldNameOutsideStructFails()
+    {
+        _Private_IonRawWriter rawWriter = basicRawWriter();
+        thrown.expect(IonException.class);
+        rawWriter.setFieldNameSymbol(10);
+    }
+
+    @Test
+    public void testRawSetTypeAnnotationSymbolsOverwrites() throws IOException
+    {
+        new Roundtrip()
+        {
+
+            @Override
+            void write(_Private_IonManagedWriter managedWriter, _Private_IonRawWriter rawWriter)
+                throws IOException
+            {
+                managedWriter.requireLocalSymbolTable();
+                rawWriter.addTypeAnnotationSymbol(4);
+                rawWriter.addTypeAnnotationSymbol(5);
+                rawWriter.setTypeAnnotationSymbols(6, 7);
+                rawWriter.writeInt(42); // dummy value
+            }
+
+            @Override
+            void read(IonReader reader)
+            {
+                reader.next();
+                SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
+                assertEquals(2, annotations.length);
+                int[] annotationSids = { annotations[0].getSid(), annotations[1].getSid() };
+                assertArrayEquals(new int[]{6, 7}, annotationSids);
+            }
+
+        }.test();
+    }
+}
diff --git a/test/com/amazon/ion/IonRawWriterSymbolsTest.java b/test/com/amazon/ion/IonRawWriterSymbolsTest.java
new file mode 100644
index 0000000000..d9767d6857
--- /dev/null
+++ b/test/com/amazon/ion/IonRawWriterSymbolsTest.java
@@ -0,0 +1,477 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+import static com.amazon.ion.IonRawWriterBasicTest.getStrings;
+import static org.junit.Assert.assertEquals;
+
+import com.amazon.ion.IonRawWriterBasicTest.Roundtrip;
+import com.amazon.ion.impl.bin._Private_IonManagedWriter;
+import com.amazon.ion.impl.bin._Private_IonRawWriter;
+import com.amazon.ion.junit.Injected;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.system.IonSystemBuilder;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests the raw symbol ID writing APIs of the {@link _Private_IonRawWriter} and
+ * {@link IonBinaryWriter} facets.
+ * @see IonRawWriterBasicTest
+ */
+@SuppressWarnings({"deprecation", "javadoc"})
+@RunWith(Injected.class)
+public class IonRawWriterSymbolsTest
+{
+
+    private static final IonSystem system = IonSystemBuilder.standard().build();
+
+    private enum SymbolCombo
+    {
+
+        /**
+         * Seralize and deserialize all symbols as symbol values.
+         */
+        VALUES
+        {
+
+            @Override
+            public List<String> serialize(_Private_IonRawWriter writer) throws IOException
+            {
+                List<String> writtenSymbols = new ArrayList<String>();
+                for (int i = 0; i < UNIQUE_SYMBOLS; i++)
+                {
+                    writtenSymbols.addAll(serializeNext(writer, null));
+                }
+                return writtenSymbols;
+            }
+
+            @Override
+            public void deserialize(IonReader reader, List<String> expectedSymbols)
+            {
+                Iterator<String> expectedSymbolsIterator = expectedSymbols.iterator();
+                for (int i = 0; i < UNIQUE_SYMBOLS; i++)
+                {
+                    assertEquals(IonType.SYMBOL, reader.next());
+                    deserializeNext(reader, expectedSymbolsIterator, null);
+                }
+            }
+
+            @Override
+            public List<String> serializeNext(_Private_IonRawWriter writer, SymbolCombo delegate) throws IOException
+            {
+                assert delegate == null;
+                String symbol = circularSymbolsList.next();
+                writer.writeSymbolToken(getLocalSid(symbol));
+                return Collections.singletonList(symbol);
+            }
+
+            @Override
+            public void deserializeNext(IonReader reader, Iterator<String> expectedSymbols, SymbolCombo delegate)
+            {
+                assert delegate == null;
+                assertEquals(expectedSymbols.next(), reader.symbolValue().getText());
+            }
+
+        },
+        /**
+         * Serialize and deserialize all symbols as field names.
+         */
+        FIELDS
+        {
+
+            @Override
+            public List<String> serialize(_Private_IonRawWriter writer)
+                throws IOException
+            {
+                List<String> writtenSymbols = new ArrayList<String>();
+                writer.stepIn(IonType.STRUCT);
+                for (int i = 0; i < UNIQUE_SYMBOLS; i++)
+                {
+                    writtenSymbols.addAll(serializeNext(writer, null));
+                }
+                writer.stepOut();
+                return writtenSymbols;
+            }
+
+            @Override
+            public void deserialize(IonReader reader,
+                                    List<String> expectedSymbols)
+            {
+                reader.next();
+                reader.stepIn();
+                Iterator<String> expectedSymbolsIterator = expectedSymbols.iterator();
+                for (int i = 0; i < UNIQUE_SYMBOLS; i++)
+                {
+                    reader.next();
+                    deserializeNext(reader, expectedSymbolsIterator, null);
+                }
+                reader.stepOut();
+            }
+
+            @Override
+            protected List<String> serializeNext(_Private_IonRawWriter writer,
+                                           SymbolCombo delegate)
+                throws IOException
+            {
+                List<String> writtenSymbols = new ArrayList<String>();
+                String symbol = circularSymbolsList.next();
+                writtenSymbols.add(symbol);
+                writer.setFieldNameSymbol(getLocalSid(symbol));
+                if (delegate == null) {
+                    writer.writeInt(42); // dummy value
+                }
+                else
+                {
+                    writtenSymbols.addAll(delegate.serializeNext(writer, null));
+                }
+                return writtenSymbols;
+            }
+
+            @Override
+            public void deserializeNext(IonReader reader, Iterator<String> expectedSymbols, SymbolCombo delegate)
+            {
+                assertEquals(expectedSymbols.next(), reader.getFieldName());
+                if (delegate != null)
+                {
+                    delegate.deserializeNext(reader, expectedSymbols, null);
+                }
+            }
+
+        },
+        /**
+         * Serialize and deserialize all symbols as annotations.
+         */
+        ANNOTATIONS
+        {
+
+            @Override
+            public List<String> serialize(_Private_IonRawWriter writer)
+                throws IOException
+            {
+                List<String> writtenSymbols = new ArrayList<String>();
+                for (int numAnnotations = 1; numAnnotations < UNIQUE_SYMBOLS; numAnnotations++)
+                {
+                    if (numAnnotations <= 2)
+                    {
+                        // Tests addTypeAnnotationSymbol called alone and repetitively
+                        for (int i = 0; i < numAnnotations; i++)
+                        {
+                            String symbol = circularSymbolsList.next();
+                            writtenSymbols.add(symbol);
+                            writer.addTypeAnnotationSymbol(getLocalSid(symbol));
+                        }
+                    }
+                    else
+                    {
+                        // tests setTypeAnnotationSymbols
+                        int[] symbolIds = new int[numAnnotations];
+                        for (int i = 0; i < numAnnotations; i++)
+                        {
+                            String symbol = circularSymbolsList.next();
+                            writtenSymbols.add(symbol);
+                            symbolIds[i] = getLocalSid(symbol);
+                            writer.setTypeAnnotationSymbols(symbolIds);
+                        }
+                    }
+                    writer.writeInt(numAnnotations); // dummy value
+                }
+                return writtenSymbols;
+            }
+
+            @Override
+            public void deserialize(IonReader reader,
+                                    List<String> expectedSymbols)
+            {
+                Iterator<String> expectedSymbolsIterator = expectedSymbols.iterator();
+                for (int numAnnotations = 1; numAnnotations < UNIQUE_SYMBOLS; numAnnotations++)
+                {
+                    reader.next();
+                    for (String annotation : reader.getTypeAnnotations())
+                    {
+                        assertEquals(expectedSymbolsIterator.next(), annotation);
+                    }
+                }
+            }
+
+            // NOTE: for ANNOTATIONS, the *Next methods only add a single
+            // annotation, for a cleaner interface. Multiple annotations on
+            // a single value are tested by the *serialize methods.
+
+            @Override
+            protected List<String> serializeNext(_Private_IonRawWriter writer,
+                                           SymbolCombo delegate)
+                throws IOException
+            {
+                List<String> writtenSymbols = new ArrayList<String>();
+                String symbol = circularSymbolsList.next();
+                writtenSymbols.add(symbol);
+                writer.addTypeAnnotationSymbol(getLocalSid(symbol));
+                if (delegate == null)
+                {
+                    writer.writeInt(42); //dummy value
+                }
+                else
+                {
+                    writtenSymbols.addAll(delegate.serializeNext(writer, null));
+                }
+                return writtenSymbols;
+            }
+
+            @Override
+            public void deserializeNext(IonReader reader, Iterator<String> expectedSymbols, SymbolCombo delegate)
+            {
+                assertEquals(expectedSymbols.next(), reader.getTypeAnnotations()[0]);
+                if (delegate != null)
+                {
+                    delegate.deserializeNext(reader, expectedSymbols, null);
+                }
+            }
+
+        },
+        /**
+         * Serialize and deserialize symbols as symbol values with annotations.
+         */
+        ANNOTATIONS_AND_VALUES
+        {
+
+            @Override
+            public List<String> serialize(_Private_IonRawWriter writer)
+                throws IOException
+            {
+                List<String> writtenSymbols = new ArrayList<String>();
+                for (int i = 0; i < UNIQUE_SYMBOLS; i++)
+                {
+                    writtenSymbols.addAll(serializeNext(writer, null));
+                }
+                return writtenSymbols;
+            }
+
+            @Override
+            public void deserialize(IonReader reader,
+                                    List<String> expectedSymbols)
+            {
+                Iterator<String> expectedSymbolsIterator = expectedSymbols.iterator();
+                for (int i = 0; i < UNIQUE_SYMBOLS; i++)
+                {
+                    reader.next();
+                    deserializeNext(reader, expectedSymbolsIterator, null);
+                }
+            }
+
+            @Override
+            protected List<String> serializeNext(_Private_IonRawWriter writer,
+                                                 SymbolCombo delegate)
+                throws IOException
+            {
+
+                return ANNOTATIONS.serializeNext(writer, VALUES);
+            }
+
+            @Override
+            public void deserializeNext(IonReader reader, Iterator<String> expectedSymbols, SymbolCombo delegate)
+            {
+                ANNOTATIONS.deserializeNext(reader, expectedSymbols, VALUES);
+            }
+
+        },
+        /**
+         * Serialize and deserialize symbols as symbol values within a struct
+         * (i.e. with field name symbols).
+         */
+        FIELDS_AND_VALUES
+        {
+
+            @Override
+            public List<String> serialize(_Private_IonRawWriter writer)
+                throws IOException
+            {
+                List<String> writtenSymbols = new ArrayList<String>();
+                writer.stepIn(IonType.STRUCT);
+                for (int i = 0; i < UNIQUE_SYMBOLS; i++)
+                {
+                    writtenSymbols.addAll(serializeNext(writer, null));
+                }
+                writer.stepOut();
+                return writtenSymbols;
+            }
+
+            @Override
+            public void deserialize(IonReader reader,
+                                    List<String> expectedSymbols)
+            {
+                reader.next();
+                reader.stepIn();
+                Iterator<String> expectedSymbolsIterator = expectedSymbols.iterator();
+                for (int i = 0; i < UNIQUE_SYMBOLS; i++)
+                {
+                    reader.next();
+                    deserializeNext(reader, expectedSymbolsIterator, null);
+                }
+                reader.stepOut();
+            }
+
+            @Override
+            protected List<String> serializeNext(_Private_IonRawWriter writer,
+                                           SymbolCombo delegate)
+                throws IOException
+            {
+                return FIELDS.serializeNext(writer, VALUES);
+            }
+
+            @Override
+            protected void deserializeNext(IonReader reader,
+                                           Iterator<String> expectedSymbols,
+                                           SymbolCombo delegate)
+            {
+                FIELDS.deserializeNext(reader, expectedSymbols, VALUES);
+            }
+
+        },
+        /**
+         * Serialize and deserialize symbols as symbol values with annotations
+         * within a struct (i.e. with field name symbols).
+         */
+        FIELDS_AND_ANNOTATIONS_AND_VALUES
+        {
+
+            @Override
+            public List<String> serialize(_Private_IonRawWriter writer)
+                throws IOException
+            {
+                List<String> writtenSymbols = new ArrayList<String>();
+                writer.stepIn(IonType.STRUCT);
+                for (int i = 0; i < UNIQUE_SYMBOLS; i++)
+                {
+                    writtenSymbols.addAll(serializeNext(writer, null));
+                }
+                writer.stepOut();
+                return writtenSymbols;
+            }
+
+            @Override
+            public void deserialize(IonReader reader,
+                                    List<String> expectedSymbols)
+            {
+                reader.next();
+                reader.stepIn();
+                Iterator<String> expectedSymbolsIterator = expectedSymbols.iterator();
+                for (int i = 0; i < UNIQUE_SYMBOLS; i++)
+                {
+                    reader.next();
+                    deserializeNext(reader, expectedSymbolsIterator, null);
+                }
+                reader.stepOut();
+            }
+
+            @Override
+            protected List<String> serializeNext(_Private_IonRawWriter writer,
+                                                 SymbolCombo delegate)
+                throws IOException
+            {
+                return FIELDS.serializeNext(writer, ANNOTATIONS_AND_VALUES);
+            }
+
+            @Override
+            protected void deserializeNext(IonReader reader,
+                                           Iterator<String> expectedSymbols,
+                                           SymbolCombo delegate)
+            {
+                FIELDS.deserializeNext(reader, expectedSymbols, ANNOTATIONS_AND_VALUES);
+            }
+
+        };
+
+        // An endless and centralized supply of symbols. Useful for chaining.
+        private static final Iterator<String> circularSymbolsList = new Iterator<String>()
+            {
+
+                private int i = 0;
+
+                public boolean hasNext()
+                {
+                    return true;
+                }
+
+                public String next()
+                {
+                    return symbolsList.get(i++ % symbolsList.size());
+                }
+
+                public void remove()
+                {
+                    throw new UnsupportedOperationException();
+                }
+
+        };
+
+        public abstract List<String> serialize(_Private_IonRawWriter writer) throws IOException;
+        public abstract void deserialize(IonReader reader, List<String> expectedSymbols);
+        protected abstract List<String> serializeNext(_Private_IonRawWriter writer, SymbolCombo delegate) throws IOException;
+        protected abstract void deserializeNext(IonReader reader, Iterator<String> expectedSymbols, SymbolCombo delegate);
+    }
+
+    private static final List<String> symbolsList = getStrings("good/symbols.ion");
+    private static final int UNIQUE_SYMBOLS = symbolsList.size();
+    private static final SymbolTable sharedTable = system.newSharedSymbolTable("shared", 1, symbolsList.iterator());
+
+    private static int getLocalSid(String symbolText)
+    {
+        return sharedTable.findSymbol(symbolText) + system.getSystemSymbolTable().getMaxId();
+    }
+
+    @Inject("symbolCombo")
+    public static SymbolCombo[] SYMBOL_COMBOS = SymbolCombo.values();
+
+    private SymbolCombo mySymbolCombo;
+
+    public void setSymbolCombo(SymbolCombo symbolCombo)
+    {
+        mySymbolCombo = symbolCombo;
+    }
+
+    @Test
+    public void testDirectWriteSymbolId() throws Exception
+    {
+        new Roundtrip(sharedTable)
+        {
+
+            List<String> expectedSymbols = null;
+
+            @Override
+            void write(_Private_IonManagedWriter managedWriter, _Private_IonRawWriter rawWriter)
+                throws IOException
+            {
+                managedWriter.requireLocalSymbolTable(); // starts the LST
+                expectedSymbols = mySymbolCombo.serialize(rawWriter);
+            }
+
+            @Override
+            void read(IonReader reader)
+            {
+                mySymbolCombo.deserialize(reader, expectedSymbols);
+            }
+
+        }.test();
+
+    }
+
+}
diff --git a/test/software/amazon/ion/IonReaderToIonValueTest.java b/test/com/amazon/ion/IonReaderToIonValueTest.java
similarity index 62%
rename from test/software/amazon/ion/IonReaderToIonValueTest.java
rename to test/com/amazon/ion/IonReaderToIonValueTest.java
index 25637d0ceb..c6789c925a 100644
--- a/test/software/amazon/ion/IonReaderToIonValueTest.java
+++ b/test/com/amazon/ion/IonReaderToIonValueTest.java
@@ -1,24 +1,21 @@
 /*
- * Copyright 2016-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import org.junit.Test;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonType;
 
 public class IonReaderToIonValueTest extends IonTestCase {
     @Test
diff --git a/test/software/amazon/ion/IonSystemTest.java b/test/com/amazon/ion/IonSystemTest.java
similarity index 89%
rename from test/software/amazon/ion/IonSystemTest.java
rename to test/com/amazon/ion/IonSystemTest.java
index f0170c82c9..9aa5df6ce5 100644
--- a/test/software/amazon/ion/IonSystemTest.java
+++ b/test/com/amazon/ion/IonSystemTest.java
@@ -1,21 +1,24 @@
 /*
- * Copyright 2010-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.impl.PrivateUtils.EMPTY_BYTE_ARRAY;
+import static com.amazon.ion.impl._Private_Utils.EMPTY_BYTE_ARRAY;
 
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.system.SimpleCatalog;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -27,22 +30,7 @@
 import java.util.Iterator;
 import java.util.zip.GZIPOutputStream;
 import org.junit.Test;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnexpectedEofException;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.system.SimpleCatalog;
+
 
 public class IonSystemTest
     extends IonTestCase
@@ -181,8 +169,8 @@ public void testCloneDetachesFromDatagramOnDiffSystemClone()
     {
         IonValue original = system().singleValue("some_symbol");
 
-        IonValue clone =
-            newSystem(new SimpleCatalog()).clone(original);
+        // Test on ValueFactory.clone() with different ValueFactory (and DOM impls)
+        IonValue clone = newSystem(new SimpleCatalog()).clone(original);
 
         assertNull("Cloned value should not have a container (parent)",
                    clone.getContainer());
@@ -329,7 +317,7 @@ public void testGzipDetection()
         throws Exception
     {
         String ionText = "1234";
-        byte[] textBytes = PrivateUtils.utf8(ionText);
+        byte[] textBytes = _Private_Utils.utf8(ionText);
         byte[] gzipTextBytes = gzip(textBytes);
 
         checkGzipDetection(textBytes);
@@ -357,7 +345,7 @@ private byte[] toBinaryIon(String text) throws IOException
     public void singleValueTextGzip() throws IOException
     {
         String ionText = "1234";
-        byte[] textBytes = PrivateUtils.utf8(ionText);
+        byte[] textBytes = _Private_Utils.utf8(ionText);
         byte[] gzipTextBytes = gzip(textBytes);
         IonInt ionValue = (IonInt) system().singleValue(gzipTextBytes);
 
diff --git a/test/software/amazon/ion/IonTestCase.java b/test/com/amazon/ion/IonTestCase.java
similarity index 86%
rename from test/software/amazon/ion/IonTestCase.java
rename to test/com/amazon/ion/IonTestCase.java
index dfb1939663..9c96dc2635 100644
--- a/test/software/amazon/ion/IonTestCase.java
+++ b/test/com/amazon/ion/IonTestCase.java
@@ -1,64 +1,43 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.SystemSymbols.ION_1_0;
 
-import java.io.ByteArrayOutputStream;
+import com.amazon.ion.impl._Private_IonSystem;
+import com.amazon.ion.junit.Injected;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.junit.IonAssert;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.SimpleCatalog;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSexp;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.ValueFactory;
-import software.amazon.ion.impl.PrivateIonSystem;
-import software.amazon.ion.junit.Injected;
-import software.amazon.ion.junit.IonAssert;
-import software.amazon.ion.system.IonSystemBuilder;
-import software.amazon.ion.system.SimpleCatalog;
 
 /**
  * Base class with helpers for Ion unit tests.
@@ -79,9 +58,14 @@ public abstract class IonTestCase
         }
     }
 
+    protected enum StreamingMode { OLD_STREAMING, NEW_STREAMING }
+
     // Using an enum makes the test names more understandable than a boolean.
     protected enum StreamCopySpeed { COPY_OPTIMIZED, COPY_NON_OPTIMIZED }
 
+    @Inject("streamingMode")
+    public static final StreamingMode[] STREAMING_DIMENSION = { StreamingMode.NEW_STREAMING };
+
     /**
      * Flag on whether IonSystems generated is
      * {@link IonSystemBuilder#isStreamCopyOptimized()}.
@@ -89,9 +73,11 @@ protected enum StreamCopySpeed { COPY_OPTIMIZED, COPY_NON_OPTIMIZED }
      * This is false by default. Keep this in sync with {@link IonSystemBuilder}!
      */
     private boolean                     myStreamCopyOptimized = false;
+    private StreamingMode               myStreamingMode;
 
+    private static boolean              ourSystemPropertiesLoaded = false;
     protected SimpleCatalog             myCatalog;
-    protected PrivateIonSystem        mySystem;
+    protected _Private_IonSystem        mySystem;
     protected IonLoader                 myLoader;
 
     @Rule
@@ -109,6 +95,16 @@ public void tearDown()
     //=========================================================================
     // Setters/Getters for injected values
 
+    public StreamingMode getStreamingMode()
+    {
+        return myStreamingMode;
+    }
+
+    public void setStreamingMode(StreamingMode mode)
+    {
+        myStreamingMode = mode;
+    }
+
     public boolean isStreamCopyOptimized()
     {
         return myStreamCopyOptimized;
@@ -119,6 +115,71 @@ public void setCopySpeed(StreamCopySpeed speed)
         myStreamCopyOptimized = (speed == StreamCopySpeed.COPY_OPTIMIZED);
     }
 
+    //=========================================================================
+    // Access to test data
+
+    public static synchronized void loadSystemProperties()
+    {
+        if (! ourSystemPropertiesLoaded)
+        {
+            InputStream stream =
+                IonTestCase.class.getResourceAsStream("/system.properties");
+
+            if (stream != null)
+            {
+                Properties props = new Properties();
+
+                try
+                {
+                    props.load(stream);
+
+                    Iterator entries = props.entrySet().iterator();
+                    while (entries.hasNext())
+                    {
+                        Map.Entry entry = (Map.Entry) entries.next();
+
+                        String key = (String) entry.getKey();
+
+                        // Command-line values override system.properties
+                        if (System.getProperty(key) == null)
+                        {
+                            System.setProperty(key, (String) entry.getValue());
+                        }
+                    }
+                }
+                catch (IOException e)
+                {
+                    synchronized (System.out)
+                    {
+                        System.out.println("Caught exception while loading system.properties:");
+                        e.printStackTrace(System.out);
+                    }
+                }
+            }
+
+            ourSystemPropertiesLoaded = true;
+        }
+    }
+
+
+    public static String requireSystemProperty(String prop)
+    {
+        loadSystemProperties();
+
+        String value = System.getProperty(prop);
+        if (value == null)
+        {
+            value = System.getenv(prop);
+        }
+        if (value == null) {
+            String message = "Missing required system property: " + prop;
+            throw new IllegalStateException(message);
+        }
+        return value;
+    }
+
+
+
     public static File getProjectHome()
     {
         String basedir = System.getProperty("user.dir");
@@ -131,7 +192,7 @@ public static File getProjectFile(String path)
     }
 
     /**
-     * Gets a {@link File} contained in the ion-tests "iontestdata" data
+     * Gets a {@link File} contained in the IonTests "iontestdata" data
      * directory.
      *
      * @param path is relative to the "iontestdata" directory.
@@ -142,7 +203,7 @@ public static File getTestdataFile(String path)
     }
 
     /**
-     * Gets a {@link File} contained in the ion-tests "bulk" data directory.
+     * Gets a {@link File} contained in the IonTests "bulk" data directory.
      *
      * @param path is relative to the "bulk" directory
      */
@@ -172,18 +233,29 @@ public IonDatagram load(File ionFile)
         IonLoader loader = loader();
         IonDatagram dg = loader.load(ionFile);
 
+        // Flush out any encoding problems in the data.
+        forceDeepMaterialization(dg);
+
         return dg;
     }
 
+    /**
+     * No op, removal pending the binary backed impl removal
+     */
+    public void forceDeepMaterialization(IonValue value)
+    {
+        // No op
+    }
+
     //=========================================================================
     // Fixture Helpers
 
     /**
      * @return
-     *          the singleton IonSystem, stream-copy optimized depending
-     *          on the injected {@link #myStreamCopyOptimized}.
+     *          the singleton IonSystem, stream-copy optimized depending on the injected
+     *          {@link #myStreamCopyOptimized}.
      */
-    protected PrivateIonSystem system()
+    protected _Private_IonSystem system()
     {
         if (mySystem == null)
         {
@@ -193,18 +265,24 @@ protected PrivateIonSystem system()
     }
 
     /**
+     * Returns a new IonSystem for each call, using the passed in IonCatalog
+     * to build the IonSystem.
+     *
+     * @param catalog
+     *          the catalog to use when building the IonSystem
+     *
      * @return
-     *          a new IonSystem instance, stream-copy optimized depending on
-     *          {@link #myStreamCopyOptimized}.
+     *          a new IonSystem instance, stream-copy optimized depending on the
+     *          injected {@link #myStreamCopyOptimized}.
      */
-    protected PrivateIonSystem newSystem(IonCatalog catalog)
+    protected _Private_IonSystem newSystem(IonCatalog catalog)
     {
         IonSystemBuilder b = IonSystemBuilder.standard().withCatalog(catalog);
 
         b.withStreamCopyOptimized(myStreamCopyOptimized);
 
         IonSystem system = b.build();
-        return (PrivateIonSystem) system;
+        return (_Private_IonSystem) system;
     }
 
     protected SimpleCatalog catalog()
@@ -728,9 +806,9 @@ public static void checkSymbol(String name, int id, IonValue value)
         }
 
         // just so we can set a break point on this before we lose all context
-        int sid = sym.symbolValue().getSid();
+        int sid = sym.getSymbolId();
         if (sid != id) {
-            assertEquals("symbol id", id, sym.symbolValue().getSid());
+            assertEquals("symbol id", id, sym.getSymbolId());
         }
 
         checkSymbol(name, id, sym.symbolValue());
@@ -948,7 +1026,7 @@ public void testCloneVariants(IonValue original)
         // Test on ValueFactory.clone() with the same ValueFactory
         testValueFactoryClone(original, original.getSystem());
 
-        // Test on ValueFactory.clone() with different ValueFactory
+        // Test on ValueFactory.clone() with different ValueFactory (and DOM impls)
         testValueFactoryClone(original, newSystem(new SimpleCatalog()));
     }
 
@@ -998,7 +1076,7 @@ public void testValueFactoryClone(IonValue original,
         IonValue clone = newFactory.clone(original);
         IonAssert.assertIonEquals(original, clone);
 
-        // TODO amzn/ion-java#30 IonSystemLite.clone() on a value that is in IonSystemImpl
+        // TODO amzn/ion-java/issues/30 IonSystemLite.clone() on a value that is in IonSystemImpl
         // doesn't seem to copy over local symbol tables.
 //        assertEquals(original.toString(), clone.toString());
 
@@ -1012,20 +1090,6 @@ public void testValueFactoryClone(IonValue original,
         assertFalse("Cloned value should be modifiable", clone.isReadOnly());
     }
 
-    public byte[] writeBinaryBytes(IonReader reader, SymbolTable... imports) throws IOException {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        IonWriter writer = system().newBinaryWriter(buf, imports);
-        try
-        {
-            writer.writeValues(reader);
-        }
-        finally
-        {
-            writer.close();
-        }
-        return buf.toByteArray();
-    }
-
     public void logSkippedTest()
     {
         System.out.println("WARNING: skipped a test in " + getClass().getName());
diff --git a/test/software/amazon/ion/IonValueChecker.java b/test/com/amazon/ion/IonValueChecker.java
similarity index 81%
rename from test/software/amazon/ion/IonValueChecker.java
rename to test/com/amazon/ion/IonValueChecker.java
index aa8a1ef7a7..27b6a7da7b 100644
--- a/test/software/amazon/ion/IonValueChecker.java
+++ b/test/com/amazon/ion/IonValueChecker.java
@@ -1,29 +1,26 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import static com.amazon.ion.IonTestCase.checkSymbol;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
-import static software.amazon.ion.IonTestCase.checkSymbol;
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
 
 public class IonValueChecker
     implements Checker
@@ -56,6 +53,9 @@ public IonValueChecker fieldName(String expectedText, int expectedSid)
                          expectedText, myCurrentValue.getFieldName());
         }
 
+        assertEquals("IonValue.getFieldId",
+                     expectedSid, myCurrentValue.getFieldId());
+
         SymbolToken sym = myCurrentValue.getFieldNameSymbol();
         checkSymbol(expectedText, expectedSid, sym);
 
diff --git a/test/software/amazon/ion/IonValueDeltaGenerator.java b/test/com/amazon/ion/IonValueDeltaGenerator.java
similarity index 90%
rename from test/software/amazon/ion/IonValueDeltaGenerator.java
rename to test/com/amazon/ion/IonValueDeltaGenerator.java
index 9f27271c19..fa8394cdaf 100644
--- a/test/software/amazon/ion/IonValueDeltaGenerator.java
+++ b/test/com/amazon/ion/IonValueDeltaGenerator.java
@@ -1,22 +1,23 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static junit.framework.Assert.assertTrue;
 
+import com.amazon.ion.Timestamp.Precision;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -24,16 +25,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import software.amazon.ion.IonDecimal;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.Timestamp.Precision;
+import junit.framework.Assert;
 
 /**
  * Class that generates {@link IonValue} based off configured properties.
@@ -118,7 +110,7 @@ public Builder() {
         }
 
         /**
-         * Configures the IonSystem that is the entry point for the DOM.
+         * Configures the IonSystem that is the entry point for DOMs.
          */
         public Builder ionSystem(IonSystem val) {
             this.ionSystem = val;
@@ -228,7 +220,7 @@ private void validateIonInt(IonInt val) throws IllegalArgumentException
             (baseInt.compareTo(LONG_MAX_VALUE) < 0) &&
             ((IonIntDeltaType) deltaType).equals(IonIntDeltaType.BIGINTEGER))
         {
-            fail("IonInt is tested on the BigInteger dimension but the " +
+            Assert.fail("IonInt is tested on the BigInteger dimension but the " +
                         "value isn't sufficiently large to be backed by a " +
                         "BigInteger");
         }
@@ -263,7 +255,7 @@ public Set<IonValue> generateValues()
             case TIMESTAMP:
                 return generateIonTimestamps();
             default:
-                fail("not supported: " + valueType);
+                Assert.fail("not supported: " + valueType);
                 return null;
         }
     }
@@ -294,7 +286,7 @@ private Set<IonValue> generateIonDecimals()
                 scale = 16;
                 break;
             default:
-                fail("not supported: " + deltaType);
+                Assert.fail("not supported: " + deltaType);
         }
 
         BigDecimal decimalDelta = BigDecimal.valueOf(delta, scale);
@@ -328,7 +320,7 @@ private Set<IonValue> generateIonFloats()
                 floatDelta = delta * 1.0d;
                 break;
             default:
-                fail("not supported: " + deltaType);
+                Assert.fail("not supported: " + deltaType);
         }
 
         double curr = ((IonFloat) baseValue).doubleValue();
@@ -356,7 +348,7 @@ private Set<IonValue> generateIonInts()
                 intDelta = BigInteger.valueOf(delta);
                 break;
             default:
-                fail("not supported: " + deltaType);
+                Assert.fail("not supported: " + deltaType);
         }
 
         IonInt curr = (IonInt) baseValue;
@@ -390,7 +382,7 @@ private Set<IonValue> generateIonSymbols()
                     break;
                 case TEXT: // TODO How should we test for text deltas?
                 default:
-                    fail("not supported: " + deltaType);
+                    Assert.fail("not supported: " + deltaType);
             }
 
             IonSymbol next = ionSystem.newSymbol(nextToken);
@@ -448,7 +440,7 @@ private Set<IonValue> generateIonTimestamps()
                 precisionToDelta = Precision.SECOND;
                 break;
             default:
-                fail("not supported: " + deltaType);
+                Assert.fail("not supported: " + deltaType);
         }
 
         IonTimestamp curr = (IonTimestamp) baseValue;
@@ -505,7 +497,7 @@ private IonTimestamp getIonTimestampWithDelta(Timestamp currTimestamp,
                 cal.add(Calendar.MILLISECOND, delta);
                 break;
             default:
-                fail("not supported: " + precisionToDelta);
+                Assert.fail("not supported: " + precisionToDelta);
         }
 
         switch (precisionToSet)
@@ -523,11 +515,11 @@ private IonTimestamp getIonTimestampWithDelta(Timestamp currTimestamp,
                 cal.clear(Calendar.MILLISECOND);
                 break;
             default:
-                fail("not supported: " + precisionToSet);
+                Assert.fail("not supported: " + precisionToSet);
         }
 
-        Timestamp nextTimestamp = Timestamp.forCalendar(cal);
-        assertTrue(nextTimestamp.getPrecision().equals(precisionToSet));
+        Timestamp nextTimestamp = new Timestamp(cal);
+        Assert.assertTrue(nextTimestamp.getPrecision().equals(precisionToSet));
 
         return ionSystem.newTimestamp(nextTimestamp);
     }
diff --git a/test/software/amazon/ion/IonValueTest.java b/test/com/amazon/ion/IonValueTest.java
similarity index 88%
rename from test/software/amazon/ion/IonValueTest.java
rename to test/com/amazon/ion/IonValueTest.java
index c6e92c4087..eb2a6bb111 100644
--- a/test/software/amazon/ion/IonValueTest.java
+++ b/test/com/amazon/ion/IonValueTest.java
@@ -1,35 +1,29 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import static com.amazon.ion.junit.IonAssert.assertAnnotations;
 import static java.lang.String.format;
-import static software.amazon.ion.junit.IonAssert.assertAnnotations;
 
+import com.amazon.ion.junit.IonAssert;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
 import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.junit.IonAssert;
-import software.amazon.ion.system.IonTextWriterBuilder;
-import software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
+
 
 public class IonValueTest
     extends IonTestCase
@@ -150,7 +144,7 @@ public void testSetTypeAnnotationInterning()
         IonValue v = system().newNull();
         v.setTypeAnnotations(nameCopy);
 
-        // TODO amzn/ion-java#21 fails because v doesn't have any symbol table at all
+        // TODO amzn/ion-java/issues/21 fails because v doesn't have any symbol table at all
 //        assertSame(nameOrig, v.getTypeAnnotations()[0]);
 //        assertSame(nameOrig, v.getTypeAnnotationSymbols()[0].getText());
     }
@@ -295,7 +289,7 @@ public void testCustomToString()
                      v.toString(IonTextWriterBuilder.standard()
                                     .withInitialIvmHandling(InitialIvmHandling.ENSURE)));
 
-        // TODO amzn/ion-java#57 determine if these really should be platform independent newlines
+        // TODO amzn/ion-java/issues/57 determine if these really should be platform independent newlines
         final String pretty = format("%n[%n  hello,%n  a::12%n]");
         assertEquals(pretty,
                      v.toString(IonTextWriterBuilder.pretty()));
@@ -314,6 +308,7 @@ public void testCloningSystemLookingValue()
         IonValue v2 = system().clone(v);
         IonAssert.assertIonEquals(v, v2);
 
+        // Try cross-product of system implementations.
         IonSystem system2 = newSystem(null);
         v2 = system2.clone(v);
         IonAssert.assertIonEquals(v, v2);
diff --git a/test/software/amazon/ion/IteratorSystemProcessingTestCase.java b/test/com/amazon/ion/IteratorSystemProcessingTestCase.java
similarity index 84%
rename from test/software/amazon/ion/IteratorSystemProcessingTestCase.java
rename to test/com/amazon/ion/IteratorSystemProcessingTestCase.java
index 1aaee61c34..5ac1a21d8a 100644
--- a/test/software/amazon/ion/IteratorSystemProcessingTestCase.java
+++ b/test/com/amazon/ion/IteratorSystemProcessingTestCase.java
@@ -1,25 +1,22 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.Iterator;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Timestamp;
+
 
 abstract class IteratorSystemProcessingTestCase
     extends SystemProcessingTestCase
diff --git a/test/software/amazon/ion/JavaNumericsTest.java b/test/com/amazon/ion/JavaNumericsTest.java
similarity index 91%
rename from test/software/amazon/ion/JavaNumericsTest.java
rename to test/com/amazon/ion/JavaNumericsTest.java
index a1d4d46739..381174f1be 100644
--- a/test/software/amazon/ion/JavaNumericsTest.java
+++ b/test/com/amazon/ion/JavaNumericsTest.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/test/software/amazon/ion/JavaReaderIteratorSystemProcessingTest.java b/test/com/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
similarity index 65%
rename from test/software/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
rename to test/com/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
index 0dc5d59f5c..5b044d2af5 100644
--- a/test/software/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
@@ -1,23 +1,23 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.io.Reader;
 import java.io.StringReader;
 import java.util.Iterator;
-import software.amazon.ion.IonValue;
 
 
 public class JavaReaderIteratorSystemProcessingTest
diff --git a/test/software/amazon/ion/ListTest.java b/test/com/amazon/ion/ListTest.java
similarity index 89%
rename from test/software/amazon/ion/ListTest.java
rename to test/com/amazon/ion/ListTest.java
index 5910a088fc..43c74fa408 100644
--- a/test/software/amazon/ion/ListTest.java
+++ b/test/com/amazon/ion/ListTest.java
@@ -1,30 +1,25 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import org.junit.Test;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
 
 
 public class ListTest
@@ -45,9 +40,7 @@ protected IonList makeEmpty()
     @Override
     protected IonList newSequence(Collection<? extends IonValue> children)
     {
-        IonList list = system().newEmptyList();
-        list.addAll(children);
-        return list;
+        return system().newList(children);
     }
 
     @Override
@@ -231,26 +224,22 @@ public void testCreatingListFromCollection()
         IonSystem system = system();
         List<IonValue> elements = null;
 
-        IonList v;
-        try {
-            v = newSequence(elements);
-            fail("Expected NullPointerException");
-        }
-        catch (NullPointerException e) {}
+        IonList v = system.newList(elements);
+        testFreshNullSequence(v);
 
         elements = new ArrayList<IonValue>();
-        v = newSequence(elements);
+        v = system.newList(elements);
         testEmptySequence(v);
 
         elements.add(system.newString("hi"));
         elements.add(system.newInt(1776));
-        v = newSequence(elements);
+        v = system.newList(elements);
         assertEquals(2, v.size());
         checkString("hi", v.get(0));
         checkInt(1776, v.get(1));
 
         try {
-            v = newSequence(elements);
+            v = system.newList(elements);
             fail("Expected ContainedValueException");
         }
         catch (ContainedValueException e) { }
@@ -259,7 +248,7 @@ public void testCreatingListFromCollection()
         elements.add(system.newInt(1776));
         elements.add(null);
         try {
-            newSequence(elements);
+            system.newList(elements);
             fail("Expected NullPointerException");
         }
         catch (NullPointerException e) { }
diff --git a/test/software/amazon/ion/LoadBinaryBytesSystemProcessingTest.java b/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
similarity index 61%
rename from test/software/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
rename to test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
index ff8574f1f8..d90dffb0e2 100644
--- a/test/software/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
+++ b/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
@@ -1,21 +1,22 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
+
+
 
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonLoader;
 
 public class LoadBinaryBytesSystemProcessingTest
     extends DatagramIteratorSystemProcessingTest
diff --git a/test/software/amazon/ion/LoadBinaryStreamSystemProcessingTest.java b/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
similarity index 64%
rename from test/software/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
rename to test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
index 35d72e276a..d938fd9a3b 100644
--- a/test/software/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
+++ b/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
@@ -1,23 +1,23 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonLoader;
+
 
 public class LoadBinaryStreamSystemProcessingTest
     extends DatagramIteratorSystemProcessingTest
diff --git a/test/software/amazon/ion/LoadTextBytesSystemProcessingTest.java b/test/com/amazon/ion/LoadTextBytesSystemProcessingTest.java
similarity index 53%
rename from test/software/amazon/ion/LoadTextBytesSystemProcessingTest.java
rename to test/com/amazon/ion/LoadTextBytesSystemProcessingTest.java
index bea8fd1b79..c8b432d5d6 100644
--- a/test/software/amazon/ion/LoadTextBytesSystemProcessingTest.java
+++ b/test/com/amazon/ion/LoadTextBytesSystemProcessingTest.java
@@ -1,22 +1,22 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
+
+import com.amazon.ion.impl._Private_Utils;
 
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.impl.PrivateUtils;
 
 
 public class LoadTextBytesSystemProcessingTest
@@ -28,7 +28,7 @@ public class LoadTextBytesSystemProcessingTest
     protected void prepare(String text)
         throws Exception
     {
-        myBytes = PrivateUtils.convertUtf16UnitsToUtf8(text);
+        myBytes = _Private_Utils.convertUtf16UnitsToUtf8(text);
     }
 
     @Override
diff --git a/test/software/amazon/ion/LoadTextStreamSystemProcessingTest.java b/test/com/amazon/ion/LoadTextStreamSystemProcessingTest.java
similarity index 57%
rename from test/software/amazon/ion/LoadTextStreamSystemProcessingTest.java
rename to test/com/amazon/ion/LoadTextStreamSystemProcessingTest.java
index ab9eac0897..4d3ed3c2b2 100644
--- a/test/software/amazon/ion/LoadTextStreamSystemProcessingTest.java
+++ b/test/com/amazon/ion/LoadTextStreamSystemProcessingTest.java
@@ -1,24 +1,24 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.impl._Private_Utils;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.impl.PrivateUtils;
+
 
 
 public class LoadTextStreamSystemProcessingTest
@@ -30,7 +30,7 @@ public class LoadTextStreamSystemProcessingTest
     protected void prepare(String text)
         throws Exception
     {
-        myBytes = PrivateUtils.convertUtf16UnitsToUtf8(text);
+        myBytes = _Private_Utils.convertUtf16UnitsToUtf8(text);
     }
 
     @Override
diff --git a/test/software/amazon/ion/LoaderTest.java b/test/com/amazon/ion/LoaderTest.java
similarity index 93%
rename from test/software/amazon/ion/LoaderTest.java
rename to test/com/amazon/ion/LoaderTest.java
index 18e9a76c89..e00685d27f 100644
--- a/test/software/amazon/ion/LoaderTest.java
+++ b/test/com/amazon/ion/LoaderTest.java
@@ -1,23 +1,26 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.impl.PrivateUtils.UTF8_CHARSET;
-import static software.amazon.ion.impl.PrivateUtils.utf8;
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.impl._Private_Utils.UTF8_CHARSET;
+import static com.amazon.ion.impl._Private_Utils.utf8;
 
+import com.amazon.ion.impl.Symtabs;
+import com.amazon.ion.system.SimpleCatalog;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -30,20 +33,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.IonMutableCatalog;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.impl.Symtabs;
-import software.amazon.ion.system.SimpleCatalog;
+
 
 public class LoaderTest
     extends IonTestCase
diff --git a/test/software/amazon/ion/LongStringTest.java b/test/com/amazon/ion/LongStringTest.java
similarity index 56%
rename from test/software/amazon/ion/LongStringTest.java
rename to test/com/amazon/ion/LongStringTest.java
index 491b6f20b0..f7454932ef 100644
--- a/test/software/amazon/ion/LongStringTest.java
+++ b/test/com/amazon/ion/LongStringTest.java
@@ -1,18 +1,20 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
+
 
 public class LongStringTest
     extends TextTestCase
diff --git a/test/software/amazon/ion/NewDatagramIteratorSystemProcessingTest.java b/test/com/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
similarity index 79%
rename from test/software/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
rename to test/com/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
index dc41683c23..3674699150 100644
--- a/test/software/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
@@ -1,24 +1,21 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.Iterator;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
 
 /**
  * TODO replicates other tests in this hierarchy
diff --git a/test/com/amazon/ion/NonEquivsTest.java b/test/com/amazon/ion/NonEquivsTest.java
new file mode 100644
index 0000000000..f8a38ab7ea
--- /dev/null
+++ b/test/com/amazon/ion/NonEquivsTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.NON_EQUIVS_IONTESTS_FILEs;
+
+import com.amazon.ion.junit.Injected.Inject;
+import java.io.File;
+
+public class NonEquivsTest
+    extends EquivsTestCase
+{
+    @Inject("testFile")
+    public static final File[] FILES =
+        TestUtils.testdataFiles(GLOBAL_SKIP_LIST, NON_EQUIVS_IONTESTS_FILEs);
+
+    public NonEquivsTest()
+    {
+        super(false);
+    }
+}
diff --git a/test/software/amazon/ion/NopPaddingTest.java b/test/com/amazon/ion/NopPaddingTest.java
similarity index 91%
rename from test/software/amazon/ion/NopPaddingTest.java
rename to test/com/amazon/ion/NopPaddingTest.java
index 57ca9ee411..2fd7fa3555 100644
--- a/test/software/amazon/ion/NopPaddingTest.java
+++ b/test/com/amazon/ion/NopPaddingTest.java
@@ -1,17 +1,18 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion;
+package com.amazon.ion;
 
 import org.junit.Test;
 
diff --git a/test/software/amazon/ion/NullTest.java b/test/com/amazon/ion/NullTest.java
similarity index 78%
rename from test/software/amazon/ion/NullTest.java
rename to test/com/amazon/ion/NullTest.java
index 48f3944cbb..aa0c4d770e 100644
--- a/test/software/amazon/ion/NullTest.java
+++ b/test/com/amazon/ion/NullTest.java
@@ -1,25 +1,22 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion;
+
+package com.amazon.ion;
 
 import java.util.Iterator;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
 
 
 
diff --git a/test/com/amazon/ion/RawValueSpanReaderBasicTest.java b/test/com/amazon/ion/RawValueSpanReaderBasicTest.java
new file mode 100644
index 0000000000..f209214c13
--- /dev/null
+++ b/test/com/amazon/ion/RawValueSpanReaderBasicTest.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+
+import com.amazon.ion.system.IonReaderBuilder;
+import java.io.ByteArrayInputStream;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+/**
+ * Tests basic behavior of the {@link RawValueSpanProvider} reader facet, which
+ * provides access to the reader's underlying byte buffer and vends OffsetSpans
+ * that provide positions of the current value in that buffer.
+ * @see RawValueSpanReaderTest
+ */
+@SuppressWarnings({"deprecation", "javadoc"})
+public class RawValueSpanReaderBasicTest
+{
+
+    private byte[] dummyData;
+
+    @Before
+    public void setup()
+    {
+        // Trivial binary Ion. IVM followed by a list with a single element (int 0).
+        dummyData = new byte[]{(byte)0xE0, (byte)0x01, (byte)0x00, (byte)0xEA, (byte)0xB1, (byte)0x20};
+    }
+
+    @Test
+    public void testTextReaderReturnsNullFacet()
+    {
+        // Only the binary reader currently provides this facet.
+        IonReader reader = IonReaderBuilder.standard().build("text");
+        assertNull(reader.asFacet(RawValueSpanProvider.class));
+    }
+
+    @Test
+    public void testNonByteBackedReaderNotSupported()
+    {
+        IonReader reader = IonReaderBuilder.standard().build(new ByteArrayInputStream(dummyData));
+        assertNull(reader.asFacet(RawValueSpanProvider.class));
+        assertNull(reader.asFacet(SeekableReader.class));
+    }
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Test
+    public void testSeekToNullSpanFails()
+    {
+        IonReader reader = IonReaderBuilder.standard().build(dummyData);
+        SeekableReader seekable = reader.asFacet(SeekableReader.class);
+        thrown.expect(IllegalArgumentException.class);
+        seekable.hoist(null);
+    }
+
+    @Test
+    public void testSeekToIncompatibleSpanFails()
+    {
+        IonReader reader = IonReaderBuilder.standard().build(dummyData);
+        SeekableReader seekable = reader.asFacet(SeekableReader.class);
+        thrown.expect(IllegalArgumentException.class);
+        seekable.hoist(new Span(){
+
+            public <T> T asFacet(Class<T> facetType)
+            {
+                return null;
+            }
+
+        });
+    }
+
+    @Test
+    public void testSeekToValueSpanFails()
+    {
+        IonReader reader = IonReaderBuilder.standard().build(dummyData);
+        RawValueSpanProvider valueSpanProvider = reader.asFacet(RawValueSpanProvider.class);
+        reader.next(); // position reader on list
+        Span valueSpan = valueSpanProvider.valueSpan();
+        reader.next(); // advance past list
+        SeekableReader seekable = reader.asFacet(SeekableReader.class);
+        thrown.expect(IllegalArgumentException.class);
+        // seeking to a value span is not allowed because it's positioned
+        // past the TID and length bytes.
+        seekable.hoist(valueSpan);
+    }
+
+    @Test
+    public void testGetBufferReturnsSame()
+    {
+        IonReader reader = IonReaderBuilder.standard().build(dummyData);
+        assertSame(dummyData, reader.asFacet(RawValueSpanProvider.class).buffer());
+    }
+
+    @Test
+    public void testGetSpanNotAtTopLevelValueFails()
+    {
+        IonReader reader = IonReaderBuilder.standard().build(dummyData);
+        RawValueSpanProvider spanProvider = reader.asFacet(RawValueSpanProvider.class);
+        thrown.expect(IllegalStateException.class);
+        spanProvider.valueSpan();
+    }
+
+    @Test
+    public void testGetSpanNotAtContainerValueFails()
+    {
+        IonReader reader = IonReaderBuilder.standard().build(dummyData);
+        RawValueSpanProvider spanProvider = reader.asFacet(RawValueSpanProvider.class);
+        reader.next();
+        reader.stepIn(); // inside list
+        thrown.expect(IllegalStateException.class);
+        spanProvider.valueSpan();
+    }
+
+    @Test
+    public void testSingleOctetValueSpan()
+    {
+        IonReader reader = IonReaderBuilder.standard().build(dummyData);
+        SpanProvider seekableSpanProvider = reader.asFacet(SpanProvider.class);
+        RawValueSpanProvider valueSpanProvider = reader.asFacet(RawValueSpanProvider.class);
+        reader.next();
+        reader.stepIn(); // inside list
+        assertEquals(IonType.INT, reader.next());
+        Span seekableSpan = seekableSpanProvider.currentSpan();
+        OffsetSpan valueSpan = (OffsetSpan)valueSpanProvider.valueSpan();
+        // int 0 is fully represented by the type ID octet.
+        assertEquals(valueSpan.getStartOffset(), valueSpan.getFinishOffset());
+        reader.stepOut(); // go logically past the value
+        SeekableReader seekable = reader.asFacet(SeekableReader.class);
+        seekable.hoist(seekableSpan); // seek back
+        reader.next(); //required after any seek
+        assertEquals(0, reader.intValue());
+    }
+
+}
diff --git a/test/software/amazon/ion/ReaderChecker.java b/test/com/amazon/ion/ReaderChecker.java
similarity index 85%
rename from test/software/amazon/ion/ReaderChecker.java
rename to test/com/amazon/ion/ReaderChecker.java
index da80590c8f..7905173d80 100644
--- a/test/software/amazon/ion/ReaderChecker.java
+++ b/test/com/amazon/ion/ReaderChecker.java
@@ -1,33 +1,32 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import static com.amazon.ion.IonTestCase.checkSymbol;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.impl._Private_Utils.stringIterator;
+import static com.amazon.ion.junit.IonAssert.assertIteratorEquals;
+import static com.amazon.ion.junit.IonAssert.assertSymbolEquals;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
-import static software.amazon.ion.IonTestCase.checkSymbol;
-import static software.amazon.ion.impl.PrivateUtils.stringIterator;
-import static software.amazon.ion.junit.IonAssert.assertIteratorEquals;
-import static software.amazon.ion.junit.IonAssert.assertSymbolEquals;
 
 import java.util.Iterator;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
+
 
 public class ReaderChecker
     implements Checker
@@ -54,6 +53,9 @@ public ReaderChecker noFieldName()
         assertEquals("IonReader.getFieldName()",
                      null, myReader.getFieldName());
 
+        assertEquals("IonReader.getFieldId()",
+                     UNKNOWN_SYMBOL_ID, myReader.getFieldId());
+
         assertEquals("IonReader.getFieldNameSymbol()",
                      null, myReader.getFieldNameSymbol());
 
@@ -79,6 +81,9 @@ public ReaderChecker fieldName(String expectedText, int expectedSid)
                          expectedText, myReader.getFieldName());
         }
 
+        assertEquals("IonReader.getFieldId()",
+                     expectedSid, myReader.getFieldId());
+
         SymbolToken sym = myReader.getFieldNameSymbol();
         checkSymbol(expectedText, expectedSid, sym);
 
diff --git a/test/software/amazon/ion/ReaderMaker.java b/test/com/amazon/ion/ReaderMaker.java
similarity index 90%
rename from test/software/amazon/ion/ReaderMaker.java
rename to test/com/amazon/ion/ReaderMaker.java
index 6b5bb78a80..ff5cc88fb7 100644
--- a/test/software/amazon/ion/ReaderMaker.java
+++ b/test/com/amazon/ion/ReaderMaker.java
@@ -1,22 +1,24 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.TestUtils.ensureBinary;
-import static software.amazon.ion.TestUtils.ensureText;
+import static com.amazon.ion.TestUtils.ensureBinary;
+import static com.amazon.ion.TestUtils.ensureText;
 
+import com.amazon.ion.impl._Private_Utils;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,10 +27,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.impl.PrivateUtils;
 
 /**
  * Abstracts the various ways that {@link IonReader}s can be created, so test
@@ -231,7 +229,7 @@ public int getOffset()
 
     public IonReader newReader(IonSystem system, String ionText)
     {
-        byte[] utf8 = PrivateUtils.utf8(ionText);
+        byte[] utf8 = _Private_Utils.utf8(ionText);
         return newReader(system, utf8);
     }
 
@@ -252,6 +250,14 @@ public IonReader newReader(IonSystem system, byte[] ionData,
     }
 
 
+    public IonReader newReader(IonSystem system, InputStream ionData)
+        throws IOException
+    {
+        byte[] bytes = _Private_Utils.loadStreamBytes(ionData);
+        return newReader(system, bytes);
+    }
+
+
     public static ReaderMaker[] valuesExcluding(ReaderMaker... exclusions)
     {
         ReaderMaker[] all = values();
diff --git a/test/software/amazon/ion/ReaderSystemProcessingTestCase.java b/test/com/amazon/ion/ReaderSystemProcessingTestCase.java
similarity index 91%
rename from test/software/amazon/ion/ReaderSystemProcessingTestCase.java
rename to test/com/amazon/ion/ReaderSystemProcessingTestCase.java
index 5c7335af53..de9b468221 100644
--- a/test/software/amazon/ion/ReaderSystemProcessingTestCase.java
+++ b/test/com/amazon/ion/ReaderSystemProcessingTestCase.java
@@ -1,34 +1,30 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.impl.PrivateUtils.EMPTY_STRING_ARRAY;
-import static software.amazon.ion.junit.IonAssert.assertNoCurrentValue;
-import static software.amazon.ion.junit.IonAssert.expectNextField;
+import static com.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY;
+import static com.amazon.ion.junit.IonAssert.assertNoCurrentValue;
+import static com.amazon.ion.junit.IonAssert.expectNextField;
 
+import com.amazon.ion.junit.IonAssert;
 import java.util.Date;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.junit.IonAssert;
+
 
 
 public abstract class ReaderSystemProcessingTestCase
@@ -240,6 +236,10 @@ public void testIsInStruct()
         assertFalse(myReader.isInStruct());
         assertEquals(0, myReader.getDepth());
 
+        assertTrue(myReader.hasNext());
+        assertFalse(myReader.isInStruct());
+        assertEquals(0, myReader.getDepth());
+
         assertEquals(IonType.STRUCT, myReader.next());
         assertFalse(myReader.isInStruct());
         assertEquals(0, myReader.getDepth());
@@ -249,6 +249,10 @@ public void testIsInStruct()
             assertTrue(myReader.isInStruct());
             assertEquals(1, myReader.getDepth());
 
+            assertTrue(myReader.hasNext());    // List is coming up
+            assertTrue(myReader.isInStruct()); // but we're still at struct level
+            assertEquals(1, myReader.getDepth());
+
             assertSame(IonType.LIST, myReader.next());
             assertTrue(myReader.isInStruct());  // still in struct until we stepIn()
             assertEquals(1, myReader.getDepth());
@@ -289,8 +293,10 @@ public void testHasNextLeavesCurrentData()
         String text = "hello 2";
         startIteration(text);
 
+        assertTrue(myReader.hasNext());
         assertEquals(IonType.SYMBOL, myReader.next());
         assertEquals(IonType.SYMBOL, myReader.getType());
+        assertTrue(myReader.hasNext());
 
         // FIXed ME text reader was broken, now fixed
         // really the binary readers were returning the
@@ -382,7 +388,6 @@ public void testStepOutInMiddle()
         expectNextField(r, "d");
     }
 
-
     @Test
     public void testSkippingFieldsNoQuote()
     throws Exception
diff --git a/test/software/amazon/ion/RoundTripTest.java b/test/com/amazon/ion/RoundTripTest.java
similarity index 79%
rename from test/software/amazon/ion/RoundTripTest.java
rename to test/com/amazon/ion/RoundTripTest.java
index 098dcd1a93..7d228a7c14 100644
--- a/test/software/amazon/ion/RoundTripTest.java
+++ b/test/com/amazon/ion/RoundTripTest.java
@@ -1,25 +1,33 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
-
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.TEXT_ONLY_FILTER;
-import static software.amazon.ion.TestUtils.testdataFiles;
-import static software.amazon.ion.junit.IonAssert.assertIonEquals;
-
+package com.amazon.ion;
+
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.TEXT_ONLY_FILTER;
+import static com.amazon.ion.TestUtils.testdataFiles;
+import static com.amazon.ion.junit.IonAssert.assertIonEquals;
+
+import com.amazon.ion.TestUtils.And;
+import com.amazon.ion.TestUtils.FileIsNot;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.streaming.ReaderCompare;
+import com.amazon.ion.streaming.RoundTripStreamingTest;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.util.Printer;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -29,31 +37,18 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.TestUtils.And;
-import software.amazon.ion.TestUtils.FileIsNot;
-import software.amazon.ion.junit.Injected.Inject;
-import software.amazon.ion.streaming.ReaderCompare;
-import software.amazon.ion.streaming.RoundTripStreamingTest;
-import software.amazon.ion.system.IonTextWriterBuilder;
 
 /**
  * Processes all text files in the "good" suite, transforming between text and
  * binary twice to ensure that the process is equivalent.
  *
- * TODO amzn/ion-java#29 Refactor this test class, possible duplicate test coverage in
+ * TODO amzn/ion-java/issues/29 Refactor this test class, possible duplicate test coverage in
  * {@link RoundTripStreamingTest}.
  */
 public class RoundTripTest
     extends IonTestCase
 {
-    // TODO amzn/ion-java#27 Writing IonSymbol to bytes using IonSymbol.writeTo(IonWriter)
+    // TODO amzn/ion-java/issues/27 Writing IonSymbol to bytes using IonSymbol.writeTo(IonWriter)
     // will throw UnknownSymbolException if symbol text is unknown
     public static final FilenameFilter ROUND_TRIP_TEST_SKIP_LIST =
         new FileIsNot("good/symbols.ion");
@@ -74,11 +69,7 @@ private enum BinaryEncoderType
      * encodings that won't round-trip.
      */
     @Inject("testFile")
-    public static final File[] FILES =
-        testdataFiles(new And(TEXT_ONLY_FILTER,
-                              GLOBAL_SKIP_LIST,
-                              ROUND_TRIP_TEST_SKIP_LIST),
-                      GOOD_IONTESTS_FILES);
+    public static final File[] FILES = testdataFiles(new And(TEXT_ONLY_FILTER, GLOBAL_SKIP_LIST, ROUND_TRIP_TEST_SKIP_LIST), GOOD_IONTESTS_FILES);
 
     @Inject("copySpeed")
     public static final StreamCopySpeed[] STREAM_COPY_SPEEDS =
@@ -88,6 +79,7 @@ private enum BinaryEncoderType
     public static final BinaryEncoderType[] BINARY_ENCODER_TYPES =
         BinaryEncoderType.values();
 
+    private Printer             myPrinter;
     private StringBuilder       myBuilder;
     private File                myTestFile;
     private BinaryEncoderType   myBinaryEncoderType;
@@ -108,6 +100,7 @@ public void setUp()
     throws Exception
     {
         super.setUp();
+        myPrinter = new Printer();
         myBuilder = new StringBuilder();
     }
 
@@ -116,6 +109,7 @@ public void setUp()
     public void tearDown()
     throws Exception
     {
+        myPrinter = null;
         myBuilder = null;
         super.tearDown();
     }
@@ -124,16 +118,11 @@ public void tearDown()
     private String renderSystemView(IonDatagram datagram)
     throws IOException
     {
+        // TODO use Printer in raw mode.
         for (Iterator i = datagram.systemIterator(); i.hasNext();)
         {
             IonValue value = (IonValue) i.next();
-            IonWriter writer = IonTextWriterBuilder.standard().build(myBuilder);
-            try {
-                value.writeTo(writer);
-            }
-            finally {
-                writer.close();
-            }
+            myPrinter.print(value, myBuilder);
             myBuilder.append('\n');
         }
 
@@ -145,16 +134,11 @@ private String renderSystemView(IonDatagram datagram)
     private String renderUserView(IonDatagram datagram)
     throws IOException
     {
+        // TODO use Printer in raw mode.
         for (Iterator i = datagram.iterator(); i.hasNext();)
         {
             IonValue value = (IonValue) i.next();
-            IonWriter writer = IonTextWriterBuilder.standard().build(myBuilder);
-            try {
-                value.writeTo(writer);
-            }
-            finally {
-                writer.close();
-            }
+            myPrinter.print(value, myBuilder);
             myBuilder.append('\n');
         }
 
diff --git a/test/software/amazon/ion/SequenceTestCase.java b/test/com/amazon/ion/SequenceTestCase.java
similarity index 95%
rename from test/software/amazon/ion/SequenceTestCase.java
rename to test/com/amazon/ion/SequenceTestCase.java
index c30e12520d..41e8a2af6a 100644
--- a/test/software/amazon/ion/SequenceTestCase.java
+++ b/test/com/amazon/ion/SequenceTestCase.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,20 +23,6 @@
 import java.util.ListIterator;
 import java.util.NoSuchElementException;
 import org.junit.Test;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonBool;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.NullValueException;
-import software.amazon.ion.ReadOnlyValueException;
 
 
 
@@ -583,7 +570,7 @@ public void testRetainAll()
                                                     (Object)nullValue2);
 
         IonSequence seq = makeEmpty();
-        // TODO amzn/ion-java#49 implement IonDatagram.retainAll
+        // TODO amzn/ion-java/issues/49 implement IonDatagram.retainAll
         if (seq.getType() == IonType.DATAGRAM) return;
 
         assertFalse(seq.retainAll(empty));
@@ -725,6 +712,8 @@ public void testAddOfClone()
         s.add(v2);
         v2.addTypeAnnotation("foo");
 
+        forceDeepMaterialization(v1);
+
         if (s.getType() != IonType.DATAGRAM)
         {
             IonDatagram dg = system().newDatagram(s);
diff --git a/test/software/amazon/ion/SexpTest.java b/test/com/amazon/ion/SexpTest.java
similarity index 89%
rename from test/software/amazon/ion/SexpTest.java
rename to test/com/amazon/ion/SexpTest.java
index 08b7578a34..18ceca29e6 100644
--- a/test/software/amazon/ion/SexpTest.java
+++ b/test/com/amazon/ion/SexpTest.java
@@ -1,29 +1,25 @@
+
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion;
+
+package com.amazon.ion;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import org.junit.Test;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSexp;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
 
 
 
@@ -45,9 +41,7 @@ protected IonSexp makeEmpty()
     @Override
     protected IonSexp newSequence(Collection<? extends IonValue> children)
     {
-        IonSexp sexp = system().newEmptySexp();
-        sexp.addAll(children);
-        return sexp;
+        return system().newSexp(children);
     }
 
     @Override
@@ -205,26 +199,22 @@ public void testCreatingSexpFromCollection()
         IonSystem system = system();
         List<IonValue> elements = null;
 
-        IonSexp v;
-        try {
-            v = newSequence(elements);
-            fail("Expected NullPointerException");
-        }
-        catch (NullPointerException e) {}
+        IonSexp v = system.newSexp(elements);
+        testFreshNullSequence(v);
 
         elements = new ArrayList<IonValue>();
-        v = newSequence(elements);
+        v = system.newSexp(elements);
         testEmptySequence(v);
 
         elements.add(system.newString("hi"));
         elements.add(system.newInt(1776));
-        v = newSequence(elements);
+        v = system.newSexp(elements);
         assertEquals(2, v.size());
         checkString("hi", v.get(0));
         checkInt(1776, v.get(1));
 
         try {
-            v = newSequence(elements);
+            v = system.newSexp(elements);
             fail("Expected ContainedValueException");
         }
         catch (ContainedValueException e) { }
@@ -233,7 +223,7 @@ public void testCreatingSexpFromCollection()
         elements.add(system.newInt(1776));
         elements.add(null);
         try {
-            v = newSequence(elements);
+            v = system.newSexp(elements);
             fail("Expected NullPointerException");
         }
         catch (NullPointerException e) { }
diff --git a/test/software/amazon/ion/SharedSymtabMaker.java b/test/com/amazon/ion/SharedSymtabMaker.java
similarity index 68%
rename from test/software/amazon/ion/SharedSymtabMaker.java
rename to test/com/amazon/ion/SharedSymtabMaker.java
index 554854f6bb..6b5e031690 100644
--- a/test/software/amazon/ion/SharedSymtabMaker.java
+++ b/test/com/amazon/ion/SharedSymtabMaker.java
@@ -1,28 +1,24 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import static com.amazon.ion.impl.Symtabs.sharedSymtabStruct;
 import static junit.framework.Assert.assertSame;
-import static software.amazon.ion.impl.Symtabs.sharedSymtabStruct;
 
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.impl.PrivateIonSystem;
+import com.amazon.ion.impl._Private_IonSystem;
 
 /**
  * Abstracts the various ways that a shared {@link SymbolTable} can be created
@@ -36,7 +32,7 @@ public enum SharedSymtabMaker
     FROM_READER
     {
         @Override
-        public SymbolTable newSharedSymtab(PrivateIonSystem system,
+        public SymbolTable newSharedSymtab(_Private_IonSystem system,
                                            IonReader reader)
         {
             return system.newSharedSymbolTable(reader);
@@ -50,7 +46,7 @@ public SymbolTable newSharedSymtab(PrivateIonSystem system,
     FROM_READER_ON_STRUCT
     {
         @Override
-        public SymbolTable newSharedSymtab(PrivateIonSystem system,
+        public SymbolTable newSharedSymtab(_Private_IonSystem system,
                                            IonReader reader)
         {
             assertSame(IonType.STRUCT, reader.next());
@@ -65,7 +61,7 @@ public SymbolTable newSharedSymtab(PrivateIonSystem system,
     FROM_READER_NOT_ON_STRUCT
     {
         @Override
-        public SymbolTable newSharedSymtab(PrivateIonSystem system,
+        public SymbolTable newSharedSymtab(_Private_IonSystem system,
                                            IonReader reader)
         {
             return system.newSharedSymbolTable(reader, false);
@@ -78,7 +74,7 @@ public SymbolTable newSharedSymtab(PrivateIonSystem system,
     FROM_STRUCT
     {
         @Override
-        public SymbolTable newSharedSymtab(PrivateIonSystem system,
+        public SymbolTable newSharedSymtab(_Private_IonSystem system,
                                            IonStruct struct)
         {
             return system.newSharedSymbolTable(struct);
@@ -86,7 +82,7 @@ public SymbolTable newSharedSymtab(PrivateIonSystem system,
     };
 
 
-    public SymbolTable newSharedSymtab(PrivateIonSystem system,
+    public SymbolTable newSharedSymtab(_Private_IonSystem system,
                                        String name,
                                        int version,
                                        String... symbols)
@@ -98,7 +94,7 @@ public SymbolTable newSharedSymtab(PrivateIonSystem system,
     /**
      * @param reader must be positioned JUST BEFORE the symtab struct.
      */
-    public SymbolTable newSharedSymtab(PrivateIonSystem system,
+    public SymbolTable newSharedSymtab(_Private_IonSystem system,
                                        IonReader reader)
     {
         assertSame(IonType.STRUCT, reader.next());
@@ -106,7 +102,7 @@ public SymbolTable newSharedSymtab(PrivateIonSystem system,
         return newSharedSymtab(system, struct);
     }
 
-    public SymbolTable newSharedSymtab(PrivateIonSystem system,
+    public SymbolTable newSharedSymtab(_Private_IonSystem system,
                                        IonStruct struct)
     {
         IonReader reader = system.newReader(struct);
diff --git a/test/software/amazon/ion/StringFieldNameEscapesTest.java b/test/com/amazon/ion/StringFieldNameEscapesTest.java
similarity index 59%
rename from test/software/amazon/ion/StringFieldNameEscapesTest.java
rename to test/com/amazon/ion/StringFieldNameEscapesTest.java
index 50bcf732c0..96e3f0e387 100644
--- a/test/software/amazon/ion/StringFieldNameEscapesTest.java
+++ b/test/com/amazon/ion/StringFieldNameEscapesTest.java
@@ -1,21 +1,20 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonValue;
 
 public class StringFieldNameEscapesTest
     extends TextTestCase
diff --git a/test/software/amazon/ion/StringTest.java b/test/com/amazon/ion/StringTest.java
similarity index 94%
rename from test/software/amazon/ion/StringTest.java
rename to test/com/amazon/ion/StringTest.java
index 5e40d6c388..79dff34f14 100644
--- a/test/software/amazon/ion/StringTest.java
+++ b/test/com/amazon/ion/StringTest.java
@@ -1,24 +1,21 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import org.junit.Test;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.UnexpectedEofException;
 
 
 
diff --git a/test/software/amazon/ion/StructTest.java b/test/com/amazon/ion/StructTest.java
similarity index 97%
rename from test/software/amazon/ion/StructTest.java
rename to test/com/amazon/ion/StructTest.java
index 7c1210d33b..88861772ae 100644
--- a/test/software/amazon/ion/StructTest.java
+++ b/test/com/amazon/ion/StructTest.java
@@ -1,21 +1,24 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 
+import com.amazon.ion.impl._Private_IonValue;
+import com.amazon.ion.impl._Private_Utils;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -25,25 +28,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonBool;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.impl.PrivateIonValue;
-import software.amazon.ion.impl.PrivateUtils;
 
 
 public class StructTest
@@ -639,7 +623,7 @@ public void testAddSymbolTokenWithBadSid()
         IonStruct struct = system().newNullStruct();
         IonBool nullBool = system().newNullBool();
 
-        SymbolToken is = PrivateUtils.newSymbolToken("f", 1);
+        SymbolToken is = _Private_Utils.newSymbolToken("f", 1);
         struct.add(is, nullBool);
         is = nullBool.getFieldNameSymbol();
         checkSymbol("f", UNKNOWN_SYMBOL_ID, is);
@@ -669,7 +653,7 @@ public void testBadAddSymbolToken()
         }
         catch (NullPointerException e) { }
 
-        SymbolToken is = PrivateUtils.newSymbolToken("f", 1);
+        SymbolToken is = _Private_Utils.newSymbolToken("f", 1);
         try {
             value.add(is, null);
             fail("Expected NullPointerException");
@@ -826,7 +810,7 @@ public void testRemoveClearsFieldName(IonStruct s)
 
         f.removeFromContainer();
         assertEquals(null, f.getFieldName());
-        assertEquals(null, f.getFieldNameSymbol());
+        assertEquals(SymbolTable.UNKNOWN_SYMBOL_ID, f.getFieldId());
     }
 
     @Test
@@ -1532,7 +1516,7 @@ public void testRandomChanges()
         }
     }
     void dump(IonStruct s1_temp, ArrayList<TestField> s2) {
-        PrivateIonValue s1 = ((PrivateIonValue)s1_temp);
+        _Private_IonValue s1 = ((_Private_IonValue)s1_temp);
         s1.dump(new PrintWriter(System.out));
         System.out.println("array: "+s2.toString());
     }
@@ -1761,8 +1745,8 @@ void compare_field_lists(IonStruct s1, ArrayList<TestField> s2, long seed)
                 errors += "extra field in struct "+v;
                 errors += "\n";
             }
-            if (v instanceof PrivateIonValue) {
-                int eid = ((PrivateIonValue)v).getElementId();
+            if (v instanceof _Private_IonValue) {
+                int eid = ((_Private_IonValue)v).getElementId();
                 if (eid != struct_idx) {
                     difference = true;
                     errors += "index of struct field "+struct_idx+" doesn't match array index "+eid+": "+v;
@@ -1785,7 +1769,7 @@ void compare_field_lists(IonStruct s1, ArrayList<TestField> s2, long seed)
 
         if (_debug_print_flag) {
             // now check the map, if there is one
-            PrivateIonValue l = (PrivateIonValue)s1;
+            _Private_IonValue l = (_Private_IonValue)s1;
             String map_error = l.validate();
             if (map_error != null) {
                 errors += map_error;
diff --git a/test/software/amazon/ion/SurrogateEscapeTest.java b/test/com/amazon/ion/SurrogateEscapeTest.java
similarity index 74%
rename from test/software/amazon/ion/SurrogateEscapeTest.java
rename to test/com/amazon/ion/SurrogateEscapeTest.java
index 4c5c6ac405..86170ae471 100644
--- a/test/software/amazon/ion/SurrogateEscapeTest.java
+++ b/test/com/amazon/ion/SurrogateEscapeTest.java
@@ -1,38 +1,35 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.impl._Private_Utils;
 import org.junit.After;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonType;
-import software.amazon.ion.impl.PrivateUtils;
 
 public class SurrogateEscapeTest extends IonTestCase {
 
     private StringBuilder buf = new StringBuilder();
 
     private IonDatagram load() {
-        byte[] utf8 = PrivateUtils.utf8(buf.toString());
+        byte[] utf8 = _Private_Utils.utf8(buf.toString());
         return loader().load(utf8);
     }
 
     private IonReader reader() {
-        byte[] utf8 = PrivateUtils.utf8(buf.toString());
+        byte[] utf8 = _Private_Utils.utf8(buf.toString());
         return system().newReader(utf8);
     }
 
@@ -53,6 +50,9 @@ private void assertSingletonCodePoint(final int expectedCode) {
         assertSingleCodePoint(expectedCode, ((IonString) dg.get(0)).stringValue());
 
         final IonReader reader = reader();
+        if (! _Private_Utils.READER_HASNEXT_REMOVED) {
+            assertTrue(reader.hasNext());
+        }
         assertEquals(IonType.STRING, reader.next());
         assertSingleCodePoint(expectedCode, reader.stringValue());
     }
diff --git a/test/software/amazon/ion/SymbolTest.java b/test/com/amazon/ion/SymbolTest.java
similarity index 87%
rename from test/software/amazon/ion/SymbolTest.java
rename to test/com/amazon/ion/SymbolTest.java
index 853aafd3bb..9a44d1d3ad 100644
--- a/test/software/amazon/ion/SymbolTest.java
+++ b/test/com/amazon/ion/SymbolTest.java
@@ -1,31 +1,24 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.impl.PrivateUtils.newSymbolToken;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
 
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnsupportedIonVersionException;
-import software.amazon.ion.ValueFactory;
 
 
 
@@ -39,6 +32,12 @@ public static void checkNullSymbol(IonSymbol value)
         assertTrue("isNullValue() is false",   value.isNullValue());
         assertNull("stringValue() isn't null", value.stringValue());
         assertNull("symbolValue() isn't null", value.symbolValue());
+
+        try {
+            value.getSymbolId();
+            fail("Expected NullValueException");
+        }
+        catch (NullValueException e) { }
     }
 
     public void modifySymbol(IonSymbol value)
@@ -55,7 +54,7 @@ public void modifySymbol(IonSymbol value)
         String modValue1 = "dude!";
         value.setValue(modValue1);
         checkSymbol(modValue1, value);
-        int sid = value.symbolValue().getSid();
+        int sid = value.getSymbolId();
 
         checkSymbol(modValue1, sid, value);
 
diff --git a/test/software/amazon/ion/SystemProcessingTestCase.java b/test/com/amazon/ion/SystemProcessingTestCase.java
similarity index 96%
rename from test/software/amazon/ion/SystemProcessingTestCase.java
rename to test/com/amazon/ion/SystemProcessingTestCase.java
index c72e8ffa22..6fce2cee24 100644
--- a/test/software/amazon/ion/SystemProcessingTestCase.java
+++ b/test/com/amazon/ion/SystemProcessingTestCase.java
@@ -1,36 +1,34 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
-import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE_SID;
-import static software.amazon.ion.TestUtils.FERMATA;
-import static software.amazon.ion.impl.Symtabs.LocalSymbolTablePrefix;
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
+import static com.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE_SID;
+import static com.amazon.ion.TestUtils.FERMATA;
+import static com.amazon.ion.impl.Symtabs.LocalSymbolTablePrefix;
 
+import com.amazon.ion.impl.SymbolTableTest;
+import com.amazon.ion.impl.Symtabs;
+import com.amazon.ion.system.SimpleCatalog;
 import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.impl.SymbolTableTest;
-import software.amazon.ion.impl.Symtabs;
-import software.amazon.ion.system.SimpleCatalog;
+
 
 
 public abstract class SystemProcessingTestCase
@@ -194,7 +192,7 @@ protected abstract void checkEof()
 
     //=========================================================================
 
-    /** TODO amzn/ion-java#8 This is broken for loaders which are now more lazy */
+    /** TODO amzn/ion-java/issues/8 This is broken for loaders which are now more lazy */
     @Test @Ignore
     public void testLocalTableResetting()
         throws Exception
@@ -1043,7 +1041,7 @@ public void testSystemIterationShowsIvm()
         checkEof();
     }
 
-    // TODO amzn/ion-java#25 test for interspersed IVMs - testSystemIterationShowsInterspersedIvm
+    // TODO amzn/ion-java/issues/25 test for interspersed IVMs - testSystemIterationShowsInterspersedIvm
 
     @Test
     public void testHighUnicodeDirectInBlob()
diff --git a/test/software/amazon/ion/SystemProcessingTests.java b/test/com/amazon/ion/SystemProcessingTests.java
similarity index 74%
rename from test/software/amazon/ion/SystemProcessingTests.java
rename to test/com/amazon/ion/SystemProcessingTests.java
index fb20ce16f2..64e77e7f40 100644
--- a/test/software/amazon/ion/SystemProcessingTests.java
+++ b/test/com/amazon/ion/SystemProcessingTests.java
@@ -1,22 +1,24 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
+
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     TextIteratorSystemProcessingTest.class,
diff --git a/test/software/amazon/ion/TestUtils.java b/test/com/amazon/ion/TestUtils.java
similarity index 90%
rename from test/software/amazon/ion/TestUtils.java
rename to test/com/amazon/ion/TestUtils.java
index a2b5cb68ac..c5fbfb2e76 100644
--- a/test/software/amazon/ion/TestUtils.java
+++ b/test/com/amazon/ion/TestUtils.java
@@ -1,22 +1,24 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.util.IonStreamUtils;
+import static com.amazon.ion.impl._Private_Utils.READER_HASNEXT_REMOVED;
 
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.util.IonStreamUtils;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.math.BigDecimal;
@@ -27,6 +29,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+
 public class TestUtils
 {
     public static final String US_ASCII_CHARSET_NAME = "US-ASCII";
@@ -129,15 +132,14 @@ public boolean accept(File dir, String name)
 
     public static final FilenameFilter GLOBAL_SKIP_LIST =
         new FileIsNot(
-             "bad/clobWithNullCharacter.ion"                // TODO amzn/ion-java#43
-            , "bad/emptyAnnotatedInt.10n"                   // TODO amzn/ion-java#55
-            , "equivs/paddedInts.10n"                       // TODO amzn/ion-java#54
-            , "good/subfieldVarUInt32bit.ion"               // TODO amzn/ion-java#62
-            , "good/utf16.ion"                              // TODO amzn/ion-java#61
-            , "good/utf32.ion"                              // TODO amzn/ion-java#61
-            , "good/whitespace.ion"                         // TODO amzn/ion-java#104
-            , "good/item1.10n"                              // TODO amzn/ion-java#126 (roundtrip symbols with unknown text)
-        );
+                      "bad/clobWithNullCharacter.ion"          // TODO amzn/ion-java/43
+                      ,"bad/emptyAnnotatedInt.10n"             // TODO amzn/ion-java/55
+                      ,"good/subfieldVarUInt32bit.ion"         // TODO amzn/ion-java/62
+                      ,"good/utf16.ion"                        // TODO amzn/ion-java/61
+                      ,"good/utf32.ion"                        // TODO amzn/ion-java/61
+                      ,"good/whitespace.ion"
+                      , "good/item1.10n"                        // TODO amzn/ion-java#126 (roundtrip symbols with unknown text)
+                      );
 
 
     private static void testdataFiles(FilenameFilter filter,
@@ -228,7 +230,7 @@ public static byte[] ensureText(IonSystem system, byte[] ionData)
 
         IonDatagram dg = system.getLoader().load(ionData);
         String ionText = dg.toString();
-        return PrivateUtils.utf8(ionText);
+        return _Private_Utils.utf8(ionText);
     }
 
 
@@ -306,9 +308,19 @@ public static void deepRead(IonReader reader, boolean flgMaterializeScalars)
         }
     }
 
+    @SuppressWarnings("deprecation")
     private static IonType doNext(IonReader reader)
     {
-        return reader.next();
+        boolean hasnext = true;
+        IonType t = null;
+
+        if (! READER_HASNEXT_REMOVED) {
+            hasnext = reader.hasNext();
+        }
+        if (hasnext) {
+            t = reader.next();
+        }
+        return t;
     }
 
 
@@ -371,7 +383,7 @@ private static void materializeScalar(IonReader reader)
 
     public static String hexDump(final String str)
     {
-        final byte[] utf16Bytes = PrivateUtils.encode(str, UTF16BE_CHARSET);
+        final byte[] utf16Bytes = _Private_Utils.encode(str, UTF16BE_CHARSET);
         StringBuilder buf = new StringBuilder(utf16Bytes.length * 4);
         for (byte b : utf16Bytes) {
             buf.append(Integer.toString(0x00FF & b, 16));
@@ -527,7 +539,7 @@ public static boolean symbolTableEquals(final SymbolTable first, final SymbolTab
 
     static
     {
-        if (! PrivateUtils.utf8(FERMATA_UTF8).equals(FERMATA))
+        if (! _Private_Utils.utf8(FERMATA_UTF8).equals(FERMATA))
         {
             throw new AssertionError("Broken encoding");
         }
diff --git a/test/software/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java b/test/com/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
similarity index 58%
rename from test/software/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
rename to test/com/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
index 2115881ff4..be8ae0ef70 100644
--- a/test/software/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
@@ -1,22 +1,22 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.impl._Private_Utils;
 import java.util.Iterator;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.impl.PrivateUtils;
 
 
 public class TextByteArrayIteratorSystemProcessingTest
@@ -28,7 +28,7 @@ public class TextByteArrayIteratorSystemProcessingTest
     protected void prepare(String text)
         throws Exception
     {
-        myBytes = PrivateUtils.convertUtf16UnitsToUtf8(text);
+        myBytes = _Private_Utils.convertUtf16UnitsToUtf8(text);
     }
 
     @Override
diff --git a/test/software/amazon/ion/TextIteratorSystemProcessingTest.java b/test/com/amazon/ion/TextIteratorSystemProcessingTest.java
similarity index 61%
rename from test/software/amazon/ion/TextIteratorSystemProcessingTest.java
rename to test/com/amazon/ion/TextIteratorSystemProcessingTest.java
index 32f490273e..f16da9245d 100644
--- a/test/software/amazon/ion/TextIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/TextIteratorSystemProcessingTest.java
@@ -1,22 +1,22 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.impl._Private_IonSystem;
 import java.util.Iterator;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.impl.PrivateIonSystem;
 
 
 public class TextIteratorSystemProcessingTest
@@ -36,7 +36,7 @@ protected Iterator<IonValue> iterate()
     protected Iterator<IonValue> systemIterate()
         throws Exception
     {
-        PrivateIonSystem sys = system();
+        _Private_IonSystem sys = system();
         Iterator<IonValue> it = sys.systemIterate(myText);
         return it;
     }
diff --git a/test/software/amazon/ion/TextReaderSystemProcessingTest.java b/test/com/amazon/ion/TextReaderSystemProcessingTest.java
similarity index 61%
rename from test/software/amazon/ion/TextReaderSystemProcessingTest.java
rename to test/com/amazon/ion/TextReaderSystemProcessingTest.java
index 9901334745..2e04b88abf 100644
--- a/test/software/amazon/ion/TextReaderSystemProcessingTest.java
+++ b/test/com/amazon/ion/TextReaderSystemProcessingTest.java
@@ -1,20 +1,23 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
+
+
+
 
-import software.amazon.ion.IonReader;
 
 public class TextReaderSystemProcessingTest
     extends ReaderSystemProcessingTestCase
diff --git a/test/software/amazon/ion/TextStreamIteratorSystemProcessingTest.java b/test/com/amazon/ion/TextStreamIteratorSystemProcessingTest.java
similarity index 62%
rename from test/software/amazon/ion/TextStreamIteratorSystemProcessingTest.java
rename to test/com/amazon/ion/TextStreamIteratorSystemProcessingTest.java
index a716a80ef7..87a92b25da 100644
--- a/test/software/amazon/ion/TextStreamIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/TextStreamIteratorSystemProcessingTest.java
@@ -1,24 +1,24 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.impl._Private_Utils;
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.util.Iterator;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.impl.PrivateUtils;
 
 
 public class TextStreamIteratorSystemProcessingTest
@@ -31,7 +31,7 @@ public class TextStreamIteratorSystemProcessingTest
     protected void prepare(String text)
         throws Exception
     {
-        myBytes = PrivateUtils.convertUtf16UnitsToUtf8(text);
+        myBytes = _Private_Utils.convertUtf16UnitsToUtf8(text);
 
         myStream = new ByteArrayInputStream(myBytes);
     }
diff --git a/test/software/amazon/ion/TextTestCase.java b/test/com/amazon/ion/TextTestCase.java
similarity index 79%
rename from test/software/amazon/ion/TextTestCase.java
rename to test/com/amazon/ion/TextTestCase.java
index 6e332c7a7f..6f5e3927b7 100644
--- a/test/software/amazon/ion/TextTestCase.java
+++ b/test/com/amazon/ion/TextTestCase.java
@@ -1,21 +1,23 @@
+
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion;
+
+package com.amazon.ion;
 
 import org.junit.Test;
-import software.amazon.ion.IonText;
-import software.amazon.ion.IonValue;
+
 
 public abstract class TextTestCase
     extends IonTestCase
diff --git a/test/software/amazon/ion/TimestampBadTest.java b/test/com/amazon/ion/TimestampBadTest.java
similarity index 60%
rename from test/software/amazon/ion/TimestampBadTest.java
rename to test/com/amazon/ion/TimestampBadTest.java
index c3a133ba88..ede4ad4144 100644
--- a/test/software/amazon/ion/TimestampBadTest.java
+++ b/test/com/amazon/ion/TimestampBadTest.java
@@ -1,32 +1,32 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.TestUtils.BAD_TIMESTAMP_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.testdataFiles;
+import static com.amazon.ion.TestUtils.BAD_TIMESTAMP_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.testdataFiles;
 
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.Injected.Inject;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import org.junit.Test;
-import software.amazon.ion.IonException;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.junit.Injected.Inject;
+
 
 public class TimestampBadTest
     extends IonTestCase
@@ -50,7 +50,7 @@ public void testValueOf()
         String tsText;
         try
         {
-            tsText = PrivateUtils.utf8FileToString(myTestFile);
+            tsText = _Private_Utils.utf8FileToString(myTestFile);
         }
         catch (IonException e)
         {
diff --git a/test/software/amazon/ion/TimestampGoodTest.java b/test/com/amazon/ion/TimestampGoodTest.java
similarity index 68%
rename from test/software/amazon/ion/TimestampGoodTest.java
rename to test/com/amazon/ion/TimestampGoodTest.java
index c01c37ee8b..e5c2167fc2 100644
--- a/test/software/amazon/ion/TimestampGoodTest.java
+++ b/test/com/amazon/ion/TimestampGoodTest.java
@@ -1,35 +1,33 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.GOOD_TIMESTAMP_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.testdataFiles;
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.GOOD_TIMESTAMP_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.testdataFiles;
 
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.Injected.Inject;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringReader;
 import java.util.Iterator;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonTimestamp;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.junit.Injected.Inject;
+
 
 public class TimestampGoodTest
     extends IonTestCase
@@ -70,7 +68,7 @@ public void testValueOf()
     {
         if (! myTestFile.getName().endsWith(".ion")) return;
 
-        String fileText = PrivateUtils.utf8FileToString(myTestFile);
+        String fileText = _Private_Utils.utf8FileToString(myTestFile);
         BufferedReader reader = new BufferedReader(new StringReader(fileText));
 
         String line = reader.readLine();
diff --git a/test/software/amazon/ion/TimestampTest.java b/test/com/amazon/ion/TimestampTest.java
similarity index 93%
rename from test/software/amazon/ion/TimestampTest.java
rename to test/com/amazon/ion/TimestampTest.java
index 322898aef8..eef97cb463 100644
--- a/test/software/amazon/ion/TimestampTest.java
+++ b/test/com/amazon/ion/TimestampTest.java
@@ -1,40 +1,41 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
-
-import static software.amazon.ion.Decimal.NEGATIVE_ZERO;
-import static software.amazon.ion.Decimal.negativeZero;
-import static software.amazon.ion.Timestamp.MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL;
-import static software.amazon.ion.Timestamp.MINIMUM_TIMESTAMP_IN_MILLIS;
-import static software.amazon.ion.Timestamp.MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL;
-import static software.amazon.ion.Timestamp.UNKNOWN_OFFSET;
-import static software.amazon.ion.Timestamp.UTC_OFFSET;
-import static software.amazon.ion.Timestamp.createFromUtcFields;
-import static software.amazon.ion.Timestamp.Precision.DAY;
-import static software.amazon.ion.Timestamp.Precision.MINUTE;
-import static software.amazon.ion.Timestamp.Precision.MONTH;
-import static software.amazon.ion.Timestamp.Precision.SECOND;
-import static software.amazon.ion.Timestamp.Precision.YEAR;
-import static software.amazon.ion.impl.PrivateUtils.UTC;
-
+package com.amazon.ion;
+
+import static com.amazon.ion.Decimal.NEGATIVE_ZERO;
+import static com.amazon.ion.Decimal.negativeZero;
+import static com.amazon.ion.Timestamp.MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL;
+import static com.amazon.ion.Timestamp.MINIMUM_TIMESTAMP_IN_MILLIS;
+import static com.amazon.ion.Timestamp.MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL;
+import static com.amazon.ion.Timestamp.UNKNOWN_OFFSET;
+import static com.amazon.ion.Timestamp.UTC_OFFSET;
+import static com.amazon.ion.Timestamp.createFromUtcFields;
+import static com.amazon.ion.Timestamp.Precision.DAY;
+import static com.amazon.ion.Timestamp.Precision.FRACTION;
+import static com.amazon.ion.Timestamp.Precision.MINUTE;
+import static com.amazon.ion.Timestamp.Precision.MONTH;
+import static com.amazon.ion.Timestamp.Precision.SECOND;
+import static com.amazon.ion.Timestamp.Precision.YEAR;
+import static com.amazon.ion.impl._Private_Utils.UTC;
+
+import com.amazon.ion.Timestamp.Precision;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.ZoneId;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -42,7 +43,6 @@
 
 import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.Timestamp.Precision;
 
 /**
  * Validates Ion date parsing, specified as per W3C but with requiring
@@ -155,7 +155,8 @@ private void checkFields(int expectedYear, int expectedMonth, int expectedDay,
                     expectedFraction,
                     expectedOffset,
                     ts);
-        assertEquals(expectedPrecision, ts.getPrecision());
+        assertTrue(expectedPrecision.equals(ts.getPrecision())
+                   || expectedPrecision.includes(Precision.SECOND) == ts.getPrecision().includes(Precision.SECOND));
 
         @SuppressWarnings("deprecation")
         Timestamp ts2 =
@@ -173,25 +174,20 @@ private void checkFields(int expectedYear, int expectedMonth, int expectedDay,
                              Integer expectedOffset,
                              Timestamp ts)
     {
-        BigDecimal expectedDecimalSeconds = BigDecimal.valueOf(expectedSecond);
-        if (expectedFraction != null) {
-            expectedDecimalSeconds = expectedDecimalSeconds.add(expectedFraction);
-        }
-
         assertEquals("year",     expectedYear,     ts.getYear());
         assertEquals("month",    expectedMonth,    ts.getMonth());
         assertEquals("day",      expectedDay,      ts.getDay());
         assertEquals("hour",     expectedHour,     ts.getHour());
         assertEquals("minute",   expectedMinute,   ts.getMinute());
         assertEquals("second",   expectedSecond,   ts.getSecond());
-        assertEquals("fraction", expectedDecimalSeconds, ts.getDecimalSecond());
+        assertEquals("fraction", expectedFraction, ts.getFractionalSecond());
         assertEquals("offset",   expectedOffset,   ts.getLocalOffset());
     }
 
     private void checkTime(int expectedYear, int expectedMonth, int expectedDay,
                            String expectedText, String ionText)
     {
-        Timestamp ts = Timestamp.forDay(expectedYear, expectedMonth, expectedDay);
+        Timestamp ts = new Timestamp(expectedYear, expectedMonth, expectedDay);
         checkFields(expectedYear, expectedMonth, expectedDay, 0, 0, 0, null,
                     UNKNOWN_OFFSET, DAY, ts);
         assertEquals(expectedText, ts.toString());
@@ -364,7 +360,7 @@ public void testTimestampConstants()
         assertEquals("0001-01-01", EARLIEST_ION_TIMESTAMP.toString());
         assertEquals(-62135769600000L, EARLIEST_ION_TIMESTAMP.getMillis());
 
-        checkFields(1970, 1, 1, 0, 0, 0, new BigDecimal("0.000"), 0, SECOND, UNIX_EPOCH_TIMESTAMP);
+        checkFields(1970, 1, 1, 0, 0, 0, new BigDecimal("0.000"), 0, FRACTION, UNIX_EPOCH_TIMESTAMP);
         assertEquals("1970-01-01T00:00:00.000Z", UNIX_EPOCH_TIMESTAMP.toZString());
         assertEquals("1970-01-01T00:00:00.000Z", UNIX_EPOCH_TIMESTAMP.toString());
         assertEquals(0L, UNIX_EPOCH_TIMESTAMP.getMillis());
@@ -721,65 +717,83 @@ public void testMonthBoundaries()
     public void testNewTimestamp()
     {
         // ===== Test on Timestamp(...) date precise constructor =====
-        Timestamp ts = Timestamp.forDay(2010, 2, 1);
+        Timestamp ts = new Timestamp(2010, 2, 1);
         checkFields(2010, 2, 1, 0, 0, 0, null, UNKNOWN_OFFSET, DAY, ts);
         assertEquals("2010-02-01", ts.toString());
         assertEquals("2010-02-01", ts.toZString());
 
         // ===== Test on Timestamp(...) minute precise constructor =====
-        ts = Timestamp.forMinute(2010, 2, 1, 10, 11, PST_OFFSET);
+        ts = new Timestamp(2010, 2, 1, 10, 11, PST_OFFSET);
         checkFields(2010, 2, 1, 10, 11, 0, null, PST_OFFSET, MINUTE, ts);
         assertEquals("2010-02-01T10:11-08:00", ts.toString());
         assertEquals("2010-02-01T18:11Z", ts.toZString());
 
-        ts = Timestamp.forMinute(2010, 2, 1, 10, 11, null);
+        ts = new Timestamp(2010, 2, 1, 10, 11, null);
         checkFields(2010, 2, 1, 10, 11, 0, null, null, MINUTE, ts);
         assertEquals("2010-02-01T10:11-00:00", ts.toString());
         assertEquals("2010-02-01T10:11Z", ts.toZString());
 
         // ===== Test on Timestamp(...) second precise constructor =====
-        ts = Timestamp.forSecond(2010, 2, 1, 10, 11, 12, PST_OFFSET);
+        ts = new Timestamp(2010, 2, 1, 10, 11, 12, PST_OFFSET);
         checkFields(2010, 2, 1, 10, 11, 12, null, PST_OFFSET, SECOND, ts);
         assertEquals("2010-02-01T10:11:12-08:00", ts.toString());
         assertEquals("2010-02-01T18:11:12Z", ts.toZString());
 
-        ts = Timestamp.forSecond(2010, 2, 1, 10, 11, 12, null);
+        ts = new Timestamp(2010, 2, 1, 10, 11, 12, null);
         checkFields(2010, 2, 1, 10, 11, 12, null, null, SECOND, ts);
         assertEquals("2010-02-01T10:11:12-00:00", ts.toString());
         assertEquals("2010-02-01T10:11:12Z", ts.toZString());
 
-        BigDecimal frac = new BigDecimal("0.34");
-        BigDecimal decimalSeconds = new BigDecimal("12.34");
-        ts = Timestamp.forSecond(2010, 2, 1, 10, 11, decimalSeconds, PST_OFFSET);
-        checkFields(2010, 2, 1, 10, 11, 12, frac, PST_OFFSET, SECOND, ts);
+        // ===== Test on Timestamp(...) fractional second precise constructor =====
+        BigDecimal fraction = new BigDecimal(".34");
+        ts = new Timestamp(2010, 2, 1, 10, 11, 12, fraction, PST_OFFSET);
+        checkFields(2010, 2, 1, 10, 11, 12, fraction, PST_OFFSET, FRACTION, ts);
+        assertEquals("2010-02-01T10:11:12.34-08:00", ts.toString());
+        assertEquals("2010-02-01T18:11:12.34Z", ts.toZString());
+
+        ts = new Timestamp(2010, 2, 1, 10, 11, 12, fraction, null);
+        checkFields(2010, 2, 1, 10, 11, 12, fraction, null, FRACTION, ts);
+        assertEquals("2010-02-01T10:11:12.34-00:00", ts.toString());
+        assertEquals("2010-02-01T10:11:12.34Z", ts.toZString());
+
+        // This was broken. It had FRACTION precision, but no
+        // fractional data, and didn't equal the same value created other ways.
+        ts = new Timestamp(2010, 2, 1, 10, 11, 12, BigDecimal.ZERO, 0);
+        assertEquals(Timestamp.valueOf("2010-02-01T10:11:12Z"), ts);
+        checkFields(2010, 2, 1, 10, 11, 12, null, 0, SECOND, ts);
+
+        // New static method unifies decimal seconds
+        BigDecimal second = new BigDecimal("12.34");
+        ts = Timestamp.forSecond(2010, 2, 1, 10, 11, second, PST_OFFSET);
+        checkFields(2010, 2, 1, 10, 11, 12, fraction, PST_OFFSET, FRACTION, ts);
         assertEquals("2010-02-01T10:11:12.34-08:00", ts.toString());
         assertEquals("2010-02-01T18:11:12.34Z", ts.toZString());
 
-        ts = Timestamp.forSecond(2010, 2, 1, 10, 11, decimalSeconds, null);
-        checkFields(2010, 2, 1, 10, 11, 12, frac, null, SECOND, ts);
+        ts = Timestamp.forSecond(2010, 2, 1, 10, 11, second, null);
+        checkFields(2010, 2, 1, 10, 11, 12, fraction, null, FRACTION, ts);
         assertEquals("2010-02-01T10:11:12.34-00:00", ts.toString());
         assertEquals("2010-02-01T10:11:12.34Z", ts.toZString());
 
-        decimalSeconds = new BigDecimal("12.");
-        ts = Timestamp.forSecond(2010, 2, 1, 10, 11, decimalSeconds, PST_OFFSET);
+        second = new BigDecimal("12.");
+        ts = Timestamp.forSecond(2010, 2, 1, 10, 11, second, PST_OFFSET);
         checkFields(2010, 2, 1, 10, 11, 12, null, PST_OFFSET, SECOND, ts);
         assertEquals("2010-02-01T10:11:12-08:00", ts.toString());
         assertEquals("2010-02-01T18:11:12Z", ts.toZString());
     }
 
-    /** Test for {@link Timestamp#forMillis(BigDecimal, Integer)} */
+    /** Test for {@link Timestamp#Timestamp(BigDecimal, Integer)} */
     @Test
     public void testNewTimestampFromBigDecimal()
     {
         BigDecimal bigDec = new BigDecimal("1325419950555.123");
 
-        Timestamp ts = Timestamp.forMillis(bigDec, PST_OFFSET);
-        checkFields(2012, 1, 1, 4, 12, 30, new BigDecimal("0.555123"), PST_OFFSET, SECOND, ts);
+        Timestamp ts = new Timestamp(bigDec, PST_OFFSET);
+        checkFields(2012, 1, 1, 4, 12, 30, new BigDecimal("0.555123"), PST_OFFSET, FRACTION, ts);
         assertEquals("2012-01-01T04:12:30.555123-08:00", ts.toString());
         assertEquals("2012-01-01T12:12:30.555123Z", ts.toZString());
 
-        ts = Timestamp.forMillis(bigDec, null);
-        checkFields(2012, 1, 1, 12, 12, 30, new BigDecimal("0.555123"), null, SECOND, ts);
+        ts = new Timestamp(bigDec, null);
+        checkFields(2012, 1, 1, 12, 12, 30, new BigDecimal("0.555123"), null, FRACTION, ts);
         assertEquals("2012-01-01T12:12:30.555123-00:00", ts.toString());
         assertEquals("2012-01-01T12:12:30.555123Z", ts.toZString());
     }
@@ -809,7 +823,7 @@ public void testNewMinimumTimestampFromStringAndMillisIsSame() {
     public void testNewTimestampFromBigDecimalWithMaximumAllowedMillis()
     {
         Timestamp ts = Timestamp.forMillis(MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL.add(BigDecimal.ONE.negate()), PST_OFFSET);
-        checkFields(9999, 12, 31, 15, 59, 59, new BigDecimal("0.999"), PST_OFFSET, SECOND, ts);
+        checkFields(9999, 12, 31, 15, 59, 59, new BigDecimal("0.999"), PST_OFFSET, FRACTION, ts);
         assertEquals("9999-12-31T15:59:59.999-08:00", ts.toString());
         assertEquals("9999-12-31T23:59:59.999Z", ts.toZString());
     }
@@ -853,7 +867,7 @@ public void testNewTimestampFromBigDecimalWithScaleTooBigPositive()
     }
 
     /**
-     * Test for {@link Timestamp#forMillis(BigDecimal, Integer)},
+     * Test for {@link Timestamp#Timestamp(BigDecimal, Integer)},
      * ensuring that varying BigDecimals with different scales produce
      * Timestamps (with correct precision of second/fractional seconds) as
      * expected.
@@ -881,44 +895,44 @@ public void testNewTimestampFromBigDecimalWithDifferentScales()
 
         Timestamp ts;
 
-        ts = Timestamp.forMillis(decScaleNegFour, null);
+        ts = new Timestamp(decScaleNegFour, null);
         checkFields(2012, 1, 1, 12, 12, 30, null, null, SECOND, ts);
 
-        ts = Timestamp.forMillis(decScaleNegThree, null);
+        ts = new Timestamp(decScaleNegThree, null);
         checkFields(2012, 1, 1, 12, 12, 30, null, null, SECOND, ts);
 
-        ts = Timestamp.forMillis(decScaleNegTwo, null);
-        checkFields(2012, 1, 1, 12, 12, 30, new BigDecimal("0.5"), null, SECOND, ts);
+        ts = new Timestamp(decScaleNegTwo, null);
+        checkFields(2012, 1, 1, 12, 12, 30, new BigDecimal("0.5"), null, FRACTION, ts);
 
-        ts = Timestamp.forMillis(decScaleNegOne, null);
-        checkFields(2012, 1, 1, 12, 12, 30, new BigDecimal("0.55"), null, SECOND, ts);
+        ts = new Timestamp(decScaleNegOne, null);
+        checkFields(2012, 1, 1, 12, 12, 30, new BigDecimal("0.55"), null, FRACTION, ts);
 
-        ts = Timestamp.forMillis(decScaleZero, null);
-        checkFields(2012, 1, 1, 12, 12, 30, new BigDecimal("0.555"), null, SECOND, ts);
+        ts = new Timestamp(decScaleZero, null);
+        checkFields(2012, 1, 1, 12, 12, 30, new BigDecimal("0.555"), null, FRACTION, ts);
 
-        ts = Timestamp.forMillis(decScalePosOne, null);
-        checkFields(2012, 1, 1, 12, 12, 30, new BigDecimal("0.5555"), null, SECOND, ts);
+        ts = new Timestamp(decScalePosOne, null);
+        checkFields(2012, 1, 1, 12, 12, 30, new BigDecimal("0.5555"), null, FRACTION, ts);
 
-        ts = Timestamp.forMillis(new BigDecimal("0e3"), null);
+        ts = new Timestamp(new BigDecimal("0e3"), null);
         checkFields(1970, 1, 1, 0, 0, 0, null, null, SECOND, ts);
 
-        ts = Timestamp.forMillis(new BigDecimal("1e3"), null);
+        ts = new Timestamp(new BigDecimal("1e3"), null);
         checkFields(1970, 1, 1, 0, 0, 1, null, null, SECOND, ts);
     }
 
-    /** Test for {@link Timestamp#forMillis(long, Integer)} */
+    /** Test for {@link Timestamp#Timestamp(long, Integer)} */
     @Test
     public void testNewTimestampFromLong()
     {
         long actualMillis = 1265019072340L;
 
-        Timestamp ts = Timestamp.forMillis(actualMillis, PST_OFFSET);
-        checkFields(2010, 2, 1, 2, 11, 12, new BigDecimal("0.340"), PST_OFFSET, SECOND, ts);
+        Timestamp ts = new Timestamp(actualMillis, PST_OFFSET);
+        checkFields(2010, 2, 1, 2, 11, 12, new BigDecimal("0.340"), PST_OFFSET, FRACTION, ts);
         assertEquals("2010-02-01T02:11:12.340-08:00", ts.toString());
         assertEquals("2010-02-01T10:11:12.340Z", ts.toZString());
 
-        ts = Timestamp.forMillis(actualMillis, null);
-        checkFields(2010, 2, 1, 10, 11, 12, new BigDecimal("0.340"), null, SECOND, ts);
+        ts = new Timestamp(actualMillis, null);
+        checkFields(2010, 2, 1, 10, 11, 12, new BigDecimal("0.340"), null, FRACTION, ts);
         assertEquals("2010-02-01T10:11:12.340-00:00", ts.toString());
         assertEquals("2010-02-01T10:11:12.340Z", ts.toZString());
     }
@@ -967,6 +981,11 @@ public void testNewTimestampFromUtcFieldsWithDifferentPrecisions()
 
         p = SECOND;
         ts = Timestamp.createFromUtcFields(p, zyear, zmonth, zday, zhour, zminute, zsecond, zfrac, offset);
+        // 2012-02-03T04:05:06-00:00
+        checkFields(zyear, zmonth, zday, zhour, zminute, zsecond, zfrac, offset, p, ts);
+
+        p = FRACTION;
+        ts = Timestamp.createFromUtcFields(p, zyear, zmonth, zday, zhour, zminute, zsecond, zfrac, offset);
         // 2012-02-03T04:05:06.007-00:00
         checkFields(zyear, zmonth, zday, zhour, zminute, zsecond, zfrac, offset, p, ts);
 
@@ -989,7 +1008,7 @@ public void testNewTimestampFromUtcFieldsWithDifferentOffsets()
         int zminute             = 5;
         int zsecond             = 6;
         BigDecimal zfrac        = new BigDecimal("0.007");
-        Precision p             = SECOND;
+        Precision p             = FRACTION;
 
         // Varying local offsets (in minutes)
         Integer offset;
@@ -1041,7 +1060,7 @@ public void testNewTimestampFromCalendar()
         cal.set(Calendar.YEAR, 2009);
         assertFalse(cal.isSet(Calendar.MONTH));
 
-        Timestamp ts = Timestamp.forCalendar(cal);
+        Timestamp ts = new Timestamp(cal);
         checkFields(2009, 1, 1, 0, 0, 0, null, UNKNOWN_OFFSET, YEAR, ts);
         assertEquals("2009T", ts.toString());
         assertEquals("2009T", ts.toZString());
@@ -1052,7 +1071,7 @@ public void testNewTimestampFromCalendar()
         cal.set(Calendar.MONTH, 2);
         assertFalse(cal.isSet(Calendar.HOUR_OF_DAY));
 
-        ts = Timestamp.forCalendar(cal);
+        ts = new Timestamp(cal);
         checkFields(2009, 3, 1, 0, 0, 0, null, UNKNOWN_OFFSET, MONTH, ts);
         assertEquals("2009-03T", ts.toString());
         assertEquals("2009-03T", ts.toZString());
@@ -1063,7 +1082,7 @@ public void testNewTimestampFromCalendar()
         assertFalse(cal.isSet(Calendar.HOUR_OF_DAY) &&
                     cal.isSet(Calendar.MINUTE));
 
-        ts = Timestamp.forCalendar(cal);
+        ts = new Timestamp(cal);
         checkFields(2009, 3, 18, 0, 0, 0, null, UNKNOWN_OFFSET, DAY, ts);
         assertEquals("2009-03-18", ts.toString());
         assertEquals("2009-03-18", ts.toZString());
@@ -1073,7 +1092,7 @@ public void testNewTimestampFromCalendar()
         cal.set(2009, 1, 1, 10, 11);
         assertFalse(cal.isSet(Calendar.SECOND));
 
-        ts = Timestamp.forCalendar(cal);
+        ts = new Timestamp(cal);
         checkFields(2009, 2, 1, 10, 11, 0, null, 0, MINUTE, ts);
         assertEquals("2009-02-01T10:11Z", ts.toString());
         assertEquals("2009-02-01T10:11Z", ts.toZString());
@@ -1083,7 +1102,7 @@ public void testNewTimestampFromCalendar()
         cal.set(2009, 1, 1, 10, 11, 12);
         assertFalse(cal.isSet(Calendar.MILLISECOND));
 
-        ts = Timestamp.forCalendar(cal);
+        ts = new Timestamp(cal);
         checkFields(2009, 2, 1, 10, 11, 12, null, 0, SECOND, ts);
         assertEquals("2009-02-01T10:11:12Z", ts.toString());
         assertEquals("2009-02-01T10:11:12Z", ts.toZString());
@@ -1094,8 +1113,8 @@ public void testNewTimestampFromCalendar()
         cal.set(Calendar.MILLISECOND, 345);
         assertTrue(cal.isSet(Calendar.MILLISECOND));
 
-        ts = Timestamp.forCalendar(cal);
-        checkFields(2009, 2, 1, 10, 11, 12, new BigDecimal("0.345"), 0, SECOND, ts);
+        ts = new Timestamp(cal);
+        checkFields(2009, 2, 1, 10, 11, 12, new BigDecimal("0.345"), 0, FRACTION, ts);
         assertEquals("2009-02-01T10:11:12.345Z", ts.toString());
         assertEquals("2009-02-01T10:11:12.345Z", ts.toZString());
 
@@ -1106,8 +1125,8 @@ public void testNewTimestampFromCalendar()
         cal.setTimeZone(TimeZone.getTimeZone("PST"));
         assertEquals(TimeZone.getTimeZone("PST"), cal.getTimeZone());
 
-        ts = Timestamp.forCalendar(cal);
-        checkFields(2009, 2, 1, 10, 11, 12, new BigDecimal("0.345"), PST_OFFSET, SECOND, ts);
+        ts = new Timestamp(cal);
+        checkFields(2009, 2, 1, 10, 11, 12, new BigDecimal("0.345"), PST_OFFSET, FRACTION, ts);
         assertEquals("2009-02-01T10:11:12.345-08:00", ts.toString());
         assertEquals("2009-02-01T18:11:12.345Z", ts.toZString());
 
@@ -1117,8 +1136,8 @@ public void testNewTimestampFromCalendar()
         cal.set(Calendar.MILLISECOND, 345);
         cal.set(Calendar.ZONE_OFFSET, -28800000);
 
-        ts = Timestamp.forCalendar(cal);
-        checkFields(2009, 2, 1, 10, 11, 12, new BigDecimal("0.345"), PST_OFFSET, SECOND, ts);
+        ts = new Timestamp(cal);
+        checkFields(2009, 2, 1, 10, 11, 12, new BigDecimal("0.345"), PST_OFFSET, FRACTION, ts);
         assertEquals("2009-02-01T10:11:12.345-08:00", ts.toString());
         assertEquals("2009-02-01T18:11:12.345Z", ts.toZString());
     }
@@ -1132,14 +1151,14 @@ public void testFromCalendarWithDaylightSavingsTime()
         cal.set(2012, 2, 9, 10, 11, 12);
         cal.set(Calendar.MILLISECOND, 345);
         cal.setTimeZone(TimeZone.getTimeZone("PST"));
-        Timestamp ts = Timestamp.forCalendar(cal);
-        checkFields(2012, 3, 9, 10, 11, 12, new BigDecimal("0.345"), PST_OFFSET, SECOND, ts);
+        Timestamp ts = new Timestamp(cal);
+        checkFields(2012, 3, 9, 10, 11, 12, new BigDecimal("0.345"), PST_OFFSET, FRACTION, ts);
         assertEquals("2012-03-09T10:11:12.345-08:00", ts.toString());
 
         // Move forward into daylight savings
         cal.add(Calendar.DAY_OF_MONTH, 5);
-        ts = Timestamp.forCalendar(cal);
-        checkFields(2012, 3, 14, 10, 11, 12, new BigDecimal("0.345"), -420, SECOND, ts);
+        ts = new Timestamp(cal);
+        checkFields(2012, 3, 14, 10, 11, 12, new BigDecimal("0.345"), -420, FRACTION, ts);
         assertEquals("2012-03-14T10:11:12.345-07:00", ts.toString());
     }
 
@@ -1149,24 +1168,36 @@ public void testNewTimestampFromClearCalendar()
     {
         Calendar cal = makeUtcCalendar();
         cal.clear();
-        Timestamp.forCalendar(cal);
+        new Timestamp(cal);
     }
 
-    @SuppressWarnings("deprecation")
+
+    @Test
+    public void testTimestampWithNegativeFraction()
+    {
+        BigDecimal frac = Decimal.negativeZero(3);
+
+        Timestamp ts = new Timestamp(2000, 11, 14, 17, 30, 12, frac, 0);
+        Timestamp expected = Timestamp.valueOf("2000-11-14T17:30:12.000Z");
+        assertEquals(expected, ts);
+        assertEquals(expected.hashCode(), ts.hashCode());
+
+        frac = new BigDecimal("-0.123");
+        ts = new Timestamp(2000, 11, 14, 17, 30, 12, frac, 0);
+        assertEquals("2000-11-14T17:30:12.123Z", ts.toString());
+    }
+
+
     private void checkFraction(String textOfFrac, BigDecimal frac)
     {
         Timestamp expected =
             Timestamp.valueOf("2000-11-14T17:30:12" + textOfFrac + "Z");
 
-        // negative fractions are not meaningful for checking second construction
-        if (frac.signum() >= 0) {
-            BigDecimal seconds = BigDecimal.valueOf(12).add(frac);
-            Timestamp ts = Timestamp.forSecond(2000, 11, 14, 17, 30, seconds, 0);
-            assertEquals(expected, ts);
-            assertEquals("hash code", expected.hashCode(), ts.hashCode());
-        }
+        Timestamp ts = new Timestamp(2000, 11, 14, 17, 30, 12, frac, 0);
+        assertEquals(expected, ts);
+        assertEquals("hash code", expected.hashCode(), ts.hashCode());
 
-        Timestamp ts = createFromUtcFields(SECOND, 2000, 11, 14, 17, 30, 12, frac,
+        ts = createFromUtcFields(FRACTION, 2000, 11, 14, 17, 30, 12, frac,
                                  UTC_OFFSET);
         assertEquals(expected, ts);
         assertEquals("hash code", expected.hashCode(), ts.hashCode());
@@ -1189,9 +1220,14 @@ public void testTimestampWithDecimalFraction()
     public void testNewTimestampWithLargeFraction()
     {
         BigDecimal frac = new BigDecimal("1.23");
+        try {
+            new Timestamp(2000, 11, 14, 17, 30, 12, frac, 0);
+            fail("Expected exception");
+        }
+        catch (IllegalArgumentException e) { }
 
         try {
-            Timestamp.createFromUtcFields(SECOND,
+            Timestamp.createFromUtcFields(FRACTION,
                                           2000, 11, 14, 17, 30, 12, frac, 0);
             fail("Expected exception");
         }
@@ -1345,8 +1381,12 @@ public void testForSqlTimestampZ()
         assertEquals(now.getTime(), ts.getMillis());
         assertEquals(Timestamp.UTC_OFFSET, ts.getLocalOffset());
 
+        BigDecimal frac = ts.getFractionalSecond();
+        frac = frac.movePointRight(9); // Convert to nanos
+        assertEquals("nanos", now.getNanos(), frac.intValue());
+
         BigDecimal second = BigDecimal.valueOf(ts.getSecond());
-        BigDecimal frac = ts.getDecimalSecond().subtract(second);
+        frac = ts.getDecimalSecond().subtract(second);
         frac = frac.movePointRight(9); // Convert to nanos
         assertEquals("nanos", now.getNanos(), frac.intValue());
 
@@ -1396,7 +1436,6 @@ public void testLocalYearBoundaryNegative() {
     }
 
     @Test
-    @SuppressWarnings("deprecation")
     public void testTimestampCopyConstructor()
     {
         BigDecimal second = new BigDecimal("12.3456789");
@@ -1406,18 +1445,19 @@ public void testTimestampCopyConstructor()
                      expectedTs.toString());
 
         //===== Test on Timestamp(...) fractional precision copy-constructor =====
-        Timestamp actualTs = Timestamp.forSecond(expectedTs.getYear(),
-                                                 expectedTs.getMonth(),
-                                                 expectedTs.getDay(),
-                                                 expectedTs.getHour(),
-                                                 expectedTs.getMinute(),
-                                                 expectedTs.getDecimalSecond(),
-                                                 expectedTs.getLocalOffset());
+        Timestamp actualTs = new Timestamp(expectedTs.getYear(),
+                                           expectedTs.getMonth(),
+                                           expectedTs.getDay(),
+                                           expectedTs.getHour(),
+                                           expectedTs.getMinute(),
+                                           expectedTs.getSecond(),
+                                           expectedTs.getFractionalSecond(),
+                                           expectedTs.getLocalOffset());
         assertEquals(expectedTs, actualTs);
 
         //===== Test on Timestamp.createFromUtcFields(...) copy-constructor =====
         actualTs = Timestamp
-            .createFromUtcFields(expectedTs.getPrecision(),
+            .createFromUtcFields(Precision.FRACTION,
                                  expectedTs.getZYear(),
                                  expectedTs.getZMonth(),
                                  expectedTs.getZDay(),
@@ -1448,10 +1488,10 @@ public void testNegativeEpochWithFractionalSeconds()
             new BigDecimal("-9223372036854.775808");
 
         Timestamp expectedTs =
-            Timestamp.forMillis(negativeEpochDecimalMillis, UTC_OFFSET);
+            new Timestamp(negativeEpochDecimalMillis, UTC_OFFSET);
         long expectedMillis = expectedTs.getMillis();
         Timestamp expectedTsMillis =
-            Timestamp.forMillis(expectedMillis, UTC_OFFSET);
+            new Timestamp(expectedMillis, UTC_OFFSET);
         Timestamp expectedTsMillisWithNanosPrecision =
             Timestamp.valueOf("1677-09-21T00:12:43.145000000Z");
 
@@ -1480,12 +1520,12 @@ public void testNegativeEpochWithFractionalSeconds()
 
 
         //===== Test on Timestamp(BigDecimal, Integer) constructor =====
-        Timestamp actualTs = Timestamp.forMillis(negativeEpochDecimalMillis, UTC_OFFSET);
+        Timestamp actualTs = new Timestamp(negativeEpochDecimalMillis, UTC_OFFSET);
         assertEquals(expectedTs, actualTs);
 
 
         //===== Test on Timestamp(long, Integer) constructor =====
-        actualTs = Timestamp.forMillis(expectedMillis, UTC_OFFSET);
+        actualTs = new Timestamp(expectedMillis, UTC_OFFSET);
         assertEquals(expectedTsMillis, actualTs);
 
 
@@ -1736,7 +1776,6 @@ public void testAdjustYearOutsideMinRange()
     public void testAddMonth()
     {
         TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
-            @Override
             public Timestamp invoke(Timestamp input, Number amount) {
                 return input.addMonth(amount.intValue());
             }
@@ -1771,7 +1810,6 @@ public Timestamp invoke(Timestamp input, Number amount) {
     public void testAdjustMonth()
     {
         TimestampArithmeticInvoker invoker = new TimestampArithmeticInvoker() {
-            @Override
             public Timestamp invoke(Timestamp input, Number amount) {
                 return input.adjustMonth(amount.intValue());
             }
@@ -2906,9 +2944,10 @@ public void testMillisIsIndepedentOfOffset() throws ParseException {
         assertEquals(t1.getDecimalMillis(), t2.getDecimalMillis());
     }
 
-    @Ignore // TODO ion-java#165
+    @Ignore
     @Test
     public void testInstantVsTimestampMillis() {
+        /* If ion-java migrates to Java 8, which added Instant, this test becomes valid.
         // addresses: https://github.com/amzn/ion-java/issues/165
         String tsText = "0001-01-01T00:00:00.000Z";
         // Instant extends the Gregorian calendar system all the way back to the beginning, whereas Timestamp uses
@@ -2916,7 +2955,7 @@ public void testInstantVsTimestampMillis() {
         // result, the two map from milliseconds to date differently before 1582, as demonstrated below.
         long millisFromInstant = Instant.parse(tsText).toEpochMilli();
         long millisFromTimestamp = Timestamp.valueOf(tsText).getMillis();
-        assertTrue(millisFromInstant != millisFromTimestamp);
+        assertNotEquals(millisFromInstant, millisFromTimestamp);
         // However, the discrepancy can be avoided by using Timestamp.forCalendar, which always respects the given
         // Calendar's method for determining leap years.
         Timestamp ts1 = Timestamp.forCalendar(GregorianCalendar.from(Instant.parse(tsText).atZone(ZoneId.of("UTC"))));
@@ -2928,5 +2967,6 @@ public void testInstantVsTimestampMillis() {
         // values are roundtripped unchanged.
         assertEquals(millisFromInstant, ts1.getMillis());
         assertEquals(millisFromTimestamp, ts2.getMillis());
+        */
     }
 }
diff --git a/test/software/amazon/ion/TrBwBrProcessingTest.java b/test/com/amazon/ion/TrBwBrProcessingTest.java
similarity index 66%
rename from test/software/amazon/ion/TrBwBrProcessingTest.java
rename to test/com/amazon/ion/TrBwBrProcessingTest.java
index 42d87d35ac..f49cfca0d5 100644
--- a/test/software/amazon/ion/TrBwBrProcessingTest.java
+++ b/test/com/amazon/ion/TrBwBrProcessingTest.java
@@ -1,22 +1,22 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.IonReader;
 
 /**
  * Tests TextReader - BinaryWriter - BinaryReader
@@ -31,7 +31,9 @@ protected void prepare(String text)
         myMissingSymbolTokensHaveText = false;
 
         IonReader textReader = system().newSystemReader(text);
-        myBytes = writeBinaryBytes(textReader);
+        IonBinaryWriter binaryWriter = system().newBinaryWriter();
+        binaryWriter.writeValues(textReader);
+        myBytes = binaryWriter.getBytes();
     }
 
     @Override
diff --git a/test/software/amazon/ion/TrueSequenceTestCase.java b/test/com/amazon/ion/TrueSequenceTestCase.java
similarity index 91%
rename from test/software/amazon/ion/TrueSequenceTestCase.java
rename to test/com/amazon/ion/TrueSequenceTestCase.java
index b9d1e0bb63..22ef0a8708 100644
--- a/test/software/amazon/ion/TrueSequenceTestCase.java
+++ b/test/com/amazon/ion/TrueSequenceTestCase.java
@@ -1,32 +1,26 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion;
+package com.amazon.ion;
 
+import com.amazon.ion.impl._Private_IonValue;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import org.junit.Test;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.impl.PrivateIonValue;
 
 
 /**
@@ -88,7 +82,7 @@ public void testNullSequenceIndexedAddAll()
 
 
     /**
-     *  TODO amzn/ion-java#47  Implement indexed addAll for datagram
+     *  TODO amzn/ion-java/issues/47  Implement indexed addAll for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -161,7 +155,7 @@ public void testIndexedAddAll(IonSequence seq)
 
 
     /**
-     *  TODO amzn/ion-java#50 Implement set for datagram
+     *  TODO amzn/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -207,14 +201,14 @@ private void set(IonSequence s, int index)
         assertSame(origElement, removed);
         assertEquals(null, removed.getContainer());
 
-        assertEquals(index, ((PrivateIonValue)newElement).getElementId());
+        assertEquals(index, ((_Private_IonValue)newElement).getElementId());
 
         assertEquals(expectedElements, s);
     }
 
 
     /**
-     *  TODO amzn/ion-java#50 Implement set for datagram
+     *  TODO amzn/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -226,7 +220,7 @@ public void testSetNullElement()
 
 
     /**
-     *  TODO amzn/ion-java#50 Implement set for datagram
+     *  TODO amzn/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -240,7 +234,7 @@ public void testSetContainedValue()
 
 
     /**
-     *  TODO amzn/ion-java#50 Implement set for datagram
+     *  TODO amzn/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -253,7 +247,7 @@ public void testSetDatagram()
 
 
     /**
-     *  TODO amzn/ion-java#50 Implement set for datagram
+     *  TODO amzn/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -267,7 +261,7 @@ public void testSetReadOnlyChild()
 
 
     /**
-     *  TODO amzn/ion-java#50 Implement set for datagram
+     *  TODO amzn/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -281,7 +275,7 @@ public void testSetReadOnlyContainer()
 
 
     /**
-     *  TODO amzn/ion-java#50 Implement set for datagram
+     *  TODO amzn/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
diff --git a/test/software/amazon/ion/ValueFactorySequenceTest.java b/test/com/amazon/ion/ValueFactorySequenceTest.java
similarity index 77%
rename from test/software/amazon/ion/ValueFactorySequenceTest.java
rename to test/com/amazon/ion/ValueFactorySequenceTest.java
index efa8bc4aba..63d227eab9 100644
--- a/test/software/amazon/ion/ValueFactorySequenceTest.java
+++ b/test/com/amazon/ion/ValueFactorySequenceTest.java
@@ -1,27 +1,25 @@
+
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion;
 
+package com.amazon.ion;
+
+import com.amazon.ion.junit.Injected.Inject;
+import java.util.Collection;
 import org.junit.Before;
 import org.junit.Test;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonSexp;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.ValueFactory;
-import software.amazon.ion.junit.Injected.Inject;
 
 public class ValueFactorySequenceTest
     extends IonTestCase
@@ -29,6 +27,7 @@ public class ValueFactorySequenceTest
     private static abstract class SequenceMaker<S extends IonSequence>
     {
         ValueFactory factory;
+        abstract S newSeq(Collection<? extends IonValue> values);
         abstract S newSeq(IonSequence child);
         abstract S newSeq(IonValue... children);
     }
@@ -37,6 +36,13 @@ private static class ListMaker extends SequenceMaker<IonList>
     {
         @Override public String toString() { return "LIST"; }
 
+        @Override
+        @SuppressWarnings("deprecation")
+        IonList newSeq(Collection<? extends IonValue> values)
+        {
+            return factory.newList(values);
+        }
+
         @Override
         IonList newSeq(IonSequence child)
         {
@@ -54,6 +60,13 @@ private static class SexpMaker extends SequenceMaker<IonSexp>
     {
         @Override public String toString() { return "SEXP"; }
 
+        @Override
+        @SuppressWarnings("deprecation")
+        IonSexp newSeq(Collection<? extends IonValue> values)
+        {
+            return factory.newSexp(values);
+        }
+
         @Override
         IonSexp newSeq(IonSequence child)
         {
diff --git a/test/software/amazon/ion/facet/FacetsTest.java b/test/com/amazon/ion/facet/FacetsTest.java
similarity index 87%
rename from test/software/amazon/ion/facet/FacetsTest.java
rename to test/com/amazon/ion/facet/FacetsTest.java
index 29b9cd75ea..27d2b0e359 100644
--- a/test/software/amazon/ion/facet/FacetsTest.java
+++ b/test/com/amazon/ion/facet/FacetsTest.java
@@ -1,27 +1,27 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.facet;
+package com.amazon.ion.facet;
 
+import static com.amazon.ion.facet.Facets.asFacet;
+import static com.amazon.ion.facet.Facets.assumeFacet;
 import static org.junit.Assert.assertSame;
-import static software.amazon.ion.facet.Facets.asFacet;
-import static software.amazon.ion.facet.Facets.assumeFacet;
 
+import com.amazon.ion.Span;
 import org.junit.Test;
-import software.amazon.ion.Span;
-import software.amazon.ion.facet.Faceted;
-import software.amazon.ion.facet.UnsupportedFacetException;
+
 
 public class FacetsTest
 {
diff --git a/test/software/amazon/ion/impl/BinaryWriterTest.java b/test/com/amazon/ion/impl/BinaryWriterTest.java
similarity index 90%
rename from test/software/amazon/ion/impl/BinaryWriterTest.java
rename to test/com/amazon/ion/impl/BinaryWriterTest.java
index b7f51f8c1b..f2d287859f 100644
--- a/test/software/amazon/ion/impl/BinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/BinaryWriterTest.java
@@ -1,32 +1,33 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.junit.IonAssert;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import org.junit.Assert;
 import org.junit.Test;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.junit.IonAssert;
 
 public class BinaryWriterTest
     extends OutputStreamWriterTestCase
@@ -44,7 +45,7 @@ public void testWriteSymbolWithLockedSymtab()
         throws Exception
     {
         iw = makeWriter();
-        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java#8
+        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java/issues/8
         iw.getSymbolTable().makeReadOnly();
         thrown.expect(IonException.class);
         iw.writeSymbol("s");
@@ -55,7 +56,7 @@ public void testAddTypeAnnotationWithLockedSymtab()
         throws Exception
     {
         iw = makeWriter();
-        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java#8
+        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java/issues/8
         iw.getSymbolTable().makeReadOnly();
         thrown.expect(IonException.class);
         iw.addTypeAnnotation("a");
@@ -66,7 +67,7 @@ public void testSetFieldNameWithLockedSymtab()
         throws Exception
     {
         iw = makeWriter();
-        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java#8
+        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java/issues/8
         iw.getSymbolTable().makeReadOnly();
         iw.stepIn(IonType.STRUCT);
         thrown.expect(IonException.class);
@@ -119,7 +120,7 @@ public void testFlushingUnlockedSymtab()
     throws Exception
     {
         iw = makeWriter();
-        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java#8
+        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java/issues/8
         SymbolTable symtab = iw.getSymbolTable();
         symtab.intern("fred_1");
         symtab.intern("fred_2");
diff --git a/test/software/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java b/test/com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
similarity index 89%
rename from test/software/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
rename to test/com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
index 6997522fcb..debc65c925 100644
--- a/test/software/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
+++ b/test/com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
@@ -1,33 +1,35 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.impl.PrivateUtils.EMPTY_STRING_ARRAY;
-import static software.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
-import static software.amazon.ion.impl.Symtabs.LOCAL_SYMBOLS_ABC;
-import static software.amazon.ion.impl.Symtabs.makeLocalSymtab;
+import static com.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
+import static com.amazon.ion.impl.Symtabs.LOCAL_SYMBOLS_ABC;
+import static com.amazon.ion.impl.Symtabs.makeLocalSymtab;
+import static com.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY;
 
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
 import java.io.ByteArrayOutputStream;
 import org.junit.After;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.system.IonBinaryWriterBuilder;
+
 
 public class BinaryWriterWithLocalSymtabsTest
     extends IonTestCase
diff --git a/test/com/amazon/ion/impl/ByteBufferTest.java b/test/com/amazon/ion/impl/ByteBufferTest.java
new file mode 100644
index 0000000000..aa93de6494
--- /dev/null
+++ b/test/com/amazon/ion/impl/ByteBufferTest.java
@@ -0,0 +1,399 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.impl.IonBinary.BufferManager;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Random;
+import org.junit.After;
+import org.junit.Test;
+
+
+public class ByteBufferTest
+    extends IonTestCase
+{
+    @Override @After
+    public void tearDown()
+        throws Exception
+    {
+        super.tearDown();
+        BlockedBuffer.resetParameters();
+    }
+
+    @Test
+    public void testSmallInsertion()
+    {
+        BufferManager buf = new BufferManager();
+        IonBinary.Writer writer = buf.openWriter();
+
+        // Write enough data to overflow the first block
+        byte[] initialData = new byte[BlockedBuffer._defaultBlockSizeMin + 5];
+
+        // Now insert some stuff at the beginning
+        try {
+            writer.write(initialData, 0, initialData.length);
+            writer.setPosition(0);
+            writer.insert(10);
+        }
+        catch (IOException e) {
+            throw new IonException(e);
+        }
+    }
+
+    @Test
+    public void testUnicodeCodepointOverflow() {
+        BufferManager buf = new BufferManager ();
+        IonBinary.Writer writer = buf.openWriter();
+
+        try {
+            writer.writeStringData(new String(new char[] { 0xd799 }, 0, 1));
+            writer.writeStringData(new String(new char[] { 0xe000 }, 0, 1));
+        } catch (Exception e) {
+            fail("Unexpected exception: " + e.getMessage());
+        }
+        try {
+            writer.writeStringData(new String(new char[] { 0xd800 }, 0, 1));
+            fail("Successfully parsed a partial surrogate");
+        } catch (Exception e) {
+        }
+        try {
+            writer.writeStringData(new String(new char[] { 0xdfff}, 0, 1));
+            fail("Successfully parsed a partial surrogate");
+        } catch (Exception e) {
+        }
+    }
+
+    @Test
+    public void testUnicodeCodepointOverflowStatic() {
+        OutputStream os = new ByteArrayOutputStream();
+        try {
+            IonBinary.writeString(os, new String(new char[] { 0xd799 }, 0, 1));
+            IonBinary.writeString(os, new String(new char[] { 0xe000 }, 0, 1));
+            // surrogates
+            IonBinary.writeString(os, new String(new char[] { 0xd800, 0xdc00 }, 0, 2));
+            IonBinary.writeString(os, new String(new char[] { 0xdbff, 0xdfff }, 0, 2));
+        } catch (Exception e) {
+            throw new IonException(e);
+        }
+        try {
+            IonBinary.writeString(os, new String(new int[] { 0xd800 }, 0, 1));
+            fail("Successfully parsed a partial surrogate");
+        } catch (Exception e) {
+        }
+        try {
+            IonBinary.writeString(os, new String(new int[] { 0xdfff}, 0, 1));
+            fail("Successfully parsed a partial surrogate");
+        } catch (Exception e) {
+        }
+    }
+
+    @Test
+    public void testLargeInsertion()
+    {
+        BufferManager buf = new BufferManager ();
+        IonBinary.Writer writer = buf.openWriter();
+
+        // Write enough data to overflow the first block
+        byte[] initialData = new byte[BlockedBuffer._defaultBlockSizeMin + 5];
+
+        // Now insert lots of stuff at the beginning
+        try {
+            writer.write(initialData, 0, initialData.length);
+            writer.setPosition(0);
+            writer.insert(5000);
+        }
+        catch (IOException e) {
+            throw new IonException(e);
+        }
+    }
+
+    @Test
+    public void testRandomUpdatesSmall() throws Exception
+    {
+        testRandomUpdates(7, 19, 100);
+    }
+
+    @Test
+    public void testRandomUpdatesMedium() throws Exception
+    {
+        testRandomUpdates(128, 4096, 1000);
+    }
+
+    @Test
+    public void testRandomUpdatesLarge()  throws Exception
+    {
+        testRandomUpdates(32*1024, 32*1024, 1000);
+    }
+
+    final static boolean _debug_long_test = false;
+
+    @Test
+    public void testRandomUpdatesLargeAndLong()  throws Exception
+    {
+        // TODO: turn on a long test, maybe not this long, when we can know it's
+        //       not going to be oppressive
+        if (!_debug_long_test) return;
+        testRandomUpdates(7, 19, 100000);
+    }
+
+    @Test
+    public void testPreviousFailuresInRandomUpdates() throws Exception
+    {
+        testRandomUpdates(128, 4096, 1000, 1230074384739L);
+    }
+
+    private void testRandomUpdates(int min, int max, int count) throws Exception
+    {
+    	long seed = System.currentTimeMillis();
+    	testRandomUpdates(min, max, count, seed);
+    }
+
+    private void testRandomUpdates(int min, int max, int count, long seed) throws Exception
+    {
+        BlockedBuffer.setBlockSizeParameters(min, max); // make it work hard
+
+        testByteBuffer testBuf = new testByteBuffer();
+
+        BlockedBuffer blocked = new BlockedBuffer();
+        BlockedBuffer.BlockedByteOutputStream blkout = new BlockedBuffer.BlockedByteOutputStream(blocked);
+        BlockedBuffer.BlockedByteInputStream  blkin = new BlockedBuffer.BlockedByteInputStream(blocked);
+
+
+        final boolean debug_output = false;
+        final boolean checkedOften = false;
+        final boolean checkContentsEverytime = false;
+
+        final int max_update = 1000;
+        final int rep_count  = count;
+
+        final int choiceCheck  = 0;
+        final int choiceAppend = 1;
+        final int choiceInsert = 2;
+        final int choiceRemove = 3;
+        final int choiceWrite  = 4;
+
+        Random r = new Random(seed);
+        if (debug_output) System.out.println("seed: " + seed);
+
+        byte[]  data = new byte[max_update];
+        int     val = -1, len = -1, pos = 0;
+        boolean justChecked = false;
+
+        try {
+            for (int ii=0; ii<rep_count; ii++) {
+                int choice = r.nextInt(5);
+                if (checkedOften && !justChecked) choice = choiceCheck;
+
+                switch(choice) {
+                    case choiceCheck: // check
+                        // check doesn't need anything else
+                        if (justChecked) continue;
+                        justChecked = true;
+                        break;
+
+                    case choiceInsert: // insert
+                    case choiceRemove: // remove
+                    case choiceWrite:  // write
+                        justChecked = false;
+                        if (testBuf.limit() < 1) continue;
+                        pos = r.nextInt(testBuf.limit());
+                        break;
+                    case choiceAppend: // append
+                        justChecked = false;
+                        pos = testBuf.limit();
+                        break;
+                    default:
+                        assert "" == "this is a bad case in a switch statement";
+                        throw new RuntimeException("switch case error!");
+                }
+
+
+                switch(choice) {
+                    case choiceCheck: // check
+                        break;
+
+                    case choiceInsert: // insert
+                    case choiceRemove: // remove
+                    case choiceWrite:  // write
+                    case choiceAppend: // append
+                        len = r.nextInt(max_update);
+                        if (choice != choiceRemove) {
+                            // every choice except remove needs a prep'd buffer
+                            val = r.nextInt(32);
+                            val |= (choice << 5);
+                            for (int jj=0; jj<len; jj++) {
+                                data[jj] = (byte)(0xff & val);
+                            }
+                        }
+                        // position the buffers for the operation
+                        testBuf.position(pos);
+                        // old: buf.positionForWrite(pos);
+                        blkout.setPosition(pos);
+                        break;
+                }
+
+                switch(choice) {
+                    case choiceCheck: // check
+                        if (debug_output) System.out.println("check "+testBuf.limit());
+                        // old: assert testBuf.limit() == buf.size();
+                        if (!checkContentsEverytime && r.nextInt(1000) < 990) break; // don't do this too often
+                        if (testBuf.limit() > 0) {
+                            testBuf.position(0);
+                            // old: buf.positionForRead(0);
+                            blkin.sync();
+                            blkin.setPosition(0);
+                            for (int jj = 0; jj<testBuf.limit(); jj++) {
+                                int bt = testBuf.read();
+                                // buf: int br = buf.read();
+                                int bk = blkin.read();
+                                if (jj > 32688 && jj < 32690) {
+                                    // old: assert (byte)(bt & 0xff) == (byte)(br & 0xff);
+                                    assert (byte)(bt & 0xff) == (byte)(bk & 0xff);
+                                }
+                                else {
+                                    // old: assert (byte)(bt & 0xff) == (byte)(br & 0xff);
+                                    assert (byte)(bt & 0xff) == (byte)(bk & 0xff);
+                                }
+                            }
+                            // old: buf._validate();
+                            blkin._validate();
+                        }
+                        break;
+                    case choiceAppend: // append
+                        if (debug_output) System.out.println("append "+len+" of "+val+" at "+pos);
+                        testBuf.write(data, len);
+                        // old: buf.write(data, 0, len);
+                        blkout.write(data, 0, len);
+                        break;
+                    case choiceInsert: // insert
+                        if (debug_output) System.out.println("insert "+len+" of "+val+" at "+pos);
+                        testBuf.insert(data, len);
+                        // old: buf.insert(len);
+                        // old: buf.write(data, 0, len);
+                        blkout.insert(data, 0, len);
+                        break;
+                    case choiceRemove: // remove
+                        if (pos + len > testBuf.limit()) {
+                            if (r.nextInt(100) < 90) break;
+                            len = testBuf.limit() - pos;
+                        }
+                        if (debug_output) System.out.println("remove "+len+" at "+pos);
+                        testBuf.remove(len);
+                        // old: buf.remove(len);
+                        blkout.remove(len);
+                        break;
+                    case choiceWrite: // write
+                        if (pos + len > testBuf.limit()) {
+                            if (r.nextInt(100) < 90) break;
+                            len = testBuf.limit() - pos;
+                        }
+                        if (debug_output) System.out.println("write "+len+" of "+val+" at "+pos);
+                        testBuf.write(data, len);
+                        // old: buf.write(data, 0, len);
+                        blkout.write(data, 0, len);
+                        break;
+                    default:
+                        assert "" == "this is a bad case in a switch statement";
+                    throw new RuntimeException("switch case error!");
+                }
+            }
+        }
+        catch (Exception e) {
+            throw new RuntimeException("FAILED with seed: " + seed, e);
+        }
+        catch (Error e) {
+            throw new RuntimeException("FAILED with seed: " + seed, e);
+        }
+    }
+
+    static public class testByteBuffer
+    {
+        static final int startingBufferSize = 16;
+        int    _position;
+        int    _inUse;
+        byte[] _buf;
+
+        public testByteBuffer() {
+            this._buf = new byte[startingBufferSize];
+        }
+
+        void expand(int newlen) {
+            int len = this._buf.length;
+            while (len < newlen) {
+                len *= 2;
+            }
+            if (len > this._buf.length) {
+                byte[] newbuf = new byte[len];
+                System.arraycopy(this._buf, 0, newbuf, 0, this._inUse);
+                this._buf = newbuf;
+            }
+        }
+        public int limit() { return this._inUse; }
+        public int position(int pos) {
+            assert (pos >= 0 && pos <= _inUse);
+            this._position = pos;
+            return this._position;
+        }
+        public int insert(byte[] data, int len) {
+            position(this._position);
+            int newEnd = this._inUse + len;
+            expand(newEnd);
+            System.arraycopy(this._buf, this._position
+                            ,this._buf, this._position + len, this._inUse - this._position);
+            System.arraycopy(data, 0, this._buf, this._position, len);
+            this._position += len;
+            this._inUse += len;
+            return len;
+        }
+        public int remove(int len) {
+            position(this._position);
+            assert (this._position + len <= this._inUse);
+            System.arraycopy(this._buf, this._position + len
+                            ,this._buf, this._position, this._inUse - (this._position + len));
+            this._inUse -= len;
+            return len;
+        }
+        public int read() {
+            position(this._position);
+            assert(this._position + 1 <= this._inUse);
+            int ret = this._buf[this._position];
+            this._position++;
+            return ret;
+        }
+        public byte[] read(int len) {
+            position(this._position);
+            assert(this._position + len <= this._inUse);
+            byte[] ret = new byte[len];
+            System.arraycopy(this._buf, this._position, ret, 0, len);
+            this._position += len;
+            return ret;
+        }
+        public int write(byte[] data, int len) {
+            assert(data.length >= len);
+            position(this._position);
+            int endWrite = this._position + len;
+            expand(endWrite);
+            System.arraycopy(data, 0, this._buf, this._position, len);
+            this._position = endWrite;
+            if (this._position > this._inUse) this._inUse = this._position;
+            return len;
+        }
+    }
+}
diff --git a/test/com/amazon/ion/impl/CharacterReaderTest.java b/test/com/amazon/ion/impl/CharacterReaderTest.java
new file mode 100644
index 0000000000..6181a7ac47
--- /dev/null
+++ b/test/com/amazon/ion/impl/CharacterReaderTest.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonTestCase;
+import java.io.IOException;
+import java.io.StringReader;
+import org.junit.Test;
+
+/**
+ * Test cases for {@link IonCharacterReader}.
+ */
+public class CharacterReaderTest extends IonTestCase
+{
+    public static IonCharacterReader createReader( final String data, final int size ) {
+        StringReader in = new StringReader( data );
+        return new IonCharacterReader( in, size );
+    }
+
+    public static IonCharacterReader createReader( final StringBuilder data, final int size ) {
+        return createReader( data.toString(), size );
+    }
+
+    @Test
+    public void testEmpty() throws Exception {
+        IonCharacterReader in = createReader( "", 1 );
+        assertTrue( in.read() == -1 );
+        assertTrue( in.getConsumedAmount() == 0 );
+        assertTrue( in.getColumn() == 0 );
+        assertTrue( in.getLineNumber() == 1 );
+    }
+
+    @Test
+    public void testEmptyMultipleRead() throws Exception {
+        IonCharacterReader in = createReader( "", 1 );
+        assertTrue( in.read() == -1 );
+        assertTrue( in.read() == -1 );
+    }
+
+    @Test
+    public void testEmptyUnreadEOF() throws Exception {
+        IonCharacterReader in = createReader( "", 1 );
+        assertTrue( in.read() == -1 );
+        in.unread( -1 );
+        assertTrue( in.read() == -1 );
+    }
+
+    @Test
+    public void testSingleRead() throws Exception {
+        IonCharacterReader in = createReader( "A", 1 );
+
+        int read = in.read();
+        assertTrue( read == 'A' );
+        assertTrue( in.getConsumedAmount() == 1 );
+        assertTrue( in.getColumn() == 1 );
+        assertTrue( in.getLineNumber() == 1 );
+
+        assertTrue( in.read() == -1 );
+        assertTrue( in.getConsumedAmount() == 1 );
+        assertTrue( in.getColumn() == 1 );
+        assertTrue( in.getLineNumber() == 1 );
+    }
+
+    @Test
+    public void testSingleUnread() throws Exception {
+        IonCharacterReader in = createReader( "B", 1 );
+
+        int read = in.read();
+
+        in.unread( read );
+        assertTrue( in.getConsumedAmount() == 0 );
+        assertTrue( in.getColumn() == 0 );
+        assertTrue( in.getLineNumber() == 1 );
+
+        assertTrue( in.read() == read );
+        assertTrue( in.getConsumedAmount() == 1 );
+        assertTrue( in.getColumn() == 1 );
+        assertTrue( in.getLineNumber() == 1 );
+    }
+
+    @Test
+    public void testSingleUnreadCarriageReturn() throws Exception {
+        IonCharacterReader in = createReader( "B", 1 );
+
+        try {
+            in.unread( '\r' );
+            fail();
+        } catch ( final IOException e ) {}
+    }
+
+    @Test
+    public void testEmptyUnread() throws Exception {
+        IonCharacterReader in = createReader( "", 1 );
+
+        assertTrue( in.read() == -1 );
+        in.unread( 'A' );
+        assertTrue( in.read() == 'A' );
+        assertTrue( in.read() == -1 );
+    }
+
+    @Test
+    public void testReadBatchMultiline() throws Exception {
+        IonCharacterReader in = createReader( "A\r\nB", 3 );
+
+        char[] buf = new char[ 3 ];
+        int num = in.read( buf );
+
+        assertTrue( num == 3 );
+        assertTrue( buf[ 0 ] == 'A' );
+        assertTrue( buf[ 1 ] == '\n' );
+        assertTrue( buf[ 2 ] == 'B' );
+        assertTrue( in.read() == -1 );
+        assertTrue( in.getConsumedAmount() == 3 );
+        assertTrue( in.getColumn() == 1 );
+        assertTrue( in.getLineNumber() == 2 );
+    }
+
+    @Test
+    public void testUnreadBatch() throws Exception {
+        IonCharacterReader in = createReader( "ABCD", 3 );
+
+        char[] buf = new char[ 3 ];
+        int num = in.read( buf );
+
+        assertTrue( num == 3 );
+        assertTrue( in.getConsumedAmount() == 3 );
+        assertTrue( in.getColumn() == 3 );
+        assertTrue( in.getLineNumber() == 1 );
+        assertEquals( new String( buf ), "ABC" );
+
+        in.unread( buf );
+        assertTrue( in.getConsumedAmount() == 0 );
+        assertTrue( in.getColumn() == 0 );
+        assertTrue( in.getLineNumber() == 1 );
+
+        buf = new char[ 3 ];
+        in.read( buf );
+        assertTrue( num == 3 );
+        assertTrue( in.getConsumedAmount() == 3 );
+        assertTrue( in.getColumn() == 3 );
+        assertTrue( in.getLineNumber() == 1 );
+        assertEquals( new String( buf ), "ABC" );
+    }
+
+    @Test
+    public void testUnreadBatchMultiline() throws Exception {
+        IonCharacterReader in = createReader( "A\r\n\n\nB\n\nC\n\nD", 3 );
+
+        in.read(); // Skip the initial 'A'
+
+        char[] buf = new char[ 3 ];
+        int num = in.read( buf );  // Consume \r\n\n\n
+
+        assertTrue( num == 3 );
+        assertTrue( in.getConsumedAmount() == 4 );
+        assertTrue( in.getColumn() == 0 );
+        assertTrue( in.getLineNumber() == 4 );
+        assertEquals( new String( buf ), "\n\n\n" );
+
+        in.unread( buf );
+        assertTrue( in.getConsumedAmount() == 1 );
+        assertTrue( in.getColumn() == 1 );
+        assertTrue( in.getLineNumber() == 1 );
+
+        buf = new char[ 3 ];
+        in.read( buf );
+        assertTrue( num == 3 );
+        assertTrue( in.getConsumedAmount() == 4 );
+        assertTrue( in.getColumn() == 0 );
+        assertTrue( in.getLineNumber() == 4 );
+        assertEquals( new String( buf ), "\n\n\n" );
+    }
+
+    @Test
+    public void testUnreadBatchMultilineAllNewlines1() throws Exception {
+        implCRUnreadBatchMultilineAllNewlines( "ABC\r\n\r\n\r\n\r\n" );
+    }
+
+    @Test
+    public void testUnreadBatchMultilineAllNewlines2() throws Exception {
+        implCRUnreadBatchMultilineAllNewlines( "ABC\n\r\n\r\n\r\n\r" );
+    }
+
+    @Test
+    public void testUnreadBatchMultilineAllNewlines3() throws Exception {
+        implCRUnreadBatchMultilineAllNewlines( "ABC\n\n\n\n\n" );
+    }
+
+    @Test
+    public void testUnreadBatchMultilineAllNewlines4() throws Exception {
+        implCRUnreadBatchMultilineAllNewlines( "ABC\r\r\r\r\r" );
+    }
+
+    protected void implCRUnreadBatchMultilineAllNewlines( final String data ) throws Exception {
+        IonCharacterReader in = createReader( data, 3 );
+        char[] buf = new char[ 3 ];
+        in.skip( 3L );
+        int num = in.read( buf );
+
+        assertTrue( num == 3 );
+        assertTrue( in.getConsumedAmount() == 6 );
+        assertTrue( in.getColumn() == 0 );
+        assertTrue( in.getLineNumber() == 4 );
+        assertEquals( new String( buf ), "\n\n\n" );
+
+        in.unread( buf );
+        assertTrue( in.getConsumedAmount() == 3 );
+        assertTrue( in.getColumn() == 3 );
+        assertTrue( in.getLineNumber() == 1 );
+    }
+
+    @Test
+    public void testUnreadUnderflow() throws Exception {
+        IonCharacterReader in = createReader( "ABCDE", 1 );
+
+        char[] buf = new char[ 4 ];
+        in.read( buf );
+        assertEquals( new String( buf ), "ABCD" );
+
+        try {
+            in.unread( buf );
+            fail();
+        } catch ( IOException e ) {}
+    }
+
+    @Test
+    public void testSkip() throws Exception {
+        IonCharacterReader in = createReader( "\r\n\r\nABCDEFG", 4 );
+
+        in.skip( 4 );
+        assertTrue( in.getConsumedAmount() == 4 );
+        assertTrue( in.getColumn() == 2 );
+        assertTrue( in.getLineNumber() == 3 );
+    }
+}
diff --git a/test/com/amazon/ion/impl/EscapingCallback.java b/test/com/amazon/ion/impl/EscapingCallback.java
new file mode 100644
index 0000000000..8f49d57e4f
--- /dev/null
+++ b/test/com/amazon/ion/impl/EscapingCallback.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonType;
+import com.amazon.ion.util._Private_FastAppendable;
+import java.io.IOException;
+
+class EscapingCallback
+        extends _Private_MarkupCallback
+{
+    private _Private_FastAppendable myAppendable;
+
+    public EscapingCallback(_Private_FastAppendable unescaped)
+    {
+        super(new EscapingIonAppendable(unescaped));
+        myAppendable = unescaped;
+    }
+
+    @Override
+    public void beforeValue(IonType iType)
+        throws IOException
+    {
+        myAppendable.append("<><><>&&&<><><>");
+    }
+
+    public static class Builder implements _Private_CallbackBuilder {
+        public _Private_MarkupCallback build(_Private_FastAppendable rawOutput)
+        {
+            return new EscapingCallback(rawOutput);
+        }
+    }
+
+    static class EscapingIonAppendable
+            extends _Private_FastAppendableDecorator
+    {
+        public EscapingIonAppendable(_Private_FastAppendable output) {
+            super(output);
+        }
+
+        @Override
+        public Appendable append(char c)
+            throws IOException
+        {
+            switch (c) {
+                case '&': super.appendAscii("&amp;"); break;
+                case '<': super.appendAscii("&lt;");  break;
+                case '>': super.appendAscii("&gt;");  break;
+                // could be non-ASCII
+                default : super.append(c);            break;
+            }
+            return this;
+        }
+
+        @Override
+        public Appendable append(CharSequence csq)
+            throws IOException
+        {
+            append(csq, 0, csq.length());
+            return this;
+        }
+
+        @Override
+        public Appendable append(CharSequence csq, int start, int end)
+            throws IOException
+        {
+            int curr_start = start;
+            for (int i = start; i < end; ++i) {
+                char c = csq.charAt(i);
+                if(c == '&' || c == '<' || c == '>') {
+                    super.append(csq, curr_start, i);
+                    append(c);
+                    curr_start = i + 1;
+                }
+            }
+            super.append(csq, curr_start, end);
+            return this;
+        }
+
+        @Override
+        public void appendAscii(char c)
+            throws IOException
+        {
+            switch (c) {
+                case '&': super.appendAscii("&amp;"); break;
+                case '<': super.appendAscii("&lt;");  break;
+                case '>': super.appendAscii("&gt;");  break;
+                default : super.appendAscii(c);       break;
+            }
+        }
+
+        @Override
+        public void appendAscii(CharSequence csq)
+            throws IOException
+        {
+            appendAscii(csq, 0, csq.length());
+        }
+
+        @Override
+        public void appendAscii(CharSequence csq, int start, int end)
+            throws IOException
+        {
+            int curr_start = start;
+            for (int i = start; i < end; ++i) {
+                char c = csq.charAt(i);
+                if(c == '&' || c == '<' || c == '>') {
+                    super.appendAscii(csq, curr_start, i);
+                    appendAscii(c);
+                    curr_start = i + 1;
+                }
+            }
+            super.appendAscii(csq, curr_start, end);
+        }
+    }
+}
diff --git a/test/com/amazon/ion/impl/IonImplUtilsTest.java b/test/com/amazon/ion/impl/IonImplUtilsTest.java
new file mode 100644
index 0000000000..3ff9ac9afd
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonImplUtilsTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+
+public class IonImplUtilsTest
+{
+    @Test
+    public void testEmptyUtf8()
+    {
+        byte[] bytes = _Private_Utils.utf8("");
+        Assert.assertArrayEquals(_Private_Utils.EMPTY_BYTE_ARRAY, bytes);
+    }
+
+    @Test
+    public void testEasyUtf8()
+    throws Exception
+    {
+        String input = "abcdefghijklm";
+        byte[] bytes = _Private_Utils.utf8(input);
+        byte[] direct = input.getBytes("UTF-8");
+        Assert.assertArrayEquals(direct, bytes);
+    }
+}
diff --git a/test/com/amazon/ion/impl/IonMarkupWriterFilesTest.java b/test/com/amazon/ion/impl/IonMarkupWriterFilesTest.java
new file mode 100644
index 0000000000..8c86e1e1d7
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonMarkupWriterFilesTest.java
@@ -0,0 +1,81 @@
+
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.testdataFiles;
+
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.util.NullOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import org.junit.Test;
+
+public class IonMarkupWriterFilesTest
+        extends IonTestCase
+{
+    @Inject("testFile")
+    public static final File[] FILES = testdataFiles(GLOBAL_SKIP_LIST,
+                                             GOOD_IONTESTS_FILES);
+    private File               myTestFile;
+
+    public void setTestFile(File file) {
+        myTestFile = file;
+    }
+
+    /**
+     * Tests to make sure that the type, the output stream, and the
+     * annotation/field name aren't null for all the files. This will fail if
+     * the callback type isn't being set.
+     * {@link IonMarkupWriterTest#testStandardCallback()} should verify they're
+     * set correctly.
+     */
+    @Test
+    public void testPrintingStandard()
+        throws Exception
+    {
+        // Just ignore the output, since we're not checking it
+        OutputStream out = new NullOutputStream();
+        InputStream in = new FileInputStream(myTestFile);
+
+        // Get a Test markup writer
+        _Private_IonTextWriterBuilder builder = (_Private_IonTextWriterBuilder)
+            IonTextWriterBuilder.standard();
+        IonWriter ionWriter = builder
+            .withCallbackBuilder(new TestMarkupCallback.Builder())
+            .build(out);
+
+        // Load file into a reader
+        IonReader ionReader = system().newReader(in);
+
+        assertNotNull("ionReader is null", ionReader);
+        assertNotNull("ionWriter is null", ionWriter);
+
+        // Write data to the writer
+        ionWriter.writeValues(ionReader);
+        // Close the writer and reader
+        ionWriter.close();
+        ionReader.close();
+    }
+}
diff --git a/test/com/amazon/ion/impl/IonMarkupWriterTest.java b/test/com/amazon/ion/impl/IonMarkupWriterTest.java
new file mode 100644
index 0000000000..b84d7a7da0
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonMarkupWriterTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import java.io.IOException;
+import java.io.StringWriter;
+import org.junit.Test;
+
+public class IonMarkupWriterTest extends IonTestCase {
+    private String input     =
+            "abcd::{ hello:( sexp 1 2 \"str\" ), 'list':[ 3.2, 32e-1], " +
+            "blob:annot::" +
+            "{{ T25lIEJpZyBGYXQgVGVzdCBCbG9iIEZvciBZb3VyIFBsZWFzdXJl }} }";
+    private String sExpected =
+            "<beforeAnnotations STRUCT><beforeEachAnnotation STRUCT>abcd" +
+            "<afterEachAnnotation STRUCT>::<afterAnnotations STRUCT>" +
+            "<beforeData STRUCT>{<afterStepIn STRUCT><beforeFieldName SEXP>" +
+            "hello<afterFieldName SEXP>:<beforeData SEXP>(<afterStepIn SEXP>" +
+            "<beforeData SYMBOL>sexp<afterData SYMBOL><beforeSeparator SEXP> " +
+            "<afterSeparator SEXP><beforeData INT>1<afterData INT>" +
+            "<beforeSeparator SEXP> <afterSeparator SEXP><beforeData INT>" +
+            "2<afterData INT><beforeSeparator SEXP> <afterSeparator SEXP>" +
+            "<beforeData STRING>\"str\"<afterData STRING><beforeStepOut SEXP>" +
+            ")<afterData SEXP><beforeSeparator STRUCT>,<afterSeparator STRUCT>" +
+            "<beforeFieldName LIST>list<afterFieldName LIST>:<beforeData LIST>" +
+            "[<afterStepIn LIST><beforeData DECIMAL>3.2<afterData DECIMAL>" +
+            "<beforeSeparator LIST>,<afterSeparator LIST><beforeData FLOAT>" +
+            "3.2e0<afterData FLOAT><beforeStepOut LIST>]<afterData LIST>" +
+            "<beforeSeparator STRUCT>,<afterSeparator STRUCT>" +
+            "<beforeFieldName BLOB>blob<afterFieldName BLOB>:<beforeAnnotations" +
+            " BLOB><beforeEachAnnotation BLOB>annot<afterEachAnnotation BLOB>::" +
+            "<afterAnnotations BLOB><beforeData BLOB>" +
+            "{{T25lIEJpZyBGYXQgVGVzdCBCbG9iIEZvciBZb3VyIFBsZWFzdXJl}}<afterData" +
+            " BLOB><beforeStepOut STRUCT>}<afterData STRUCT>";
+    // TODO amzn/ion-java/issues/57 determine if platform specific newlines are appropriate for pretty printing
+    private String pExpected = String.format(
+            "%n<beforeAnnotations STRUCT><beforeEachAnnotation STRUCT>abcd" +
+            "<afterEachAnnotation STRUCT>::<afterAnnotations STRUCT><beforeData" +
+            " STRUCT>{<afterStepIn STRUCT>%n  <beforeFieldName SEXP>hello" +
+            "<afterFieldName SEXP>:<beforeData SEXP>(<afterStepIn SEXP>%n    " +
+            "<beforeData SYMBOL>sexp<afterData SYMBOL><beforeSeparator SEXP>" +
+            "%n    <afterSeparator SEXP><beforeData INT>1<afterData INT>" +
+            "<beforeSeparator SEXP>%n    <afterSeparator SEXP><beforeData INT>2" +
+            "<afterData INT><beforeSeparator SEXP>%n    <afterSeparator SEXP>" +
+            "<beforeData STRING>\"str\"<afterData STRING><beforeStepOut SEXP>%n  " +
+            ")<afterData SEXP><beforeSeparator STRUCT>,%n  " +
+            "<afterSeparator STRUCT><beforeFieldName LIST>list<afterFieldName " +
+            "LIST>:<beforeData LIST>[<afterStepIn LIST>%n    <beforeData " +
+            "DECIMAL>3.2<afterData DECIMAL><beforeSeparator LIST>,%n    " +
+            "<afterSeparator LIST><beforeData FLOAT>3.2e0<afterData FLOAT>" +
+            "<beforeStepOut LIST>%n  ]<afterData LIST><beforeSeparator STRUCT>" +
+            ",%n  <afterSeparator STRUCT><beforeFieldName BLOB>blob" +
+            "<afterFieldName BLOB>:<beforeAnnotations BLOB>" +
+            "<beforeEachAnnotation BLOB>annot<afterEachAnnotation BLOB>::" +
+            "<afterAnnotations BLOB><beforeData BLOB>" +
+            "{{ T25lIEJpZyBGYXQgVGVzdCBCbG9iIEZvciBZb3VyIFBsZWFzdXJl }}" +
+            "<afterData BLOB><beforeStepOut STRUCT>%n}<afterData STRUCT>"
+    );
+
+    @Test
+    public void testStandardCallback()
+        throws IOException
+    {
+        // Write to a StringWriter for testing
+        StringWriter out = new StringWriter();
+        IonReader ionReader = system().newReader(input);
+
+        _Private_IonTextWriterBuilder builder = (_Private_IonTextWriterBuilder)
+            IonTextWriterBuilder.standard();
+        IonWriter ionWriter = builder
+            .withCallbackBuilder(new TestMarkupCallback.Builder())
+            .build(out);
+
+        write(ionReader, ionWriter);
+        assertEquals("Markup callback with standard Ion Writer, " +
+                     "error with data:\n" + input + "\n",
+                     sExpected, out.toString());
+    }
+
+    @Test
+    public void testPrettyCallback()
+        throws IOException
+    {
+        // Write to a StringWriter for testing
+        StringWriter out = new StringWriter();
+        IonReader ionReader = system().newReader(input);
+        _Private_IonTextWriterBuilder builder = (_Private_IonTextWriterBuilder)
+            IonTextWriterBuilder.pretty();
+        IonWriter ionWriter = builder
+            .withCallbackBuilder(new TestMarkupCallback.Builder())
+            .build(out);
+        write(ionReader, ionWriter);
+        assertEquals("Markup callback with pretty printing Ion Writer," +
+                     " error with data:\n" + input + "\n",
+                     pExpected, out.toString());
+    }
+
+    @Test
+    public void testEscaping() throws IOException
+    {
+        String input = "These should be escaped <>&";
+        String expected = "<><><>&&&<><><>\"These should be escaped &lt;&gt;&amp;\"";
+        StringWriter out = new StringWriter();
+        _Private_IonTextWriterBuilder builder = (_Private_IonTextWriterBuilder)
+            IonTextWriterBuilder.standard();
+        IonWriter ionWriter = builder
+            .withCallbackBuilder(new EscapingCallback.Builder())
+            .build(out);
+        ionWriter.writeString(input);
+        ionWriter.finish();
+        assertEquals("Escaping failed, with data:\n" + input + "\n",
+                     expected, out.toString());
+    }
+
+    public void write(IonReader ionReader, IonWriter ionWriter)
+        throws IOException
+    {
+        assertNotNull("ionReader is null", ionReader);
+        assertNotNull("ionWriter is null", ionWriter);
+
+        ionWriter.writeValues(ionReader);
+
+        ionWriter.close();
+        ionReader.close();
+    }
+}
diff --git a/test/software/amazon/ion/impl/IonUTF8Test.java b/test/com/amazon/ion/impl/IonUTF8Test.java
similarity index 92%
rename from test/software/amazon/ion/impl/IonUTF8Test.java
rename to test/com/amazon/ion/impl/IonUTF8Test.java
index 15b09cd9e8..0457d423be 100644
--- a/test/software/amazon/ion/impl/IonUTF8Test.java
+++ b/test/com/amazon/ion/impl/IonUTF8Test.java
@@ -1,4 +1,19 @@
-package software.amazon.ion.impl;
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/test/software/amazon/ion/impl/IonWriterTestCase.java b/test/com/amazon/ion/impl/IonWriterTestCase.java
similarity index 92%
rename from test/software/amazon/ion/impl/IonWriterTestCase.java
rename to test/com/amazon/ion/impl/IonWriterTestCase.java
index 79690fbfb4..e13ff69dcf 100644
--- a/test/software/amazon/ion/impl/IonWriterTestCase.java
+++ b/test/com/amazon/ion/impl/IonWriterTestCase.java
@@ -1,29 +1,55 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.TestUtils.FERMATA;
-import static software.amazon.ion.impl.PrivateIonWriterBase.ERROR_MISSING_FIELD_NAME;
-import static software.amazon.ion.impl.PrivateUtils.newSymbolToken;
-import static software.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
-import static software.amazon.ion.junit.IonAssert.assertIonEquals;
-import static software.amazon.ion.junit.IonAssert.expectNextField;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.TestUtils.FERMATA;
+import static com.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
+import static com.amazon.ion.impl._Private_IonWriterBase.ERROR_MISSING_FIELD_NAME;
+import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
+import static com.amazon.ion.junit.IonAssert.assertIonEquals;
+import static com.amazon.ion.junit.IonAssert.expectNextField;
+
+import com.amazon.ion.FakeSymbolToken;
+import com.amazon.ion.IonBlob;
+import com.amazon.ion.IonClob;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonLob;
+import com.amazon.ion.IonNull;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonText;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.TestUtils;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.junit.IonAssert;
+import com.amazon.ion.system.IonSystemBuilder;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -35,30 +61,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import software.amazon.ion.FakeSymbolToken;
-import software.amazon.ion.IonBlob;
-import software.amazon.ion.IonClob;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonLob;
-import software.amazon.ion.IonNull;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonText;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.TestUtils;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.impl.PrivateIonWriter;
-import software.amazon.ion.junit.IonAssert;
+
 
 @SuppressWarnings("deprecation")
 public abstract class IonWriterTestCase
@@ -448,6 +451,7 @@ public void testWritingDeepNestedList() throws Exception {
         IonDatagram dg = loader().load("[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]");
         iw = makeWriter();
         dg.writeTo(iw);
+        iw.writeValue(dg);
     }
 
     // TODO test failure of getBytes before stepping all the way out
@@ -829,7 +833,7 @@ public void testFinishDoesReset()
 
         Iterator<IonValue> it = systemIterateOutput();
 
-        if (myOutputForm != OutputForm.TEXT) { // TODO amzn/ion-java#8
+        if (myOutputForm != OutputForm.TEXT) { // TODO amzn/ion-java/issues/8
             checkSymbol(SystemSymbols.ION_1_0, it.next());
         }
         checkAnnotation(SystemSymbols.ION_SYMBOL_TABLE, it.next());
@@ -916,7 +920,7 @@ public void testWritingEmptySymtab()
     }
 
 
-    @Test @Ignore // TODO amzn/ion-java#15
+    @Test @Ignore // TODO amzn/ion-java/issues/15
     public void testWritingSymtabWithExtraAnnotations()
     throws Exception
     {
@@ -934,6 +938,21 @@ public void testWritingSymtabWithExtraAnnotations()
         Assert.assertArrayEquals(annotations, v.getTypeAnnotations());
     }
 
+    /**
+     * Discovered this old behavior during test builds, some user code relies
+     * on it.
+     */
+    @Test
+    public void testWriteValueNull()
+        throws Exception
+    {
+        iw = makeWriter();
+        iw.writeValue((IonValue)null);
+
+        IonDatagram dg = reload();
+        assertEquals(0, dg.size());
+    }
+
     @Test
     public void testWriteSymbolTokenWithGoodSid()
         throws Exception
@@ -990,7 +1009,7 @@ public void testWriteValuesWithSymtab()
     }
 
     /**
-     * TODO amzn/ion-java#8 datagram is lazy creating local symtabs.
+     * TODO amzn/ion-java/issues/8 datagram is lazy creating local symtabs.
      * Should use a reader to check the results.
      */
     @Test
@@ -1032,29 +1051,29 @@ public void testWriteIVMExplicitly()
     {
         iw = makeWriter();
         iw.writeSymbol("foo");
-        ((PrivateIonWriter)iw).writeIonVersionMarker();
+        ((_Private_IonWriter)iw).writeIonVersionMarker();
         iw.writeInt(1);
 
         IonDatagram dg = reload();
         assertEquals(2, dg.size());
     }
 
-    @Test // TODO amzn/ion-java#8 Inconsistencies between writers
+    @Test // TODO amzn/ion-java/issues/8 Inconsistencies between writers
     public void testWritingDatagram()
         throws Exception
     {
         IonDatagram dg = loader().load("foo");
         iw = makeWriter();
         dg.writeTo(iw);
+        iw.writeValue(dg);
 
         Iterator<IonValue> it = systemIterateOutput();
-        //if (myOutputIsBinary)
-        {
-            checkSymbol(SystemSymbols.ION_1_0, it.next());
-        }
+        checkSymbol(SystemSymbols.ION_1_0, it.next());
+
         if (myOutputForm != OutputForm.TEXT) {
             checkAnnotation(SystemSymbols.ION_SYMBOL_TABLE, it.next());
         }
+
         // TODO amzn/ion-java#14
         if (myOutputForm != OutputForm.TEXT)
         {
@@ -1089,13 +1108,13 @@ public void testWritingNestedSymtab()
         iw.addTypeAnnotation(SystemSymbols.ION_SYMBOL_TABLE);
         iw.stepIn(IonType.STRUCT);
         {
-            assertEquals(1, ((PrivateIonWriter)iw).getDepth());
+            assertEquals(1, ((_Private_IonWriter)iw).getDepth());
 
             iw.setFieldName("open");
             iw.addTypeAnnotation(SystemSymbols.ION_SYMBOL_TABLE);
             iw.stepIn(IonType.STRUCT);
             {
-                assertEquals(2, ((PrivateIonWriter)iw).getDepth());
+                assertEquals(2, ((_Private_IonWriter)iw).getDepth());
             }
             iw.stepOut();
         }
diff --git a/test/software/amazon/ion/impl/IonWriterTests.java b/test/com/amazon/ion/impl/IonWriterTests.java
similarity index 58%
rename from test/software/amazon/ion/impl/IonWriterTests.java
rename to test/com/amazon/ion/impl/IonWriterTests.java
index 1b51f13f0d..a3a3e6b806 100644
--- a/test/software/amazon/ion/impl/IonWriterTests.java
+++ b/test/com/amazon/ion/impl/IonWriterTests.java
@@ -1,22 +1,24 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
+
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
     TextWriterTest.class,
@@ -24,6 +26,7 @@
     OptimizedBinaryWriterSymbolTableTest.class,
     OptimizedBinaryWriterLengthPatchingTest.class,
     BinaryWriterWithLocalSymtabsTest.class,
+    OldBinaryWriterTest.class,
     ValueWriterTest.class
 })
 public class IonWriterTests
diff --git a/test/software/amazon/ion/impl/IterationTest.java b/test/com/amazon/ion/impl/IterationTest.java
similarity index 77%
rename from test/software/amazon/ion/impl/IterationTest.java
rename to test/com/amazon/ion/impl/IterationTest.java
index 346075e541..483b4557ef 100644
--- a/test/software/amazon/ion/impl/IterationTest.java
+++ b/test/com/amazon/ion/impl/IterationTest.java
@@ -1,24 +1,27 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion.impl;
 
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonValue;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 import org.junit.Test;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonValue;
+
 
 public class IterationTest
     extends IonTestCase
diff --git a/test/software/amazon/ion/impl/LocalSymbolTableTest.java b/test/com/amazon/ion/impl/LocalSymbolTableTest.java
similarity index 89%
rename from test/software/amazon/ion/impl/LocalSymbolTableTest.java
rename to test/com/amazon/ion/impl/LocalSymbolTableTest.java
index a680f9055c..d7cddcd594 100644
--- a/test/software/amazon/ion/impl/LocalSymbolTableTest.java
+++ b/test/com/amazon/ion/impl/LocalSymbolTableTest.java
@@ -1,33 +1,33 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.impl.PrivateUtils.EMPTY_STRING_ARRAY;
-import static software.amazon.ion.impl.PrivateUtils.copyLocalSymbolTable;
-import static software.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
-import static software.amazon.ion.impl.Symtabs.LOCAL_SYMBOLS_ABC;
-import static software.amazon.ion.impl.Symtabs.makeLocalSymtab;
+import static com.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
+import static com.amazon.ion.impl.Symtabs.LOCAL_SYMBOLS_ABC;
+import static com.amazon.ion.impl.Symtabs.makeLocalSymtab;
+import static com.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY;
+import static com.amazon.ion.impl._Private_Utils.copyLocalSymbolTable;
 
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.SubstituteSymbolTableException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
 import org.junit.Test;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.SubstituteSymbolTableException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.impl.LocalSymbolTable;
-import software.amazon.ion.impl.SubstituteSymbolTable;
+
 
 public class LocalSymbolTableTest
     extends IonTestCase
diff --git a/test/com/amazon/ion/impl/OldBinaryWriterTest.java b/test/com/amazon/ion/impl/OldBinaryWriterTest.java
new file mode 100644
index 0000000000..1c7aee2d38
--- /dev/null
+++ b/test/com/amazon/ion/impl/OldBinaryWriterTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonBinaryWriter;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+
+
+@SuppressWarnings("deprecation")
+public class OldBinaryWriterTest
+    extends IonWriterTestCase
+{
+    private IonBinaryWriter myWriter;
+
+
+    @Override
+    protected IonWriter makeWriter(SymbolTable... imports)
+        throws Exception
+    {
+        myOutputForm = OutputForm.BINARY;
+        myWriter = system().newBinaryWriter(imports);
+        return myWriter;
+    }
+
+    @Override
+    protected byte[] outputByteArray()
+        throws Exception
+    {
+        return myWriter.getBytes();
+    }
+
+    @Override
+    protected void checkClosed()
+    {
+        // No-op.
+    }
+
+    @Override
+    protected void checkFlushed(boolean expectFlushed)
+    {
+        // No-op.
+    }
+}
diff --git a/test/software/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java b/test/com/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
similarity index 90%
rename from test/software/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
rename to test/com/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
index 905154fe0c..002ac1aaa4 100644
--- a/test/software/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
+++ b/test/com/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
@@ -1,31 +1,32 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.junit.IonAssert.assertIonEquals;
+import static com.amazon.ion.junit.IonAssert.assertIonEquals;
 
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonSexp;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SystemSymbols;
 import org.junit.Test;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonSexp;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SystemSymbols;
 
 /**
  * {@link OptimizedBinaryWriterTestCase} tests related to
@@ -37,7 +38,7 @@ public class OptimizedBinaryWriterLengthPatchingTest
     /**
      * Variants of different container values as Ion text of different type
      * descriptor lengths (i.e., L in the type desc octet, not VarUInt Length).
-     * Refer to Ion's binary format spec for more info.
+     * Refer to Ion's binary format wiki for more info.
      */
     protected enum ContainerTypeDescLengthVariant
     {
diff --git a/test/software/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java b/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
similarity index 89%
rename from test/software/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
rename to test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
index cbd0532431..850fa54ac4 100644
--- a/test/software/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
+++ b/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
@@ -1,34 +1,34 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.impl.PrivateUtils.isNonSymbolScalar;
-import static software.amazon.ion.impl.PrivateUtils.symtabExtends;
-import static software.amazon.ion.impl.Symtabs.printLocalSymtab;
-import static software.amazon.ion.junit.IonAssert.assertIonEquals;
-import static software.amazon.ion.junit.IonAssert.assertIonIteratorEquals;
+import static com.amazon.ion.impl.Symtabs.printLocalSymtab;
+import static com.amazon.ion.impl._Private_Utils.isNonSymbolScalar;
+import static com.amazon.ion.impl._Private_Utils.symtabExtends;
+import static com.amazon.ion.junit.IonAssert.assertIonEquals;
+import static com.amazon.ion.junit.IonAssert.assertIonIteratorEquals;
 
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.impl.PrivateUtils;
 
 /**
  * {@link OptimizedBinaryWriterTestCase} tests related to
- * {@link PrivateUtils#symtabExtends(SymbolTable, SymbolTable)} checks.
+ * {@link _Private_Utils#symtabExtends(SymbolTable, SymbolTable)} checks.
  */
 public class OptimizedBinaryWriterSymbolTableTest
     extends OptimizedBinaryWriterTestCase
@@ -243,7 +243,7 @@ public void testOptimizedWriteValueDiffImports()
 
     /**
      * Writer's imports superset of Reader's: (could be) fully optimized.
-     * TODO amzn/ion-java#18 at the moment the compatability code requires
+     * TODO amzn/ion-java/issues/18 at the moment the compatability code requires
      *      exact-match on imports.
      */
     @Test
@@ -289,7 +289,7 @@ public void testOptimizedWriteValueSubsetWriterImport()
 
     /**
      * Reader's source contains interspersed LSTs.
-     * TODO amzn/ion-java#39 Investigate allowing a config. option to copy reader's LST
+     * TODO amzn/ion-java/issues/39 Investigate allowing a config. option to copy reader's LST
      *              over to the writer.
      */
     @Test
diff --git a/test/software/amazon/ion/impl/OptimizedBinaryWriterTestCase.java b/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
similarity index 72%
rename from test/software/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
rename to test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
index 2941a201c2..684c8a3eaf 100644
--- a/test/software/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
+++ b/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
@@ -1,37 +1,35 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.impl.Symtabs.makeLocalSymtab;
 import static java.lang.reflect.Proxy.newProxyInstance;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.impl.Symtabs.makeLocalSymtab;
 
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.impl.PrivateByteTransferReader;
-import software.amazon.ion.impl.PrivateByteTransferSink;
-import software.amazon.ion.impl.PrivateIonWriter;
-import software.amazon.ion.junit.Injected.Inject;
-import software.amazon.ion.system.IonBinaryWriterBuilder;
-import software.amazon.ion.system.IonSystemBuilder;
 
 /**
  * Base test case for {@link IonWriter#writeValue(IonReader)}, with and without
@@ -48,7 +46,7 @@ public class OptimizedBinaryWriterTestCase
 
     /**
      * Denotes whether the
-     * {@link PrivateByteTransferReader#transferCurrentValue(IonWriterSystemBinary)}
+     * {@link _Private_ByteTransferReader#transferCurrentValue(IonWriterSystemBinary)}
      * has been called after an {@link IonWriter#writeValue(IonReader)}.
      */
     private boolean isTransferCurrentValueInvoked = false;
@@ -68,8 +66,8 @@ protected void checkWriterStreamCopyOptimized(IonWriter writer)
         if (isStreamCopyOptimized())
         {
             assertTrue("IonWriter should be instance of _Private_IonWriter",
-                       writer instanceof PrivateIonWriter);
-            PrivateIonWriter privateWriter = (PrivateIonWriter) writer;
+                       writer instanceof _Private_IonWriter);
+            _Private_IonWriter privateWriter = (_Private_IonWriter) writer;
             assertTrue("IonWriter should be stream copy optimized",
                        privateWriter.isStreamCopyOptimized());
         }
@@ -110,16 +108,16 @@ protected byte[] outputByteArray()
     }
 
     private class TransferCurrentValueWatchingReader
-        implements PrivateByteTransferReader
+        implements _Private_ByteTransferReader
     {
-        private final PrivateByteTransferReader myDelegate;
+        private final _Private_ByteTransferReader myDelegate;
 
-        TransferCurrentValueWatchingReader(PrivateByteTransferReader byteTransferReader)
+        TransferCurrentValueWatchingReader(_Private_ByteTransferReader byteTransferReader)
         {
             myDelegate = byteTransferReader;
         }
 
-        public void transferCurrentValue(PrivateByteTransferSink sink)
+        public void transferCurrentValue(_Private_ByteTransferSink sink)
             throws IOException
         {
             OptimizedBinaryWriterTestCase.this.isTransferCurrentValueInvoked = true;
@@ -129,7 +127,7 @@ public void transferCurrentValue(PrivateByteTransferSink sink)
 
     /**
      * Obtains a dynamic proxy of {@link IonReader} over the passed in byte[],
-     * with an invocation handler hook over {@link PrivateByteTransferReader} facet,
+     * with an invocation handler hook over {@link _Private_ByteTransferReader} facet,
      * so as to verify whether the transferCurrentValue() method is actually
      * being called.
      *
@@ -146,10 +144,10 @@ public Object invoke(Object proxy, Method method, Object[] args)
             {
                 if (method.getName().equals("asFacet") &&
                     args.length == 1 &&
-                    args[0] == PrivateByteTransferReader.class)
+                    args[0] == _Private_ByteTransferReader.class)
                 {
-                    PrivateByteTransferReader transferReader =
-                        (PrivateByteTransferReader) method.invoke(reader, args);
+                    _Private_ByteTransferReader transferReader =
+                        (_Private_ByteTransferReader) method.invoke(reader, args);
 
                     if (transferReader == null)
                         return null;
@@ -180,7 +178,7 @@ protected void checkWriteValue(boolean expectedTransferInvoked)
         // Reset flag before calling IonWriter.writeValue
         isTransferCurrentValueInvoked = false;
 
-        // TODO amzn/ion-java#16 - Currently, doesn't copy annotations or field names,
+        // TODO amzn/ion-java/issues/16 - Currently, doesn't copy annotations or field names,
         //      so we always expect no transfer of raw bytes
         if (ir.isInStruct() || ir.getTypeAnnotationSymbols().length > 0)
         {
diff --git a/test/software/amazon/ion/impl/OutputStreamWriterTestCase.java b/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
similarity index 90%
rename from test/software/amazon/ion/impl/OutputStreamWriterTestCase.java
rename to test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
index 7749a64518..acc7c010a8 100644
--- a/test/software/amazon/ion/impl/OutputStreamWriterTestCase.java
+++ b/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
@@ -1,33 +1,35 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.Timestamp;
 import java.io.ByteArrayOutputStream;
 import java.io.FilterOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.Timestamp;
+
 
 public abstract class OutputStreamWriterTestCase
     extends IonWriterTestCase
@@ -137,12 +139,12 @@ public void testFlushingLockedSymtab()
     {
         iw = makeWriter();
 
-        // Force a local symtab.  TODO amzn/ion-java#8 Should have an API for this
+        // Force a local symtab.  TODO amzn/ion-java/issues/8 Should have an API for this
         iw.addTypeAnnotation(SystemSymbols.ION_SYMBOL_TABLE);
         iw.stepIn(IonType.STRUCT);
         iw.stepOut();
 
-        SymbolTable symtab = iw.getSymbolTable();  // TODO amzn/ion-java#22
+        SymbolTable symtab = iw.getSymbolTable();  // TODO amzn/ion-java/issues/22
         symtab.intern("fred_1");
         symtab.intern("fred_2");
         testFlushing();
@@ -339,6 +341,7 @@ public void testAutoFlushTopLevelValuesForTypedWritesScalars()
      *
      * @see #testAutoFlushTopLevelValuesForTypedWritesContainers()
      */
+    @SuppressWarnings("deprecation")
     @Test
     public void testAutoFlushTopLevelValuesForOtherWrites()
         throws Exception
@@ -350,6 +353,11 @@ public void testAutoFlushTopLevelValuesForOtherWrites()
         val.writeTo(iw);
         checkFlushedAfterTopLevelValueWritten();
 
+        //================== IonWriter.writeValue(IonValue) ====================
+        iw = makeWriter();
+        iw.writeValue(val);
+        checkFlushedAfterTopLevelValueWritten();
+
         //================== IonWriter.writeValues(IonReader) ==================
         iw = makeWriter();
         IonReader reader = system().newReader(val);
diff --git a/test/com/amazon/ion/impl/RawValueSpanReaderTest.java b/test/com/amazon/ion/impl/RawValueSpanReaderTest.java
new file mode 100644
index 0000000000..e99ee79569
--- /dev/null
+++ b/test/com/amazon/ion/impl/RawValueSpanReaderTest.java
@@ -0,0 +1,325 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.OffsetSpan;
+import com.amazon.ion.RawValueSpanProvider;
+import com.amazon.ion.RawValueSpanReaderBasicTest;
+import com.amazon.ion.SeekableReader;
+import com.amazon.ion.Span;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.TestUtils;
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.testdataFiles;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import com.amazon.ion.junit.Injected;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.system.IonReaderBuilder;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests the {@link RawValueSpanProvider} reader facet, which provides access
+ * to the reader's underlying byte buffer and vends OffsetSpans that provide
+ * positions of the current value in that buffer.
+ *
+ * @see RawValueSpanReaderBasicTest
+ */
+@SuppressWarnings({"deprecation", "javadoc"})
+@RunWith(Injected.class)
+public class RawValueSpanReaderTest
+{
+
+    @Inject("testFile")
+    public static final File[] FILES =
+        testdataFiles(new TestUtils.And(GLOBAL_SKIP_LIST, new FilenameFilter(){
+
+            public boolean accept(File dir, String name)
+            {
+                // Only accepting binary files because the RawValueSpanProvider
+                // facet is currently only compatible with the binary reader.
+                return name.endsWith(".10n");
+            }
+
+        }), GOOD_IONTESTS_FILES);
+
+
+    private File myTestFile;
+
+    public void setTestFile(File file)
+    {
+        myTestFile = file;
+    }
+
+    private IonReaderBinaryUserX reader;
+    private RawValueSpanProvider spanProvider;
+    private SeekableReader seekableReader;
+
+    /*
+     * Returns a byte array that contains the value ONLY (i.e. no type code
+     * or length), as encoded by Ion.
+     */
+    private byte[] valueBytes(OffsetSpan valueSpan)
+    {
+        // In a real-world use case, this byte buffer may already be allocated.
+        int valueSize = (int)(valueSpan.getFinishOffset() - valueSpan.getStartOffset());
+        byte[] value = new byte[valueSize];
+        System.arraycopy(spanProvider.buffer(), (int)valueSpan.getStartOffset(), value, 0, value.length);
+        return value;
+    }
+
+    private static class SpanTester
+    {
+        final Object expected;
+        final byte[] expectedBytes;
+        final IonType expectedType;
+        final Span span;
+
+        SpanTester(Object expected, IonType expectedType, byte[] expectedBytes, Span span)
+        {
+            this.expected = expected;
+            this.expectedBytes = expectedBytes;
+            this.expectedType = expectedType;
+            this.span = span;
+        }
+    }
+
+    private SpanTester generateSpan(Object expected, IonType type)
+    {
+        // This span includes the TID and length bytes
+        Span span = seekableReader.currentSpan();
+        // This gets just the value bytes
+        byte[] expectedBytes = valueBytes((OffsetSpan)spanProvider.valueSpan());
+        return new SpanTester(expected, type, expectedBytes, span);
+    }
+
+    private void generateSpans(List<SpanTester> output)
+    {
+        IonType type = null;
+        while ((type = reader.next()) != null)
+        {
+            if (reader.isNullValue())
+            {
+                output.add(generateSpan(null, type));
+                continue;
+            }
+            switch (type)
+            {
+                case BOOL:
+                    output.add(generateSpan(reader.booleanValue(), type));
+                    break;
+                case INT:
+                    output.add(generateSpan(reader.bigIntegerValue(), type));
+                    break;
+                case FLOAT:
+                    output.add(generateSpan(reader.doubleValue(), type));
+                    break;
+                case DECIMAL:
+                    output.add(generateSpan(reader.bigDecimalValue(), type));
+                    break;
+                case TIMESTAMP:
+                    output.add(generateSpan(reader.timestampValue(), type));
+                    break;
+                case STRING:
+                    output.add(generateSpan(reader.stringValue(), type));
+                    break;
+                case SYMBOL:
+                    output.add(generateSpan(reader.symbolValue(), type));
+                    break;
+                case BLOB:
+                case CLOB:
+                    output.add(generateSpan(reader.newBytes(), type));
+                    break;
+                case LIST:
+                case SEXP:
+                case STRUCT:
+                    // 'expected' not used for containers because there is no
+                    // corresponding *Value() method on the reader. Instead,
+                    // byte and position comparisons will be used, and the
+                    // containers' values will be recursively checked.
+                    output.add(generateSpan(null, type));
+                    reader.stepIn();
+                    generateSpans(output);
+                    reader.stepOut();
+                    break;
+                default:
+                    throw new IllegalStateException("unexpected type: " + type);
+            }
+        }
+    }
+
+    private void assertSpan(SpanTester tester) throws Exception
+    {
+
+        IonType type = tester.expectedType;
+        seekableReader.hoist(tester.span); // seeks back to the given span
+        assertEquals(type, reader.next());
+
+        Object expected = tester.expected;
+        if (reader.isNullValue())
+        {
+            assertEquals(expected, null);
+        }
+        else
+        {
+            OffsetSpan valueSpan = (OffsetSpan)spanProvider.valueSpan();
+            switch(type)
+            {
+                case BOOL:
+                    assertEquals(expected, reader.booleanValue());
+                    break;
+                case INT:
+                    assertEquals(expected, reader.bigIntegerValue());
+                    break;
+                case FLOAT:
+                    assertEquals(expected, reader.doubleValue());
+                    break;
+                case DECIMAL:
+                    assertEquals(expected, reader.bigDecimalValue());
+                    break;
+                case TIMESTAMP:
+                    assertEquals(expected, reader.timestampValue());
+                    break;
+                case STRING:
+                    // A common use case will be to pass strings along without
+                    // decoding. This tests that case.
+                    assertArrayEquals(((String)expected).getBytes("UTF-8"), valueBytes(valueSpan));
+                    assertEquals(expected, reader.stringValue());
+                    break;
+                case SYMBOL:
+                    // SymbolTokenImpl does not override .equals
+                    SymbolToken expectedToken = (SymbolToken)expected;
+                    SymbolToken actualToken = reader.symbolValue();
+                    assertEquals(expectedToken.getSid(), actualToken.getSid());
+                    assertEquals(expectedToken.getText(), actualToken.getText());
+
+                    break;
+                case BLOB:
+                case CLOB:
+                    assertArrayEquals((byte[])expected, reader.newBytes());
+                    break;
+                case STRUCT:
+                case LIST:
+                case SEXP:
+                    reader.stepIn();
+                    if (reader.next() != null)
+                    {
+                        // The start position of the container's value span should
+                        // be the same as the start position of its first element's
+                        // seekable span.
+                        long expectedValueStart = valueSpan.getStartOffset();
+                        long expectedValueEnd = ((OffsetSpan) seekableReader.currentSpan()).getStartOffset();
+
+                        // skips any nop pad to get at the actual value start
+                        expectedValueStart += countNopPad((int) expectedValueStart);
+
+                        if (reader.isInStruct())
+                        {
+                            // In structs, however, value spans will start before
+                            // the first value's field name SID (VarUInt - 7
+                            // bits per byte, hence division by 0x80).
+                            expectedValueStart += (reader.getFieldNameSymbol().getSid() / 0x80) + 1;
+                        }
+
+                        assertEquals(expectedValueStart, expectedValueEnd);
+                    }
+
+                    reader.stepOut();
+
+                    break;
+                default:
+                    throw new IllegalStateException("unexpected type: " + type);
+            }
+            assertArrayEquals(tester.expectedBytes, valueBytes(valueSpan));
+            // All spans over the same value, no matter where they started, should finish at
+            // the same position.
+            assertEquals(((OffsetSpan)tester.span).getFinishOffset(), valueSpan.getFinishOffset());
+        }
+    }
+
+    private int countNopPad(int start) throws IOException
+    {
+        int index = start;
+        int len = 0;
+
+        if (reader.isInStruct())
+        {
+            // In structs nop pads have a sid before then
+            index += (reader.getFieldNameSymbol().getSid() / 0x80) + 1;
+            len += index - start;
+        }
+
+        int td = reader.getCurrentBuffer()[index] & 0xFF;
+        int tid = _Private_IonConstants.getTypeCode(td);
+        int typeLen = _Private_IonConstants.getLowNibble(td);
+
+        if(tid == _Private_IonConstants.tidNull && typeLen != _Private_IonConstants.lnIsNull){
+            if(typeLen == _Private_IonConstants.lnIsVarLen) {
+                len += reader.readVarUInt();
+            }
+            else {
+                len += 1;
+            }
+
+            return len;
+        }
+
+        return 0;
+    }
+
+    private static byte[] readFileAsBytes(File file) throws IOException
+    {
+        FileInputStream in = new FileInputStream(file);
+        byte[] data = new byte[(int)file.length()];
+        in.read(data);
+        in.close();
+        return data;
+    }
+
+    /**
+     * Retrieve a span for each value. Seek back to them in any order and assert
+     * that the values can be retrieved both through raw inspection of the
+     * underlying buffer and through the high-level IonReader APIs.
+     */
+    @Test
+    public void testSpans() throws Exception
+    {
+        // Seeking currently only works over byte-backed IonReaders -- not InputStreams
+        reader = (IonReaderBinaryUserX) IonReaderBuilder.standard().build(readFileAsBytes(myTestFile));
+        spanProvider = reader.asFacet(RawValueSpanProvider.class);
+        seekableReader = reader.asFacet(SeekableReader.class);
+
+        List<SpanTester> spans = new ArrayList<SpanTester>();
+        generateSpans(spans);
+        Collections.shuffle(spans); // spans can be revisited in any order
+        for (SpanTester span : spans)
+        {
+            assertSpan(span);
+        }
+    }
+}
diff --git a/test/software/amazon/ion/impl/SharedSymbolTableTest.java b/test/com/amazon/ion/impl/SharedSymbolTableTest.java
similarity index 90%
rename from test/software/amazon/ion/impl/SharedSymbolTableTest.java
rename to test/com/amazon/ion/impl/SharedSymbolTableTest.java
index 07d9eb5fd0..34bfab7582 100644
--- a/test/software/amazon/ion/impl/SharedSymbolTableTest.java
+++ b/test/com/amazon/ion/impl/SharedSymbolTableTest.java
@@ -1,37 +1,38 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.impl.PrivateUtils.EMPTY_STRING_ARRAY;
-import static software.amazon.ion.impl.PrivateUtils.stringIterator;
-import static software.amazon.ion.impl.SymbolTableTest.checkSharedTable;
-import static software.amazon.ion.impl.Symtabs.sharedSymtabStruct;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.impl.SymbolTableTest.checkSharedTable;
+import static com.amazon.ion.impl.Symtabs.sharedSymtabStruct;
+import static com.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY;
+import static com.amazon.ion.impl._Private_Utils.stringIterator;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SharedSymtabMaker;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.junit.Injected.Inject;
 import java.io.IOException;
 import org.junit.Test;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SharedSymtabMaker;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.junit.Injected.Inject;
 
 
 /**
diff --git a/test/software/amazon/ion/impl/SymbolTableTest.java b/test/com/amazon/ion/impl/SymbolTableTest.java
similarity index 94%
rename from test/software/amazon/ion/impl/SymbolTableTest.java
rename to test/com/amazon/ion/impl/SymbolTableTest.java
index d4ea57f8d1..3c62543709 100644
--- a/test/software/amazon/ion/impl/SymbolTableTest.java
+++ b/test/com/amazon/ion/impl/SymbolTableTest.java
@@ -1,33 +1,57 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
-
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.SystemSymbols.ION;
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.SystemSymbols.ION_1_0_SID;
-import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.NAME;
-import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.SystemSymbols.SYMBOLS;
-import static software.amazon.ion.impl.PrivateUtils.EMPTY_STRING_ARRAY;
-import static software.amazon.ion.impl.PrivateUtils.stringIterator;
-import static software.amazon.ion.impl.PrivateUtils.symtabTree;
-import static software.amazon.ion.impl.Symtabs.printLocalSymtab;
-
+package com.amazon.ion.impl;
+
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import com.amazon.ion.SymbolToken;
+import static com.amazon.ion.SystemSymbols.ION;
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
+import static com.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.NAME;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.SystemSymbols.SYMBOLS;
+import static com.amazon.ion.impl.Symtabs.printLocalSymtab;
+import static com.amazon.ion.impl._Private_Utils.EMPTY_STRING_ARRAY;
+import static com.amazon.ion.impl._Private_Utils.stringIterator;
+import static com.amazon.ion.impl._Private_Utils.symtabTree;
+
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonMutableCatalog;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSexp;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.ReadOnlyValueException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.system.SimpleCatalog;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -39,34 +63,11 @@
 import java.util.Set;
 import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonMutableCatalog;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSexp;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.system.IonBinaryWriterBuilder;
-import software.amazon.ion.system.IonSystemBuilder;
-import software.amazon.ion.system.IonTextWriterBuilder;
-import software.amazon.ion.system.SimpleCatalog;
 
 /**
  * @see SharedSymbolTableTest
  */
+@SuppressWarnings("deprecation")
 public class SymbolTableTest
     extends IonTestCase
 {
@@ -256,7 +257,7 @@ public void testLocalSymbolTableAppendImportBoundary()
                 "  symbols:[ \"s11\"]" +
                 "}\n" +
                 "1\n" +
-                LocalSymbolTablePrefix +
+            LocalSymbolTablePrefix +
                 "{" +
                 "  imports:" + ION_SYMBOL_TABLE + "," +
                 "  symbols:[ \"s21\"]" +
@@ -274,6 +275,7 @@ public void testLocalSymbolTableAppendImportBoundary()
         // new symbols in `original` don't influence SIDs for new symbols in `appended` after import
         checkSymbol("s11", systemMaxId() + 1, appended);
         checkSymbol("o1", systemMaxId() + 2, original);
+
         checkSymbol("s11", systemMaxId() + 1, appended);
         checkSymbol("s21", systemMaxId() + 2, appended);
         checkSymbol("a1", systemMaxId() + 3, appended);
@@ -439,6 +441,7 @@ public void testImportsFollowSymbols()
 
         final int import1id = systemMaxId() + 1;
         final int local1id = systemMaxId() + IMPORTED_1_MAX_ID + 1;
+        final int local2id = local1id + 1;
 
         String importingText =
             "$ion_1_0 "+
@@ -750,7 +753,7 @@ public void testDupLocalSymbolOnDatagram() throws Exception {
         final IonMutableCatalog cat = new SimpleCatalog();
         cat.putTable(st);
 
-        // amzn/ion-java#46 has the datagram producing something like:
+        // amzn/ion-java/issues/46 has the datagram producing something like:
         // $ion_1_0 $ion_symbol_table::{imports:[{name: "foobar", version: 1, max_id: 1}], symbols: ["s1", "l1"]} $11 $12
         // local table should not have "s1", user values should be $10 $11
         IonDatagram dg = ion1.newDatagram(st);
@@ -966,7 +969,7 @@ public void testBasicLocalSymtabCreation()
     public void testSymtabImageMaintenance()
     {
         IonSystem system = system();
-        SymbolTable st = ((PrivateValueFactory)system).getLstFactory().newLocalSymtab(system.getSystemSymbolTable());
+        SymbolTable st = ((_Private_ValueFactory)system).getLstFactory().newLocalSymtab(system.getSystemSymbolTable());
         st.intern("foo");
         IonStruct image = symtabTree(st);
         st.intern("bar");
@@ -1044,7 +1047,7 @@ public void testSharedSymtabCreationWithDuplicates()
     }
 
 
-    @Test @Ignore // TODO amzn/ion-java#12
+    @Test @Ignore // TODO amzn/ion-java/issues/12
     public void testSharedSymtabCreationWithEmptyName()
     {
         String[] syms = { "a", "b", "", "c" };
@@ -1314,7 +1317,7 @@ public void testWriteWithSymbolTable() throws IOException
 
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         IonWriter writer = system().newTextWriter(out);
-        data.writeTo(writer);
+        writer.writeValue(data);
         writer.close();
 
         // dataMap.put("value", out.toByteArray());
@@ -1393,7 +1396,7 @@ public void testSymtabBinaryInjection() throws Exception
         writer.writeNull();
         writer.writeInt(10);
         writer.writeFloat(10.0);
-        writer.writeTimestamp(Timestamp.forDay(2013, 1, 1));
+        writer.writeTimestamp(new Timestamp(2013, 1, 1));
         writer.writeSymbol("abc");  // this is where symbol table injection happens
         writer.writeString("abc");
         writer.stepOut();
diff --git a/test/software/amazon/ion/impl/Symtabs.java b/test/com/amazon/ion/impl/Symtabs.java
similarity index 81%
rename from test/software/amazon/ion/impl/Symtabs.java
rename to test/com/amazon/ion/impl/Symtabs.java
index c1c0ebf084..f1a78a22df 100644
--- a/test/software/amazon/ion/impl/Symtabs.java
+++ b/test/com/amazon/ion/impl/Symtabs.java
@@ -1,38 +1,38 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import static com.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.util.IonTextUtils.printString;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static software.amazon.ion.SystemSymbols.ION_SHARED_SYMBOL_TABLE;
-import static software.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static software.amazon.ion.util.IonTextUtils.printString;
 
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.ValueFactory;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.SimpleCatalog;
 import java.io.IOException;
 import java.util.Arrays;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.ValueFactory;
-import software.amazon.ion.impl.PrivateIonSystem;
-import software.amazon.ion.impl.PrivateLocalSymbolTableFactory;
-import software.amazon.ion.system.IonSystemBuilder;
-import software.amazon.ion.system.SimpleCatalog;
+
 
 public class Symtabs
 {
@@ -110,7 +110,7 @@ private static int[] registerTables(String[] serializedTables)
     {
         int[] maxIds = new int[serializedTables.length];
 
-        PrivateIonSystem system = (PrivateIonSystem)
+        _Private_IonSystem system = (_Private_IonSystem)
             IonSystemBuilder.standard().withCatalog(CATALOG).build();
 
         for (int i = 1; i < serializedTables.length; i++)
@@ -229,12 +229,12 @@ public static SymbolTable makeLocalSymtab(IonSystem system,
     }
 
     /**
-     * Trampoline to {@link LocalSymbolTable#DEFAULT_LST_FACTORY}
-     * @return the {@link LocalSymbolTable.Factory} singleton.
-     */
-    public static PrivateLocalSymbolTableFactory localSymbolTableFactory()
-    {
-        return LocalSymbolTable.DEFAULT_LST_FACTORY;
-    }
+      * Trampoline to {@link LocalSymbolTable#DEFAULT_LST_FACTORY}
+      * @return the {@link LocalSymbolTable.Factory} singleton.
+      */
+     public static _Private_LocalSymbolTableFactory localSymbolTableFactory()
+     {
+         return LocalSymbolTable.DEFAULT_LST_FACTORY;
+     }
 
 }
diff --git a/test/com/amazon/ion/impl/TestMarkupCallback.java b/test/com/amazon/ion/impl/TestMarkupCallback.java
new file mode 100644
index 0000000000..86187004ff
--- /dev/null
+++ b/test/com/amazon/ion/impl/TestMarkupCallback.java
@@ -0,0 +1,148 @@
+
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.util._Private_FastAppendable;
+import java.io.IOException;
+import org.junit.Assert;
+
+public class TestMarkupCallback
+    extends _Private_MarkupCallback
+{
+    public static class Builder
+        implements _Private_CallbackBuilder
+    {
+        public _Private_MarkupCallback build(_Private_FastAppendable rawOutput)
+        {
+            return new TestMarkupCallback(rawOutput);
+        }
+    }
+
+    private final _Private_FastAppendable myAppendable;
+
+    public TestMarkupCallback(_Private_FastAppendable out) {
+        super(out);
+        myAppendable = out;
+    }
+
+    public void checkForNulls(IonType iType) {
+        Assert.assertNotNull("iType is null", iType);
+        Assert.assertNotNull("myOut is null", myAppendable);
+    }
+
+    @Override
+    public void beforeValue(IonType iType)
+        throws IOException
+    {
+        checkForNulls(iType);
+        myAppendable.append("<beforeData " + iType + ">");
+    }
+
+    @Override
+    public void afterValue(IonType iType)
+        throws IOException
+    {
+        checkForNulls(iType);
+        myAppendable.append("<afterData " + iType + ">");
+    }
+
+    @Override
+    public void afterStepIn(IonType iType)
+        throws IOException
+    {
+        checkForNulls(iType);
+        myAppendable.append("<afterStepIn " + iType + ">");
+    }
+
+    @Override
+    public void beforeStepOut(IonType iType)
+        throws IOException
+    {
+        checkForNulls(iType);
+        myAppendable.append("<beforeStepOut " + iType + ">");
+    }
+
+    @Override
+    public void beforeFieldName(IonType iType, SymbolToken name)
+        throws IOException
+    {
+        checkForNulls(iType);
+        Assert.assertNotNull("beforeFieldName: name is null", name);
+        myAppendable.append("<beforeFieldName " + iType + ">");
+    }
+
+    @Override
+    public void afterFieldName(IonType iType, SymbolToken name)
+        throws IOException
+    {
+        checkForNulls(iType);
+        Assert.assertNotNull("afterFieldName: name is null", name);
+        myAppendable.append("<afterFieldName " + iType + ">");
+    }
+
+    @Override
+    public void beforeSeparator(IonType iType)
+        throws IOException
+    {
+        checkForNulls(iType);
+        myAppendable.append("<beforeSeparator " + iType + ">");
+    }
+
+    @Override
+    public void afterSeparator(IonType iType)
+        throws IOException
+    {
+        checkForNulls(iType);
+        myAppendable.append("<afterSeparator " + iType + ">");
+    }
+
+    @Override
+    public void beforeAnnotations(IonType iType)
+        throws IOException
+    {
+        checkForNulls(iType);
+        myAppendable.append("<beforeAnnotations " + iType + ">");
+    }
+
+    @Override
+    public void afterAnnotations(IonType iType)
+        throws IOException
+    {
+        checkForNulls(iType);
+        myAppendable.append("<afterAnnotations " + iType + ">");
+    }
+
+    @Override
+    public void beforeEachAnnotation(IonType iType, SymbolToken ann)
+        throws IOException
+    {
+        checkForNulls(iType);
+        Assert.assertNotNull("beforeEachAnnotation: ann is null", ann);
+        myAppendable.append("<beforeEachAnnotation " + iType + ">");
+    }
+
+    @Override
+    public void afterEachAnnotation(IonType iType, SymbolToken ann)
+        throws IOException
+    {
+        checkForNulls(iType);
+        Assert.assertNotNull("afterEachAnnotation: ann is null", ann);
+        myAppendable.append("<afterEachAnnotation " + iType + ">");
+    }
+}
diff --git a/test/software/amazon/ion/impl/TextWriterTest.java b/test/com/amazon/ion/impl/TextWriterTest.java
similarity index 89%
rename from test/software/amazon/ion/impl/TextWriterTest.java
rename to test/com/amazon/ion/impl/TextWriterTest.java
index 536e47e534..ba57d634bf 100644
--- a/test/software/amazon/ion/impl/TextWriterTest.java
+++ b/test/com/amazon/ion/impl/TextWriterTest.java
@@ -1,39 +1,40 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.ENSURE;
+import static com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.SUPPRESS;
+import static com.amazon.ion.system.IonWriterBuilder.IvmMinimizing.DISTANT;
 import static java.lang.String.format;
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.ENSURE;
-import static software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.SUPPRESS;
-import static software.amazon.ion.system.IonWriterBuilder.IvmMinimizing.DISTANT;
 
-import java.io.ByteArrayOutputStream;
+import com.amazon.ion.IonBinaryWriter;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder.LstMinimizing;
+import com.amazon.ion.system.IonWriterBuilder.IvmMinimizing;
 import java.io.OutputStream;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.system.IonTextWriterBuilder;
-import software.amazon.ion.system.IonTextWriterBuilder.LstMinimizing;
-import software.amazon.ion.system.IonWriterBuilder.IvmMinimizing;
+
 
 public class TextWriterTest
     extends OutputStreamWriterTestCase
@@ -55,7 +56,7 @@ protected String outputString()
         throws Exception
     {
         byte[] utf8Bytes = outputByteArray();
-        return PrivateUtils.utf8(utf8Bytes);
+        return _Private_Utils.utf8(utf8Bytes);
     }
 
     @Test
@@ -137,12 +138,11 @@ public void testLstMinimizing()
     {
         SymbolTable fred1 = Symtabs.register("fred",   1, catalog());
 
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        IonWriter binaryWriter = system().newBinaryWriter(buf, fred1);
+        IonBinaryWriter binaryWriter = system().newBinaryWriter(fred1);
         binaryWriter.writeSymbol("fred_1");
         binaryWriter.writeSymbol("ginger");
         binaryWriter.finish();
-        byte[] binaryData = buf.toByteArray();
+        byte[] binaryData = binaryWriter.getBytes();
 
         options = IonTextWriterBuilder.standard();
 
@@ -282,7 +282,7 @@ public void testWritingLongStrings()
 
         options.withPrettyPrinting();
         expectRendering(
-            // TODO amzn/ion-java#57 determine if these really should be platform independent newlines
+            // TODO amzn/ion-java/issues/57 determine if these really should be platform independent newlines
             format(
                 "%n" +
                 "'''looong'''%n" +
diff --git a/test/software/amazon/ion/impl/TreeReaderTest.java b/test/com/amazon/ion/impl/TreeReaderTest.java
similarity index 69%
rename from test/software/amazon/ion/impl/TreeReaderTest.java
rename to test/com/amazon/ion/impl/TreeReaderTest.java
index 5ea8ae527d..34af455227 100644
--- a/test/software/amazon/ion/impl/TreeReaderTest.java
+++ b/test/com/amazon/ion/impl/TreeReaderTest.java
@@ -1,30 +1,32 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
-import static software.amazon.ion.junit.IonAssert.assertTopLevel;
+import static com.amazon.ion.junit.IonAssert.assertTopLevel;
 
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonType;
+import com.amazon.ion.TestUtils;
+import com.amazon.ion.streaming.ReaderTestCase;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonType;
-import software.amazon.ion.TestUtils;
-import software.amazon.ion.streaming.ReaderTestCase;
+
 
 public class TreeReaderTest
     extends ReaderTestCase
diff --git a/test/software/amazon/ion/impl/UnifiedInputStreamXTest.java b/test/com/amazon/ion/impl/UnifiedInputStreamXTest.java
similarity index 69%
rename from test/software/amazon/ion/impl/UnifiedInputStreamXTest.java
rename to test/com/amazon/ion/impl/UnifiedInputStreamXTest.java
index f6413bceb0..e353b49e19 100644
--- a/test/software/amazon/ion/impl/UnifiedInputStreamXTest.java
+++ b/test/com/amazon/ion/impl/UnifiedInputStreamXTest.java
@@ -1,8 +1,19 @@
 /*
- * Copyright 2017 Amazon.com, Inc. or its affiliates.  All rights reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/test/software/amazon/ion/impl/ValueWriterTest.java b/test/com/amazon/ion/impl/ValueWriterTest.java
similarity index 81%
rename from test/software/amazon/ion/impl/ValueWriterTest.java
rename to test/com/amazon/ion/impl/ValueWriterTest.java
index c8141fb9c1..730ce7158e 100644
--- a/test/software/amazon/ion/impl/ValueWriterTest.java
+++ b/test/com/amazon/ion/impl/ValueWriterTest.java
@@ -1,28 +1,30 @@
 /*
- * Copyright 2009-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl;
+package com.amazon.ion.impl;
 
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
 import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
+
 
 public class ValueWriterTest
     extends IonWriterTestCase
@@ -136,13 +138,13 @@ public void testWriteValuesWithSymtabIntoContainer()
     }
 
 
-    @Override @Test @Ignore // TODO amzn/ion-java#8
+    @Override @Test @Ignore // TODO amzn/ion-java/issues/8
     public void testWriteIVMImplicitly()
         throws Exception
     {
         super.testWriteIVMImplicitly();
 
-        // TODO amzn/ion-java#20
+        // TODO amzn/ion-java/issues/20
         // assertEquals(2, myDatagram.size());
     }
 
@@ -152,7 +154,7 @@ public void testWriteIVMExplicitly()
         throws Exception
     {
         super.testWriteIVMExplicitly();
-        // TODO amzn/ion-java#20
+        // TODO amzn/ion-java/issues/20
         //assertEquals(2, myDatagram.size());
     }
 }
diff --git a/test/software/amazon/ion/impl/VarIntTest.java b/test/com/amazon/ion/impl/VarIntTest.java
similarity index 83%
rename from test/software/amazon/ion/impl/VarIntTest.java
rename to test/com/amazon/ion/impl/VarIntTest.java
index d5ab77d912..1e297b317b 100644
--- a/test/software/amazon/ion/impl/VarIntTest.java
+++ b/test/com/amazon/ion/impl/VarIntTest.java
@@ -1,11 +1,27 @@
-package software.amazon.ion.impl;
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
 
 import org.junit.Test;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.system.SimpleCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.system.SimpleCatalog;
 
 import java.io.ByteArrayInputStream;
+import java.math.BigInteger;
 
 public class VarIntTest extends IonTestCase {
 
@@ -86,7 +102,6 @@ public void readVarIntegerNegativeZero() throws Exception {
 
     private IonReaderBinaryUserX makeReader(String hex) throws Exception {
         ByteArrayInputStream input = new ByteArrayInputStream(parseHexBinary("E00100EA" + hex));
-
         UnifiedInputStreamX uis = UnifiedInputStreamX.makeStream(input);
         uis.skip(4);
 
@@ -122,4 +137,4 @@ private static int parseHexChar(char c) {
         }
         throw new IllegalArgumentException("invalid hex character: " + c);
     }
-}
\ No newline at end of file
+}
diff --git a/test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java b/test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java
new file mode 100644
index 0000000000..c607cbb891
--- /dev/null
+++ b/test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import static org.junit.Assert.*;
+
+import org.junit.Assert;
+import org.junit.Test;
+import com.amazon.ion.Decimal;
+import static org.junit.Assert.*;
+
+public class _Private_ScalarConversionsTest {
+    private long decimalToLong(final Decimal d) {
+        _Private_ScalarConversions.ValueVariant v = new _Private_ScalarConversions.ValueVariant();
+        v.setValue(d);
+        v.cast(_Private_ScalarConversions.FNID_FROM_DECIMAL_TO_LONG);
+        return v.getLong();
+    }
+    @Test
+    public void decimalToLong() {
+        assertEquals(1, decimalToLong(Decimal.valueOf(1L)));
+    }
+    @Test
+    public void decimalToMinLong() {
+        assertEquals(Long.MAX_VALUE, decimalToLong(Decimal.valueOf(Long.MAX_VALUE)));
+    }
+    @Test
+    public void decimalToMaxLong() {
+        assertEquals(Long.MIN_VALUE, decimalToLong(Decimal.valueOf(Long.MIN_VALUE)));
+    }
+}
diff --git a/test/software/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
similarity index 83%
rename from test/software/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
rename to test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
index fbbe1cfa73..b83bbbd2e1 100644
--- a/test/software/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
@@ -1,23 +1,37 @@
 /*
- * Copyright 2016-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
+package com.amazon.ion.impl.bin;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.unmodifiableList;
 import static java.util.Collections.unmodifiableMap;
 
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonMutableCatalog;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.impl.bin.IonManagedBinaryWriter.ImportedSymbolResolverMode;
+import com.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder.AllocatorMode;
+import com.amazon.ion.junit.Injected.Inject;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -26,21 +40,8 @@
 import java.util.List;
 import java.util.Map;
 import org.junit.Test;
-import software.amazon.ion.IonContainer;
-import software.amazon.ion.IonMutableCatalog;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.SystemSymbols;
-import software.amazon.ion.impl.bin.PrivateIonManagedBinaryWriterBuilder;
-import software.amazon.ion.impl.bin.Symbols;
-import software.amazon.ion.impl.bin.IonManagedBinaryWriter.ImportedSymbolResolverMode;
-import software.amazon.ion.impl.bin.PrivateIonManagedBinaryWriterBuilder.AllocatorMode;
-import software.amazon.ion.junit.Injected.Inject;
 
+@SuppressWarnings("deprecation")
 public class IonManagedBinaryWriterTest extends IonRawBinaryWriterTest
 {
     @SuppressWarnings("unchecked")
@@ -134,7 +135,7 @@ protected IonWriter createWriter(final OutputStream out) throws IOException
             catalog.putTable(table);
         }
 
-        final IonWriter writer = PrivateIonManagedBinaryWriterBuilder
+        final IonWriter writer = _Private_IonManagedBinaryWriterBuilder
             .create(AllocatorMode.POOLED)
             .withImports(importedSymbolResolverMode, symbolTables)
             .withPreallocationMode(preallocationMode)
diff --git a/test/software/amazon/ion/impl/bin/IonRawBinaryWriterTest.java b/test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
similarity index 75%
rename from test/software/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
rename to test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
index 33745b978e..7d23e59afc 100644
--- a/test/software/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
@@ -1,68 +1,69 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
-
-import static software.amazon.ion.IonType.BLOB;
-import static software.amazon.ion.IonType.BOOL;
-import static software.amazon.ion.IonType.CLOB;
-import static software.amazon.ion.IonType.DECIMAL;
-import static software.amazon.ion.IonType.FLOAT;
-import static software.amazon.ion.IonType.INT;
-import static software.amazon.ion.IonType.LIST;
-import static software.amazon.ion.IonType.NULL;
-import static software.amazon.ion.IonType.SEXP;
-import static software.amazon.ion.IonType.STRING;
-import static software.amazon.ion.IonType.STRUCT;
-import static software.amazon.ion.IonType.SYMBOL;
-import static software.amazon.ion.IonType.TIMESTAMP;
-import static software.amazon.ion.SystemSymbols.IMPORTS_SID;
-import static software.amazon.ion.SystemSymbols.NAME_SID;
-import static software.amazon.ion.SystemSymbols.VERSION_SID;
-import static software.amazon.ion.TestUtils.hexDump;
-import static software.amazon.ion.impl.bin.Symbols.systemSymbol;
-
-import java.io.ByteArrayOutputStream;
+package com.amazon.ion.impl.bin;
+
+import static com.amazon.ion.IonType.BLOB;
+import static com.amazon.ion.IonType.BOOL;
+import static com.amazon.ion.IonType.CLOB;
+import static com.amazon.ion.IonType.DECIMAL;
+import static com.amazon.ion.IonType.FLOAT;
+import static com.amazon.ion.IonType.INT;
+import static com.amazon.ion.IonType.LIST;
+import static com.amazon.ion.IonType.NULL;
+import static com.amazon.ion.IonType.SEXP;
+import static com.amazon.ion.IonType.STRING;
+import static com.amazon.ion.IonType.STRUCT;
+import static com.amazon.ion.IonType.SYMBOL;
+import static com.amazon.ion.IonType.TIMESTAMP;
+import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.SystemSymbols.VERSION_SID;
+import static com.amazon.ion.TestUtils.hexDump;
+import static com.amazon.ion.impl.bin.Symbols.systemSymbol;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.TestUtils;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl.bin.AbstractIonWriter.WriteValueOptimization;
+import com.amazon.ion.impl.bin.IonBinaryWriterAdapter.Factory;
+import com.amazon.ion.impl.bin.IonRawBinaryWriter.PreallocationMode;
+import com.amazon.ion.impl.bin.IonRawBinaryWriter.StreamCloseMode;
+import com.amazon.ion.impl.bin.IonRawBinaryWriter.StreamFlushMode;
+import com.amazon.ion.junit.Injected;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.junit.IonAssert;
+import com.amazon.ion.system.IonSystemBuilder;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.TestUtils;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.impl.bin.BlockAllocatorProviders;
-import software.amazon.ion.impl.bin.IonRawBinaryWriter;
-import software.amazon.ion.impl.bin.AbstractIonWriter.WriteValueOptimization;
-import software.amazon.ion.impl.bin.IonRawBinaryWriter.PreallocationMode;
-import software.amazon.ion.impl.bin.IonRawBinaryWriter.StreamCloseMode;
-import software.amazon.ion.impl.bin.IonRawBinaryWriter.StreamFlushMode;
-import software.amazon.ion.junit.Injected;
-import software.amazon.ion.junit.IonAssert;
-import software.amazon.ion.junit.Injected.Inject;
-import software.amazon.ion.system.IonSystemBuilder;
 
 // TODO incorporate this into the main reader/writer tests
 
+@SuppressWarnings("deprecation")
 @RunWith(Injected.class)
 public class IonRawBinaryWriterTest extends Assert
 {
@@ -81,8 +82,8 @@ protected static void assertEquals(final IonValue v1, final IonValue v2)
     @Inject("preallocationMode")
     public static final PreallocationMode[] PREALLOCATION_DIMENSION = PreallocationMode.values();
 
-    protected ByteArrayOutputStream     buffer;
-    protected IonWriter                 writer;
+    // XXX use this API to indirectly test it
+    protected IonBinaryWriterAdapter    writer;
     protected PreallocationMode         preallocationMode;
 
     public void setPreallocationMode(final PreallocationMode preallocationMode)
@@ -93,8 +94,15 @@ public void setPreallocationMode(final PreallocationMode preallocationMode)
     @Before
     public final void setup() throws Exception
     {
-        buffer = new ByteArrayOutputStream();
-        writer = createWriter(buffer);
+        writer = new IonBinaryWriterAdapter(
+            new Factory()
+            {
+                public IonWriter create(final OutputStream out) throws IOException
+                {
+                    return createWriter(out);
+                }
+            }
+        );
         writeIVMIfPossible();
     }
 
@@ -102,7 +110,6 @@ public final void setup() throws Exception
     public final void teardown() throws Exception
     {
         writer.close();
-        buffer = null;
         writer = null;
     }
 
@@ -122,9 +129,10 @@ protected IonWriter createWriter(final OutputStream out) throws IOException
 
     private void writeIVMIfPossible() throws IOException
     {
-        if (writer instanceof IonRawBinaryWriter)
+        final IonWriter delegate = writer.getDelegate();
+        if (delegate instanceof IonRawBinaryWriter)
         {
-            ((IonRawBinaryWriter) writer).writeIonVersionMarker();
+            ((IonRawBinaryWriter) delegate).writeIonVersionMarker();
         }
     }
 
@@ -134,7 +142,7 @@ protected void additionalValueAssertions(final IonValue value) {}
     protected final void assertValue(final String literal) throws IOException
     {
         writer.finish();
-        final byte[] data = buffer.toByteArray();
+        final byte[] data = writer.getBytes();
         final IonValue actual;
         try {
             actual = system().singleValue(data);
@@ -147,7 +155,7 @@ protected final void assertValue(final String literal) throws IOException
         additionalValueAssertions(actual);
 
         // prepare for next value
-        buffer.reset();
+        writer.reset();
         writeIVMIfPossible();
     }
 
@@ -245,47 +253,43 @@ public void testFloat() throws Exception
     }
 
     public int ivmLength() {
-        return 0;
+        return 4;
     }
 
     @Test
-    public void testVariableFloat() throws Exception
+    public void testVariableFloatZero() throws Exception
     {
-        // IonRawBinaryWriterTest writes a single BVM,
-        // but IonManagedBinaryWriterTest writes a BVM
-        // when a value is written after a #finish()
-        // call. Normalize before the test.
-        writer.writeFloat(0.0);
-        writer.finish();
-        buffer.reset();
-
         // 0e0 - 32-bit
         writer.writeFloat(0.0);
         writer.finish();
-        assertEquals(ivmLength() + 5,
-                     buffer.size());
-        buffer.reset();
+        assertEquals(ivmLength() + 5, writer.byteSize());
+    }
 
+    @Test
+    public void testVariableFloatInfinity() throws Exception
+    {
         // +inf - 32-bit
         writer.writeFloat(Double.POSITIVE_INFINITY);
         writer.finish();
-        assertEquals(ivmLength() + 5,
-                     buffer.size());
-        buffer.reset();
+        assertEquals(ivmLength() + 5, writer.byteSize());
+    }
 
+    @Test
+    public void testVariableFloatFractionOverflow() throws Exception
+    {
         // 64-bit value - fraction overflows 32-bits
         writer.writeFloat(2.147483647e9);
         writer.finish();
-        assertEquals(ivmLength() + 9,
-                     buffer.size());
-        buffer.reset();
+        assertEquals(ivmLength() + 9, writer.byteSize());
+    }
 
+    @Test
+    public void testVariableFloatExponentOverflow() throws Exception
+    {
         // 64-bit value - exponent overflows 32-bits
         writer.writeFloat(6e128);
         writer.finish();
-        assertEquals(ivmLength() + 9,
-                     buffer.size());
-        buffer.reset();
+        assertEquals(ivmLength() + 9, writer.byteSize());
     }
 
     private static final String DECIMAL_10_DIGIT  = "1.000000001";
@@ -329,13 +333,13 @@ public void testTimestamp() throws Exception
     public void testTimestampInvalidFractionalSeconds() throws IOException
     {
         Timestamp ts = Timestamp.createFromUtcFields(
-            Timestamp.Precision.SECOND, 2000, 1, 1, 0, 0, 0, new BigDecimal(new BigInteger("0"), -1), 0);
+            Timestamp.Precision.FRACTION, 2000, 1, 1, 0, 0, 0, new BigDecimal(new BigInteger("0"), -1), 0);
         writer.writeTimestamp(ts);
         writer.finish();
         assertEquals(
             TestUtils.hexDump(new byte[] {(byte)0xe0, 0x01, 0x00, (byte)0xea,
                 0x68, (byte)0x80, 0x0f, (byte)0xd0, (byte)0x81, (byte)0x81, (byte)0x80, (byte)0x80, (byte)0x80 }),
-            TestUtils.hexDump(buffer.toByteArray()));
+            TestUtils.hexDump(writer.getBytes()));
     }
 
     // note that we stick to system symbols for round trip assertions
diff --git a/test/software/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java b/test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
similarity index 81%
rename from test/software/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
rename to test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
index 8f5e7156c8..97ccef5546 100644
--- a/test/software/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
+++ b/test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
+package com.amazon.ion.impl.bin;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
@@ -21,9 +22,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import software.amazon.ion.impl.bin.Block;
-import software.amazon.ion.impl.bin.BlockAllocator;
-import software.amazon.ion.impl.bin.PooledBlockAllocatorProvider;
 
 public class PooledBlockAllocatorProviderTest
 {
diff --git a/test/software/amazon/ion/impl/bin/WriteBufferTest.java b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
similarity index 97%
rename from test/software/amazon/ion/impl/bin/WriteBufferTest.java
rename to test/com/amazon/ion/impl/bin/WriteBufferTest.java
index 8c200e9c04..5a5ddb5acf 100644
--- a/test/software/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
@@ -1,23 +1,24 @@
 /*
- * Copyright 2016-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.bin;
+package com.amazon.ion.impl.bin;
 
+import static com.amazon.ion.TestUtils.hexDump;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
-import static software.amazon.ion.TestUtils.hexDump;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -25,9 +26,6 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import software.amazon.ion.impl.bin.BlockAllocator;
-import software.amazon.ion.impl.bin.BlockAllocatorProviders;
-import software.amazon.ion.impl.bin.WriteBuffer;
 
 public class WriteBufferTest
 {
diff --git a/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java b/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
similarity index 95%
rename from test/software/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
rename to test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
index 644ece031f..2bc94f7cf4 100644
--- a/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
+++ b/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
@@ -1,4 +1,19 @@
-package software.amazon.ion.impl.lite;
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.lite;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -11,12 +26,12 @@
 import java.util.List;
 import java.util.ListIterator;
 import org.junit.Test;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.ContainedValueException;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.system.IonSystemBuilder;
 
 /**
  * All tests related to {@link IonSequenceLite#subList(int, int)}. Extracted to a separate test due to the amount of
diff --git a/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java b/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
similarity index 68%
rename from test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
rename to test/com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
index 0942a0ae7c..66964cbb59 100644
--- a/test/software/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
+++ b/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
@@ -1,4 +1,19 @@
-package software.amazon.ion.impl.lite;
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.lite;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -6,21 +21,13 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
-import java.util.ConcurrentModificationException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ListIterator;
 import org.junit.Test;
-import software.amazon.ion.ContainedValueException;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.ReadOnlyValueException;
-import software.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.ReadOnlyValueException;
+import com.amazon.ion.system.IonSystemBuilder;
 
 public abstract class BaseIonSequenceLiteTestCase {
 
diff --git a/test/software/amazon/ion/impl/lite/IonContextTest.java b/test/com/amazon/ion/impl/lite/IonContextTest.java
similarity index 91%
rename from test/software/amazon/ion/impl/lite/IonContextTest.java
rename to test/com/amazon/ion/impl/lite/IonContextTest.java
index 823d507706..2b13fb554d 100644
--- a/test/software/amazon/ion/impl/lite/IonContextTest.java
+++ b/test/com/amazon/ion/impl/lite/IonContextTest.java
@@ -1,38 +1,35 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.impl.lite;
-
-import static software.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static software.amazon.ion.impl.Symtabs.CATALOG;
-
+package com.amazon.ion.impl.lite;
+
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.impl.Symtabs.CATALOG;
+
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.impl.Symtabs;
+import com.amazon.ion.junit.Injected.Inject;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonList;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.impl.Symtabs;
-import software.amazon.ion.impl.lite.ContainerlessContext;
-import software.amazon.ion.impl.lite.IonContainerLite;
-import software.amazon.ion.impl.lite.IonContext;
-import software.amazon.ion.impl.lite.IonValueLite;
-import software.amazon.ion.junit.Injected.Inject;
 
 
 public class IonContextTest
diff --git a/test/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java b/test/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
new file mode 100644
index 0000000000..55d9380597
--- /dev/null
+++ b/test/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.lite;
+
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonSequence;
+
+public class IonDatagramLiteSublistTest extends BaseIonSequenceLiteSublistTestCase {
+
+    protected IonSequence newSequence() {
+        final IonDatagram datagram = SYSTEM.newDatagram();
+        for(int i : INTS) {
+            datagram.add(SYSTEM.newInt(INTS[i]));
+        }
+
+        return datagram;
+    }
+}
diff --git a/test/com/amazon/ion/impl/lite/IonDatagramLiteTest.java b/test/com/amazon/ion/impl/lite/IonDatagramLiteTest.java
new file mode 100644
index 0000000000..5ab78440ec
--- /dev/null
+++ b/test/com/amazon/ion/impl/lite/IonDatagramLiteTest.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.lite;
+
+import com.amazon.ion.IonSequence;
+
+public class IonDatagramLiteTest extends BaseIonSequenceLiteTestCase {
+    @Override
+    protected IonSequence newEmptySequence() {
+        return SYSTEM.newDatagram();
+    }
+}
\ No newline at end of file
diff --git a/test/com/amazon/ion/impl/lite/IonListLiteTest.java b/test/com/amazon/ion/impl/lite/IonListLiteTest.java
new file mode 100644
index 0000000000..86db62c90d
--- /dev/null
+++ b/test/com/amazon/ion/impl/lite/IonListLiteTest.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.lite;
+
+import com.amazon.ion.IonSequence;
+
+public class IonListLiteTest extends BaseIonSequenceLiteTestCase {
+    @Override
+    protected IonSequence newEmptySequence() {
+        return SYSTEM.newEmptyList();
+    }
+}
diff --git a/test/software/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java b/test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
similarity index 77%
rename from test/software/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
rename to test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
index 6166a5843b..bd607af587 100644
--- a/test/software/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
+++ b/test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
@@ -1,16 +1,33 @@
-package software.amazon.ion.impl.lite;
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.lite;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.List;
 import java.util.ListIterator;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import software.amazon.ion.IonInt;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.junit.Injected;
-import software.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.impl.lite.BaseIonSequenceLiteSublistTestCase;
+import com.amazon.ion.junit.Injected;
+import com.amazon.ion.junit.Injected.Inject;
 
 /**
  * Sublist tests for list and sexp
diff --git a/test/com/amazon/ion/impl/lite/IonSexpLiteTest.java b/test/com/amazon/ion/impl/lite/IonSexpLiteTest.java
new file mode 100644
index 0000000000..a8575e4705
--- /dev/null
+++ b/test/com/amazon/ion/impl/lite/IonSexpLiteTest.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.lite;
+
+import com.amazon.ion.IonSequence;
+
+public class IonSexpLiteTest extends BaseIonSequenceLiteTestCase {
+    @Override
+    protected IonSequence newEmptySequence() {
+        return SYSTEM.newEmptySexp();
+    }
+}
diff --git a/test/software/amazon/ion/impl/lite/SIDPresentLifecycleTest.java b/test/com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
similarity index 81%
rename from test/software/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
rename to test/com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
index d62e8f89fd..b17cd8a889 100644
--- a/test/software/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
+++ b/test/com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
@@ -1,10 +1,25 @@
-package software.amazon.ion.impl.lite;
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl.lite;
 
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.impl.PrivateUtils;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.impl._Private_Utils;
 import org.junit.Test;
 
 /**
@@ -31,7 +46,7 @@ public void testFieldsWithSID() {
         IonStringLite value = (IonStringLite) system().newString("Test Value");
         // a new value should create without SID presence as it has no annotations
         assertFalse(value._isSymbolIdPresent());
-        value.setFieldNameSymbol(PrivateUtils.newSymbolToken("Symbol-With-Sid", 12));
+        value.setFieldNameSymbol(_Private_Utils.newSymbolToken("Symbol-With-Sid", 12));
         // setting a field with a SID means that SID Present now must be true
         assertTrue(value._isSymbolIdPresent());
 
@@ -43,11 +58,11 @@ public void testFieldsWithSID() {
         assertFalse(value._isSymbolIdPresent());
 
         //verify that detaching still retains symbols - as SID is still present
-        value.setFieldNameSymbol(PrivateUtils.newSymbolToken(13));
+        value.setFieldNameSymbol(_Private_Utils.newSymbolToken(13));
         assertTrue(value._isSymbolIdPresent());
         value.clearSymbolIDValues();
         // NOTE: SID is still present as clearSymbolIDValues doesn't clear SID-only tokens
-        assertEquals(13, value.getFieldNameSymbol().getSid());
+        assertEquals(13, value.getFieldId());
         assertTrue(value._isSymbolIdPresent());
     }
 
@@ -57,8 +72,8 @@ public void testAnnotationsWithSIDs() {
         // a new value should create without any SID's as it has no annotations
         assertFalse(value._isSymbolIdPresent());
         value.setTypeAnnotationSymbols(
-            PrivateUtils.newSymbolToken("Symbol-Without-SID", -1),
-            PrivateUtils.newSymbolToken("Symbol-With-SID", 99));
+                _Private_Utils.newSymbolToken("Symbol-Without-SID", -1),
+                _Private_Utils.newSymbolToken("Symbol-With-SID", 99));
         // setting an annotation with a SID means that SID present now must be true
         assertTrue(value._isSymbolIdPresent());
 
@@ -67,7 +82,7 @@ public void testAnnotationsWithSIDs() {
 
         // ensure that setting annotations that don't have SIDs doesn't change the SID present status (need to wait for
         // an explicit action such as detatch from container or clone).
-        value.setTypeAnnotationSymbols(PrivateUtils.newSymbolToken("Symbol-Without-Sid", -1));
+        value.setTypeAnnotationSymbols(_Private_Utils.newSymbolToken("Symbol-Without-Sid", -1));
         assertTrue(value._isSymbolIdPresent());
 
         // verify detaching from the container clears the SID Present flag
@@ -76,7 +91,7 @@ public void testAnnotationsWithSIDs() {
 
         // verify that where SID context preserves through the clone due to SID context not being known (believed a bug)
         // that the SID present flag is *retained*
-        value.setTypeAnnotationSymbols(PrivateUtils.newSymbolToken(101));
+        value.setTypeAnnotationSymbols(_Private_Utils.newSymbolToken(101));
         assertTrue(value.clone()._isSymbolIdPresent());
     }
 
@@ -87,21 +102,21 @@ public void testPropagationAcrossGraph() {
 
         // 1. test addition of child by field WITHOUT SID causes no propagation
         IonStringLite keyValue1 = (IonStringLite) system().newString("Foo");
-        struct.add(PrivateUtils.newSymbolToken("field_1", -1), keyValue1);
+        struct.add(_Private_Utils.newSymbolToken("field_1", -1), keyValue1);
         assertFalse(struct._isSymbolIdPresent());
         assertFalse(keyValue1._isSymbolIdPresent());
 
         // 2. test addition of child by field WITH SID but also with field text causes no propagation
         // (struct only takes field name if present and strips SID)
         IonStringLite keyValue2 = (IonStringLite) system().newString("Bar");
-        struct.add(PrivateUtils.newSymbolToken("field_2", 87), keyValue2);
+        struct.add(_Private_Utils.newSymbolToken("field_2", 87), keyValue2);
         assertFalse(struct._isSymbolIdPresent());
         assertFalse(keyValue1._isSymbolIdPresent());
         assertFalse(keyValue2._isSymbolIdPresent());
 
         // 3. test addition of child by field with SID ONLY causes propagation due to retention of field SID
         IonStringLite keyValue3 = (IonStringLite) system().newString("Car");
-        struct.add(PrivateUtils.newSymbolToken(76), keyValue3);
+        struct.add(_Private_Utils.newSymbolToken(76), keyValue3);
         assertTrue(struct._isSymbolIdPresent());
         assertFalse(keyValue1._isSymbolIdPresent());
         assertFalse(keyValue2._isSymbolIdPresent());
@@ -111,7 +126,7 @@ public void testPropagationAcrossGraph() {
         IonStructLite struct2 = (IonStructLite) system().newEmptyStruct();
         IonStringLite keyValue4 = (IonStringLite) system().newString("But");
         struct2.add("field_1", keyValue4);
-        keyValue4.setTypeAnnotationSymbols(PrivateUtils.newSymbolToken("Lah", 13));
+        keyValue4.setTypeAnnotationSymbols(_Private_Utils.newSymbolToken("Lah", 13));
         assertTrue(struct2._isSymbolIdPresent());
 
         // 5. test clone propagates clearing of status. NOTE - clone with an unresolvable SID for a field ID fails
@@ -133,7 +148,7 @@ public void testPropagationAcrossGraph() {
 
         // 6. ensure clearing symbols propogates from root to impacted leaves
         // add back in field ID (SID) only child before clearing to test SID retained
-        struct.add(PrivateUtils.newSymbolToken(76), keyValue3);
+        struct.add(_Private_Utils.newSymbolToken(76), keyValue3);
         struct.clearSymbolIDValues();
         assertTrue(struct._isSymbolIdPresent());
         assertFalse(keyValue1._isSymbolIdPresent());
@@ -147,7 +162,7 @@ public void testPropagationAcrossGraph() {
         middle.add(inner);
         outer.put("foo", middle);
         // now add a SID only annotation to inner
-        inner.setTypeAnnotationSymbols(PrivateUtils.newSymbolToken(99));
+        inner.setTypeAnnotationSymbols(_Private_Utils.newSymbolToken(99));
         // verify that all components are signaling SID present
         assertTrue(outer._isSymbolIdPresent());
         assertTrue(middle._isSymbolIdPresent());
@@ -163,14 +178,14 @@ public void testPropagationAcrossGraph() {
     @Test
     public void testSymbolValueLifecyle() {
         // test creation from SymbolToken
-        IonSymbolLite symbolLite = (IonSymbolLite) system().newSymbol(PrivateUtils.newSymbolToken("version", 5));
+        IonSymbolLite symbolLite = (IonSymbolLite) system().newSymbol(_Private_Utils.newSymbolToken("version", 5));
         // SID isn't present as it is stripped if there is text present
         assertFalse(symbolLite._isSymbolIdPresent());
 
         IonListLite container1 = (IonListLite) system().newEmptyList();
         container1.add(symbolLite);
         // test propagation of context when symbol context is added
-        assertEquals(5, symbolLite.symbolValue().getSid());
+        assertEquals(5, symbolLite.getSymbolId());
         // as the getSymbolId memoizes SID into the entity SID present must be set
         assertTrue(symbolLite._isSymbolIdPresent());
         // check memoization propagates to container
@@ -179,7 +194,7 @@ public void testSymbolValueLifecyle() {
         assertFalse(container1._isSymbolIdPresent());
         assertFalse(symbolLite._isSymbolIdPresent());
 
-        IonSymbolLite symbolSIDOnly = (IonSymbolLite) system().newSymbol(PrivateUtils.newSymbolToken(321));
+        IonSymbolLite symbolSIDOnly = (IonSymbolLite) system().newSymbol(_Private_Utils.newSymbolToken(321));
         // SID Present is preserved when only SID is present
         assertTrue(symbolSIDOnly._isSymbolIdPresent());
         IonListLite container2 = (IonListLite) system().newEmptyList();
@@ -198,9 +213,9 @@ public void testSIDRetentionAcrossObjectHierarchy() {
         IonStructLite outer = (IonStructLite) system().newEmptyStruct();
         IonListLite middle = (IonListLite) system().newEmptyList();
         IonStringLite inner = (IonStringLite) system().newString("A");
-        outer.add(PrivateUtils.newSymbolToken(321), middle);
+        outer.add(_Private_Utils.newSymbolToken(321), middle);
         middle.add(inner);
-        inner.setTypeAnnotationSymbols(PrivateUtils.newSymbolToken("B", 123));
+        inner.setTypeAnnotationSymbols(_Private_Utils.newSymbolToken("B", 123));
         assertTrue(outer._isSymbolIdPresent());
         assertTrue(middle._isSymbolIdPresent());
         assertTrue(inner._isSymbolIdPresent());
@@ -211,12 +226,12 @@ public void testSIDRetentionAcrossObjectHierarchy() {
 
         // field ID's can be retained on IonSymbolLite - so ensure these are retained as well.
         IonStructLite container = (IonStructLite) system().newEmptyStruct();
-        IonSymbolLite symbol = (IonSymbolLite) system().newSymbol(PrivateUtils.newSymbolToken("Foo", 123));
-        container.add(PrivateUtils.newSymbolToken(321), symbol);
+        IonSymbolLite symbol = (IonSymbolLite) system().newSymbol(_Private_Utils.newSymbolToken("Foo", 123));
+        container.add(_Private_Utils.newSymbolToken(321), symbol);
         container.clearSymbolIDValues();
-        assertEquals(SymbolTable.UNKNOWN_SYMBOL_ID, symbol.symbolValue().getSid());
+        assertEquals(SymbolTable.UNKNOWN_SYMBOL_ID, symbol.getSymbolId());
         assertEquals("Foo", symbol.stringValue());
-        assertEquals(321, symbol.getFieldNameSymbol().getSid());
+        assertEquals(321, symbol.getFieldId());
         assertTrue(symbol._isSymbolIdPresent());
 
         assertTrue(container._isSymbolIdPresent());
diff --git a/test/software/amazon/ion/junit/Injected.java b/test/com/amazon/ion/junit/Injected.java
similarity index 88%
rename from test/software/amazon/ion/junit/Injected.java
rename to test/com/amazon/ion/junit/Injected.java
index 3a4ce91120..1272bcc062 100644
--- a/test/software/amazon/ion/junit/Injected.java
+++ b/test/com/amazon/ion/junit/Injected.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.junit;
+package com.amazon.ion.junit;
 
 import java.beans.BeanInfo;
 import java.beans.Introspector;
@@ -24,7 +25,6 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import org.junit.runner.Runner;
 import org.junit.runner.notification.RunNotifier;
@@ -42,12 +42,6 @@
  * the test fixture with a set of configured values.  This approach is similar
  * to {@link Parameterized} but utilizes setter injection instead of using
  * constructors, so its easier to reuse the injection via inheritance.
- * <p>
- * A test fixture may have no {@link Inject} parameters, in which case the
- * fixture runs as it would without the {@link Injected} runner.
- * This is useful for allowing a hierarchy of test fixtures to be declared
- * as {@link Injected} when only some of the sub-classes actually {@link Inject}
- * parameters.
  */
 public class Injected
 extends Suite
@@ -176,12 +170,8 @@ public Injected(Class<?> klass)
     private static List<Runner> fanout(Class<?> klass) throws Throwable
     {
         Dimension[] dimensions = findDimensions(new TestClass(klass));
+        assert dimensions.length != 0;
 
-        if (dimensions.length == 0)
-        {
-            // no dimensions in this test class--run with normal runner
-            return Collections.<Runner>singletonList(new BlockJUnit4ClassRunner(klass));
-        }
         return fanout(klass, new ArrayList<Runner>(), dimensions, new int[dimensions.length], 0);
     }
 
@@ -214,7 +204,6 @@ private static List<Runner> fanout(Class<?> klass,
         return runners;
     }
 
-    private static final Dimension[] EMPTY_DIMENSION_ARRAY = new Dimension[0];
 
     private static Dimension[] findDimensions(TestClass testClass)
     throws Throwable
@@ -223,7 +212,8 @@ private static Dimension[] findDimensions(TestClass testClass)
             testClass.getAnnotatedFields(Inject.class);
         if (fields.isEmpty())
         {
-            return EMPTY_DIMENSION_ARRAY;
+            throw new Exception("No fields of " + testClass.getName()
+                                + " have the @Inject annotation");
         }
 
         BeanInfo beanInfo = Introspector.getBeanInfo(testClass.getJavaClass());
diff --git a/test/software/amazon/ion/junit/IonAssert.java b/test/com/amazon/ion/junit/IonAssert.java
similarity index 82%
rename from test/software/amazon/ion/junit/IonAssert.java
rename to test/com/amazon/ion/junit/IonAssert.java
index c72b577f03..163d5eddc2 100644
--- a/test/software/amazon/ion/junit/IonAssert.java
+++ b/test/com/amazon/ion/junit/IonAssert.java
@@ -1,27 +1,31 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.junit;
+package com.amazon.ion.junit;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-import static software.amazon.ion.impl.PrivateIonConstants.UNKNOWN_SYMBOL_TEXT_PREFIX;
-import static software.amazon.ion.util.IonTextUtils.printSymbol;
+import com.amazon.ion.IonLob;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.ReaderChecker;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.util.Equivalence;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,17 +33,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import software.amazon.ion.IonLob;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonSequence;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.ReaderChecker;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.UnknownSymbolException;
-import software.amazon.ion.util.Equivalence;
+
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static com.amazon.ion.impl._Private_IonConstants.UNKNOWN_SYMBOL_TEXT_PREFIX;
+import static com.amazon.ion.util.IonTextUtils.printSymbol;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public final class IonAssert
 {
@@ -59,6 +63,7 @@ public static void assertTopLevel(IonReader in, boolean inStruct)
 
         if (! inStruct) {
             assertNull("reader field name", in.getFieldName());
+            assertEquals("reader fieldId", UNKNOWN_SYMBOL_ID, in.getFieldId());
             assertNull("reader field symbol", in.getFieldNameSymbol());
         }
 
@@ -78,9 +83,10 @@ public static void assertNoCurrentValue(IonReader in)
         assertNull(in.getType());
 
         assertNull(in.getFieldName());
+        assertTrue(in.getFieldId() < 0);
         assertNull(in.getFieldNameSymbol());
 
-        // TODO amzn/ion-java#13 Text reader doesn't throw, but others do.
+        // TODO amzn/ion-java/issues/13 Text reader doesn't throw, but others do.
         try {
             String[] ann = in.getTypeAnnotations();
             assertEquals(0, ann.length);
@@ -103,11 +109,15 @@ public static void assertNoCurrentValue(IonReader in)
     }
 
 
+    @SuppressWarnings("deprecation")
     public static void assertEof(IonReader in)
     {
+        assertFalse(in.hasNext());
+        assertFalse(in.hasNext());
         assertNull(in.next());
         assertNoCurrentValue(in);
         assertNull(in.next());
+        assertFalse(in.hasNext());
         assertNull(in.next());
     }
 
@@ -392,8 +402,7 @@ private static void assertSequenceEquals(String path,
         int actualSize = actual.size();
         if (expectedSize != actualSize)
         {
-            fail(path + " length, expected:" + expectedSize
-                 + " actual:" + actualSize);
+            fail(path + " length, expected:" + expectedSize + " actual:" + actualSize);
         }
 
         for (int i = 0; i < expectedSize; i++)
@@ -411,33 +420,22 @@ private static void assertStructEquals(String path,
     {
         int expectedSize = expected.size();
         int actualSize = actual.size();
-        if (expectedSize != actualSize)
-        {
-            fail(path + " size, expected:" + expectedSize
-                 + " actual:" + actualSize);
+        if (expectedSize != actualSize) {
+            fail(String.format("%s size, expected:%s actual:%s", path, expectedSize, actualSize));
         }
 
-        Map<String, List<IonValue>> expectedFields = sortFields(expected);
-        Map<String, List<IonValue>> actualFields   = sortFields(actual);
+        Map<SymbolToken, List<IonValue>> expectedFields = sortFields(expected);
+        Map<SymbolToken, List<IonValue>> actualFields   = sortFields(actual);
 
-        for (Entry<String,List<IonValue>> expectedEntry
-                : expectedFields.entrySet())
-        {
-            String fieldName = expectedEntry.getKey();
-            String fieldPath = path + '.' + printSymbol(fieldName);
+        for (Entry<SymbolToken, List<IonValue>> expectedEntry : expectedFields.entrySet()) {
+            SymbolToken token = expectedEntry.getKey();
+            String fieldPath = path + '.' + printSymbol(token);
 
-            List<IonValue> actualList = actualFields.get(fieldName);
-            if (actualList == null)
-            {
-                fail("Missing field " + fieldPath
-                     + ", expected: " + expected
-                     + " actual: " + actual);
+            List<IonValue> actualList = actualFields.get(token);
+            if (actualList == null) {
+                fail(String.format("Missing field %s, expected: %s actual: %s",fieldPath, expected, actual));
             }
-
-            assertFieldEquals(fieldPath,
-                              expectedEntry.getValue(),
-                              actual,
-                              actualList);
+            assertFieldEquals(fieldPath, expectedEntry.getValue(), actual, actualList);
         }
     }
 
@@ -445,24 +443,15 @@ private static void assertStructEquals(String path,
      * Problematic with unknown field names.
      * See {@link Equivalence} for another use of this idiom.
      */
-    private static HashMap<String,List<IonValue>> sortFields(IonStruct s)
+    private static HashMap<SymbolToken,List<IonValue>> sortFields(IonStruct s)
     {
-        HashMap<String,List<IonValue>> sorted =
-            new HashMap<String,List<IonValue>>();
-        for (IonValue v : s)
-        {
+        HashMap<SymbolToken,List<IonValue>> sorted = new HashMap<SymbolToken,List<IonValue>>();
+        for (IonValue v : s) {
             SymbolToken tok = v.getFieldNameSymbol();
-            String text = tok.getText();
-            if (text == null) {
-                text = UNKNOWN_SYMBOL_TEXT_PREFIX + tok.getSid(); // TODO amzn/ion-java#23
-            }
-            List<IonValue> fields = sorted.get(text);
-            if (fields == null)
-            {
-                fields = new ArrayList<IonValue>(2);
-                sorted.put(text, fields);
+            if(!sorted.containsKey(tok)){
+                sorted.put(tok, new ArrayList<IonValue>());
             }
-            fields.add(v);
+            sorted.get(tok).add(v);
         }
         return sorted;
     }
diff --git a/test/software/amazon/ion/profile/IteratorTiming.java b/test/com/amazon/ion/profile/IteratorTiming.java
similarity index 77%
rename from test/software/amazon/ion/profile/IteratorTiming.java
rename to test/com/amazon/ion/profile/IteratorTiming.java
index 841ad7f3a6..fd5eb3fe7e 100644
--- a/test/software/amazon/ion/profile/IteratorTiming.java
+++ b/test/com/amazon/ion/profile/IteratorTiming.java
@@ -1,28 +1,30 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.profile;
+package com.amazon.ion.profile;
 
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.system.IonSystemBuilder;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.Date;
 import java.util.Iterator;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.system.IonSystemBuilder;
+
 
 public class IteratorTiming
 {
diff --git a/test/com/amazon/ion/streaming/BadIonStreamingTest.java b/test/com/amazon/ion/streaming/BadIonStreamingTest.java
new file mode 100644
index 0000000000..b9dcf008c1
--- /dev/null
+++ b/test/com/amazon/ion/streaming/BadIonStreamingTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.streaming;
+
+import static com.amazon.ion.TestUtils.BAD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.testdataFiles;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.TestUtils;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.Injected.Inject;
+import java.io.File;
+import java.io.IOException;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class BadIonStreamingTest
+extends IonTestCase
+{
+    private static final boolean _debug_output_errors = false;
+
+
+    @Inject("testFile")
+    public static final File[] FILES = testdataFiles(GLOBAL_SKIP_LIST,
+                                                     BAD_IONTESTS_FILES);
+
+    private File myTestFile;
+
+    public void setTestFile(File file)
+    {
+        myTestFile = file;
+    }
+
+    @Test(expected = IonException.class)
+    public void testReadingScalars()
+    throws Exception
+    {
+        try
+        {
+            byte[] buf = _Private_Utils.loadFileBytes(myTestFile);
+            IonReader it = system().newReader(buf);
+            TestUtils.deepRead(it, true);
+        }
+        catch (IonException e)
+        {
+            /* good - we're expecting an error, there are testing bad input */
+            if (_debug_output_errors) {
+                System.out.print(this.myTestFile.getName());
+                System.out.print(": ");
+                System.out.println(e.getMessage());
+            }
+            throw e;
+        }
+    }
+}
diff --git a/test/software/amazon/ion/streaming/BinaryStreamingTest.java b/test/com/amazon/ion/streaming/BinaryStreamingTest.java
similarity index 88%
rename from test/software/amazon/ion/streaming/BinaryStreamingTest.java
rename to test/com/amazon/ion/streaming/BinaryStreamingTest.java
index f9fa4f060c..05de4a40e3 100644
--- a/test/software/amazon/ion/streaming/BinaryStreamingTest.java
+++ b/test/com/amazon/ion/streaming/BinaryStreamingTest.java
@@ -1,22 +1,38 @@
+
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-package software.amazon.ion.streaming;
-
-import static software.amazon.ion.impl.PrivateUtils.newSymbolToken;
-import static software.amazon.ion.junit.IonAssert.expectField;
 
-import java.io.ByteArrayOutputStream;
+package com.amazon.ion.streaming;
+
+import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
+import static com.amazon.ion.junit.IonAssert.expectField;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonBinaryWriter;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.IonAssert;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -24,18 +40,7 @@
 import java.util.Date;
 import java.util.Iterator;
 import org.junit.Test;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.junit.IonAssert;
+
 
 public class BinaryStreamingTest
     extends IonTestCase
@@ -58,7 +63,7 @@ static class TestValue {
             value = tv_value;
         }
 
-        /** TODO amzn/ion-java#5 why this context? I think it will round-off values */
+        /** TODO amzn/ion-java/issues/5 why this context? I think it will round-off values */
         static MathContext context = MathContext.DECIMAL128;
         static Decimal makeBigDecimal(double d) {
             Decimal bd = Decimal.valueOf(d, context);
@@ -347,8 +352,7 @@ else if (value instanceof Integer) {
     public void testAllValues()
     throws Exception
     {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        IonWriter wr = system().newBinaryWriter(buf);
+        IonBinaryWriter wr = system().newBinaryWriter();
         byte[] buffer = null;
 
         byte[] _testbytes1 = new byte[5];
@@ -519,8 +523,7 @@ public void testAllValues()
             }
 
             wr.stepOut();
-            wr.close();
-            buffer = buf.toByteArray();
+            buffer = wr.getBytes();
         }
         catch (IOException e) {
             throw new Exception(e);
@@ -551,7 +554,9 @@ public void testValue1()
             +",index_suppressed:true,"
             +"offline_store_only:true,version:2,}";
         IonReader ir = system().newReader(s);
-        byte[] buffer = writeBinaryBytes(ir);
+        IonBinaryWriter wr = system().newBinaryWriter();
+        wr.writeValues(ir);
+        byte[] buffer = wr.getBytes();
         dumpBuffer(buffer, buffer.length);
     }
 
@@ -577,7 +582,10 @@ public void testValue2()
 
         Iterator<String> symbols = sym.iterateDeclaredSymbolNames();
         SymbolTable u = system().newSharedSymbolTable("items", 1, symbols);
-        byte[] buffer = writeBinaryBytes(ir, u);
+        IonBinaryWriter wr = system().newBinaryWriter(u);
+
+        wr.writeValues(ir);
+        byte[] buffer = wr.getBytes();
         dumpBuffer(buffer, buffer.length);
     }
     void dumpBuffer(byte[] buffer, int len)
@@ -616,8 +624,7 @@ void dumpBuffer(byte[] buffer, int len)
     public void testBoolValue()
         throws Exception
     {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        IonWriter wr = system().newBinaryWriter(buf);
+        IonBinaryWriter wr = system().newBinaryWriter();
         byte[] buffer = null;
 
         try {
@@ -625,18 +632,18 @@ public void testBoolValue()
             wr.setFieldName("Foo");
             wr.writeBool(true);
             wr.stepOut();
-            wr.close();
-            buffer = buf.toByteArray();
+            buffer = wr.getBytes();
         }
         catch (IOException e) {
             throw new Exception(e);
         }
 
         IonReader ir = system().newReader(buffer);
-        if (ir.next() != null) {
+        if (ir.hasNext()) {
+            ir.next();
             ir.stepIn();
-            while (ir.next() != null) {
-                IonType t = ir.getType();
+            while (ir.hasNext()) {
+                IonType t = ir.next();
                 String name = ir.getFieldName();
                 boolean value = ir.booleanValue();
                 assertTrue( value );
@@ -649,18 +656,20 @@ public void testBoolValue()
 
 
     @Test
-    public void testTwoMagicCookies() throws Exception {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        IonWriter wr = system().newBinaryWriter(buf);
+    public void testTwoMagicCookies() {
+        IonBinaryWriter wr = system().newBinaryWriter();
         byte[] buffer = null;
 
-        wr.stepIn(IonType.STRUCT);
-        wr.setFieldName("Foo");
-        wr.addTypeAnnotation("boolean");
-        wr.writeBool(true);
-        wr.stepOut();
-        wr.close();
-        buffer = buf.toByteArray();
+        try {
+            wr.stepIn(IonType.STRUCT);
+            wr.setFieldName("Foo");
+            wr.addTypeAnnotation("boolean");
+            wr.writeBool(true);
+            wr.stepOut();
+            buffer = wr.getBytes();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         byte[] doublebuffer = new byte[buffer.length * 2];
         System.arraycopy(buffer, 0, doublebuffer, 0, buffer.length);
@@ -699,24 +708,27 @@ public void testTwoMagicCookies() throws Exception {
 
 
     @Test
-    public void testBoolean() throws Exception {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        IonWriter wr = system().newBinaryWriter(buf);
+    public void testBoolean() {
+        IonBinaryWriter wr = system().newBinaryWriter();
         byte[] buffer = null;
 
-        wr.stepIn(IonType.STRUCT);
-        wr.setFieldName("Foo");
-        wr.addTypeAnnotation("boolean");
-        wr.writeBool(true);
-        wr.stepOut();
-        wr.close();
-        buffer = buf.toByteArray();
+        try {
+            wr.stepIn(IonType.STRUCT);
+            wr.setFieldName("Foo");
+            wr.addTypeAnnotation("boolean");
+            wr.writeBool(true);
+            wr.stepOut();
+            buffer = wr.getBytes();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
 
         IonReader ir = system().newReader(buffer);
-        if (ir.next() != null) {
+        if (ir.hasNext()) {
+            ir.next();
             ir.stepIn();
-            while (ir.next() != null) {
-                assertEquals(ir.getType(), IonType.BOOL);
+            while (ir.hasNext()) {
+                assertEquals(ir.next(), IonType.BOOL);
                 expectField(ir, "Foo");
                 //assertEquals(ir.getAnnotations(), new String[] { "boolean" });
                 String[] annotations = ir.getTypeAnnotations();
@@ -732,43 +744,46 @@ public void testBoolean() throws Exception {
     //Test Sample map.
     //{hello=true, Almost Done.=true, This is a test String.=true, 12242.124598129=12242.124598129, Something=null, false=false, true=true, long=9326, 12=-12}
     @Test
-    public void testSampleMap() throws Exception {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        IonWriter wr = system().newBinaryWriter(buf);
+    public void testSampleMap() {
+        IonBinaryWriter wr = system().newBinaryWriter();
         byte[] buffer = null;
 
-        wr.stepIn(IonType.STRUCT);
+        try {
+            wr.stepIn(IonType.STRUCT);
 
-        wr.setFieldName("hello");
-        wr.writeBool(true);
+            wr.setFieldName("hello");
+            wr.writeBool(true);
 
-        wr.setFieldName("Almost Done.");
-        wr.writeBool(true);
+            wr.setFieldName("Almost Done.");
+            wr.writeBool(true);
 
-        wr.setFieldName("This is a test String.");
-        wr.writeBool(true);
+            wr.setFieldName("This is a test String.");
+            wr.writeBool(true);
 
-        wr.setFieldName("12242.124598129");
-        wr.writeFloat(12242.124598129);
+            wr.setFieldName("12242.124598129");
+            wr.writeFloat(12242.124598129);
 
-        wr.setFieldName("Something");
-        wr.writeNull();
+            wr.setFieldName("Something");
+            wr.writeNull();
 
-        wr.setFieldName("false");
-        wr.writeBool(false);
+            wr.setFieldName("false");
+            wr.writeBool(false);
 
-        wr.setFieldName("true");
-        wr.writeBool(true);
+            wr.setFieldName("true");
+            wr.writeBool(true);
 
-        wr.setFieldName("long");
-        wr.writeInt((long) 9326);
+            wr.setFieldName("long");
+            wr.writeInt((long) 9326);
 
-        wr.setFieldName("12");
-        wr.writeInt(-12);
+            wr.setFieldName("12");
+            wr.writeInt(-12);
 
-        wr.stepOut();
-        wr.close();
-        buffer = buf.toByteArray();
+            wr.stepOut();
+            buffer = wr.getBytes();
+        } catch (IOException e) {
+
+            throw new RuntimeException(e);
+        }
 
         IonReader ir = system().newReader(buffer);
         if (ir.next() != null) {
@@ -821,8 +836,7 @@ public void testBenchmarkDirect() throws IOException {
 
         byte[] bytes ;
 
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        IonWriter wr = system().newBinaryWriter(buf);
+        IonBinaryWriter wr = system().newBinaryWriter();
         wr.stepIn(IonType.STRUCT);
 
         wr.setFieldName("12");
@@ -855,43 +869,51 @@ public void testBenchmarkDirect() throws IOException {
 
         wr.stepOut();
 
-        wr.close();
-        bytes = buf.toByteArray();
+        bytes = wr.getBytes();
 
         IonReader ir = system().newReader(bytes);
         assertEquals(IonType.STRUCT, ir.next());
         ir.stepIn();
 
+        if (! _Private_Utils.READER_HASNEXT_REMOVED) assertTrue(ir.hasNext());
         assertEquals(ir.next(), IonType.INT);
         expectField(ir, "12");
         assertEquals(ir.intValue(), -12);
 
+        if (! _Private_Utils.READER_HASNEXT_REMOVED) assertTrue(ir.hasNext());
         assertEquals(ir.next(), IonType.FLOAT);
         expectField(ir, "12242.124598129");
         assertEquals(ir.doubleValue(), 12242.124598129);
 
+        if (! _Private_Utils.READER_HASNEXT_REMOVED) assertTrue(ir.hasNext());
         assertEquals(ir.next(), IonType.BOOL);
         expectField(ir, "Almost Done.");
         assertEquals(ir.booleanValue(), true);
 
+        if (! _Private_Utils.READER_HASNEXT_REMOVED) assertTrue(ir.hasNext());
         assertEquals(ir.next(), IonType.BOOL);
         expectField(ir, "This is a test String.");
         assertEquals(ir.booleanValue(), true);
 
+        if (! _Private_Utils.READER_HASNEXT_REMOVED) assertTrue(ir.hasNext());
         assertEquals(ir.next(), IonType.BOOL);
         expectField(ir, "false");
         assertEquals(ir.booleanValue(), false);
 
+        if (! _Private_Utils.READER_HASNEXT_REMOVED) assertTrue(ir.hasNext());
         assertEquals(ir.next(), IonType.INT);
         expectField(ir, "long");
         assertEquals(ir.longValue(), 9326L);
 
+        if (! _Private_Utils.READER_HASNEXT_REMOVED) assertTrue(ir.hasNext());
         assertEquals(ir.next(), IonType.BOOL);
         expectField(ir, "true");
         assertEquals(ir.booleanValue(), true);
 
+        if (! _Private_Utils.READER_HASNEXT_REMOVED) assertFalse(ir.hasNext());
         assertEquals(null, ir.next());
         ir.stepOut();
+        if (! _Private_Utils.READER_HASNEXT_REMOVED) assertFalse(ir.hasNext());
         assertEquals(null, ir.next());
     }
 }
diff --git a/test/software/amazon/ion/streaming/GoodIonStreamingTest.java b/test/com/amazon/ion/streaming/GoodIonStreamingTest.java
similarity index 53%
rename from test/software/amazon/ion/streaming/GoodIonStreamingTest.java
rename to test/com/amazon/ion/streaming/GoodIonStreamingTest.java
index aca3b69bdd..04336f132b 100644
--- a/test/software/amazon/ion/streaming/GoodIonStreamingTest.java
+++ b/test/com/amazon/ion/streaming/GoodIonStreamingTest.java
@@ -1,31 +1,32 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.testdataFiles;
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.testdataFiles;
 
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.TestUtils;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.Injected.Inject;
 import java.io.File;
 import java.io.IOException;
 import org.junit.Test;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.TestUtils;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.junit.Injected.Inject;
 
 public class GoodIonStreamingTest
 extends IonTestCase
@@ -55,7 +56,7 @@ public void test()
     void iterateIon(File myTestFile)
     throws IOException
     {
-        byte[] buf = PrivateUtils.loadFileBytes(myTestFile);
+        byte[] buf = _Private_Utils.loadFileBytes(myTestFile);
 
         IonReader reader = system().newReader(buf);
         TestUtils.deepRead(reader);
diff --git a/test/software/amazon/ion/streaming/InputStreamReaderTest.java b/test/com/amazon/ion/streaming/InputStreamReaderTest.java
similarity index 72%
rename from test/software/amazon/ion/streaming/InputStreamReaderTest.java
rename to test/com/amazon/ion/streaming/InputStreamReaderTest.java
index 0ee92470bf..d819d09503 100644
--- a/test/software/amazon/ion/streaming/InputStreamReaderTest.java
+++ b/test/com/amazon/ion/streaming/InputStreamReaderTest.java
@@ -1,30 +1,32 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
-import static software.amazon.ion.impl.PrivateUtils.EMPTY_BYTE_ARRAY;
-import static software.amazon.ion.impl.PrivateUtils.utf8;
+import static com.amazon.ion.impl._Private_Utils.EMPTY_BYTE_ARRAY;
+import static com.amazon.ion.impl._Private_Utils.utf8;
 
+import com.amazon.ion.InputStreamWrapper;
+import com.amazon.ion.IonType;
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.junit.Injected.Inject;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import org.junit.Test;
-import software.amazon.ion.InputStreamWrapper;
-import software.amazon.ion.IonType;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.junit.Injected.Inject;
+
 
 public class InputStreamReaderTest
     extends ReaderTestCase
diff --git a/test/software/amazon/ion/streaming/MiscStreamingTest.java b/test/com/amazon/ion/streaming/MiscStreamingTest.java
similarity index 87%
rename from test/software/amazon/ion/streaming/MiscStreamingTest.java
rename to test/com/amazon/ion/streaming/MiscStreamingTest.java
index 8f88d53b5e..0625fa9817 100644
--- a/test/software/amazon/ion/streaming/MiscStreamingTest.java
+++ b/test/com/amazon/ion/streaming/MiscStreamingTest.java
@@ -1,38 +1,42 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
-
-import static software.amazon.ion.impl.PrivateUtils.utf8;
-
+package com.amazon.ion.streaming;
+
+import static com.amazon.ion.impl._Private_Utils.utf8;
+
+import com.amazon.ion.BinaryTest;
+import com.amazon.ion.IonBinaryWriter;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.TestUtils;
+import com.amazon.ion.impl._Private_Utils;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Iterator;
 import org.junit.Assert;
 import org.junit.Test;
-import software.amazon.ion.BinaryTest;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSymbol;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.TestUtils;
+
 
 public class MiscStreamingTest
     extends IonTestCase
@@ -50,6 +54,7 @@ public class MiscStreamingTest
     static final String _QuotingString2_java = "s\'t2";
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testQuoting()
     throws Exception
     {
@@ -68,7 +73,12 @@ public void testQuoting()
         //    value2 symbol 'str2' (2 bytes: 1 typedesc + 1 sid)
         IonReader ir = system().newReader(s);
 
-        byte[] buffer = writeBinaryBytes(ir);
+        IonSystem system = system();
+        IonBinaryWriter wr = system.newBinaryWriter();
+        wr = system.newBinaryWriter();
+        wr.writeValues(ir);
+
+        byte[] buffer = wr.getBytes();
         assertSame("this buffer length is known to be 22", buffer.length, 22);
 
         IonReader sir = system().newReader(s);
@@ -245,8 +255,12 @@ private void testNullSymbolValue(IonReader reader)
         testNullTextValue(reader, IonType.SYMBOL);
     }
 
+    @SuppressWarnings("deprecation")
     private void testNullTextValue(IonReader reader, IonType textType)
     {
+        if (! _Private_Utils.READER_HASNEXT_REMOVED) {
+            assertTrue(reader.hasNext());
+        }
         assertEquals(textType, reader.next());
         assertEquals(textType, reader.getType());
         assertTrue(reader.isNullValue());
@@ -276,7 +290,6 @@ public void testSkippingOperator()
         assertEquals(null, reader.next());
     }
 
-
     @Test
     public void testReaderDataMangling()
     throws Exception
@@ -291,7 +304,6 @@ public void testReaderDataMangling()
         Assert.assertArrayEquals("UTF-8 text", utf8(dataText), dataBytes);
     }
 
-
     @Test
     public void testIteratorDataMangling()
     throws Exception
@@ -306,7 +318,6 @@ public void testIteratorDataMangling()
         Assert.assertArrayEquals("UTF-8 text", utf8(dataText), dataBytes);
     }
 
-
     @Test
     public void testTextWriterSymtabs()
     throws IOException
diff --git a/test/software/amazon/ion/streaming/NonOffsetSpanReaderTest.java b/test/com/amazon/ion/streaming/NonOffsetSpanReaderTest.java
similarity index 60%
rename from test/software/amazon/ion/streaming/NonOffsetSpanReaderTest.java
rename to test/com/amazon/ion/streaming/NonOffsetSpanReaderTest.java
index f71f045a05..d5d9dfd0ea 100644
--- a/test/software/amazon/ion/streaming/NonOffsetSpanReaderTest.java
+++ b/test/com/amazon/ion/streaming/NonOffsetSpanReaderTest.java
@@ -1,24 +1,25 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
+import com.amazon.ion.OffsetSpan;
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.Span;
+import com.amazon.ion.junit.Injected.Inject;
 import org.junit.Test;
-import software.amazon.ion.OffsetSpan;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.Span;
-import software.amazon.ion.junit.Injected.Inject;
 
 /**
  * @see OffsetSpanReaderTest
diff --git a/test/software/amazon/ion/streaming/NonSeekableReaderTest.java b/test/com/amazon/ion/streaming/NonSeekableReaderTest.java
similarity index 58%
rename from test/software/amazon/ion/streaming/NonSeekableReaderTest.java
rename to test/com/amazon/ion/streaming/NonSeekableReaderTest.java
index 376f198cc6..7c22cc9463 100644
--- a/test/software/amazon/ion/streaming/NonSeekableReaderTest.java
+++ b/test/com/amazon/ion/streaming/NonSeekableReaderTest.java
@@ -1,23 +1,24 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.SeekableReader;
+import com.amazon.ion.junit.Injected.Inject;
 import org.junit.Test;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.SeekableReader;
-import software.amazon.ion.junit.Injected.Inject;
 
 /**
  * @see SeekableReaderTest
diff --git a/test/software/amazon/ion/streaming/NonSpanReaderTest.java b/test/com/amazon/ion/streaming/NonSpanReaderTest.java
similarity index 60%
rename from test/software/amazon/ion/streaming/NonSpanReaderTest.java
rename to test/com/amazon/ion/streaming/NonSpanReaderTest.java
index 8770a33945..61389988cb 100644
--- a/test/software/amazon/ion/streaming/NonSpanReaderTest.java
+++ b/test/com/amazon/ion/streaming/NonSpanReaderTest.java
@@ -1,23 +1,24 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.SpanProvider;
+import com.amazon.ion.junit.Injected.Inject;
 import org.junit.Test;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.SpanProvider;
-import software.amazon.ion.junit.Injected.Inject;
 
 /**
  * @see SpanReaderTest
diff --git a/test/software/amazon/ion/streaming/NonTextSpanTest.java b/test/com/amazon/ion/streaming/NonTextSpanTest.java
similarity index 59%
rename from test/software/amazon/ion/streaming/NonTextSpanTest.java
rename to test/com/amazon/ion/streaming/NonTextSpanTest.java
index 5284c30eb0..d54b8188e7 100644
--- a/test/software/amazon/ion/streaming/NonTextSpanTest.java
+++ b/test/com/amazon/ion/streaming/NonTextSpanTest.java
@@ -1,24 +1,25 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.Span;
+import com.amazon.ion.TextSpan;
+import com.amazon.ion.junit.Injected.Inject;
 import org.junit.Test;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.Span;
-import software.amazon.ion.TextSpan;
-import software.amazon.ion.junit.Injected.Inject;
 
 /**
  * @see TextSpanTest
diff --git a/test/software/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java b/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
similarity index 76%
rename from test/software/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
rename to test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
index 8dc949c558..665eb853d2 100644
--- a/test/software/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
+++ b/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
@@ -1,27 +1,29 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
-import static software.amazon.ion.BinaryTest.hexToBytes;
+import static com.amazon.ion.BinaryTest.hexToBytes;
 
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonType;
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.util.RepeatInputStream;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonType;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.util.RepeatInputStream;
+
 
 public class OffsetSpanBinaryReaderTest
     extends ReaderFacetTestCase
@@ -85,7 +87,7 @@ public void testCurrentSpanBeyondMaxIntForOrderedStruct()
                                  + "84 "        //   name:
                                  + "AE 08 80"   //     blob, len=1024
                                 );
-        data = PrivateUtils.copyOf(data, data.length + 1024);
+        data = _Private_Utils.copyOf(data, data.length + 1024);
 
         readBeyondMaxInt(data, IonType.STRUCT);
     }
diff --git a/test/software/amazon/ion/streaming/OffsetSpanReaderTest.java b/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
similarity index 75%
rename from test/software/amazon/ion/streaming/OffsetSpanReaderTest.java
rename to test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
index b892b6551c..9c62e0312f 100644
--- a/test/software/amazon/ion/streaming/OffsetSpanReaderTest.java
+++ b/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
@@ -1,26 +1,28 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
+import com.amazon.ion.BinaryTest;
+import com.amazon.ion.IonType;
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.junit.Injected.Inject;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import org.junit.Test;
-import software.amazon.ion.BinaryTest;
-import software.amazon.ion.IonType;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.junit.Injected.Inject;
+
 
 public class OffsetSpanReaderTest
     extends ReaderFacetTestCase
@@ -78,9 +80,14 @@ public void testCurrentSpanFromStreamMed() throws IOException {
             buf.write(BinaryTest.hexToBytes("22 03 E8"));
         }
 
+        // Textification is wonky and inconsistent here, it looks like:
+        //  LITE:   $ion_1_0 1000 1000 1000 1000 ...
+        //  BACKED: $ion_1_0 1000 $ion_1_0 1000 ...
+
         read(buf.toByteArray());
         int binaryStart = 4;
         int textStart = 9;
+
         for (int i = 0; i < count; i++) {
             assertSame(IonType.INT, in.next());
             checkCurrentSpan(binaryStart, binaryStart+3, textStart);
diff --git a/test/software/amazon/ion/streaming/ReaderCompare.java b/test/com/amazon/ion/streaming/ReaderCompare.java
similarity index 82%
rename from test/software/amazon/ion/streaming/ReaderCompare.java
rename to test/com/amazon/ion/streaming/ReaderCompare.java
index 6d180cfb17..2a3c68dd94 100644
--- a/test/software/amazon/ion/streaming/ReaderCompare.java
+++ b/test/com/amazon/ion/streaming/ReaderCompare.java
@@ -1,35 +1,39 @@
 /*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
+import static com.amazon.ion.impl._Private_Utils.READER_HASNEXT_REMOVED;
+
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.junit.IonAssert;
 import java.math.BigDecimal;
 import org.junit.Assert;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonType;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.Timestamp;
-import software.amazon.ion.junit.IonAssert;
+
 
 public class ReaderCompare
     extends Assert
 {
     public static void compare(IonReader it1, IonReader it2) {
         while (hasNext(it1, it2)) {
-            IonType t1 = it1.getType();
-            IonType t2 = it2.getType();
+            IonType t1 = (READER_HASNEXT_REMOVED ? it1.getType() : it1.next());
+            IonType t2 = (READER_HASNEXT_REMOVED ? it2.getType() : it2.next());
 
             if ((t1 != t2) && (t1 == null || t2 == null || !t1.equals(t2))) {
                 assertEquals("ion type", t1, t2);
@@ -81,8 +85,20 @@ public static void compare(IonReader it1, IonReader it2) {
     public static boolean hasNext(IonReader it1, IonReader it2)
     {
         boolean more;
-        more = (it1.next() != null);
-        assertEquals("next results don't match", more, it2.next() != null);
+        if (READER_HASNEXT_REMOVED)
+        {
+            more = (it1.next() != null);
+            assertEquals("next results don't match", more, it2.next() != null);
+        }
+        else
+        {
+            more = it1.hasNext();
+            assertEquals("hasNext results don't match", more, it2.hasNext());
+
+            // Check that result doesn't change
+            assertEquals(more, it1.hasNext());
+            assertEquals(more, it2.hasNext());
+        }
 
         if (!more) {
             assertEquals(null, it1.next());
diff --git a/test/software/amazon/ion/streaming/ReaderDomCopyTest.java b/test/com/amazon/ion/streaming/ReaderDomCopyTest.java
similarity index 55%
rename from test/software/amazon/ion/streaming/ReaderDomCopyTest.java
rename to test/com/amazon/ion/streaming/ReaderDomCopyTest.java
index e07018b21d..4afb3ec7a4 100644
--- a/test/software/amazon/ion/streaming/ReaderDomCopyTest.java
+++ b/test/com/amazon/ion/streaming/ReaderDomCopyTest.java
@@ -1,32 +1,33 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.testdataFiles;
-import static software.amazon.ion.junit.IonAssert.assertIonEquals;
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.testdataFiles;
+import static com.amazon.ion.junit.IonAssert.assertIonEquals;
 
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.junit.Injected.Inject;
 import java.io.File;
 import java.io.IOException;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.junit.Injected.Inject;
 
 public class ReaderDomCopyTest
 extends IonTestCase
diff --git a/test/software/amazon/ion/streaming/ReaderFacetTestCase.java b/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
similarity index 82%
rename from test/software/amazon/ion/streaming/ReaderFacetTestCase.java
rename to test/com/amazon/ion/streaming/ReaderFacetTestCase.java
index 2715d89e46..bfbbeb0d78 100644
--- a/test/software/amazon/ion/streaming/ReaderFacetTestCase.java
+++ b/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
@@ -1,30 +1,32 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
-import static software.amazon.ion.facet.Facets.assumeFacet;
-import static software.amazon.ion.util.Spans.currentSpan;
+import static com.amazon.ion.facet.Facets.assumeFacet;
+import static com.amazon.ion.util.Spans.currentSpan;
 
+import com.amazon.ion.OffsetSpan;
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.SeekableReader;
+import com.amazon.ion.Span;
+import com.amazon.ion.SpanProvider;
+import com.amazon.ion.TextSpan;
+import com.amazon.ion.facet.Facets;
 import org.junit.After;
-import software.amazon.ion.OffsetSpan;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.SeekableReader;
-import software.amazon.ion.Span;
-import software.amazon.ion.SpanProvider;
-import software.amazon.ion.TextSpan;
-import software.amazon.ion.facet.Facets;
+
 
 public abstract class ReaderFacetTestCase
     extends ReaderTestCase
@@ -55,7 +57,7 @@ public abstract class ReaderFacetTestCase
      *
      * @see NonSeekableReaderTest
      */
-    public static final ReaderMaker[] NON_SEEKABLE_READERS =  // TODO amzn/ion-java#17
+    public static final ReaderMaker[] NON_SEEKABLE_READERS =  // TODO amzn/ion-java/issues/17
     {
         ReaderMaker.FROM_INPUT_STREAM_BINARY,
         ReaderMaker.FROM_INPUT_STREAM_TEXT,
diff --git a/test/software/amazon/ion/streaming/ReaderIntegerSizeTest.java b/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
similarity index 85%
rename from test/software/amazon/ion/streaming/ReaderIntegerSizeTest.java
rename to test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
index 07ade48477..983d2b23e5 100644
--- a/test/software/amazon/ion/streaming/ReaderIntegerSizeTest.java
+++ b/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
@@ -1,12 +1,25 @@
-// Copyright (c) 2016 Amazon.com, Inc.  All rights reserved.
-
-package software.amazon.ion.streaming;
-
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.streaming;
+
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.junit.Injected.Inject;
 import java.math.BigInteger;
 import org.junit.Test;
-import software.amazon.ion.IntegerSize;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.junit.Injected.Inject;
 
 public class ReaderIntegerSizeTest
     extends ReaderTestCase
diff --git a/test/software/amazon/ion/streaming/ReaderSkippingTest.java b/test/com/amazon/ion/streaming/ReaderSkippingTest.java
similarity index 84%
rename from test/software/amazon/ion/streaming/ReaderSkippingTest.java
rename to test/com/amazon/ion/streaming/ReaderSkippingTest.java
index 308c24d287..6a45032cbc 100644
--- a/test/software/amazon/ion/streaming/ReaderSkippingTest.java
+++ b/test/com/amazon/ion/streaming/ReaderSkippingTest.java
@@ -1,24 +1,32 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.consumeCurrentValue;
-import static software.amazon.ion.TestUtils.testdataFiles;
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.consumeCurrentValue;
+import static com.amazon.ion.TestUtils.testdataFiles;
 
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.junit.IonAssert;
 import java.io.File;
 import java.io.FileInputStream;
 import java.util.Random;
@@ -26,13 +34,6 @@
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.junit.IonAssert;
-import software.amazon.ion.junit.Injected.Inject;
 
 public class ReaderSkippingTest
     extends IonTestCase
diff --git a/test/software/amazon/ion/streaming/ReaderTest.java b/test/com/amazon/ion/streaming/ReaderTest.java
similarity index 91%
rename from test/software/amazon/ion/streaming/ReaderTest.java
rename to test/com/amazon/ion/streaming/ReaderTest.java
index 72e4a83fa0..50ba1ab6d5 100644
--- a/test/software/amazon/ion/streaming/ReaderTest.java
+++ b/test/com/amazon/ion/streaming/ReaderTest.java
@@ -1,36 +1,38 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
-import static software.amazon.ion.impl.Symtabs.printLocalSymtab;
-import static software.amazon.ion.junit.IonAssert.checkNullSymbol;
+import static com.amazon.ion.impl.Symtabs.printLocalSymtab;
+import static com.amazon.ion.junit.IonAssert.checkNullSymbol;
 
+import com.amazon.ion.BinaryTest;
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonType;
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.junit.IonAssert;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Arrays;
 import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.BinaryTest;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonType;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.SymbolToken;
-import software.amazon.ion.junit.Injected.Inject;
-import software.amazon.ion.junit.IonAssert;
+
 
 public class ReaderTest
     extends ReaderTestCase
@@ -237,7 +239,7 @@ public void testReadingFloatAsBigInteger()
      * it's not what one would expect.
      */
     @Test @Ignore
-    public void testReadingFloatAsBigDecimal() // TODO amzn/ion-java#56
+    public void testReadingFloatAsBigDecimal() // TODO amzn/ion-java/issues/56
     {
         // Note that one can't represent Long.MAX_VALUE as a double, there's
         // not enough bits in the mantissa!
diff --git a/test/software/amazon/ion/streaming/ReaderTestCase.java b/test/com/amazon/ion/streaming/ReaderTestCase.java
similarity index 74%
rename from test/software/amazon/ion/streaming/ReaderTestCase.java
rename to test/com/amazon/ion/streaming/ReaderTestCase.java
index 54034f9a1d..c39208d8b0 100644
--- a/test/software/amazon/ion/streaming/ReaderTestCase.java
+++ b/test/com/amazon/ion/streaming/ReaderTestCase.java
@@ -1,28 +1,30 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
+import com.amazon.ion.InputStreamWrapper;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonType;
+import com.amazon.ion.ReaderChecker;
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.junit.IonAssert;
 import java.io.IOException;
 import org.junit.After;
-import software.amazon.ion.InputStreamWrapper;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonType;
-import software.amazon.ion.ReaderChecker;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.junit.IonAssert;
+
 
 
 public abstract class ReaderTestCase
diff --git a/test/software/amazon/ion/streaming/RoundTripStreamingTest.java b/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
similarity index 88%
rename from test/software/amazon/ion/streaming/RoundTripStreamingTest.java
rename to test/com/amazon/ion/streaming/RoundTripStreamingTest.java
index 490c5fba4a..f1eb07e002 100644
--- a/test/software/amazon/ion/streaming/RoundTripStreamingTest.java
+++ b/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
@@ -1,25 +1,40 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
-
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.testdataFiles;
-import static software.amazon.ion.impl.PrivateUtils.utf8;
-import static software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.SUPPRESS;
-
+package com.amazon.ion.streaming;
+
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.testdataFiles;
+import static com.amazon.ion.impl._Private_Utils.utf8;
+import static com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.SUPPRESS;
+
+import com.amazon.ion.IonBinaryWriter;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonLoader;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.RoundTripTest;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.junit.IonAssert;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.util.Equivalence;
+import com.amazon.ion.util.Printer;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -27,21 +42,9 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonLoader;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.RoundTripTest;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.junit.IonAssert;
-import software.amazon.ion.junit.Injected.Inject;
-import software.amazon.ion.system.IonTextWriterBuilder;
-import software.amazon.ion.util.Equivalence;
 
 /**
- * TODO amzn/ion-java#29 Refactor this test class, possible duplicate test coverage in
+ * TODO amzn/ion-java/issues/29 Refactor this test class, possible duplicate test coverage in
  * {@link RoundTripTest}.
  */
 public class RoundTripStreamingTest
@@ -51,13 +54,13 @@ public class RoundTripStreamingTest
     static final boolean _debug_dump_datagrams = false;
 
     @Inject("testFile")
-    public static final File[] FILES =
-        testdataFiles(GLOBAL_SKIP_LIST, GOOD_IONTESTS_FILES);
+    public static final File[] FILES = testdataFiles(GLOBAL_SKIP_LIST, GOOD_IONTESTS_FILES);
 
     @Inject("copySpeed")
     public static final StreamCopySpeed[] STREAM_COPY_SPEEDS =
         StreamCopySpeed.values();
 
+    private Printer       myPrinter;
     private StringBuilder myBuilder;
     private byte[]        myBuffer;
     private File          myTestFile;
@@ -73,8 +76,9 @@ public void setUp()
     throws Exception
     {
         super.setUp();
+        myPrinter = new Printer();
         myBuilder = new StringBuilder();
-        myBuffer = PrivateUtils.loadFileBytes(myTestFile);
+        myBuffer = _Private_Utils.loadFileBytes(myTestFile);
     }
 
     @Override
@@ -82,6 +86,7 @@ public void setUp()
     public void tearDown()
     throws Exception
     {
+        myPrinter = null;
         myBuilder = null;
         myBuffer  = null;
         super.tearDown();
@@ -101,13 +106,7 @@ private String makeString(IonDatagram datagram)
             else {
                 myBuilder.append(' ');
             }
-            IonWriter writer = IonTextWriterBuilder.standard().build(myBuilder);
-            try {
-                value.writeTo(writer);
-            }
-            finally {
-                writer.close();
-            }
+            myPrinter.print(value, myBuilder);
             // Why is this here?  myBuilder.append('\n');
         }
 
@@ -153,7 +152,10 @@ private byte[] makeBinary(byte[] buffer)
     throws IOException
     {
         IonReader in = makeIterator(buffer);
-        byte[] buf = writeBinaryBytes(in);
+        IonBinaryWriter bw = system().newBinaryWriter();
+
+        bw.writeValues(in);
+        byte[] buf = bw.getBytes(); // this is binary
 
         return buf;
     }
diff --git a/test/software/amazon/ion/streaming/SeekableReaderTest.java b/test/com/amazon/ion/streaming/SeekableReaderTest.java
similarity index 88%
rename from test/software/amazon/ion/streaming/SeekableReaderTest.java
rename to test/com/amazon/ion/streaming/SeekableReaderTest.java
index 1c73e42b8d..cc6ce61cda 100644
--- a/test/software/amazon/ion/streaming/SeekableReaderTest.java
+++ b/test/com/amazon/ion/streaming/SeekableReaderTest.java
@@ -1,31 +1,32 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonType;
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.Span;
+import com.amazon.ion.TestUtils;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.Injected.Inject;
+import com.amazon.ion.junit.IonAssert;
 import java.io.File;
 import java.io.IOException;
 import org.junit.Assert;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonType;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.Span;
-import software.amazon.ion.TestUtils;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.junit.IonAssert;
-import software.amazon.ion.junit.Injected.Inject;
 
 /**
  * @see NonSeekableReaderTest
@@ -205,7 +206,7 @@ public void testHoistingOrderedStruct()
     throws IOException
     {
         File file = getTestdataFile("good/structOrdered.10n");
-        byte[] binary = PrivateUtils.loadFileBytes(file);
+        byte[] binary = _Private_Utils.loadFileBytes(file);
 
         read(binary);
 
diff --git a/test/software/amazon/ion/streaming/SpanReaderTest.java b/test/com/amazon/ion/streaming/SpanReaderTest.java
similarity index 86%
rename from test/software/amazon/ion/streaming/SpanReaderTest.java
rename to test/com/amazon/ion/streaming/SpanReaderTest.java
index 358b957bc5..646906caca 100644
--- a/test/software/amazon/ion/streaming/SpanReaderTest.java
+++ b/test/com/amazon/ion/streaming/SpanReaderTest.java
@@ -1,26 +1,27 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonType;
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.Span;
+import com.amazon.ion.TestUtils;
+import com.amazon.ion.junit.Injected.Inject;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonType;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.Span;
-import software.amazon.ion.TestUtils;
-import software.amazon.ion.junit.Injected.Inject;
 
 /**
  * @see NonSpanReaderTest
diff --git a/test/software/amazon/ion/streaming/SpanTests.java b/test/com/amazon/ion/streaming/SpanTests.java
similarity index 60%
rename from test/software/amazon/ion/streaming/SpanTests.java
rename to test/com/amazon/ion/streaming/SpanTests.java
index 73f6f57005..54d23fcdde 100644
--- a/test/software/amazon/ion/streaming/SpanTests.java
+++ b/test/com/amazon/ion/streaming/SpanTests.java
@@ -1,22 +1,24 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
+import com.amazon.ion.util.SpansTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
-import software.amazon.ion.util.SpansTest;
+
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
diff --git a/test/software/amazon/ion/streaming/TextSpanTest.java b/test/com/amazon/ion/streaming/TextSpanTest.java
similarity index 60%
rename from test/software/amazon/ion/streaming/TextSpanTest.java
rename to test/com/amazon/ion/streaming/TextSpanTest.java
index 4040f4b5b7..cd8c5a340e 100644
--- a/test/software/amazon/ion/streaming/TextSpanTest.java
+++ b/test/com/amazon/ion/streaming/TextSpanTest.java
@@ -1,28 +1,29 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.streaming;
+package com.amazon.ion.streaming;
 
-import static software.amazon.ion.ReaderMaker.valuesExcluding;
-import static software.amazon.ion.util.Spans.currentSpan;
+import static com.amazon.ion.ReaderMaker.valuesExcluding;
+import static com.amazon.ion.util.Spans.currentSpan;
 
+import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.Span;
+import com.amazon.ion.TextSpan;
+import com.amazon.ion.facet.Facets;
+import com.amazon.ion.junit.Injected.Inject;
 import org.junit.Test;
-import software.amazon.ion.ReaderMaker;
-import software.amazon.ion.Span;
-import software.amazon.ion.TextSpan;
-import software.amazon.ion.facet.Facets;
-import software.amazon.ion.junit.Injected.Inject;
 
 /**
  * @see NonTextSpanTest
diff --git a/test/software/amazon/ion/system/IonBinaryWriterBuilderTest.java b/test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java
similarity index 86%
rename from test/software/amazon/ion/system/IonBinaryWriterBuilderTest.java
rename to test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java
index bee7917c68..410ac4509e 100644
--- a/test/software/amazon/ion/system/IonBinaryWriterBuilderTest.java
+++ b/test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java
@@ -1,40 +1,42 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
 
+import static com.amazon.ion.TestUtils.symbolTableEquals;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static software.amazon.ion.TestUtils.symbolTableEquals;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.impl.Symtabs;
+import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
+import com.amazon.ion.impl._Private_IonWriter;
+import com.amazon.ion.impl._Private_Utils;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import org.junit.Assert;
 import org.junit.Test;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.impl.PrivateIonBinaryWriterBuilder;
-import software.amazon.ion.impl.PrivateIonWriter;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.impl.Symtabs;
+
 
 public class IonBinaryWriterBuilderTest
 {
@@ -76,7 +78,7 @@ public void testCustomCatalog()
 
         OutputStream out = new ByteArrayOutputStream();
         IonWriter writer = b.build(out);
-        assertSame(catalog, ((PrivateIonWriter)writer).getCatalog());
+        assertSame(catalog, ((_Private_IonWriter)writer).getCatalog());
 
         IonCatalog catalog2 = new SimpleCatalog();
         b.setCatalog(catalog2);
@@ -123,7 +125,7 @@ public void testStreamCopyOptimized()
 
         OutputStream out = new ByteArrayOutputStream();
         IonWriter w = b.build(out);
-        assertTrue(((PrivateIonWriter)w).isStreamCopyOptimized());
+        assertTrue(((_Private_IonWriter)w).isStreamCopyOptimized());
     }
 
 
@@ -206,8 +208,8 @@ public void testSymtabValueFactory()
     {
         IonSystem system = IonSystemBuilder.standard().build();
 
-        PrivateIonBinaryWriterBuilder b =
-            PrivateIonBinaryWriterBuilder.standard();
+        _Private_IonBinaryWriterBuilder b =
+            _Private_IonBinaryWriterBuilder.standard();
         b.setSymtabValueFactory(system);
         assertSame(system, b.getSymtabValueFactory());
 
@@ -219,11 +221,11 @@ public void testSymtabValueFactory()
     @Test(expected = UnsupportedOperationException.class)
     public void testSymtabValueFactoryImmutability()
     {
-        PrivateIonBinaryWriterBuilder b =
-            PrivateIonBinaryWriterBuilder.standard();
+        _Private_IonBinaryWriterBuilder b =
+            _Private_IonBinaryWriterBuilder.standard();
         b.setSymtabValueFactory(IonSystemBuilder.standard().build());
 
-        PrivateIonBinaryWriterBuilder b2 = b.immutable();
+        _Private_IonBinaryWriterBuilder b2 = b.immutable();
         b2.setSymtabValueFactory(null);
     }
 
@@ -235,13 +237,13 @@ public void testSymtabValueFactoryImmutability()
     public void testInitialSymtab()
         throws IOException
     {
-        SymbolTable sst = PrivateUtils.systemSymtab(1);
+        SymbolTable sst = _Private_Utils.systemSymtab(1);
 
         SymbolTable lst0 = Symtabs.localSymbolTableFactory().newLocalSymtab(sst);
         lst0.intern("hello");
 
-        PrivateIonBinaryWriterBuilder b =
-            PrivateIonBinaryWriterBuilder.standard();
+        _Private_IonBinaryWriterBuilder b =
+            _Private_IonBinaryWriterBuilder.standard();
         b.setInitialSymbolTable(lst0);
         assertSame(lst0, b.getInitialSymbolTable());
 
@@ -277,15 +279,15 @@ public void testInitialSymtab()
     @Test
     public void testImmutableInitialSymtab()
     {
-        SymbolTable sst = PrivateUtils.systemSymtab(1);
+        SymbolTable sst = _Private_Utils.systemSymtab(1);
 
         // Immutable local symtabs shouldn't get copied.
         SymbolTable lst = Symtabs.localSymbolTableFactory().newLocalSymtab(sst);
         lst.intern("hello");
         lst.makeReadOnly();
 
-        PrivateIonBinaryWriterBuilder b =
-            PrivateIonBinaryWriterBuilder.standard();
+        _Private_IonBinaryWriterBuilder b =
+            _Private_IonBinaryWriterBuilder.standard();
         b.setInitialSymbolTable(lst);
         assertSame(lst, b.getInitialSymbolTable());
 
@@ -300,11 +302,11 @@ public void testImmutableInitialSymtab()
     @Test(expected = UnsupportedOperationException.class)
     public void testInitialSymtabImmutability()
     {
-        PrivateIonBinaryWriterBuilder b =
-            PrivateIonBinaryWriterBuilder.standard();
+        _Private_IonBinaryWriterBuilder b =
+            _Private_IonBinaryWriterBuilder.standard();
         b.setInitialSymbolTable(null);
 
-        PrivateIonBinaryWriterBuilder b2 = b.immutable();
+        _Private_IonBinaryWriterBuilder b2 = b.immutable();
         b2.setInitialSymbolTable(null);
     }
 
diff --git a/test/software/amazon/ion/system/IonReaderBuilderTest.java b/test/com/amazon/ion/system/IonReaderBuilderTest.java
similarity index 83%
rename from test/software/amazon/ion/system/IonReaderBuilderTest.java
rename to test/com/amazon/ion/system/IonReaderBuilderTest.java
index 06b938396e..6b15bb458b 100644
--- a/test/software/amazon/ion/system/IonReaderBuilderTest.java
+++ b/test/com/amazon/ion/system/IonReaderBuilderTest.java
@@ -1,33 +1,34 @@
 /*
- * Copyright 2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonType;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.impl.PrivateIonBinaryWriterBuilder;
 
 /**
  * Note: because the IonReaderBuilder is used by IonSystem.newReader(...),
@@ -102,7 +103,7 @@ public void testSystemFreeRoundtrip() throws IOException
     {
         // No IonSystem in sight.
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-        IonWriter writer = PrivateIonBinaryWriterBuilder.standard().build(out);
+        IonWriter writer = _Private_IonBinaryWriterBuilder.standard().build(out);
         writer.writeInt(42);
         writer.finish();
         IonReader reader = IonReaderBuilder.standard().build(out.toByteArray());
diff --git a/test/software/amazon/ion/system/IonSystemBuilderTest.java b/test/com/amazon/ion/system/IonSystemBuilderTest.java
similarity index 80%
rename from test/software/amazon/ion/system/IonSystemBuilderTest.java
rename to test/com/amazon/ion/system/IonSystemBuilderTest.java
index 32914809b9..ad3f40b0fb 100644
--- a/test/software/amazon/ion/system/IonSystemBuilderTest.java
+++ b/test/com/amazon/ion/system/IonSystemBuilderTest.java
@@ -1,33 +1,34 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
 
+import static com.amazon.ion.impl.lite._Private_LiteDomTrampoline.isLiteSystem;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static software.amazon.ion.impl.lite.PrivateLiteDomTrampoline.isLiteSystem;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.impl._Private_IonWriter;
 import java.io.ByteArrayOutputStream;
 import org.junit.Test;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.impl.PrivateIonWriter;
-import software.amazon.ion.system.IonSystemBuilder;
-import software.amazon.ion.system.SimpleCatalog;
+
 
 public class IonSystemBuilderTest
 {
@@ -106,14 +107,6 @@ public void testWithCatalog()
         assertSame(catalog, b.getCatalog());
     }
 
-    @Test
-    public void testLite()
-    {
-        IonSystemBuilder b = IonSystemBuilder.standard().copy();
-        IonSystem ion = b.build();
-        assertTrue(isLiteSystem(ion));
-    }
-
     //-------------------------------------------------------------------------
 
     @Test
@@ -125,7 +118,7 @@ public void testStreamCopyOptimized()
         assertTrue(isLiteSystem(ion));
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         IonWriter w = ion.newBinaryWriter(out);
-        assertTrue(((PrivateIonWriter)w).isStreamCopyOptimized());
+        assertTrue(((_Private_IonWriter)w).isStreamCopyOptimized());
     }
 
 
diff --git a/test/software/amazon/ion/system/IonTextWriterBuilderTest.java b/test/com/amazon/ion/system/IonTextWriterBuilderTest.java
similarity index 90%
rename from test/software/amazon/ion/system/IonTextWriterBuilderTest.java
rename to test/com/amazon/ion/system/IonTextWriterBuilderTest.java
index 0e10244fe1..5c819debdf 100644
--- a/test/software/amazon/ion/system/IonTextWriterBuilderTest.java
+++ b/test/com/amazon/ion/system/IonTextWriterBuilderTest.java
@@ -1,45 +1,45 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
 
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.system.IonTextWriterBuilder.ASCII;
+import static com.amazon.ion.system.IonTextWriterBuilder.UTF8;
+import static com.amazon.ion.system.IonTextWriterBuilder.LstMinimizing.EVERYTHING;
+import static com.amazon.ion.system.IonTextWriterBuilder.LstMinimizing.LOCALS;
+import static com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.SUPPRESS;
+import static com.amazon.ion.system.IonWriterBuilder.IvmMinimizing.ADJACENT;
+import static com.amazon.ion.system.IonWriterBuilder.IvmMinimizing.DISTANT;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.fail;
-import static software.amazon.ion.SystemSymbols.ION_1_0;
-import static software.amazon.ion.system.IonTextWriterBuilder.ASCII;
-import static software.amazon.ion.system.IonTextWriterBuilder.UTF8;
-import static software.amazon.ion.system.IonTextWriterBuilder.LstMinimizing.EVERYTHING;
-import static software.amazon.ion.system.IonTextWriterBuilder.LstMinimizing.LOCALS;
-import static software.amazon.ion.system.IonWriterBuilder.InitialIvmHandling.SUPPRESS;
-import static software.amazon.ion.system.IonWriterBuilder.IvmMinimizing.ADJACENT;
-import static software.amazon.ion.system.IonWriterBuilder.IvmMinimizing.DISTANT;
 
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.impl.Symtabs;
+import com.amazon.ion.impl._Private_IonWriter;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
 import org.junit.Assert;
 import org.junit.Test;
-import software.amazon.ion.IonCatalog;
-import software.amazon.ion.IonWriter;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.impl.PrivateIonWriter;
-import software.amazon.ion.impl.Symtabs;
-import software.amazon.ion.system.IonTextWriterBuilder;
-import software.amazon.ion.system.SimpleCatalog;
+
 
 public class IonTextWriterBuilderTest
 {
@@ -87,7 +87,7 @@ public void testCustomCatalog()
 
         StringBuilder out = new StringBuilder();
         IonWriter writer = b.build(out);
-        assertSame(catalog, ((PrivateIonWriter)writer).getCatalog());
+        assertSame(catalog, ((_Private_IonWriter)writer).getCatalog());
 
         IonCatalog catalog2 = new SimpleCatalog();
         b.setCatalog(catalog2);
diff --git a/test/software/amazon/ion/system/SimpleCatalogTest.java b/test/com/amazon/ion/system/SimpleCatalogTest.java
similarity index 87%
rename from test/software/amazon/ion/system/SimpleCatalogTest.java
rename to test/com/amazon/ion/system/SimpleCatalogTest.java
index c5f040ea0f..251dce0001 100644
--- a/test/software/amazon/ion/system/SimpleCatalogTest.java
+++ b/test/com/amazon/ion/system/SimpleCatalogTest.java
@@ -1,19 +1,27 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.system;
+package com.amazon.ion.system;
 
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
@@ -23,14 +31,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 import org.junit.Test;
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonString;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonSystem;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.SymbolTable;
-import software.amazon.ion.system.SimpleCatalog;
+
 
 public class SimpleCatalogTest
     extends IonTestCase
diff --git a/test/software/amazon/ion/util/EquivalenceTest.java b/test/com/amazon/ion/util/EquivalenceTest.java
similarity index 93%
rename from test/software/amazon/ion/util/EquivalenceTest.java
rename to test/com/amazon/ion/util/EquivalenceTest.java
index 5cfa7cf979..676469187c 100644
--- a/test/software/amazon/ion/util/EquivalenceTest.java
+++ b/test/com/amazon/ion/util/EquivalenceTest.java
@@ -1,26 +1,26 @@
 /*
- * Copyright 2016-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
+import com.amazon.ion.IonFloat;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonValue;
 import org.junit.Ignore;
 import org.junit.Test;
-import software.amazon.ion.IonFloat;
-import software.amazon.ion.IonStruct;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.IonValue;
-import software.amazon.ion.util.Equivalence;
 
 public class EquivalenceTest
     extends IonTestCase
@@ -358,7 +358,7 @@ public void testStringSymbol() {
         assertNotIonEq(ion("\"hi\""), ion("'hi'"));
     }
 
-    // TODO amzn/ion-java#58 : Remove the ignore annotation from this test after
+    // TODO amzn/ion-java/issues/58 : Remove the ignore annotation from this test after
     // making the required changes to Equivalence.Field.hashCode.
     @Ignore
     @Test
@@ -389,7 +389,7 @@ public void testFieldEquals1() {
         assertTrue(f1.hashCode() != f3.hashCode());
     }
 
-    // TODO amzn/ion-java#58 : Remove the ignore annotation from this test after
+    // TODO amzn/ion-java/issues/58 : Remove the ignore annotation from this test after
     // making the required changes to Equivalence.Field.hashCode.
     @Ignore
     @Test
diff --git a/test/software/amazon/ion/util/IonStreamUtilsTest.java b/test/com/amazon/ion/util/IonStreamUtilsTest.java
similarity index 78%
rename from test/software/amazon/ion/util/IonStreamUtilsTest.java
rename to test/com/amazon/ion/util/IonStreamUtilsTest.java
index 603f0c24c6..f95f8a6545 100644
--- a/test/software/amazon/ion/util/IonStreamUtilsTest.java
+++ b/test/com/amazon/ion/util/IonStreamUtilsTest.java
@@ -1,24 +1,25 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
+import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
+import static com.amazon.ion.impl._Private_Utils.EMPTY_BYTE_ARRAY;
+import static com.amazon.ion.util.IonStreamUtils.isIonBinary;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static software.amazon.ion.impl.PrivateIonConstants.BINARY_VERSION_MARKER_1_0;
-import static software.amazon.ion.impl.PrivateUtils.EMPTY_BYTE_ARRAY;
-import static software.amazon.ion.util.IonStreamUtils.isIonBinary;
 
 import org.junit.Test;
 
diff --git a/test/software/amazon/ion/util/JarInfoTest.java b/test/com/amazon/ion/util/JarInfoTest.java
similarity index 82%
rename from test/software/amazon/ion/util/JarInfoTest.java
rename to test/com/amazon/ion/util/JarInfoTest.java
index 3f7abafa91..3994ed4e15 100644
--- a/test/software/amazon/ion/util/JarInfoTest.java
+++ b/test/com/amazon/ion/util/JarInfoTest.java
@@ -1,20 +1,25 @@
 /*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
-import static org.junit.Assert.assertEquals;
+import com.amazon.ion.IonException;
+import com.amazon.ion.Timestamp;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -22,15 +27,11 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.jar.Manifest;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import software.amazon.ion.IonException;
-import software.amazon.ion.Timestamp;
+
+import static org.junit.Assert.*;
 
 public class JarInfoTest
 {
-
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
@@ -42,8 +43,8 @@ private static String getAttributes(String manifestVersion)
     private static String getIonJavaAttributes(String buildTime, String version)
     {
         return getAttributes("1.0")
-            + "Ion-Java-Build-Time: " + buildTime + "\n"
-            + "Ion-Java-Project-Version: " + version + "\n";
+                + "Ion-Java-Build-Time: " + buildTime + "\n"
+                + "Ion-Java-Project-Version: " + version + "\n";
     }
 
     private static Manifest getManifest(String attributes) throws IOException
@@ -105,4 +106,4 @@ public void testConflictingManifests() throws Exception
         new JarInfo(manifests);
     }
 
-}
+}
\ No newline at end of file
diff --git a/test/software/amazon/ion/util/NullOutputStream.java b/test/com/amazon/ion/util/NullOutputStream.java
similarity index 63%
rename from test/software/amazon/ion/util/NullOutputStream.java
rename to test/com/amazon/ion/util/NullOutputStream.java
index 843f0fc4e5..584531905c 100644
--- a/test/software/amazon/ion/util/NullOutputStream.java
+++ b/test/com/amazon/ion/util/NullOutputStream.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2015-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/test/com/amazon/ion/util/PrinterTest.java b/test/com/amazon/ion/util/PrinterTest.java
new file mode 100644
index 0000000000..fc26658003
--- /dev/null
+++ b/test/com/amazon/ion/util/PrinterTest.java
@@ -0,0 +1,678 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.util;
+
+
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+
+import com.amazon.ion.BlobTest;
+import com.amazon.ion.ClobTest;
+import com.amazon.ion.IntTest;
+import com.amazon.ion.IonBlob;
+import com.amazon.ion.IonBool;
+import com.amazon.ion.IonClob;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonDecimal;
+import com.amazon.ion.IonFloat;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonNull;
+import com.amazon.ion.IonSexp;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.impl._Private_Utils;
+import org.junit.Before;
+import org.junit.Test;
+
+
+public class PrinterTest
+    extends IonTestCase
+{
+    private Printer myPrinter;
+
+
+    @Before @Override
+    public void setUp()
+        throws Exception
+    {
+        super.setUp();
+        myPrinter = new Printer();
+    }
+
+    public IonInt int123()
+    {
+        return system().newInt(123);
+    }
+
+
+    public IonSymbol symbol(String text)
+    {
+        return system().newSymbol(text);
+    }
+
+    public IonSymbol symbolHello()
+    {
+        return symbol("hello");
+    }
+
+    public IonSymbol symbolNotEquals()
+    {
+        return symbol("!=");
+    }
+
+    public void checkRendering(String expected, IonValue value)
+        throws Exception
+    {
+        StringBuilder w = new StringBuilder();
+        myPrinter.print(value, w);
+        assertEquals("Printer output", expected, w.toString());
+    }
+
+    public void checkNullRendering(String image, IonValue value)
+        throws Exception
+    {
+        boolean origUntypedNulls = myPrinter.myOptions.untypedNulls;
+
+        myPrinter.myOptions.untypedNulls = false;
+        checkRendering(image, value);
+
+        myPrinter.myOptions.untypedNulls = true;
+        checkRendering("null", value);
+
+        myPrinter.myOptions.untypedNulls = origUntypedNulls;
+    }
+
+
+    //=========================================================================
+    // Test cases
+
+    @Test
+    public void testPrintingAnnotations()
+        throws Exception
+    {
+        IonNull value = (IonNull) oneValue("an::$0::null");
+        checkRendering("an::$0::null", value);
+
+        value.addTypeAnnotation("+");
+        value.addTypeAnnotation("\u0000");
+        value.addTypeAnnotation("$0");
+        checkRendering("an::$0::'+'::'\\0'::'$0'::null", value);
+
+        myPrinter.setPrintSymbolAsString(true);
+        checkRendering("an::$0::'+'::'\\0'::'$0'::null", value);
+        myPrinter.setPrintStringAsJson(true);
+        checkRendering("an::$0::'+'::'\\0'::'$0'::null", value);
+        myPrinter.setPrintSymbolAsString(false);
+        myPrinter.setPrintStringAsJson(false);
+
+        myPrinter.setSkipAnnotations(true);
+        checkRendering("null", value);
+        myPrinter.setSkipAnnotations(false);
+
+        IonSexp s = system().newEmptySexp();
+        s.add(value);
+        checkRendering("(an::$0::'+'::'\\0'::'$0'::null)", s);
+        myPrinter.setPrintSymbolAsString(true);
+        checkRendering("(an::$0::'+'::'\\0'::'$0'::null)", s);
+        myPrinter.setPrintStringAsJson(true);
+        checkRendering("(an::$0::'+'::'\\0'::'$0'::null)", s);
+
+        value.setTypeAnnotations("boo", "boo");
+        checkRendering("boo::boo::null", value);
+    }
+
+
+    @Test
+    public void testPrintingBlob()
+        throws Exception
+    {
+        IonBlob value = system().newNullBlob();
+        checkNullRendering("null.blob", value);
+
+        for (int i = 0; i < BlobTest.TEST_DATA.length; i++)
+        {
+            BlobTest.TestData td = BlobTest.TEST_DATA[i];
+            value.setBytes(td.bytes);
+
+            myPrinter.setPrintBlobAsString(true);
+            checkRendering("\"" + td.base64 + "\"", value);
+
+            myPrinter.setPrintBlobAsString(false);
+            checkRendering("{{" + td.base64 + "}}", value);
+        }
+
+        value = (IonBlob) oneValue("{{}}");
+        checkRendering("{{}}", value);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::{{}}", value);
+    }
+
+
+    @Test
+    public void testPrintingBool()
+        throws Exception
+    {
+        IonBool value = system().newNullBool();
+        checkNullRendering("null.bool", value);
+
+        value.setValue(true);
+        checkRendering("true", value);
+
+        value.setValue(false);
+        checkRendering("false", value);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::false", value);
+    }
+
+
+    @Test
+    public void testPrintingClob()
+        throws Exception
+    {
+        IonClob value = system().newNullClob();
+        checkNullRendering("null.clob", value);
+
+        value.setBytes(ClobTest.SAMPLE_ASCII_AS_UTF8);
+        checkRendering("{{\"" + ClobTest.SAMPLE_ASCII + "\"}}", value);
+
+        // TODO test "real" UTF8 and other encodings.
+
+        value = (IonClob) oneValue("{{\"\"}}");
+        checkRendering("{{\"\"}}", value);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::{{\"\"}}", value);
+
+        myPrinter.setPrintClobAsString(true);
+        checkRendering("an::\"\"", value);
+
+        value.clearTypeAnnotations();
+        value.setBytes(ClobTest.SAMPLE_ASCII_AS_UTF8);
+        checkRendering("\"" + ClobTest.SAMPLE_ASCII + "\"", value);
+
+        value = (IonClob) oneValue("{{'''Ab\\0'''}}");
+        myPrinter.setPrintClobAsString(false);
+        checkRendering("{{\"Ab\\0\"}}", value);
+        myPrinter.setPrintClobAsString(true);
+        checkRendering("\"Ab\\0\"", value);
+        myPrinter.setPrintStringAsJson(true);
+        checkRendering("\"Ab\\u0000\"", value);
+    }
+
+
+    @Test
+    public void testPrintingDatagram()
+        throws Exception
+    {
+        IonDatagram dg = loader().load("a b c");
+        StringBuilder w = new StringBuilder();
+        myPrinter.print(dg, w);
+        String text = w.toString();
+        assertTrue("missing version marker",
+                   text.startsWith(ION_1_0 + ' '));
+        assertTrue("missing data",
+                   text.endsWith(" a b c"));
+
+        // Just force symtab analysis and make sure output is still okay
+        dg.getBytes(new byte[dg.byteSize()]);
+        text = w.toString();
+        assertTrue("missing version marker",
+                   text.startsWith(ION_1_0 + ' '));
+        assertTrue("missing data",
+                   text.endsWith(" a b c"));
+
+        // We shouldn't inject a local table if its not needed.
+
+        String data = "2 '+' [2,'+']";
+        String dataWithIvm = ION_1_0 + ' ' + data;
+        dg = loader().load(dataWithIvm);
+        checkRendering(dataWithIvm, dg);
+
+        myPrinter.setSkipSystemValues(true);
+        checkRendering(data, dg);
+
+        myPrinter.setPrintDatagramAsList(true);
+        checkRendering("[2,'+',[2,'+']]", dg);
+
+        myPrinter.setPrintDatagramAsList(false);
+        myPrinter.setSkipSystemValues(false);
+        myPrinter.setJsonMode();
+        checkRendering("[2,\"+\",[2,\"+\"]]", dg);
+    }
+
+    @Test
+    public void testDatagramWithoutSymbols()
+    throws Exception
+    {
+        IonDatagram dg = system().newDatagram();
+        dg.add().newInt(1);
+        checkRendering(ION_1_0 + " 1", dg);
+    }
+
+    @Test
+    public void testSimplifyingChainedLocalSymtab()
+    throws Exception
+    {
+        myPrinter.myOptions.simplifySystemValues = true;
+
+        String ionText =
+            ION_SYMBOL_TABLE + "::{}"
+            + " x"
+            + " " + ION_SYMBOL_TABLE + "::{}"
+            + " y";
+        IonDatagram dg = loader().load(ionText);
+        checkRendering(ION_1_0 + " x y", dg);
+    }
+
+    @Test
+    public void testPrintingDecimal()
+        throws Exception
+    {
+        IonDecimal value = system().newNullDecimal();
+        checkNullRendering("null.decimal", value);
+
+        value.setValue(-123);
+        checkRendering("-123.", value);
+
+        value.setValue(456);
+        checkRendering("456.", value);
+
+        value.setValue(0);
+        checkRendering("0.", value);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::0.", value);
+
+        value = (IonDecimal) oneValue("0d42");
+        checkRendering("0d42", value);
+
+        value = (IonDecimal) oneValue("0d+42");
+        checkRendering("0d42", value);
+
+        value = (IonDecimal) oneValue("0d-42");
+        checkRendering("0d-42", value);
+
+        value = (IonDecimal) oneValue("100d-1");
+        checkRendering("10.0", value);
+
+        value = (IonDecimal) oneValue("100d3");
+        checkRendering("100d3", value);
+
+        myPrinter.setPrintDecimalAsFloat(true);
+        checkRendering("100e3", value);
+    }
+
+
+    @Test
+    public void testPrintingFloat()
+        throws Exception
+    {
+        IonFloat value = system().newNullFloat();
+        checkNullRendering("null.float", value);
+
+        value.setValue(-123);
+        checkRendering("-123e0", value);
+
+        value.setValue(456);
+        checkRendering("456e0", value);
+
+        value.setValue(0);
+        checkRendering("0e0", value);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::0e0", value);
+
+        value = (IonFloat) oneValue("1e4");
+        checkRendering("10000e0", value);
+
+        value = (IonFloat) oneValue("1e+4");
+        checkRendering("10000e0", value);
+
+        value = (IonFloat) oneValue("125e-2");
+        checkRendering("1.25e0", value);
+    }
+
+
+    @Test
+    public void testPrintingInt()
+        throws Exception
+    {
+        IonInt value = system().newNullInt();
+        checkNullRendering("null.int", value);
+
+        value.setValue(-123);
+        checkRendering("-123", value);
+
+        value.setValue(456);
+        checkRendering("456", value);
+
+        value.setValue(IntTest.A_LONG_INT);
+        checkRendering(Long.toString(IntTest.A_LONG_INT), value);
+
+        value.setValue(0);
+        checkRendering("0", value);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::0", value);
+    }
+
+
+    @Test
+    public void testPrintingList()
+        throws Exception
+    {
+        IonList value = system().newNullList();
+        checkNullRendering("null.list", value);
+
+        value.add(system().newNull());
+        checkRendering("[null]", value);
+
+        value.add(int123());
+        checkRendering("[null,123]", value);
+
+        value.add(symbolNotEquals());
+        value.add(symbolHello());
+        value.add(symbol("null"));
+        checkRendering("[null,123,'!=',hello,'null']", value);
+
+        value = (IonList) oneValue("[]");
+        checkRendering("[]", value);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::[]", value);
+    }
+
+
+    @Test
+    public void testPrintingNull()
+        throws Exception
+    {
+        IonNull value = system().newNull();
+        checkNullRendering("null", value);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::null", value);
+    }
+
+
+    @Test
+    public void testPrintingSexp()
+        throws Exception
+    {
+        IonSexp value = system().newNullSexp();
+        checkNullRendering("null.sexp", value);
+
+        value.add(system().newNull());
+        checkRendering("(null)", value);
+
+        value.add(int123());
+        checkRendering("(null 123)", value);
+
+        value.add(symbolNotEquals());
+        value.add(symbolHello());
+        value.add(symbol("null"));
+        checkRendering("(null 123 != hello 'null')", value);
+
+        myPrinter.setPrintSexpAsList(true);
+        checkRendering("[null,123,'!=',hello,'null']", value);
+        myPrinter.setPrintSymbolAsString(true);
+        checkRendering("[null,123,\"!=\",\"hello\",\"null\"]", value);
+
+        value = (IonSexp) oneValue("()");
+        checkRendering("[]", value);
+        myPrinter.setPrintSexpAsList(false);
+        checkRendering("()", value);
+
+        myPrinter.setPrintSymbolAsString(false);
+        value.addTypeAnnotation("an");
+        checkRendering("an::()", value);
+    }
+
+
+    @Test
+    public void testPrintingString()
+        throws Exception
+    {
+        IonString value = system().newNullString();
+        checkNullRendering("null.string", value);
+
+        value.setValue("Adam E");
+        checkRendering("\"Adam E\"", value);
+
+        value.setValue("Oh, \"Hello!\"");
+        checkRendering("\"Oh, \\\"Hello!\\\"\"", value);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::\"Oh, \\\"Hello!\\\"\"", value);
+
+        value = system().newString("Ab\u0000");
+        checkRendering("\"Ab\\0\"", value);
+        myPrinter.setPrintStringAsJson(true);
+        checkRendering("\"Ab\\u0000\"", value);
+
+        // TODO check escaping
+    }
+
+
+    @Test
+    public void testPrintingStruct()
+        throws Exception
+    {
+        IonStruct value = system().newNullStruct();
+        checkNullRendering("null.struct", value);
+
+        value.put("foo", system().newNull());
+        checkRendering("{foo:null}", value);
+
+        // TODO this is too strict, order shouldn't matter.
+        value.put("123", system().newNull());
+        checkRendering("{foo:null,'123':null}", value);
+
+        value.add("foo", int123());
+        checkRendering("{foo:null,'123':null,foo:123}", value);
+
+        myPrinter.setPrintSymbolAsString(true);
+        checkRendering("{\"foo\":null,\"123\":null,\"foo\":123}", value);
+
+        value = (IonStruct) oneValue("{}");
+        checkRendering("{}", value);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::{}", value);
+
+
+        value = (IonStruct) oneValue("an::{$0:null}");
+        value.addTypeAnnotation("\u0007");
+        value.put("A\u0000", system().newInt(12));
+        checkRendering("an::'\\a'::{\"$0\":null,\"A\\0\":12}", value);
+        myPrinter.setPrintStringAsJson(true);
+        checkRendering("an::'\\a'::{\"$0\":null,\"A\\u0000\":12}", value);
+    }
+
+
+    @Test
+    public void testPrintingSymbol()
+        throws Exception
+    {
+        IonSymbol value = system().newNullSymbol();
+        checkNullRendering("null.symbol", value);
+
+        value.setValue("Adam E");
+        checkRendering("'Adam E'", value);
+
+        // Symbols that look like keywords.
+        value.setValue("null");
+        checkRendering("'null'", value);
+        value.setValue("true");
+        checkRendering("'true'", value);
+        value.setValue("false");
+        checkRendering("'false'", value);
+        value.setValue("null.int");
+        checkRendering("'null.int'", value);
+
+        // Operators standalone
+        value.setValue("%");
+        checkRendering("'%'", value);
+
+        value.setValue("Oh, \"Hello!\"");
+        checkRendering("'Oh, \"Hello!\"'", value);
+        // not: checkRendering("'Oh, \\\"Hello!\\\"'", value);
+
+        myPrinter.setPrintSymbolAsString(true);
+        checkRendering("\"Oh, \\\"Hello!\\\"\"", value);
+        myPrinter.setPrintSymbolAsString(false);
+
+        value.setValue("Oh, 'Hello there!'");
+        checkRendering("'Oh, \\\'Hello there!\\\''", value);
+
+        myPrinter.setPrintSymbolAsString(true);
+        checkRendering("\"Oh, 'Hello there!'\"", value);
+        myPrinter.setPrintSymbolAsString(false);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::'Oh, \\\'Hello there!\\\''", value);
+
+        // TODO check escaping
+
+        value = system().newSymbol("Ab\u0000");
+        checkRendering("'Ab\\0'", value);
+        myPrinter.setPrintSymbolAsString(true);
+        checkRendering("\"Ab\\0\"", value);
+        myPrinter.setPrintStringAsJson(true);
+        checkRendering("\"Ab\\u0000\"", value);
+        myPrinter.setPrintSymbolAsString(false);
+        checkRendering("'Ab\\0'", value);
+
+        value = system().newSymbol("$99"); // Known, sidlike text
+        checkRendering("'$99'", value);
+        myPrinter.setPrintSymbolAsString(true);
+        checkRendering("\"$99\"", value);
+        myPrinter.setPrintStringAsJson(true);
+        checkRendering("\"$99\"", value);
+        myPrinter.setPrintSymbolAsString(false);
+        checkRendering("'$99'", value);
+
+        value = (IonSymbol) system().singleValue("$0");  // Unknown symbol
+        checkRendering("$0", value);
+        myPrinter.setPrintSymbolAsString(true);
+        checkRendering("\"$0\"", value);
+        myPrinter.setPrintStringAsJson(true);
+        checkRendering("\"$0\"", value);
+        myPrinter.setPrintSymbolAsString(false);
+        checkRendering("$0", value);
+    }
+
+    @Test
+    public void testPrintingSidlikeSymbol()
+        throws Exception
+    {
+        IonSymbol value = system().newSymbol("$");
+        checkRendering("$", value);
+
+        value = system().newSymbol("$0");
+        checkRendering("'$0'", value);
+
+        value = system().newSymbol("$99");
+        checkRendering("'$99'", value);
+    }
+
+    // TODO annotations
+    // TODO field names
+
+
+    @Test
+    public void testPrintingTimestamp()
+        throws Exception
+    {
+        IonTimestamp value = system().newNullTimestamp();
+        checkNullRendering("null.timestamp", value);
+
+        value = (IonTimestamp) oneValue("2007-05-15T18:45-00:00");
+        checkRendering("2007-05-15T18:45-00:00", value);
+
+        value = (IonTimestamp) oneValue("2007-05-15T18:45Z");
+        checkRendering("2007-05-15T18:45Z", value);
+
+        // offset +0 shortens to Z
+        value = (IonTimestamp) oneValue("2007-05-15T18:45+00:00");
+        checkRendering("2007-05-15T18:45Z", value);
+
+        value = (IonTimestamp) oneValue("2007-05-15T18:45+01:12");
+        checkRendering("2007-05-15T18:45+01:12", value);
+
+        value = (IonTimestamp) oneValue("2007-05-15T18:45-10:01");
+        checkRendering("2007-05-15T18:45-10:01", value);
+
+        value.addTypeAnnotation("an");
+        checkRendering("an::2007-05-15T18:45-10:01", value);
+
+        myPrinter.setPrintTimestampAsString(true);
+        checkRendering("an::\"2007-05-15T18:45-10:01\"", value);
+
+        myPrinter.setJsonMode();
+        checkRendering("" + value.getMillis(), value);
+
+        // TODO test printTimestampAsMillis
+    }
+
+    private static final String Q = "\"";
+
+    @Test
+    public void testJsonEscapes()
+    throws Exception
+    {
+        String ionEscapes =
+            Q + "\\0\\a\\b\\t\\n\\f\\r\\v\\\"\\'\\?\\\\\\/\\\n" + Q;
+        String jsonEscapes =
+            Q + "\\u0000\\u0007\\b\\t\\n\\f\\r\\u000b\\\"'?\\\\/" + Q;
+
+        IonString value = (IonString) system().singleValue(ionEscapes);
+
+        myPrinter.setJsonMode();
+        checkRendering(jsonEscapes, value);
+    }
+
+
+    @Test
+    public void testJsonEscapeNonBmp() throws Exception {
+        final String literal = new StringBuilder()
+            .append("'''")
+            .append('\uDAF7')
+            .append('\uDE56')
+            .append("'''")
+            .toString();
+
+        final byte[] utf8Bytes = _Private_Utils.utf8(literal);
+
+        final IonDatagram dg = loader().load(utf8Bytes);
+        final StringBuilder out = new StringBuilder();
+        final Printer json = new Printer();
+        json.setJsonMode();
+        json.print(dg.get(0), out);
+
+        assertEquals(
+            "\"\\uDAF7\\uDE56\"".toLowerCase(),
+            out.toString().toLowerCase()
+        );
+    }
+}
diff --git a/test/software/amazon/ion/util/RepeatInputStream.java b/test/com/amazon/ion/util/RepeatInputStream.java
similarity index 82%
rename from test/software/amazon/ion/util/RepeatInputStream.java
rename to test/com/amazon/ion/util/RepeatInputStream.java
index 315ce39963..f5bae1c206 100644
--- a/test/software/amazon/ion/util/RepeatInputStream.java
+++ b/test/com/amazon/ion/util/RepeatInputStream.java
@@ -1,18 +1,19 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/test/software/amazon/ion/util/SpansTest.java b/test/com/amazon/ion/util/SpansTest.java
similarity index 61%
rename from test/software/amazon/ion/util/SpansTest.java
rename to test/com/amazon/ion/util/SpansTest.java
index a097928c30..33355caa4f 100644
--- a/test/software/amazon/ion/util/SpansTest.java
+++ b/test/com/amazon/ion/util/SpansTest.java
@@ -1,25 +1,26 @@
 /*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
+import static com.amazon.ion.util.Spans.currentSpan;
 import static org.junit.Assert.assertNull;
-import static software.amazon.ion.util.Spans.currentSpan;
 
+import com.amazon.ion.Span;
+import com.amazon.ion.TextSpan;
 import org.junit.Test;
-import software.amazon.ion.Span;
-import software.amazon.ion.TextSpan;
 
 public class SpansTest
 {
diff --git a/test/software/amazon/ion/util/TextTest.java b/test/com/amazon/ion/util/TextTest.java
similarity index 84%
rename from test/software/amazon/ion/util/TextTest.java
rename to test/com/amazon/ion/util/TextTest.java
index 42d5d02b0d..6011adfd7c 100644
--- a/test/software/amazon/ion/util/TextTest.java
+++ b/test/com/amazon/ion/util/TextTest.java
@@ -1,27 +1,28 @@
 /*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License").
  * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
+ * A copy of the License is located at
  *
- *     http://aws.amazon.com/apache2.0/
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
-package software.amazon.ion.util;
+package com.amazon.ion.util;
 
+import com.amazon.ion.BlobTest;
+import com.amazon.ion.BlobTest.TestData;
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonTestCase;
+import com.amazon.ion.impl._Private_IonTextAppender;
 import java.math.BigDecimal;
 import org.junit.Test;
-import software.amazon.ion.BlobTest;
-import software.amazon.ion.Decimal;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.BlobTest.TestData;
-import software.amazon.ion.impl.PrivateIonTextAppender;
-import software.amazon.ion.util.IonTextUtils;
+
 
 public class TextTest
     extends IonTestCase
@@ -120,9 +121,9 @@ private void unquotedAnywhere(String symbol)
                      IonTextUtils.symbolVariant(symbol));
 
         // unquoted in sexp
-        assertFalse(PrivateIonTextAppender.symbolNeedsQuoting(symbol, false));
+        assertFalse(_Private_IonTextAppender.symbolNeedsQuoting(symbol, false));
         // unquoted elsewhere
-        assertFalse(PrivateIonTextAppender.symbolNeedsQuoting(symbol, true));
+        assertFalse(_Private_IonTextAppender.symbolNeedsQuoting(symbol, true));
     }
 
     private void quotedEverywhere(String symbol)
@@ -131,9 +132,9 @@ private void quotedEverywhere(String symbol)
                      IonTextUtils.symbolVariant(symbol));
 
         // Quoted in sexp
-        assertTrue(PrivateIonTextAppender.symbolNeedsQuoting(symbol, false));
+        assertTrue(_Private_IonTextAppender.symbolNeedsQuoting(symbol, false));
         // Quoted elsewhere
-        assertTrue(PrivateIonTextAppender.symbolNeedsQuoting(symbol, true));
+        assertTrue(_Private_IonTextAppender.symbolNeedsQuoting(symbol, true));
     }
 
     private void unquotedInSexp(String symbol)
@@ -142,9 +143,9 @@ private void unquotedInSexp(String symbol)
                      IonTextUtils.symbolVariant(symbol));
 
         // unquoted in sexp
-        assertFalse(PrivateIonTextAppender.symbolNeedsQuoting(symbol, false));
+        assertFalse(_Private_IonTextAppender.symbolNeedsQuoting(symbol, false));
         // quoted elsewheres
-        assertTrue(PrivateIonTextAppender.symbolNeedsQuoting(symbol, true));
+        assertTrue(_Private_IonTextAppender.symbolNeedsQuoting(symbol, true));
     }
 
 
diff --git a/test/software/amazon/ion/BinaryTestGenerator.py b/test/software/amazon/ion/BinaryTestGenerator.py
deleted file mode 100755
index 53717a30b1..0000000000
--- a/test/software/amazon/ion/BinaryTestGenerator.py
+++ /dev/null
@@ -1,271 +0,0 @@
-#!/apollo/bin/env -e Python python
-
-import struct
-
-_COOKIE = struct.pack('>L', 0x10140100L)
-
-def var_uint(val) :
-    assert isinstance(val, (int, long))
-    assert val >= 0
-    bytes = []
-    while val > 0x7F :
-        chunk = (val & 0x7F)
-        bytes.append(chunk)
-        val >>= 7
-    bytes.append(val)
-    # terminating high bit
-    bytes[0] |= 0x80
-    return ''.join(chr(x) for x in reversed(bytes))
-
-def var_int(val) :
-    assert isinstance(val, (int, long))
-    bytes = []
-    if val < 0 :
-        val = -val
-        sbit = 0x40
-    else :
-        sbit = 0
-    while val > 0x7F :
-        chunk = (val & 0x7F)
-        bytes.append(chunk)
-        val >>= 7
-    if val > 0x3F :
-        # can't quite fit the sign bit
-        bytes.append(val)
-        bytes.append(sbit)
-    else :
-        bytes.append(val | sbit)
-    # terminating high bit
-    bytes[0] |= 0x80
-    return ''.join(chr(x) for x in reversed(bytes))
-
-def raw_uint(val) :
-    assert isinstance(val, (int, long))
-    assert val >= 0
-    bytes = []
-    while val > 0xFF :
-        bytes.append(val & 0xFF)
-        val >>= 8
-    bytes.append(val)
-    return ''.join(chr(x) for x in reversed(bytes))
-
-def raw_int(val) :
-    assert isinstance(val, (int, long))
-    bytes = []
-    if val < 1 :
-        val = -val
-        sbit = 0x40
-    else :
-        sbit = 0
-    while val > 0xFF :
-        bytes.append(chr(val & 0xFF))
-        val >>= 8
-    if val > 0x7F :
-        # can't quite fit the sign bit
-        bytes.append(val)
-        bytes.append(sbit)
-    else :
-        bytes.append(val | sbit)
-    return ''.join(chr(x) for x in reversed(bytes))
-
-def gen_type(high, low) :
-    assert high >= 0 and high <= 15
-    assert low >= 0 and low <= 15
-    return struct.pack('>B', ((high << 4 ) | low))
-
-_LN_EXT     = 14
-_LN_NULL    = 15
-
-def gen_type_len(high, len) :
-    assert high >= 0 and high <= 15
-    assert len is None or len >= 0
-    if len is None :
-        return gen_type(high, _LN_NULL)
-    elif len < _LN_EXT :
-        return gen_type(high, len)
-    else :
-        return gen_type(high, _LN_EXT) + var_uint(len)
-
-def gen_null(high) :
-    return gen_type(high, _LN_NULL)
-
-_HN_NULL        = 0
-_HN_BOOL        = 1
-_HN_PINT        = 2
-_HN_NINT        = 3
-_HN_FLOAT       = 4
-_HN_DECIMAL     = 5
-_HN_TIMESTAMP   = 6
-_HN_SYMBOL      = 7
-_HN_STRING      = 8
-_HN_CLOB        = 9
-_HN_BLOB        = 10
-_HN_LIST        = 11
-_HN_SEXP        = 12
-_HN_STRUCT      = 13
-_HN_ANNOTATION  = 14
-
-def gen_int(val) :
-    assert val is None or isinstance(val, (int, long))
-    if val is None :
-        return gen_null(_HN_PINT)
-    
-    if val < 0 :
-        val = -val
-        type = _HN_NINT
-    else :
-        type = _HN_PINT
-    
-    if val != 0 :
-        raw_bits = raw_uint(val)
-    else :
-        raw_bits = ''
-    return gen_type_len(type, len(raw_bits)) \
-            + raw_bits
-
-def gen_float(val) :
-    assert val is None or isinstance(val, (float, int))
-    if val is None :
-        return gen_null(_HN_FLOAT)
-
-    if isinstance(val, int) :
-        val = float(int)
-    # note this violates the standard
-    return gen_type(_HN_FLOAT, 8) + struct.pack('>d', val)
-
-def gen_raw_decimal(val) :
-    from decimal import Decimal
-    assert isinstance(val, (str, int, long, Decimal))
-    if isinstance(val, (str, int, long)) :
-        val = Decimal(val)
-    sign, digits, exponent = val.as_tuple()
-    mantissa = 0L
-    for digit in digits :
-        mantissa *= 10
-        mantissa += digit
-    if sign == 1 :
-        mantissa = -mantissa
-    print mantissa, exponent
-    raw_mantissa = raw_int(mantissa)
-    raw_exponent = var_int(exponent)
-    return raw_exponent + raw_mantissa
-
-def gen_decimal(val) :
-    from decimal import Decimal
-    assert val is None or isinstance(val, (str, int, long, Decimal))
-    if val is None :
-        return gen_null(_HN_DECIMAL)
-
-    raw_decimal = gen_raw_decimal(val)
-    return gen_type_len(_HN_DECIMAL, len(raw_decimal)) \
-            + raw_decimal
-
-def gen_timestamp(milliseconds, offset = 0) :
-    from decimal import Decimal
-    assert milliseconds is None or isinstance(milliseconds, (str, int, long, Decimal))
-    assert isinstance(offset, (int, long))
-    if milliseconds is None :
-        return gen_null(_HN_TIMESTAMP)
-
-    raw_offset = var_int(offset)
-    raw_ms = gen_raw_decimal(milliseconds)
-    return gen_type_len(_HN_TIMESTAMP, len(raw_offset) + len(raw_ms)) \
-            + raw_offset \
-            + raw_ms
-
-def gen_symbol(val) :
-    assert val is None or isinstance(val, (int, long))
-    # symbols must be greater than 0
-    assert val > 0
-    if val is None :
-        return gen_null(_HN_SYMBOL)
-
-    raw_symbol = raw_uint(val)
-    return gen_type_len(_HN_SYMBOL, len(raw_symbol)) \
-            + raw_symbol
-
-def gen_byte_type(type, val) :
-    assert val is None or isinstance(val, str)
-    if val is None :
-        return gen_null(type)
-
-    return gen_type_len(type, len(val)) + val
-
-def gen_string(val) :
-    assert val is None or isinstance(val, (str, unicode))
-    if isinstance(val, unicode):
-        val = val.encode('UTF-8')
-    else :
-        try :
-            val.decode('UTF-8')
-        except UnicodeDecodeError :
-            raise ValueError, 'Byte string must be UTF-8'
-    return gen_byte_type(_HN_STRING, val)
-
-def gen_clob(val) :
-    assert val is None or isinstance(val, str)
-    return gen_byte_type(_HN_CLOB, val)
-
-def gen_blob(val) :
-    assert val is None or isinstance(val, str)
-    return gen_byte_type(_HN_BLOB, val)
-
-def gen_sequence_type(type, *blobs) :
-    assert all(isinstance(blob, str) for blob in blobs)
-    return gen_type_len(type, sum(len(blob) for blob in blobs)) \
-            + ''.join(blobs)
-
-def gen_list(*blobs) :
-    return gen_sequence_type(_HN_LIST, *blobs)
-
-def gen_sexp(*blobs) :
-    return gen_sequence_type(_HN_SEXP, *blobs)
-
-def gen_struct(*pairs) :
-    assert all(isinstance(id, (int, long)) \
-            and id > 0 and isinstance(bytes, str) \
-                for id, bytes in pairs)
-    data = ''.join('%s%s' % (var_uint(id), bytes) for id, bytes in pairs)
-    data_len = len(data)
-    return gen_type_len(_HN_STRUCT, data_len) + data
-
-def gen_ann(bytes, *syms) :
-    assert isinstance(bytes, str)
-    assert all(isinstance(x, (int, long)) and x > 0 for x in syms)
-    anns = ''.join(var_uint(x) for x in syms)
-    anns_len = len(anns)
-    anns_len_bytes = var_uint(anns_len)
-    val_len = len(anns_len_bytes) + anns_len + len(bytes)
-    return gen_type_len(_HN_ANNOTATION, val_len) \
-            + anns_len_bytes \
-            + anns \
-            + bytes
-
-def lit(*vals):
-    from itertools import chain
-    return '"%s"' % ' '.join('%02X' % ord(x) for x in chain(*vals))
-
-_SYM_ION                = 1
-_SYM_ION_1_0            = 2
-_SYM_ION_SYMBOL_TABLE   = 3
-_SYM_NAME               = 4
-_SYM_VERSION            = 5
-_SYM_IMPORTS            = 6
-_SYM_SYMBOLS            = 7
-_SYM_MAX_ID             = 8
-
-_SYS_SYMBOLS            = 9;
-
-if __name__ == '__main__' :
-    print '$ion_1_0::{symbols : struct.null} 1e0'
-    print lit(
-        gen_ann(
-            gen_struct(
-                (_SYM_SYMBOLS, gen_null(_HN_STRUCT))
-            ),
-            _SYM_ION_1_0),
-        gen_float(1.0)
-    )
-    print lit(
-        gen_decimal(1)
-    )
diff --git a/test/software/amazon/ion/EquivsTest.java b/test/software/amazon/ion/EquivsTest.java
deleted file mode 100644
index 8a6549345d..0000000000
--- a/test/software/amazon/ion/EquivsTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2007-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package software.amazon.ion;
-
-import static software.amazon.ion.TestUtils.EQUIVS_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-
-import java.io.File;
-import software.amazon.ion.junit.Injected.Inject;
-
-public class EquivsTest
-    extends EquivsTestCase
-{
-    @Inject("testFile")
-    public static final File[] FILES =
-        TestUtils.testdataFiles(GLOBAL_SKIP_LIST, EQUIVS_IONTESTS_FILES);
-
-    public EquivsTest()
-    {
-        super(true);
-    }
-}
diff --git a/test/software/amazon/ion/NonEquivsTest.java b/test/software/amazon/ion/NonEquivsTest.java
deleted file mode 100644
index ff25ad4ffa..0000000000
--- a/test/software/amazon/ion/NonEquivsTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2013-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package software.amazon.ion;
-
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.NON_EQUIVS_IONTESTS_FILEs;
-
-import java.io.File;
-import software.amazon.ion.junit.Injected.Inject;
-
-public class NonEquivsTest
-    extends EquivsTestCase
-{
-    @Inject("testFile")
-    public static final File[] FILES =
-        TestUtils.testdataFiles(GLOBAL_SKIP_LIST, NON_EQUIVS_IONTESTS_FILEs);
-
-    public NonEquivsTest()
-    {
-        super(false);
-    }
-}
diff --git a/test/software/amazon/ion/impl/IonImplUtilsTest.java b/test/software/amazon/ion/impl/IonImplUtilsTest.java
deleted file mode 100644
index b626317f61..0000000000
--- a/test/software/amazon/ion/impl/IonImplUtilsTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright 2011-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-
-package software.amazon.ion.impl;
-
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.ion.impl.PrivateUtils;
-
-public class IonImplUtilsTest
-{
-    @Test
-    public void testEmptyUtf8()
-    {
-        byte[] bytes = PrivateUtils.utf8("");
-        Assert.assertArrayEquals(PrivateUtils.EMPTY_BYTE_ARRAY, bytes);
-    }
-
-    @Test
-    public void testEasyUtf8()
-    throws Exception
-    {
-        String input = "abcdefghijklm";
-        byte[] bytes = PrivateUtils.utf8(input);
-        byte[] direct = input.getBytes("UTF-8");
-        Assert.assertArrayEquals(direct, bytes);
-    }
-}
diff --git a/test/software/amazon/ion/impl/PrivateScalarConversionsTest.java b/test/software/amazon/ion/impl/PrivateScalarConversionsTest.java
deleted file mode 100644
index b19b301839..0000000000
--- a/test/software/amazon/ion/impl/PrivateScalarConversionsTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package software.amazon.ion.impl;
-
-import org.junit.Assert;
-import org.junit.Test;
-import software.amazon.ion.Decimal;
-
-import static org.junit.Assert.*;
-
-public class PrivateScalarConversionsTest {
-
-    private long decimalToLong(final Decimal d) {
-        PrivateScalarConversions.ValueVariant v = new PrivateScalarConversions.ValueVariant();
-        v.setValue(d);
-
-        v.cast(PrivateScalarConversions.FNID_FROM_DECIMAL_TO_LONG);
-        return v.getLong();
-    }
-
-    @Test
-    public void decimalToLong() {
-        assertEquals(1, decimalToLong(Decimal.valueOf(1L)));
-    }
-
-    @Test
-    public void decimalToMinLong() {
-        assertEquals(Long.MAX_VALUE, decimalToLong(Decimal.valueOf(Long.MAX_VALUE)));
-    }
-
-    @Test
-    public void decimalToMaxLong() {
-        assertEquals(Long.MIN_VALUE, decimalToLong(Decimal.valueOf(Long.MIN_VALUE)));
-    }
-}
\ No newline at end of file
diff --git a/test/software/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java b/test/software/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
deleted file mode 100644
index 7bb57e17c9..0000000000
--- a/test/software/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package software.amazon.ion.impl.lite;
-
-import software.amazon.ion.IonDatagram;
-import software.amazon.ion.IonSequence;
-
-public class IonDatagramLiteSublistTest extends BaseIonSequenceLiteSublistTestCase {
-
-    protected IonSequence newSequence() {
-        final IonDatagram datagram = SYSTEM.newDatagram();
-        for(int i : INTS) {
-            datagram.add(SYSTEM.newInt(INTS[i]));
-        }
-
-        return datagram;
-    }
-}
diff --git a/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java b/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
deleted file mode 100644
index 3637df1eba..0000000000
--- a/test/software/amazon/ion/impl/lite/IonDatagramLiteTest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package software.amazon.ion.impl.lite;
-
-import software.amazon.ion.IonSequence;
-
-public class IonDatagramLiteTest extends BaseIonSequenceLiteTestCase {
-    @Override
-    protected IonSequence newEmptySequence() {
-        return SYSTEM.newDatagram();
-    }
-}
diff --git a/test/software/amazon/ion/impl/lite/IonListLiteTest.java b/test/software/amazon/ion/impl/lite/IonListLiteTest.java
deleted file mode 100644
index 2da37f29b7..0000000000
--- a/test/software/amazon/ion/impl/lite/IonListLiteTest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package software.amazon.ion.impl.lite;
-
-import software.amazon.ion.IonSequence;
-
-public class IonListLiteTest extends BaseIonSequenceLiteTestCase {
-    @Override
-    protected IonSequence newEmptySequence() {
-        return SYSTEM.newEmptyList();
-    }
-}
diff --git a/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java b/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java
deleted file mode 100644
index 3b3fbfaa96..0000000000
--- a/test/software/amazon/ion/impl/lite/IonSexpLiteTest.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package software.amazon.ion.impl.lite;
-
-import software.amazon.ion.IonSequence;
-
-public class IonSexpLiteTest extends BaseIonSequenceLiteTestCase {
-    @Override
-    protected IonSequence newEmptySequence() {
-        return SYSTEM.newEmptySexp();
-    }
-}
diff --git a/test/software/amazon/ion/streaming/BadIonStreamingTest.java b/test/software/amazon/ion/streaming/BadIonStreamingTest.java
deleted file mode 100644
index ce02918b5a..0000000000
--- a/test/software/amazon/ion/streaming/BadIonStreamingTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2008-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at:
- *
- *     http://aws.amazon.com/apache2.0/
- *
- * or in the "license" file accompanying this file. This file is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
- * language governing permissions and limitations under the License.
- */
-package software.amazon.ion.streaming;
-
-import static software.amazon.ion.TestUtils.BAD_IONTESTS_FILES;
-import static software.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
-import static software.amazon.ion.TestUtils.testdataFiles;
-
-import java.io.File;
-import java.io.IOException;
-import org.junit.Ignore;
-import org.junit.Test;
-import software.amazon.ion.IonException;
-import software.amazon.ion.IonReader;
-import software.amazon.ion.IonTestCase;
-import software.amazon.ion.TestUtils;
-import software.amazon.ion.impl.PrivateUtils;
-import software.amazon.ion.junit.Injected.Inject;
-
-public class BadIonStreamingTest
-extends IonTestCase
-{
-    private static final boolean _debug_output_errors = false;
-
-
-    @Inject("testFile")
-    public static final File[] FILES = testdataFiles(GLOBAL_SKIP_LIST,
-                                                     BAD_IONTESTS_FILES);
-
-
-    private File myTestFile;
-
-    public void setTestFile(File file)
-    {
-        myTestFile = file;
-    }
-
-
-    @Test(expected = IonException.class)
-    public void testReadingScalars()
-    throws Exception
-    {
-        readFile( true );
-    }
-
-
-    @Ignore // TODO amzn/ion-java#7
-    @Test(expected = IonException.class)
-    public void testSkippingScalars()
-    throws Exception
-    {
-        // Readers don't validate while skipping scalars
-        // so we won't throw exceptions for all bad files.
-        readFile( false );
-    }
-
-    private void readFile(boolean materializeScalars)
-    throws IOException
-    {
-        try
-        {
-            byte[] buf = PrivateUtils.loadFileBytes(myTestFile);
-            IonReader it = system().newReader(buf);
-            TestUtils.deepRead(it, materializeScalars);
-        }
-        catch (IonException e)
-        {
-            /* good - we're expecting an error, there are testing bad input */
-            if (_debug_output_errors) {
-                System.out.print(this.myTestFile.getName());
-                System.out.print(": ");
-                System.out.println(e.getMessage());
-            }
-            throw e;
-        }
-    }
-}

From 1b0c86b79e887934380173f97f1a2dff937f24fe Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Thu, 11 Apr 2019 13:27:23 -0700
Subject: [PATCH 056/490] target JDK 6

Some older users require jdk 1.5 we can't set the target to anything lower than 1.6 starting with JDK 9 so setting it to 1.6 at least

Important to note that we are still required to be JDK 1.5 compatible
---
 pom.xml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 33792c29df..25cb777b6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -81,6 +81,15 @@
     <sourceDirectory>src</sourceDirectory>
     <testSourceDirectory>test</testSourceDirectory>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
       <plugin>
         <!--
         Since the format of maven.build.timestamp cannot be changed
@@ -331,4 +340,4 @@
     </profile>
   </profiles>
 
-</project>
\ No newline at end of file
+</project>

From 6de9797668674e84c81234545dbcd1ceb5fb8753 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Thu, 11 Apr 2019 15:51:25 -0700
Subject: [PATCH 057/490] Release 1.4.0

---
 README.md |  2 +-
 pom.xml   | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 5c27014596..b09ec8ea08 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.3.1</version>
+  <version>1.4.0</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 25cb777b6f..a286c95bd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.3.1</version>
+  <version>1.4.0</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>
@@ -65,6 +65,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
     <build.year>${maven.build.timestamp}</build.year>
+    <jdkVersion>1.6</jdkVersion>
   </properties>
 
   <dependencies>
@@ -86,8 +87,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.8.0</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>${jdkVersion}</source>
+          <target>${jdkVersion}</target>
         </configuration>
       </plugin>
       <plugin>
@@ -264,6 +265,9 @@
   <profiles>
     <profile>
       <id>release</id>
+      <properties>
+        <jdkVersion>1.5</jdkVersion>
+      </properties>
       <build>
         <plugins>
           <plugin>

From 0c603a693001e2f314c6021347754e4b1935c6b5 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Wed, 17 Apr 2019 16:00:50 -0700
Subject: [PATCH 058/490] adding SNAPSHOT suffix in pom.xml (#231)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a286c95bd0..83a2387c8d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.4.0</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 4ce1f0f58c6a5a8e42d0425ccdb36e38be3e2270 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Fri, 19 Apr 2019 13:57:04 -0700
Subject: [PATCH 059/490] fixing gitignore (#232)

bin/ and tmp/ can match relative paths, e.g. com/amazon/ion/impl/bin
---
 .gitignore | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index c6d00a25a0..b47ba47a34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,8 +14,6 @@ tmp*
 ### Eclipse ###
 
 .metadata
-bin/
-tmp/
 *.tmp
 *.bak
 *.swp

From 9f713950875bc5a0c9ffb6ad126c824bad405e53 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <barbosf@amazon.com>
Date: Tue, 30 Apr 2019 15:50:34 -0700
Subject: [PATCH 060/490] Adding groupId change notice to Readme.md (#234)

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b09ec8ea08..a3f8d729eb 100644
--- a/README.md
+++ b/README.md
@@ -64,7 +64,14 @@ dependency into your project's `pom.xml`:
 </dependency>
 ```
 
+#### Legacy group id
+
+Originally ion-java was published using the group id `software.amazon.ion`. Since 1.4.0 the
+official groupId was changed to `com.amazon.ion` to be consistent with other Amazon open
+source libraries. We still maintain the legacy group id but strongly encourage users to migrate
+to the official one.
+
 ## Using the Library
 A great way to get started is to use the [Ion cookbook](http://amzn.github.io/ion-docs/cookbook.html).
 The [API documentation](http://www.javadoc.io/doc/com.amazon.ion/ion-java) will give a lot
-of detailed information about how to use the library.
\ No newline at end of file
+of detailed information about how to use the library.

From cd32f3948bfcb962496bef40c6e2c047fc97e317 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <develar@gmail.com>
Date: Mon, 13 May 2019 18:05:34 +0200
Subject: [PATCH 061/490] Make IllegalStateException() more descriptive (#238)

Report current value type.
---
 .../ion/impl/IonReaderBinarySystemX.java      | 34 ++++++++-----------
 .../amazon/ion/impl/IonReaderTextRawX.java    |  4 +--
 .../amazon/ion/impl/IonReaderTextSystemX.java | 31 +++++++----------
 .../ion/impl/_Private_IonWriterBase.java      |  2 +-
 4 files changed, 30 insertions(+), 41 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
index 614ef7f5a1..840d8336a3 100644
--- a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
@@ -15,7 +15,6 @@
 
 package com.amazon.ion.impl;
 
-import com.amazon.ion.IonSystem;
 import static com.amazon.ion.IonType.SYMBOL;
 import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 
@@ -296,14 +295,19 @@ public double doubleValue()
         return _v.getDouble();
     }
 
-    public int intValue()
+    private void checkIsIntApplicableType()
     {
         if (_value_type != IonType.INT &&
-            _value_type != IonType.DECIMAL &&
-            _value_type != IonType.FLOAT)
+          _value_type != IonType.DECIMAL &&
+          _value_type != IonType.FLOAT)
         {
-            throw new IllegalStateException();
+          throw new IllegalStateException("Unexpected value type: " + _value_type);
         }
+    }
+
+    public int intValue()
+    {
+        checkIsIntApplicableType();
 
         prepare_value(AS_TYPE.int_value);
         return _v.getInt();
@@ -311,12 +315,7 @@ public int intValue()
 
     public long longValue()
     {
-        if (_value_type != IonType.INT &&
-            _value_type != IonType.DECIMAL &&
-            _value_type != IonType.FLOAT)
-        {
-            throw new IllegalStateException();
-        }
+        checkIsIntApplicableType();
 
         prepare_value(AS_TYPE.long_value);
         return _v.getLong();
@@ -324,12 +323,7 @@ public long longValue()
 
     public BigInteger bigIntegerValue()
     {
-        if (_value_type != IonType.INT &&
-            _value_type != IonType.DECIMAL &&
-            _value_type != IonType.FLOAT)
-        {
-            throw new IllegalStateException();
-        }
+        checkIsIntApplicableType();
 
         if (_value_is_null) {
             return null;
@@ -386,7 +380,7 @@ public IntegerSize getIntegerSize()
 
     public String stringValue()
     {
-        if (! IonType.isText(_value_type)) throw new IllegalStateException();
+        if (! IonType.isText(_value_type)) throw new IllegalStateException("Unexpected value type: " + _value_type);
         if (_value_is_null) return null;
 
         if (_value_type == SYMBOL) {
@@ -407,7 +401,7 @@ public String stringValue()
 
     public SymbolToken symbolValue()
     {
-        if (_value_type != SYMBOL) throw new IllegalStateException();
+        if (_value_type != SYMBOL) throw new IllegalStateException("Unexpected value type: " + _value_type);
         if (_value_is_null) return null;
 
         int sid = getSymbolId();
@@ -419,7 +413,7 @@ public SymbolToken symbolValue()
 
     int getSymbolId()
     {
-        if (_value_type != SYMBOL) throw new IllegalStateException();
+        if (_value_type != SYMBOL) throw new IllegalStateException("Unexpected value type: " + _value_type);
         if (_value_is_null) throw new NullValueException();
 
         prepare_value(AS_TYPE.int_value);
diff --git a/src/com/amazon/ion/impl/IonReaderTextRawX.java b/src/com/amazon/ion/impl/IonReaderTextRawX.java
index 9a9049aa4f..0255489888 100644
--- a/src/com/amazon/ion/impl/IonReaderTextRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextRawX.java
@@ -1338,7 +1338,7 @@ public void stepIn()
         case SEXP:
             break;
         default:
-            throw new IllegalStateException();
+            throw new IllegalStateException("Unexpected value type: " + _value_type);
         }
 
         int new_state = get_state_at_container_start(_value_type);
@@ -1382,7 +1382,7 @@ public void stepOut()
             case DATAGRAM:
                 break;
             default:
-                throw new IllegalStateException();
+                throw new IllegalStateException("Unexpected value type: " + _value_type);
             }
         }
         catch (IOException e) {
diff --git a/src/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
index c876386b72..c8f7aaeaed 100644
--- a/src/com/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
@@ -512,14 +512,19 @@ public double doubleValue()
         return _v.getDouble();
     }
 
-    public int intValue()
+    private void checkIsIntApplicableType()
     {
         if (_value_type != IonType.INT &&
-            _value_type != IonType.DECIMAL &&
-            _value_type != IonType.FLOAT)
+          _value_type != IonType.DECIMAL &&
+          _value_type != IonType.FLOAT)
         {
-            throw new IllegalStateException();
+          throw new IllegalStateException("Unexpected value type: " + _value_type);
         }
+    }
+
+    public int intValue()
+    {
+        checkIsIntApplicableType();
 
         load_or_cast_cached_value(AS_TYPE.int_value);
         return _v.getInt();
@@ -527,12 +532,7 @@ public int intValue()
 
     public long longValue()
     {
-        if (_value_type != IonType.INT &&
-            _value_type != IonType.DECIMAL &&
-            _value_type != IonType.FLOAT)
-        {
-            throw new IllegalStateException();
-        }
+        checkIsIntApplicableType();
 
         load_or_cast_cached_value(AS_TYPE.long_value);
         return _v.getLong();
@@ -541,12 +541,7 @@ public long longValue()
     @Override
     public BigInteger bigIntegerValue()
     {
-        if (_value_type != IonType.INT &&
-            _value_type != IonType.DECIMAL &&
-            _value_type != IonType.FLOAT)
-        {
-            throw new IllegalStateException();
-        }
+        checkIsIntApplicableType();
 
         load_or_cast_cached_value(AS_TYPE.bigInteger_value);
         if (_v.isNull()) return null;
@@ -583,7 +578,7 @@ public Timestamp timestampValue()
 
     public final String stringValue()
     {
-        if (! IonType.isText(_value_type)) throw new IllegalStateException();
+        if (! IonType.isText(_value_type)) throw new IllegalStateException("Unexpected value type: " + _value_type);
         if (_v.isNull()) return null;
 
         load_or_cast_cached_value(AS_TYPE.string_value);
@@ -665,7 +660,7 @@ public SymbolToken getFieldNameSymbol()
 
     public SymbolToken symbolValue()
     {
-        if (_value_type != IonType.SYMBOL) throw new IllegalStateException();
+        if (_value_type != IonType.SYMBOL) throw new IllegalStateException("Unexpected value type: " + _value_type);
         if (_v.isNull()) return null;
 
         load_or_cast_cached_value(AS_TYPE.string_value);
diff --git a/src/com/amazon/ion/impl/_Private_IonWriterBase.java b/src/com/amazon/ion/impl/_Private_IonWriterBase.java
index b04e4e5ef7..82802d938a 100644
--- a/src/com/amazon/ion/impl/_Private_IonWriterBase.java
+++ b/src/com/amazon/ion/impl/_Private_IonWriterBase.java
@@ -431,7 +431,7 @@ final void writeValueRecursively(IonType type, IonReader reader)
                 if (_debug_on) System.out.print(")");
                 break;
             default:
-                throw new IllegalStateException();
+                throw new IllegalStateException("Unknown value type: " + type);
             }
         }
     }

From bac993f9b74ef5de1cb2e9aa83c065fea8f64798 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <barbosf@amazon.com>
Date: Thu, 16 May 2019 10:58:11 -0700
Subject: [PATCH 062/490] Triggers sid resolution when getting annotations in
 text documents (#239)

* Triggers sid resolution when getting annotations in text documents

closes #237
---
 .../amazon/ion/impl/IonReaderTextRawX.java    |  6 ----
 .../amazon/ion/impl/IonReaderTextSystemX.java | 29 ++++++++++++++-----
 test/com/amazon/ion/RoundTripTest.java        |  6 ++--
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderTextRawX.java b/src/com/amazon/ion/impl/IonReaderTextRawX.java
index 0255489888..437094c920 100644
--- a/src/com/amazon/ion/impl/IonReaderTextRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextRawX.java
@@ -1321,12 +1321,6 @@ public Iterator<String> iterateTypeAnnotations()
         return _Private_Utils.stringIterator(getTypeAnnotations());
     }
 
-    public String[] getTypeAnnotations()
-    {
-        return _Private_Utils.toStrings(_annotations, _annotation_count);
-    }
-
-
     public void stepIn()
     {
         if (_value_type == null || _eof) {
diff --git a/src/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
index c8f7aaeaed..62b743a7b2 100644
--- a/src/com/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
@@ -480,20 +480,33 @@ public SymbolToken[] getTypeAnnotationSymbols()
         final int count = _annotation_count;
         if (count == 0) return SymbolToken.EMPTY_ARRAY;
 
-        SymbolTable symbols = getSymbolTable();
+        resolveAnnotationSymbols(count);
 
         SymbolToken[] result = new SymbolToken[count];
-        for (int i = 0; i < count; i++)
-        {
-            SymbolToken sym = _annotations[i];
-            SymbolToken updated = _Private_Utils.localize(symbols, sym);
-            if (updated != sym) _annotations[i] = updated;
-            result[i] = updated;
-        }
+        System.arraycopy(_annotations, 0, result, 0, count);
 
         return result;
     }
 
+    public String[] getTypeAnnotations()
+    {
+        resolveAnnotationSymbols(_annotation_count);
+        return _Private_Utils.toStrings(_annotations, _annotation_count);
+    }
+
+    /**
+     * Resolve annotations with the current symbol table.
+     */
+    private void resolveAnnotationSymbols(int count) {
+        SymbolTable symbols = getSymbolTable();
+        for (int i = 0; i < count; i++) {
+            SymbolToken sym = _annotations[i];
+            SymbolToken updated = _Private_Utils.localize(symbols, sym);
+            if (updated != sym) {
+                _annotations[i] = updated;
+            }
+        }
+    }
 
     public boolean isNullValue()
     {
diff --git a/test/com/amazon/ion/RoundTripTest.java b/test/com/amazon/ion/RoundTripTest.java
index 7d228a7c14..650bf5cac0 100644
--- a/test/com/amazon/ion/RoundTripTest.java
+++ b/test/com/amazon/ion/RoundTripTest.java
@@ -291,7 +291,7 @@ private void checkTextOutput(IonTextWriterBuilder builder)
         FileInputStream fileIn = new FileInputStream(myTestFile);
         try
         {
-            IonReader r0 = system().newSystemReader(fileIn);
+            IonReader r0 = system().newReader(fileIn);
 
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             IonWriter w = builder.build(out);
@@ -308,8 +308,8 @@ private void checkTextOutput(IonTextWriterBuilder builder)
         fileIn = new FileInputStream(myTestFile);
         try
         {
-            IonReader r0 = system().newSystemReader(fileIn);
-            IonReader r1 = system().newSystemReader(outBytes);
+            IonReader r0 = system().newReader(fileIn);
+            IonReader r1 = system().newReader(outBytes);
 
             ReaderCompare.compare(r0, r1);
         }

From a2eb014633ae90addff92c73d3d29bfb3ada75e5 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <barbosf@amazon.com>
Date: Mon, 20 May 2019 09:56:34 -0700
Subject: [PATCH 063/490] Fixes manifest main class and CLI -- options (#241)

resolves #240
---
 pom.xml                                           | 2 +-
 src/com/amazon/ion/impl/_Private_CommandLine.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 83a2387c8d..59e2f750a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
               com.amazon.ion.*,
             </Export-Package>
             <!-- This can be used to retrieve the compiled JarInfo. -->
-            <Main-Class>com.amazon.ion.impl.PrivateCommandLine</Main-Class>
+            <Main-Class>com.amazon.ion.impl._Private_CommandLine</Main-Class>
             <!-- Add these properties to the manifest so they may be retrieved at runtime. -->
             <Ion-Java-Build-Time>${build.time}</Ion-Java-Build-Time>
             <Ion-Java-Project-Version>${project.version}</Ion-Java-Project-Version>
diff --git a/src/com/amazon/ion/impl/_Private_CommandLine.java b/src/com/amazon/ion/impl/_Private_CommandLine.java
index 2296d400e6..902b327d67 100644
--- a/src/com/amazon/ion/impl/_Private_CommandLine.java
+++ b/src/com/amazon/ion/impl/_Private_CommandLine.java
@@ -91,10 +91,10 @@ private static int getArgumentId(String arg)
             }
         }
         if (arg.startsWith("--") && arg.length() > 2) {
-            if (arg.equals("help")) {
+            if (arg.equals("--help")) {
                 return argid_HELP;
             }
-            if (arg.equals("version")) {
+            if (arg.equals("--version")) {
                 return argid_VERSION;
             }
         }

From 938440a2b8a6ec320db8057416f3e9ea413f5eb5 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 29 May 2019 15:35:49 -0700
Subject: [PATCH 064/490] Adds an Equivalence option to specify an epsilon to
 use when comparing float values.

---
 src/com/amazon/ion/util/Equivalence.java      | 172 +++++++++++++++---
 test/com/amazon/ion/util/EquivalenceTest.java |  62 ++++++-
 2 files changed, 202 insertions(+), 32 deletions(-)

diff --git a/src/com/amazon/ion/util/Equivalence.java b/src/com/amazon/ion/util/Equivalence.java
index dbbd391b2c..70759b884f 100644
--- a/src/com/amazon/ion/util/Equivalence.java
+++ b/src/com/amazon/ion/util/Equivalence.java
@@ -61,6 +61,20 @@
  *</pre>
  *
  * <p>
+ * Additional options are available by configuring an <code>Equivalence</code>
+ * instance using {@link Equivalence.Builder}. For example:
+ *
+ * <pre>
+ *     com.amazon.ion.util.Equivalence equivalence =
+ *         new com.amazon.ion.util.Equivalence.Builder()
+ *             .withEpsilon(1e-6)
+ *             .build();
+ *     IonValue v1 = ...;
+ *     IonValue v2 = ...;
+ *     equivalence.ionValueEquals( v1, v2 );
+ * </pre>
+ *
+ * <p>
  * <h3>Ion Equivalence</h3>
  * In order to make Ion a useful model to describe data, we must first define
  * the notion of equivalence for all values representable in Ion. Equivalence
@@ -104,7 +118,19 @@
  * (A, V), where A is an ordered list of annotations, and V is an Ion Primitive
  * Data or Ion Complex Data value. The list of annotations, A is an tuple of Ion
  * Symbols (a specific type of Ion Primitive).
-
+ *
+ * <p>
+ * <h3>Terminology</h3>
+ * Within this class, <i>strict</i> equivalence refers to Ion data model
+ * equivalence as defined above and by the
+ * <a href="http://amzn.github.io/ion-docs/docs/spec.html">Ion
+ * Specification</a>. <i>Structural</i> or <i>non-strict</i> equivalence
+ * follows the same rules as strict equivalence, except that
+ * <ul>
+ *   <li>Annotations are not considered, and</li>
+ *   <li>Timestamps that represent the same instant in time are always
+ *   considered equivalent.</li>
+ * </ul>
  */
 public final class Equivalence {
 
@@ -115,7 +141,78 @@ public final class Equivalence {
      */
     private static final boolean PUBLIC_COMPARISON_API = false;
 
-    private Equivalence() {
+    /**
+     * Configuration that requires strict data equivalence.
+     * @see #ionEquals(IonValue, IonValue)
+     */
+    private static final Configuration STRICT_CONFIGURATION = new Configuration(new Builder().withStrict(true));
+
+    /**
+     * Configuration that requires structural equivalence without considering annotations.
+     * @see #ionEqualsByContent(IonValue, IonValue)
+     */
+    private static final Configuration NON_STRICT_CONFIGURATION = new Configuration(new Builder().withStrict(false));
+
+    /**
+     * Contains the configuration to use when comparing Ion values.
+     */
+    static final class Configuration {
+        private final boolean isStrict;
+        private final Double epsilon;
+
+        Configuration(Builder builder) {
+            this.isStrict = builder.isStrict;
+            this.epsilon = builder.epsilon;
+        }
+    }
+
+    /**
+     * Constructs {@link Equivalence} instances.
+     */
+    public static final class Builder {
+
+        private boolean isStrict = true;
+        private Double epsilon = null;
+
+        /**
+         * When true, checks for strict data equivalence over two Ion Values.
+         * When false, checks for structural data equivalence over two Ion
+         * Values. See {@link Equivalence} for discussion of the differences
+         * between the two.
+         * Default: true.
+         * @param isStrict the value.
+         * @return this builder.
+         */
+        public Builder withStrict(boolean isStrict) {
+            this.isStrict = isStrict;
+            return this;
+        }
+
+        /**
+         * The maximum absolute difference between two Ion float values for
+         * which the two values will be considered equivalent. Default: Ion
+         * float values will only be considered equivalent when
+         * <code>Double.compare(a, b) == 0</code>.
+         * @param epsilon the value.
+         * @return this builder.
+         */
+        public Builder withEpsilon(double epsilon) {
+            this.epsilon = epsilon;
+            return this;
+        }
+
+        /**
+         * @return a new Equivalence using this builder's configuration.
+         */
+        public Equivalence build() {
+            return new Equivalence(new Configuration(this));
+        }
+    }
+
+    private final Configuration configuration;
+
+    private Equivalence(Configuration configuration) {
+        this.configuration = configuration;
     }
 
 
@@ -166,13 +263,13 @@ private static int compareSymbolTokens(SymbolToken tok1,
      * and cannot contain duplicate elements, hence we cannot use it.
      */
     private static final Map<Field, Field>
-        convertToMultiSet(final IonStruct struct, final boolean strict) {
+        convertToMultiSet(final IonStruct struct, final Configuration configuration) {
 
         final Map<Field, Field> structMultiSet =
             new HashMap<Field, Field>();
 
         for (final IonValue val : struct) {
-            final Field item = new Field(val, strict);
+            final Field item = new Field(val, configuration);
             Field curr = structMultiSet.put(item, item);
             // curr will be non-null if the multi-set already contains the
             // name/value pair
@@ -193,7 +290,7 @@ private static int compareSymbolTokens(SymbolToken tok1,
 
     private static int compareStructs(final IonStruct s1,
                                       final IonStruct s2,
-                                      boolean strict)
+                                      final Configuration configuration)
     {
         int result = s1.size() - s2.size();
         if (result == 0) {
@@ -201,7 +298,7 @@ private static int compareStructs(final IonStruct s1,
             // Map<Field, Field>). Refer to convertToMultiSet()'s
             // documentation for more info
             final Map<Field, Field> s1MultiSet
-                    = convertToMultiSet(s1, strict);
+                    = convertToMultiSet(s1, configuration);
 
             // Iterates through each name/value pair in IonStruct s2 and
             // determine if it also occurs in s1MultiSet.
@@ -209,7 +306,7 @@ private static int compareStructs(final IonStruct s1,
             //          If it does, remove an occurrence from s1MultiSet
             //          If it doesn't, the two IonStructs aren't equal
             for (IonValue val : s2) {
-                Field field = new Field(val, strict);
+                Field field = new Field(val, configuration);
 
                 // Find an occurrence of the name/value pair in s1MultiSet
                 Field mappedValue = s1MultiSet.get(field);
@@ -231,7 +328,7 @@ private static int compareStructs(final IonStruct s1,
 
     private static int compareSequences(final IonSequence s1,
                                         final IonSequence s2,
-                                        boolean strict)
+                                        final Configuration configuration)
     {
         int result = s1.size() - s2.size();
         if (result == 0) {
@@ -240,7 +337,7 @@ private static int compareSequences(final IonSequence s1,
             while (iter1.hasNext()) {
                 result = ionCompareToImpl(iter1.next(),
                                           iter2.next(),
-                                          strict);
+                                          configuration);
                 if (result != 0) {
                     break;
                 }
@@ -315,7 +412,7 @@ private static int compareLobContents(final IonLob lob1, final IonLob lob2)
      * a single {@code Field} -> {@code Field} with {@code occurrences} of 2.
      * <p>
      * Refer to
-     * {@link Equivalence#convertToMultiSet(IonStruct, boolean)} and
+     * {@link Equivalence#convertToMultiSet(IonStruct, Configuration)} and
      * {@link Field#equals(Object)} for more info.
      * <p>
      * NOTE: This class should only be instantiated for the sole purpose of
@@ -324,7 +421,7 @@ private static int compareLobContents(final IonLob lob1, final IonLob lob2)
     static class Field {
         private final String    name; // aka field name
         private final IonValue  value;
-        private final boolean   strict;
+        private final Configuration configuration;
 
         /**
          * Number of times that this specific field (with the same name
@@ -332,7 +429,7 @@ static class Field {
          */
         private int occurrences;
 
-        Field(final IonValue value, final boolean strict)
+        Field(final IonValue value, final Configuration configuration)
         {
             SymbolToken tok = value.getFieldNameSymbol();
             String name = tok.getText();
@@ -342,7 +439,7 @@ static class Field {
             }
             this.name = name;
             this.value = value;
-            this.strict = strict;
+            this.configuration = configuration;
 
             // Occurrences of this name/value pair is 0 initially
             this.occurrences = 0;
@@ -371,20 +468,20 @@ public boolean equals(final Object other) {
             final Field sOther = (Field) other;
 
             return name.equals(sOther.name)
-                && ionEqualsImpl(value, ((Field) other).value, strict);
+                && ionEqualsImpl(value, ((Field) other).value, configuration);
         }
     }
 
     private static boolean ionEqualsImpl(final IonValue v1,
-                                               final IonValue v2,
-                                               final boolean strict)
+                                         final IonValue v2,
+                                         final Configuration configuration)
     {
-        return (ionCompareToImpl(v1, v2, strict) == 0);
+        return (ionCompareToImpl(v1, v2, configuration) == 0);
     }
 
     private static int ionCompareToImpl(final IonValue v1,
                                         final IonValue v2,
-                                        final boolean strict)
+                                        final Configuration configuration)
     {
         int result = 0;
 
@@ -431,8 +528,14 @@ private static int ionCompareToImpl(final IonValue v1,
                              ((IonInt) v2).bigIntegerValue());
                     break;
                 case FLOAT:
-                    result = Double.compare(((IonFloat) v1).doubleValue(),
-                                            ((IonFloat) v2).doubleValue());
+                    double double1 = ((IonFloat) v1).doubleValue();
+                    double double2 = ((IonFloat) v2).doubleValue();
+                    if (configuration.epsilon != null
+                            && (double1 == double2 || Math.abs(double1 - double2) <= configuration.epsilon)) {
+                        result = 0;
+                    } else {
+                        result = Double.compare(double1, double2);
+                    }
                     break;
                 case DECIMAL:
                     assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26
@@ -441,7 +544,7 @@ private static int ionCompareToImpl(final IonValue v1,
                                             ? 0 : 1;
                     break;
                 case TIMESTAMP:
-                    if (strict) {
+                    if (configuration.isStrict) {
                         assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26
                         result = (((IonTimestamp) v1).timestampValue().equals(
                                   ((IonTimestamp) v2).timestampValue())
@@ -473,14 +576,14 @@ private static int ionCompareToImpl(final IonValue v1,
                     assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26
                     result = compareStructs((IonStruct) v1,
                                             (IonStruct) v2,
-                                            strict);
+                                            configuration);
                     break;
                 case LIST:
                 case SEXP:
                 case DATAGRAM:
                     result = compareSequences((IonSequence) v1,
                                               (IonSequence) v2,
-                                              strict);
+                                              configuration);
                     break;
                 }
             }
@@ -488,7 +591,7 @@ private static int ionCompareToImpl(final IonValue v1,
 
         // if the values are otherwise equal, but the caller wants strict
         // comparison, then we check the annotations
-        if ((result == 0) && strict) {
+        if ((result == 0) && configuration.isStrict) {
             // check tuple equality over the annotations
             // (which are symbol tokens)
             result = compareAnnotations(v1.getTypeAnnotationSymbols(),
@@ -511,7 +614,7 @@ private static int ionCompareToImpl(final IonValue v1,
     public static boolean ionEquals(final IonValue v1,
                                     final IonValue v2)
     {
-        return ionEqualsImpl(v1, v2, true);
+        return ionEqualsImpl(v1, v2, STRICT_CONFIGURATION);
     }
 
     /**
@@ -529,7 +632,24 @@ public static boolean ionEquals(final IonValue v1,
     public static boolean ionEqualsByContent(final IonValue v1,
                                              final IonValue v2)
     {
-        return ionEqualsImpl(v1, v2, false);
+        return ionEqualsImpl(v1, v2, NON_STRICT_CONFIGURATION);
+    }
+
+    /**
+     * Checks for data equivalence over two Ion values using this Equivalence's
+     * configuration
+     *
+     * @see Builder
+     *
+     * @param v1
+     *            The first Ion value to compare.
+     * @param v2
+     *            The second Ion value to compare.
+     *
+     * @return true if two Ion Values represent the same data.
+     */
+    public boolean ionValueEquals(final IonValue v1, final IonValue v2) {
+        return ionEqualsImpl(v1, v2, configuration);
     }
 
 }
diff --git a/test/com/amazon/ion/util/EquivalenceTest.java b/test/com/amazon/ion/util/EquivalenceTest.java
index 676469187c..8a552ec1dc 100644
--- a/test/com/amazon/ion/util/EquivalenceTest.java
+++ b/test/com/amazon/ion/util/EquivalenceTest.java
@@ -16,6 +16,7 @@
 package com.amazon.ion.util;
 
 import com.amazon.ion.IonFloat;
+import com.amazon.ion.IonList;
 import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonTestCase;
 import com.amazon.ion.IonValue;
@@ -28,6 +29,9 @@ public class EquivalenceTest
     private static void assertIonEq(final IonValue left, final IonValue right) {
         assertTrue(Equivalence.ionEquals(left, right));
         assertTrue(Equivalence.ionEquals(right, left));
+        Equivalence equivalence = new Equivalence.Builder().build();
+        assertTrue(equivalence.ionValueEquals(left, right));
+        assertTrue(equivalence.ionValueEquals(right, left));
 
         // Redundancy check included here, in the case that IonValue#equals()
         // doesn't use Equivalence's implementation anymore.
@@ -40,6 +44,9 @@ private static void assertIonEq(final IonValue left, final IonValue right) {
     private static void assertNotIonEq(final IonValue left, final IonValue right) {
         assertFalse(Equivalence.ionEquals(left, right));
         assertFalse(Equivalence.ionEquals(right, left));
+        Equivalence equivalence = new Equivalence.Builder().build();
+        assertFalse(equivalence.ionValueEquals(left, right));
+        assertFalse(equivalence.ionValueEquals(right, left));
 
         // Redundancy check included here, in the case that IonValue#equals()
         // doesn't use Equivalence's implementation anymore.
@@ -52,6 +59,9 @@ private static void assertNotIonEq(final IonValue left, final IonValue right) {
     private static void assertIonEqForm(final IonValue left, final IonValue right) {
         assertTrue(Equivalence.ionEqualsByContent(left, right));
         assertTrue(Equivalence.ionEqualsByContent(right, left));
+        Equivalence equivalence = new Equivalence.Builder().withStrict(false).build();
+        assertTrue(equivalence.ionValueEquals(left, right));
+        assertTrue(equivalence.ionValueEquals(right, left));
     }
 
     private IonValue ion(final String raw) {
@@ -375,9 +385,10 @@ public void testFieldEquals1() {
 
         assertEquals(3, struct.size());
 
-        Equivalence.Field f1 = new Equivalence.Field(v1, true);
-        Equivalence.Field f2 = new Equivalence.Field(v2, true);
-        Equivalence.Field f3 = new Equivalence.Field(v3, true);
+        Equivalence.Configuration configuration = new Equivalence.Configuration(new Equivalence.Builder().withStrict(true));
+        Equivalence.Field f1 = new Equivalence.Field(v1, configuration);
+        Equivalence.Field f2 = new Equivalence.Field(v2, configuration);
+        Equivalence.Field f3 = new Equivalence.Field(v3, configuration);
 
         assertFalse(f1.equals(f2));
         assertFalse(f1.equals(f3));
@@ -407,9 +418,10 @@ public void testFieldEquals2() {
 
         assertEquals(3, struct.size());
 
-        Equivalence.Field f1 = new Equivalence.Field(v1, true);
-        Equivalence.Field f2 = new Equivalence.Field(v2, true);
-        Equivalence.Field f3 = new Equivalence.Field(v3, true);
+        Equivalence.Configuration configuration = new Equivalence.Configuration(new Equivalence.Builder().withStrict(true));
+        Equivalence.Field f1 = new Equivalence.Field(v1, configuration);
+        Equivalence.Field f2 = new Equivalence.Field(v2, configuration);
+        Equivalence.Field f3 = new Equivalence.Field(v3, configuration);
 
         assertEquals(f1, f2);
         assertEquals(f2, f1); // symmetric
@@ -420,4 +432,42 @@ public void testFieldEquals2() {
         assertEquals(f2, f3); // transitive
         assertEquals(f3, f2); // symmetric
     }
+
+    @Test
+    public void builderWithoutEpsilon() {
+        Equivalence equivalence = new Equivalence.Builder().build();
+        IonFloat v1 = ionFloat(3.14);
+        IonFloat v2 = ionFloat(3.14 + 1e-7);
+        assertFalse(equivalence.ionValueEquals(v1, v2));
+        assertFalse(equivalence.ionValueEquals(v2, v1));
+        IonStruct struct1 = system().newEmptyStruct();
+        struct1.add("foo", v1.clone());
+        IonStruct struct2 = system().newEmptyStruct();
+        struct2.add("foo", v2.clone());
+        assertFalse(equivalence.ionValueEquals(struct1, struct2));
+        assertFalse(equivalence.ionValueEquals(struct2, struct1));
+        IonList list1 = system().newList(v1.clone());
+        IonList list2 = system().newList(v2.clone());
+        assertFalse(equivalence.ionValueEquals(list1, list2));
+        assertFalse(equivalence.ionValueEquals(list2, list1));
+    }
+
+    @Test
+    public void builderWithEpsilon() {
+        Equivalence equivalence = new Equivalence.Builder().withEpsilon(1e-6).build();
+        IonFloat v1 = ionFloat(3.14);
+        IonFloat v2 = ionFloat(3.14 + 1e-7);
+        assertTrue(equivalence.ionValueEquals(v1, v2));
+        assertTrue(equivalence.ionValueEquals(v2, v1));
+        IonStruct struct1 = system().newEmptyStruct();
+        struct1.add("foo", v1.clone());
+        IonStruct struct2 = system().newEmptyStruct();
+        struct2.add("foo", v2.clone());
+        assertTrue(equivalence.ionValueEquals(struct1, struct2));
+        assertTrue(equivalence.ionValueEquals(struct2, struct1));
+        IonList list1 = system().newList(v1.clone());
+        IonList list2 = system().newList(v2.clone());
+        assertTrue(equivalence.ionValueEquals(list1, list2));
+        assertTrue(equivalence.ionValueEquals(list2, list1));
+    }
 }

From 23b412f108279b38a03ada0d76cab4d8d07bfe77 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Fri, 31 May 2019 13:54:35 -0700
Subject: [PATCH 065/490] Makes IonRawBinaryWriter reuse ContainerInfo objects,
 reducing allocations and garbage. (#244)

---
 .../ion/impl/bin/IonRawBinaryWriter.java      | 51 +++++++++++++------
 1 file changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 25d4e145a5..603d9e25cb 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -235,19 +235,20 @@ private ContainerType(final boolean allowedInStepOut)
     private static class ContainerInfo
     {
         /** Whether or not the container is a struct */
-        public final ContainerType type;
+        public ContainerType type;
         /** The location of the pre-allocated size descriptor in the buffer. */
-        public final long position;
+        public long position;
         /** The size of the current value. */
         public long length;
         /** The patchlist for this container. */
         public PatchList patches;
 
-        public ContainerInfo(final ContainerType type, final long offset)
+        public ContainerInfo()
         {
-            this.type = type;
-            this.position = offset;
-            this.patches = null;
+            type = null;
+            position = -1;
+            length = -1;
+            patches = null;
         }
 
         public void appendPatch(final PatchPoint patch)
@@ -271,6 +272,13 @@ public void extendPatches(final PatchList newPatches)
             }
         }
 
+        public void initialize(final ContainerType type, final long offset) {
+            this.type = type;
+            this.position = offset;
+            this.patches = null;
+            this.length = 0;
+        }
+
         @Override
         public String toString()
         {
@@ -466,7 +474,8 @@ public String toString()
     private final WriteBuffer                   buffer;
     private final WriteBuffer                   patchBuffer;
     private final PatchList                     patchPoints;
-    private final LinkedList<ContainerInfo>     containers;
+    private final List<ContainerInfo>           containers;
+    private int                                 currentContainerIndex;
     private int                                 depth;
     private boolean                             hasWrittenValuesSinceFinished;
     private boolean                             hasWrittenValuesSinceConstructed;
@@ -501,8 +510,10 @@ public String toString()
         this.buffer            = new WriteBuffer(allocator);
         this.patchBuffer       = new WriteBuffer(allocator);
         this.patchPoints       = new PatchList();
-        this.containers        = new LinkedList<ContainerInfo>();
-
+        this.containers        = new ArrayList<ContainerInfo>(10);
+        // Note: this is not the same as depth because ContainerInfo is used for annotations and certain scalars
+        // in addition to container types.
+        this.currentContainerIndex            = -1;
         this.depth                            = 0;
         this.hasWrittenValuesSinceFinished    = false;
         this.hasWrittenValuesSinceConstructed = false;
@@ -651,23 +662,31 @@ public int getDepth()
 
     private void updateLength(long length)
     {
-        if (containers.isEmpty())
+        if (currentContainerIndex < 0)
         {
             return;
         }
 
-        containers.getLast().length += length;
+        containers.get(currentContainerIndex).length += length;
     }
 
     private void pushContainer(final ContainerType type)
     {
         // XXX we push before writing the type of container
-        containers.add(new ContainerInfo(type, buffer.position() + 1));
+        currentContainerIndex++;
+        ContainerInfo info;
+        if (currentContainerIndex >= containers.size()) {
+            info = new ContainerInfo();
+            containers.add(info);
+        }  else {
+            info = containers.get(currentContainerIndex);
+        }
+        info.initialize(type, buffer.position() + 1);
     }
 
     private ContainerInfo currentContainer()
     {
-        return containers.isEmpty() ? null : containers.getLast();
+        return currentContainerIndex < 0 ? null : containers.get(currentContainerIndex);
     }
 
     private void addPatchPoint(final long position, final int oldLength, final long value)
@@ -712,7 +731,7 @@ private ContainerInfo popContainer()
         {
             throw new IllegalStateException("Tried to pop container state without said container");
         }
-        containers.removeLast();
+        currentContainerIndex--;
 
         // only patch for real containers and annotations -- we use VALUE for tracking only
         final long length = current.length;
@@ -876,7 +895,7 @@ public void stepOut() throws IOException
 
     public boolean isInStruct()
     {
-        return !containers.isEmpty() && currentContainer().type == ContainerType.STRUCT;
+        return currentContainerIndex >= 0 && currentContainer().type == ContainerType.STRUCT;
     }
 
     // Write Value Methods
@@ -1499,7 +1518,7 @@ public void finish() throws IOException
         {
             return;
         }
-        if (!containers.isEmpty())
+        if (currentContainerIndex >= 0 || depth > 0)
         {
             throw new IllegalStateException("Cannot finish within container: " + containers);
         }

From 29176eac409a46f83d64688a07a1fee71a619a0b Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 31 May 2019 13:42:13 -0700
Subject: [PATCH 066/490] Makes IonRawBinaryWriter's currentFieldSid an int
 primitive instead of an Integer, cutting down on allocations and garbage
 caused by autoboxing.

---
 .../amazon/ion/impl/bin/IonRawBinaryWriter.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 603d9e25cb..ffc59f6935 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -465,6 +465,8 @@ public String toString()
         FLUSH
     }
 
+    private static final int SID_UNASSIGNED = -1;
+
     private final BlockAllocator                allocator;
     private final OutputStream                  out;
     private final StreamCloseMode               streamCloseMode;
@@ -480,7 +482,7 @@ public String toString()
     private boolean                             hasWrittenValuesSinceFinished;
     private boolean                             hasWrittenValuesSinceConstructed;
 
-    private Integer                 currentFieldSid;
+    private int                     currentFieldSid;
     private final List<Integer>     currentAnnotationSids;
     // XXX this is for managed detection of TLV that is a LST--this is easier to track here than at the managed level
     private boolean                     hasTopLevelSymbolTableAnnotation;
@@ -518,7 +520,7 @@ public String toString()
         this.hasWrittenValuesSinceFinished    = false;
         this.hasWrittenValuesSinceConstructed = false;
 
-        this.currentFieldSid                  = null;
+        this.currentFieldSid                  = SID_UNASSIGNED;
         this.currentAnnotationSids            = new ArrayList<Integer>();
         this.hasTopLevelSymbolTableAnnotation = false;
 
@@ -645,7 +647,7 @@ public IonCatalog getCatalog()
 
     public boolean isFieldNameSet()
     {
-        return currentFieldSid != null;
+        return currentFieldSid > SID_UNASSIGNED;
     }
 
     public void writeIonVersionMarker() throws IOException
@@ -798,17 +800,17 @@ private static void checkSid(int sid)
     /** prepare to write values with field name and annotations. */
     private void prepareValue()
     {
-        if (isInStruct() && currentFieldSid == null)
+        if (isInStruct() && currentFieldSid <= SID_UNASSIGNED)
         {
             throw new IllegalStateException("IonWriter.setFieldName() must be called before writing a value into a struct.");
         }
-        if (currentFieldSid != null)
+        if (currentFieldSid > SID_UNASSIGNED)
         {
             checkSid(currentFieldSid);
             writeVarUInt(currentFieldSid);
 
             // clear out field name
-            currentFieldSid = null;
+            currentFieldSid = SID_UNASSIGNED;
         }
         if (!currentAnnotationSids.isEmpty())
         {
@@ -873,7 +875,7 @@ public void stepIn(final IonType containerType) throws IOException
 
     public void stepOut() throws IOException
     {
-        if (currentFieldSid != null)
+        if (currentFieldSid > SID_UNASSIGNED)
         {
             throw new IonException("Cannot step out with field name set");
         }

From 51a53654138de5c80f2571bf58c2cd7b9008f169 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 31 May 2019 17:26:48 -0700
Subject: [PATCH 067/490] Refactors the containers stack into the
 RecyclingStack class, which caches the top element to avoid repetitive
 ArrayList.get calls in inner-loop code.

---
 .../ion/impl/bin/IonRawBinaryWriter.java      | 143 +++++++++++++-----
 1 file changed, 106 insertions(+), 37 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index ffc59f6935..617fa3e5ef 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -52,7 +52,6 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.NoSuchElementException;
 
@@ -465,6 +464,90 @@ public String toString()
         FLUSH
     }
 
+    /**
+     * A stack whose elements are recycled. This can be useful when the stack needs to grow and shrink
+     * frequently and has a predictable maximum depth.
+     * @param <T> the type of elements stored.
+     */
+    private static final class RecyclingStack<T> {
+
+        /**
+         * Factory for new stack elements.
+         * @param <T> the type of element.
+         */
+        public interface ElementFactory<T> {
+
+            /**
+             * @return a new instance.
+             */
+            T newElement();
+        }
+
+        private final List<T> elements;
+        private final ElementFactory<T> elementFactory;
+        private int currentIndex;
+        private T top;
+
+        /**
+         * @param initialCapacity the initial capacity of the underlying collection.
+         * @param elementFactory the factory used to create a new element on {@link #push()} when the stack has
+         *                       not previously grown to the new depth.
+         */
+        public RecyclingStack(int initialCapacity, ElementFactory<T> elementFactory) {
+            elements = new ArrayList<T>(initialCapacity);
+            this.elementFactory = elementFactory;
+            currentIndex = -1;
+            top = null;
+        }
+
+        /**
+         * Pushes an element onto the top of the stack, instantiating a new element only if the stack has not
+         * previously grown to the new depth.
+         * @return the element at the top of the stack after the push. This element must be initialized by the caller.
+         */
+        public T push() {
+            currentIndex++;
+            if (currentIndex >= elements.size()) {
+                top = elementFactory.newElement();
+                elements.add(top);
+            }  else {
+                top = elements.get(currentIndex);
+            }
+            return top;
+        }
+
+        /**
+         * @return the element at the top of the stack, or null if the stack is empty.
+         */
+        public T peek() {
+            return top;
+        }
+
+        /**
+         * Pops an element from the stack, retaining a reference to the element so that it can be reused the
+         * next time the stack grows to the element's depth.
+         * @return the element that was at the top of the stack before the pop, or null if the stack was empty.
+         */
+        public T pop() {
+            T popped = top;
+            currentIndex--;
+            if (currentIndex >= 0) {
+                top = elements.get(currentIndex);
+            } else {
+                top = null;
+                currentIndex = -1;
+            }
+            return popped;
+        }
+
+        /**
+         * @return true if the stack is empty; otherwise, false.
+         */
+        public boolean isEmpty() {
+            return top == null;
+        }
+    }
+
     private static final int SID_UNASSIGNED = -1;
 
     private final BlockAllocator                allocator;
@@ -476,8 +559,7 @@ public String toString()
     private final WriteBuffer                   buffer;
     private final WriteBuffer                   patchBuffer;
     private final PatchList                     patchPoints;
-    private final List<ContainerInfo>           containers;
-    private int                                 currentContainerIndex;
+    private final RecyclingStack<ContainerInfo> containers;
     private int                                 depth;
     private boolean                             hasWrittenValuesSinceFinished;
     private boolean                             hasWrittenValuesSinceConstructed;
@@ -512,10 +594,15 @@ public String toString()
         this.buffer            = new WriteBuffer(allocator);
         this.patchBuffer       = new WriteBuffer(allocator);
         this.patchPoints       = new PatchList();
-        this.containers        = new ArrayList<ContainerInfo>(10);
-        // Note: this is not the same as depth because ContainerInfo is used for annotations and certain scalars
-        // in addition to container types.
-        this.currentContainerIndex            = -1;
+        this.containers        = new RecyclingStack<ContainerInfo>(
+            10,
+            new RecyclingStack.ElementFactory<ContainerInfo>() {
+                @Override
+                public ContainerInfo newElement() {
+                    return new ContainerInfo();
+                }
+            }
+        );
         this.depth                            = 0;
         this.hasWrittenValuesSinceFinished    = false;
         this.hasWrittenValuesSinceConstructed = false;
@@ -664,31 +751,18 @@ public int getDepth()
 
     private void updateLength(long length)
     {
-        if (currentContainerIndex < 0)
+        if (containers.isEmpty())
         {
             return;
         }
 
-        containers.get(currentContainerIndex).length += length;
+        containers.peek().length += length;
     }
 
     private void pushContainer(final ContainerType type)
     {
         // XXX we push before writing the type of container
-        currentContainerIndex++;
-        ContainerInfo info;
-        if (currentContainerIndex >= containers.size()) {
-            info = new ContainerInfo();
-            containers.add(info);
-        }  else {
-            info = containers.get(currentContainerIndex);
-        }
-        info.initialize(type, buffer.position() + 1);
-    }
-
-    private ContainerInfo currentContainer()
-    {
-        return currentContainerIndex < 0 ? null : containers.get(currentContainerIndex);
+        containers.push().initialize(type, buffer.position() + 1);
     }
 
     private void addPatchPoint(final long position, final int oldLength, final long value)
@@ -697,8 +771,7 @@ private void addPatchPoint(final long position, final int oldLength, final long
         final long patchPosition = patchBuffer.position();
         final int patchLength = patchBuffer.writeVarUInt(value);
         final PatchPoint patch = new PatchPoint(position, oldLength, patchPosition, patchLength);
-        final ContainerInfo container = currentContainer();
-        if (container == null)
+        if (containers.isEmpty())
         {
             // not nested, just append to the root list
             patchPoints.append(patch);
@@ -706,15 +779,14 @@ private void addPatchPoint(final long position, final int oldLength, final long
         else
         {
             // nested, apply it to the current container
-            container.appendPatch(patch);
+            containers.peek().appendPatch(patch);
         }
         updateLength(patchLength - oldLength);
     }
 
     private void extendPatchPoints(final PatchList patches)
     {
-        final ContainerInfo container = currentContainer();
-        if (container == null)
+        if (containers.isEmpty())
         {
             // not nested, extend root list
             patchPoints.extend(patches);
@@ -722,18 +794,17 @@ private void extendPatchPoints(final PatchList patches)
         else
         {
             // nested, apply it to the current container
-            container.extendPatches(patches);
+            containers.peek().extendPatches(patches);
         }
     }
 
     private ContainerInfo popContainer()
     {
-        final ContainerInfo current = currentContainer();
+        final ContainerInfo current = containers.pop();
         if (current == null)
         {
             throw new IllegalStateException("Tried to pop container state without said container");
         }
-        currentContainerIndex--;
 
         // only patch for real containers and annotations -- we use VALUE for tracking only
         final long length = current.length;
@@ -848,8 +919,7 @@ private void prepareValue()
     /** Closes out annotations. */
     private void finishValue()
     {
-        final ContainerInfo current = currentContainer();
-        if (current != null && current.type == ContainerType.ANNOTATION)
+        if (!containers.isEmpty() && containers.peek().type == ContainerType.ANNOTATION)
         {
             // close out and patch the length
             popContainer();
@@ -883,8 +953,7 @@ public void stepOut() throws IOException
         {
             throw new IonException("Cannot step out with field name set");
         }
-        final ContainerInfo container = currentContainer();
-        if (container == null || !container.type.allowedInStepOut)
+        if (containers.isEmpty() || !containers.peek().type.allowedInStepOut)
         {
             throw new IonException("Cannot step out when not in container");
         }
@@ -897,7 +966,7 @@ public void stepOut() throws IOException
 
     public boolean isInStruct()
     {
-        return currentContainerIndex >= 0 && currentContainer().type == ContainerType.STRUCT;
+        return !containers.isEmpty() && containers.peek().type == ContainerType.STRUCT;
     }
 
     // Write Value Methods
@@ -1520,7 +1589,7 @@ public void finish() throws IOException
         {
             return;
         }
-        if (currentContainerIndex >= 0 || depth > 0)
+        if (!containers.isEmpty() || depth > 0)
         {
             throw new IllegalStateException("Cannot finish within container: " + containers);
         }

From 6ef0342d11778649b5f29191293d071d2fa96420 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Tue, 4 Jun 2019 19:29:58 -0700
Subject: [PATCH 068/490] Removes @Override annotation not allowed by old JDK
 versions. (#249)

JDK 5 won't compile @Override annotations on methods that implement an interface.
---
 src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 617fa3e5ef..23ced039c6 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -597,7 +597,6 @@ public boolean isEmpty() {
         this.containers        = new RecyclingStack<ContainerInfo>(
             10,
             new RecyclingStack.ElementFactory<ContainerInfo>() {
-                @Override
                 public ContainerInfo newElement() {
                     return new ContainerInfo();
                 }

From 0873d5c1429a3bf6365d56ae2ae8461bd3865289 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 25 Jun 2019 17:27:51 -0700
Subject: [PATCH 069/490] Release 1.5.0

---
 .travis.yml | 1 -
 README.md   | 2 +-
 pom.xml     | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f1dd7898a3..96dc30e864 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,6 @@ jdk:
   - openjdk11
   - oraclejdk8
   - oraclejdk9
-  - oraclejdk11
 
 script: mvn test
 
diff --git a/README.md b/README.md
index a3f8d729eb..06a886255f 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.4.0</version>
+  <version>1.5.0</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 59e2f750a7..062a2fa8cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.5.0-SNAPSHOT</version>
+  <version>1.5.0</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 447bd74eb71cdab1432b93f45ee30dc87ec6f4cc Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 26 Jun 2019 13:24:45 -0700
Subject: [PATCH 070/490] Bumps version to 1.5.1-SNAPSHOT.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 062a2fa8cc..648e241f1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.5.0</version>
+  <version>1.5.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 157d47441df57cd11b8fc10526142ff798e44a08 Mon Sep 17 00:00:00 2001
From: David Lurton <dlurton@users.noreply.github.com>
Date: Mon, 29 Jul 2019 16:09:57 -0700
Subject: [PATCH 071/490] Manually specify the trusty distro

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 96dc30e864..c40e335f83 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 sudo: false
 language: java
+dist: trusty
 jdk:
   - openjdk8
   - openjdk9
@@ -24,4 +25,4 @@ jobs:
       github-token: "$GITHUB_TOKEN"
       keep-history: true # keeps commit history of gh-pages branch
       on:
-        branch: master
\ No newline at end of file
+        branch: master

From 1c6f20e18f79004b6a1b8bc003202af32de6c27f Mon Sep 17 00:00:00 2001
From: Dmitry Zvorygin <zvorygin@gmail.com>
Date: Tue, 30 Jul 2019 15:44:48 -0700
Subject: [PATCH 072/490] Add IonSystem#singleValue(byte[], int, int) (#257)

When ion object resides in the middle of bytearray, this helper
method would help to extract it without memory copy overhead.
---
 src/com/amazon/ion/IonSystem.java             | 21 ++++++++
 .../amazon/ion/impl/lite/IonSystemLite.java   |  7 ++-
 test/com/amazon/ion/LoaderTest.java           | 49 +++++++++++++++++++
 3 files changed, 76 insertions(+), 1 deletion(-)

diff --git a/src/com/amazon/ion/IonSystem.java b/src/com/amazon/ion/IonSystem.java
index 56871c9ec7..f7bb29c038 100644
--- a/src/com/amazon/ion/IonSystem.java
+++ b/src/com/amazon/ion/IonSystem.java
@@ -373,6 +373,27 @@ public SymbolTable newSharedSymbolTable(String name,
      */
     public IonValue singleValue(byte[] ionData);
 
+    /**
+     * Extracts a single value from Ion text or binary data.
+     * <p>
+     * This method will auto-detect and uncompress GZIPped Ion data.
+     *
+     * @param ionData is used only within the range of bytes starting at
+     * {@code offset} for {@code len} bytes.
+     * The data in that range may be either Ion binary data, or UTF-8 Ion text.
+     * @param offset must be non-negative and less than {@code ionData.length}.
+     * @param len must be non-negative and {@code offset+len} must not exceed
+     *
+     * @return the first (and only) user value in the data; not null.
+     *
+     * @throws NullPointerException if {@code ionData} is null.
+     * @throws UnexpectedEofException if the data doesn't contain any user
+     * values.
+     * @throws IonException if the data does not contain exactly one user
+     * value.
+     */
+    public IonValue singleValue(byte[] ionData, int offset, int len);
+
 
     //-------------------------------------------------------------------------
     // IonReader creation
diff --git a/src/com/amazon/ion/impl/lite/IonSystemLite.java b/src/com/amazon/ion/impl/lite/IonSystemLite.java
index 1e16f7392b..95bfa4d08a 100644
--- a/src/com/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSystemLite.java
@@ -523,7 +523,12 @@ public IonValue singleValue(String ionText)
 
     public IonValue singleValue(byte[] ionData)
     {
-        IonReader reader = newReader(ionData);
+        return singleValue(ionData, 0, ionData.length);
+    }
+
+    @Override
+    public IonValue singleValue(byte[] ionData, int offset, int len) {
+        IonReader reader = newReader(ionData, offset, len);
         try {
             Iterator<IonValue> it = iterate(reader);
             return singleValue(it);
diff --git a/test/com/amazon/ion/LoaderTest.java b/test/com/amazon/ion/LoaderTest.java
index e00685d27f..fc020077a4 100644
--- a/test/com/amazon/ion/LoaderTest.java
+++ b/test/com/amazon/ion/LoaderTest.java
@@ -32,6 +32,8 @@
 import java.io.StringReader;
 import java.util.Arrays;
 import java.util.Iterator;
+
+import org.junit.Assert;
 import org.junit.Test;
 
 
@@ -393,6 +395,53 @@ public void testSingleValue()
         catch (IonException ie) { /* ok */ }
     }
 
+    @Test
+    public void testSubBufferSingleValue()
+    {
+        IonSystem sys = system();
+
+        String image = "(this is a single sexp)";
+        byte[] bytes =  sys.newLoader().load(image).getBytes();
+
+        IonValue singleValue = sys.singleValue(bytes, 0, bytes.length);
+        assertEquals(singleValue.toString(), image);
+
+        byte[] padded = new byte[bytes.length + 20];
+        System.arraycopy(bytes, 0, padded, 10, bytes.length);
+
+        IonValue paddedValue = sys.singleValue(padded, 10, bytes.length);
+        assertEquals(paddedValue.toString(), image);
+
+        bytes = sys.newLoader().load("(two) (values)").getBytes();
+
+        try {
+            sys.singleValue(bytes, 0, bytes.length);
+            fail("Expected IonException");
+        }
+        catch (IonException ie) {
+            Assert.assertTrue(ie.getMessage().contains("not a single value"));
+        }
+
+        padded = new byte[bytes.length + 20];
+        System.arraycopy(bytes, 0, padded, 10, bytes.length);
+
+        try {
+            sys.singleValue(padded, 10, bytes.length);
+            fail("Expected IonException");
+        }
+        catch (IonException ie) {
+            Assert.assertTrue(ie.getMessage().contains("not a single value"));
+        }
+
+        try {
+            sys.singleValue(padded, 15, bytes.length);
+            fail("Expected IonException");
+        }
+        catch (IonException ie) {
+            Assert.assertTrue(ie.getMessage().contains("bad character"));
+        }
+    }
+
     @Test
     public void testCatalogOnLoader() throws Exception {
         IonSystem sys = newSystem(Symtabs.CATALOG);

From 389241fead069414be752574dea8e65adf127deb Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 24 Sep 2019 14:18:01 -0700
Subject: [PATCH 073/490] Fixes a bug in IonReaderBinaryRawX that caused the
 reader to prematurely finish reading large streams in certain cases.

---
 .../amazon/ion/impl/IonReaderBinaryRawX.java  | 15 +++-
 test/AllTests.java                            |  2 +
 .../IonReaderBinaryRawLargeStreamTest.java    | 73 +++++++++++++++++++
 .../amazon/ion/util/RepeatInputStream.java    |  4 +-
 4 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
index 1ef4ffde21..c5ece958f9 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
@@ -1064,7 +1064,10 @@ protected final Decimal readDecimal(int len) throws IOException
         }
         else {
             // otherwise we to it the hard way ....
-            int  save_limit = _local_remaining - len;
+            int save_limit = NO_LIMIT;
+            if (_local_remaining != NO_LIMIT) {
+                save_limit = _local_remaining - len;
+            }
             _local_remaining = len;
             int  exponent = readVarInt();
             BigInteger value;
@@ -1114,7 +1117,10 @@ protected final Timestamp readTimestamp(int len) throws IOException
 
         int         year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0;
         BigDecimal  frac = null;
-        int         save_limit = _local_remaining - len;
+        int         save_limit = NO_LIMIT;
+        if (_local_remaining != NO_LIMIT) {
+            save_limit = _local_remaining - len;
+        }
         _local_remaining = len;  // > 0
 
         // first up is the offset, which requires a special int reader
@@ -1182,7 +1188,10 @@ protected final String readString(int len) throws IOException
         // the char array is way faster than using string buffer
         char[] chars = new char[len];
         int    c, ii = 0;
-        int    save_limit = _local_remaining - len;
+        int    save_limit = NO_LIMIT;
+        if (_local_remaining != NO_LIMIT) {
+            save_limit = _local_remaining - len;
+        }
         _local_remaining = len;
         while (!isEOF()) {
             c = readUnicodeScalar();
diff --git a/test/AllTests.java b/test/AllTests.java
index 326611b69a..0e433b5b8b 100644
--- a/test/AllTests.java
+++ b/test/AllTests.java
@@ -48,6 +48,7 @@
 import com.amazon.ion.NopPaddingTest;
 import com.amazon.ion.NullTest;
 import com.amazon.ion.RawValueSpanReaderBasicTest;
+import com.amazon.ion.impl.IonReaderBinaryRawLargeStreamTest;
 import com.amazon.ion.impl.RawValueSpanReaderTest;
 import com.amazon.ion.RoundTripTest;
 import com.amazon.ion.SexpTest;
@@ -206,6 +207,7 @@
     IonReaderToIonValueTest.class,
     BinaryReaderWrappedValueLengthTest.class,
     IonReaderBuilderTest.class,
+    IonReaderBinaryRawLargeStreamTest.class,
 
     // experimental binary writer tests
     PooledBlockAllocatorProviderTest.class,
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java b/test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
new file mode 100644
index 0000000000..9ed965105a
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
@@ -0,0 +1,73 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.util.RepeatInputStream;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.SequenceInputStream;
+import java.math.BigDecimal;
+
+import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
+import static org.junit.Assert.assertEquals;
+
+public class IonReaderBinaryRawLargeStreamTest {
+
+    // NOTE: this test takes several seconds to complete.
+    @Test
+    public void testReadLargeScalarStream() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
+        final Timestamp timestamp = Timestamp.forDay(2000, 1, 1);
+        writer.writeString("foo");
+        writer.writeDecimal(BigDecimal.TEN);
+        writer.writeTimestamp(timestamp);
+        writer.close();
+        byte[] dataWithIvm = out.toByteArray();
+        // Strip the IVM, as this needs to be one continuous stream to avoid resetting the reader's internals.
+        byte[] data = new byte[dataWithIvm.length - BINARY_VERSION_MARKER_1_0.length];
+        System.arraycopy(dataWithIvm, BINARY_VERSION_MARKER_1_0.length, data, 0, data.length);
+        // The binary reader uses Integer.MIN_VALUE to mean NO_LIMIT for its _local_remaining value, which keeps track
+        // of the remaining number of bytes in the current value. Between values at the top level, this should always be
+        // NO_LIMIT. No arithmetic should ever be performed on the value when it is set to NO_LIMIT. If bugs exist that
+        // violate this, then between top level values _local_remaining will never again be NO_LIMIT, meaning that
+        // arithmetic will continue to be performed on it. Eventually, due to integer overflow, the value will roll over
+        // into a small enough positive value that the reader will erroneously determine that there are fewer bytes
+        // remaining than are needed to complete the current value. The reader will then finish early before reading the
+        // entire stream. The bug that prompted this test to be written involved an unconditional subtraction of the
+        // current value's length as declared in its header from the current value of _local_remaining within
+        // stringValue(), decimalValue(), and timestampValue(). This caused _local_remaining to overflow to a very
+        // large value immediately. For every top level value subsequently read, the length of that value would be
+        // subtracted from _local_remaining until eventually _local_remaining prematurely reached 0 around the time
+        // the stream reached Integer.MAX_VALUE in length.
+        // Repeat the batch a sufficient number of times to exceed a total stream length of Integer.MAX_VALUE, plus
+        // a few more to make sure batches continue to be read correctly.
+        final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 7;
+        InputStream inputStream = new SequenceInputStream(
+            new ByteArrayInputStream(BINARY_VERSION_MARKER_1_0),
+            new RepeatInputStream(data, totalNumberOfBatches - 1) // This will provide the data 'totalNumberOfBatches' times
+        );
+        IonReader reader = IonReaderBuilder.standard().build(inputStream);
+        reader.next();
+        assertEquals("foo", reader.stringValue());
+        reader.next();
+        assertEquals(BigDecimal.TEN, reader.decimalValue());
+        reader.next();
+        assertEquals(timestamp, reader.timestampValue());
+        int batchesRead = 1;
+        while (reader.next() != null) {
+            assertEquals(IonType.STRING, reader.getType());
+            assertEquals(IonType.DECIMAL, reader.next());
+            assertEquals(IonType.TIMESTAMP, reader.next());
+            batchesRead++;
+        }
+        assertEquals(totalNumberOfBatches, batchesRead);
+    }
+}
diff --git a/test/com/amazon/ion/util/RepeatInputStream.java b/test/com/amazon/ion/util/RepeatInputStream.java
index f5bae1c206..c9e254af42 100644
--- a/test/com/amazon/ion/util/RepeatInputStream.java
+++ b/test/com/amazon/ion/util/RepeatInputStream.java
@@ -33,7 +33,9 @@ public final class RepeatInputStream
 
     /**
      * @param bytes the data to be repeated.
-     * @param times the number of times to repeat the data.
+     * @param times the number of times to repeat the data. NOTE: this is the number of times the bytes will be
+     *              repeated after the first time they are read. For example, providing a byte array with a single
+     *              byte 'a' and times=1 will allow 'a' to be read twice before the stream signals EOF.
      */
     public RepeatInputStream(byte[] bytes, long times)
     {

From 00b62fdd7d0210327d2272d205f9d3b959651bec Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Wed, 25 Sep 2019 13:26:52 -0700
Subject: [PATCH 074/490] Release 1.5.1 (#262)

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 06a886255f..17b4327909 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.5.0</version>
+  <version>1.5.1</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 648e241f1c..051cdd3cb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.5.1-SNAPSHOT</version>
+  <version>1.5.1</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 88ed4c5477a0e84fc4a404df0910a2b173bdd278 Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Fri, 27 Sep 2019 10:03:04 -0700
Subject: [PATCH 075/490] Prepare v1.5.2 SNAPSHOT (#263)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 051cdd3cb9..b212673a52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.5.1</version>
+  <version>1.5.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 6112773c5f62fb23c2b33f38909add07c5c9072c Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Thu, 31 Oct 2019 12:34:34 -0700
Subject: [PATCH 076/490] Move to new sonatype URL (#265)

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b212673a52..51e20d3858 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,11 +53,11 @@
   <distributionManagement>
     <snapshotRepository>
       <id>ossrh</id>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <url>https://aws.oss.sonatype.org/content/repositories/snapshots</url>
     </snapshotRepository>
     <repository>
       <id>ossrh</id>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+      <url>https://aws.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
     </repository>
   </distributionManagement>
 

From 1673177920347ad9fae69a187ea513f5ffbc1050 Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Thu, 21 Nov 2019 16:47:30 -0500
Subject: [PATCH 077/490] Optimizations for reading binary strings. (#267)

Optimizations for reading binary strings.
---
 .../amazon/ion/impl/IonReaderBinaryRawX.java  | 176 +++++++++++-------
 .../impl/IonReaderBinaryRawStringTest.java    |  97 ++++++++++
 2 files changed, 208 insertions(+), 65 deletions(-)
 create mode 100644 test/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
index c5ece958f9..5bbc543503 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
@@ -27,10 +27,16 @@
 import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
 import com.amazon.ion.impl._Private_ScalarConversions.AS_TYPE;
 import com.amazon.ion.impl._Private_ScalarConversions.ValueVariant;
+
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.MathContext;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
 
 
 /**
@@ -52,6 +58,8 @@ abstract class IonReaderBinaryRawX
     static final int DEFAULT_CONTAINER_STACK_SIZE = 12; // a multiple of 3
     static final int DEFAULT_ANNOTATION_SIZE = 10;
     static final int NO_LIMIT = Integer.MIN_VALUE;
+    static final int UTF8_BUFFER_SIZE_IN_BYTES = 4 * 1024;
+
     protected enum State {
         S_INVALID,
         S_BEFORE_FIELD, // only true in structs
@@ -96,6 +104,19 @@ protected enum State {
     int                 _container_top;
     long[]              _container_stack; // triples of: position, type, local_end
 
+
+    // `StandardCharsets.UTF_8` wasn't introduced until Java 7, so we have to use Charset#forName(String) instead.
+    private static final Charset UTF8 = Charset.forName("UTF-8");
+    private CharsetDecoder utf8CharsetDecoder = UTF8.newDecoder();
+
+    // Calling read() to pull in the next byte of a string requires an EOF check to be performed for each byte.
+    // This reusable buffer allows us to call read(utf8InputBuffer) instead, letting us can pay the cost of an EOF check
+    // once per buffer rather than once per byte.
+    private ByteBuffer utf8InputBuffer = ByteBuffer.allocate(UTF8_BUFFER_SIZE_IN_BYTES);
+
+    // A reusable scratch space to hold the decoded bytes as they're read from the utf8InputBuffer.
+    private CharBuffer utf8DecodingBuffer = CharBuffer.allocate(UTF8_BUFFER_SIZE_IN_BYTES);
+
     protected IonReaderBinaryRawX() {
     }
 
@@ -1181,81 +1202,106 @@ protected final Timestamp readTimestamp(int len) throws IOException
         }
     }
 
-    protected final String readString(int len) throws IOException
+    protected final String readString(int numberOfBytes) throws IOException
     {
-        // len is bytes, which is greater than or equal to java
-        // chars even after utf8 to utf16 decoding nonsense
-        // the char array is way faster than using string buffer
-        char[] chars = new char[len];
-        int    c, ii = 0;
-        int    save_limit = NO_LIMIT;
-        if (_local_remaining != NO_LIMIT) {
-            save_limit = _local_remaining - len;
+        // If the string we're reading is small enough to fit in our reusable buffer, we can avoid the overhead
+        // of looping and bounds checking.
+        if (numberOfBytes <= utf8InputBuffer.capacity()) {
+            return readStringWithReusableBuffer(numberOfBytes);
         }
-        _local_remaining = len;
-        while (!isEOF()) {
-            c = readUnicodeScalar();
-            if (c < 0) throwUnexpectedEOFException();
-            if (c < 0x10000) {
-                chars[ii++] = (char)c;
+
+        // Otherwise, allocate a one-off decoding buffer that's large enough to hold the string
+        // and prepare to decode the string in chunks.
+        CharBuffer decodingBuffer = CharBuffer.allocate(numberOfBytes);
+        utf8CharsetDecoder.reset();
+
+        int save_limit = NO_LIMIT;
+        if (_local_remaining != NO_LIMIT) {
+            save_limit = _local_remaining - numberOfBytes;
+        }
+        _local_remaining = numberOfBytes;
+
+        // The following loop will:
+        // * Fill the input buffer with utf8 bytes
+        // * Write decoded chars to the decoding buffer
+        // * Move any remaining partial character bytes to the front of the buffer
+        // * Repeat until the requested number of bytes have been decoded.
+        // * Create a new String object from the contents of the decoding buffer.
+        int totalBytesRead = 0;
+        int carryoverBytes = 0;
+        while (totalBytesRead < numberOfBytes) {
+
+            int bytesRemaining = numberOfBytes - totalBytesRead;
+            // When decoding, it's possible to have 'carryover' bytes left in the buffer which represent
+            // a partial unicode character. We need to leave these in the buffer so that we can complete the
+            // partial character in the next call to read().
+            int capacityRemaining = utf8InputBuffer.array().length - carryoverBytes;
+            int bytesToRead = Math.min(bytesRemaining, capacityRemaining);
+
+            int bytesRead = read(utf8InputBuffer.array(), carryoverBytes, bytesToRead);
+            if (bytesRead <= 0) {
+                // UnifiedInputStreamX doesn't adhere to InputStream's API. See the comments on
+                // UnifiedInputStreamX#read() for more information.
+                throwUnexpectedEOFException();
             }
-            else { // when c is >= 0x10000 we need surrogate encoding
-                chars[ii++] = (char)_Private_IonConstants.makeHighSurrogate(c);
-                chars[ii++] = (char)_Private_IonConstants.makeLowSurrogate(c);
+
+            totalBytesRead += bytesRead;
+
+            utf8InputBuffer.position(0);
+            utf8InputBuffer.limit(carryoverBytes + bytesRead);
+
+            CoderResult coderResult = utf8CharsetDecoder.decode(
+                    utf8InputBuffer,
+                    decodingBuffer,
+                    totalBytesRead >= numberOfBytes
+            );
+            if (coderResult.isError()) {
+                throw new IonException("Illegal value encountered while validating UTF-8 data in input stream. " + coderResult.toString());
+            }
+
+            // Shift leftover partial character bytes (if any) to the beginning of the buffer
+            carryoverBytes = utf8InputBuffer.remaining();
+            if (carryoverBytes > 0) {
+                System.arraycopy(
+                        utf8InputBuffer.array(),
+                        utf8InputBuffer.position(),
+                        utf8InputBuffer.array(),
+                        0,
+                        carryoverBytes
+                );
             }
         }
+
         _local_remaining = save_limit;
-        return new String(chars, 0, ii);
+
+        decodingBuffer.flip();
+        return decodingBuffer.toString();
     }
-    private final int readUnicodeScalar() throws IOException
-    {
-        int c = -1, b;
-        b = read();
-        // ascii is all good, even -1 (eof)
-        if (IonUTF8.isOneByteUTF8(b)) {
-            return b;
+
+    private String readStringWithReusableBuffer(int numberOfBytes) throws IOException {
+        int save_limit = NO_LIMIT;
+        if (_local_remaining != NO_LIMIT) {
+            save_limit = _local_remaining - numberOfBytes;
         }
-        switch(IonUTF8.getUTF8LengthFromFirstByte(b)) {
-        case 2:
-            // now we start gluing the multi-byte value together
-            assert((b & 0xe0) == 0xc0);
-            // for values from 0x80 to 0x7FF (all legal)
-            int b2 = read();
-            if (!IonUTF8.isContinueByteUTF8(b2)) throwUTF8Exception();
-            c = IonUTF8.twoByteScalar(b, b2);
-            break;
-        case 3:
-            assert((b & 0xf0) == 0xe0);
-            // for values from 0x800 to 0xFFFFF (NOT all legal)
-            b2 = read();
-            if (!IonUTF8.isContinueByteUTF8(b2)) throwUTF8Exception();
-            int b3 = read();
-            if (!IonUTF8.isContinueByteUTF8(b3)) throwUTF8Exception();
-            c = IonUTF8.threeByteScalar(b, b2, b3);
-            break;
-        case 4:
-            assert((b & 0xf8) == 0xf0);
-            // for values from 0x010000 to 0x1FFFFF (NOT all legal)
-            b2 = read();
-            if (!IonUTF8.isContinueByteUTF8(b2)) throwUTF8Exception();
-            b3 = read();
-            if (!IonUTF8.isContinueByteUTF8(b3)) throwUTF8Exception();
-            int b4 = read();
-            if (!IonUTF8.isContinueByteUTF8(b4)) throwUTF8Exception();
-            c = IonUTF8.fourByteScalar(b, b2, b3, b4);
-            if (c > 0x10FFFF) {
-                throw new IonException("illegal utf value encountered in input utf-8 stream");
-            }
-            break;
-        default:
-            throwUTF8Exception();
+        _local_remaining = numberOfBytes;
+        readAll(utf8InputBuffer.array(), 0, numberOfBytes);
+        _local_remaining = save_limit;
+
+        utf8InputBuffer.position(0);
+        utf8InputBuffer.limit(numberOfBytes);
+
+        utf8DecodingBuffer.position(0);
+        utf8DecodingBuffer.limit(utf8DecodingBuffer.capacity());
+
+        utf8CharsetDecoder.reset();
+        CoderResult coderResult = utf8CharsetDecoder.decode(utf8InputBuffer, utf8DecodingBuffer, true);
+        if (coderResult.isError()) {
+            throw new IonException("Illegal value encountered while validating UTF-8 data in input stream. " + coderResult.toString());
         }
-        return c;
-    }
-    private final void throwUTF8Exception() throws IOException
-    {
-        throwErrorAt("Invalid UTF-8 character encounter in a string at position ");
+        utf8DecodingBuffer.flip();
+        return utf8DecodingBuffer.toString();
     }
+
     private final void throwUnexpectedEOFException() throws IOException {
         throwErrorAt("unexpected EOF in value");
     }
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java b/test/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java
new file mode 100644
index 0000000000..3ad6e86938
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java
@@ -0,0 +1,97 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.util.RepeatInputStream;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.SequenceInputStream;
+import java.math.BigDecimal;
+
+import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
+import static org.junit.Assert.assertEquals;
+
+public class IonReaderBinaryRawStringTest {
+
+    @Test
+    public void testReadShortStrings() throws Exception {
+        // This test constructs some strings with non-ascii text that are short enough to fit in
+        // IonBinaryReaderRawX's reusable decoding buffers and then round-trips them.
+
+        String adage = "Brevity is the soul of wit. \uD83D\uDE02"; // Laughing face with tears
+        String observation = "What's the deal with airline food? \u2708\uFE0F\uD83C\uDF7D️"; // Airplane/fork+knife+plate
+        String litotes = "Not bad. \uD83D\uDC4D"; // Thumbs up
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
+
+        writer.writeString(adage);
+        writer.writeString(observation);
+        writer.writeString(litotes);
+        writer.close();
+
+        byte[] data = out.toByteArray();
+
+        IonReader reader = IonReaderBuilder.standard().build(data);
+        reader.next();
+        assertEquals(adage, reader.stringValue());
+        reader.next();
+        assertEquals(observation, reader.stringValue());
+        reader.next();
+        assertEquals(litotes, reader.stringValue());
+    }
+
+    @Test
+    public void testReadLargeStrings() throws Exception {
+        // This test constructs some strings with non-ascii text that are large enough to exceed the size
+        // of IonBinaryReaderRawX's reusable decoding buffers and then round-trips them.
+
+        String verse = "\uD83C\uDFB6 This is the song that never ends\n" // Musical notes emoji
+                + "\uD83C\uDFB5 Yes it goes on and on, my friends!\n"
+                + "\uD83C\uDFB6 Some people started singing it not knowing what it was\n"
+                + "\uD83C\uDFB5 And they'll continue singing it forever just because...\n";
+
+        final int numberOfVerses = 1024;
+
+        StringBuilder stringBuilder = new StringBuilder();
+        for (int i = 0; i < numberOfVerses; i++) {
+            stringBuilder.append(verse);
+        }
+        String longSong = stringBuilder.toString();
+
+        for (int i = 0; i < numberOfVerses; i++) {
+            stringBuilder.append(verse);
+        }
+        String longerSong = stringBuilder.toString();
+
+        for (int i = 0; i < numberOfVerses; i++) {
+            stringBuilder.append(verse);
+        }
+        String longestSong = stringBuilder.toString();
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
+
+        writer.writeString(longSong);
+        writer.writeString(longerSong);
+        writer.writeString(longestSong);
+        writer.close();
+
+        byte[] songData = out.toByteArray();
+
+        IonReader reader = IonReaderBuilder.standard().build(songData);
+        reader.next();
+        assertEquals(longSong, reader.stringValue());
+        reader.next();
+        assertEquals(longerSong, reader.stringValue());
+        reader.next();
+        assertEquals(longestSong, reader.stringValue());
+    }
+}

From 7cb5c0b7f8c0d0503b7c63b0416a2099f8cfcda7 Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Tue, 26 Nov 2019 07:47:34 -0500
Subject: [PATCH 078/490] Optimizations for writing binary strings. (#268)

---
 .../ion/impl/bin/IonRawBinaryWriter.java      | 162 ++++++++++++------
 1 file changed, 106 insertions(+), 56 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 23ced039c6..7d192f5bac 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -50,6 +50,11 @@
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -120,6 +125,16 @@ private static byte[] bytes(int... vals) {
 
     private static final byte VARINT_NEG_ZERO   = (byte) 0xC0;
 
+    // See IonRawBinaryWriter#writeString(String) for usage information.
+    static final int SMALL_STRING_SIZE = 64;
+    static final int MEDIUM_STRING_SIZE = 4 * 1024;
+
+    // Reusable resources for encoding Strings as UTF-8 bytes
+    final CharsetEncoder utf8Encoder = Charset.forName("UTF-8").newEncoder();
+    final ByteBuffer utf8EncodingBuffer = ByteBuffer.allocate((int) (MEDIUM_STRING_SIZE * utf8Encoder.maxBytesPerChar()));
+    final char[] charArray = new char[MEDIUM_STRING_SIZE];
+    final CharBuffer reusableCharBuffer = CharBuffer.wrap(charArray);
+
     private static final byte[] makeTypedPreallocatedBytes(final int typeDesc, final int length)
     {
         final byte[] bytes = new byte[length];
@@ -1429,65 +1444,100 @@ public void writeString(final String value) throws IOException
         }
         prepareValue();
 
-        // assume the string is ASCII and round up the sizing -- we should revisit this for CJK heavy use cases
-        int estUtf8Length = value.length();
-        int preallocatedLength = 1;
-        final long lengthPosition = buffer.position() + 1;
-        if (estUtf8Length <= 0xD)
-        {
-            // size fits in low nibble
-            estUtf8Length = 0xD;
-            buffer.writeUInt8(STRING_TYPE);
-        }
-        else
-        {
-            if (estUtf8Length <= 0x7F)
-            {
-                estUtf8Length = 0x7F;
-                preallocatedLength = 2;
-                buffer.writeBytes(STRING_TYPED_PREALLOCATED_2);
-            }
-            else
-            {
-                estUtf8Length = 0x3FFF;
-                preallocatedLength = 3;
-                buffer.writeBytes(STRING_TYPED_PREALLOCATED_3);
-            }
-            // TODO decide if it is worth preallocating for > 16KB strings
+        /*
+         This method relies on the standard CharsetEncoder class to encode each String's UTF-16 char[] data into
+         UTF-8 bytes. Strangely, CharsetEncoders cannot operate directly on instances of a String. The CharsetEncoder
+         API requires all inputs and outputs to be specified as instances of java.nio.ByteBuffer and
+         java.nio.CharBuffer, making some number of allocations mandatory. Specifically, for each encoding operation
+         we need to have:
+
+            1. An instance of a UTF-8 CharsetEncoder.
+            2. A CharBuffer representation of the String's data.
+            3. A ByteBuffer into which the CharsetEncoder may write UTF-8 bytes.
+
+         To minimize the overhead involved, the IonRawBinaryWriter will reuse previously initialized resources wherever
+         possible. However, because CharBuffer and ByteBuffer each have a fixed length, we can only reuse them for
+         Strings that are small enough to fit. This creates two kinds of input String to encode: those that are small
+         enough for us to reuse our buffers, and those which are not.
+
+         Further benchmarking shows that there is also a third kind: Strings which are small enough to enable additional
+         aggressive optimizations. The JIT can eliminate heap allocations for scalar arrays (e.g. byte[], char[])
+         that have no more than than a configurable number of elements (default: 64), opting to place them on the stack
+         instead. (This threshold be can be overridden with the -XX:EliminateAllocationArraySizeLimit=N JVM flag, but
+         this is neither common nor recommended.) When encoding small strings, requesting new buffers will cause those
+         buffers to be allocated on the stack instead of on the heap. And, because these buffers only exist for the
+         duration of the encoding method call (i.e. they are neither returned from the method nor stored in a member
+         field), the JIT is able to selectively eliminate costly superfluous steps like defensive array copying. For
+         more details, see the JDK's documentation on Escape Analysis[1].
+
+         The String#getBytes(Charset) method cannot be used for two reasons:
+
+               1. It always allocates, so we cannot reuse any resources.
+               2. If/when it encounters character data that cannot be encoded as UTF-8, it simply replaces that data
+                 with a substitute character[2]. (Sometimes seen in applications as a '?'.) In order
+                 to surface invalid data to the user, the method must be able to detect these events at encoding time.
+
+            [1] https://docs.oracle.com/javase/8/docs/technotes/guides/vm/performance-enhancements-7.html#escapeAnalysis
+            [2] https://en.wikipedia.org/wiki/Substitute_character
+        */
+
+        CharBuffer stringData;
+        ByteBuffer encodingBuffer;
+
+        int length = value.length();
+
+        // While it is possible to encode the Ion string using a fixed-size encodingBuffer, we need to be able to
+        // write the length of the complete UTF-8 string to the output stream before we write the string itself.
+        // For simplicity, we reuse or create an encodingBuffer that is large enough to hold the full string.
+
+        // In order to encode the input String, we need to pass it to CharsetEncoder as an implementation of CharBuffer.
+        // Surprisingly, the intuitive way to achieve this (the CharBuffer#wrap(CharSequence) method) adds a large
+        // amount of CPU overhead to the encoding process. Benchmarking shows that it's substantially faster
+        // to use String#getChars(int, int, char[], int) to copy the String's backing array and then call
+        // CharBuffer#wrap(char[]) on the copy.
+
+        if (length <= SMALL_STRING_SIZE || length > MEDIUM_STRING_SIZE) {
+            // Small strings and large Strings both request fresh buffers.
+            encodingBuffer = ByteBuffer.allocate((int) (value.length() * utf8Encoder.maxBytesPerChar()));
+            char[] chars = new char[value.length()];
+            value.getChars(0, value.length(), chars, 0);
+            stringData = CharBuffer.wrap(chars);
+        } else {
+            // Medium-sized strings are encoded using our reusable buffers.
+            encodingBuffer = utf8EncodingBuffer;
+            encodingBuffer.position(0);
+            encodingBuffer.limit(encodingBuffer.capacity());
+            stringData = reusableCharBuffer;
+            value.getChars(0, value.length(), charArray, 0);
+            reusableCharBuffer.position(0);
+            reusableCharBuffer.limit(value.length());
+        }
+
+        // Because encodingBuffer is guaranteed to be large enough to hold the encoded string, we can
+        // perform the encoding in a single call to CharsetEncoder#encode(CharBuffer, ByteBuffer, boolean).
+        CoderResult coderResult = utf8Encoder.encode(stringData, encodingBuffer, true);
+
+        // 'Underflow' is the success state of a CoderResult.
+        if (!coderResult.isUnderflow()) {
+            throw new IllegalArgumentException("Could not encode string as UTF8 bytes: " + value);
+        }
+        encodingBuffer.flip();
+        int utf8Length = encodingBuffer.remaining();
+
+        // Write the type and length codes to the output stream.
+        long previousPosition = buffer.position();
+        if (utf8Length <= 0xD) {
+            buffer.writeUInt8(STRING_TYPE | utf8Length);
+        } else {
+            buffer.writeUInt8(STRING_TYPE | 0xE);
+            buffer.writeVarUInt(utf8Length);
         }
-        updateLength(preallocatedLength);
 
-        // actually encode the string
-        final int utf8Length = buffer.writeUTF8(value);
-        if (utf8Length <= estUtf8Length)
-        {
-            // we fit!
-            if (utf8Length <= 0xD)
-            {
-                // special case for patching the type byte itself with the length
-                buffer.writeUInt8At(lengthPosition - 1, STRING_TYPE | utf8Length);
-            }
-            else if (utf8Length <= 0x7F)
-            {
-                buffer.writeVarUIntDirect1At(lengthPosition, utf8Length);
-            }
-            else
-            {
-                buffer.writeVarUIntDirect2At(lengthPosition, utf8Length);
-            }
-        }
-        else
-        {
-            // side patch
-            if (estUtf8Length == 0xD)
-            {
-                // we need to patch the type with the extended length
-                buffer.writeUInt8At(lengthPosition - 1, STRING_TYPE_EXTENDED_LENGTH);
-            }
-            addPatchPoint(lengthPosition, preallocatedLength - 1, utf8Length);
-        }
+        // Write the encoded UTF-8 bytes to the output stream
+        buffer.writeBytes(encodingBuffer.array(), 0, utf8Length);
 
-        updateLength(utf8Length);
+        long bytesWritten = buffer.position() - previousPosition;
+        updateLength(bytesWritten);
 
         finishValue();
     }

From a339edb793692ef4408c526d2329dad728a8173a Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Tue, 26 Nov 2019 18:05:05 -0500
Subject: [PATCH 079/490] Simplified string encoding. (#269)

---
 .../ion/impl/bin/IonRawBinaryWriter.java      | 35 ++++++-------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 7d192f5bac..887ad9be30 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -126,13 +126,12 @@ private static byte[] bytes(int... vals) {
     private static final byte VARINT_NEG_ZERO   = (byte) 0xC0;
 
     // See IonRawBinaryWriter#writeString(String) for usage information.
-    static final int SMALL_STRING_SIZE = 64;
-    static final int MEDIUM_STRING_SIZE = 4 * 1024;
+    static final int SMALL_STRING_SIZE = 4 * 1024;
 
     // Reusable resources for encoding Strings as UTF-8 bytes
     final CharsetEncoder utf8Encoder = Charset.forName("UTF-8").newEncoder();
-    final ByteBuffer utf8EncodingBuffer = ByteBuffer.allocate((int) (MEDIUM_STRING_SIZE * utf8Encoder.maxBytesPerChar()));
-    final char[] charArray = new char[MEDIUM_STRING_SIZE];
+    final ByteBuffer utf8EncodingBuffer = ByteBuffer.allocate((int) (SMALL_STRING_SIZE * utf8Encoder.maxBytesPerChar()));
+    final char[] charArray = new char[SMALL_STRING_SIZE];
     final CharBuffer reusableCharBuffer = CharBuffer.wrap(charArray);
 
     private static final byte[] makeTypedPreallocatedBytes(final int typeDesc, final int length)
@@ -1458,27 +1457,16 @@ public void writeString(final String value) throws IOException
          To minimize the overhead involved, the IonRawBinaryWriter will reuse previously initialized resources wherever
          possible. However, because CharBuffer and ByteBuffer each have a fixed length, we can only reuse them for
          Strings that are small enough to fit. This creates two kinds of input String to encode: those that are small
-         enough for us to reuse our buffers, and those which are not.
-
-         Further benchmarking shows that there is also a third kind: Strings which are small enough to enable additional
-         aggressive optimizations. The JIT can eliminate heap allocations for scalar arrays (e.g. byte[], char[])
-         that have no more than than a configurable number of elements (default: 64), opting to place them on the stack
-         instead. (This threshold be can be overridden with the -XX:EliminateAllocationArraySizeLimit=N JVM flag, but
-         this is neither common nor recommended.) When encoding small strings, requesting new buffers will cause those
-         buffers to be allocated on the stack instead of on the heap. And, because these buffers only exist for the
-         duration of the encoding method call (i.e. they are neither returned from the method nor stored in a member
-         field), the JIT is able to selectively eliminate costly superfluous steps like defensive array copying. For
-         more details, see the JDK's documentation on Escape Analysis[1].
+         enough for us to reuse our buffers ("small strings"), and those which are not ("large strings").
 
          The String#getBytes(Charset) method cannot be used for two reasons:
 
                1. It always allocates, so we cannot reuse any resources.
                2. If/when it encounters character data that cannot be encoded as UTF-8, it simply replaces that data
-                 with a substitute character[2]. (Sometimes seen in applications as a '?'.) In order
+                 with a substitute character[1]. (Sometimes seen in applications as a '?'.) In order
                  to surface invalid data to the user, the method must be able to detect these events at encoding time.
 
-            [1] https://docs.oracle.com/javase/8/docs/technotes/guides/vm/performance-enhancements-7.html#escapeAnalysis
-            [2] https://en.wikipedia.org/wiki/Substitute_character
+            [1] https://en.wikipedia.org/wiki/Substitute_character
         */
 
         CharBuffer stringData;
@@ -1496,20 +1484,19 @@ duration of the encoding method call (i.e. they are neither returned from the me
         // to use String#getChars(int, int, char[], int) to copy the String's backing array and then call
         // CharBuffer#wrap(char[]) on the copy.
 
-        if (length <= SMALL_STRING_SIZE || length > MEDIUM_STRING_SIZE) {
-            // Small strings and large Strings both request fresh buffers.
+        if (length > SMALL_STRING_SIZE) {
+            // Allocate a new buffer for large strings
             encodingBuffer = ByteBuffer.allocate((int) (value.length() * utf8Encoder.maxBytesPerChar()));
             char[] chars = new char[value.length()];
             value.getChars(0, value.length(), chars, 0);
             stringData = CharBuffer.wrap(chars);
         } else {
-            // Medium-sized strings are encoded using our reusable buffers.
+            // Reuse our existing buffers for small strings
             encodingBuffer = utf8EncodingBuffer;
-            encodingBuffer.position(0);
-            encodingBuffer.limit(encodingBuffer.capacity());
+            encodingBuffer.clear();
             stringData = reusableCharBuffer;
             value.getChars(0, value.length(), charArray, 0);
-            reusableCharBuffer.position(0);
+            reusableCharBuffer.rewind();
             reusableCharBuffer.limit(value.length());
         }
 

From 925d50d08b7610e2dc37cbab5cd30d954103eee1 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 24 Dec 2019 14:00:28 -0800
Subject: [PATCH 080/490] Adds support for writing LST append after
 IonWriter.flush().

---
 src/com/amazon/ion/IonWriter.java             | 38 ++++++-----
 .../ion/impl/bin/IonManagedBinaryWriter.java  | 19 ++++--
 .../com/amazon/ion/impl/BinaryWriterTest.java | 25 ++++++--
 .../amazon/ion/impl/IonWriterTestCase.java    | 20 +++++-
 .../ion/impl/OutputStreamWriterTestCase.java  |  1 -
 .../impl/bin/IonManagedBinaryWriterTest.java  | 64 +++++++++++++++++++
 6 files changed, 134 insertions(+), 33 deletions(-)

diff --git a/src/com/amazon/ion/IonWriter.java b/src/com/amazon/ion/IonWriter.java
index fe1e0e960d..dae9c08e62 100644
--- a/src/com/amazon/ion/IonWriter.java
+++ b/src/com/amazon/ion/IonWriter.java
@@ -58,12 +58,12 @@
  * <p>
  * Once all the top-level values have been written (and stepped-out back to
  * the starting level), the caller must {@link #close()} the writer
- * (or at least {@link #finish()} it) before accessing
+ * (or at least {@link #flush()} or {@link #finish()} it) before accessing
  * the data written to the underlying data sink
  * (for example, via {@link ByteArrayOutputStream#toByteArray()}).
- * The writer may have internal buffers and without closing or finishing it,
- * it may not have written everything to the underlying data sink. In addition,
- * {@link #flush()} isn't guaranteed to be sufficient for all implementations.
+ * The writer may have internal buffers and without closing, flushing, or
+ * finishing it, it may not have written everything to the underlying data
+ * sink.
  *
  * <h2>Exception Handling</h2>
  * {@code IonWriter} is a generic interface for generating Ion data, and it's
@@ -106,18 +106,19 @@ public interface IonWriter
 
     /**
      * Flushes this writer by writing any buffered output to the underlying
-     * output target.
+     * output target without finalizing the stream's local symbol table.
      * <p>
      * For some implementations this may have no effect even when some data is
      * buffered, because it's not always possible to fully write partial data.
      * In particular, when writing binary Ion data, Ion's length-prefixed
      * encoding requires a complete top-level value to be written at once.
      * <p>
-     * Furthermore, when writing binary Ion data, <em>nothing</em> can be
-     * flushed until the writer knows that no more local symbols can be
-     * encountered. This can be accomplished via {@link #finish()} or by
-     * making the {@linkplain #getSymbolTable() local symbol table}
-     * {@linkplain SymbolTable#makeReadOnly() read-only}.
+     * This feature can be used to flush buffered data before writing more
+     * values without subsequently having to redeclare the current local
+     * symbol table. Applications that produce long streams of binary Ion may
+     * wish to flush occasionally to relieve memory pressure, then continue
+     * writing data using the same local symbol table. The symbol table will
+     * be appended with newly-encountered symbols as necessary.
      *
      * @throws IOException if thrown by the underlying output target.
      *
@@ -144,13 +145,16 @@ public interface IonWriter
      * {@link com.amazon.ion.system.IonWriterBuilder.IvmMinimizing
      * IvmMinimizing}.)
      * <p>
-     * This feature can be used to flush reliably before writing more values.
-     * Think about a long-running stream of binary values: without finishing,
-     * all the values would continue to buffer since the encoder keeps
-     * expecting more local symbols (which must be written into the local
-     * symbol table that precedes all top-level values). Such an application
-     * can finish occasionally to flush the data out, then continue writing
-     * more data using a fresh local symbol table.
+     * This feature can be used to flush buffered data and reset the local
+     * symbol table before writing more values. Applications that produce long
+     * streams of binary Ion may wish to finish occasionally to relieve memory
+     * pressure, then continue writing data using a new local symbol table.
+     * This is particularly useful for streams that contain an ever-growing
+     * number of unique symbols to avoid unbounded growth of the symbol table,
+     * which may degrade performance and bloat the encoding. Applications that
+     * produce long streams with a limited number of unique symbols should
+     * use {@link #flush()} instead to avoid re-declaring the local symbol
+     * table unnecessarily.
      *
      * @throws IOException if thrown by the underlying output target.
      * @throws IllegalStateException when not between top-level values.
diff --git a/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
index e898f2a16a..3c87b72afb 100644
--- a/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
@@ -740,16 +740,22 @@ public int getDepth()
 
     private void startLocalSymbolTableIfNeeded(final boolean writeIVM) throws IOException
     {
-        if (symbolState == SymbolState.SYSTEM_SYMBOLS)
+        boolean isAppend = symbolState == SymbolState.LOCAL_SYMBOLS_FLUSHED;
+        if (symbolState == SymbolState.SYSTEM_SYMBOLS || isAppend)
         {
-            if (writeIVM)
+            if (writeIVM && !isAppend)
             {
                 symbols.writeIonVersionMarker();
             }
             symbols.addTypeAnnotationSymbol(systemSymbol(ION_SYMBOL_TABLE_SID));
             symbols.stepIn(STRUCT);
             {
-                if (imports.parents.size() > 0)
+                if (isAppend)
+                {
+                    symbols.setFieldNameSymbol(systemSymbol(IMPORTS_SID));
+                    symbols.writeSymbolToken(systemSymbol(ION_SYMBOL_TABLE_SID));
+                }
+                else if (imports.parents.size() > 0)
                 {
                     symbols.setFieldNameSymbol(systemSymbol(IMPORTS_SID));
                     symbols.stepIn(LIST);
@@ -1071,7 +1077,7 @@ public void writeBytes(byte[] data, int off, int len) throws IOException
 
     public void flush() throws IOException
     {
-        if (getDepth() == 0 && localsLocked)
+        if (getDepth() == 0 && !user.hasAnnotations())
         {
             unsafeFlush();
         }
@@ -1083,10 +1089,9 @@ private void unsafeFlush() throws IOException
         {
             // this implies that we have a local symbol table of some sort and the user locked it
             symbolState.closeTable(symbols);
+            // make sure that until the local symbol state changes we no-op the table closing routine
+            symbolState = SymbolState.LOCAL_SYMBOLS_FLUSHED;
         }
-
-        // make sure that until the local symbol state changes we no-op the table closing routine
-        symbolState = SymbolState.LOCAL_SYMBOLS_FLUSHED;
         // push the data out
         symbols.finish();
         user.finish();
diff --git a/test/com/amazon/ion/impl/BinaryWriterTest.java b/test/com/amazon/ion/impl/BinaryWriterTest.java
index f2d287859f..7110e152cc 100644
--- a/test/com/amazon/ion/impl/BinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/BinaryWriterTest.java
@@ -15,6 +15,7 @@
 
 package com.amazon.ion.impl;
 
+import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonType;
@@ -26,6 +27,9 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.SimpleCatalog;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -120,27 +124,36 @@ public void testFlushingUnlockedSymtab()
     throws Exception
     {
         iw = makeWriter();
-        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java/issues/8
+        iw.writeSymbol("force a local symtab");
         SymbolTable symtab = iw.getSymbolTable();
         symtab.intern("fred_1");
         symtab.intern("fred_2");
 
         iw.writeSymbol("fred_1");
+        // This would cause an appended LST to be written before the next value.
         iw.flush();
-        byte[] bytes = myOutputStream.toByteArray();
-        assertEquals(0, bytes.length);
+        IonReader reader = IonReaderBuilder.standard().build(myOutputStream.toByteArray());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("force a local symtab", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("fred_1", reader.stringValue());
+        assertNull(reader.next());
     }
 
     @Test
     public void testFlushingUnlockedSymtabWithImports()
     throws Exception
     {
-        SymbolTable fred1 = Symtabs.register("fred",   1, catalog());
+        SimpleCatalog catalog = catalog();
+        SymbolTable fred1 = Symtabs.register("fred",   1, catalog);
         iw = makeWriter(fred1);
         iw.writeSymbol("fred_1");
+        // This would cause an appended LST to be written before the next value.
         iw.flush();
-        byte[] bytes = myOutputStream.toByteArray();
-        assertEquals(0, bytes.length);
+        IonReader reader = IonReaderBuilder.standard().withCatalog(catalog).build(myOutputStream.toByteArray());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("fred_1", reader.stringValue());
+        assertNull(reader.next());
     }
 
     @Test
diff --git a/test/com/amazon/ion/impl/IonWriterTestCase.java b/test/com/amazon/ion/impl/IonWriterTestCase.java
index e13ff69dcf..505a756e9e 100644
--- a/test/com/amazon/ion/impl/IonWriterTestCase.java
+++ b/test/com/amazon/ion/impl/IonWriterTestCase.java
@@ -47,6 +47,7 @@
 import com.amazon.ion.SystemSymbols;
 import com.amazon.ion.TestUtils;
 import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.impl.bin._Private_IonManagedWriter;
 import com.amazon.ion.junit.IonAssert;
 import com.amazon.ion.system.IonSystemBuilder;
 import java.io.ByteArrayInputStream;
@@ -805,9 +806,24 @@ public void testFlushDoesNotReset()
         iw.writeSymbol("now");
         iw.close();
 
-        // Should have:  IVM SYMTAB hey now
         IonDatagram dg = reload();
-        assertEquals(4, dg.systemSize());
+        if (myOutputForm == OutputForm.BINARY && iw instanceof _Private_IonManagedWriter) {
+            // Note: LST append will only be implemented in the "new" binary writer (which implements
+            // _Private_IonMangedWriter)
+            // Should have:  IVM SYMTAB hey SYMTAB_APPEND now
+            assertEquals(5, dg.systemSize());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+            assertEquals("hey", ((IonSymbol) dg.systemGet(2)).stringValue());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
+            assertEquals("now", ((IonSymbol) dg.systemGet(4)).stringValue());
+        }
+        else {
+            // Should have:  IVM SYMTAB hey SYMTAB_APPEND now
+            assertEquals(4, dg.systemSize());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+            assertEquals("hey", ((IonSymbol) dg.systemGet(2)).stringValue());
+            assertEquals("now", ((IonSymbol) dg.systemGet(3)).stringValue());
+        }
     }
 
     Iterator<IonValue> systemIterateOutput()
diff --git a/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java b/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
index acc7c010a8..4093ae4b6d 100644
--- a/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
+++ b/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
@@ -179,7 +179,6 @@ private void testFlushing()
         // Try flushing when there's just a pending annotation.
         iw.addTypeAnnotation("fred_1");
         iw.flush();
-        checkFlushed(true);
         myOutputStreamWrapper.flushed = false;
 
         bytes = myOutputStream.toByteArray();
diff --git a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
index b83bbbd2e1..8fc3d67b00 100644
--- a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
@@ -20,7 +20,11 @@
 import static java.util.Collections.unmodifiableMap;
 
 import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonInt;
 import com.amazon.ion.IonMutableCatalog;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonSymbol;
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonValue;
@@ -179,6 +183,66 @@ public void testSystemSymbol() throws Exception
         assertValue("name");
     }
 
+    @Test
+    public void testLocalSymbolTableAppend() throws Exception
+    {
+        writer.writeSymbol("taco");
+        writer.flush();
+        writer.writeSymbol("burrito");
+        writer.finish();
+        IonReader reader = system().newReader(writer.getBytes());
+        reader.next();
+        assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
+        assertEquals(reader.getSymbolTable().findSymbol("burrito"), -1);
+        reader.next();
+        assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
+        assertEquals(reader.getSymbolTable().findSymbol("burrito"), 16);
+        assertNull(reader.next());
+
+        IonDatagram dg = system().getLoader().load(writer.getBytes());
+        // Should be IVM SYMTAB taco SYMTAB burrito
+        assertEquals(5, dg.systemSize());
+        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+        assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
+        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
+        assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
+    }
+
+    @Test
+    public void testFlushImmediatelyAfterIVM() throws Exception
+    {
+        writer.flush();
+        writer.writeSymbol("burrito");
+        writer.finish();
+        IonReader reader = system().newReader(writer.getBytes());
+        reader.next();
+        assertEquals(reader.getSymbolTable().findSymbol("taco"), -1);
+        assertEquals(reader.getSymbolTable().findSymbol("burrito"), 15);
+        assertNull(reader.next());
+
+        IonDatagram dg = system().getLoader().load(writer.getBytes());
+        // Should be IVM SYMTAB burrito
+        assertEquals(3, dg.systemSize());
+        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+        assertEquals("burrito", ((IonSymbol) dg.systemGet(2)).stringValue());
+    }
+
+    @Test
+    public void testNoNewSymbolsAfterFlush() throws Exception
+    {
+        writer.writeSymbol("taco");
+        writer.flush();
+        writer.writeInt(123);
+        writer.finish();
+
+        IonDatagram dg = system().getLoader().load(writer.getBytes());
+        // Should be IVM SYMTAB taco 123
+        assertEquals(4, dg.systemSize());
+        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+        assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
+        assertEquals(123, ((IonInt) dg.systemGet(3)).intValue());
+    }
+
     @Test
     public void testUserFieldNames() throws Exception
     {

From b823333c0cea44e3e9d636080b0ed2830c5eaad0 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 24 Dec 2019 14:50:21 -0800
Subject: [PATCH 081/490] Adds support for intercepting an appended LST when
 written via the public IonWriter APIs.

---
 .../ion/impl/bin/IonManagedBinaryWriter.java  | 36 ++++++++--
 .../impl/bin/IonManagedBinaryWriterTest.java  | 68 +++++++++++++++++++
 2 files changed, 99 insertions(+), 5 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
index 3c87b72afb..2299baf20e 100644
--- a/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
@@ -368,12 +368,20 @@ public void afterStepOut(final IonManagedBinaryWriter self) throws IOException
                     // since we don't know what's coming after (i.e. new local symbols)
                     self.user.truncate(self.userSymbolTablePosition);
 
-                    // flush out the pre-existing symbol and user content before the user provided symbol table
-                    self.finish();
+                    if (self.isUserLSTAppend)
+                    {
+                        self.flush();
+                    }
+                    else
+                    {
 
-                    // replace the symbol table context with the user provided one
-                    // TODO determine if the resolver mode should be configurable for this use case
-                    self.imports = new ImportedSymbolContext(ImportedSymbolResolverMode.DELEGATE, self.userImports);
+                        // flush out the pre-existing symbol and user content before the user provided symbol table
+                        self.finish();
+
+                        // replace the symbol table context with the user provided one
+                        // TODO determine if the resolver mode should be configurable for this use case
+                        self.imports = new ImportedSymbolContext(ImportedSymbolResolverMode.DELEGATE, self.userImports);
+                    }
 
                     // explicitly start the local symbol table with no version marker
                     // in case we need the previous symbols
@@ -392,10 +400,24 @@ public void afterStepOut(final IonManagedBinaryWriter self) throws IOException
                     self.userCurrentImport.reset();
                     self.userImports.clear();
                     self.userSymbols.clear();
+                    self.isUserLSTAppend = false;
 
                     self.userState = NORMAL;
                 }
             }
+
+            @Override
+            public void writeSymbolToken(final IonManagedBinaryWriter self, final SymbolToken value)
+            {
+                if (
+                    self.user.getDepth() == 1
+                    && self.user.getFieldId() == IMPORTS_SID
+                    && value.getSid() == ION_SYMBOL_TABLE_SID
+                ) {
+                    self.isUserLSTAppend = true;
+                    self.userState = LOCALS_AT_TOP;
+                }
+            }
         },
         LOCALS_AT_IMPORTS
         {
@@ -515,6 +537,7 @@ public void writeString(final IonManagedBinaryWriter self, String value)
         public abstract void afterStepOut(final IonManagedBinaryWriter self) throws IOException;
 
         public void writeString(final IonManagedBinaryWriter self, final String value) throws IOException {}
+        public void writeSymbolToken(final IonManagedBinaryWriter self, final SymbolToken value) {}
         public void writeInt(final IonManagedBinaryWriter self, final long value) throws IOException {}
         public void writeInt(IonManagedBinaryWriter self, BigInteger value) throws IOException
         {
@@ -636,6 +659,7 @@ public void makeReadOnly()
     private final List<SymbolTable>             userImports;
     private final List<String>                  userSymbols;
     private final ImportDescriptor              userCurrentImport;
+    private boolean                             isUserLSTAppend;
 
     private boolean                             closed;
 
@@ -680,6 +704,7 @@ public void makeReadOnly()
         this.userImports = new ArrayList<SymbolTable>();
         this.userSymbols = new ArrayList<String>();
         this.userCurrentImport = new ImportDescriptor();
+        this.isUserLSTAppend = false;
 
         // TODO decide if initial LST should survive finish() and seed the next LST
         final SymbolTable lst = builder.initialSymbolTable;
@@ -1031,6 +1056,7 @@ public void writeSymbolToken(SymbolToken token) throws IOException
             return;
         }
         token = intern(token);
+        userState.writeSymbolToken(this, token);
         user.writeSymbolToken(token);
     }
 
diff --git a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
index 8fc3d67b00..416abc9637 100644
--- a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
@@ -243,6 +243,74 @@ public void testNoNewSymbolsAfterFlush() throws Exception
         assertEquals(123, ((IonInt) dg.systemGet(3)).intValue());
     }
 
+    @Test
+    public void testManuallyWriteLSTAppendWithImportsFirst() throws Exception
+    {
+        writer.writeSymbol("taco");
+        writer.addTypeAnnotation("$ion_symbol_table");
+        writer.stepIn(IonType.STRUCT);
+        writer.setFieldName("imports");
+        writer.writeSymbol("$ion_symbol_table");
+        writer.setFieldName("symbols");
+        writer.stepIn(IonType.LIST);
+        writer.writeString("burrito");
+        writer.stepOut();
+        writer.stepOut();
+        writer.writeSymbol("burrito");
+        writer.finish();
+
+        IonDatagram dg = system().getLoader().load(writer.getBytes());
+        // Should be IVM SYMTAB taco SYMTAB burrito
+        assertEquals(5, dg.systemSize());
+        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+        assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
+        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
+        assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
+
+        IonReader reader = system().newReader(writer.getBytes());
+        reader.next();
+        assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
+        assertEquals(reader.getSymbolTable().findSymbol("burrito"), -1);
+        reader.next();
+        assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
+        assertEquals(reader.getSymbolTable().findSymbol("burrito"), 16);
+        assertNull(reader.next());
+    }
+
+    @Test
+    public void testManuallyWriteLSTAppendWithSymbolsFirst() throws Exception
+    {
+        writer.writeSymbol("taco");
+        writer.addTypeAnnotation("$ion_symbol_table");
+        writer.stepIn(IonType.STRUCT);
+        writer.setFieldName("symbols");
+        writer.stepIn(IonType.LIST);
+        writer.writeString("burrito");
+        writer.stepOut();
+        writer.setFieldName("imports");
+        writer.writeSymbol("$ion_symbol_table");
+        writer.stepOut();
+        writer.writeSymbol("burrito");
+        writer.finish();
+
+        IonDatagram dg = system().getLoader().load(writer.getBytes());
+        // Should be IVM SYMTAB taco SYMTAB burrito
+        assertEquals(5, dg.systemSize());
+        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+        assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
+        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
+        assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
+
+        IonReader reader = system().newReader(writer.getBytes());
+        reader.next();
+        assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
+        assertEquals(reader.getSymbolTable().findSymbol("burrito"), -1);
+        reader.next();
+        assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
+        assertEquals(reader.getSymbolTable().findSymbol("burrito"), 16);
+        assertNull(reader.next());
+    }
+
     @Test
     public void testUserFieldNames() throws Exception
     {

From ff3a971781aab36d1da7d632abb2a2cf121846bc Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <barbosf@amazon.com>
Date: Tue, 28 Jan 2020 10:09:05 -0800
Subject: [PATCH 082/490] Update ion-tests (#275)

Adds a filter for md files so we can safely add documentation to any
ion-tests subfolder
---
 ion-tests                                       |  2 +-
 test/com/amazon/ion/TestUtils.java              | 17 ++++++++++++-----
 .../amazon/ion/streaming/ReaderDomCopyTest.java |  1 -
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ion-tests b/ion-tests
index 48a63157b2..05ecd5de78 160000
--- a/ion-tests
+++ b/ion-tests
@@ -1 +1 @@
-Subproject commit 48a63157b28b81ed72c71789dac7d7f0ffe87038
+Subproject commit 05ecd5de78ac6244826cd4e77bae932925c966c1
diff --git a/test/com/amazon/ion/TestUtils.java b/test/com/amazon/ion/TestUtils.java
index c5fbfb2e76..3f8a2bb241 100644
--- a/test/com/amazon/ion/TestUtils.java
+++ b/test/com/amazon/ion/TestUtils.java
@@ -63,11 +63,11 @@ public boolean accept(File dir, String name)
         }
     };
 
-    public static final FilenameFilter ION_ONLY_FILTER = new FilenameFilter()
+    public static final FilenameFilter NOT_MARKDOWN_FILTER = new FilenameFilter()
     {
         public boolean accept(File dir, String name)
         {
-            return name.endsWith(".ion") || name.endsWith(".10n");
+            return !name.endsWith(".md");
         }
     };
 
@@ -131,15 +131,22 @@ public boolean accept(File dir, String name)
     }
 
     public static final FilenameFilter GLOBAL_SKIP_LIST =
-        new FileIsNot(
+        new And(
+            // Skips documentation that accompanies some test vectors
+            NOT_MARKDOWN_FILTER,   
+            new FileIsNot(
                       "bad/clobWithNullCharacter.ion"          // TODO amzn/ion-java/43
                       ,"bad/emptyAnnotatedInt.10n"             // TODO amzn/ion-java/55
                       ,"good/subfieldVarUInt32bit.ion"         // TODO amzn/ion-java/62
                       ,"good/utf16.ion"                        // TODO amzn/ion-java/61
                       ,"good/utf32.ion"                        // TODO amzn/ion-java/61
                       ,"good/whitespace.ion"
-                      , "good/item1.10n"                        // TODO amzn/ion-java#126 (roundtrip symbols with unknown text)
-                      );
+                      ,"good/item1.10n"                        // TODO amzn/ion-java#126 (roundtrip symbols with unknown text)
+                      ,"bad/typecodes/type_6_length_0.10n"     // TODO amzn/ion-java#272
+                      ,"good/typecodes/T7-large.10n"           // TODO amzn/ion-java#273 
+                      ,"good/equivs/clobNewlines.ion"          // TODO amzn/ion-java#274
+            )
+        );
 
 
     private static void testdataFiles(FilenameFilter filter,
diff --git a/test/com/amazon/ion/streaming/ReaderDomCopyTest.java b/test/com/amazon/ion/streaming/ReaderDomCopyTest.java
index 4afb3ec7a4..a9674d4cee 100644
--- a/test/com/amazon/ion/streaming/ReaderDomCopyTest.java
+++ b/test/com/amazon/ion/streaming/ReaderDomCopyTest.java
@@ -36,7 +36,6 @@ public class ReaderDomCopyTest
     public static final File[] FILES =
         testdataFiles(GLOBAL_SKIP_LIST, GOOD_IONTESTS_FILES);
 
-
     private File myTestFile;
 
     public void setTestFile(File file)

From 40689a8d59d8299cd5884ad7768a1125c3ce2385 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 7 Feb 2020 13:39:47 -0800
Subject: [PATCH 083/490] Fixes a bug that could cause an infinite loop when an
 IonValue was modified while being read with the tree reader.

---
 src/com/amazon/ion/IonSystem.java               |  4 ++++
 .../amazon/ion/impl/IonReaderTreeSystem.java    |  1 +
 src/com/amazon/ion/system/IonReaderBuilder.java |  4 ++++
 test/com/amazon/ion/impl/TreeReaderTest.java    | 17 +++++++++++++++++
 4 files changed, 26 insertions(+)

diff --git a/src/com/amazon/ion/IonSystem.java b/src/com/amazon/ion/IonSystem.java
index f7bb29c038..8dd489562a 100644
--- a/src/com/amazon/ion/IonSystem.java
+++ b/src/com/amazon/ion/IonSystem.java
@@ -485,6 +485,10 @@ public SymbolTable newSharedSymbolTable(String name,
      * model. Typically this is used to iterate over a collection, such as an
      * {@link IonStruct}.
      *
+     * The given value and its children, if any, must not be modified until after
+     * the IonReader constructed by this method is closed. Violating this
+     * constraint results in undefined behavior.
+     *
      * @param value must not be null.
      */
     public IonReader newReader(IonValue value);
diff --git a/src/com/amazon/ion/impl/IonReaderTreeSystem.java b/src/com/amazon/ion/impl/IonReaderTreeSystem.java
index f8a12181b0..868e65104b 100644
--- a/src/com/amazon/ion/impl/IonReaderTreeSystem.java
+++ b/src/com/amazon/ion/impl/IonReaderTreeSystem.java
@@ -497,6 +497,7 @@ public boolean hasNext()
                         _next_idx = ii+1;
                         break;
                     }
+                    ii++;
                 }
             }
             // if there anything left?
diff --git a/src/com/amazon/ion/system/IonReaderBuilder.java b/src/com/amazon/ion/system/IonReaderBuilder.java
index 895933b43d..755cbe1fa8 100644
--- a/src/com/amazon/ion/system/IonReaderBuilder.java
+++ b/src/com/amazon/ion/system/IonReaderBuilder.java
@@ -253,6 +253,10 @@ public IonReader build(Reader ionText)
      * {@link IonReader} instance over an {@link IonValue} data model. Typically
      * this is used to iterate over a collection, such as an {@link IonStruct}.
      *
+     * The given value and its children, if any, must not be modified until after
+     * the IonReader constructed by this method is closed. Violating this
+     * constraint results in undefined behavior.
+     *
      * @param value must not be null.
      *
      * @see IonSystem#newReader(IonValue)
diff --git a/test/com/amazon/ion/impl/TreeReaderTest.java b/test/com/amazon/ion/impl/TreeReaderTest.java
index 34af455227..20108f9e0e 100644
--- a/test/com/amazon/ion/impl/TreeReaderTest.java
+++ b/test/com/amazon/ion/impl/TreeReaderTest.java
@@ -92,4 +92,21 @@ public void testReadingStructFields()
         check().next().fieldName((String)null).type(IonType.NULL);
         assertTopLevel(in, /* inStruct */ false);
     }
+
+    @Test
+    public void testModificationDuringRead()
+    {
+        IonList list = system().newEmptyList();
+        list.add().newString("abc");
+        list.add().newString("def");
+        in = system().newReader(list);
+        assertEquals(IonType.LIST, in.next());
+        in.stepIn();
+        assertEquals(IonType.STRING, in.next());
+        // Violate the contract by modifying the value.
+        list.remove(0);
+        // Since the value was modified while it was being written, the result of the following is undefined. But
+        // one thing is for sure: it should not cause an infinite loop.
+        in.next();
+    }
 }

From fa374ac22f18432338b9e88a20c8f32de91cb3cb Mon Sep 17 00:00:00 2001
From: Peter Cornell <pcornell@amazon.com>
Date: Mon, 24 Feb 2020 16:46:56 -0800
Subject: [PATCH 084/490] Disables LST append writing by default and adds
 option to enable it (#278)

---
 src/com/amazon/ion/IonWriter.java             |   8 +-
 .../impl/_Private_IonBinaryWriterBuilder.java |  30 +++++
 .../ion/impl/bin/IonManagedBinaryWriter.java  |   6 +-
 ...Private_IonManagedBinaryWriterBuilder.java |  15 +++
 .../ion/system/IonBinaryWriterBuilder.java    |  21 ++++
 .../com/amazon/ion/impl/BinaryWriterTest.java |  64 ++++++++--
 .../amazon/ion/impl/IonWriterTestCase.java    |  19 ++-
 .../impl/bin/IonManagedBinaryWriterTest.java  | 113 +++++++++++++-----
 8 files changed, 231 insertions(+), 45 deletions(-)

diff --git a/src/com/amazon/ion/IonWriter.java b/src/com/amazon/ion/IonWriter.java
index dae9c08e62..99270c6eae 100644
--- a/src/com/amazon/ion/IonWriter.java
+++ b/src/com/amazon/ion/IonWriter.java
@@ -113,7 +113,9 @@ public interface IonWriter
      * In particular, when writing binary Ion data, Ion's length-prefixed
      * encoding requires a complete top-level value to be written at once.
      * <p>
-     * This feature can be used to flush buffered data before writing more
+     * If localSymbolTableAppend is enabled (see
+     * {@link com.amazon.ion.system.IonBinaryWriterBuilder#withLocalSymbolTableAppendEnabled}),
+     * this feature can be used to flush buffered data before writing more
      * values without subsequently having to redeclare the current local
      * symbol table. Applications that produce long streams of binary Ion may
      * wish to flush occasionally to relieve memory pressure, then continue
@@ -153,7 +155,9 @@ public interface IonWriter
      * number of unique symbols to avoid unbounded growth of the symbol table,
      * which may degrade performance and bloat the encoding. Applications that
      * produce long streams with a limited number of unique symbols should
-     * use {@link #flush()} instead to avoid re-declaring the local symbol
+     * enable localSymbolTableAppend (see
+     * {@link com.amazon.ion.system.IonBinaryWriterBuilder#withLocalSymbolTableAppendEnabled})
+     * and {@link #flush()} instead to avoid re-declaring the local symbol
      * table unnecessarily.
      *
      * @throws IOException if thrown by the underlying output target.
diff --git a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
index c92da72b29..3465bd474d 100644
--- a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
+++ b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
@@ -193,6 +193,36 @@ _Private_IonBinaryWriterBuilder withInitialSymbolTable(SymbolTable symtab)
         return b;
     }
 
+    @Override
+    public void setLocalSymbolTableAppendEnabled(boolean enabled)
+    {
+        mutationCheck();
+        if (enabled)
+        {
+            myBinaryWriterBuilder.withLocalSymbolTableAppendEnabled();
+        }
+        else
+        {
+            myBinaryWriterBuilder.withLocalSymbolTableAppendDisabled();
+        }
+    }
+
+    @Override
+    public _Private_IonBinaryWriterBuilder withLocalSymbolTableAppendEnabled()
+    {
+        _Private_IonBinaryWriterBuilder b = mutable();
+        b.setLocalSymbolTableAppendEnabled(true);
+        return b;
+    }
+
+    @Override
+    public _Private_IonBinaryWriterBuilder withLocalSymbolTableAppendDisabled()
+    {
+        _Private_IonBinaryWriterBuilder b = mutable();
+        b.setLocalSymbolTableAppendEnabled(false);
+        return b;
+    }
+
     @Override
     public void setIsFloatBinary32Enabled(boolean enabled) {
         mutationCheck();
diff --git a/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
index 2299baf20e..003dc70abe 100644
--- a/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
@@ -659,6 +659,7 @@ public void makeReadOnly()
     private final List<SymbolTable>             userImports;
     private final List<String>                  userSymbols;
     private final ImportDescriptor              userCurrentImport;
+    private final boolean                       lstAppendEnabled;
     private boolean                             isUserLSTAppend;
 
     private boolean                             closed;
@@ -704,6 +705,7 @@ public void makeReadOnly()
         this.userImports = new ArrayList<SymbolTable>();
         this.userSymbols = new ArrayList<String>();
         this.userCurrentImport = new ImportDescriptor();
+        this.lstAppendEnabled = builder.isLocalSymbolTableAppendEnabled;
         this.isUserLSTAppend = false;
 
         // TODO decide if initial LST should survive finish() and seed the next LST
@@ -765,7 +767,7 @@ public int getDepth()
 
     private void startLocalSymbolTableIfNeeded(final boolean writeIVM) throws IOException
     {
-        boolean isAppend = symbolState == SymbolState.LOCAL_SYMBOLS_FLUSHED;
+        boolean isAppend = symbolState == SymbolState.LOCAL_SYMBOLS_FLUSHED && lstAppendEnabled;
         if (symbolState == SymbolState.SYSTEM_SYMBOLS || isAppend)
         {
             if (writeIVM && !isAppend)
@@ -1103,7 +1105,7 @@ public void writeBytes(byte[] data, int off, int len) throws IOException
 
     public void flush() throws IOException
     {
-        if (getDepth() == 0 && !user.hasAnnotations())
+        if (getDepth() == 0 && !user.hasAnnotations() && (localsLocked || lstAppendEnabled))
         {
             unsafeFlush();
         }
diff --git a/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java b/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
index 8c1dd6aab9..b439d160a1 100644
--- a/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
+++ b/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
@@ -77,6 +77,7 @@ BlockAllocatorProvider createAllocatorProvider()
     /*package*/ volatile IonCatalog             catalog;
     /*package*/ volatile WriteValueOptimization optimization;
     /*package*/ volatile SymbolTable            initialSymbolTable;
+    /*package*/ volatile boolean                isLocalSymbolTableAppendEnabled;
     /*package*/ volatile boolean                isFloatBinary32Enabled;
 
     private _Private_IonManagedBinaryWriterBuilder(final BlockAllocatorProvider provider)
@@ -88,6 +89,7 @@ private _Private_IonManagedBinaryWriterBuilder(final BlockAllocatorProvider prov
         this.preallocationMode = PreallocationMode.PREALLOCATE_2;
         this.catalog = new SimpleCatalog();
         this.optimization = WriteValueOptimization.NONE;
+        this.isLocalSymbolTableAppendEnabled = false;
         this.isFloatBinary32Enabled = false;
     }
 
@@ -101,6 +103,7 @@ private _Private_IonManagedBinaryWriterBuilder(final _Private_IonManagedBinaryWr
         this.catalog            = other.catalog;
         this.optimization       = other.optimization;
         this.initialSymbolTable = other.initialSymbolTable;
+        this.isLocalSymbolTableAppendEnabled = other.isLocalSymbolTableAppendEnabled;
         this.isFloatBinary32Enabled = other.isFloatBinary32Enabled;
     }
 
@@ -193,6 +196,18 @@ public _Private_IonManagedBinaryWriterBuilder withStreamCopyOptimization(boolean
         return this;
     }
 
+    public _Private_IonManagedBinaryWriterBuilder withLocalSymbolTableAppendEnabled()
+    {
+        isLocalSymbolTableAppendEnabled = true;
+        return this;
+    }
+
+    public _Private_IonManagedBinaryWriterBuilder withLocalSymbolTableAppendDisabled()
+    {
+        isLocalSymbolTableAppendEnabled = false;
+        return this;
+    }
+
     public _Private_IonManagedBinaryWriterBuilder withFloatBinary32Enabled() {
         isFloatBinary32Enabled = true;
         return this;
diff --git a/src/com/amazon/ion/system/IonBinaryWriterBuilder.java b/src/com/amazon/ion/system/IonBinaryWriterBuilder.java
index c6d6a0e545..b6b40257e3 100644
--- a/src/com/amazon/ion/system/IonBinaryWriterBuilder.java
+++ b/src/com/amazon/ion/system/IonBinaryWriterBuilder.java
@@ -174,6 +174,27 @@ public IvmMinimizing getIvmMinimizing()
     IonBinaryWriterBuilder withInitialSymbolTable(SymbolTable symtab);
 
 
+    /**
+     * Enables or disables writing local symbol tables that append symbols
+     * to the current symbol table.  This functionality is disabled by default.
+     */
+    public abstract void setLocalSymbolTableAppendEnabled(boolean enabled);
+
+
+    /**
+     * Enables writing local symbol tables that append symbols to the current
+     * symbol table.  This functionality is disabled by default.
+     */
+    public abstract IonBinaryWriterBuilder withLocalSymbolTableAppendEnabled();
+
+
+    /**
+     * Disables writing local symbol tables that append symbols to the current
+     * symbol table.  This functionality is disabled by default.
+     */
+    public abstract IonBinaryWriterBuilder withLocalSymbolTableAppendDisabled();
+
+
     /**
      * Enables or disables writing Binary32 (4-byte, single precision,
      * IEEE-754) values for floats when there would be no loss in precision.
diff --git a/test/com/amazon/ion/impl/BinaryWriterTest.java b/test/com/amazon/ion/impl/BinaryWriterTest.java
index 7110e152cc..8ab10fdcef 100644
--- a/test/com/amazon/ion/impl/BinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/BinaryWriterTest.java
@@ -28,6 +28,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 
+import com.amazon.ion.system.IonBinaryWriterBuilder;
 import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.system.SimpleCatalog;
 import org.junit.Assert;
@@ -41,7 +42,10 @@ protected IonWriter makeWriter(OutputStream out, SymbolTable... imports)
         throws Exception
     {
         myOutputForm = OutputForm.BINARY;
-        return system().newBinaryWriter(out, imports);
+        IonBinaryWriterBuilder builder = IonBinaryWriterBuilder.standard()
+                .withImports(imports);
+        builder.setLocalSymbolTableAppendEnabled(myLstAppendEnabled);
+        return builder.build(out);
     }
 
     @Test
@@ -123,6 +127,29 @@ public void testInternUnlockedSymtab()
     public void testFlushingUnlockedSymtab()
     throws Exception
     {
+        byte[] bytes = flushUnlockedSymtab(false);
+        assertEquals(0, bytes.length);
+    }
+
+    @Test
+    public void testFlushingUnlockedSymtabWithLSTAppend()
+    throws Exception
+    {
+        byte[] bytes = flushUnlockedSymtab(true);
+
+        // iw.flush() should have caused an appended LST to be written before the next value.
+        IonReader reader = IonReaderBuilder.standard().build(bytes);
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("force a local symtab", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("fred_1", reader.stringValue());
+        assertNull(reader.next());
+    }
+
+    private byte[] flushUnlockedSymtab(boolean lstAppendEnabled)
+    throws Exception
+    {
+        myLstAppendEnabled = lstAppendEnabled;
         iw = makeWriter();
         iw.writeSymbol("force a local symtab");
         SymbolTable symtab = iw.getSymbolTable();
@@ -130,14 +157,8 @@ public void testFlushingUnlockedSymtab()
         symtab.intern("fred_2");
 
         iw.writeSymbol("fred_1");
-        // This would cause an appended LST to be written before the next value.
         iw.flush();
-        IonReader reader = IonReaderBuilder.standard().build(myOutputStream.toByteArray());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("force a local symtab", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("fred_1", reader.stringValue());
-        assertNull(reader.next());
+        return myOutputStream.toByteArray();
     }
 
     @Test
@@ -145,15 +166,34 @@ public void testFlushingUnlockedSymtabWithImports()
     throws Exception
     {
         SimpleCatalog catalog = catalog();
+        byte[] bytes = flushUnlockedSymtabWithImports(catalog, false);
+        assertEquals(0, bytes.length);
+    }
+
+    @Test
+    public void testFlushingUnlockedSymtabWithImportsWithLSTAppend()
+    throws Exception
+    {
+        SimpleCatalog catalog = catalog();
+        byte[] bytes = flushUnlockedSymtabWithImports(catalog, true);
+
+        IonReader reader = IonReaderBuilder.standard().withCatalog(catalog).build(bytes);
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("fred_1", reader.stringValue());
+        assertNull(reader.next());
+    }
+
+
+    private byte[] flushUnlockedSymtabWithImports(SimpleCatalog catalog, boolean lstAppendEnabled)
+    throws Exception
+    {
         SymbolTable fred1 = Symtabs.register("fred",   1, catalog);
+        myLstAppendEnabled = lstAppendEnabled;
         iw = makeWriter(fred1);
         iw.writeSymbol("fred_1");
         // This would cause an appended LST to be written before the next value.
         iw.flush();
-        IonReader reader = IonReaderBuilder.standard().withCatalog(catalog).build(myOutputStream.toByteArray());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("fred_1", reader.stringValue());
-        assertNull(reader.next());
+        return myOutputStream.toByteArray();
     }
 
     @Test
diff --git a/test/com/amazon/ion/impl/IonWriterTestCase.java b/test/com/amazon/ion/impl/IonWriterTestCase.java
index 505a756e9e..82f8e61914 100644
--- a/test/com/amazon/ion/impl/IonWriterTestCase.java
+++ b/test/com/amazon/ion/impl/IonWriterTestCase.java
@@ -72,6 +72,8 @@ enum OutputForm { TEXT, BINARY, DOM }
 
     OutputForm myOutputForm;
 
+    boolean myLstAppendEnabled = false;
+
     protected IonWriter iw;
 
     @Rule
@@ -799,6 +801,21 @@ public void testFlushMidValue()
     public void testFlushDoesNotReset()
     throws Exception
     {
+        flushDoesNotReset(false);
+    }
+
+    @Test
+    public void testFlushDoesNotResetWithLstAppend()
+    throws Exception
+    {
+        flushDoesNotReset(true);
+    }
+
+    private void flushDoesNotReset(boolean lstAppendEnabled)
+    throws Exception
+    {
+        myLstAppendEnabled = lstAppendEnabled;
+
         SymbolTable fred1 = Symtabs.register("fred",   1, catalog());
         iw = makeWriter(fred1);
         iw.writeSymbol("hey");
@@ -807,7 +824,7 @@ public void testFlushDoesNotReset()
         iw.close();
 
         IonDatagram dg = reload();
-        if (myOutputForm == OutputForm.BINARY && iw instanceof _Private_IonManagedWriter) {
+        if (myOutputForm == OutputForm.BINARY && iw instanceof _Private_IonManagedWriter && myLstAppendEnabled) {
             // Note: LST append will only be implemented in the "new" binary writer (which implements
             // _Private_IonMangedWriter)
             // Should have:  IVM SYMTAB hey SYMTAB_APPEND now
diff --git a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
index 416abc9637..033ad91c36 100644
--- a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
@@ -43,6 +43,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.junit.Test;
 
 @SuppressWarnings("deprecation")
@@ -81,6 +82,21 @@ public class IonManagedBinaryWriterTest extends IonRawBinaryWriterTest
         SHARED_SYMBOL_LOCAL_SIDS = unmodifiableMap(sidMap);
     }
 
+    private enum LSTAppendMode
+    {
+        LST_APPEND_DISABLED,
+        LST_APPEND_ENABLED;
+        public boolean isEnabled() { return this == LST_APPEND_ENABLED; }
+    }
+
+    @Inject("lstAppendMode")
+    public static final LSTAppendMode[] LST_APPEND_ENABLED_DIMENSIONS = LSTAppendMode.values();
+    private LSTAppendMode lstAppendMode;
+    public void setLstAppendMode(final LSTAppendMode mode)
+    {
+        this.lstAppendMode = mode;
+    }
+
     private void checkSymbolTokenAgainstImport(final SymbolToken token)
     {
         final Integer sid = SHARED_SYMBOL_LOCAL_SIDS.get(token.getText());
@@ -139,12 +155,19 @@ protected IonWriter createWriter(final OutputStream out) throws IOException
             catalog.putTable(table);
         }
 
-        final IonWriter writer = _Private_IonManagedBinaryWriterBuilder
+        final _Private_IonManagedBinaryWriterBuilder builder = _Private_IonManagedBinaryWriterBuilder
             .create(AllocatorMode.POOLED)
             .withImports(importedSymbolResolverMode, symbolTables)
             .withPreallocationMode(preallocationMode)
-            .withFloatBinary32Enabled()
-            .newWriter(out);
+            .withFloatBinary32Enabled();
+
+        if (lstAppendMode.isEnabled()) {
+            builder.withLocalSymbolTableAppendEnabled();
+        } else {
+            builder.withLocalSymbolTableAppendDisabled();
+        }
+
+        final IonWriter writer = builder.newWriter(out);
 
         final SymbolTable locals = writer.getSymbolTable();
         assertEquals(14, locals.getImportedMaxId());
@@ -190,22 +213,34 @@ public void testLocalSymbolTableAppend() throws Exception
         writer.flush();
         writer.writeSymbol("burrito");
         writer.finish();
+
         IonReader reader = system().newReader(writer.getBytes());
         reader.next();
         assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
-        assertEquals(reader.getSymbolTable().findSymbol("burrito"), -1);
+        assertEquals(reader.getSymbolTable().findSymbol("burrito"), lstAppendMode.isEnabled() ? -1 : 16);
         reader.next();
         assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
         assertEquals(reader.getSymbolTable().findSymbol("burrito"), 16);
         assertNull(reader.next());
 
         IonDatagram dg = system().getLoader().load(writer.getBytes());
-        // Should be IVM SYMTAB taco SYMTAB burrito
-        assertEquals(5, dg.systemSize());
-        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
-        assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
-        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
-        assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
+        if (lstAppendMode.isEnabled())
+        {
+            // Should be IVM SYMTAB taco SYMTAB burrito
+            assertEquals(5, dg.systemSize());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
+            assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
+        }
+        else
+        {
+            // Should be IVM SYMTAB taco burrito
+            assertEquals(4, dg.systemSize());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
+            assertEquals("burrito", ((IonSymbol) dg.systemGet(3)).stringValue());
+        }
     }
 
     @Test
@@ -259,22 +294,33 @@ public void testManuallyWriteLSTAppendWithImportsFirst() throws Exception
         writer.writeSymbol("burrito");
         writer.finish();
 
-        IonDatagram dg = system().getLoader().load(writer.getBytes());
-        // Should be IVM SYMTAB taco SYMTAB burrito
-        assertEquals(5, dg.systemSize());
-        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
-        assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
-        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
-        assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
-
         IonReader reader = system().newReader(writer.getBytes());
         reader.next();
         assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
-        assertEquals(reader.getSymbolTable().findSymbol("burrito"), -1);
+        assertEquals(reader.getSymbolTable().findSymbol("burrito"), lstAppendMode.isEnabled() ? -1 : 16);
         reader.next();
         assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
         assertEquals(reader.getSymbolTable().findSymbol("burrito"), 16);
         assertNull(reader.next());
+
+        IonDatagram dg = system().getLoader().load(writer.getBytes());
+        if (lstAppendMode.isEnabled())
+        {
+            // Should be IVM SYMTAB taco SYMTAB burrito
+            assertEquals(5, dg.systemSize());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
+            assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
+        }
+        else
+        {
+            // Should be IVM SYMTAB taco burrito
+            assertEquals(4, dg.systemSize());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
+            assertEquals("burrito", ((IonSymbol) dg.systemGet(3)).stringValue());
+        }
     }
 
     @Test
@@ -293,22 +339,33 @@ public void testManuallyWriteLSTAppendWithSymbolsFirst() throws Exception
         writer.writeSymbol("burrito");
         writer.finish();
 
-        IonDatagram dg = system().getLoader().load(writer.getBytes());
-        // Should be IVM SYMTAB taco SYMTAB burrito
-        assertEquals(5, dg.systemSize());
-        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
-        assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
-        assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
-        assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
-
         IonReader reader = system().newReader(writer.getBytes());
         reader.next();
         assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
-        assertEquals(reader.getSymbolTable().findSymbol("burrito"), -1);
+        assertEquals(reader.getSymbolTable().findSymbol("burrito"), lstAppendMode.isEnabled() ? -1 : 16);
         reader.next();
         assertEquals(reader.getSymbolTable().findSymbol("taco"), 15);
         assertEquals(reader.getSymbolTable().findSymbol("burrito"), 16);
         assertNull(reader.next());
+
+        IonDatagram dg = system().getLoader().load(writer.getBytes());
+        if (lstAppendMode.isEnabled())
+        {
+            // Should be IVM SYMTAB taco SYMTAB burrito
+            assertEquals(5, dg.systemSize());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
+            assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
+        }
+        else
+        {
+            // Should be IVM SYMTAB taco burrito
+            assertEquals(4, dg.systemSize());
+            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
+            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
+            assertEquals("burrito", ((IonSymbol) dg.systemGet(3)).stringValue());
+        }
     }
 
     @Test

From d96a94a9d7d41f278761a1e45968d024357b98e0 Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Tue, 25 Feb 2020 11:57:13 -0800
Subject: [PATCH 085/490] Release 1.6.0 (#280)

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 17b4327909..ccf0d16542 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.5.1</version>
+  <version>1.6.0</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 51e20d3858..a8392b69f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.5.2-SNAPSHOT</version>
+  <version>1.6.0</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From fddacf3316ac5a0901d493287c632ac32adb5c3f Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Tue, 25 Feb 2020 16:48:35 -0800
Subject: [PATCH 086/490] Fixing staging nexus URL (#282)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a8392b69f8..82b22f7e07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -335,7 +335,7 @@
             <extensions>true</extensions>
             <configuration>
               <serverId>ossrh</serverId>
-              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+              <nexusUrl>https://aws.oss.sonatype.org/</nexusUrl>
               <autoReleaseAfterClose>true</autoReleaseAfterClose>
             </configuration>
           </plugin>

From 8b4df7d5254c5479aa7b494111f904852f7ab25a Mon Sep 17 00:00:00 2001
From: Fernando Raganhan Barbosa <fernandorb86@gmail.com>
Date: Wed, 26 Feb 2020 11:48:41 -0800
Subject: [PATCH 087/490] Adding SNAPSHOT version suffix (#283)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 82b22f7e07..2ac31b4935 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From a563caf436928ac902b1103fd4c7f89294ac142f Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Thu, 19 Mar 2020 14:19:04 -0700
Subject: [PATCH 088/490] Fix(allocator): Allow GC on freed blocks over 64MB
 (#285)

Quick fix to stop memory leaks. Addressing Issue #225 will help decide
on what to do with the block allocator implementations.
---
 .../ion/impl/bin/PooledBlockAllocatorProvider.java     | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java b/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
index 831cb4d2ce..cbd30ae76a 100644
--- a/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
+++ b/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
@@ -34,13 +34,15 @@
      */
     private final class PooledBlockAllocator extends BlockAllocator
     {
-        private final int blockSize;
+        private final int blockSize, blockLimit;
         private final ConcurrentLinkedQueue<Block> freeBlocks;
+        static final int FREE_CAPACITY = 1024 * 1024 * 64; // 64MB
 
         public PooledBlockAllocator(final int blockSize)
         {
             this.blockSize = blockSize;
             this.freeBlocks = new ConcurrentLinkedQueue<Block>();
+            this.blockLimit = FREE_CAPACITY / blockSize;
         }
 
         @Override
@@ -54,8 +56,10 @@ public Block allocateBlock()
                     @Override
                     public void close()
                     {
-                        reset();
-                        freeBlocks.add(this);
+                        if (freeBlocks.size() < blockLimit) {
+                            reset();
+                            freeBlocks.add(this);
+                        }
                     }
                 };
             }

From 5e1be319080bca756e8e963a8adef6b2089077eb Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Thu, 19 Mar 2020 14:51:12 -0700
Subject: [PATCH 089/490] Release 1.6.1 (#286)

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ccf0d16542..76c150391f 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.6.0</version>
+  <version>1.6.1</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 2ac31b4935..d16e9acb32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.6.1-SNAPSHOT</version>
+  <version>1.6.1</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 89add66178d8b276fa5b50bf58e23d0894054686 Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Thu, 19 Mar 2020 16:55:10 -0700
Subject: [PATCH 090/490] Create next SNAPSHOT (#287)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d16e9acb32..bab0e92076 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.6.1</version>
+  <version>1.6.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 5d62f9ab6ee912f2812071fcec9454bd17c3d134 Mon Sep 17 00:00:00 2001
From: Peter Cornell <pcornell@amazon.com>
Date: Mon, 20 Apr 2020 16:08:43 -0700
Subject: [PATCH 091/490] Adds a space after a fieldname's colon when
 pretty-printing (#289)

---
 src/com/amazon/ion/impl/IonWriterSystemText.java  |  3 +++
 test/com/amazon/ion/impl/IonMarkupWriterTest.java |  6 +++---
 test/com/amazon/ion/impl/TextWriterTest.java      | 10 +++++-----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonWriterSystemText.java b/src/com/amazon/ion/impl/IonWriterSystemText.java
index 0e78e95ccd..f577c26ee5 100644
--- a/src/com/amazon/ion/impl/IonWriterSystemText.java
+++ b/src/com/amazon/ion/impl/IonWriterSystemText.java
@@ -366,6 +366,9 @@ void startValue() throws IOException
             SymbolToken sym = assumeFieldNameSymbol();
             writeFieldNameToken(sym);
             _output.appendAscii(':');
+            if (_options.isPrettyPrintOn()) {
+                _output.appendAscii(' ');
+            }
             clearFieldName();
             followingLongString = false;
         }
diff --git a/test/com/amazon/ion/impl/IonMarkupWriterTest.java b/test/com/amazon/ion/impl/IonMarkupWriterTest.java
index b84d7a7da0..f7067d057f 100644
--- a/test/com/amazon/ion/impl/IonMarkupWriterTest.java
+++ b/test/com/amazon/ion/impl/IonMarkupWriterTest.java
@@ -54,7 +54,7 @@ public class IonMarkupWriterTest extends IonTestCase {
             "%n<beforeAnnotations STRUCT><beforeEachAnnotation STRUCT>abcd" +
             "<afterEachAnnotation STRUCT>::<afterAnnotations STRUCT><beforeData" +
             " STRUCT>{<afterStepIn STRUCT>%n  <beforeFieldName SEXP>hello" +
-            "<afterFieldName SEXP>:<beforeData SEXP>(<afterStepIn SEXP>%n    " +
+            "<afterFieldName SEXP>: <beforeData SEXP>(<afterStepIn SEXP>%n    " +
             "<beforeData SYMBOL>sexp<afterData SYMBOL><beforeSeparator SEXP>" +
             "%n    <afterSeparator SEXP><beforeData INT>1<afterData INT>" +
             "<beforeSeparator SEXP>%n    <afterSeparator SEXP><beforeData INT>2" +
@@ -62,12 +62,12 @@ public class IonMarkupWriterTest extends IonTestCase {
             "<beforeData STRING>\"str\"<afterData STRING><beforeStepOut SEXP>%n  " +
             ")<afterData SEXP><beforeSeparator STRUCT>,%n  " +
             "<afterSeparator STRUCT><beforeFieldName LIST>list<afterFieldName " +
-            "LIST>:<beforeData LIST>[<afterStepIn LIST>%n    <beforeData " +
+            "LIST>: <beforeData LIST>[<afterStepIn LIST>%n    <beforeData " +
             "DECIMAL>3.2<afterData DECIMAL><beforeSeparator LIST>,%n    " +
             "<afterSeparator LIST><beforeData FLOAT>3.2e0<afterData FLOAT>" +
             "<beforeStepOut LIST>%n  ]<afterData LIST><beforeSeparator STRUCT>" +
             ",%n  <afterSeparator STRUCT><beforeFieldName BLOB>blob" +
-            "<afterFieldName BLOB>:<beforeAnnotations BLOB>" +
+            "<afterFieldName BLOB>: <beforeAnnotations BLOB>" +
             "<beforeEachAnnotation BLOB>annot<afterEachAnnotation BLOB>::" +
             "<afterAnnotations BLOB><beforeData BLOB>" +
             "{{ T25lIEJpZyBGYXQgVGVzdCBCbG9iIEZvciBZb3VyIFBsZWFzdXJl }}" +
diff --git a/test/com/amazon/ion/impl/TextWriterTest.java b/test/com/amazon/ion/impl/TextWriterTest.java
index ba57d634bf..8c8b527bed 100644
--- a/test/com/amazon/ion/impl/TextWriterTest.java
+++ b/test/com/amazon/ion/impl/TextWriterTest.java
@@ -287,14 +287,14 @@ public void testWritingLongStrings()
                 "%n" +
                 "'''looong'''%n" +
                 "{%n" +
-                        "  a:'''looong''',%n" +
-                "  b:\"hello\",%n" +
-                "  c:'''hello\n" +
+                "  a: '''looong''',%n" +
+                "  b: \"hello\",%n" +
+                "  c: '''hello\n" +
                         "nurse''',%n" +
-                        "  d:'''what\\'s\n" +
+                "  d: '''what\\'s\n" +
                         "up\n" +
                         "doc'''%n" +
-                        "}"
+                "}"
             ),
             dg
         );

From 363a4a1550c98c2cdc95205eb11a10358169af8d Mon Sep 17 00:00:00 2001
From: David Lurton <dlurton@users.noreply.github.com>
Date: Wed, 3 Jun 2020 12:26:37 -0700
Subject: [PATCH 092/490] Fix issue causing test failures in IDE only (#293)

EquivsTestCase and OptimiziedBinaryWriterTestCase are base classes that
were not marked as `abstract` causing IntelliJ's test runner to attempt
treat them like regular, non-abstract test classes which fail.  Making them
both abstract fixes this issue.
---
 test/com/amazon/ion/EquivsTestCase.java       | 21 +++++++------------
 .../impl/OptimizedBinaryWriterTestCase.java   |  2 +-
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/test/com/amazon/ion/EquivsTestCase.java b/test/com/amazon/ion/EquivsTestCase.java
index 7bdce6bb9e..3cb88b345e 100644
--- a/test/com/amazon/ion/EquivsTestCase.java
+++ b/test/com/amazon/ion/EquivsTestCase.java
@@ -15,28 +15,21 @@
 
 package com.amazon.ion;
 
-import static com.amazon.ion.IonType.DATAGRAM;
-
-import com.amazon.ion.impl._Private_Utils;
-import com.amazon.ion.junit.IonAssert;
-import java.io.File;
-import org.junit.Test;
-import com.amazon.ion.IonDatagram;
-import com.amazon.ion.IonSequence;
-import com.amazon.ion.IonString;
-import com.amazon.ion.IonValue;
 import com.amazon.ion.impl._Private_Utils;
 import com.amazon.ion.junit.IonAssert;
 import com.amazon.ion.system.IonBinaryWriterBuilder;
 import com.amazon.ion.system.IonSystemBuilder;
 import com.amazon.ion.system.IonTextWriterBuilder;
+import org.junit.Test;
+
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.util.HashSet;
 
-public class EquivsTestCase
+import static com.amazon.ion.IonType.DATAGRAM;
+
+public abstract class EquivsTestCase
     extends IonTestCase
 {
     /**
@@ -198,7 +191,7 @@ protected void checkEquivalence(final IonValue left,
         }
     }
 
-    public static IonDatagram[] roundTripDatagram(IonDatagram input) throws IOException {
+    protected static IonDatagram[] roundTripDatagram(IonDatagram input) throws IOException {
         IonSystem system = IonSystemBuilder.standard().build();
         IonLoader loader = system.getLoader();
         ByteArrayOutputStream textOutputStream = new ByteArrayOutputStream();
@@ -226,7 +219,7 @@ public static IonDatagram[] roundTripDatagram(IonDatagram input) throws IOExcept
         return data;
     }
 
-    public void roundTripEquivalence(IonDatagram input, boolean myExpectedEquality) throws IOException {
+    protected void roundTripEquivalence(IonDatagram input, boolean myExpectedEquality) throws IOException {
         IonDatagram[] data = roundTripDatagram(input);
         for(int i = 0; i < data.length; i++){
             runEquivalenceChecks(data[i], myExpectedEquality);
diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java b/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
index 684c8a3eaf..f03707ab21 100644
--- a/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
+++ b/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
@@ -37,7 +37,7 @@
  *
  * @see IonSystemBuilder#withStreamCopyOptimized(boolean)
  */
-public class OptimizedBinaryWriterTestCase
+public abstract class OptimizedBinaryWriterTestCase
     extends IonTestCase
 {
     @Inject("copySpeed")

From 0e432eddf34449171f89e94113ed69489ae1400b Mon Sep 17 00:00:00 2001
From: David Lurton <dlurton@users.noreply.github.com>
Date: Thu, 4 Jun 2020 12:31:49 -0700
Subject: [PATCH 093/490] Avoid nesting IonSequenceLite.SubListView instances

---
 .../amazon/ion/impl/lite/IonSequenceLite.java | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/com/amazon/ion/impl/lite/IonSequenceLite.java b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
index 5214b79ec3..f8e2fdf418 100644
--- a/src/com/amazon/ion/impl/lite/IonSequenceLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
@@ -340,7 +340,7 @@ public int lastIndexOf(Object o)
 
     public List<IonValue> subList(int fromIndex, int toIndex)
     {
-        return new SubListView(this, fromIndex, toIndex);
+        return new SubListView(fromIndex, toIndex);
     }
 
     public IonValue[] toArray()
@@ -422,10 +422,8 @@ private class SubListView implements List<IonValue> {
         private int size;
         private int structuralModificationCount;
 
-        private SubListView(final List<IonValue> parent,
-                            final int fromIndex,
-                            final int toIndex) {
-            this.fromIndex = toTopLevelFromIndex(parent, fromIndex);
+        private SubListView(final int fromIndex, final int toIndex) {
+            this.fromIndex = fromIndex;
             this.size = toIndex - fromIndex;
             this.structuralModificationCount = IonSequenceLite.this.structuralModificationCount;
         }
@@ -691,7 +689,7 @@ public void add(final IonValue ionValue) {
 
         public List<IonValue> subList(final int fromIndex, final int toIndex) {
             checkForParentModification();
-            return new SubListView(this, fromIndex, toIndex);
+            return new SubListView(toParentIndex(fromIndex), toParentIndex(toIndex));
         }
 
         private void rangeCheck(int index) {
@@ -708,18 +706,6 @@ private int fromParentIndex(int index) {
             return index - fromIndex;
         }
 
-        /**
-         * Calculates fromIndex based on the top level parent which must be an {@link IonSequenceLite}. With this
-         * nested sublists are able to directly call the top level parent instead of delegating up the parent chain
-         */
-        private int toTopLevelFromIndex(final List<IonValue> parent, int fromIndex) {
-            if (parent instanceof SubListView) {
-                return fromIndex + ((SubListView) parent).fromIndex;
-            }
-
-            return fromIndex;
-        }
-
         private void checkForParentModification() {
             if (this.structuralModificationCount != IonSequenceLite.this.structuralModificationCount) {
                 throw new ConcurrentModificationException();

From b3115b27ee572e5d14af261dea445f72b8522d06 Mon Sep 17 00:00:00 2001
From: David Lurton <dlurton@users.noreply.github.com>
Date: Thu, 4 Jun 2020 16:54:01 -0700
Subject: [PATCH 094/490] Throw exception when IonSequenceLite.subList(int,
 int) arguments invalid

Throw exceptions according to the
[List<T>.subList(int, in)](https://docs.oracle.com/javase/7/docs/api/java/util/ArrayList.html#subList(int,%20int))
javadoc.

Fixes #295
---
 .../amazon/ion/impl/lite/IonSequenceLite.java | 18 +++++++++
 .../BaseIonSequenceLiteSublistTestCase.java   | 40 +++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/src/com/amazon/ion/impl/lite/IonSequenceLite.java b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
index f8e2fdf418..d7e2eeebc3 100644
--- a/src/com/amazon/ion/impl/lite/IonSequenceLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
@@ -338,8 +338,25 @@ public int lastIndexOf(Object o)
         return indexOf(o);
     }
 
+    private static void checkSublistParameters(int size, int fromIndex, int toIndex)
+    {
+        if(fromIndex < 0)
+        {
+            throw new IndexOutOfBoundsException("fromIndex is less than zero");
+        }
+        if(toIndex < fromIndex)
+        {
+            throw new IllegalArgumentException("toIndex may not be less than fromIndex");
+        }
+        if(toIndex > size)
+        {
+            throw new IndexOutOfBoundsException("toIndex exceeds size");
+        }
+    }
+
     public List<IonValue> subList(int fromIndex, int toIndex)
     {
+        checkSublistParameters(this.size(), fromIndex, toIndex);
         return new SubListView(fromIndex, toIndex);
     }
 
@@ -688,6 +705,7 @@ public void add(final IonValue ionValue) {
         }
 
         public List<IonValue> subList(final int fromIndex, final int toIndex) {
+            checkSublistParameters(this.size(), fromIndex, toIndex);
             checkForParentModification();
             return new SubListView(toParentIndex(fromIndex), toParentIndex(toIndex));
         }
diff --git a/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java b/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
index 2bc94f7cf4..13562eefd1 100644
--- a/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
+++ b/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
@@ -44,6 +44,11 @@ public abstract class BaseIonSequenceLiteSublistTestCase {
 
     protected abstract IonSequence newSequence();
 
+    List<IonValue> newSubList() {
+        List<IonValue> seq = newSequence();
+        return seq.subList(0, seq.size());
+    }
+
     @Test
     public void sublistSize() {
         final IonSequence sequence = newSequence();
@@ -52,6 +57,7 @@ public void sublistSize() {
         assertEquals(3, actual.size());
     }
 
+
     @Test
     public void sublistIsEmpty() {
         IonSequence sequence = newSequence();
@@ -60,6 +66,40 @@ public void sublistIsEmpty() {
         assertFalse(sequence.subList(0, 1).isEmpty());
     }
 
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void subListFromIndexLessThanZero() {
+        newSequence().subList(-1, 1);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void subListToIndexLessThanFromIndex() {
+        newSequence().subList(2, 1);
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void subListToIndexExceedsSize() {
+        IonSequence seq = newSequence();
+        // toIndex is exclusive, hence the + 1
+        seq.subList(0, seq.size() + 1);
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void subListOfSubListFromIndexLessThanZero() {
+        newSubList().subList(-1, 1);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void subListOfSubListToIndexLessThanFromIndex() {
+        newSubList().subList(2, 1);
+    }
+
+    @Test(expected = IndexOutOfBoundsException.class)
+    public void subListOfSubListToIndexExceedsSize() {
+        List<IonValue> seq = newSubList();
+        // toIndex is exclusive, hence the + 1
+        seq.subList(0, seq.size() + 1);
+    }
+
     @Test
     public void sublistGet() {
         final IonSequence sequence = newSequence();

From 06752a3be4a2cd2f0ef3cd0165457e88b416b07f Mon Sep 17 00:00:00 2001
From: David Lurton <dlurton@users.noreply.github.com>
Date: Wed, 10 Jun 2020 17:11:50 -0700
Subject: [PATCH 095/490] Make IonSequence.SubListView implement equals and
 hashCode (#297)

* Make IonSequence.SubListView implmenet equals and hashCode

This is accomplished by making it extend AbstractList<IonValue> instead
of implementing List<IonValue>.  Also added tests.
---
 pom.xml                                       |   6 +
 src/com/amazon/ion/IonSequence.java           | 112 ++++++++++-
 .../amazon/ion/impl/lite/IonSequenceLite.java | 153 ++++++++-------
 .../BaseIonSequenceLiteSublistTestCase.java   |   7 +-
 ...nSequenceLiteSubListViewEqualityTests.java | 180 ++++++++++++++++++
 5 files changed, 375 insertions(+), 83 deletions(-)
 create mode 100644 test/com/amazon/ion/impl/lite/IonSequenceLiteSubListViewEqualityTests.java

diff --git a/pom.xml b/pom.xml
index bab0e92076..62ac58ae56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,12 @@
       <version>4.12</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>pl.pragmatists</groupId>
+      <artifactId>JUnitParams</artifactId>
+      <version>1.1.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/src/com/amazon/ion/IonSequence.java b/src/com/amazon/ion/IonSequence.java
index 9621859e59..63995fcaea 100644
--- a/src/com/amazon/ion/IonSequence.java
+++ b/src/com/amazon/ion/IonSequence.java
@@ -44,10 +44,24 @@
  *     non-Ion {@link Collection}s.
  *   </li>
  *   <li>
- *     The method {@link #subList(int, int)} is not implemented at all.
- *     We think it will be quite challenging to get correct, and decided that
- *     it was still valuable to extend {@link List} even with this contractual
- *     violation.
+ *     The implementations of {@link List#equals(Object)}} and
+ *     {@link List#hashCode()} does not conform to the specification of those
+ *     methods in order to conform with Ion's definition of equality which
+ *     takes into account the {@link IonSequence}'s {@link IonType} and its
+ *     annotations in addition to the contents of the collection.
+ *     <ul>
+ *       <li>
+ *         {@link List#equals(Object)} always returns <code>false</code>
+ *         for any non-{@link IonSequence} implementation of {@link List},
+ *         including the sub-list returned from
+ *         {@link IonSequence#subList(int, int)}.
+ *       </li>
+ *       <li>
+ *         {@link List#hashCode()} returns a different hash code than
+ *         other {@link List#hashCode()} implementations. including the
+ *         sub-list returned from {@link IonSequence#subList(int, int)}.
+ *       </li>
+ *     </ul>
  *   </li>
  * </ul>
  */
@@ -400,16 +414,98 @@ public void add(int index, IonValue child)
 
     /**
      * <p>
-     * Returns a view of the portion of this list according to {@link List#subList(int, int)}
-     * contract.
+     * Returns a view of the portion of this list according to
+     * {@link List#subList(int, int)} contract.
      * </p>
      *
      * <p>
-     * Sublist methods will throw a {@link java.util.ConcurrentModificationException} if
-     * its parent list, i.e. this list, had any changes that affect its size the after sublist
+     * Sublist methods will throw a
+     * {@link java.util.ConcurrentModificationException} if its parent list,
+     * i.e. this list, had any changes that affect its size the after sublist
      * was created.
      * </p>
      *
+     * The implementation of {@link List<IonValue>} returned by this method
+     * implements {@link List#equals(Object)} and
+     * {@link List#equals(Object)} ()} per the specification of these methods.
+     * However, the existing implementation of {@link IonSequence} does not
+     * provide a specification compliant {@link List#equals} and
+     * {@link List#hashCode()}} which results to the following caveats:
+     *
+     * Given:
+     *
+     * <code>
+     * int[] ints = new int[] {1, 2, 3, 4};
+     * IonList list = SYSTEM.newList(ints);
+     * IonSexp sexp = SYSTEM.newSexp(ints)
+     * IonSexp dgrm = SYSTEM.newDatagram(ints)
+     * List<IonValue> listSubList = list.subList(0, ints.size())
+     * List<IonValue> sexpSubList = sexp.subList(0, ints.size())
+     * List<IonValue> dgrmSubList = sexp.subList(0, ints.size())
+     * List<IonValue> arrayList = new ArrayList<IonValue>();
+     * for(int i : ints) { arrayList.add(SYSTEM.newInt(i)); }
+     * </code>
+     *
+     * {@link IonSequence#equals(Object)} always returns false when presented
+     * with a non {@link IonSequence} instance of {@link List<IonValue>}.
+     * Hence, the following invocations of {@link Object#equals(Object)}
+     * return false even if the contained elements are equivalent.  This
+     * means that {@link Object#equals(Object)} is not symmetric in these
+     * cases.  The reason for the asymmetry is historical:
+     * {@link IonSequence} has long violated the contract outlined by the
+     * {@link List} documentation.  For the current major version of this
+     * library we maintain backwards compatibility and support this behaviour
+     * as-is.
+     *
+     * <code>
+     * list.equals(listSubList)     // false
+     * list.equals(sexpSubList)     // false
+     * list.equals(dgrm)            // false
+     * list.equals(arrayList)       // false
+     *
+     * sexp.equals(listSubList)     // false
+     * sexp.equals(sexpSubList)     // false
+     * sexp.equals(dgrm)            // false
+     * sexp.equals(arrayList)       // false
+     *
+     * dgrm.equals(listSubList)     // false
+     * dgrm.equals(sexpSubList)     // false
+     * dgrm.equals(dgrmSubList)     // false
+     * dgrm.equals(arrayList)       // false
+     *</code>
+     *
+     * However, {@link IonSequence#subList(int, int)} was implemented much
+     * later and faithfully implements {@link List#equals(Object)} meaning
+     * the cases below all work as expected.  While {@link IonSequence}
+     * does not comply with the specification for {@link List#equals(Object)}
+     * because it has to comply with Ion's rules for equality, the same is
+     * not true for sub-lists.  Unlike {@link IonSequence}, sub-lists have
+     * no notion of an {@link IonType}, annotations or nullability which
+     * allows for compliance with the {@link List} specification.
+     *
+     * <code>
+     * listSubList.equals(listSubList); // true
+     * listSubList.equals(sexpSubList); // true
+     * listSubList.equals(dgrmSubList); // true
+     * listSubList.equals(list);        // true
+     * listSubList.equals(sexp);        // true
+     * listSubList.equals(arrayList);   // true
+     *
+     * sexpSubList.equals(listSubList); // true
+     * sexpSubList.equals(sexpSubList); // true
+     * sexpSubList.equals(dgrmSubList); // true
+     * sexpSubList.equals(list);        // true
+     * sexpSubList.equals(sexp);        // true
+     * sexpSubList.equals(arrayList);   // true
+     *
+     * dgrmSubList.equals(listSubList); // true
+     * dgrmSubList.equals(sexpSubList); // true
+     * dgrmSubList.equals(dgrmSubList); // true
+     * dgrmSubList.equals(list);        // true
+     * dgrmSubList.equals(sexp);        // true
+     * dgrmSubList.equals(arrayList);   // true
+     * </code>
+     *
      * @see List#subList(int, int)
      */
     public List<IonValue> subList(int fromIndex, int toIndex);
diff --git a/src/com/amazon/ion/impl/lite/IonSequenceLite.java b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
index d7e2eeebc3..d8ae7ac361 100644
--- a/src/com/amazon/ion/impl/lite/IonSequenceLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
@@ -25,6 +25,7 @@
 import com.amazon.ion.impl._Private_IonValue;
 import java.io.IOException;
 import java.lang.reflect.Array;
+import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.ConcurrentModificationException;
@@ -429,7 +430,7 @@ void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
      *
      * Structural modifications from the sublist itself are allowed.
      */
-    private class SubListView implements List<IonValue> {
+    private class SubListView extends AbstractList<IonValue> {
 
         /**
          * index in top level IonSequenceLite that marks the start of this sublist view. For nested
@@ -437,24 +438,26 @@ private class SubListView implements List<IonValue> {
          */
         private final int fromIndex;
         private int size;
-        private int structuralModificationCount;
 
         private SubListView(final int fromIndex, final int toIndex) {
             this.fromIndex = fromIndex;
             this.size = toIndex - fromIndex;
-            this.structuralModificationCount = IonSequenceLite.this.structuralModificationCount;
+            super.modCount = IonSequenceLite.this.structuralModificationCount;
         }
 
+        @Override
         public int size() {
             checkForParentModification();
             return size;
         }
 
+        @Override
         public boolean isEmpty() {
             checkForParentModification();
             return size == 0;
         }
 
+        @Override
         public IonValue get(final int index) {
             checkForParentModification();
             rangeCheck(index);
@@ -462,6 +465,7 @@ public IonValue get(final int index) {
             return IonSequenceLite.this.get(toParentIndex(index));
         }
 
+        @Override
         public IonValue set(final int index, final IonValue element) {
             checkForParentModification();
             rangeCheck(index);
@@ -469,53 +473,31 @@ public IonValue set(final int index, final IonValue element) {
             return IonSequenceLite.this.set(toParentIndex(index), element);
         }
 
+        @Override
         public boolean contains(final Object o) {
             checkForParentModification();
-            return indexOf(o) != -1;
+            return super.contains(o);
         }
 
-        public boolean containsAll(final Collection<?> c) {
-            for (Object o : c) {
-                if (!contains(o)) {
-                    return false;
-                }
-            }
-
-            return true;
+        @Override
+        public boolean containsAll(final Collection<?> collection) {
+            checkForParentModification();
+            return super.containsAll(collection);
         }
 
-        public IonValue[] toArray() {
+        @Override
+        public Object[] toArray() {
             checkForParentModification();
-
-            if (size < 1) {
-                return EMPTY_VALUE_ARRAY;
-            }
-
-            return toArray(new IonValue[size]);
+            return super.toArray();
         }
 
-        @SuppressWarnings("unchecked")
-        public <T> T[] toArray(T[] array) {
+        @Override
+        public <T> T[] toArray(T[] ts) {
             checkForParentModification();
-
-            if (array.length < size) {
-                final Class<?> type = array.getClass().getComponentType();
-                // generates unchecked warning
-                array = (T[]) Array.newInstance(type, size);
-            }
-
-            if (size > 0) {
-                System.arraycopy(IonSequenceLite.this._children, fromIndex, array, 0, size);
-            }
-
-            if (size < array.length) {
-                // See IonSequence#toArray and ArrayList#toArray
-                array[size] = null;
-            }
-
-            return array;
+            return super.toArray(ts);
         }
 
+        @Override
         public boolean add(final IonValue ionValue) {
             checkForParentModification();
 
@@ -528,42 +510,42 @@ public boolean add(final IonValue ionValue) {
                 IonSequenceLite.this.add(parentIndex, ionValue);
             }
 
-            this.structuralModificationCount = IonSequenceLite.this.structuralModificationCount;
+            super.modCount = IonSequenceLite.this.structuralModificationCount;
             size++;
 
             return true;
         }
 
+        @Override
         public void add(final int index, final IonValue ionValue) {
             checkForParentModification();
             rangeCheck(index);
 
             IonSequenceLite.this.add(toParentIndex(index), ionValue);
 
-            this.structuralModificationCount = IonSequenceLite.this.structuralModificationCount;
+            super.modCount = IonSequenceLite.this.structuralModificationCount;
             size++;
         }
 
-        public boolean addAll(final Collection<? extends IonValue> c) {
-            for (IonValue ionValue : c) {
-                add(ionValue);
-            }
 
-            return true;
+        @Override
+        public boolean addAll(int i, Collection<? extends IonValue> collection) {
+            checkForParentModification();
+            return super.addAll(i, collection);
         }
 
-        public boolean addAll(final int index, final Collection<? extends IonValue> c) {
-            int i = index;
 
-            for (IonValue ionValue : c) {
-                add(i, ionValue);
-                i++;
-            }
-
-            return true;
+        @Override
+        public boolean addAll(Collection<? extends IonValue> collection) {
+            checkForParentModification();
+            return super.addAll(collection);
         }
 
+        // retainAll has no functionality that is specific to SubListView but
+        // needs to be implemented because the AbstractList<T>.retainAll() throws [UnsupportedOperationException].
+        @Override
         public boolean retainAll(final Collection<?> c) {
+            checkForParentModification();
             if (size < 1) {
                 return false;
             }
@@ -585,6 +567,7 @@ public boolean retainAll(final Collection<?> c) {
             return removeAll(toRemove);
         }
 
+        @Override
         public void clear() {
             checkForParentModification();
 
@@ -595,22 +578,27 @@ public void clear() {
             }
 
             size = 0;
-            this.structuralModificationCount = IonSequenceLite.this.structuralModificationCount;
+            super.modCount = IonSequenceLite.this.structuralModificationCount;
         }
 
+        @Override
         public IonValue remove(final int index) {
             checkForParentModification();
             rangeCheck(index);
 
             final IonValue removed = IonSequenceLite.this.remove(toParentIndex(index));
 
-            this.structuralModificationCount = IonSequenceLite.this.structuralModificationCount;
+            super.modCount = IonSequenceLite.this.structuralModificationCount;
             size--;
 
             return removed;
         }
 
+        // remove(Object) contains no functionality that is specific to SubListView but
+        // needs to be implemented because the AbstractList<T>.remove(Object) throws [UnsupportedOperationException].
+        @Override
         public boolean remove(final Object o) {
+            checkForParentModification();
             int index = indexOf(o);
             if (index < 0) {
                 return false;
@@ -620,7 +608,11 @@ public boolean remove(final Object o) {
             return true;
         }
 
+        // removeAll(Collection<?>) contains no functionality that is specific to SubListView but
+        // needs to be implemented because the AbstractList<T>.remove(Object) throws [UnsupportedOperationException].
+        @Override
         public boolean removeAll(final Collection<?> c) {
+            checkForParentModification();
             boolean changed = false;
             for (Object o : c) {
                 if (remove(o)) {
@@ -631,32 +623,36 @@ public boolean removeAll(final Collection<?> c) {
             return changed;
         }
 
+        @Override
         public int indexOf(final Object o) {
             checkForParentModification();
+            return super.indexOf(o);
+        }
 
-            final int parentIndex = IonSequenceLite.this.indexOf(o);
-            final int index = fromParentIndex(parentIndex);
-
-            // not found
-            if (parentIndex < 0 || index < 0 || index >= size) {
-                return -1;
-            }
-
-            return index;
+        @Override
+        public int lastIndexOf(Object o) {
+            checkForParentModification();
+            return super.lastIndexOf(o);
         }
 
-        public int lastIndexOf(final Object o) {
-            return indexOf(o);
+        @Override
+        protected void removeRange(int from, int to) {
+            checkForParentModification();
+            super.removeRange(from, to);
         }
 
+
+        @Override
         public Iterator<IonValue> iterator() {
             return listIterator(0);
         }
 
+        @Override
         public ListIterator<IonValue> listIterator() {
             return listIterator(0);
         }
 
+        @Override
         public ListIterator<IonValue> listIterator(final int index) {
             checkForParentModification();
 
@@ -704,12 +700,31 @@ public void add(final IonValue ionValue) {
             };
         }
 
+        @Override
         public List<IonValue> subList(final int fromIndex, final int toIndex) {
             checkSublistParameters(this.size(), fromIndex, toIndex);
             checkForParentModification();
             return new SubListView(toParentIndex(fromIndex), toParentIndex(toIndex));
         }
 
+        @Override
+        public boolean equals(Object o) {
+            checkForParentModification();
+            return super.equals(o);
+        }
+
+        @Override
+        public int hashCode() {
+            checkForParentModification();
+            return super.hashCode();
+        }
+
+        @Override
+        public String toString() {
+            checkForParentModification();
+            return super.toString();
+        }
+
         private void rangeCheck(int index) {
             if (index < 0 || index >= size) {
                 throw new IndexOutOfBoundsException(String.valueOf(index));
@@ -720,12 +735,8 @@ private int toParentIndex(int index) {
             return index + fromIndex;
         }
 
-        private int fromParentIndex(int index) {
-            return index - fromIndex;
-        }
-
         private void checkForParentModification() {
-            if (this.structuralModificationCount != IonSequenceLite.this.structuralModificationCount) {
+            if (super.modCount != IonSequenceLite.this.structuralModificationCount) {
                 throw new ConcurrentModificationException();
             }
         }
diff --git a/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java b/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
index 13562eefd1..67b60f8fb8 100644
--- a/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
+++ b/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
@@ -15,16 +15,13 @@
 
 package com.amazon.ion.impl.lite;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.ListIterator;
+
 import org.junit.Test;
 import com.amazon.ion.ContainedValueException;
 import com.amazon.ion.IonInt;
@@ -33,6 +30,8 @@
 import com.amazon.ion.IonValue;
 import com.amazon.ion.system.IonSystemBuilder;
 
+import static org.junit.Assert.*;
+
 /**
  * All tests related to {@link IonSequenceLite#subList(int, int)}. Extracted to a separate test due to the amount of
  * tests
diff --git a/test/com/amazon/ion/impl/lite/IonSequenceLiteSubListViewEqualityTests.java b/test/com/amazon/ion/impl/lite/IonSequenceLiteSubListViewEqualityTests.java
new file mode 100644
index 0000000000..292b4a7bd2
--- /dev/null
+++ b/test/com/amazon/ion/impl/lite/IonSequenceLiteSubListViewEqualityTests.java
@@ -0,0 +1,180 @@
+package com.amazon.ion.impl.lite;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.system.IonSystemBuilder;
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+@RunWith(JUnitParamsRunner.class)
+public class IonSequenceLiteSubListViewEqualityTests {
+    static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
+    private static List<Integer> INTS = Arrays.asList(0, 1, 2, 3, 4, 5, 6);
+    private static List<Integer> OTHER_INTS = Arrays.asList(0, 1, 2, 33, 4, 5, 6);
+    private static List<IonValue> ARRAY_LIST = newArrayList(INTS);
+    private static List<IonValue> OTHER_ARRAY_LIST = newArrayList(OTHER_INTS);
+
+    private interface SublistMaker {
+        List<IonValue> makeSublist(List<IonValue> seq);
+    }
+
+    private static void runSubListEquivalenceTests(List<IonValue> seq, SublistMaker maker) {
+        testSublistEquivalence(seq, maker);
+        testSublistNonEquivalence(seq, maker);
+    }
+
+    // makes a sublist of seq and asserts its equivalence to sublists of all sequence types and to a sublist
+    // derived from ARRAY_LIST
+    private static void testSublistEquivalence(List<IonValue> seq, SublistMaker maker) {
+        List<IonValue> subList = maker.makeSublist(seq);
+        for(IonSequence otherSeq : getTestSequences()) {
+            List<IonValue> otherSubList = maker.makeSublist(otherSeq);
+            assertEquals("subLists should be equivalent", subList, otherSubList);
+            assertEquals("subLists should have the same hashCode", subList.hashCode(), otherSubList.hashCode());
+        }
+
+        List<IonValue> ararySubList = maker.makeSublist(ARRAY_LIST);
+        assertEquals("subList should be equivalent to a sublist of ARRAY_LIST",
+                ararySubList, subList);
+
+        assertEquals("subList should have the same hash code as a sublist of ARRAY_LIST",
+                ararySubList.hashCode(), subList.hashCode());
+    }
+
+    // makes a sublist of seq and asserts its non-equivalence to the same subList range of the "other" sequence
+    // and to a sublist derived from OTHER_ARRAY_LIST
+    private static void testSublistNonEquivalence(List<IonValue> seq, SublistMaker maker) {
+        // A hash collision is unlikely but possible so we do not assert that the hashCodes are different here.
+
+        List<IonValue> subList = maker.makeSublist(seq);
+        for(IonSequence otherSeq : getOtherTestSequences()) {
+            List<IonValue> otherSubList = maker.makeSublist(otherSeq);
+            assertNotEquals("subLists should *not* be equivalent", subList, otherSubList);
+        }
+
+        assertNotEquals("subList should *not* be equivalent to a sublist of OTHER_ARRAY_LIST",
+                maker.makeSublist(OTHER_ARRAY_LIST), subList);
+    }
+
+    private static IonSequence[] getParameters(List<Integer> ints) {
+        return new IonSequence[] {
+            populateSequence(SYSTEM.newList(), ints),
+            populateSequence(SYSTEM.newSexp(), ints),
+            populateSequence(SYSTEM.newDatagram(), ints)
+        };
+    }
+
+
+    @Test
+    @Parameters(method = "getTestSequences")
+    public void fullSubList(IonSequence seq) {
+        SublistMaker maker = new SublistMaker() {
+            @Override
+            public List<IonValue> makeSublist(List<IonValue> seq) {
+                return seq.subList(0, seq.size());
+            }
+        };
+        runSubListEquivalenceTests(seq, maker);
+
+        // The sublist should also be equivalent to the ARRAY_LIST
+        List<IonValue> subList = maker.makeSublist(seq);
+        assertEquals("The full sublist should be equivalent to the ArrayList<IonValue",
+                ARRAY_LIST, subList);
+
+        assertNotEquals("The full sublist should *not* be equivalent to the *other* ArrayList<IonValue",
+                OTHER_ARRAY_LIST, subList);
+    }
+
+    @Test
+    @Parameters(method = "getTestSequences")
+    public void fullSubListOfFullSubList(IonSequence seq) {
+        SublistMaker maker = new SublistMaker() {
+            @Override
+            public List<IonValue> makeSublist(List<IonValue> seq) {
+                return seq.subList(0, seq.size()).subList(0, seq.size());
+            }
+        };
+        runSubListEquivalenceTests(seq, maker);
+    }
+
+    @Test
+    @Parameters(method = "getTestSequences")
+    public void partialSubList(IonSequence seq) {
+        SublistMaker maker = new SublistMaker() {
+            @Override
+            public List<IonValue> makeSublist(List<IonValue> seq) {
+                return seq.subList(1, seq.size() - 1);
+            }
+        };
+        runSubListEquivalenceTests(seq, maker);
+    }
+
+    @Test
+    @Parameters(method = "getTestSequences")
+    public void partialSubListOfPartialSubList(IonSequence seq) {
+        SublistMaker maker = new SublistMaker() {
+            @Override
+            public List<IonValue> makeSublist(List<IonValue> seq) {
+                return seq.subList(1, seq.size() - 1).subList(1, seq.size() - 2);
+            }
+        };
+        runSubListEquivalenceTests(seq, maker);
+    }
+
+    @Test
+    @Parameters(method = "getTestSequences")
+    public void sequenceEquivalenceToSubList(IonSequence seq) {
+        List<IonValue> subList = seq.subList(0, seq.size());
+
+        // Note the asymmetry.  This is expected. See IonSequence.subList javadoc.
+        assertEquals("the sublist should be equivalent to the sequence", subList, seq);
+        assertNotEquals("the sequence should *not* be equivalent to the subList", seq, subList);
+    }
+
+    @Test
+    @Parameters(method = "getTestSequences")
+    public void subListNotEquivalentToNull(IonSequence seq) {
+        List<IonValue> subList = seq.subList(0, seq.size());
+        assertNotEquals("subList should not be equivalent to null", subList, null);
+    }
+
+    @Test
+    @Parameters(method = "getTestSequences")
+    public void subListEquivalentToSelf(IonSequence seq) {
+        List<IonValue> subList = seq.subList(0, seq.size());
+        assertEquals("subList should be equivalent to itself", subList, subList);
+    }
+
+    public static IonSequence[] getTestSequences() {
+        return getParameters(INTS);
+    }
+
+    public static IonSequence[] getOtherTestSequences() {
+        return getParameters(OTHER_INTS);
+    }
+
+    private static IonSequence populateSequence(IonSequence seq, List<Integer> ints) {
+        for(int i : ints) {
+            seq.add(SYSTEM.newInt(i));
+        }
+        return seq;
+    }
+
+    private static ArrayList<IonValue> newArrayList(List<Integer> ints) {
+        ArrayList<IonValue> values = new ArrayList<IonValue>();
+        for(int i : ints) {
+            values.add(SYSTEM.newInt(i));
+        }
+        return values;
+    }
+}

From b6842d54245fdef9366236856130d9cb086b6f37 Mon Sep 17 00:00:00 2001
From: David Lurton <dlurton@users.noreply.github.com>
Date: Mon, 10 Aug 2020 15:00:31 -0700
Subject: [PATCH 096/490] Remove comment suggesting `IonWriter` isn't stable

---
 src/com/amazon/ion/IonWriter.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/com/amazon/ion/IonWriter.java b/src/com/amazon/ion/IonWriter.java
index 99270c6eae..2f0f100247 100644
--- a/src/com/amazon/ion/IonWriter.java
+++ b/src/com/amazon/ion/IonWriter.java
@@ -34,8 +34,6 @@
  * <p>
  * <b>WARNING:</b> This interface should not be implemented or extended by
  * code outside of this library.
- * We still have some work to do before this interface is stable.
- * See <a href="https://github.com/amzn/ion-java/issues/10">issue amzn/ion-java/issues/10</a>
  * <p>
  * A value is written via the set of typed {@code write*()} methods such as
  * {@link #writeBool(boolean)} and {@link #writeInt(long)}.

From 56cbf645e6e34dc3970c92443512de59dac7a633 Mon Sep 17 00:00:00 2001
From: David Lurton <dlurton@users.noreply.github.com>
Date: Fri, 14 Aug 2020 17:14:01 -0700
Subject: [PATCH 097/490] Adds Timestamp.forEpochSecond() (#302)

* Adds Timestamp.forEpochSeconds()

Implements #301.
---
 src/com/amazon/ion/Timestamp.java      | 151 ++++++++++++++++---------
 test/com/amazon/ion/TimestampTest.java | 117 ++++++++++++++++++-
 2 files changed, 215 insertions(+), 53 deletions(-)

diff --git a/src/com/amazon/ion/Timestamp.java b/src/com/amazon/ion/Timestamp.java
index 39df6e0827..591d865222 100644
--- a/src/com/amazon/ion/Timestamp.java
+++ b/src/com/amazon/ion/Timestamp.java
@@ -84,18 +84,37 @@ public final class Timestamp
     private static final int NO_SECONDS = 0;
     private static final BigDecimal NO_FRACTIONAL_SECONDS = null;
 
-    // 0001-01-01T00:00:00.0Z in millis
+    /**
+     * 0001-01-01T00:00:00.0Z in millis.
+     */
     static final long MINIMUM_TIMESTAMP_IN_MILLIS = -62135769600000L;
 
-    // 0001-01-01T00:00:00.0Z in millis
+    /**
+     * 0001-01-01T00:00:00.0Z in millis.
+     */
     static final BigDecimal MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL = new BigDecimal(MINIMUM_TIMESTAMP_IN_MILLIS);
 
-    // 10000T in millis, upper bound exclusive
+    /**
+     * 10000T in millis, upper bound exclusive.
+     */
     static final long MAXIMUM_TIMESTAMP_IN_MILLIS = 253402300800000L;
 
-    // 10000T in millis, upper bound exclusive
+    /**
+     * 10000T in millis, upper bound exclusive.
+     */
     static final BigDecimal MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL = new BigDecimal(MAXIMUM_TIMESTAMP_IN_MILLIS);
 
+
+    /**
+     * 0001-01-01T00:00:00.0Z epoch seconds.
+     */
+    static final long MINIMUM_TIMESTAMP_IN_EPOCH_SECONDS = MINIMUM_TIMESTAMP_IN_MILLIS / 1000;
+
+    /**
+     * 10000T in epoch seconds, upper bound exclusive.
+     */
+    static final long MAXIMUM_TIMESTAMP_IN_EPOCH_SECONDS = MAXIMUM_TIMESTAMP_IN_MILLIS / 1000;
+
     /**
      * Unknown local offset from UTC.
      */
@@ -1254,16 +1273,19 @@ public static Timestamp forDay(int yearZ, int monthZ, int dayZ)
     /**
      * Returns a Timestamp, precise to the minute, with a given local
      * offset.
-     * <p>
-     * This is equivalent to the corresponding Ion value
+     *
+     * <p>This is equivalent to the corresponding Ion value
      * {@code YYYY-MM-DDThh:mm+-oo:oo}, where {@code oo:oo} represents the
-     * hour and minutes of the local offset from UTC.
+     * hour and minutes of the local offset from UTC.</p>
+     *
+     * <p>The values of the {@code year}, {@code month}, {@code day},
+     * {@code hour}, and {@code minute} parameters are relative to the
+     * local {@code offset}.</p>
      *
      * @param offset
      *          the local offset from UTC, measured in minutes;
      *          may be {@code null} to represent an unknown local offset
      *
-
      */
     public static Timestamp forMinute(int year, int month, int day,
                                       int hour, int minute,
@@ -1275,10 +1297,14 @@ public static Timestamp forMinute(int year, int month, int day,
 
     /**
      * Returns a Timestamp, precise to the second, with a given local offset.
-     * <p>
-     * This is equivalent to the corresponding Ion value
+     *
+     * <p>This is equivalent to the corresponding Ion value
      * {@code YYYY-MM-DDThh:mm:ss+-oo:oo}, where {@code oo:oo} represents the
-     * hour and minutes of the local offset from UTC.
+     * hour and minutes of the local offset from UTC.</p>
+     *
+     * <p>The values of the {@code year}, {@code month}, {@code day},
+     * {@code hour}, {@code minute} and {@code second} parameters are relative
+     * to the local {@code offset}.</p>
      *
      * @param offset
      *          the local offset from UTC, measured in minutes;
@@ -1296,19 +1322,19 @@ public static Timestamp forSecond(int year, int month, int day,
 
     /**
      * Returns a Timestamp, precise to the second, with a given local offset.
-     * <p>
-     * This is equivalent to the corresponding Ion value
+     *
+     * <p>This is equivalent to the corresponding Ion value
      * {@code YYYY-MM-DDThh:mm:ss.sss+-oo:oo}, where {@code oo:oo} represents
-     * the hour and minutes of the local offset from UTC.
+     * the hour and minutes of the local offset from UTC.</p>
      *
-     * @param second must be at least zero and less than 60.
-     * Must not be null.
+     * <p>The values of the {@code year}, {@code month}, {@code day},
+     * {@code hour}, {@code minute} and {@code second} parameters are relative
+     * to the local {@code offset}.</p>
      *
-     * @param offset
-     *          the local offset from UTC, measured in minutes;
-     *          may be {@code null} to represent an unknown local offset
+     * @param second must be at least zero and less than 60. Must not be null.
+     * @param offset the local offset from UTC, measured in minutes;
+     *              may be {@code null} to represent an unknown local offset
      *
-
      */
     public static Timestamp forSecond(int year, int month, int day,
                                       int hour, int minute, BigDecimal second,
@@ -1323,46 +1349,33 @@ public static Timestamp forSecond(int year, int month, int day,
 
 
     /**
-     * Returns a Timestamp that represents the point in time that is
-     * {@code millis} milliseconds from the epoch, with a given local offset.
-     * <p>
-     * The resulting Timestamp will be precise to the millisecond.
+     * Returns a Timestamp that represents the point in time that is {@code millis} milliseconds from the epoch,
+     * with a given local offset.
      *
-     * @param millis
-     * the number of milliseconds from the epoch (1970-01-01T00:00:00.000Z).
-     * @param localOffset
-     *          the local offset from UTC, measured in minutes;
-     *          may be {@code null} to represent an unknown local offset.
+     * <p>The resulting Timestamp will be precise to the millisecond.</p>
      *
-
+     * <p>{@code millis} is relative to UTC, regardless of the value supplied for {@code localOffset}.  This
+     * varies from the {@link #forMinute} and {@link #forSecond} methods that assume the specified date and time
+     * values are relative to the local offset.  For example, the following two Timestamps represent
+     * the same point in time:</p>
+     *
+     * <code>
+     * Timestamp theEpoch = Timestamp.forMillis(0, 0);
+     * Timestamp alsoTheEpoch = Timestamp.forSecond(1969, 12, 31, 23, 0, BigDecimal.ZERO, -60);
+     * </code>
+     *
+     * @param millis the number of milliseconds from the epoch (1970-01-01T00:00:00.000Z) in UTC.
+     * @param localOffset the local offset from UTC, measured in minutes;
+     *                    may be {@code null} to represent an unknown local offset.
      */
     public static Timestamp forMillis(long millis, Integer localOffset)
     {
         return new Timestamp(millis, localOffset);
     }
 
-
     /**
-     * Returns a Timestamp that represents the point in time that is
-     * {@code millis} milliseconds (including any fractional
-     * milliseconds) from the epoch, with a given local offset.
-     *
-     * <p>
-     * The resulting Timestamp will be precise to the second if {@code millis}
-     * doesn't contain information that is more granular than seconds.
-     * For example, a {@code BigDecimal} of
-     * value <tt>132541995e4 (132541995 &times; 10<sup>4</sup>)</tt>
-     * will return a Timestamp of {@code 2012-01-01T12:12:30Z},
-     * precise to the second.
-     *
-     * <p>
-     * The resulting Timestamp will be precise to the fractional second if
-     * {@code millis} contains information that is at least granular to
-     * milliseconds.
-     * For example, a {@code BigDecimal} of
-     * value <tt>1325419950555</tt>
-     * will return a Timestamp of {@code 2012-01-01T12:12:30.555Z},
-     * precise to the fractional second.
+     * The same as {@link #forMillis(long, Integer)} but the millisecond component is specified using a
+     * {@link BigDecimal} and therefore may include fractional milliseconds.
      *
      * @param millis
      *          number of milliseconds (including any fractional
@@ -1374,7 +1387,6 @@ public static Timestamp forMillis(long millis, Integer localOffset)
      *
      * @throws NullPointerException if {@code millis} is {@code null}
      *
-
      */
     public static Timestamp forMillis(BigDecimal millis, Integer localOffset)
     {
@@ -1382,6 +1394,41 @@ public static Timestamp forMillis(BigDecimal millis, Integer localOffset)
     }
 
 
+    /**
+     * Returns a Timestamp that represents the point in time that is {@code seconds} from the unix epoch
+     * (1970-01-01T00:00:00.000Z), with the {@code nanoOffset} applied and a given local offset.
+     *
+     * <p>This function is intended to allow easy conversion to Timestamp from Java 8's {@code java.time.Instant}
+     * without having to port this library to Java 8.  The following snippet will yield a Timestamp {@code ts}
+     * that equivalent to the {@code java.time.Instant} {@code i}:</p>
+     *
+     * <code>
+     *     Instant i = Instant.now();
+     *     Timestamp ts = Timestamp.forEpochSecond(i.getEpochSecond(), i.getNano(), 0);
+     * </code>
+     *
+     * <p>Like {@link #forMillis}, {@code seconds} is relative to UTC, regardless of the value
+     * supplied for {@code localOffset}.</p>
+     *
+     * @param seconds The number of seconds from the unix epoch (1970-01-01T00:00:00.000Z) UTC.
+     * @param nanoOffset The number of nanoseconds for the fractional component. Must be between 0 and 999,999,999.
+     * @param localOffset the local offset from UTC, measured in minutes;
+     *                    may be {@code null} to represent an unknown local offset.
+     */
+    public static Timestamp forEpochSecond(long seconds, int nanoOffset, Integer localOffset) {
+        // We do not validate seconds here because that is done within the forMillis static constructor.
+        long millis = seconds * 1000L;
+        Timestamp ts = forMillis(millis, localOffset);
+        if(nanoOffset != 0) {
+            if(nanoOffset < 0 || nanoOffset > 999999999) {
+                throw new IllegalArgumentException("nanoOffset must be between 0 and 999,999,999");
+            }
+            ts._fraction = ts._fraction.add(BigDecimal.valueOf(nanoOffset).movePointLeft(9));
+        }
+        return ts;
+    }
+
+
     /**
      * Converts a {@link Calendar} to a Timestamp, preserving the calendar's
      * time zone as the equivalent local offset when it has at least minutes
diff --git a/test/com/amazon/ion/TimestampTest.java b/test/com/amazon/ion/TimestampTest.java
index eef97cb463..fb9129cf2d 100644
--- a/test/com/amazon/ion/TimestampTest.java
+++ b/test/com/amazon/ion/TimestampTest.java
@@ -42,7 +42,9 @@
 import java.util.TimeZone;
 
 import org.junit.Ignore;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 /**
  * Validates Ion date parsing, specified as per W3C but with requiring
@@ -53,6 +55,9 @@
 public class TimestampTest
     extends IonTestCase
 {
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
     /**
      * Earliest Ion timestamp possible, that is, "0001-01-01".
      */
@@ -761,9 +766,14 @@ public void testNewTimestamp()
         ts = new Timestamp(2010, 2, 1, 10, 11, 12, BigDecimal.ZERO, 0);
         assertEquals(Timestamp.valueOf("2010-02-01T10:11:12Z"), ts);
         checkFields(2010, 2, 1, 10, 11, 12, null, 0, SECOND, ts);
+    }
 
-        // New static method unifies decimal seconds
+    @Test
+    public void testForSecond() {
+        BigDecimal fraction = new BigDecimal(".34");
         BigDecimal second = new BigDecimal("12.34");
+
+        Timestamp ts;
         ts = Timestamp.forSecond(2010, 2, 1, 10, 11, second, PST_OFFSET);
         checkFields(2010, 2, 1, 10, 11, 12, fraction, PST_OFFSET, FRACTION, ts);
         assertEquals("2010-02-01T10:11:12.34-08:00", ts.toString());
@@ -781,6 +791,111 @@ public void testNewTimestamp()
         assertEquals("2010-02-01T18:11:12Z", ts.toZString());
     }
 
+    @Test
+    public void forEpochSecondTest() {
+        // Unix epoch
+        assertEquals(
+                Timestamp.valueOf("1970-01-01T00:00:00.000Z"),
+                Timestamp.forEpochSecond(0, 0, 0));
+
+        // One day before unix epoch
+        assertEquals(
+                Timestamp.valueOf("1969-12-31T00:00:00.000Z"),
+                Timestamp.forEpochSecond(-86400, 0, 0));
+
+        // One day after unix epoch
+        assertEquals(
+                Timestamp.valueOf("1970-01-02T00:00:00.000Z"),
+                Timestamp.forEpochSecond(86400, 0, 0));
+
+        // Maximum timestamp value (that can be created with forEpochSecond)
+        assertEquals(
+                Timestamp.valueOf("9999-12-31T23:59:59.999999999Z"),
+                Timestamp.forEpochSecond(Timestamp.MAXIMUM_TIMESTAMP_IN_EPOCH_SECONDS-1, 999999999, 0));
+
+        // Minimum timestamp value (that can be created with forEpochSecond)
+        assertEquals(
+                Timestamp.valueOf("0001-01-01T00:00:00.000Z"),
+                Timestamp.forEpochSecond(Timestamp.MINIMUM_TIMESTAMP_IN_EPOCH_SECONDS, 0, 0));
+
+        // Without fractional component
+        assertEquals(
+                Timestamp.valueOf("2009-01-20T20:17:00.000Z"),
+                Timestamp.forEpochSecond(1232482620, 0, 0));
+
+        // With fractional component (1/2 second)
+        assertEquals(
+                Timestamp.valueOf("2009-01-20T20:17:00.500000000Z"),
+                Timestamp.forEpochSecond(1232482620, 500000000, 0));
+
+        // With fractional component (one nanosecond)
+        assertEquals(
+                Timestamp.valueOf("2009-01-20T20:17:00.000000001Z"),
+                Timestamp.forEpochSecond(1232482620, 1, 0));
+
+        // With fractional component (999,999,999 nanoseconds)
+        assertEquals(
+                Timestamp.valueOf("2009-01-20T20:17:00.999999999Z"),
+                Timestamp.forEpochSecond(1232482620, 999999999, 0));
+
+        // With unknown local offset
+        assertEquals(
+                Timestamp.valueOf("1970-01-01T00:00:00.000-00:00"),
+                Timestamp.forEpochSecond(0, 0, null));
+
+        // With a local offset
+        assertEquals(
+                Timestamp.valueOf("1970-01-01T01:00:00.000+01:00"),
+                Timestamp.forEpochSecond(0, 0, 60));
+
+        // With negative local offset
+        assertEquals(
+                Timestamp.valueOf("1969-12-31T23:00:00.000-01:00"),
+                Timestamp.forEpochSecond(0, 0, -60));
+    }
+
+    @Test
+    public void forEpochSecondTestSecondsTooLow() {
+        thrown.expect(IllegalArgumentException.class);
+        // MINIMUM_TIMESTAMP_IN_EPOCH_SECONDS is inclusive
+        Timestamp.forEpochSecond(Timestamp.MINIMUM_TIMESTAMP_IN_EPOCH_SECONDS - 1, 0, 0);
+    }
+
+    @Test
+    public void forEpochSecondTestSecondsTooHigh() {
+        thrown.expect(IllegalArgumentException.class);
+        // MAXIMUM_TIMESTAMP_IN_EPOCH_SECONDS is exclusive
+        Timestamp.forEpochSecond(Timestamp.MAXIMUM_TIMESTAMP_IN_EPOCH_SECONDS, 0, 0);
+    }
+
+    @Test
+    public void forEpochSecondTestNanosTooLow() {
+        thrown.expect(IllegalArgumentException.class);
+        Timestamp.forEpochSecond(0, -1, 0);
+    }
+
+    @Test
+    public void forEpochSecondTestNanosTooHigh() {
+        thrown.expect(IllegalArgumentException.class);
+        Timestamp.forEpochSecond(0, 1000000000, 0);
+    }
+
+    @Test
+    @Ignore("https://github.com/amzn/ion-java/issues/303")
+    public void forEpochSecondTesOffsetTooLow() {
+        thrown.expect(IllegalArgumentException.class);
+        Timestamp.forEpochSecond(0, 0, -24 * 60);
+    }
+
+    @Test
+    @Ignore("https://github.com/amzn/ion-java/issues/303")
+    public void forEpochSecondTestOffsetTooHigh() {
+        thrown.expect(IllegalArgumentException.class);
+        Timestamp.forEpochSecond(0, 0, 24 * 60);
+    }
+
+
+
     /** Test for {@link Timestamp#Timestamp(BigDecimal, Integer)} */
     @Test
     public void testNewTimestampFromBigDecimal()

From 392581921f1bbdbba9dd8eb541680f24faec2220 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Tue, 18 Aug 2020 17:24:30 -0700
Subject: [PATCH 098/490] Sets LocalSymbolTable's initial map size to avoid
 guaranteed resizing within the constructor.

---
 src/com/amazon/ion/impl/LocalSymbolTable.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/amazon/ion/impl/LocalSymbolTable.java b/src/com/amazon/ion/impl/LocalSymbolTable.java
index dde4bb8d67..93480ec5b4 100644
--- a/src/com/amazon/ion/impl/LocalSymbolTable.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTable.java
@@ -168,7 +168,10 @@ protected LocalSymbolTable(LocalSymbolTableImports imports, List<String> symbols
         myFirstLocalSid = myImportsList.getMaxId() + 1;
 
         // Copy locally declared symbols to mySymbolsMap
-        mySymbolsMap = new HashMap<String, Integer>();
+        // The initial size is chosen so that resizing is avoided. The default load factor is 0.75. Resizing
+        // could also be avoided by setting the initial size to mySymbolsCount and setting the load factor to
+        // 1.0, but this would lead to more hash collisions.
+        mySymbolsMap = new HashMap<String, Integer>((int) Math.ceil(mySymbolsCount / 0.75));
         buildSymbolsMap();
     }
 

From c0799556609b904e8c1e2c80c10ee7caf99a7f8c Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 31 Aug 2020 18:51:51 -0700
Subject: [PATCH 099/490] Improves read performance of streams that use LST
 append with a large number of symbols.

---
 src/com/amazon/ion/impl/LocalSymbolTable.java | 50 +++++++++-------
 .../ion/impl/LocalSymbolTableAsStruct.java    |  7 ++-
 .../amazon/ion/impl/IonWriterTestCase.java    | 20 +------
 test/com/amazon/ion/impl/SymbolTableTest.java | 34 ++++++-----
 .../impl/bin/IonManagedBinaryWriterTest.java  | 60 +++----------------
 5 files changed, 66 insertions(+), 105 deletions(-)

diff --git a/src/com/amazon/ion/impl/LocalSymbolTable.java b/src/com/amazon/ion/impl/LocalSymbolTable.java
index 93480ec5b4..b5990d5cce 100644
--- a/src/com/amazon/ion/impl/LocalSymbolTable.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTable.java
@@ -64,11 +64,16 @@ public SymbolTable newLocalSymtab(IonCatalog catalog,
                                           boolean alreadyInStruct)
         {
             List<String> symbolsList = new ArrayList<String>();
+            SymbolTable currentSymbolTable = reader.getSymbolTable();
             LocalSymbolTableImports imports = readLocalSymbolTable(reader,
                                                                    catalog,
                                                                    alreadyInStruct,
                                                                    symbolsList,
-                                                                   reader.getSymbolTable());
+                                                                   currentSymbolTable);
+            if (imports == null) {
+                // This was an LST append, so the existing symbol table was updated.
+                return currentSymbolTable;
+            }
             return new LocalSymbolTable(imports, symbolsList);
         }
 
@@ -201,11 +206,21 @@ protected LocalSymbolTable(LocalSymbolTable other, int maxId)
         }
     }
 
+    /**
+     * Parses the symbol table at the reader's current position.
+     * @param reader the reader from which to parse the symbol table.
+     * @param catalog the catalog from which to resolve shared symbol table imports.
+     * @param isOnStruct true if the reader is already positioned on the symbol table struct; otherwise, false.
+     * @param symbolsListOut list into which local symbols declared by the parsed symbol table will be deposited.
+     * @param currentSymbolTable the symbol table currently active in the stream.
+     * @return a new LocalSymbolTableImports instance, or null if this was an LST append. If null, `currentSymbolTable`
+     *   continues to be the active symbol table.
+     */
     protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader,
                                                                   IonCatalog catalog,
                                                                   boolean isOnStruct,
                                                                   List<String> symbolsListOut,
-                                                                  SymbolTable symbolTable)
+                                                                  SymbolTable currentSymbolTable)
     {
         if (! isOnStruct)
         {
@@ -223,14 +238,11 @@ protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader,
 
         List<SymbolTable> importsList = new ArrayList<SymbolTable>();
         importsList.add(reader.getSymbolTable().getSystemSymbolTable());
-        // Isolate the newly-declared symbols because they must be added after any symbols declared
-        // by the previous symbol table if this is an appending local symbol table, but the 'imports' and
-        // 'symbols' declarations can occur in any order.
-        List<String> newSymbols = new ArrayList<String>();
 
         IonType fieldType;
         boolean foundImportList = false;
         boolean foundLocalSymbolList = false;
+        boolean isAppend = false;
         while ((fieldType = reader.next()) != null)
         {
             if (reader.isNullValue()) continue;
@@ -275,7 +287,7 @@ protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader,
                                 text = null;
                             }
 
-                            newSymbols.add(text);
+                            symbolsListOut.add(text);
                         }
                         reader.stepOut();
                     }
@@ -291,18 +303,9 @@ protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader,
                     {
                         prepImportsList(importsList, reader, catalog);
                     }
-                    else if (fieldType == IonType.SYMBOL)
+                    else if (fieldType == IonType.SYMBOL && ION_SYMBOL_TABLE.equals(reader.stringValue()))
                     {
-                        // trying to import the current table
-                        if(symbolTable.isLocalTable() && ION_SYMBOL_TABLE.equals(reader.stringValue()))
-                        {
-                            SymbolTable currentSymbolTable = reader.getSymbolTable();
-                            importsList.addAll(Arrays.asList(currentSymbolTable.getImportedTables()));
-                            Iterator<String> currentSymbols = currentSymbolTable.iterateDeclaredSymbolNames();
-                            while (currentSymbols.hasNext()) {
-                                symbolsListOut.add(currentSymbols.next());
-                            }
-                        }
+                        isAppend = true;
                     }
                     break;
                 }
@@ -313,9 +316,16 @@ else if (fieldType == IonType.SYMBOL)
                 }
             }
         }
-
         reader.stepOut();
-        symbolsListOut.addAll(newSymbols);
+        if (isAppend && currentSymbolTable.isLocalTable()) {
+            // Because the current symbol table is a local symbol table (i.e. not the system symbol table), it can
+            // be appended in-place.
+            LocalSymbolTable currentLocalSymbolTable = (LocalSymbolTable) currentSymbolTable;
+            for (String newSymbol : symbolsListOut) {
+                currentLocalSymbolTable.putSymbol(newSymbol);
+            }
+            return null;
+        }
         return new LocalSymbolTableImports(importsList);
     }
 
diff --git a/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java b/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
index 3ac9e674ae..98d325174b 100644
--- a/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
@@ -62,11 +62,16 @@ public SymbolTable newLocalSymtab(IonCatalog catalog,
                                           boolean alreadyInStruct)
         {
             List<String> symbolsList = new ArrayList<String>();
+            SymbolTable currentSymbolTable = reader.getSymbolTable();
             LocalSymbolTableImports imports = readLocalSymbolTable(reader,
                                                                    catalog,
                                                                    alreadyInStruct,
                                                                    symbolsList,
-                                                                   reader.getSymbolTable());
+                                                                   currentSymbolTable);
+            if (imports == null) {
+                // This was an LST append, so the existing symbol table was updated.
+                return currentSymbolTable;
+            }
             return new LocalSymbolTableAsStruct(imageFactory, imports, symbolsList);
         }
 
diff --git a/test/com/amazon/ion/impl/IonWriterTestCase.java b/test/com/amazon/ion/impl/IonWriterTestCase.java
index 82f8e61914..8fa77f299f 100644
--- a/test/com/amazon/ion/impl/IonWriterTestCase.java
+++ b/test/com/amazon/ion/impl/IonWriterTestCase.java
@@ -824,23 +824,9 @@ private void flushDoesNotReset(boolean lstAppendEnabled)
         iw.close();
 
         IonDatagram dg = reload();
-        if (myOutputForm == OutputForm.BINARY && iw instanceof _Private_IonManagedWriter && myLstAppendEnabled) {
-            // Note: LST append will only be implemented in the "new" binary writer (which implements
-            // _Private_IonMangedWriter)
-            // Should have:  IVM SYMTAB hey SYMTAB_APPEND now
-            assertEquals(5, dg.systemSize());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
-            assertEquals("hey", ((IonSymbol) dg.systemGet(2)).stringValue());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
-            assertEquals("now", ((IonSymbol) dg.systemGet(4)).stringValue());
-        }
-        else {
-            // Should have:  IVM SYMTAB hey SYMTAB_APPEND now
-            assertEquals(4, dg.systemSize());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
-            assertEquals("hey", ((IonSymbol) dg.systemGet(2)).stringValue());
-            assertEquals("now", ((IonSymbol) dg.systemGet(3)).stringValue());
-        }
+        assertEquals(2, dg.size());
+        assertEquals("hey", ((IonSymbol) dg.get(0)).stringValue());
+        assertEquals("now", ((IonSymbol) dg.get(1)).stringValue());
     }
 
     Iterator<IonValue> systemIterateOutput()
diff --git a/test/com/amazon/ion/impl/SymbolTableTest.java b/test/com/amazon/ion/impl/SymbolTableTest.java
index 3c62543709..41ec83340f 100644
--- a/test/com/amazon/ion/impl/SymbolTableTest.java
+++ b/test/com/amazon/ion/impl/SymbolTableTest.java
@@ -61,6 +61,8 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+
+import com.amazon.ion.util.Equivalence;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -249,7 +251,7 @@ public void testLocalSymbolTableAppendEmptyList()
     }
 
     @Test
-    public void testLocalSymbolTableAppendImportBoundary()
+    public void testLocalSymbolTableAppendImportBoundary() throws IOException
     {
         String text =
             LocalSymbolTablePrefix +
@@ -266,23 +268,23 @@ public void testLocalSymbolTableAppendImportBoundary()
 
         IonDatagram datagram = loader().load(text);
 
-        SymbolTable original = datagram.get(0).getSymbolTable();
-        original.intern("o1");
-
-        SymbolTable appended = datagram.get(1).getSymbolTable();
-        appended.intern("a1");
-
-        // new symbols in `original` don't influence SIDs for new symbols in `appended` after import
-        checkSymbol("s11", systemMaxId() + 1, appended);
-        checkSymbol("o1", systemMaxId() + 2, original);
+        SymbolTable symbolTable = datagram.get(0).getSymbolTable();
+        assertSame(symbolTable, datagram.get(1).getSymbolTable());
+        symbolTable.intern("o1");
+        symbolTable.intern("a1");
 
-        checkSymbol("s11", systemMaxId() + 1, appended);
-        checkSymbol("s21", systemMaxId() + 2, appended);
-        checkSymbol("a1", systemMaxId() + 3, appended);
+        // new symbols don't influence SIDs for existing symbols; they are appended
+        checkSymbol("s11", systemMaxId() + 1, symbolTable);
+        checkSymbol("s21", systemMaxId() + 2, symbolTable);
+        checkSymbol("o1", systemMaxId() + 3, symbolTable);
+        checkSymbol("a1", systemMaxId() + 4, symbolTable);
 
-        // new symbols in `original` are not accessible from `appended` after import
-        assertNull(original.find("a1"));
-        assertNull(appended.find("o1"));
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
+        datagram.writeTo(writer);
+        writer.close();
+        IonDatagram roundtripped = loader().load(out.toByteArray());
+        assertTrue(Equivalence.ionEquals(datagram, roundtripped));
     }
 
     @Test
diff --git a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
index 033ad91c36..853136c59f 100644
--- a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
@@ -224,23 +224,9 @@ public void testLocalSymbolTableAppend() throws Exception
         assertNull(reader.next());
 
         IonDatagram dg = system().getLoader().load(writer.getBytes());
-        if (lstAppendMode.isEnabled())
-        {
-            // Should be IVM SYMTAB taco SYMTAB burrito
-            assertEquals(5, dg.systemSize());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
-            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
-            assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
-        }
-        else
-        {
-            // Should be IVM SYMTAB taco burrito
-            assertEquals(4, dg.systemSize());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
-            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
-            assertEquals("burrito", ((IonSymbol) dg.systemGet(3)).stringValue());
-        }
+        assertEquals(2, dg.size());
+        assertEquals("taco", ((IonSymbol) dg.get(0)).stringValue());
+        assertEquals("burrito", ((IonSymbol) dg.get(1)).stringValue());
     }
 
     @Test
@@ -304,23 +290,9 @@ public void testManuallyWriteLSTAppendWithImportsFirst() throws Exception
         assertNull(reader.next());
 
         IonDatagram dg = system().getLoader().load(writer.getBytes());
-        if (lstAppendMode.isEnabled())
-        {
-            // Should be IVM SYMTAB taco SYMTAB burrito
-            assertEquals(5, dg.systemSize());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
-            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
-            assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
-        }
-        else
-        {
-            // Should be IVM SYMTAB taco burrito
-            assertEquals(4, dg.systemSize());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
-            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
-            assertEquals("burrito", ((IonSymbol) dg.systemGet(3)).stringValue());
-        }
+        assertEquals(2, dg.size());
+        assertEquals("taco", ((IonSymbol) dg.get(0)).stringValue());
+        assertEquals("burrito", ((IonSymbol) dg.get(1)).stringValue());
     }
 
     @Test
@@ -349,23 +321,9 @@ public void testManuallyWriteLSTAppendWithSymbolsFirst() throws Exception
         assertNull(reader.next());
 
         IonDatagram dg = system().getLoader().load(writer.getBytes());
-        if (lstAppendMode.isEnabled())
-        {
-            // Should be IVM SYMTAB taco SYMTAB burrito
-            assertEquals(5, dg.systemSize());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
-            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(3)).getTypeAnnotations()[0]);
-            assertEquals("burrito", ((IonSymbol) dg.systemGet(4)).stringValue());
-        }
-        else
-        {
-            // Should be IVM SYMTAB taco burrito
-            assertEquals(4, dg.systemSize());
-            assertEquals("$ion_symbol_table", ((IonStruct) dg.systemGet(1)).getTypeAnnotations()[0]);
-            assertEquals("taco", ((IonSymbol) dg.systemGet(2)).stringValue());
-            assertEquals("burrito", ((IonSymbol) dg.systemGet(3)).stringValue());
-        }
+        assertEquals(2, dg.size());
+        assertEquals("taco", ((IonSymbol) dg.get(0)).stringValue());
+        assertEquals("burrito", ((IonSymbol) dg.get(1)).stringValue());
     }
 
     @Test

From efd5b3f95131206145a59db1f51a4e49e7080208 Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Wed, 2 Sep 2020 18:46:27 -0700
Subject: [PATCH 100/490] prepare new release 1.7.0 (#309)

* prepare new release 1.6.2

* fix version number to be 1.7.0
---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 76c150391f..10bc55c3ac 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.6.1</version>
+  <version>1.7.0</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 62ac58ae56..3f03843614 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.6.2-SNAPSHOT</version>
+  <version>1.7.0</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 73e26b1c5e6b7d943b64652d6c6efb69e083a809 Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Wed, 2 Sep 2020 21:45:19 -0700
Subject: [PATCH 101/490] creates v1.7.1-SNAPSHOT (#310)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3f03843614..4ccb147968 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.7.0</version>
+  <version>1.7.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From a2f7a4f9e9e6745718a57b4b69662efe47c4f744 Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Fri, 4 Sep 2020 18:30:05 -0700
Subject: [PATCH 102/490] Revert "Adds a space after a fieldname's colon when
 pretty-printing (#289)" (#311)

This reverts commit 5d62f9ab6ee912f2812071fcec9454bd17c3d134.
---
 src/com/amazon/ion/impl/IonWriterSystemText.java  |  3 ---
 test/com/amazon/ion/impl/IonMarkupWriterTest.java |  6 +++---
 test/com/amazon/ion/impl/TextWriterTest.java      | 10 +++++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonWriterSystemText.java b/src/com/amazon/ion/impl/IonWriterSystemText.java
index f577c26ee5..0e78e95ccd 100644
--- a/src/com/amazon/ion/impl/IonWriterSystemText.java
+++ b/src/com/amazon/ion/impl/IonWriterSystemText.java
@@ -366,9 +366,6 @@ void startValue() throws IOException
             SymbolToken sym = assumeFieldNameSymbol();
             writeFieldNameToken(sym);
             _output.appendAscii(':');
-            if (_options.isPrettyPrintOn()) {
-                _output.appendAscii(' ');
-            }
             clearFieldName();
             followingLongString = false;
         }
diff --git a/test/com/amazon/ion/impl/IonMarkupWriterTest.java b/test/com/amazon/ion/impl/IonMarkupWriterTest.java
index f7067d057f..b84d7a7da0 100644
--- a/test/com/amazon/ion/impl/IonMarkupWriterTest.java
+++ b/test/com/amazon/ion/impl/IonMarkupWriterTest.java
@@ -54,7 +54,7 @@ public class IonMarkupWriterTest extends IonTestCase {
             "%n<beforeAnnotations STRUCT><beforeEachAnnotation STRUCT>abcd" +
             "<afterEachAnnotation STRUCT>::<afterAnnotations STRUCT><beforeData" +
             " STRUCT>{<afterStepIn STRUCT>%n  <beforeFieldName SEXP>hello" +
-            "<afterFieldName SEXP>: <beforeData SEXP>(<afterStepIn SEXP>%n    " +
+            "<afterFieldName SEXP>:<beforeData SEXP>(<afterStepIn SEXP>%n    " +
             "<beforeData SYMBOL>sexp<afterData SYMBOL><beforeSeparator SEXP>" +
             "%n    <afterSeparator SEXP><beforeData INT>1<afterData INT>" +
             "<beforeSeparator SEXP>%n    <afterSeparator SEXP><beforeData INT>2" +
@@ -62,12 +62,12 @@ public class IonMarkupWriterTest extends IonTestCase {
             "<beforeData STRING>\"str\"<afterData STRING><beforeStepOut SEXP>%n  " +
             ")<afterData SEXP><beforeSeparator STRUCT>,%n  " +
             "<afterSeparator STRUCT><beforeFieldName LIST>list<afterFieldName " +
-            "LIST>: <beforeData LIST>[<afterStepIn LIST>%n    <beforeData " +
+            "LIST>:<beforeData LIST>[<afterStepIn LIST>%n    <beforeData " +
             "DECIMAL>3.2<afterData DECIMAL><beforeSeparator LIST>,%n    " +
             "<afterSeparator LIST><beforeData FLOAT>3.2e0<afterData FLOAT>" +
             "<beforeStepOut LIST>%n  ]<afterData LIST><beforeSeparator STRUCT>" +
             ",%n  <afterSeparator STRUCT><beforeFieldName BLOB>blob" +
-            "<afterFieldName BLOB>: <beforeAnnotations BLOB>" +
+            "<afterFieldName BLOB>:<beforeAnnotations BLOB>" +
             "<beforeEachAnnotation BLOB>annot<afterEachAnnotation BLOB>::" +
             "<afterAnnotations BLOB><beforeData BLOB>" +
             "{{ T25lIEJpZyBGYXQgVGVzdCBCbG9iIEZvciBZb3VyIFBsZWFzdXJl }}" +
diff --git a/test/com/amazon/ion/impl/TextWriterTest.java b/test/com/amazon/ion/impl/TextWriterTest.java
index 8c8b527bed..ba57d634bf 100644
--- a/test/com/amazon/ion/impl/TextWriterTest.java
+++ b/test/com/amazon/ion/impl/TextWriterTest.java
@@ -287,14 +287,14 @@ public void testWritingLongStrings()
                 "%n" +
                 "'''looong'''%n" +
                 "{%n" +
-                "  a: '''looong''',%n" +
-                "  b: \"hello\",%n" +
-                "  c: '''hello\n" +
+                        "  a:'''looong''',%n" +
+                "  b:\"hello\",%n" +
+                "  c:'''hello\n" +
                         "nurse''',%n" +
-                "  d: '''what\\'s\n" +
+                        "  d:'''what\\'s\n" +
                         "up\n" +
                         "doc'''%n" +
-                "}"
+                        "}"
             ),
             dg
         );

From 4cf824b939c5db3bcf720024ad69814c9f687d4d Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Fri, 4 Sep 2020 20:49:30 -0700
Subject: [PATCH 103/490] preparing release 1.7.1 (#312)

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 10bc55c3ac..b8b6a280df 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.7.0</version>
+  <version>1.7.1</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 4ccb147968..e7c0280b6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.7.1-SNAPSHOT</version>
+  <version>1.7.1</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 4b99e45b6a55aeb5137bd48ab0b57f68acffe1c4 Mon Sep 17 00:00:00 2001
From: Therapon Skoteiniotis <therapon@users.noreply.github.com>
Date: Fri, 4 Sep 2020 21:30:49 -0700
Subject: [PATCH 104/490] prepare 1.7.2-SNAPSHOT (#313)

prepare 1.7.2-SNAPSHOT
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e7c0280b6f..e2b56980a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.7.1</version>
+  <version>1.7.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From d6ea7518153020acbaa29587cba116e5e058ffeb Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Thu, 10 Sep 2020 17:39:11 -0700
Subject: [PATCH 105/490] Adds a CLI that implements the standardized interface
 required by ion-test-driver. (#314)

https://github.com/amzn/ion-test-driver
---
 ion-java-cli/pom.xml                          |  121 ++
 .../src/com/amazon/tools/cli/CommandType.java |    6 +
 .../com/amazon/tools/cli/CompareContext.java  |  100 ++
 .../com/amazon/tools/cli/ComparisonType.java  |    8 +
 .../src/com/amazon/tools/cli/IonJavaCli.java  | 1389 +++++++++++++++++
 .../amazon/tools/cli/NoCloseOutputStream.java |   17 +
 .../amazon/tools/cli/NoOpOutputStream.java    |   10 +
 .../com/amazon/tools/cli/OutputFormat.java    |   88 ++
 .../com/amazon/tools/cli/ProcessContext.java  |   95 ++
 .../comparisonReport/ComparisonContext.java   |   27 +
 .../comparisonReport/ComparisonResult.java    |   55 +
 .../ComparisonResultType.java                 |    7 +
 .../tools/errorReport/ErrorDescription.java   |   41 +
 .../amazon/tools/errorReport/ErrorType.java   |    7 +
 .../src/com/amazon/tools/events/Event.java    |  179 +++
 .../com/amazon/tools/events/EventType.java    |    9 +
 .../amazon/tools/events/ImportDescriptor.java |   33 +
 17 files changed, 2192 insertions(+)
 create mode 100644 ion-java-cli/pom.xml
 create mode 100644 ion-java-cli/src/com/amazon/tools/cli/CommandType.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/cli/CompareContext.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/cli/ComparisonType.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/cli/NoCloseOutputStream.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/cli/NoOpOutputStream.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/cli/OutputFormat.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/cli/ProcessContext.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonContext.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResult.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResultType.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/errorReport/ErrorDescription.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/errorReport/ErrorType.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/events/Event.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/events/EventType.java
 create mode 100644 ion-java-cli/src/com/amazon/tools/events/ImportDescriptor.java

diff --git a/ion-java-cli/pom.xml b/ion-java-cli/pom.xml
new file mode 100644
index 0000000000..17dd85d335
--- /dev/null
+++ b/ion-java-cli/pom.xml
@@ -0,0 +1,121 @@
+<!--
+  ~ Copyright 2007 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License").
+  ~ You may not use this file except in compliance with the License.
+  ~ A copy of the License is located at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ or in the "license" file accompanying this file. This file is distributed
+  ~ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+  ~ express or implied. See the License for the specific language governing
+  ~ permissions and limitations under the License.
+  -->
+
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.amazon.ion</groupId>
+  <artifactId>ion-java-cli</artifactId>
+  <version>1.0</version>
+  <packaging>jar</packaging>
+
+  <name>${project.groupId}:${project.artifactId}</name>
+  <description>
+    A CLI that implements the standard interface defined by ion-test-driver.
+  </description>
+  <url>https://github.com/amzn/ion-java/tree/master/ion-java-cli</url>
+
+  <licenses>
+    <license>
+      <name>The Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+    </license>
+  </licenses>
+
+  <developers>
+    <developer>
+      <name>Amazon Ion Team</name>
+      <email>ion-team@amazon.com</email>
+      <organization>Amazon</organization>
+      <organizationUrl>https://github.com/amzn</organizationUrl>
+    </developer>
+  </developers>
+
+  <scm>
+    <connection>scm:git:git@github.com:amzn/ion-java.git</connection>
+    <developerConnection>scm:git:git@github.com:amzn/ion-java.git</developerConnection>
+    <url>git@github.com:amzn/ion-java.git</url>
+  </scm>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
+    <build.year>${maven.build.timestamp}</build.year>
+    <jdkVersion>1.8</jdkVersion>
+  </properties>
+
+  <dependencies>
+    <!-- ion-java/tools/cli dependencies -->
+    <dependency>
+      <groupId>args4j</groupId>
+      <artifactId>args4j</artifactId>
+      <version>2.33</version>
+    </dependency>
+    <dependency>
+      <groupId>com.amazon.ion</groupId>
+      <artifactId>ion-java</artifactId>
+      <version>[1.7.0,)</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <plugins>
+    <!--  used for building ion-java CLI jar-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <classesDirectory>${project.build.outputDirectory}</classesDirectory>
+          <archive>
+            <manifest>
+              <mainClass>com.amazon.tools.cli.IonJavaCli</mainClass>
+              <useUniqueVersions>false</useUniqueVersions>
+              <addClasspath>true</addClasspath>
+              <classpathPrefix>lib/</classpathPrefix>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <type>jar</type>
+              <includeTypes>jar</includeTypes>
+              <outputDirectory>${project.build.directory}/lib</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+        <configuration>
+          <source>${jdkVersion}</source>
+          <target>${jdkVersion}</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/ion-java-cli/src/com/amazon/tools/cli/CommandType.java b/ion-java-cli/src/com/amazon/tools/cli/CommandType.java
new file mode 100644
index 0000000000..c2168bcc25
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/cli/CommandType.java
@@ -0,0 +1,6 @@
+package com.amazon.tools.cli;
+
+public enum CommandType {
+    PROCESS,
+    COMPARE
+}
diff --git a/ion-java-cli/src/com/amazon/tools/cli/CompareContext.java b/ion-java-cli/src/com/amazon/tools/cli/CompareContext.java
new file mode 100644
index 0000000000..ab06a14000
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/cli/CompareContext.java
@@ -0,0 +1,100 @@
+package com.amazon.tools.cli;
+
+import com.amazon.tools.events.Event;
+
+import java.util.List;
+
+public class CompareContext {
+    String path;
+    String compareToPath;
+    int fileEventIndex;
+    int compareToFileEventIndex;
+    String message;
+    List<Event> eventStreamFirst;
+    List<Event> eventStreamSecond;
+    ComparisonType type;
+
+    public CompareContext(List<Event> eventStreamFirst,
+                          List<Event> eventStreamSecond) {
+        this.path = null;
+        this.compareToPath = null;
+        this.eventStreamFirst = eventStreamFirst;
+        this.eventStreamSecond = eventStreamSecond;
+        this.message = null;
+        this.type = null;
+    }
+
+    public void reset(String file, String compareToFile){
+        this.setFile(file);
+        this.setCompareToFile(compareToFile);
+        this.setFileEventIndex(-1);
+        this.setCompareToFileEventIndex(-1);
+        this.message = null;
+        this.eventStreamFirst = null;
+        this.eventStreamSecond = null;
+    }
+
+    public String getFile() {
+        return path;
+    }
+
+    public void setFile(String file) {
+        this.path = file;
+    }
+
+    public String getCompareToFile() {
+        return compareToPath;
+    }
+
+    public void setCompareToFile(String compareToFile) {
+        this.compareToPath = compareToFile;
+    }
+
+    public int getFileEventIndex() {
+        return fileEventIndex;
+    }
+
+    public void setFileEventIndex(int fileEventIndex) {
+        this.fileEventIndex = fileEventIndex;
+    }
+
+    public int getCompareToFileEventIndex() {
+        return compareToFileEventIndex;
+    }
+
+    public void setCompareToFileEventIndex(int compareToFileEventIndex) {
+        this.compareToFileEventIndex = compareToFileEventIndex;
+    }
+
+    public List<Event> getEventStreamFirst() {
+        return eventStreamFirst;
+    }
+
+    public void setEventStreamFirst(List<Event> eventStreamFirst) {
+        this.eventStreamFirst = eventStreamFirst;
+    }
+
+    public List<Event> getEventStreamSecond() {
+        return eventStreamSecond;
+    }
+
+    public void setEventStreamSecond(List<Event> eventStreamSecond) {
+        this.eventStreamSecond = eventStreamSecond;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public ComparisonType getType() {
+        return type;
+    }
+
+    public void setType(ComparisonType type) {
+        this.type = type;
+    }
+}
diff --git a/ion-java-cli/src/com/amazon/tools/cli/ComparisonType.java b/ion-java-cli/src/com/amazon/tools/cli/ComparisonType.java
new file mode 100644
index 0000000000..58cb5e76d2
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/cli/ComparisonType.java
@@ -0,0 +1,8 @@
+package com.amazon.tools.cli;
+
+public enum ComparisonType {
+    BASIC,
+    EQUIVS,
+    NON_EQUIVS,
+    EQUIVS_TIMELINE
+}
diff --git a/ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java b/ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java
new file mode 100644
index 0000000000..59086f3b54
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java
@@ -0,0 +1,1389 @@
+package com.amazon.tools.cli;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSequence;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonTimestamp;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.util.Equivalence;
+import org.kohsuke.args4j.Argument;
+import org.kohsuke.args4j.CmdLineException;
+import org.kohsuke.args4j.CmdLineParser;
+import org.kohsuke.args4j.Option;
+import com.amazon.tools.comparisonReport.ComparisonContext;
+import com.amazon.tools.comparisonReport.ComparisonResult;
+import com.amazon.tools.comparisonReport.ComparisonResultType;
+import com.amazon.tools.errorReport.ErrorDescription;
+import com.amazon.tools.errorReport.ErrorType;
+import com.amazon.tools.events.Event;
+import com.amazon.tools.events.EventType;
+import com.amazon.tools.events.ImportDescriptor;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+public class IonJavaCli {
+    private static final int CONSOLE_WIDTH = 120; // Only used for formatting the USAGE message
+    private static final int USAGE_ERROR_EXIT_CODE = 1;
+    private static final int IO_ERROR_EXIT_CODE = 2;
+    private static final int BUFFER_SIZE = 128 * 1024;
+    private static final String SYSTEM_OUT_DEFAULT_VALUE = "out";
+    private static final String SYSTEM_ERR_DEFAULT_VALUE = "err";
+    private static final IonTextWriterBuilder ION_TEXT_WRITER_BUILDER = IonTextWriterBuilder.standard();
+    private static final IonSystem ION_SYSTEM = IonSystemBuilder.standard().build();
+    private static final String EMBEDDED_STREAM_ANNOTATION = "embedded_documents";
+    private static final String EVENT_STREAM = "$ion_event_stream";
+    private static final Pattern ION_VERSION_MARKER_REGEX = Pattern.compile("^\\$ion_[0-9]+_[0-9]+$");
+
+    public static void main(final String[] args) {
+        CommandArgs parsedArgs = new CommandArgs();
+        CmdLineParser parser = new CmdLineParser(parsedArgs);
+        parser.getProperties().withUsageWidth(CONSOLE_WIDTH);
+        ComparisonType comparisonType = null;
+        OutputFormat outputFormat = null;
+        CommandType commandType = null;
+
+        try {
+            //parse
+            parser.parseArgument(args);
+            validateArgs(parsedArgs);
+            //get value
+            comparisonType = parsedArgs.getComparisonType();
+            outputFormat = parsedArgs.getOutputFormat();
+            commandType = parsedArgs.getCommand();
+        } catch (CmdLineException | IllegalArgumentException e) {
+            printHelpText(e.getMessage(), parser, parsedArgs);
+            System.exit(USAGE_ERROR_EXIT_CODE);
+        }
+
+        ProcessContext processContext = commandType == CommandType.PROCESS ? new ProcessContext(null, -1,
+                null, ErrorType.READ, null) : null;
+        try (
+                //Initialize output stream, never return null. (default value: STDOUT)
+                OutputStream outputStream = initOutputStream(parsedArgs, SYSTEM_OUT_DEFAULT_VALUE, processContext);
+                //Initialize error report, never return null. (default value: STDERR)
+                OutputStream errorReportOutputStream =
+                        initOutputStream(parsedArgs, SYSTEM_ERR_DEFAULT_VALUE, processContext);
+                IonWriter ionWriterForErrorReport = outputFormat.createIonWriter(errorReportOutputStream);
+                IonWriter ionWriterForOutput = outputFormat.createIonWriter(outputStream);
+        ) {
+            if (commandType == CommandType.COMPARE) {
+                compareFiles(ionWriterForOutput, ionWriterForErrorReport, parsedArgs, comparisonType);
+            } else if (commandType == CommandType.PROCESS) {
+                processContext.setIonWriter(ionWriterForOutput);
+                processFiles(ionWriterForErrorReport, parsedArgs, processContext);
+            }
+        } catch (IOException e) {
+            System.err.println("Failed to close OutputStream: " + e.getMessage());
+        } finally {
+            if (processContext != null) {
+                IonWriter ionWriter = processContext.getIonWriter();
+                if (ionWriter != null) {
+                    try {
+                        ionWriter.close();
+                    } catch (IOException e) {
+                        System.err.println(e.getMessage());
+                        System.exit(IO_ERROR_EXIT_CODE);
+                    }
+                }
+            }
+        }
+    }
+
+    private static void validateArgs(CommandArgs parsedArgs) throws CmdLineException {
+        parsedArgs.setCommand();
+        CommandType type = parsedArgs.getCommand();
+        switch (type) {
+            case PROCESS:
+                break;
+            case COMPARE:
+                if (parsedArgs.getOutputFormat() == OutputFormat.EVENTS) {
+                    throw new CmdLineException("COMPARE doesn't support option format \"-f events\"");
+                }
+                break;
+        }
+    }
+
+    private static void printHelpText(String msg, CmdLineParser parser, CommandArgs parsedArgs) {
+        CommandType commandType = parsedArgs.getCommand();
+
+        if (commandType == null) {
+            System.err.println(msg + "\n");
+            System.err.println("Usage : \n" +
+                    " [-h|--help] [-v|--version]\n" +
+                    "  -h, --help                print the help message and exit\n" +
+                    "  -v, --version             print the command's version number and exit");
+        } else if (commandType == CommandType.PROCESS) {
+            System.err.println(msg + "\n");
+            System.err.println("\"Process\" reads the input file(s) and re-write in the format specified by " +
+                    "--output.\n");
+            System.err.println("Usage:\n");
+            System.err.println("ion process [--output <file>] [--error-report <file>] [--output-format \n"
+                    + "(text | pretty | binary | events | none)] [--catalog <file>]... [--imports <file>]... \n"
+                    + "[--perf-report <file>] [--filter <filter> | --traverse <file>]  [-] [<input_file>]...\n");
+            System.err.println("Options:\n");
+            parser.printUsage(System.err);
+        } else if (commandType == CommandType.COMPARE) {
+            System.err.println(msg + "\n");
+            System.err.println("\"Compare\" Compare all inputs (which may contain Ion streams and/or EventStreams) \n"
+                    + "against all other inputs using the Ion data model's definition of equality. Write a \n"
+                    + "ComparisonReport to the output.\n");
+            System.err.println("Usage:\n");
+            System.err.println("ion compare [--output <file>] [--error-report <file>] [--output-format (text | \n"
+                    + "pretty | binary | none)]  [--catalog <file>]... [--comparison-type (basic | equivs | \n"
+                    + "non-equivs | equiv-timeline)] [-] [<input_file>]...\n");
+            parser.printUsage(System.err);
+        }
+    }
+
+    //
+    //
+    // functions for processing
+    //
+    //
+
+    private static void processFiles(IonWriter ionWriterForErrorReport,
+                                     CommandArgs args,
+                                     ProcessContext processContext) throws IOException {
+        boolean finish = false;
+        for (String path : args.getInputFiles()) {
+            try (
+                    InputStream inputStream = new BufferedInputStream(new FileInputStream(path));
+                    IonReader ionReader = IonReaderBuilder.standard().build(inputStream);
+            ) {
+                processContext.setFileName(path);
+                ReadContext readContext = new ReadContext(new ArrayList<>());
+                try {
+                    getEventStream(ionReader, CommandType.PROCESS, readContext);
+                } catch (IonException | NullPointerException e) {
+                    new ErrorDescription(readContext.getState(), e.getMessage(), processContext.getFileName(),
+                            processContext.getEventIndex()).writeOutput(ionWriterForErrorReport);
+                    finish = true;
+                } catch (Exception e) {
+                    new ErrorDescription(ErrorType.STATE, e.getMessage(), processContext.getFileName(),
+                            processContext.getEventIndex()).writeOutput(ionWriterForErrorReport);
+                    finish = true;
+                }
+
+                processContext.setEventStream(readContext.getEventStream());
+                processContext.setEventIndex(0);
+
+                if (args.getOutputFormat() == OutputFormat.EVENTS) {
+                    processContext.getIonWriter().writeSymbol(EVENT_STREAM);
+                    processToEventStream(ionWriterForErrorReport, processContext);
+                } else {
+                    processToIonStream(processContext, args);
+                }
+                if (finish) System.exit(IO_ERROR_EXIT_CODE);
+                processContext.getIonWriter().finish();
+                ionWriterForErrorReport.finish();
+            } catch (IonException | NullPointerException e) {
+                new ErrorDescription(processContext.getState(), e.getMessage(), processContext.getFileName(),
+                        processContext.getEventIndex()).writeOutput(ionWriterForErrorReport);
+                System.exit(IO_ERROR_EXIT_CODE);
+            } catch (Exception e) {
+                new ErrorDescription(ErrorType.STATE, e.getMessage(), processContext.getFileName(),
+                        processContext.getEventIndex()).writeOutput(ionWriterForErrorReport);
+                System.exit(IO_ERROR_EXIT_CODE);
+            }
+        }
+    }
+
+    private static void processToEventStream(IonWriter ionWriterForErrorReport,
+                                             ProcessContext processContext) throws IOException {
+        for (Event event : processContext.getEventStream()) {
+            event.writeOutput(ionWriterForErrorReport, processContext);
+        }
+    }
+
+    private static void processToIonStream(ProcessContext processContext,
+                                           CommandArgs args) throws IOException {
+        List<Event> events = processContext.getEventStream();
+        int count = 0;
+        while (count != events.size()) {
+            //update eventIndex
+            Event event = events.get(count);
+            processContext.setEventIndex(processContext.getEventIndex() + 1);
+            processContext.setLastEventType(event.getEventType());
+            if (event.getEventType() == EventType.CONTAINER_START) {
+                if (isEmbeddedEvent(event)) {
+                    count = embeddedEventToIon(processContext, args, count, event.getIonType());
+                } else {
+                    IonType type = event.getIonType();
+                    setFieldName(event, processContext.getIonWriter());
+                    setAnnotations(event, processContext.getIonWriter());
+                    processContext.getIonWriter().stepIn(type);
+                }
+            } else if (event.getEventType().equals(EventType.CONTAINER_END)) {
+                processContext.getIonWriter().stepOut();
+            } else if (event.getEventType().equals(EventType.SCALAR)) {
+                writeIonByType(event, processContext.getIonWriter());
+            } else if (event.getEventType().equals(EventType.SYMBOL_TABLE)) {
+                handleSymbolTableEvent(processContext, event, args, false);
+            } else if (event.getEventType().equals(EventType.STREAM_END)) {
+                processContext.getIonWriter().finish();
+            }
+            count++;
+        }
+    }
+
+    private static int embeddedEventToIon(ProcessContext processContext,
+                                          CommandArgs args,
+                                          int count,
+                                          IonType ionType) throws IOException {
+        processContext.getIonWriter().addTypeAnnotation(EMBEDDED_STREAM_ANNOTATION);
+        processContext.getIonWriter().stepIn(ionType);
+        List<Event> events =  processContext.getEventStream();
+        int depth = 1;
+        boolean finish = false;
+        while (++count < events.size()) {
+            StringBuilder out = new StringBuilder();
+            ProcessContext embeddedContext = new ProcessContext(null,0,null, null,
+                    ION_TEXT_WRITER_BUILDER.withImports(_Private_Utils.systemSymtab(1)).build(out));
+            embeddedContext.setEmbeddedOut(out);
+            try {
+                do {
+                    Event event = events.get(count);
+                    processContext.setEventIndex(processContext.getEventIndex() + 1);
+                    processContext.setLastEventType(event.getEventType());
+                    if (event.getEventType() == EventType.STREAM_END) {
+                        break;
+                    } else if (event.getEventType() == EventType.SCALAR) {
+                        writeIonByType(event, embeddedContext.getIonWriter());
+                    } else if (event.getEventType() == EventType.CONTAINER_START) {
+                        depth++;
+                        setFieldName(event, embeddedContext.getIonWriter());
+                        setAnnotations(event, embeddedContext.getIonWriter());
+                        embeddedContext.getIonWriter().stepIn(event.getIonType());
+                    } else if (event.getEventType() == EventType.CONTAINER_END) {
+                        depth--;
+                        if (depth == 0) {
+                            if (event.getIonType() == IonType.SEXP || event.getIonType() == IonType.LIST) {
+                                finish = true;
+                                break;
+                            } else {
+                                throw new IonException("invalid CONTAINER_END");
+                            }
+                        }
+                        embeddedContext.getIonWriter().stepOut();
+                    } else if (event.getEventType() == EventType.SYMBOL_TABLE) {
+                        handleSymbolTableEvent(embeddedContext, event, args, true);
+                    }
+                } while (++count < events.size());
+
+                if (!finish) {
+                    embeddedContext.getIonWriter().finish();
+                    processContext.getIonWriter().writeString(out.toString());
+                }
+            } finally {
+                IonWriter ionWriter = embeddedContext.getIonWriter();
+                if (ionWriter != null) {
+                    try {
+                        ionWriter.close();
+                    } catch (IOException e) {
+                        System.err.println(e.getMessage());
+                        System.exit(IO_ERROR_EXIT_CODE);
+                    }
+                }
+            }
+            if (finish) { break; }
+        }
+        processContext.getIonWriter().stepOut();
+        return count;
+    }
+
+    //
+    //
+    //  functions for comparing
+    //
+    //
+
+    private static void compareFiles(IonWriter ionWriterForOutput,
+                                     IonWriter ionWriterForErrorReport,
+                                     CommandArgs args,
+                                     ComparisonType comparisonType) throws IOException {
+        List<String> files = args.getInputFiles();
+        CompareContext compareContext = new CompareContext(null, null);
+        compareContext.setType(args.getComparisonType());
+        for (String path : files) {
+            for (String compareToPath : files) {
+                compareContext.reset(path, compareToPath);
+                try (InputStream inputFirst = new BufferedInputStream(new FileInputStream(path));
+                     IonReader ionReaderFirst = IonReaderBuilder.standard().build(inputFirst);
+                     InputStream inputSecond = new BufferedInputStream(new FileInputStream(compareToPath));
+                     IonReader ionReaderSecond = IonReaderBuilder.standard().build(inputSecond);
+                ) {
+                    if (comparisonType == ComparisonType.BASIC) {
+                        if (path.equals(compareToPath)) { continue; }
+                    }
+                    ReadContext readContextFirst = new ReadContext(new ArrayList<>());
+                    ReadContext readContextSecond = new ReadContext(new ArrayList<>());
+                    getEventStream(ionReaderFirst, CommandType.COMPARE, readContextFirst);
+                    getEventStream(ionReaderSecond, CommandType.COMPARE, readContextSecond);
+
+                    compareContext.setEventStreamFirst(readContextFirst.getEventStream());
+                    compareContext.setEventStreamSecond(readContextSecond.getEventStream());
+
+                    if (comparisonType != ComparisonType.BASIC) {
+                        if (compareEquivs(compareContext) ^
+                                (comparisonType == ComparisonType.EQUIVS
+                                        || comparisonType == ComparisonType.EQUIVS_TIMELINE)) {
+                            ComparisonResultType type = comparisonType == ComparisonType.NON_EQUIVS ?
+                                    ComparisonResultType.EQUAL : ComparisonResultType.NOT_EQUAL;
+                            writeReport(compareContext, ionWriterForOutput, type);
+                        }
+                    } else {
+                        if (!compare(compareContext, 0, readContextFirst.getEventStream().size() - 1,
+                                0, readContextSecond.getEventStream().size() - 1)) {
+                            writeReport(compareContext, ionWriterForOutput, ComparisonResultType.NOT_EQUAL);
+                        }
+                    }
+                } catch (Exception e) {
+                    new ErrorDescription(ErrorType.STATE, e.getMessage(), path + ';' + compareToPath,
+                            -1).writeOutput(ionWriterForErrorReport);
+                    System.exit(IO_ERROR_EXIT_CODE);
+                }
+            }
+        }
+    }
+
+    private static boolean compare(CompareContext compareContext,
+                                   int startI, int endI, int startJ, int endJ) throws IOException {
+        List<Event> eventsFirst = compareContext.getEventStreamFirst();
+        List<Event> eventsSecond = compareContext.getEventStreamSecond();
+        int i = startI;
+        int j = startJ;
+        while (i <= endI && j <= endJ && i < eventsFirst.size() && j < eventsSecond.size()) {
+            Event eventFirst = eventsFirst.get(i);
+            Event eventSecond = eventsSecond.get(j);
+            SymbolToken fieldNameFirst = eventFirst.getFieldName();
+            SymbolToken fieldNameSecond = eventSecond.getFieldName();
+            SymbolToken[] annotationFirst = eventFirst.getAnnotations();
+            SymbolToken[] annotationSecond = eventSecond.getAnnotations();
+            EventType eventTypeFirst = eventFirst.getEventType();
+            EventType eventTypeSecond = eventSecond.getEventType();
+            if (eventTypeFirst != eventTypeSecond) {
+                setReportInfo(i, j,"Didn't match event_type", compareContext);
+                return false;
+            } else if (eventFirst.getDepth() != eventSecond.getDepth()) {
+                setReportInfo(i, j,"Didn't match depth", compareContext);
+                return false;
+            } else if (eventFirst.getIonType() != eventSecond.getIonType()) {
+                setReportInfo(i, j,"Didn't match ion_type", compareContext);
+                return false;
+            } else if (!isSameSymbolToken(fieldNameFirst, fieldNameSecond)) {
+                setReportInfo(i, j,"Didn't match field_name", compareContext);
+                return false;
+            } else if (!isSameSymbolTokenArray(annotationFirst, annotationSecond)) {
+                setReportInfo(i, j,"Didn't match annotation", compareContext);
+                return false;
+            }
+
+            if (eventTypeFirst == EventType.CONTAINER_START
+                    && eventFirst.getIonType() == IonType.STRUCT) {
+                int iStart = i;
+                int jStart = j;
+                ContainerContext containerContextFirst = new ContainerContext(i);
+                IonStruct structFirst = parseStruct(containerContextFirst, compareContext, endI, true);
+                i = containerContextFirst.getIndex();
+                ContainerContext containerContextSecond = new ContainerContext(j);
+                IonStruct structSecond = parseStruct(containerContextSecond, compareContext, endJ, false);
+                j = containerContextSecond.getIndex();
+                if (!Equivalence.ionEquals(structFirst, structSecond)) {
+                    setReportInfo(iStart, jStart,
+                            "Did not find matching field for " + structFirst.toString(),
+                            compareContext);
+                    return false;
+                }
+            } else if (eventTypeFirst == EventType.SCALAR) {
+                boolean compareResult;
+                if (compareContext.getType() == ComparisonType.EQUIVS_TIMELINE
+                        && eventFirst.getIonType() == IonType.TIMESTAMP) {
+                    IonTimestamp ionTimestampFirst = (IonTimestamp) eventFirst.getValue();
+                    IonTimestamp ionTimestampSecond = (IonTimestamp) eventSecond.getValue();
+                    compareResult = ionTimestampFirst.timestampValue()
+                            .compareTo(ionTimestampSecond.timestampValue()) == 0;
+                } else {
+                    compareResult = Equivalence.ionEquals(eventFirst.getValue(), eventSecond.getValue());
+                }
+                if (!compareResult) {
+                    setReportInfo(i, j, eventFirst.getValue() + " vs. "
+                            + eventSecond.getValue(), compareContext);
+                    return false;
+                }
+            }
+            i++;
+            j++;
+        }
+        if (i <= endI || j <= endJ) {
+            setReportInfo(i , j, "two event streams have different size", compareContext);
+            return false;
+        }
+        return true;
+    }
+
+    private static IonStruct parseStruct(ContainerContext containerContext,
+                                         CompareContext compareContext,
+                                         int end,
+                                         boolean isFirst) {
+        Event initEvent = isFirst ?
+                compareContext.getEventStreamFirst().get(containerContext.getIndex()) :
+                compareContext.getEventStreamSecond().get(containerContext.getIndex());
+        if (initEvent.getEventType() != EventType.CONTAINER_START || initEvent.getIonType() != IonType.STRUCT) {
+            return null;
+        }
+        IonStruct ionStruct = ION_SYSTEM.newEmptyStruct();
+        while (containerContext.increaseIndex() < end) {
+            Event event = isFirst ?
+                    compareContext.getEventStreamFirst().get(containerContext.getIndex()) :
+                    compareContext.getEventStreamSecond().get(containerContext.getIndex());
+            EventType eventType = event.getEventType();
+            if (eventType == EventType.CONTAINER_START) {
+                switch (event.getIonType()) {
+                    case LIST:
+                        ionStruct.add(event.getFieldName(),
+                                parseSequence(containerContext, compareContext, end, isFirst, ION_SYSTEM.newEmptyList()));
+                        break;
+                    case STRUCT:
+                        ionStruct.add(event.getFieldName(),
+                                parseStruct(containerContext, compareContext, end, isFirst));
+                        break;
+                    case SEXP:
+                        ionStruct.add(event.getFieldName(),
+                                parseSequence(containerContext, compareContext, end, isFirst, ION_SYSTEM.newEmptySexp()));
+                        break;
+                }
+            } else if (eventType == EventType.CONTAINER_END) {
+                break;
+            } else if (eventType == EventType.STREAM_END) {
+                throw new IonException("Invalid struct: eventStream ends without CONTAINER_END");
+            } else {
+                IonValue cloneValue = event.getValue().clone();
+                cloneValue.setTypeAnnotationSymbols(event.getAnnotations());
+                ionStruct.add(event.getFieldName(), cloneValue);
+            }
+        }
+        return ionStruct;
+    }
+
+    private static IonSequence parseSequence(ContainerContext containerContext,
+                                             CompareContext compareContext,
+                                             int end,
+                                             boolean isFirst,
+                                             IonSequence ionSequence) {
+        while (containerContext.increaseIndex() < end) {
+            Event event = isFirst ?
+                    compareContext.getEventStreamFirst().get(containerContext.getIndex()) :
+                    compareContext.getEventStreamSecond().get(containerContext.getIndex());
+            EventType eventType = event.getEventType();
+            if (eventType == EventType.CONTAINER_START) {
+                switch (event.getIonType()) {
+                    case LIST:
+                        ionSequence.add(parseSequence(containerContext, compareContext, end, isFirst, ION_SYSTEM.newEmptyList()));
+                        break;
+                    case SEXP:
+                        ionSequence.add(parseSequence(containerContext, compareContext, end, isFirst, ION_SYSTEM.newEmptySexp()));
+                        break;
+                    case STRUCT:
+                        ionSequence.add(parseStruct(containerContext, compareContext, end, isFirst));
+                        break;
+                }
+            } else if (eventType == EventType.CONTAINER_END) {
+                break;
+            } else if (eventType == EventType.STREAM_END) {
+                throw new IonException("Invalid ionSequence: eventStream ends without CONTAINER_END");
+            } else {
+                IonValue cloneValue = event.getValue().clone();
+                cloneValue.setTypeAnnotationSymbols(event.getAnnotations());
+                ionSequence.add(cloneValue);
+            }
+        }
+        return ionSequence;
+    }
+
+    private static boolean compareEquivs(CompareContext compareContext) throws IOException {
+        int i = 0;
+        int j = 0;
+        List<Event> eventStreamFirst = compareContext.getEventStreamFirst();
+        List<Event> eventStreamSecond = compareContext.getEventStreamSecond();
+        ComparisonType type = compareContext.getType();
+
+        while (i < eventStreamFirst.size() && j < eventStreamSecond.size()) {
+            Event eventFirst = eventStreamFirst.get(i);
+            Event eventSecond = eventStreamSecond.get(j);
+
+            if (eventFirst.getEventType() == EventType.STREAM_END
+                    && eventSecond.getEventType() == EventType.STREAM_END) {
+                break;
+            } else if (eventFirst.getEventType() == EventType.STREAM_END
+                    || eventSecond.getEventType() == EventType.STREAM_END) {
+                setReportInfo(i, j,
+                        "The input streams had a different number of comparison sets.", compareContext);
+                return type == ComparisonType.NON_EQUIVS;
+            } else if (!(eventFirst.getIonType() == IonType.LIST || eventFirst.getIonType() == IonType.SEXP)
+                    || !(eventSecond.getIonType() == IonType.LIST || eventSecond.getIonType() == IonType.SEXP)) {
+                throw new IonException("Comparison sets must be lists or s-expressions.");
+            } else if (isEmbeddedEvent(eventFirst) ^ isEmbeddedEvent(eventSecond)) {
+                throw new IonException("Embedded streams set expected.");
+            }
+
+            List<Pair> pairsFirst;
+            List<Pair> pairsSecond;
+
+            if (isEmbeddedEvent(eventFirst) && isEmbeddedEvent(eventSecond)) {
+                pairsFirst = locateEmbeddedStreamBoundaries(eventStreamFirst, i);
+                pairsSecond = locateEmbeddedStreamBoundaries(eventStreamSecond, j);
+            } else {
+                pairsFirst = locateContainerBoundaries(eventStreamFirst, i);
+                pairsSecond = locateContainerBoundaries(eventStreamSecond, j);
+            }
+            i = pairsFirst.size() == 0 ? i + 1 : pairsFirst.get(pairsFirst.size() - 1).right + 1;
+            j = pairsSecond.size() == 0 ? j + 1 : pairsSecond.get(pairsSecond.size() - 1).right + 1;
+
+            for (int m = 0; m < pairsFirst.size(); m++) {
+                for (int n = 0; n < pairsSecond.size(); n++) {
+                    if (compareContext.getType() == ComparisonType.NON_EQUIVS) {
+                        if (m == n) continue;
+                    }
+                    Pair pairFirst = pairsFirst.get(m);
+                    Pair pairSecond = pairsSecond.get(n);
+                    if (compare(compareContext, pairFirst.left, pairFirst.right, pairSecond.left, pairSecond.right) ^
+                            (type == ComparisonType.EQUIVS || type == ComparisonType.EQUIVS_TIMELINE)) {
+                        if (type == ComparisonType.NON_EQUIVS) {
+                            setReportInfo(pairFirst.left, pairSecond.left,
+                                    "Equivalent values in a non-equivs set.", compareContext);
+                        }
+                        return type == ComparisonType.NON_EQUIVS;
+                    }
+                }
+            }
+            i++;
+            j++;
+        }
+        return (type == ComparisonType.EQUIVS || type == ComparisonType.EQUIVS_TIMELINE);
+    }
+
+    /**
+     *  This function parses an embedded stream into pairs<int,int> that stores index range for
+     *  each string the embedded stream includes.
+     *
+     *  Input value 'start' must be index of a CONTAINER_START event.
+     *
+     *  return List is never null. It will return a list with size zero if the embedded stream is empty.
+     */
+    private static List<Pair> locateEmbeddedStreamBoundaries(List<Event> events, int start) {
+        List<Pair> parsedEvents = new ArrayList<>(0);
+        int left = start + 1;
+        int right = start;
+        int depth = 1;
+        while (++right < events.size()) {
+            EventType eventType = events.get(right).getEventType();
+
+            if (eventType == EventType.STREAM_END) {
+                parsedEvents.add(new Pair(left, right));
+                left = right + 1;
+            } else if (eventType == EventType.CONTAINER_END) {
+                if (--depth == 0) break;
+            } else if (eventType == EventType.CONTAINER_START) {
+                depth++;
+            }
+        }
+        return parsedEvents;
+    }
+
+    /**
+     *  This function parses a container's values into pairs<int,int> that stores its index range.
+     *  1. For SCALAR event with index i, the pair will be (i, i).
+     *  2. For CONTAINER event, the pair will be (start, end) where start is the index of the CONTAINER_START event
+     *  and end is the index of the CONTAINER_END event.
+     *
+     *  Input value 'start' must be index of a CONTAINER_START event.
+     *
+     *  return List is never null. It will return a list with size zero if the container is empty.
+     */
+    private static List<Pair> locateContainerBoundaries(List<Event> events, int start) {
+        List<Pair> parsedEvents = new ArrayList<>(0);
+        while (++start < events.size()) {
+            EventType eventType = events.get(start).getEventType();
+
+            if (eventType == EventType.STREAM_END) {
+                throw new IonException("Invalid container: end without CONTAINER_END event");
+            } else if (eventType == EventType.CONTAINER_END) {
+                break;
+            } else if (eventType == EventType.SCALAR) {
+                parsedEvents.add(new Pair(start, start));
+            } else if (eventType == EventType.CONTAINER_START) {
+                int startCount = start;
+                int endCount = findNextContainer(events, start);
+                start = endCount;
+                parsedEvents.add(new Pair(startCount, endCount));
+            }
+        }
+        return parsedEvents;
+    }
+
+    /**
+     *  This function will move the count i from the CONTAINER_START event to its corresponding CONTAINER_END event.
+     *
+     *  return the index of its corresponding CONTAINER_END event.
+     *
+     *  throw IonException if CONTAINER_END event doesn't exist.
+     */
+    private static int findNextContainer(List<Event> eventStream, int i) {
+        if (!IonType.isContainer(eventStream.get(i).getIonType())) return i;
+        int depth = 1;
+        while (i++ < eventStream.size()) {
+            Event event = eventStream.get(i);
+            if (event.getEventType() == EventType.CONTAINER_START) {
+                depth++;
+            } else if (event.getEventType() == EventType.CONTAINER_END) {
+                if (--depth == 0) break;
+            }
+        }
+        if (i == eventStream.size()) {
+            throw new IonException("Invalid container, reach the end of the eventStream without CONTAINER_END event");
+        }
+        return i;
+    }
+
+    //
+    //
+    // helper functions
+    //
+    //
+
+    private static void handleSymbolTableEvent(ProcessContext processContext,
+                                               Event event,
+                                               CommandArgs args,
+                                               boolean isEmbedded) throws IOException {
+        processContext.getIonWriter().close();
+        ImportDescriptor[] imports = event.getImports();
+        SymbolTable[] symbolTables = new SymbolTable[imports.length];
+        for (int i = 0; i < imports.length; i++) {
+            SymbolTable symbolTable = ION_SYSTEM.newSharedSymbolTable(
+                    imports[i].getImportName(), imports[i].getVersion(), null);
+            symbolTables[i] = symbolTable;
+        }
+        if (!isEmbedded) {
+            OutputStream out = args.getOutputFile() == null ?
+                    new NoCloseOutputStream(System.out) : new FileOutputStream(processContext.getFile(), true);
+            processContext.setIonWriter(args.getOutputFormat().createIonWriterWithImports(out, symbolTables));
+        } else {
+            processContext.getEmbeddedOut().append(" ");
+            processContext.setIonWriter(ION_TEXT_WRITER_BUILDER.withImports(symbolTables)
+                    .build(processContext.getEmbeddedOut()));
+        }
+    }
+
+    private static void writeIonByType(Event event, IonWriter ionWriter) {
+        setFieldName(event, ionWriter);
+        IonValue value = event.getValue();
+        value.setTypeAnnotationSymbols(event.getAnnotations());
+        value.writeTo(ionWriter);
+    }
+
+    private static void setFieldName(Event event, IonWriter ionWriter) {
+        SymbolToken field = event.getFieldName();
+        if (field != null) {
+            if (!ionWriter.isInStruct()) throw new IonException("invalid field_name inside STRUCT");
+            ionWriter.setFieldNameSymbol(field);
+        } else if (ionWriter.isInStruct()) {
+            SymbolToken symbolToken = _Private_Utils.newSymbolToken((String) null, 0);
+            ionWriter.setFieldNameSymbol(symbolToken);
+        }
+    }
+
+    private static void setAnnotations(Event event, IonWriter ionWriter) {
+        SymbolToken[] annotations = event.getAnnotations();
+        if (annotations != null && annotations.length != 0) {
+            ionWriter.setTypeAnnotationSymbols(annotations);
+        }
+    }
+
+    private static boolean isSameSymbolToken(SymbolToken symbolTokenX, SymbolToken symbolTokenY) {
+        if (symbolTokenX == null && symbolTokenY == null) {
+            return true;
+        } else if (symbolTokenX != null && symbolTokenY != null) {
+            if (symbolTokenX.getText() != null && symbolTokenY.getText() != null) {
+                return symbolTokenX.getText().equals(symbolTokenY.getText());
+            } else {
+                return symbolTokenX.getSid() == symbolTokenY.getSid();
+            }
+        } else return false;
+    }
+
+    private static boolean isSameSymbolTokenArray(SymbolToken[] symbolTokenArrayX, SymbolToken[] symbolTokenArrayY) {
+        if ((symbolTokenArrayX == null || symbolTokenArrayX.length == 0)
+                && (symbolTokenArrayY == null || symbolTokenArrayY.length == 0)) {
+            return true;
+        } else if (symbolTokenArrayX != null && symbolTokenArrayY != null) {
+            if (symbolTokenArrayX.length == symbolTokenArrayY.length) {
+                for (int i = 0; i < symbolTokenArrayX.length; i++) {
+                    if (!isSameSymbolToken(symbolTokenArrayX[i], symbolTokenArrayY[i])) return false;
+                }
+            } else  return false;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private static boolean isEmbeddedStream(IonReader ionReader) {
+        IonType ionType = ionReader.getType();
+        String[] annotations = ionReader.getTypeAnnotations();
+        return (ionType == IonType.SEXP || ionType == IonType.LIST)
+                && ionReader.getDepth() == 0
+                && annotations.length > 0
+                && annotations[0].equals(EMBEDDED_STREAM_ANNOTATION);
+    }
+
+    private static boolean isEmbeddedEvent(Event event) {
+        IonType ionType = event.getIonType();
+        SymbolToken[] annotations = event.getAnnotations();
+        return (ionType == IonType.SEXP || ionType == IonType.LIST)
+                && event.getDepth() == 0
+                && annotations != null
+                && annotations.length > 0
+                && annotations[0].getText().equals(EMBEDDED_STREAM_ANNOTATION);
+    }
+
+    public static boolean isEventStream(IonReader ionReader) {
+        return ionReader.next() != null
+                && !ionReader.isNullValue()
+                && ionReader.getType() == IonType.SYMBOL
+                && EVENT_STREAM.equals(ionReader.symbolValue().getText());
+    }
+
+    private static void setReportInfo(int i, int j, String message, CompareContext compareContext) {
+        if (i != -1) compareContext.setFileEventIndex(i);
+        if (j != -1) compareContext.setCompareToFileEventIndex(j);
+        if (message != null) compareContext.setMessage(message);
+    }
+
+    private static void writeReport(CompareContext compareContext,
+                                    IonWriter ionWriter,
+                                    ComparisonResultType type) throws IOException {
+        new ComparisonResult(type,
+                new ComparisonContext(compareContext.getFile(),
+                        (compareContext.getFileEventIndex() >= compareContext.getEventStreamFirst().size()
+                                || compareContext.getFileEventIndex() < 0) ? null :
+                                compareContext.getEventStreamFirst().get(compareContext.getFileEventIndex()),
+                        compareContext.getFileEventIndex()),
+                new ComparisonContext(compareContext.getCompareToFile(),
+                        (compareContext.getCompareToFileEventIndex() >= compareContext.getEventStreamSecond().size()
+                                || compareContext.getCompareToFileEventIndex() < 0) ? null :
+                                compareContext.getEventStreamSecond().get(compareContext.getCompareToFileEventIndex()),
+                        compareContext.getCompareToFileEventIndex()),
+                compareContext.getMessage()).writeOutput(ionWriter);
+    }
+
+    private static void getEventStream(IonReader ionReader,
+                                       CommandType commandType,
+                                       ReadContext readContext) throws IOException {
+        SymbolTable curTable = ionReader.getSymbolTable();
+        boolean isEventStream = isEventStream(ionReader);
+
+        if (isEventStream) {
+            readContext.setState(ErrorType.WRITE);
+            while (ionReader.next() != null) {
+                Event event = eventStreamToEvent(ionReader);
+                if (event.getEventType() == EventType.SYMBOL_TABLE && commandType == CommandType.COMPARE) {
+                    continue;
+                }
+                readContext.getEventStream().add(event);
+            }
+        } else {
+            readContext.setState(ErrorType.READ);
+            ionStreamToEventStream(ionReader, commandType, curTable, readContext);
+            readContext.getEventStream().add(new Event(EventType.STREAM_END, null, null, null,
+                    null, null, 0));
+        }
+
+        if (commandType == CommandType.PROCESS) {
+            validateEventStream(readContext.getEventStream());
+        }
+        return;
+    }
+
+    private static void validateEventStream(List<Event> events) {
+        if (events.size() == 0) return;
+
+        int depth = 0;
+        int i = -1;
+        while (++i < events.size()) {
+            Event event = events.get(i);
+            EventType eventType = event.getEventType();
+
+            if (eventType == EventType.CONTAINER_START) {
+                depth++;
+            } else if (eventType == EventType.CONTAINER_END) {
+                if (--depth < 0) {
+                    throw new IonException("Invalid event stream: Invalid CONTAINER_END event");
+                }
+            }
+
+            if (isEmbeddedEvent(event)) {
+                while (i < events.size()) {
+                    if (events.get(++i).getEventType() == EventType.CONTAINER_END) {
+                        depth--;
+                        break;
+                    }
+                    while (i < events.size()) {
+                        Event aEvent = events.get(i);
+                        EventType aEventType = aEvent.getEventType();
+                        if (aEventType == EventType.CONTAINER_START) {
+                            depth++;
+                        } else if (aEventType == EventType.CONTAINER_END) {
+                            if (--depth == 0) {
+                                throw new IonException("Invalid EventStream: end without STREAM_END event");
+                            }
+                        } else if (aEventType == EventType.STREAM_END) {
+                            if (depth != 1) {
+                                throw new IonException("Invalid EventStream: " +
+                                        "CONTAINER_START and CONTAINER_END not match");
+                            }
+                            break;
+                        }
+                        i++;
+                    }
+                    if (i == events.size()) {
+                        throw new IonException("Invalid EventStream: end without CONTAINER_END event");
+                    }
+                }
+            }
+        }
+        if (depth != 0) {
+            throw new IonException("Invalid event stream: CONTAINER_START and CONTAINER_END events doesn't match");
+        }
+    }
+
+    private static void ionStreamToEventStream(IonReader ionReader,
+                                               CommandType commandType,
+                                               SymbolTable curTable,
+                                               ReadContext readContext) throws IOException {
+        if (ionReader.getType() == null) return;
+        do {
+            if (ionReader.isNullValue()) {
+                IonValue value = ION_SYSTEM.newValue(ionReader);
+                value.clearTypeAnnotations();
+                readContext.getEventStream().add(new Event(EventType.SCALAR, ionReader.getType(), ionReader.getFieldNameSymbol(),
+                        ionReader.getTypeAnnotationSymbols(), value, null, ionReader.getDepth()));
+                continue;
+            }
+
+            if (!isSameSymbolTable(ionReader.getSymbolTable(), curTable)) {
+                curTable = ionReader.getSymbolTable();
+                ImportDescriptor[] imports = symbolTableToImports(curTable.getImportedTables());
+
+                if (commandType != CommandType.COMPARE) {
+                    readContext.getEventStream().add(new Event(EventType.SYMBOL_TABLE, null, null, null,
+                            null, imports, 0));
+                }
+            }
+            if (isEmbeddedStream(ionReader)) {
+                //get current Ion type and depth
+                IonType curType = ionReader.getType();
+                int curDepth = ionReader.getDepth();
+
+                //write a Container_Start event and step in
+                readContext.getEventStream().add(ionStreamToEvent(ionReader));
+                ionReader.stepIn();
+
+                while (ionReader.next() != null) {
+                    if (ionReader.getType() != IonType.STRING) {
+                        throw new IonException("Elements of embedded streams sets must be strings.");
+                    }
+                    String stream = ionReader.stringValue();
+                    try (IonReader tempIonReader = IonReaderBuilder.standard().build(stream)) {
+                        SymbolTable symbolTable = tempIonReader.getSymbolTable();
+                        while (tempIonReader.next() != null) {
+                            ionStreamToEventStream(tempIonReader, commandType, symbolTable, readContext);
+                        }
+                    }
+                    readContext.getEventStream().add (new Event(EventType.STREAM_END, null, null, null,
+                            null, null, 0));
+                }
+                //write a Container_End event and step out
+                readContext.getEventStream().add(new Event(EventType.CONTAINER_END, curType, null, null,
+                        null, null, curDepth));
+                ionReader.stepOut();
+            } else if (IonType.isContainer(ionReader.getType())) {
+                //get current Ion type and depth
+                IonType curType = ionReader.getType();
+                int curDepth = ionReader.getDepth();
+
+                //write a Container_Start event and step in
+                readContext.getEventStream().add(ionStreamToEvent(ionReader));
+                ionReader.stepIn();
+
+                //recursive call
+                ionReader.next();
+                ionStreamToEventStream(ionReader, commandType, curTable, readContext);
+                //write a Container_End event and step out
+                readContext.getEventStream().add(new Event(EventType.CONTAINER_END, curType, null, null,
+                        null, null, curDepth));
+                ionReader.stepOut();
+            } else {
+                readContext.getEventStream().add(ionStreamToEvent(ionReader));
+            }
+        } while (ionReader.next() != null);;
+    }
+
+    private static ImportDescriptor[] symbolTableToImports(SymbolTable[] tables) {
+        if (tables == null || tables.length == 0) return null;
+        int size = tables.length;
+
+        ImportDescriptor[] imports = new ImportDescriptor[size];
+        for (int i = 0; i < size; i++) {
+            ImportDescriptor table = new ImportDescriptor(tables[i]);
+            imports[i] = table;
+        }
+        return imports;
+    }
+
+    private static boolean isSameSymbolTable(SymbolTable newTable, SymbolTable curTable) {
+        if (newTable == null && curTable == null) { return true; }
+        else if (newTable != null && curTable == null) { return false; }
+        else if (newTable == null) { return false; }
+
+        if (newTable.isLocalTable() && newTable.getImportedTables().length == 0) {
+            return true;
+        } else if (newTable.isSystemTable() && curTable.isSystemTable()) {
+            return newTable.getVersion() == curTable.getVersion();
+        } else if (newTable.isSharedTable() && curTable.isSharedTable()) {
+            return (newTable.getName().equals(curTable.getName())) & (newTable.getVersion() == curTable.getVersion());
+        } else if (newTable.isLocalTable() && curTable.isLocalTable()) {
+            SymbolTable[] xTable = newTable.getImportedTables();
+            SymbolTable[] yTable = curTable.getImportedTables();
+            //compare imports
+            if (xTable.length == yTable.length) {
+                for (int i = 0; i < xTable.length; i++) {
+                    if (!isSameSymbolTable(xTable[i], yTable[i]))  return false;
+                }
+            } else {
+                return false;
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    private static boolean isIonVersionMarker(String text) {
+        return text != null && ION_VERSION_MARKER_REGEX.matcher(text).matches();
+    }
+
+    private static Event ionStreamToEvent(IonReader ionReader) throws IllegalStateException {
+        if (ionReader.getType() == null) throw new IllegalStateException("Can't convert ionReader null type to Event");
+        IonType ionType = ionReader.getType();
+        SymbolToken fieldName = ionReader.getFieldNameSymbol();
+        SymbolToken[] annotations = ionReader.getTypeAnnotationSymbols();
+        int depth = ionReader.getDepth();
+        ImportDescriptor[] imports = null;
+
+        EventType eventType;
+        IonValue value = null;
+
+        if (IonType.isContainer(ionType)) {
+            eventType = EventType.CONTAINER_START;
+        } else {
+            eventType = EventType.SCALAR;
+            value = ION_SYSTEM.newValue(ionReader);
+            value.clearTypeAnnotations();
+            if (isIonVersionMarker(value.toString())) {
+                value.setTypeAnnotationSymbols(_Private_Utils.newSymbolToken("$ion_user_value", 0));
+            }
+        }
+
+        return new Event(eventType, ionType, fieldName, annotations, value, imports, depth);
+    }
+
+    private static Event eventStreamToEvent(IonReader ionReader) {
+        if (ionReader.getType() != IonType.STRUCT) throw new IonException("cant convert null");
+        String textValue = null;
+        byte[] binaryValue = null;
+        IonValue eventValue = null;
+        EventType eventType = null;
+        IonType ionType = null;
+        SymbolToken fieldName = null;
+        SymbolToken[] annotations = null;
+        ImportDescriptor[] imports = null;
+        int depth = -1;
+
+        ionReader.stepIn();
+        while (ionReader.next() != null) {
+            switch (ionReader.getFieldName()) {
+                case "event_type":
+                    if (eventType != null) throw new IonException("invalid Event: repeat event_type");
+                    eventType = EventType.valueOf(ionReader.stringValue().toUpperCase());
+                    break;
+                case "ion_type":
+                    if (ionType != null) throw new IonException("invalid Event: repeat ion_type");
+                    ionType = IonType.valueOf(ionReader.stringValue().toUpperCase());
+                    break;
+                case "field_name":
+                    if (fieldName != null) throw new IonException("invalid Event: repeat field_name");
+                    ionReader.stepIn();
+                    String fieldText = null;
+                    int fieldSid = 0;
+                    while (ionReader.next() != null) {
+                        switch (ionReader.getFieldName()) {
+                            case "text":
+                                fieldText = ionReader.stringValue();
+                                break;
+                            case "sid":
+                                fieldSid = ionReader.intValue();
+                                break;
+                        }
+                    }
+                    fieldName = _Private_Utils.newSymbolToken(fieldText, fieldSid);
+                    ionReader.stepOut();
+                    break;
+                case "annotations":
+                    if (annotations != null) throw new IonException("invalid Event: repeat annotations");
+                    ArrayList<SymbolToken> annotationsList = new ArrayList<>();
+                    ionReader.stepIn();
+                    while (ionReader.next() != null) {
+                        ionReader.stepIn();
+                        String text = null;
+                        int sid = 0;
+                        while (ionReader.next() != null) {
+                            switch (ionReader.getFieldName()) {
+                                case "text":
+                                    text = ionReader.isNullValue() ? null : ionReader.stringValue();
+                                    break;
+                                case "sid":
+                                    sid = ionReader.intValue();
+                                    break;
+                            }
+                        }
+                        SymbolToken annotation = _Private_Utils.newSymbolToken(text, sid);
+                        annotationsList.add(annotation);
+                        ionReader.stepOut();
+                    }
+                    annotations = annotationsList.toArray(SymbolToken.EMPTY_ARRAY);
+                    ionReader.stepOut();
+                    break;
+                case "value_text":
+                    if (textValue != null) throw new IonException("invalid Event: repeat value_text");
+                    textValue = ionReader.stringValue();
+                    break;
+                case "value_binary":
+                    if (binaryValue != null) throw new IonException("invalid Event: repeat binary_value");
+                    ArrayList<Integer> intArray = new ArrayList<>();
+                    ionReader.stepIn();
+                    while (ionReader.next() != null) {
+                        intArray.add(ionReader.intValue());
+                    }
+                    byte[] binary = new byte[intArray.size()];
+                    for (int i = 0; i < intArray.size(); i++) {
+                        int val = intArray.get(i);
+                        binary[i] = (byte) (val & 0xff);
+                    }
+                    binaryValue = binary;
+                    ionReader.stepOut();
+                    break;
+                case "imports":
+                    if (imports != null) throw new IonException("invalid Event: repeat imports");
+                    imports = ionStreamToImportDescriptors(ionReader);
+                    break;
+                case "depth":
+                    if (depth != -1) throw new IonException("invalid Event: repeat depth");
+                    depth = ionReader.intValue();
+                    break;
+            }
+        }
+        ionReader.stepOut();
+        //validate event
+        validateEvent(textValue, binaryValue, eventType, fieldName, ionType, imports, depth);
+        if (textValue != null) eventValue = ION_SYSTEM.singleValue(textValue);
+
+        return new Event(eventType, ionType, fieldName, annotations, eventValue, imports, depth);
+    }
+
+    private static void validateEvent(String textValue, byte[] binaryValue, EventType eventType, SymbolToken fieldName,
+                                      IonType ionType, ImportDescriptor[] imports, int depth) {
+        if (eventType == null) throw new IllegalStateException("only can convert Struct to Event");
+
+        switch (eventType) {
+            case CONTAINER_START:
+                if (ionType == null || depth == -1) {
+                    throw new IonException("Invalid CONTAINER_START: missing field(s)");
+                } else if (!IonType.isContainer(ionType)) {
+                    throw new IonException("Invalid CONTAINER_START: not a container");
+                } else if (textValue != null || binaryValue != null) {
+                    throw new IonException("Invalid CONTAINER_START: value_binary and value_text are only applicable"
+                            + " for SCALAR events");
+                } else if (imports != null) {
+                    throw new IonException("Invalid CONTAINER_START: imports must only be present with SYMBOL_TABLE "
+                            + "events");
+                }
+                break;
+            case SCALAR:
+                if (ionType == null || textValue == null || binaryValue == null || depth == -1) {
+                    throw new IonException("Invalid SCALAR: missing field(s)");
+                } else if (imports != null) {
+                    throw new IonException("Invalid SCALAR: imports must only be present with SYMBOL_TABLE "
+                            + "events");
+                }
+                //compare text value and binary value
+                IonValue text = ION_SYSTEM.singleValue(textValue);
+                IonValue binary = ION_SYSTEM.singleValue(binaryValue);
+                if (!Equivalence.ionEquals(text, binary)) {
+                    throw new IonException("invalid Event: Text value and Binary value are different");
+                }
+                break;
+            case SYMBOL_TABLE:
+                if (depth == -1) {
+                    throw new IonException("Invalid SYMBOL_TABLE: missing depth");
+                } else if (imports == null ) {
+                    throw new IonException("Invalid SYMBOL_TABLE: missing imports");
+                } else if (textValue != null && binaryValue != null) {
+                    throw new IonException("Invalid SYMBOL_TABLE: text_value and binary_value "
+                            + "are only applicable for SCALAR events");
+                } else if (fieldName != null && ionType != null) {
+                    throw new IonException("Invalid SYMBOL_TABLE: unnecessary fields");
+                }
+                break;
+            case CONTAINER_END:
+                if (depth == -1 || ionType == null) {
+                    throw new IonException("Invalid CONTAINER_END: missing depth");
+                } else if (textValue != null && binaryValue != null) {
+                    throw new IonException("Invalid CONTAINER_END: text_value and binary_value "
+                            + "are only applicable for SCALAR events");
+                } else if (fieldName != null && imports != null) {
+                    throw new IonException("Invalid CONTAINER_END: unnecessary fields");
+                }
+                break;
+            case STREAM_END:
+                if (depth == -1) {
+                    throw new IonException("Invalid STREAM_END: missing depth");
+                } else if (textValue != null && binaryValue != null) {
+                    throw new IonException("Invalid STREAM_END: text_value and binary_value "
+                            + "are only applicable for SCALAR events");
+                } else if (fieldName != null && ionType != null && imports != null) {
+                    throw new IonException("Invalid STREAM_END: unnecessary fields");
+                }
+                break;
+            default:
+                throw new IonException("Invalid event_type");
+        }
+    }
+
+    private static ImportDescriptor[] ionStreamToImportDescriptors(IonReader ionReader) {
+        ArrayList<ImportDescriptor> imports = new ArrayList<>();
+
+        ionReader.stepIn();
+        while (ionReader.next() != null) {
+            String importName = null;
+            int maxId = 0;
+            int version = 0;
+
+            ionReader.stepIn();
+            while (ionReader.next() != null) {
+                switch (ionReader.getFieldName()) {
+                    case "name":
+                        importName = ionReader.stringValue();
+                        break;
+                    case "max_id":
+                        maxId = ionReader.intValue();
+                        break;
+                    case "version":
+                        version = ionReader.intValue();
+                        break;
+                }
+            }
+            ionReader.stepOut();
+
+            ImportDescriptor table = new ImportDescriptor(importName, maxId, version);
+            imports.add(table);
+        }
+        ImportDescriptor[] importsArray = imports.toArray(new ImportDescriptor[0]);
+
+        ionReader.stepOut();
+        return importsArray;
+    }
+
+    /**
+     *  This function creates a new file for output stream with the fileName, If file name is empty or undefined,
+     *  it will create a default output which is System.out or System.err.
+     *
+     *  this function never return null
+     */
+    private static BufferedOutputStream initOutputStream(CommandArgs args,
+                                                         String defaultValue,
+                                                         ProcessContext processContext) throws IOException {
+        BufferedOutputStream outputStream = null;
+        switch (defaultValue) {
+            case SYSTEM_OUT_DEFAULT_VALUE:
+                String outputFile = args.getOutputFile();
+                if (outputFile != null && outputFile.length() != 0) {
+                    File myFile = new File(outputFile);
+                    if (args.getCommand() == CommandType.PROCESS && processContext != null) {
+                        processContext.setFile(myFile);
+                    }
+                    FileOutputStream out = new FileOutputStream(myFile);
+                    outputStream = new BufferedOutputStream(out, BUFFER_SIZE);
+                } else {
+                    outputStream = new BufferedOutputStream(new NoCloseOutputStream(System.out), BUFFER_SIZE);
+                }
+                break;
+            case SYSTEM_ERR_DEFAULT_VALUE:
+                String errorReport = args.getErrorReport();
+                if (errorReport != null && errorReport.length() != 0) {
+                    File myFile = new File(errorReport);
+                    FileOutputStream out = new FileOutputStream(myFile, true);
+                    outputStream = new BufferedOutputStream(out, BUFFER_SIZE);
+                } else {
+                    outputStream = new BufferedOutputStream(System.err, BUFFER_SIZE);
+                }
+                break;
+        }
+        return outputStream;
+    }
+
+    static class Pair {
+        final int left;
+        final int right;
+
+        Pair(int left, int right) {
+            this.left = left;
+            this.right = right;
+        }
+    }
+
+    static class ReadContext {
+        final private List<Event> eventStream;
+        private ErrorType state;
+
+        public ReadContext(List<Event> eventStream) {
+            this.eventStream = eventStream;
+            this.state = ErrorType.READ;
+        }
+
+        public List<Event> getEventStream() {
+            return eventStream;
+        }
+
+        public ErrorType getState() {
+            return state;
+        }
+
+        public void setState(ErrorType state) {
+            this.state = state;
+        }
+    }
+
+    static class ContainerContext {
+        int index;
+
+        ContainerContext(int index) {
+            this.index = index;
+        }
+
+        public int getIndex() {
+            return index;
+        }
+
+        public void setIndex(int index) {
+            this.index = index;
+        }
+
+        public int increaseIndex() {
+            this.index = this.index + 1;
+            return this.index;
+        }
+    }
+
+    static class CommandArgs {
+        private static final String DEFAULT_FORMAT_VALUE = OutputFormat.PRETTY.toString();
+        private static final String DEFAULT_COMPARISON_TYPE = ComparisonType.BASIC.toString();
+
+        @Option(name = "--output",
+                aliases = {"-o"},
+                metaVar = "FILE",
+                usage = "Output file")
+        private String outputFile;
+
+        @Option(name = "--error-report",
+                aliases = {"-e"},
+                metaVar = "FILE",
+                usage = "Error report file")
+        private String errorReport;
+
+        @Option(name = "--output-format",
+                aliases = {"-f"},
+                metaVar = "TYPE",
+                usage = "Output format, from the set (text | pretty | binary |\n"
+                        + "events | none). 'events' is only available with the\n"
+                        + "'process' command, and outputs a serialized EventStream\n"
+                        + "representing the input Ion stream(s).")
+        private String outputFormatName = DEFAULT_FORMAT_VALUE;
+
+        @Option(name = "--comparison-type",
+                aliases = {"-y"},
+                metaVar = "TYPE",
+                usage = "Comparison semantics to be used with the compare command, from the set (basic | equivs |\n"
+                        + "non-equivs | equiv-timeline). Any embedded streams in the inputs are compared for\n"
+                        + "EventStream equality. 'basic' performs a standard data-model comparison between the\n"
+                        + "corresponding events (or embedded streams) in the inputs. 'equivs' verifies that each \n"
+                        + "value (or embedded stream) in a top-level sequence is equivalent to every other value \n"
+                        + "(or embedded stream) in that sequence. 'non-equivs' does the same, but verifies that the \n"
+                        + "values (or embedded streams) are not equivalent. 'equiv-timeline' is the same as 'equivs',\n"
+                        + " except that when top-level sequences contain timestamp values, they are considered \n"
+                        + "equivalent if they represent the same instant regardless of whether they are considered \n"
+                        + "equivalent by the Ion data model.")
+        private String comparisonType = DEFAULT_COMPARISON_TYPE;
+
+        @Argument(required = true)
+        private List<String> inputs;
+
+        private CommandType commandType = null;
+
+        public String getOutputFormatName() {
+            return outputFormatName;
+        }
+
+        public ComparisonType getComparisonType() throws IllegalArgumentException {
+            return ComparisonType.valueOf(comparisonType.replace('-','_').toUpperCase());
+        }
+
+        public CommandType getCommand() {
+            return this.commandType;
+        }
+
+        public void setCommand() {
+            this.commandType = CommandType.valueOf(inputs.get(0).toUpperCase());
+        }
+
+        public OutputFormat getOutputFormat() throws IllegalArgumentException {
+            return OutputFormat.valueOf(outputFormatName.toUpperCase());
+        }
+
+        public List<String> getInputFiles() {
+            int length = this.inputs.size();
+            return this.inputs.subList(1, length);
+        }
+        public String getOutputFile() { return outputFile; }
+        public String getErrorReport() { return errorReport; }
+    }
+}
diff --git a/ion-java-cli/src/com/amazon/tools/cli/NoCloseOutputStream.java b/ion-java-cli/src/com/amazon/tools/cli/NoCloseOutputStream.java
new file mode 100644
index 0000000000..b202b7807e
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/cli/NoCloseOutputStream.java
@@ -0,0 +1,17 @@
+package com.amazon.tools.cli;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class NoCloseOutputStream extends FilterOutputStream {
+
+    public NoCloseOutputStream(OutputStream out) {
+        super(out);
+    }
+
+    @Override
+    public void close() throws IOException{
+        out.flush();
+    }
+}
diff --git a/ion-java-cli/src/com/amazon/tools/cli/NoOpOutputStream.java b/ion-java-cli/src/com/amazon/tools/cli/NoOpOutputStream.java
new file mode 100644
index 0000000000..2ff022e8e1
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/cli/NoOpOutputStream.java
@@ -0,0 +1,10 @@
+package com.amazon.tools.cli;
+
+import java.io.OutputStream;
+
+public class NoOpOutputStream extends OutputStream {
+    @Override
+    public void write(int b) {
+        return;
+    }
+}
diff --git a/ion-java-cli/src/com/amazon/tools/cli/OutputFormat.java b/ion-java-cli/src/com/amazon/tools/cli/OutputFormat.java
new file mode 100644
index 0000000000..15a658fcd3
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/cli/OutputFormat.java
@@ -0,0 +1,88 @@
+package com.amazon.tools.cli;
+
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder;
+
+import java.io.OutputStream;
+
+/**
+ * Represents the different Ion output formats supported by the command line com.amazon.tools in this package.
+ */
+public enum OutputFormat {
+    /**
+     * Nicely spaced, 'prettified' text Ion.
+     */
+    PRETTY {
+        @Override
+        public IonWriter createIonWriter(OutputStream outputStream) {
+            return IonTextWriterBuilder.pretty().build(outputStream);
+        }
+
+        @Override
+        public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
+            return IonTextWriterBuilder.pretty().withImports(imports).build(outputStream);
+        }
+    },
+    /**
+     * Minimally spaced text Ion.
+     */
+    TEXT {
+        @Override
+        public IonWriter createIonWriter(OutputStream outputStream) {
+            return IonTextWriterBuilder.standard().build(outputStream);
+        }
+
+        @Override
+        public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
+            return IonTextWriterBuilder.standard().withImports(imports).build(outputStream);
+        }
+    },
+    /**
+     * Compact, read-optimized binary Ion.
+     */
+    BINARY {
+        @Override
+        public IonWriter createIonWriter(OutputStream outputStream) {
+            return IonBinaryWriterBuilder.standard().build(outputStream);
+        }
+
+        @Override
+        public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
+            return IonBinaryWriterBuilder.standard().withImports(imports).build(outputStream);
+        }
+    },
+    /**
+     * Event Stream
+     */
+    EVENTS {
+        @Override
+        public IonWriter createIonWriter(OutputStream outputStream) {
+            return IonTextWriterBuilder.pretty().build(outputStream);
+        }
+
+        @Override
+        public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
+            return IonTextWriterBuilder.pretty().withImports(imports).build(outputStream);
+        }
+    },
+    /**
+     * None
+     */
+    NONE {
+        @Override
+        public IonWriter createIonWriter(OutputStream outputStream) {
+            NoOpOutputStream out = new NoOpOutputStream();
+            return IonTextWriterBuilder.pretty().build(out);
+        }
+
+        @Override
+        public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
+            return IonTextWriterBuilder.pretty().withImports(imports).build(outputStream);
+        }
+    };
+
+    abstract IonWriter createIonWriter(OutputStream outputStream);
+    abstract IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] symbolTable);
+}
diff --git a/ion-java-cli/src/com/amazon/tools/cli/ProcessContext.java b/ion-java-cli/src/com/amazon/tools/cli/ProcessContext.java
new file mode 100644
index 0000000000..82662e8328
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/cli/ProcessContext.java
@@ -0,0 +1,95 @@
+package com.amazon.tools.cli;
+
+import com.amazon.ion.IonWriter;
+import com.amazon.tools.errorReport.ErrorType;
+import com.amazon.tools.events.Event;
+import com.amazon.tools.events.EventType;
+
+import java.io.File;
+import java.util.List;
+
+public class ProcessContext {
+    private String fileName;
+    private int eventIndex;
+    private EventType lastEventType;
+    private ErrorType state;
+    private IonWriter ionWriter;
+    private File file;
+    private StringBuilder embeddedOut;
+    private List<Event> eventStream;
+
+    public ProcessContext(String file, int index, EventType lastEventType, ErrorType state, IonWriter ionWriter) {
+        this.fileName = file;
+        this.eventIndex = index;
+        this.lastEventType = lastEventType;
+        this.state = state;
+        this.ionWriter = ionWriter;
+        this.file = null;
+        this.embeddedOut = null;
+        this.eventStream = null;
+    }
+
+    public String getFileName() {
+        return this.fileName;
+    }
+
+    public int getEventIndex() {
+        return this.eventIndex;
+    }
+
+    public EventType getLastEventType() {
+        return this.lastEventType;
+    }
+
+    public ErrorType getState() {
+        return state;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public void setEventIndex(int eventIndex) {
+        this.eventIndex = eventIndex;
+    }
+
+    public void setLastEventType(EventType lastEventType) {
+        this.lastEventType = lastEventType;
+    }
+
+    public void setState(ErrorType state) {
+        this.state = state;
+    }
+
+    public IonWriter getIonWriter() {
+        return ionWriter;
+    }
+
+    public void setIonWriter(IonWriter ionWriter) {
+        this.ionWriter = ionWriter;
+    }
+
+    public File getFile() {
+        return file;
+    }
+
+    public void setFile(File file) {
+        this.file = file;
+    }
+
+    public StringBuilder getEmbeddedOut() {
+        return embeddedOut;
+    }
+
+    public void setEmbeddedOut(StringBuilder embeddedOut) {
+        this.embeddedOut = embeddedOut;
+    }
+
+    public List<Event> getEventStream() {
+        return eventStream;
+    }
+
+    public void setEventStream(List<Event> eventStream) {
+        this.eventStream = eventStream;
+    }
+}
diff --git a/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonContext.java b/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonContext.java
new file mode 100644
index 0000000000..e8104dfcfe
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonContext.java
@@ -0,0 +1,27 @@
+package com.amazon.tools.comparisonReport;
+
+import com.amazon.tools.events.Event;
+
+public class ComparisonContext {
+    private final String location;
+    private final Event event;
+    private final int eventIndex;
+
+    public ComparisonContext(String location, Event event, int eventIndex) {
+        this.location = location;
+        this.event = event;
+        this.eventIndex = eventIndex;
+    }
+
+    public String getLocation() {
+        return location;
+    }
+
+    public Event getEvent() {
+        return event;
+    }
+
+    public int getEventIndex() {
+        return eventIndex;
+    }
+}
diff --git a/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResult.java b/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResult.java
new file mode 100644
index 0000000000..5fb22ecbd5
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResult.java
@@ -0,0 +1,55 @@
+package com.amazon.tools.comparisonReport;
+
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+
+import java.io.IOException;
+
+public class ComparisonResult {
+    private final ComparisonResultType result;
+    private final ComparisonContext lhs;
+    private final ComparisonContext rhs;
+    private final String message;
+
+    public ComparisonResult(ComparisonResultType result, ComparisonContext lhs,
+                            ComparisonContext rhs, String message) {
+        this.result = result;
+        this.lhs = lhs;
+        this.rhs = rhs;
+        this.message = message;
+    }
+
+    public void writeOutput(IonWriter ionWriter) throws IOException {
+        ionWriter.stepIn(IonType.STRUCT);
+        if (this.result != null) {
+            ionWriter.setFieldName("result");
+            ionWriter.writeString(result.toString());
+        }
+        if (this.message != null) {
+            ionWriter.setFieldName("message");
+            ionWriter.writeString(message);
+        }
+        if (this.lhs != null) {
+            ionWriter.setFieldName("lhs");
+            writeComparisonContext(ionWriter, this.lhs);
+        }
+        if (this.rhs != null) {
+            ionWriter.setFieldName("rhs");
+            writeComparisonContext(ionWriter, this.rhs);
+        }
+        ionWriter.stepOut();
+    }
+
+    private void writeComparisonContext(IonWriter ionWriter, ComparisonContext comparisonContext) throws IOException {
+        ionWriter.stepIn(IonType.STRUCT);
+        ionWriter.setFieldName("location");
+        ionWriter.writeString(comparisonContext.getLocation());
+        if (comparisonContext.getEvent() != null) {
+            ionWriter.setFieldName("event");
+            comparisonContext.getEvent().writeOutput(ionWriter, -1);
+        }
+        ionWriter.setFieldName("event_index");
+        ionWriter.writeInt(comparisonContext.getEventIndex());
+        ionWriter.stepOut();
+    }
+}
diff --git a/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResultType.java b/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResultType.java
new file mode 100644
index 0000000000..b82864eebe
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResultType.java
@@ -0,0 +1,7 @@
+package com.amazon.tools.comparisonReport;
+
+public enum ComparisonResultType {
+    EQUAL,
+    NOT_EQUAL,
+    ERROR
+}
diff --git a/ion-java-cli/src/com/amazon/tools/errorReport/ErrorDescription.java b/ion-java-cli/src/com/amazon/tools/errorReport/ErrorDescription.java
new file mode 100644
index 0000000000..5efccade2c
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/errorReport/ErrorDescription.java
@@ -0,0 +1,41 @@
+package com.amazon.tools.errorReport;
+
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+
+import java.io.IOException;
+
+public class ErrorDescription {
+    private final ErrorType errorType;
+    private final String message;
+    private final String location;
+    private final int eventIndex;
+
+    public ErrorDescription(ErrorType errorType, String message, String location, int eventIndex) {
+        this.errorType = errorType;
+        this.message = message;
+        this.location = location;
+        this.eventIndex = eventIndex;
+    }
+
+    public void writeOutput(IonWriter ionWriterForErrorReport) throws IOException {
+        ionWriterForErrorReport.stepIn(IonType.STRUCT);
+        if (this.errorType != null) {
+            ionWriterForErrorReport.setFieldName("error_type");
+            ionWriterForErrorReport.writeSymbol(this.errorType.toString());
+        }
+        if (this.message != null) {
+            ionWriterForErrorReport.setFieldName("message");
+            ionWriterForErrorReport.writeString(this.message);
+        }
+        if (this.location != null) {
+            ionWriterForErrorReport.setFieldName("location");
+            ionWriterForErrorReport.writeString(this.location);
+        }
+        if (this.eventIndex != -1) {
+            ionWriterForErrorReport.setFieldName("event_index");
+            ionWriterForErrorReport.writeInt(this.eventIndex);
+        }
+        ionWriterForErrorReport.stepOut();
+    }
+}
diff --git a/ion-java-cli/src/com/amazon/tools/errorReport/ErrorType.java b/ion-java-cli/src/com/amazon/tools/errorReport/ErrorType.java
new file mode 100644
index 0000000000..9bbd678e56
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/errorReport/ErrorType.java
@@ -0,0 +1,7 @@
+package com.amazon.tools.errorReport;
+
+public enum ErrorType {
+    READ,
+    WRITE,
+    STATE
+}
diff --git a/ion-java-cli/src/com/amazon/tools/events/Event.java b/ion-java-cli/src/com/amazon/tools/events/Event.java
new file mode 100644
index 0000000000..cb89b328fe
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/events/Event.java
@@ -0,0 +1,179 @@
+package com.amazon.tools.events;
+
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.IonWriter;
+
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.tools.cli.ProcessContext;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+public class Event {
+    private static final int IO_ERROR_EXIT_CODE = 2;
+
+    private final EventType eventType;
+    private final IonType ionType;
+    private final SymbolToken fieldName;
+    private final SymbolToken[] annotations;
+    private final IonValue value;
+    private final ImportDescriptor[] imports;
+    private final int depth;
+
+    public Event(EventType eventType, IonType ionType, SymbolToken fieldName, SymbolToken[] annotations,
+                 IonValue value, ImportDescriptor[] imports, int depth) {
+        this.eventType = eventType;
+        this.ionType = ionType;
+        this.fieldName = fieldName;
+        this.annotations = annotations;
+        this.value = value;
+        this.imports = imports;
+        this.depth = depth;
+    }
+
+    public void writeOutput(IonWriter ionWriterForErrorReport,
+                            ProcessContext processContext) throws IOException {
+        int updatedEventIndex = writeOutput(processContext.getIonWriter(),processContext.getEventIndex());
+
+        processContext.setEventIndex(updatedEventIndex);
+    }
+
+    /**
+     * write Event structure to Event Stream and return the updated eventIndex.
+     */
+    public int writeOutput(IonWriter ionWriterForOutput,
+                           int eventIndex) throws IOException {
+            ionWriterForOutput.stepIn(IonType.STRUCT);
+
+            if (this.eventType != null) {
+                ionWriterForOutput.setFieldName("event_type");
+                ionWriterForOutput.writeSymbol(this.eventType.toString());
+            }
+
+            if (this.ionType != null) {
+                ionWriterForOutput.setFieldName("ion_type");
+                ionWriterForOutput.writeSymbol(this.ionType.toString());
+            }
+
+            if (this.fieldName != null) {
+                ionWriterForOutput.setFieldName("field_name");
+                ionWriterForOutput.stepIn(IonType.STRUCT);
+                ionWriterForOutput.setFieldName("text");
+                if (this.fieldName.getText() == null) {
+                    ionWriterForOutput.writeNull();
+                } else {
+                    ionWriterForOutput.writeString(this.fieldName.getText());
+                }
+                ionWriterForOutput.setFieldName("import_location");
+                ionWriterForOutput.writeNull();
+                ionWriterForOutput.stepOut();
+            }
+
+            if (this.annotations != null && this.annotations.length > 0) {
+                ionWriterForOutput.setFieldName("annotations");
+                ionWriterForOutput.stepIn(IonType.LIST);
+                for (SymbolToken annotation : this.annotations) {
+                    ionWriterForOutput.stepIn(IonType.STRUCT);
+                    ionWriterForOutput.setFieldName("text");
+                    String text = annotation.getText();
+                    if (text == null) {
+                        ionWriterForOutput.writeNull();
+                        ionWriterForOutput.setFieldName("import_location");
+                        ionWriterForOutput.writeNull();
+                    } else {
+                        ionWriterForOutput.writeString(text);
+                    }
+                    ionWriterForOutput.stepOut();
+                }
+                ionWriterForOutput.stepOut();
+            }
+
+            if (this.value != null) {
+                String valueText;
+                byte[] valueBinary;
+                try (
+                        ByteArrayOutputStream textOut = new ByteArrayOutputStream();
+                        IonWriter textWriter = IonTextWriterBuilder.standard().build(textOut);
+                        ByteArrayOutputStream binaryOut = new ByteArrayOutputStream();
+                        IonWriter binaryWriter = IonBinaryWriterBuilder.standard().build(binaryOut);
+                ) {
+                    //write Text
+                    this.value.writeTo(textWriter);
+                    textWriter.finish();
+                    valueText = textOut.toString("utf-8");
+
+                    ionWriterForOutput.setFieldName("value_text");
+                    ionWriterForOutput.writeString(valueText);
+
+                    //write binary
+                    this.value.writeTo(binaryWriter);
+                    binaryWriter.finish();
+                    valueBinary = binaryOut.toByteArray();
+
+                    ionWriterForOutput.setFieldName("value_binary");
+                    ionWriterForOutput.stepIn(IonType.LIST);
+                    for (byte b : valueBinary) {
+                        ionWriterForOutput.writeInt(b & 0xff);
+                    }
+                    ionWriterForOutput.stepOut();
+                }
+            }
+
+            if (this.imports != null && this.imports.length > 0) {
+                ionWriterForOutput.setFieldName("imports");
+                ionWriterForOutput.stepIn(IonType.LIST);
+                for (ImportDescriptor anImport : this.imports) {
+                    ionWriterForOutput.stepIn(IonType.STRUCT);
+                    ionWriterForOutput.setFieldName("name");
+                    ionWriterForOutput.writeString(anImport.getImportName());
+                    ionWriterForOutput.setFieldName("version");
+                    ionWriterForOutput.writeInt(anImport.getVersion());
+                    ionWriterForOutput.setFieldName("max_id");
+                    ionWriterForOutput.writeInt(anImport.getMaxId());
+                    ionWriterForOutput.stepOut();
+                }
+                ionWriterForOutput.stepOut();
+            }
+
+            if (this.depth != -1) {
+                ionWriterForOutput.setFieldName("depth");
+                ionWriterForOutput.writeInt(this.depth);
+            }
+
+            ionWriterForOutput.stepOut();
+
+        //event index + 1 if we write OutputStream successfully.
+        return eventIndex + 1;
+    }
+
+    public EventType getEventType() {
+        return eventType;
+    }
+
+    public IonType getIonType() {
+        return ionType;
+    }
+
+    public SymbolToken getFieldName() {
+        return fieldName;
+    }
+
+    public SymbolToken[] getAnnotations() {
+        return annotations;
+    }
+
+    public ImportDescriptor[] getImports() {
+        return imports;
+    }
+
+    public int getDepth() {
+        return depth;
+    }
+
+    public IonValue getValue() {
+        return value;
+    }
+}
diff --git a/ion-java-cli/src/com/amazon/tools/events/EventType.java b/ion-java-cli/src/com/amazon/tools/events/EventType.java
new file mode 100644
index 0000000000..2fa801152b
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/events/EventType.java
@@ -0,0 +1,9 @@
+package com.amazon.tools.events;
+
+public enum EventType {
+    CONTAINER_START,
+    CONTAINER_END,
+    SCALAR,
+    SYMBOL_TABLE,
+    STREAM_END,
+}
diff --git a/ion-java-cli/src/com/amazon/tools/events/ImportDescriptor.java b/ion-java-cli/src/com/amazon/tools/events/ImportDescriptor.java
new file mode 100644
index 0000000000..f64f74cd1a
--- /dev/null
+++ b/ion-java-cli/src/com/amazon/tools/events/ImportDescriptor.java
@@ -0,0 +1,33 @@
+package com.amazon.tools.events;
+
+import com.amazon.ion.SymbolTable;
+
+public class ImportDescriptor {
+    private final String importName;
+    private final int maxId;
+    private final int version;
+
+    public ImportDescriptor(String importName, int maxId, int version) {
+        this.importName = importName;
+        this.maxId = maxId;
+        this.version = version;
+    }
+
+    public ImportDescriptor(SymbolTable symbolTable) {
+        this.importName = symbolTable.getName();
+        this.maxId = symbolTable.getMaxId();
+        this.version = symbolTable.getVersion();
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public int getMaxId() {
+        return maxId;
+    }
+
+    public String getImportName() {
+        return importName;
+    }
+}

From 2f734a4cdcc6d0598fcf209e6e3158049eb1d497 Mon Sep 17 00:00:00 2001
From: Eric Chen <cheqianh@amazon.com>
Date: Thu, 10 Sep 2020 18:25:16 -0700
Subject: [PATCH 106/490] Implements version command for ion-java-cli.

---
 ion-java-cli/src/com/amazon/tools/cli/CommandType.java | 3 ++-
 ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java  | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ion-java-cli/src/com/amazon/tools/cli/CommandType.java b/ion-java-cli/src/com/amazon/tools/cli/CommandType.java
index c2168bcc25..4ee74e658b 100644
--- a/ion-java-cli/src/com/amazon/tools/cli/CommandType.java
+++ b/ion-java-cli/src/com/amazon/tools/cli/CommandType.java
@@ -2,5 +2,6 @@
 
 public enum CommandType {
     PROCESS,
-    COMPARE
+    COMPARE,
+    VERSION
 }
diff --git a/ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java b/ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java
index 59086f3b54..e54965af60 100644
--- a/ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java
+++ b/ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java
@@ -42,6 +42,7 @@
 import java.util.regex.Pattern;
 
 public class IonJavaCli {
+    private static final String VERSION = "1.0";
     private static final int CONSOLE_WIDTH = 120; // Only used for formatting the USAGE message
     private static final int USAGE_ERROR_EXIT_CODE = 1;
     private static final int IO_ERROR_EXIT_CODE = 2;
@@ -75,6 +76,11 @@ public static void main(final String[] args) {
             System.exit(USAGE_ERROR_EXIT_CODE);
         }
 
+        if (commandType == CommandType.VERSION) {
+            System.err.println(VERSION);
+            System.exit(0);
+        }
+
         ProcessContext processContext = commandType == CommandType.PROCESS ? new ProcessContext(null, -1,
                 null, ErrorType.READ, null) : null;
         try (

From 16cb1460e7da04c63b56d87248d0b22f37f450b1 Mon Sep 17 00:00:00 2001
From: Eric Chen <cheqianh@amazon.com>
Date: Thu, 10 Sep 2020 18:51:38 -0700
Subject: [PATCH 107/490] Adds travis logic to check ion-java-cli version.

---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c40e335f83..8be4b80dfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,10 @@ jdk:
   - oraclejdk8
   - oraclejdk9
 
-script: mvn test
+script:
+ - mvn test
+ - mvn package -f ion-java-cli/pom.xml
+ - java -jar ion-java-cli/target/ion-java-cli-1.0.jar version
 
 jobs:
   include:

From 16c1da3e7c6f1dcc3087a1e5a5c7f3ca98e6b9ad Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 9 Oct 2020 13:44:42 -0700
Subject: [PATCH 108/490] Fixes bug #318 in the binary reader's implementation
 of IonReader.getBytes.

---
 .../amazon/ion/impl/IonReaderBinaryRawX.java  |  6 +----
 test/com/amazon/ion/streaming/ReaderTest.java | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
index 5bbc543503..656000c3aa 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
@@ -737,16 +737,12 @@ public int readBytes(byte[] buffer, int offset, int len)
         if (offset < 0 || len < 0) {
             throw new IllegalArgumentException();
         }
-        int value_len = byteSize(); // again validation
-        if (_value_lob_remaining > len) {
-            len = _value_lob_remaining;
-        }
         if (len < 1) {
             return 0;
         }
         int read_len;
         try {
-            read_len = read(buffer, offset, value_len);
+            read_len = read(buffer, offset, len);
             _value_lob_remaining -= read_len;
         }
         catch (IOException e) {
diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/test/com/amazon/ion/streaming/ReaderTest.java
index 50ba1ab6d5..04c18a3cfb 100644
--- a/test/com/amazon/ion/streaming/ReaderTest.java
+++ b/test/com/amazon/ion/streaming/ReaderTest.java
@@ -371,6 +371,28 @@ public void testSkippingLobInStruct()
         testSkippingLob("{a:1, b:{ c:", "}}");
     }
 
+    @Test
+    public void testReadLobUsingGetBytes() throws Exception
+    {
+        if (!myReaderMaker.sourceIsBinary()) {
+            // TODO text implements getBytes() differently: https://github.com/amzn/ion-java/issues/319
+            return;
+        }
+        String data = "{{\"abcdefghijklmnopqrstuvwxyz\"}}";
+        byte[] partialBuffer = new byte[10];
+        read(data);
+        assertEquals(IonType.CLOB, in.next());
+        int remaining = in.byteSize();
+        assertEquals(26, remaining);
+        StringBuilder value = new StringBuilder();
+        while (remaining > 0) {
+            int bytesRead = in.getBytes(partialBuffer, 0, partialBuffer.length);
+            remaining -= bytesRead;
+            value.append(new String(partialBuffer, 0, bytesRead, "UTF-8"));
+        }
+        assertEquals("abcdefghijklmnopqrstuvwxyz", value.toString());
+    }
+
     @Test
     public void testGetSymbolTableBeforeFirstValue()
     {

From 7f590bb4d24d530303c41edee6a5bd51a391b84c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2020 13:49:10 -0700
Subject: [PATCH 109/490] Bump junit from 4.12 to 4.13.1 (#322)

Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e2b56980a5..1e9097b005 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,7 +73,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 37f48737061d0274c360f39c1dd4af918894b89c Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Tue, 27 Oct 2020 16:41:30 -0700
Subject: [PATCH 110/490] Avoids repetitive reallocation of
 PooledBlockAllocatorProvider in _PrivateIon_HashTrampoline.

---
 src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java b/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
index a54da159a1..aea1e31a78 100644
--- a/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
+++ b/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
@@ -28,10 +28,12 @@
 @Deprecated
 public class _PrivateIon_HashTrampoline
 {
+    private static final PooledBlockAllocatorProvider ALLOCATOR_PROVIDER = new PooledBlockAllocatorProvider();
+    
     public static IonWriter newIonWriter(ByteArrayOutputStream baos) throws IOException
     {
         return new IonRawBinaryWriter(
-                new PooledBlockAllocatorProvider(),
+                ALLOCATOR_PROVIDER,
                 _Private_IonManagedBinaryWriterBuilder.DEFAULT_BLOCK_SIZE,
                 baos,
                 AbstractIonWriter.WriteValueOptimization.NONE,

From 69e62f618fbf4f5d4068aca5e7dc6d4ec777b34d Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Thu, 29 Oct 2020 18:43:47 -0700
Subject: [PATCH 111/490] Adds ion-test-driver analysis to Github Actions.
 (#325)

---
 .github/ISSUE_TEMPLATE.md  |  6 +++
 .github/workflows/main.yml | 80 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000000..1e2141d9e3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,6 @@
+---
+title: Ion-test-driver issue.
+labels: bug
+---
+Ion-test-driver complained that behavior changed for the commit {{ env.GITHUB_PR_SHA }} created by `{{ payload.sender.login }}`.
+Refer to the [workflow]({{ env.GITHUB_WORKFLOW_URL }}) for more details. 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000000..64ec69e087
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,80 @@
+name: ion-test-driver
+
+on: [pull_request]
+
+jobs:
+  ion-test-driver:
+    runs-on: macos-10.15
+    steps:
+      - name: Checkout ion-java
+        uses: actions/checkout@master
+        with:
+          repository: amzn/ion-java
+          ref: master
+          path: ion-java
+
+      - name: Get main branch HEAD sha
+        run: cd ion-java && echo "sha=`git rev-parse --short HEAD`" >> $GITHUB_ENV
+
+      - name: Checkout ion-test-driver
+        uses: actions/checkout@master
+        with:
+          repository: amzn/ion-test-driver
+          ref: master
+          path: ion-test-driver
+
+      - name: Set up python3 env
+        run: python3 -m venv ion-test-driver/venv && . ion-test-driver/venv/bin/activate
+
+      - name: Pip install
+        run: pip3 install -r ion-test-driver/requirements.txt && pip3 install -e ion-test-driver
+
+      - name: Run ion-test-driver
+        run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -o output
+          -i ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }}
+
+      - name: Upload result
+        uses: actions/upload-artifact@v2
+        with:
+          name: ion-test-driver-result.ion
+          path: output/results/ion-test-driver-results.ion
+
+      - name: showing result
+        run: cat output/results/ion-test-driver-results.ion
+
+      - name: Analyze two implementations
+        continue-on-error: true
+        id: result-diff
+        run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -R
+          ion-java,https://github.com/amzn/ion-java,$sha
+          ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }}
+          output/results/ion-test-driver-results.ion
+
+      - name: Upload analysis report
+        uses: actions/upload-artifact@v2
+        with:
+          name: analysis-report.ion
+          path: result.ion
+
+      - name: showing report
+        run: cat result.ion
+
+      - name: Check if ion-test-driver fails
+        if: ${{ steps.result-diff.outcome == 'failure' }}
+        run: echo 'Implementation behavior changed, Refer to the analysis report in the previous step for the reason.' && exit 1
+
+  open-issue:
+    runs-on: ubuntu-latest
+    needs: ion-test-driver
+    if: ${{ failure() }}
+    steps:
+      - uses: actions/checkout@master
+      - name: Open an issue
+        uses: JasonEtco/create-an-issue@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_WORKFLOW_URL: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
+          GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha }}
+        with:
+          assignees: ${{ github.event.sender.login }}
+

From b967c4f0c11cfecf2aa875de18e6e5cbf4c347c3 Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Wed, 4 Nov 2020 11:51:27 -0800
Subject: [PATCH 112/490] Migrated Travis CI to Github Actions.

---
 .github/workflows/ion-test-driver.yml |  80 +++++++++++++++++++
 .github/workflows/main.yml            | 106 ++++++++++----------------
 .travis.yml                           |  31 --------
 3 files changed, 119 insertions(+), 98 deletions(-)
 create mode 100644 .github/workflows/ion-test-driver.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
new file mode 100644
index 0000000000..64ec69e087
--- /dev/null
+++ b/.github/workflows/ion-test-driver.yml
@@ -0,0 +1,80 @@
+name: ion-test-driver
+
+on: [pull_request]
+
+jobs:
+  ion-test-driver:
+    runs-on: macos-10.15
+    steps:
+      - name: Checkout ion-java
+        uses: actions/checkout@master
+        with:
+          repository: amzn/ion-java
+          ref: master
+          path: ion-java
+
+      - name: Get main branch HEAD sha
+        run: cd ion-java && echo "sha=`git rev-parse --short HEAD`" >> $GITHUB_ENV
+
+      - name: Checkout ion-test-driver
+        uses: actions/checkout@master
+        with:
+          repository: amzn/ion-test-driver
+          ref: master
+          path: ion-test-driver
+
+      - name: Set up python3 env
+        run: python3 -m venv ion-test-driver/venv && . ion-test-driver/venv/bin/activate
+
+      - name: Pip install
+        run: pip3 install -r ion-test-driver/requirements.txt && pip3 install -e ion-test-driver
+
+      - name: Run ion-test-driver
+        run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -o output
+          -i ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }}
+
+      - name: Upload result
+        uses: actions/upload-artifact@v2
+        with:
+          name: ion-test-driver-result.ion
+          path: output/results/ion-test-driver-results.ion
+
+      - name: showing result
+        run: cat output/results/ion-test-driver-results.ion
+
+      - name: Analyze two implementations
+        continue-on-error: true
+        id: result-diff
+        run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -R
+          ion-java,https://github.com/amzn/ion-java,$sha
+          ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }}
+          output/results/ion-test-driver-results.ion
+
+      - name: Upload analysis report
+        uses: actions/upload-artifact@v2
+        with:
+          name: analysis-report.ion
+          path: result.ion
+
+      - name: showing report
+        run: cat result.ion
+
+      - name: Check if ion-test-driver fails
+        if: ${{ steps.result-diff.outcome == 'failure' }}
+        run: echo 'Implementation behavior changed, Refer to the analysis report in the previous step for the reason.' && exit 1
+
+  open-issue:
+    runs-on: ubuntu-latest
+    needs: ion-test-driver
+    if: ${{ failure() }}
+    steps:
+      - uses: actions/checkout@master
+      - name: Open an issue
+        uses: JasonEtco/create-an-issue@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_WORKFLOW_URL: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
+          GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha }}
+        with:
+          assignees: ${{ github.event.sender.login }}
+
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 64ec69e087..4f4d7d7917 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,80 +1,52 @@
-name: ion-test-driver
+name: build
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
-on: [pull_request]
 
 jobs:
-  ion-test-driver:
-    runs-on: macos-10.15
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 9, 10, 11]
     steps:
-      - name: Checkout ion-java
-        uses: actions/checkout@master
+      - uses: actions/checkout@v2
         with:
-          repository: amzn/ion-java
-          ref: master
-          path: ion-java
-
-      - name: Get main branch HEAD sha
-        run: cd ion-java && echo "sha=`git rev-parse --short HEAD`" >> $GITHUB_ENV
-
-      - name: Checkout ion-test-driver
-        uses: actions/checkout@master
+          submodules: recursive
+      - name: Use java ${{ matrix.java }}
+        uses: actions/setup-java@v1
         with:
-          repository: amzn/ion-test-driver
-          ref: master
-          path: ion-test-driver
-
-      - name: Set up python3 env
-        run: python3 -m venv ion-test-driver/venv && . ion-test-driver/venv/bin/activate
+          java-version: ${{ matrix.java }}
+      - run: mvn test
+      - run: mvn package -f ion-java-cli/pom.xml
+      - run: java -jar ion-java-cli/target/ion-java-cli-1.0.jar version
 
-      - name: Pip install
-        run: pip3 install -r ion-test-driver/requirements.txt && pip3 install -e ion-test-driver
-
-      - name: Run ion-test-driver
-        run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -o output
-          -i ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }}
-
-      - name: Upload result
-        uses: actions/upload-artifact@v2
+  report-generation:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
         with:
-          name: ion-test-driver-result.ion
-          path: output/results/ion-test-driver-results.ion
-
-      - name: showing result
-        run: cat output/results/ion-test-driver-results.ion
-
-      - name: Analyze two implementations
-        continue-on-error: true
-        id: result-diff
-        run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -R
-          ion-java,https://github.com/amzn/ion-java,$sha
-          ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }}
-          output/results/ion-test-driver-results.ion
-
-      - name: Upload analysis report
-        uses: actions/upload-artifact@v2
+          submodules: recursive
+      - name: Use java 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - run: mvn test site
+      - uses: codecov/codecov-action@v1
         with:
-          name: analysis-report.ion
-          path: result.ion
+          file: target/site/jacoco/jacoco.xml
+      - name: deploy gh-pages
+        if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' }}
+        uses: JamesIves/github-pages-deploy-action@3.7.1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: "./target/site"
 
-      - name: showing report
-        run: cat result.ion
 
-      - name: Check if ion-test-driver fails
-        if: ${{ steps.result-diff.outcome == 'failure' }}
-        run: echo 'Implementation behavior changed, Refer to the analysis report in the previous step for the reason.' && exit 1
 
-  open-issue:
-    runs-on: ubuntu-latest
-    needs: ion-test-driver
-    if: ${{ failure() }}
-    steps:
-      - uses: actions/checkout@master
-      - name: Open an issue
-        uses: JasonEtco/create-an-issue@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_WORKFLOW_URL: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
-          GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha }}
-        with:
-          assignees: ${{ github.event.sender.login }}
 
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8be4b80dfb..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-sudo: false
-language: java
-dist: trusty
-jdk:
-  - openjdk8
-  - openjdk9
-  - openjdk10
-  - openjdk11
-  - oraclejdk8
-  - oraclejdk9
-
-script:
- - mvn test
- - mvn package -f ion-java-cli/pom.xml
- - java -jar ion-java-cli/target/ion-java-cli-1.0.jar version
-
-jobs:
-  include:
-    stage: report generation
-    jdk: openjdk11
-    script: mvn test site
-    after_success:
-      - bash <(curl -s https://codecov.io/bash)
-    deploy:
-      provider: pages
-      local-dir: "./target/site/"
-      skip-cleanup: true
-      github-token: "$GITHUB_TOKEN"
-      keep-history: true # keeps commit history of gh-pages branch
-      on:
-        branch: master

From b6fd73b73494c44a4d15e1f5eebaf188b1ff29fc Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Thu, 5 Nov 2020 15:19:20 -0800
Subject: [PATCH 113/490] Fixed async main branch change issue for
 ion-test-driver GitHub Actions.

---
 .github/workflows/ion-test-driver.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 64ec69e087..e45619c3c4 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,9 +13,6 @@ jobs:
           ref: master
           path: ion-java
 
-      - name: Get main branch HEAD sha
-        run: cd ion-java && echo "sha=`git rev-parse --short HEAD`" >> $GITHUB_ENV
-
       - name: Checkout ion-test-driver
         uses: actions/checkout@master
         with:
@@ -29,6 +26,9 @@ jobs:
       - name: Pip install
         run: pip3 install -r ion-test-driver/requirements.txt && pip3 install -e ion-test-driver
 
+      - name: Get main branch HEAD sha
+        run: cd ion-java && echo `git rev-parse --short HEAD` && echo "sha=`git rev-parse --short HEAD`" >> $GITHUB_ENV
+
       - name: Run ion-test-driver
         run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -o output
           -i ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }}

From 44e476fd9eef8b52d899f54011f857907c1ce567 Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Fri, 6 Nov 2020 16:41:05 -0800
Subject: [PATCH 114/490] Prepare new release 1.8.0

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b8b6a280df..f218f99764 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.7.1</version>
+  <version>1.8.0</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 1e9097b005..c6731ce47e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.7.2-SNAPSHOT</version>
+  <version>1.8.0</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 8742dc8c417ec0911eed8c34870a369b2a4fcc44 Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Mon, 9 Nov 2020 18:09:42 -0800
Subject: [PATCH 115/490] Prepare 1.8.1-SNAPSHOT.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c6731ce47e..00f65d9701 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.0</version>
+  <version>1.8.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From f218c9534b70edd8956c0004ef9bb290ce78dac0 Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Thu, 19 Nov 2020 11:51:46 -0800
Subject: [PATCH 116/490] Removed issue template.

---
 .github/{ISSUE_TEMPLATE.md => ion-test-driver-issue.md} | 0
 .github/workflows/ion-test-driver.yml                   | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename .github/{ISSUE_TEMPLATE.md => ion-test-driver-issue.md} (100%)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ion-test-driver-issue.md
similarity index 100%
rename from .github/ISSUE_TEMPLATE.md
rename to .github/ion-test-driver-issue.md
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index e45619c3c4..0690c6db30 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -77,4 +77,4 @@ jobs:
           GITHUB_PR_SHA: ${{ github.event.pull_request.head.sha }}
         with:
           assignees: ${{ github.event.sender.login }}
-
+          filename: .github/ion-test-driver-issue.md

From d0656e8856bfb1c0695eecebae03141ae10e3990 Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Mon, 30 Nov 2020 16:11:51 -0800
Subject: [PATCH 117/490] Matched Ion-test-driver spec (Ion-test-driver issue
 #15).

---
 .github/workflows/ion-test-driver.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 0690c6db30..206e8a3d7c 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -27,7 +27,11 @@ jobs:
         run: pip3 install -r ion-test-driver/requirements.txt && pip3 install -e ion-test-driver
 
       - name: Get main branch HEAD sha
-        run: cd ion-java && echo `git rev-parse --short HEAD` && echo "sha=`git rev-parse --short HEAD`" >> $GITHUB_ENV
+        run: cd ion-java && echo `git rev-parse --short=7 HEAD` && echo "main=`git rev-parse --short=7 HEAD`" >> $GITHUB_ENV
+
+      - name: Get current commit sha
+        run: cd ion-java && echo `git rev-parse --short=7 ${{ github.event.pull_request.head.sha }}`
+          && echo "cur=`git rev-parse --short=7 ${{ github.event.pull_request.head.sha }}`" >> $GITHUB_ENV
 
       - name: Run ion-test-driver
         run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -o output
@@ -46,9 +50,7 @@ jobs:
         continue-on-error: true
         id: result-diff
         run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -R
-          ion-java,https://github.com/amzn/ion-java,$sha
-          ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }}
-          output/results/ion-test-driver-results.ion
+          ion-java,$main ion-java,$cur output/results/ion-test-driver-results.ion
 
       - name: Upload analysis report
         uses: actions/upload-artifact@v2

From 30536fbee0cf93d7b21c1702cf4ba6df6a58965e Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Wed, 2 Dec 2020 17:45:04 -0800
Subject: [PATCH 118/490] Using --replace option in GH Actions to avoid
 ion-test-driver async issue.

---
 .github/workflows/ion-test-driver.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 206e8a3d7c..e39846aed3 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -36,6 +36,7 @@ jobs:
       - name: Run ion-test-driver
         run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -o output
           -i ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }}
+          --replace ion-java,https://github.com/amzn/ion-java.git,$main
 
       - name: Upload result
         uses: actions/upload-artifact@v2

From 34ddd09fc92db6f203b9748fd5fec16e227bb6a9 Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Fri, 26 Mar 2021 14:27:27 -0700
Subject: [PATCH 119/490] Catches exception of unknown SIDs that bigger than
 INT_MAX. (#349)

---
 src/com/amazon/ion/impl/IonTokenConstsX.java |  7 ++++++-
 test/com/amazon/ion/LoaderTest.java          | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/com/amazon/ion/impl/IonTokenConstsX.java b/src/com/amazon/ion/impl/IonTokenConstsX.java
index c361606636..33a8e8e365 100644
--- a/src/com/amazon/ion/impl/IonTokenConstsX.java
+++ b/src/com/amazon/ion/impl/IonTokenConstsX.java
@@ -513,7 +513,12 @@ public static int decodeSid(CharSequence sidToken)
         assert length > 1;
 
         String digits = sidToken.subSequence(1, length).toString();
-        return Integer.parseInt(digits);
+
+        try {
+            return Integer.parseInt(digits);
+        } catch (Exception e) {
+            throw new IonException(String.format("Unable to parse SID %s", digits), e);
+        }
     }
 
     static public int keyword(CharSequence word, int start_word, int end_word)
diff --git a/test/com/amazon/ion/LoaderTest.java b/test/com/amazon/ion/LoaderTest.java
index fc020077a4..ff936a6a04 100644
--- a/test/com/amazon/ion/LoaderTest.java
+++ b/test/com/amazon/ion/LoaderTest.java
@@ -160,6 +160,17 @@ public void testIgnoreHeaderSymbol()
         checkInt(123, value);
     }
 
+    @Test
+    public void testLargeSidSymbol()
+    {
+        String text = "$11111111111111";
+
+        // it's supposed to throw an IonException since sid is greater than INT_MAX.
+        try {
+            IonSymbol value = (IonSymbol) loadOneValue(text);
+            Assert.fail("Expected IonException to be thrown.");
+        } catch (IonException ignore) { /* expected to reach here */ }
+    }
 
     private static class FailingInputStream extends InputStream
     {

From 858a566ac9f2212b99237138e6b8b00e1dc87350 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Fri, 2 Apr 2021 17:05:50 -0700
Subject: [PATCH 120/490] =?UTF-8?q?Add=20options=20to=20configure=20whethe?=
 =?UTF-8?q?r=20each=20top=20level=20value=20should=20be=20on=20a=20?=
 =?UTF-8?q?=E2=80=A6=20(#351)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add options to configure whether each top level value should be on a new line and what line separator should be used
---
 .../amazon/ion/impl/IonWriterSystemText.java  |  36 +++--
 .../impl/_Private_IonTextWriterBuilder.java   |  15 +-
 .../ion/system/IonTextWriterBuilder.java      | 137 ++++++++++++++++++
 src/com/amazon/ion/util/IonTextUtils.java     |  21 +++
 test/com/amazon/ion/impl/TextWriterTest.java  |  94 ++++++++++++
 5 files changed, 279 insertions(+), 24 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonWriterSystemText.java b/src/com/amazon/ion/impl/IonWriterSystemText.java
index 0e78e95ccd..0cbb85942a 100644
--- a/src/com/amazon/ion/impl/IonWriterSystemText.java
+++ b/src/com/amazon/ion/impl/IonWriterSystemText.java
@@ -66,7 +66,7 @@ class IonWriterSystemText
      */
     private boolean _following_long_string;
 
-    int         _separator_character;
+    CharSequence _separator_character;
 
     int         _top;
     int []      _stack_parent_type = new int[10];
@@ -89,12 +89,7 @@ protected IonWriterSystemText(SymbolTable defaultSystemSymtab,
                                                        options.getCharset());
         _options = options;
 
-        if (_options.isPrettyPrintOn()) {
-            _separator_character = '\n';
-        }
-        else {
-            _separator_character = ' ';
-        }
+        _separator_character = _options.topLevelSeparator();
 
         int threshold = _options.getLongStringThreshold();
         if (threshold < 1) threshold = Integer.MAX_VALUE;
@@ -151,14 +146,14 @@ void push(int typeid)
         _stack_pending_comma[_top] = _pending_separator;
         switch (typeid) {
         case _Private_IonConstants.tidSexp:
-            _separator_character = ' ';
+            _separator_character = " ";
             break;
         case _Private_IonConstants.tidList:
         case _Private_IonConstants.tidStruct:
-            _separator_character = ',';
+            _separator_character = ",";
             break;
         default:
-            _separator_character = _options.isPrettyPrintOn() ? '\n' : ' ';
+            _separator_character = _options.lineSeparator();
         break;
         }
         _top++;
@@ -182,21 +177,24 @@ int pop() {
         int parentid = (_top > 0) ? _stack_parent_type[_top - 1] : -1;
         switch (parentid) {
         case -1:
+            _in_struct = false;
+            _separator_character = _options.topLevelSeparator();
+            break;
         case _Private_IonConstants.tidSexp:
             _in_struct = false;
-            _separator_character = ' ';
+            _separator_character = " ";
             break;
         case _Private_IonConstants.tidList:
             _in_struct = false;
-            _separator_character = ',';
+            _separator_character = ",";
             break;
         case _Private_IonConstants.tidStruct:
             _in_struct = true;
-            _separator_character = ',';
+            _separator_character = ",";
             break;
         default:
-            _separator_character = _options.isPrettyPrintOn() ? '\n' : ' ';
-        break;
+            _separator_character = _options.lineSeparator();
+            break;
         }
 
         return typeid;
@@ -337,17 +335,17 @@ boolean writeSeparator(boolean followingLongString)
         throws IOException
     {
         if (_options.isPrettyPrintOn()) {
-            if (_pending_separator && _separator_character > ' ') {
+            if (_pending_separator && !IonTextUtils.isAllWhitespace(_separator_character)) {
                 // Only bother if the separator is non-whitespace.
-                _output.appendAscii((char)_separator_character);
+                _output.appendAscii(_separator_character);
                 followingLongString = false;
             }
             _output.appendAscii(_options.lineSeparator());
             printLeadingWhiteSpace();
         }
         else if (_pending_separator) {
-            _output.appendAscii((char)_separator_character);
-            if (_separator_character > ' ') followingLongString = false;
+            _output.appendAscii(_separator_character);
+            if (!IonTextUtils.isAllWhitespace(_separator_character)) followingLongString = false;
         }
         return followingLongString;
     }
diff --git a/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java b/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
index 5c94c62556..971aeb5bc5 100644
--- a/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
+++ b/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
@@ -34,10 +34,6 @@ public class _Private_IonTextWriterBuilder
     extends IonTextWriterBuilder
 {
     private final static CharSequence SPACE_CHARACTER = " ";
-    // TODO amzn/ion-java/issues/57 decide if this should be platform-specific
-    private final static CharSequence LINE_SEPARATOR =
-        System.getProperty("line.separator");
-
 
     public static _Private_IonTextWriterBuilder standard()
     {
@@ -148,13 +144,17 @@ final boolean isPrettyPrintOn()
     final CharSequence lineSeparator()
     {
         if (_pretty_print) {
-            return LINE_SEPARATOR;
+            return getNewLineType().getCharSequence();
         }
         else {
             return SPACE_CHARACTER;
         }
     }
 
+    final CharSequence topLevelSeparator()
+    {
+        return getWriteTopLevelValuesOnNewLines() ? getNewLineType().getCharSequence() : lineSeparator();
+    }
 
     //=========================================================================
 
@@ -173,6 +173,11 @@ private _Private_IonTextWriterBuilder fillDefaults()
             b.setCharset(UTF8);
         }
 
+        if (b.getNewLineType() == null)
+        {
+            b.setNewLineType(NewLineType.PLATFORM_DEPENDENT);
+        }
+
         return (_Private_IonTextWriterBuilder) b.immutable();
     }
 
diff --git a/src/com/amazon/ion/system/IonTextWriterBuilder.java b/src/com/amazon/ion/system/IonTextWriterBuilder.java
index daa90ff689..3f201c6137 100644
--- a/src/com/amazon/ion/system/IonTextWriterBuilder.java
+++ b/src/com/amazon/ion/system/IonTextWriterBuilder.java
@@ -113,6 +113,38 @@ public enum LstMinimizing
      */
     public static final Charset UTF8 = _Private_Utils.UTF8_CHARSET;
 
+    /**
+     * Represents common new-line separators that are valid in Ion.
+     *
+     * Unicode defines several characters that can represent a new line, but only carriage return (CR) and linefeed (LF) are valid whitespace in Ion.
+     * Using other new-line characters (such as {@code NEL}) will result in printing invalid Ion.
+     */
+    public enum NewLineType {
+        /**
+         * A carriage return and linefeed ({@code U+000D} followed by {@code U+000A}).
+         */
+        CRLF("\r\n"),
+        /**
+         * A single linefeed ({@code U+000A}).
+         */
+        LF("\n"),
+        /**
+         * The new-line separator specified in the "line.separator" system property.
+         * Using this will result in writing invalid Ion if the platform uses anything other than CR and/or LF as the line separator
+         * <i>and</i> the IonTextWriter is configured to use pretty printing or to write each top-level value on a separate line.
+         */
+        PLATFORM_DEPENDENT(System.getProperty("line.separator"));
+
+        private final CharSequence charSequence;
+
+        NewLineType(CharSequence cs) {
+            this.charSequence = cs;
+        }
+
+        public CharSequence getCharSequence() {
+            return charSequence;
+        }
+    }
 
     /**
      * The standard builder of text {@link IonWriter}s, with all configuration
@@ -187,6 +219,8 @@ public static IonTextWriterBuilder json()
     private IvmMinimizing myIvmMinimizing;
     private LstMinimizing myLstMinimizing;
     private int myLongStringThreshold;
+    private NewLineType myNewLineType;
+    private boolean myTopLevelValuesOnNewLines;
 
 
     /** NOT FOR APPLICATION USE! */
@@ -204,6 +238,8 @@ protected IonTextWriterBuilder(IonTextWriterBuilder that)
         this.myIvmMinimizing        = that.myIvmMinimizing;
         this.myLstMinimizing        = that.myLstMinimizing;
         this.myLongStringThreshold  = that.myLongStringThreshold;
+        this.myNewLineType          = that.myNewLineType;
+        this.myTopLevelValuesOnNewLines = that.myTopLevelValuesOnNewLines;
     }
 
 
@@ -626,6 +662,107 @@ public final IonTextWriterBuilder withLongStringThreshold(int threshold)
 
     //=========================================================================
 
+    /**
+     * Gets the character sequence that will be written as a line separator.
+     * The default is {@link NewLineType#PLATFORM_DEPENDENT}
+     *
+     * @return the character sequence to be written between top-level values; null means the default should be used.
+     *
+     * @see #setNewLineType(NewLineType)
+     * @see #withNewLineType(NewLineType)
+     */
+    public final NewLineType getNewLineType()
+    {
+        return myNewLineType;
+    }
+
+    /**
+     * Sets the character sequence that will be written as a line separator.
+     * The default is {@link NewLineType#PLATFORM_DEPENDENT}
+     *
+     * @param newLineType the character sequence to be written between top-level values; null means the default should be used.
+     *
+     * @see #getNewLineType()
+     * @see #withNewLineType(NewLineType)
+     *
+     * @throws UnsupportedOperationException if this is immutable.
+     */
+    public void setNewLineType(NewLineType newLineType)
+    {
+        mutationCheck();
+        this.myNewLineType = newLineType;
+    }
+
+    /**
+     * Declares the character sequence that will be written as a line separator.
+     * The default is {@link NewLineType#PLATFORM_DEPENDENT}
+     *
+     * @param newLineType the character sequence to be written between top-level values; null means the default should be used.
+     *
+     * @see #getNewLineType()
+     * @see #setNewLineType(NewLineType)
+     *
+     * @return this instance, if mutable;
+     * otherwise a mutable copy of this instance.
+     */
+    public final IonTextWriterBuilder withNewLineType(NewLineType newLineType)
+    {
+        IonTextWriterBuilder b = mutable();
+        b.setNewLineType(newLineType);
+        return b;
+    }
+
+    //=========================================================================
+
+    /**
+     * Gets whether each top level value for standard printing should start on a new line. The default value is {@code false}.
+     * When false, the IonTextWriter will insert a single space character (U+0020) between top-level values.
+     * When pretty-printing, this setting is ignored; the pretty printer will always start top-level values on a new line.
+     *
+     * @return value indicating whether standard printing will insert a newline between top-level values
+     *
+     * @see #setWriteTopLevelValuesOnNewLines(boolean)
+     * @see #withWriteTopLevelValuesOnNewLines(boolean)
+     */
+    public final boolean getWriteTopLevelValuesOnNewLines()
+    {
+        return myTopLevelValuesOnNewLines;
+    }
+
+    /**
+     * Sets whether each top level value for standard printing should start on a new line. The default value is {@code false}.
+     * When false, the IonTextWriter will insert a single space character (U+0020) between top-level values.
+     * When pretty-printing, this setting is ignored; the pretty printer will always start top-level values on a new line.
+     *
+     * @param writeTopLevelValuesOnNewLines value indicating whether standard printing will insert a newline between top-level values
+     *
+     * @see #getWriteTopLevelValuesOnNewLines()
+     * @see #withWriteTopLevelValuesOnNewLines(boolean)
+     */
+    public void setWriteTopLevelValuesOnNewLines(boolean writeTopLevelValuesOnNewLines)
+    {
+        mutationCheck();
+        myTopLevelValuesOnNewLines = writeTopLevelValuesOnNewLines;
+    }
+
+    /**
+     * Declares whether each top level value for standard printing should start on a new line. The default value is {@code false}.
+     * When false, the IonTextWriter will insert a single space character (U+0020) between top-level values.
+     * When pretty-printing, this setting is ignored; the pretty printer will always start top-level values on a new line.
+     *
+     * @param writeTopLevelValuesOnNewLines value indicating whether standard printing will insert a newline between top-level values
+     *
+     * @see #getWriteTopLevelValuesOnNewLines()
+     * @see #setWriteTopLevelValuesOnNewLines(boolean)
+     */
+    public final IonTextWriterBuilder withWriteTopLevelValuesOnNewLines(boolean writeTopLevelValuesOnNewLines)
+    {
+        IonTextWriterBuilder b = mutable();
+        b.setWriteTopLevelValuesOnNewLines(writeTopLevelValuesOnNewLines);
+        return b;
+    }
+
+    //=========================================================================
 
     /**
      * Creates a new writer that will write text to the given output
diff --git a/src/com/amazon/ion/util/IonTextUtils.java b/src/com/amazon/ion/util/IonTextUtils.java
index 47e0d17326..afc997db7e 100644
--- a/src/com/amazon/ion/util/IonTextUtils.java
+++ b/src/com/amazon/ion/util/IonTextUtils.java
@@ -67,6 +67,27 @@ public static boolean isWhitespace(int codePoint)
         }
     }
 
+    /**
+     * Ion whitespace is defined as one of the characters space, tab, newline,
+     * and carriage-return.  This matches the definition of whitespace used by
+     * JSON.
+     *
+     * @param charSequence the CharSequence to test.
+     * @return {@code true} if {@code charSequence} consists entirely of the four legal
+     * Ion whitespace characters.
+     *
+     * @see #isWhitespace(int)
+     * @see <a href="http://tools.ietf.org/html/rfc4627">RFC 4627</a>
+     */
+    public static boolean isAllWhitespace(CharSequence charSequence) {
+        for (int i = 0; i < charSequence.length(); i++) {
+            if (!IonTextUtils.isWhitespace(Character.codePointAt(charSequence, i))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     /**
      * Determines whether a given code point is one of the valid Ion numeric
      * terminators.
diff --git a/test/com/amazon/ion/impl/TextWriterTest.java b/test/com/amazon/ion/impl/TextWriterTest.java
index ba57d634bf..1b3445e423 100644
--- a/test/com/amazon/ion/impl/TextWriterTest.java
+++ b/test/com/amazon/ion/impl/TextWriterTest.java
@@ -334,6 +334,100 @@ public void testJsonSystemMinimization()
         assertEquals("\"fred_1\" \"fred_1\"", outputString());
     }
 
+    @Test
+    public void testWritingTopLevelValuesOnNewLinesWithoutPrettyPrint()
+    {
+        IonTextWriterBuilder writerBuilder = IonTextWriterBuilder.standard()
+                .withInitialIvmHandling(SUPPRESS)
+                .withWriteTopLevelValuesOnNewLines(true)
+                .withNewLineType(IonTextWriterBuilder.NewLineType.LF);
+
+        IonDatagram dg = system().newDatagram();
+        dg.add().newString("Foo");
+        dg.add().newSymbol("Bar");
+        dg.add().newSexp(new int[]{1, 2, 3});
+        dg.add().newList(new int[]{4, 5, 6});
+        IonStruct struct = dg.add().newEmptyStruct();
+        struct.add("def").newInt(42);
+        struct.addTypeAnnotation("abc");
+
+        StringBuilder sb = new StringBuilder();
+        IonWriter writer = writerBuilder.build(sb);
+        dg.writeTo(writer);
+        assertEquals("\"Foo\"\nBar\n(1 2 3)\n[4,5,6]\nabc::{def:42}", sb.toString());
+    }
+
+    @Test
+    public void testWritingTopLevelValuesOnNewLinesShouldHaveNoEffectWithPrettyPrint()
+    {
+        // Setting top-level newlines to false should have no effect when pretty printing.
+        IonTextWriterBuilder writerBuilder = IonTextWriterBuilder.standard()
+                .withInitialIvmHandling(SUPPRESS)
+                .withWriteTopLevelValuesOnNewLines(false)
+                .withPrettyPrinting()
+                .withNewLineType(IonTextWriterBuilder.NewLineType.LF);
+
+        IonDatagram dg = system().newDatagram();
+        dg.add().newString("Foo");
+        dg.add().newSymbol("Bar");
+        dg.add().newSexp(new int[]{1, 2, 3});
+        dg.add().newList(new int[]{4, 5, 6});
+
+        StringBuilder sb = new StringBuilder();
+        IonWriter writer = writerBuilder.build(sb);
+        dg.writeTo(writer);
+        assertEquals("\n\"Foo\"\nBar\n(\n  1\n  2\n  3\n)\n[\n  4,\n  5,\n  6\n]", sb.toString());
+    }
+    
+    @Test
+    public void testNewLineTypesWithPrettyPrinting()
+    {
+        for (IonTextWriterBuilder.NewLineType nlt : IonTextWriterBuilder.NewLineType.values()) {
+            String expected = String.format("%s\"Foo\"%<sBar%<s(%<s  1%<s  2%<s  3%<s)%<s[%<s  4,%<s  5,%<s  6%<s]", nlt.getCharSequence());
+
+            IonTextWriterBuilder writerBuilder = IonTextWriterBuilder.standard()
+                    .withInitialIvmHandling(SUPPRESS)
+                    .withWriteTopLevelValuesOnNewLines(false)
+                    .withPrettyPrinting()
+                    .withNewLineType(nlt);
+
+            IonDatagram dg = system().newDatagram();
+            dg.add().newString("Foo");
+            dg.add().newSymbol("Bar");
+            dg.add().newSexp(new int[]{1, 2, 3});
+            dg.add().newList(new int[]{4, 5, 6});
+
+            StringBuilder sb = new StringBuilder();
+            IonWriter writer = writerBuilder.build(sb);
+            dg.writeTo(writer);
+            assertEquals(expected, sb.toString());
+        }
+    }
+
+    @Test
+    public void testNewLineTypesWithStandardPrinting()
+    {
+        for (IonTextWriterBuilder.NewLineType nlt : IonTextWriterBuilder.NewLineType.values()) {
+            String expected = String.format("\"Foo\"%sBar%<s(1 2 3)%<s[4,5,6]", nlt.getCharSequence());
+
+            IonTextWriterBuilder writerBuilder = IonTextWriterBuilder.standard()
+                    .withInitialIvmHandling(SUPPRESS)
+                    .withWriteTopLevelValuesOnNewLines(true)
+                    .withNewLineType(nlt);
+
+            IonDatagram dg = system().newDatagram();
+            dg.add().newString("Foo");
+            dg.add().newSymbol("Bar");
+            dg.add().newSexp(new int[]{1, 2, 3});
+            dg.add().newList(new int[]{4, 5, 6});
+
+            StringBuilder sb = new StringBuilder();
+            IonWriter writer = writerBuilder.build(sb);
+            dg.writeTo(writer);
+            assertEquals(expected, sb.toString());
+        }
+    }
+
     @Test
     public void testWritingLongClobs()
         throws Exception

From 3ed233131ff011a86c6aa8b723852c3bcb112a4a Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Mon, 5 Apr 2021 16:09:21 -0700
Subject: [PATCH 121/490] preparing release 1.8.1

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f218f99764..82eb2b9ad0 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.0</version>
+  <version>1.8.1</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 00f65d9701..89b23c719a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.1-SNAPSHOT</version>
+  <version>1.8.1</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 0d06a61dd2904bdb0ba1427b0007193d9f0f41cc Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Wed, 7 Apr 2021 12:46:56 -0700
Subject: [PATCH 122/490] Bumps version to 1.8.2-SNAPSHOT (#353)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 89b23c719a..9a7eb74b6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.1</version>
+  <version>1.8.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 0eb62ba92633f03e9f3175bb77f1b3214fcc1cdd Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 7 Apr 2021 14:45:24 -1000
Subject: [PATCH 123/490] Updates the ion-tests submodule to c125f57.

---
 ion-tests | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ion-tests b/ion-tests
index 05ecd5de78..c125f571d2 160000
--- a/ion-tests
+++ b/ion-tests
@@ -1 +1 @@
-Subproject commit 05ecd5de78ac6244826cd4e77bae932925c966c1
+Subproject commit c125f571d2b459e0e610eac5ca11900bd3b6d493

From abd3d7f4c0f8ddd940f8095f6290dc767546ef6a Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Fri, 30 Apr 2021 12:58:36 -0700
Subject: [PATCH 124/490] Fixes unexpected assertion error.

---
 src/com/amazon/ion/impl/IonUTF8.java      |  3 +++
 test/com/amazon/ion/IonExceptionTest.java | 20 ++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/src/com/amazon/ion/impl/IonUTF8.java b/src/com/amazon/ion/impl/IonUTF8.java
index 4b1c718bc0..f0980b78c2 100644
--- a/src/com/amazon/ion/impl/IonUTF8.java
+++ b/src/com/amazon/ion/impl/IonUTF8.java
@@ -378,6 +378,9 @@ public final static int getScalarFromBytes(byte[] bytes, int offset, int maxLeng
     }
 
     public final static boolean needsSurrogateEncoding(int unicodeScalar) {
+        if (unicodeScalar > Character.MAX_CODE_POINT) {
+            throw new IonException("Invalid encoding: encountered non-Unicode character.");
+        }
         return (unicodeScalar > MAXIMUM_UTF16_1_CHAR_CODE_POINT);
     }
     public final static char highSurrogate(int unicodeScalar) {
diff --git a/test/com/amazon/ion/IonExceptionTest.java b/test/com/amazon/ion/IonExceptionTest.java
index dd7c18b089..52c40caa12 100644
--- a/test/com/amazon/ion/IonExceptionTest.java
+++ b/test/com/amazon/ion/IonExceptionTest.java
@@ -15,11 +15,15 @@
 
 package com.amazon.ion;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
+
+import com.amazon.ion.system.IonSystemBuilder;
 import org.junit.Test;
 
 
@@ -100,4 +104,20 @@ public void testCauseOfTypeWithCycle()
         IonException ion = new IonException(ie1);
         assertNull(ion.causeOfType(IOException.class));
     }
+
+    @Test
+    public void testCauseOfWrongEncoding() {
+        try {
+            byte[] bytes_input = new byte[]{
+                    (byte) 0x27, (byte) 0x31, (byte) -0xB, (byte) 0x31, (byte) 0x31, (byte) 0x31, (byte) 0x27};
+
+            IonSystemBuilder.standard().build().newLoader().load(bytes_input);
+        } catch (IonException e) {
+            // The exception should be caught here
+            assertEquals(e.getMessage(), "Invalid encoding: encountered non-Unicode character.");
+            return;
+        } catch (Exception ignore) {}
+
+        fail();
+    }
 }

From 45234885de653eae67db4d8d3ccb6bb85bb82fd9 Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Wed, 19 May 2021 19:17:19 -0400
Subject: [PATCH 125/490] Adds IonSystem field to IonContainerLite (#361)

All IonValueLite subclasses implement `getSystem()` by delegating
that call to their internal `_context` field, which represents the
parent value. The context will then delegate to its own context,
and this process repeats up the tree until the top level is found.
In deeply nested data, this linear search becomes especially expensive.

The `getSystem()` method is widely used. Among other examples, it is
called several times per add() operation on a container.

This commit modifies IonContainerLite (the abstract base class for
IonStructLite and IonSequenceLite) by adding an IonSystem field
that is populated at instantiation time. Storing this reference
guarantees that calls to `getSystem()` can always be resolved by
either the current value or its immediate parent container.

Fixes #360.

Co-authored-by: Zack Slayton <zslayton@amazon.com>
---
 .../amazon/ion/impl/lite/IonContainerLite.java    | 15 +++++++++++++++
 src/com/amazon/ion/impl/lite/IonStructLite.java   |  4 ++--
 src/com/amazon/ion/impl/lite/IonValueLite.java    |  4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/com/amazon/ion/impl/lite/IonContainerLite.java b/src/com/amazon/ion/impl/lite/IonContainerLite.java
index 4efdd23dbb..e0276329a7 100644
--- a/src/com/amazon/ion/impl/lite/IonContainerLite.java
+++ b/src/com/amazon/ion/impl/lite/IonContainerLite.java
@@ -40,16 +40,25 @@ abstract class IonContainerLite
     protected int            _child_count;
     protected IonValueLite[] _children;
     protected int            structuralModificationCount;
+    // IonValueLite delegates calls to getSystem() to the parent context. If the value is deeply nested, the
+    // the parent will delegate the call to getSystem() to its own parent context. This delegation repeats until
+    // the top level is reached. This linear walk to the root of the DOM can be very expensive.
+    // As an optimization, each container holds a reference to its parent's IonSystem and overrides IonValueLite's
+    // implementation of getSystem(). Scalar IonValueLite implementations will continue to delegate to the parent
+    // context, but the parent context will always be able to provide the IonSystem without further delegation.
+    protected IonSystemLite  ionSystem;
 
     protected IonContainerLite(ContainerlessContext context, boolean isNull)
     {
         // we'll let IonValueLite handle this work as we always need to know
         // our context and if we should start out as a null value or not
         super(context, isNull);
+        this.ionSystem = context.getSystem();
     }
 
     IonContainerLite(IonContainerLite existing, IonContext context, boolean isStruct) {
         super(existing, context);
+        this.ionSystem = existing.getSystem();
         boolean retainingSIDs = false;
         int childCount = existing._child_count;
         this._child_count = childCount;
@@ -88,6 +97,12 @@ protected IonContainerLite(ContainerlessContext context, boolean isNull)
         }
     }
 
+    // See the comment on the `ionSystem` member field for more information.
+    @Override
+    public IonSystemLite getSystem() {
+        return ionSystem;
+    }
+
     @Override
     public abstract void accept(ValueVisitor visitor) throws Exception;
 
diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/com/amazon/ion/impl/lite/IonStructLite.java
index 2f0afd334c..e8864163ba 100644
--- a/src/com/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStructLite.java
@@ -460,7 +460,7 @@ public boolean add(IonValue child)
 
     public ValueFactory add(final String fieldName)
     {
-        return new _Private_CurriedValueFactory(_context.getSystem())
+        return new _Private_CurriedValueFactory(getSystem())
         {
             @Override
             protected void handle(IonValue newValue)
@@ -531,7 +531,7 @@ public void add(SymbolToken fieldName, IonValue child)
 
     public ValueFactory put(final String fieldName)
     {
-        return new _Private_CurriedValueFactory(_context.getSystem())
+        return new _Private_CurriedValueFactory(getSystem())
         {
             @Override
             protected void handle(IonValue newValue)
diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
index 8c58a0dd7b..598c4a0a6a 100644
--- a/src/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -633,7 +633,7 @@ public SymbolTable getSymbolTable()
         if (symbols != null) {
             return symbols;
         }
-        return _context.getSystem().getSystemSymbolTable();
+        return getSystem().getSystemSymbolTable();
     }
 
     public SymbolTable getAssignedSymbolTable()
@@ -651,7 +651,7 @@ public IonSystemLite getSystem()
 
     public IonType getType()
     {
-        throw new UnsupportedOperationException("this type "+this.getClass().getSimpleName()+" should not be instanciated, there is not IonType associated with it");
+        throw new UnsupportedOperationException("this type "+this.getClass().getSimpleName()+" should not be instantiated, there is not IonType associated with it");
     }
 
     public SymbolToken[] getTypeAnnotationSymbols()

From f4e2e6b7b715a2e46bfa82c7ab047cfdc3de3efc Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Mon, 24 May 2021 17:06:45 -0400
Subject: [PATCH 126/490] Makes the PooledBlockAllocatorProvider a singleton
 (#363)

Makes the PooledBlockAllocatorProvider a singleton

Many applications need to initialize IonWriters repeatedly for
short-lived tasks. For example, a webserver might create a new
IonWriter for each HTTP response that it needs to write. In such
cases, the bulk of the compute time needed to serialize the
response data is often spent initializing the byte array buffer
backing the IonWriter rather than performing the write logic itself.

Each time that a (e.g.) binary IonWriter is initialized, a new
PooledBlockAllocatorProvider (PBAP) is initialized with it to dole
out new byte array buffers. It attempts to reuse these byte arrays
wherever possible during its lifespan. Unfortunately, the PBAP only
lives as long as the IonWriter itself. If a new IonWriter is created,
a new PBAP (and therefore new byte arrays) are created as well.

This change modifies the PooledBlockAllocatorProvider (which was
already thread-safe) to be a globally shared singleton. This makes
repeatedly initializing new IonWriters substantially cheaper.
---
 .../impl/bin/PooledBlockAllocatorProvider.java    | 15 ++++++++++++---
 .../ion/impl/bin/_PrivateIon_HashTrampoline.java  |  2 +-
 .../_Private_IonManagedBinaryWriterBuilder.java   |  2 +-
 .../bin/PooledBlockAllocatorProviderTest.java     |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java b/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
index cbd30ae76a..b3d58e2c5f 100644
--- a/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
+++ b/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
@@ -20,8 +20,9 @@
 import java.util.concurrent.ConcurrentMap;
 
 /**
- * A simple pooling implementation of {@link BlockAllocatorProvider} with a global thread-safe free block list
+ * A singleton implementation of {@link BlockAllocatorProvider} offering a thread-safe free block list
  * for each block size.
+ *
  * <p>
  * This implementation is thread-safe.
  */
@@ -32,7 +33,7 @@
      * <p>
      * This implementation is thread-safe.
      */
-    private final class PooledBlockAllocator extends BlockAllocator
+    private static final class PooledBlockAllocator extends BlockAllocator
     {
         private final int blockSize, blockLimit;
         private final ConcurrentLinkedQueue<Block> freeBlocks;
@@ -76,13 +77,21 @@ public int getBlockSize()
         public void close() {}
     }
 
+    // A globally shared instance of the PooledBlockAllocatorProvider.
+    // This instance allows BlockAllocators to be re-used across instantiations of classes like
+    // the binary Ion writer, thereby avoiding costly array initializations.
+    private static final PooledBlockAllocatorProvider INSTANCE = new PooledBlockAllocatorProvider();
     private final ConcurrentMap<Integer, BlockAllocator> allocators;
 
-    public PooledBlockAllocatorProvider()
+    private PooledBlockAllocatorProvider()
     {
         allocators = new ConcurrentHashMap<Integer, BlockAllocator>();
     }
 
+    public static PooledBlockAllocatorProvider getInstance() {
+        return INSTANCE;
+    }
+
     @Override
     public BlockAllocator vendAllocator(final int blockSize)
     {
diff --git a/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java b/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
index aea1e31a78..6d3537c1f6 100644
--- a/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
+++ b/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
@@ -28,7 +28,7 @@
 @Deprecated
 public class _PrivateIon_HashTrampoline
 {
-    private static final PooledBlockAllocatorProvider ALLOCATOR_PROVIDER = new PooledBlockAllocatorProvider();
+    private static final PooledBlockAllocatorProvider ALLOCATOR_PROVIDER = PooledBlockAllocatorProvider.getInstance();
     
     public static IonWriter newIonWriter(ByteArrayOutputStream baos) throws IOException
     {
diff --git a/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java b/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
index b439d160a1..35d87e118a 100644
--- a/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
+++ b/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
@@ -52,7 +52,7 @@ public enum AllocatorMode
             @Override
             BlockAllocatorProvider createAllocatorProvider()
             {
-                return new PooledBlockAllocatorProvider();
+                return PooledBlockAllocatorProvider.getInstance();
             }
         },
         BASIC
diff --git a/test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java b/test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
index 97ccef5546..807f8d142b 100644
--- a/test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
+++ b/test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
@@ -30,7 +30,7 @@ public class PooledBlockAllocatorProviderTest
     @Before
     public void setup()
     {
-        provider = new PooledBlockAllocatorProvider();
+        provider = PooledBlockAllocatorProvider.getInstance();
     }
 
     @After

From 7e4baa6d9a5c4dd76273a6d677c7d22e4efdd6d6 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 26 May 2021 14:46:31 -0700
Subject: [PATCH 127/490] Prepares version 1.8.2 for release.

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 82eb2b9ad0..f6ec39d438 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.1</version>
+  <version>1.8.2</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 9a7eb74b6b..302e454473 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.2-SNAPSHOT</version>
+  <version>1.8.2</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 23a7f457c5f5ff6587d097aa5fedb238a3c110c0 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Wed, 26 May 2021 17:41:00 -0700
Subject: [PATCH 128/490] Prepares 1.8.3-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 302e454473..3858356611 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.2</version>
+  <version>1.8.3-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 64a5b8e00423359e87a7db8d9e0b720f7196cb14 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Tue, 15 Jun 2021 15:07:56 -0700
Subject: [PATCH 129/490] Fixes handling of NaN and +/-Inf when downconverting
 to json

---
 .../amazon/ion/impl/IonWriterSystemText.java  |  2 +-
 .../ion/impl/_Private_IonTextAppender.java    | 24 ++++++---
 .../impl/_Private_IonTextWriterBuilder.java   |  6 +++
 src/com/amazon/ion/util/IonTextUtils.java     |  4 +-
 test/com/amazon/ion/impl/TextWriterTest.java  | 51 +++++++++++++++++++
 5 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonWriterSystemText.java b/src/com/amazon/ion/impl/IonWriterSystemText.java
index 0cbb85942a..4c7b2c2192 100644
--- a/src/com/amazon/ion/impl/IonWriterSystemText.java
+++ b/src/com/amazon/ion/impl/IonWriterSystemText.java
@@ -604,7 +604,7 @@ public void writeFloat(double value)
         throws IOException
     {
         startValue();
-        _output.printFloat(value);
+        _output.printFloat(_options, value);
         closeValue();
     }
 
diff --git a/src/com/amazon/ion/impl/_Private_IonTextAppender.java b/src/com/amazon/ion/impl/_Private_IonTextAppender.java
index 4e6f952615..7a15216691 100644
--- a/src/com/amazon/ion/impl/_Private_IonTextAppender.java
+++ b/src/com/amazon/ion/impl/_Private_IonTextAppender.java
@@ -798,7 +798,7 @@ else if (adjustedExponent >= -6)
     }
 
 
-    public void printFloat(double value)
+    public void printFloat(_Private_IonTextWriterBuilder _options, double value)
         throws IOException
     {
         // shortcut zero cases
@@ -815,15 +815,27 @@ public void printFloat(double value)
         }
         else if (Double.isNaN(value))
         {
-            appendAscii("nan");
+            if (_options._float_nan_and_inf_as_null) {
+                appendAscii("null");
+            } else {
+                appendAscii("nan");
+            }
         }
         else if (value == Double.POSITIVE_INFINITY)
         {
-            appendAscii("+inf");
+            if (_options._float_nan_and_inf_as_null) {
+                appendAscii("null");
+            } else {
+                appendAscii("+inf");
+            }
         }
         else if (value == Double.NEGATIVE_INFINITY)
         {
-            appendAscii("-inf");
+            if (_options._float_nan_and_inf_as_null) {
+                appendAscii("null");
+            } else {
+                appendAscii("-inf");
+            }
         }
         else
         {
@@ -846,7 +858,7 @@ else if (value == Double.NEGATIVE_INFINITY)
         }
     }
 
-    public void printFloat(Double value)
+    public void printFloat(_Private_IonTextWriterBuilder _options, Double value)
         throws IOException
     {
         if (value == null)
@@ -855,7 +867,7 @@ public void printFloat(Double value)
         }
         else
         {
-            printFloat(value.doubleValue());
+            printFloat(_options, value.doubleValue());
         }
     }
 
diff --git a/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java b/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
index 971aeb5bc5..c1fbaed8de 100644
--- a/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
+++ b/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
@@ -47,9 +47,12 @@ public static _Private_IonTextWriterBuilder standard()
     //=========================================================================
 
     private boolean _pretty_print;
+
+    // These options control whether the IonTextWriter will write standard ion or ion that is down-converted json.
     public boolean _blob_as_string;
     public boolean _clob_as_string;
     public boolean _decimal_as_float;
+    public boolean _float_nan_and_inf_as_null;
     public boolean _sexp_as_list;
     public boolean _skip_annotations;
     public boolean _string_as_json;
@@ -57,6 +60,7 @@ public static _Private_IonTextWriterBuilder standard()
     public boolean _timestamp_as_millis;
     public boolean _timestamp_as_string;
     public boolean _untyped_nulls;
+
     private _Private_CallbackBuilder _callback_builder;
 
 
@@ -73,6 +77,7 @@ private _Private_IonTextWriterBuilder(_Private_IonTextWriterBuilder that)
         this._blob_as_string      = that._blob_as_string     ;
         this._clob_as_string      = that._clob_as_string     ;
         this._decimal_as_float    = that._decimal_as_float   ;
+        this._float_nan_and_inf_as_null = that._float_nan_and_inf_as_null;
         this._sexp_as_list        = that._sexp_as_list       ;
         this._skip_annotations    = that._skip_annotations   ;
         this._string_as_json      = that._string_as_json     ;
@@ -123,6 +128,7 @@ public final IonTextWriterBuilder withJsonDowngrade()
         _clob_as_string      = true;
         // datagramAsList    = true; // TODO
         _decimal_as_float    = true;
+        _float_nan_and_inf_as_null = true;
         _sexp_as_list        = true;
         _skip_annotations    = true;
         // skipSystemValues  = true; // TODO
diff --git a/src/com/amazon/ion/util/IonTextUtils.java b/src/com/amazon/ion/util/IonTextUtils.java
index afc997db7e..089aa4a89a 100644
--- a/src/com/amazon/ion/util/IonTextUtils.java
+++ b/src/com/amazon/ion/util/IonTextUtils.java
@@ -876,7 +876,7 @@ public static void printFloat(Appendable out, double value)
     {
         _Private_IonTextAppender appender =
             _Private_IonTextAppender.forAppendable(out);
-        appender.printFloat(value);
+        appender.printFloat(STANDARD, value);
     }
 
     public static String printFloat(double value)
@@ -900,7 +900,7 @@ public static void printFloat(Appendable out, Double value)
     {
         _Private_IonTextAppender appender =
             _Private_IonTextAppender.forAppendable(out);
-        appender.printFloat(value);
+        appender.printFloat(STANDARD, value);
     }
 
     public static String printFloat(Double value)
diff --git a/test/com/amazon/ion/impl/TextWriterTest.java b/test/com/amazon/ion/impl/TextWriterTest.java
index 1b3445e423..1601c3e79e 100644
--- a/test/com/amazon/ion/impl/TextWriterTest.java
+++ b/test/com/amazon/ion/impl/TextWriterTest.java
@@ -487,6 +487,57 @@ public void testWritingJsonLongClobs()
         assertEquals("\"a\\\"'\\nc\\u007f\"", actual);
     }
 
+    @Test
+    public void testWritingFloatNanToJson()
+            throws Exception
+    {
+        options = IonTextWriterBuilder.json();
+        options.setInitialIvmHandling(SUPPRESS);
+
+        IonDatagram dg = system().newDatagram();
+        dg.add().newFloat(Double.NaN);
+
+        iw = makeWriter();
+        dg.writeTo(iw);
+
+        String actual = outputString();
+        assertEquals("null", actual);
+    }
+
+    @Test
+    public void testWritingFloatPositiveInfinityToJson()
+            throws Exception
+    {
+        options = IonTextWriterBuilder.json();
+        options.setInitialIvmHandling(SUPPRESS);
+
+        IonDatagram dg = system().newDatagram();
+        dg.add().newFloat(Double.POSITIVE_INFINITY);
+
+        iw = makeWriter();
+        dg.writeTo(iw);
+
+        String actual = outputString();
+        assertEquals("null", actual);
+    }
+
+    @Test
+    public void testWritingFloatNegativeInfinityToJson()
+            throws Exception
+    {
+        options = IonTextWriterBuilder.json();
+        options.setInitialIvmHandling(SUPPRESS);
+
+        IonDatagram dg = system().newDatagram();
+        dg.add().newFloat(Double.NEGATIVE_INFINITY);
+
+        iw = makeWriter();
+        dg.writeTo(iw);
+
+        String actual = outputString();
+        assertEquals("null", actual);
+    }
+
     @Test
     public void testSuppressInitialIvm()
         throws Exception

From ca85095f497f19846544acc48a54fd2fb6ac428a Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Wed, 16 Jun 2021 17:42:24 -0400
Subject: [PATCH 130/490] Makes `writeValueRecursively` iterative (#368)

* Makes `writeValueRecursively` iterative

The method `_Private_IonWriterBase#writeValueRecursively` is
recursive in two senses:

1. It visits all of the children in the provided IonReader's
   current value recursively.
2. The method itself is implemented using recursion.

This patch modifies the implementation (#2) to be iterative,
eliminating a source of StackOverflowExceptions and offering
a modest reduction in CPU cost.

* Tweaked javadoc, removed parameter.

* Fixed comment.

Co-authored-by: Zack Slayton <zslayton@amazon.com>
---
 .../amazon/ion/impl/IonWriterUserBinary.java  |   2 +-
 .../ion/impl/_Private_IonWriterBase.java      | 199 ++++++++++--------
 2 files changed, 110 insertions(+), 91 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonWriterUserBinary.java b/src/com/amazon/ion/impl/IonWriterUserBinary.java
index 8d9a7823dd..ae1c072f3b 100644
--- a/src/com/amazon/ion/impl/IonWriterUserBinary.java
+++ b/src/com/amazon/ion/impl/IonWriterUserBinary.java
@@ -105,7 +105,7 @@ public void writeValue(IonReader reader)
 
         // From here on, we won't call back into this method, so we won't
         // bother doing all those checks again.
-        writeValueRecursively(type, reader);
+        writeValueRecursively(reader);
     }
 
 
diff --git a/src/com/amazon/ion/impl/_Private_IonWriterBase.java b/src/com/amazon/ion/impl/_Private_IonWriterBase.java
index 82802d938a..1aa806ec67 100644
--- a/src/com/amazon/ion/impl/_Private_IonWriterBase.java
+++ b/src/com/amazon/ion/impl/_Private_IonWriterBase.java
@@ -44,10 +44,6 @@ public abstract class _Private_IonWriterBase
     static final String ERROR_FINISH_NOT_AT_TOP_LEVEL =
         "IonWriter.finish() can only be called at top-level.";
 
-    private static final boolean _debug_on = false;
-
-
-
     /**
      * Returns the current depth of containers the writer is at.  This is
      * 0 if the writer is at top-level.
@@ -329,7 +325,6 @@ private final void write_value_field_name_helper(IonReader reader)
             }
 
             setFieldNameSymbol(tok);
-            if (_debug_on) System.out.print(":");
         }
     }
 
@@ -340,7 +335,6 @@ private final void write_value_annotations_helper(IonReader reader)
         // because local symtab diversion leaves the $ion_symbol_table
         // dangling on the system writer!  TODO fix that, it's broken.
         setTypeAnnotationSymbols(a);
-        if (_debug_on) System.out.print(";");
     }
 
 
@@ -355,101 +349,126 @@ public boolean isStreamCopyOptimized()
     public void writeValue(IonReader reader) throws IOException
     {
         // TODO this should do symtab optimization as per writeValues()
-        IonType type = reader.getType();
-        writeValueRecursively(type, reader);
+        writeValueRecursively(reader);
     }
 
     /**
-     * Unoptimized copy. This must not recurse back to the public
-     * {@link #writeValue(IonReader)} method since that will cause the
-     * optimization test to happen repeatedly.
+     * Writes the provided IonReader's current value including any annotations. This function will not advance the
+     * IonReader beyond the end of the current value; users wishing to continue using the IonReader at the current
+     * depth will need to call {@link IonReader#next()} again.
+     *
+     * - If the IonReader is not positioned over a value (for example: because it is at the beginning or end of a
+     *   stream), then this function does nothing.
+     * - If the current value is a container, this function will visit all of its child values and write those too,
+     *   advancing the IonReader to the end of the container in the process.
+     * - If both this writer and the IonReader are in a struct, the writer will write the current value's field name.
+     * - If the writer is not in a struct but the reader is, the writer will ignore the current value's field name.
+     * - If the writer is in a struct but the IonReader is not, this function throws an IllegalStateException.
+     *
+     * @param reader       The IonReader that will provide a value to write.
+     * @throws IOException if either the provided IonReader or this writer's underlying OutputStream throw an
+     *                     IOException.
+     * @throws IllegalStateException if this writer is inside a struct but the IonReader is not.
      */
-    final void writeValueRecursively(IonType type, IonReader reader)
-        throws IOException
+    final void writeValueRecursively(IonReader reader) throws IOException
     {
-        write_value_field_name_helper(reader);
-        write_value_annotations_helper(reader);
+        // The IonReader does not need to be at the top level (getDepth()==0) when the function is called.
+        // We take note of its initial depth so we can avoid advancing the IonReader beyond the starting value.
+        int startingDepth = getDepth();
+
+        // The IonReader will be at `startingDepth` when the function is first called and then again when we
+        // have finished traversing all of its children. This boolean tracks which of those two states we are
+        // in when `getDepth() == startingDepth`.
+        boolean alreadyProcessedTheStartingValue = false;
+
+        // The IonType of the IonReader's current value.
+        IonType type;
+
+        while (true) {
+            // Each time we reach the top of the loop we are in one of three states:
+            // 1. We have not yet begun processing the starting value.
+            // 2. We are currently traversing the starting value's children.
+            // 3. We have finished processing the starting value.
+            if (getDepth() == startingDepth) {
+                // The IonReader is at the starting depth. We're either beginning our traversal or finishing it.
+                if (alreadyProcessedTheStartingValue) {
+                    // We're finishing our traversal.
+                    break;
+                }
+                // We're beginning our traversal. Don't advance the cursor; instead, use the current
+                // value's IonType.
+                type = reader.getType();
+                // We've begun processing the starting value.
+                alreadyProcessedTheStartingValue = true;
+            } else {
+                // We're traversing the starting value's children (that is: values at greater depths). We need to
+                // advance the cursor by calling next().
+                type = reader.next();
+            }
 
-        if (reader.isNullValue()) {
-            this.writeNull(type);
-        }
-        else {
-            switch (type) {
-            case NULL:
-                writeNull();
-                if (_debug_on) System.out.print("-");
-                break;
-            case BOOL:
-                writeBool(reader.booleanValue());
-                if (_debug_on) System.out.print("b");
-                break;
-            case INT:
-                writeInt(reader.bigIntegerValue());
-                if (_debug_on) System.out.print("i");
-                break;
-            case FLOAT:
-                writeFloat(reader.doubleValue());
-                if (_debug_on) System.out.print("f");
-                break;
-            case DECIMAL:
-                writeDecimal(reader.decimalValue());
-                if (_debug_on) System.out.print("d");
-                break;
-            case TIMESTAMP:
-                writeTimestamp(reader.timestampValue());
-                if (_debug_on) System.out.print("t");
-                break;
-            case STRING:
-                writeString(reader.stringValue());
-                if (_debug_on) System.out.print("$");
-                break;
-            case SYMBOL:
-                writeSymbolToken(reader.symbolValue());
-                if (_debug_on) System.out.print("y");
-                break;
-            case BLOB:
-                writeBlob(reader.newBytes());
-                if (_debug_on) System.out.print("B");
-                break;
-            case CLOB:
-                writeClob(reader.newBytes());
-                if (_debug_on) System.out.print("L");
-                break;
-            case STRUCT:
-                if (_debug_on) System.out.print("{");
-                writeContainerRecursively(IonType.STRUCT, reader);
-                if (_debug_on) System.out.print("}");
-                break;
-            case LIST:
-                if (_debug_on) System.out.print("[");
-                writeContainerRecursively(IonType.LIST, reader);
-                if (_debug_on) System.out.print("]");
-                break;
-            case SEXP:
-                if (_debug_on) System.out.print("(");
-                writeContainerRecursively(IonType.SEXP, reader);
-                if (_debug_on) System.out.print(")");
-                break;
-            default:
-                throw new IllegalStateException("Unknown value type: " + type);
+            if (type == null) {
+                // There are no more values at this level. If we're at the starting level, we're done.
+                if (getDepth() == startingDepth) {
+                    break;
+                }
+                // Otherwise, step out once and then try to move forward again.
+                reader.stepOut();
+                stepOut();
+                continue;
             }
-        }
-    }
 
-    private void writeContainerRecursively(IonType type, IonReader reader)
-        throws IOException
-    {
-        stepIn(type);
-        reader.stepIn();
-        while ((type = reader.next()) != null)
-        {
-            writeValueRecursively(type, reader);
+            // We found a value. Write out its field name and annotations, if any.
+            write_value_field_name_helper(reader);
+            write_value_annotations_helper(reader);
+
+            if (reader.isNullValue()) {
+                this.writeNull(type);
+                continue;
+            }
+
+            switch (type) {
+                case NULL:
+                    // The isNullValue() check above will handle this.
+                    throw new IllegalStateException("isNullValue() was false but IonType was NULL.");
+                case BOOL:
+                    writeBool(reader.booleanValue());
+                    break;
+                case INT:
+                    writeInt(reader.bigIntegerValue());
+                    break;
+                case FLOAT:
+                    writeFloat(reader.doubleValue());
+                    break;
+                case DECIMAL:
+                    writeDecimal(reader.decimalValue());
+                    break;
+                case TIMESTAMP:
+                    writeTimestamp(reader.timestampValue());
+                    break;
+                case STRING:
+                    writeString(reader.stringValue());
+                    break;
+                case SYMBOL:
+                    writeSymbolToken(reader.symbolValue());
+                    break;
+                case BLOB:
+                    writeBlob(reader.newBytes());
+                    break;
+                case CLOB:
+                    writeClob(reader.newBytes());
+                    break;
+                case STRUCT: // Intentional fallthrough
+                case LIST:   // Intentional fallthrough
+                case SEXP:
+                    reader.stepIn();
+                    stepIn(type);
+                    break;
+                default:
+                    throw new IllegalStateException("Unknown value type: " + type);
+            }
         }
-        reader.stepOut();
-        stepOut();
     }
 
-
     //
     //  This code handles the skipped symbol table
     //  support - it is cloned in IonReaderTextUserX,

From 4132c761cf1ee0db634af4aa90674fd3b089b13c Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Wed, 23 Jun 2021 17:21:00 -0400
Subject: [PATCH 131/490] Adds a pool of UTF8 String encoders (#369)

* Adds a pool of UTF8 String encoders

Most of the expense involved in constructing new binary writers
comes from allocating/initializing the buffers needed to encode
Java's UTF-16 Strings to UTF-8.

This change refactors the UTF-8 encoding logic into its own
class (Utf8StringEncoder) and introduces a singleton
Utf8StringEncoderPool that allows these encoders to be reused
across instantiations of binary writers.
---
 .../ion/impl/bin/IonRawBinaryWriter.java      |  93 ++--------
 .../ion/impl/bin/utf8/Utf8StringEncoder.java  | 170 ++++++++++++++++++
 .../impl/bin/utf8/Utf8StringEncoderPool.java  |  60 +++++++
 3 files changed, 242 insertions(+), 81 deletions(-)
 create mode 100644 src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java
 create mode 100644 src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java

diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 887ad9be30..4df80f7993 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -46,15 +46,13 @@
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl.bin.utf8.Utf8StringEncoder;
+import com.amazon.ion.impl.bin.utf8.Utf8StringEncoderPool;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetEncoder;
-import java.nio.charset.CoderResult;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
@@ -125,14 +123,9 @@ private static byte[] bytes(int... vals) {
 
     private static final byte VARINT_NEG_ZERO   = (byte) 0xC0;
 
-    // See IonRawBinaryWriter#writeString(String) for usage information.
-    static final int SMALL_STRING_SIZE = 4 * 1024;
-
-    // Reusable resources for encoding Strings as UTF-8 bytes
-    final CharsetEncoder utf8Encoder = Charset.forName("UTF-8").newEncoder();
-    final ByteBuffer utf8EncodingBuffer = ByteBuffer.allocate((int) (SMALL_STRING_SIZE * utf8Encoder.maxBytesPerChar()));
-    final char[] charArray = new char[SMALL_STRING_SIZE];
-    final CharBuffer reusableCharBuffer = CharBuffer.wrap(charArray);
+    final Utf8StringEncoder utf8StringEncoder = Utf8StringEncoderPool
+            .getInstance()
+            .getOrCreateUtf8Encoder();
 
     private static final byte[] makeTypedPreallocatedBytes(final int typeDesc, final int length)
     {
@@ -1443,73 +1436,10 @@ public void writeString(final String value) throws IOException
         }
         prepareValue();
 
-        /*
-         This method relies on the standard CharsetEncoder class to encode each String's UTF-16 char[] data into
-         UTF-8 bytes. Strangely, CharsetEncoders cannot operate directly on instances of a String. The CharsetEncoder
-         API requires all inputs and outputs to be specified as instances of java.nio.ByteBuffer and
-         java.nio.CharBuffer, making some number of allocations mandatory. Specifically, for each encoding operation
-         we need to have:
-
-            1. An instance of a UTF-8 CharsetEncoder.
-            2. A CharBuffer representation of the String's data.
-            3. A ByteBuffer into which the CharsetEncoder may write UTF-8 bytes.
-
-         To minimize the overhead involved, the IonRawBinaryWriter will reuse previously initialized resources wherever
-         possible. However, because CharBuffer and ByteBuffer each have a fixed length, we can only reuse them for
-         Strings that are small enough to fit. This creates two kinds of input String to encode: those that are small
-         enough for us to reuse our buffers ("small strings"), and those which are not ("large strings").
-
-         The String#getBytes(Charset) method cannot be used for two reasons:
-
-               1. It always allocates, so we cannot reuse any resources.
-               2. If/when it encounters character data that cannot be encoded as UTF-8, it simply replaces that data
-                 with a substitute character[1]. (Sometimes seen in applications as a '?'.) In order
-                 to surface invalid data to the user, the method must be able to detect these events at encoding time.
-
-            [1] https://en.wikipedia.org/wiki/Substitute_character
-        */
-
-        CharBuffer stringData;
-        ByteBuffer encodingBuffer;
-
-        int length = value.length();
-
-        // While it is possible to encode the Ion string using a fixed-size encodingBuffer, we need to be able to
-        // write the length of the complete UTF-8 string to the output stream before we write the string itself.
-        // For simplicity, we reuse or create an encodingBuffer that is large enough to hold the full string.
-
-        // In order to encode the input String, we need to pass it to CharsetEncoder as an implementation of CharBuffer.
-        // Surprisingly, the intuitive way to achieve this (the CharBuffer#wrap(CharSequence) method) adds a large
-        // amount of CPU overhead to the encoding process. Benchmarking shows that it's substantially faster
-        // to use String#getChars(int, int, char[], int) to copy the String's backing array and then call
-        // CharBuffer#wrap(char[]) on the copy.
-
-        if (length > SMALL_STRING_SIZE) {
-            // Allocate a new buffer for large strings
-            encodingBuffer = ByteBuffer.allocate((int) (value.length() * utf8Encoder.maxBytesPerChar()));
-            char[] chars = new char[value.length()];
-            value.getChars(0, value.length(), chars, 0);
-            stringData = CharBuffer.wrap(chars);
-        } else {
-            // Reuse our existing buffers for small strings
-            encodingBuffer = utf8EncodingBuffer;
-            encodingBuffer.clear();
-            stringData = reusableCharBuffer;
-            value.getChars(0, value.length(), charArray, 0);
-            reusableCharBuffer.rewind();
-            reusableCharBuffer.limit(value.length());
-        }
-
-        // Because encodingBuffer is guaranteed to be large enough to hold the encoded string, we can
-        // perform the encoding in a single call to CharsetEncoder#encode(CharBuffer, ByteBuffer, boolean).
-        CoderResult coderResult = utf8Encoder.encode(stringData, encodingBuffer, true);
-
-        // 'Underflow' is the success state of a CoderResult.
-        if (!coderResult.isUnderflow()) {
-            throw new IllegalArgumentException("Could not encode string as UTF8 bytes: " + value);
-        }
-        encodingBuffer.flip();
-        int utf8Length = encodingBuffer.remaining();
+        // UTF-8 encode the String
+        Utf8StringEncoder.Result encoderResult = utf8StringEncoder.encode(value);
+        int utf8Length = encoderResult.getEncodedLength();
+        byte[] utf8Buffer = encoderResult.getBuffer();
 
         // Write the type and length codes to the output stream.
         long previousPosition = buffer.position();
@@ -1521,7 +1451,7 @@ enough for us to reuse our buffers ("small strings"), and those which are not ("
         }
 
         // Write the encoded UTF-8 bytes to the output stream
-        buffer.writeBytes(encodingBuffer.array(), 0, utf8Length);
+        buffer.writeBytes(utf8Buffer, 0, utf8Length);
 
         long bytesWritten = buffer.position() - previousPosition;
         updateLength(bytesWritten);
@@ -1686,6 +1616,7 @@ public void close() throws IOException
             buffer.close();
             patchBuffer.close();
             allocator.close();
+            utf8StringEncoder.close();
         }
         finally
         {
diff --git a/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java b/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java
new file mode 100644
index 0000000000..d890e1beaf
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java
@@ -0,0 +1,170 @@
+package com.amazon.ion.impl.bin.utf8;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.CoderResult;
+
+/**
+ * Encodes {@link String}s to UTF-8. Instances of this class are reusable but are NOT threadsafe.
+ *
+ * Users are strongly encouraged to get instances from {@link Utf8StringEncoderPool#getOrCreateUtf8Encoder()}.
+ * {@link #encode(String)} can be called any number of times. Users are expected to call {@link #close()} when
+ * the encoder is no longer needed.
+ */
+public class Utf8StringEncoder implements Closeable {
+    // The longest String (as measured by {@link java.lang.String#length()}) that this instance can encode without
+    // requiring additional allocations.
+    private static final int SMALL_STRING_SIZE = 4 * 1024;
+
+    // Reusable resources for encoding Strings as UTF-8 bytes
+    final Utf8StringEncoderPool utf8StringEncoderPool;
+    final CharsetEncoder utf8Encoder;
+    final ByteBuffer utf8EncodingBuffer;
+    final char[] charArray;
+    final CharBuffer charBuffer;
+
+    public Utf8StringEncoder(Utf8StringEncoderPool pool) {
+        utf8StringEncoderPool = pool;
+        utf8Encoder = Charset.forName("UTF-8").newEncoder();
+        utf8EncodingBuffer = ByteBuffer.allocate((int) (SMALL_STRING_SIZE * utf8Encoder.maxBytesPerChar()));
+        charArray = new char[SMALL_STRING_SIZE];
+        charBuffer = CharBuffer.wrap(charArray);
+    }
+
+    public Utf8StringEncoder() {
+        // This instance is not associated with a Utf8StringEncoderPool
+        this(null);
+    }
+
+    /**
+     * Encodes the provided String's text to UTF-8. Unlike {@link String#getBytes(Charset)}, this method will not
+     * silently replace characters that cannot be encoded with a substitute character. Instead, it will throw
+     * an {@link IllegalArgumentException}.
+     *
+     * Some resources in the returned {@link Result} may be reused across calls to this method. Consequently,
+     * callers should use the Result and discard it immediately.
+     *
+     * @param text A Java String to encode as UTF8 bytes.
+     * @return  A {@link Result} containing a byte array of UTF-8 bytes and encoded length.
+     * @throws IllegalArgumentException if the String cannot be encoded as UTF-8.
+     */
+    public Result encode(String text) {
+        /*
+         This method relies on the standard CharsetEncoder class to encode each String's UTF-16 char[] data into
+         UTF-8 bytes. Strangely, CharsetEncoders cannot operate directly on instances of a String. The CharsetEncoder
+         API requires all inputs and outputs to be specified as instances of java.nio.ByteBuffer and
+         java.nio.CharBuffer, making some number of allocations mandatory. Specifically, for each encoding operation
+         we need to have:
+
+            1. An instance of a UTF-8 CharsetEncoder.
+            2. A CharBuffer representation of the String's data.
+            3. A ByteBuffer into which the CharsetEncoder may write UTF-8 bytes.
+
+         To minimize the overhead involved, the Utf8StringEncoder will reuse previously initialized resources wherever
+         possible. However, because CharBuffer and ByteBuffer each have a fixed length, we can only reuse them for
+         Strings that are small enough to fit. This creates two kinds of input String to encode: those that are small
+         enough for us to reuse our buffers ("small strings"), and those which are not ("large strings").
+
+         The String#getBytes(Charset) method cannot be used for two reasons:
+
+               1. It always allocates, so we cannot reuse any resources.
+               2. If/when it encounters character data that cannot be encoded as UTF-8, it simply replaces that data
+                 with a substitute character[1]. (Sometimes seen in applications as a '?'.) In order
+                 to surface invalid data to the user, the method must be able to detect these events at encoding time.
+
+            [1] https://en.wikipedia.org/wiki/Substitute_character
+        */
+
+        CharBuffer stringData;
+        ByteBuffer encodingBuffer;
+
+        int length = text.length();
+
+        // While it is technically possible to encode any String using a fixed-size encodingBuffer, we need
+        // to be able to write the length of the complete UTF-8 string to the output stream before we write the string
+        // itself. For simplicity, we reuse or create an encodingBuffer that is large enough to hold the full string.
+
+        // In order to encode the input String, we need to pass it to CharsetEncoder as an implementation of CharBuffer.
+        // Surprisingly, the intuitive way to achieve this (the CharBuffer#wrap(CharSequence) method) adds a large
+        // amount of CPU overhead to the encoding process. Benchmarking shows that it's substantially faster
+        // to use String#getChars(int, int, char[], int) to copy the String's backing array and then call
+        // CharBuffer#wrap(char[]) on the copy.
+
+        if (length > SMALL_STRING_SIZE) {
+            // Allocate a new buffer for large strings
+            encodingBuffer = ByteBuffer.allocate((int) (text.length() * utf8Encoder.maxBytesPerChar()));
+            char[] chars = new char[text.length()];
+            text.getChars(0, text.length(), chars, 0);
+            stringData = CharBuffer.wrap(chars);
+        } else {
+            // Reuse our existing buffers for small strings
+            encodingBuffer = utf8EncodingBuffer;
+            encodingBuffer.clear();
+            stringData = charBuffer;
+            text.getChars(0, text.length(), charArray, 0);
+            charBuffer.rewind();
+            charBuffer.limit(text.length());
+        }
+
+        // Because encodingBuffer is guaranteed to be large enough to hold the encoded string, we can
+        // perform the encoding in a single call to CharsetEncoder#encode(CharBuffer, ByteBuffer, boolean).
+        CoderResult coderResult = utf8Encoder.encode(stringData, encodingBuffer, true);
+
+        // 'Underflow' is the success state of a CoderResult.
+        if (!coderResult.isUnderflow()) {
+            throw new IllegalArgumentException("Could not encode string as UTF8 bytes: " + text);
+        }
+        encodingBuffer.flip();
+        int utf8Length = encodingBuffer.remaining();
+
+        // In most usages, the JVM should be able to eliminate this allocation via an escape analysis of the caller.
+        return new Result(utf8Length, encodingBuffer.array());
+    }
+
+    /**
+     * Attempts to return this instance to the Utf8StringEncoderPool with which it is associated, if any.
+     *
+     * Do not continue to use this encoder after calling this method.
+     */
+    @Override
+    public void close() {
+        if (utf8StringEncoderPool != null) {
+            utf8StringEncoderPool.returnEncoderToPool(this);
+        }
+    }
+
+    /**
+     * Represents the result of a {@link Utf8StringEncoder#encode(String)} operation.
+     */
+    public static class Result {
+        final private byte[] buffer;
+        final private int encodedLength;
+
+        public Result(int encodedLength, byte[] buffer) {
+            this.encodedLength = encodedLength;
+            this.buffer = buffer;
+        }
+
+        /**
+         * Returns a byte array containing the encoded UTF-8 bytes starting at index 0. This byte array is NOT
+         * guaranteed to be the same length as the data it contains. Callers must use {@link #getEncodedLength()}
+         * to determine the number of bytes that should be read from the byte array.
+         *
+         * @return the buffer containing UTF-8 bytes.
+         */
+        public byte[] getBuffer() {
+            return buffer;
+        }
+
+        /**
+         * @return the number of encoded bytes in the array returned by {@link #getBuffer()}.
+         */
+        public int getEncodedLength() {
+            return encodedLength;
+        }
+    }
+}
diff --git a/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java b/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java
new file mode 100644
index 0000000000..e926df4a75
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java
@@ -0,0 +1,60 @@
+package com.amazon.ion.impl.bin.utf8;
+
+import java.util.concurrent.ArrayBlockingQueue;
+
+/**
+ * A thread-safe shared pool of {@link Utf8StringEncoder}s that can be used for UTF8 encoding and decoding.
+ */
+public enum Utf8StringEncoderPool {
+    // The only enum variant; a singleton instance.
+    INSTANCE;
+
+    // The maximum number of Utf8Encoders that can be waiting in the queue before new ones will be discarded.
+    private static final int MAX_QUEUE_SIZE = 128;
+
+    // A queue of previously initialized encoders that can be loaned out.
+    private final ArrayBlockingQueue<Utf8StringEncoder> bufferQueue;
+
+    // Do not allow instantiation; all classes should share the singleton instance.
+    private Utf8StringEncoderPool() {
+        bufferQueue = new ArrayBlockingQueue<Utf8StringEncoder>(MAX_QUEUE_SIZE);
+    }
+
+    /**
+     * @return a threadsafe shared instance of {@link Utf8StringEncoderPool}.
+     */
+    public static Utf8StringEncoderPool getInstance() {
+        return INSTANCE;
+    }
+
+    /**
+     * If the pool is not empty, removes an instance of {@link Utf8StringEncoder} from the pool and returns it;
+     * otherwise, constructs a new instance.
+     *
+     * @return An instance of {@link Utf8StringEncoder}.
+     */
+    public Utf8StringEncoder getOrCreateUtf8Encoder() {
+        // The `poll` method does not block. If the queue is empty it returns `null` immediately.
+        Utf8StringEncoder encoder = bufferQueue.poll();
+        if (encoder == null) {
+            // No buffers were available in the pool. Create a new one.
+            encoder = new Utf8StringEncoder(this);
+        }
+        return encoder;
+    }
+
+    /**
+     * Adds the provided instance of {@link Utf8StringEncoder} to the pool. If the pool is full, the instance will
+     * be discarded.
+     *
+     * Callers MUST NOT use an encoder after returning it to the pool.
+     *
+     * @param encoder   A {@link Utf8StringEncoder} to add to the pool.
+     */
+    public void returnEncoderToPool(Utf8StringEncoder encoder) {
+        // The `offer` method does not block. If the queue is full, it returns `false` immediately.
+        // If the provided instance cannot be added to the pool, we discard it silently.
+        bufferQueue.offer(encoder);
+    }
+
+}

From edf7809fd579347318e63410c900fb181e332a00 Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Tue, 10 Aug 2021 15:45:51 -0700
Subject: [PATCH 132/490] Prepares version 1.8.3 for release. (#374)

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f6ec39d438..dad1504b2d 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.2</version>
+  <version>1.8.3</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 3858356611..4f7a712c56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.3-SNAPSHOT</version>
+  <version>1.8.3</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From ddaa965e45917881babe4b7277d972a997bf646e Mon Sep 17 00:00:00 2001
From: linlin-s <84819822+linlin-s@users.noreply.github.com>
Date: Tue, 10 Aug 2021 16:18:41 -0700
Subject: [PATCH 133/490] Adds GitHub workflow to detect the performance
 regression of ion-java automatically. (#373)

---
 ...n-java-performance-regression-detector.yml | 123 ++++++++++++++++++
 1 file changed, 123 insertions(+)
 create mode 100644 .github/workflows/ion-java-performance-regression-detector.yml

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
new file mode 100644
index 0000000000..6bf0cd43c5
--- /dev/null
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -0,0 +1,123 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: Ion Java performance regression detector
+
+on: [pull_request]
+
+jobs:
+  detect-regression:
+    name: Detect Regression
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+
+      - name: Checkout ion-java from the new commit.
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 2
+          submodules: recursive
+          path: ion-java
+
+      - name: Build ion-java from the new commit
+        run: cd ion-java && mvn clean install
+
+      - name: Checkout ion-java-benchmark-cli
+        uses: actions/checkout@v2
+        with:
+          repository: amzn/ion-java-benchmark-cli
+          ref: master
+          path: ion-java-benchmark-cli
+
+      - name: Build ion-java-benchmark-cli
+        run: cd ion-java-benchmark-cli && mvn clean install
+
+      - name: Check the version of ion-java.
+        run: java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar --version
+
+      - name: Generate test Ion Data
+        run: |
+          mkdir -p testData
+          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/benchmark/testStruct.isl testData/testStruct.10n
+          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/benchmark/testList.isl testData/testList.10n
+          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/benchmark/testNestedStruct.isl testData/testNestedStruct.10n
+
+      - name: Upload test Ion Data to artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: test Ion Data
+          path: testData
+
+      - name: Benchmark ion-java from the new commit
+        run: |
+          mkdir -p benchmarkResults
+          cd ion-java-benchmark-cli && java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar run-suite --test-ion-data /home/runner/work/ion-java/ion-java/testData --benchmark-options-combinations tst/com/amazon/ion/benchmark/optionsCombinations.ion /home/runner/work/ion-java/ion-java/benchmarkResults
+
+      - name: Upload benchmark results to artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Benchmark result
+          path: benchmarkResults
+
+      - name: Clean maven dependencies repository
+        run : rm -r /home/runner/.m2
+
+      - name: Build ion-java from the previous commit
+        run: cd ion-java && git checkout HEAD^ && mvn clean install
+
+      - name: Build ion-java-benchmark-cli
+        run: cd ion-java-benchmark-cli && mvn clean install
+
+      - name: Check the version of ion-java
+        run: java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar --version
+
+      - name: Create directories for test data and benchmark results
+        run: |
+          mkdir -p benchmarkResults
+          mkdir -p testData
+
+      - name: Download test Ion Data from artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: test Ion Data
+          path: testData
+
+      - name: Download benchmark results of ion-java from the new commit from artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: Benchmark result
+          path: benchmarkResults
+
+      - name: Benchmark ion-java from the previous commit and add the generated benchmark results to the existing directories
+        run: cd ion-java-benchmark-cli && java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar run-suite --test-ion-data /home/runner/work/ion-java/ion-java/testData --benchmark-options-combinations tst/com/amazon/ion/benchmark/optionsCombinations.ion /home/runner/work/ion-java/ion-java/benchmarkResults
+
+      - name: Upload new benchmark results directory to artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Benchmark result
+          path: benchmarkResults
+
+      - name: Detect performance regression
+        id: regression_result
+        run: |
+          result=true
+          cd benchmarkResults && for FILE in *; do message=$(java -jar /home/runner/work/ion-java/ion-java/ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar compare --benchmark-result-previous $FILE/previous.ion --benchmark-result-new $FILE/new.ion $FILE/report.ion | tee /dev/stderr) && if [ "$message" != "" ]; then result=false; fi; done
+          echo "::set-output name=regression-result::$result"
+          echo $result
+
+      - name: Upload comparison reports to the benchmark results directory
+        uses: actions/upload-artifact@v2
+        with:
+          name: Benchmark result
+          path: benchmarkResults
+
+      - name: Fail the workflow if regression happened
+        env:
+          regression_detect: ${{steps.regression_result.outputs.regression-result}}
+        if: ${{ env.regression_detect == 'false' }}
+        run: exit 1

From b183f250919ed7f4196a353a69ec801ca56368c1 Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Tue, 10 Aug 2021 21:50:14 -0700
Subject: [PATCH 134/490] Bumps version to 1.8.4-SNAPSHOT (#377)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4f7a712c56..eb601e57b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.3</version>
+  <version>1.8.4-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From a398b156bed8e7d110e68a7a00e4b781c3fe8138 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Tue, 7 Sep 2021 17:04:11 -0700
Subject: [PATCH 135/490] Adds a binary IonReader implementation capable of
 incremental reads. (#355)

---
 src/com/amazon/ion/BufferConfiguration.java   |  265 ++
 .../amazon/ion/IonBufferConfiguration.java    |  164 +
 src/com/amazon/ion/IonReader.java             |    6 +-
 .../ion/impl/IonReaderBinaryIncremental.java  | 1957 ++++++++++
 .../ion/impl/IonReaderLookaheadBuffer.java    |  921 +++++
 src/com/amazon/ion/impl/IonTypeID.java        |  116 +
 .../ion/impl/ReaderLookaheadBuffer.java       |   46 +
 .../ion/impl/ReaderLookaheadBufferBase.java   |  194 +
 .../ion/impl/ResizingPipedInputStream.java    |  557 +++
 src/com/amazon/ion/impl/SymbolTokenImpl.java  |   14 +-
 .../ion/impl/_Private_IonReaderFactory.java   |    7 +
 .../ion/impl/_Private_RecyclingStack.java     |   95 +
 src/com/amazon/ion/impl/_Private_Utils.java   |   13 +-
 .../ion/impl/bin/IonRawBinaryWriter.java      |   91 +-
 .../amazon/ion/impl/lite/IonDatagramLite.java |    4 +-
 .../amazon/ion/system/IonReaderBuilder.java   |  213 +-
 test/AllTests.java                            |    8 +
 ...IonReaderIteratorSystemProcessingTest.java |   35 +
 .../ion/BinaryReaderSystemProcessingTest.java |    2 +-
 .../BinaryReaderWrappedValueLengthTest.java   |    8 +-
 test/com/amazon/ion/BinaryTest.java           |   24 +-
 test/com/amazon/ion/EquivsTestCase.java       |   24 +-
 test/com/amazon/ion/GoodIonTest.java          |   18 +-
 test/com/amazon/ion/IonTestCase.java          |   50 +-
 ...adBinaryIonReaderSystemProcessingTest.java |   31 +
 test/com/amazon/ion/NopPaddingTest.java       |    2 -
 .../ion/RawValueSpanReaderBasicTest.java      |    9 +-
 test/com/amazon/ion/ReaderChecker.java        |    5 +-
 test/com/amazon/ion/ReaderMaker.java          |   29 +
 .../ion/ReaderSystemProcessingTestCase.java   |   10 -
 test/com/amazon/ion/RoundTripTest.java        |   12 +-
 .../amazon/ion/SystemProcessingTestCase.java  |   26 +-
 .../com/amazon/ion/SystemProcessingTests.java |    2 +
 test/com/amazon/ion/TestUtils.java            |   29 +
 .../impl/IonReaderBinaryIncrementalTest.java  | 3158 +++++++++++++++++
 .../impl/IonReaderLookaheadBufferTest.java    | 1197 +++++++
 .../IonReaderLookaheadBufferTestBase.java     |  679 ++++
 .../impl/ResizingPipedInputStreamTest.java    |  789 ++++
 test/com/amazon/ion/impl/SymbolTableTest.java |    4 +-
 test/com/amazon/ion/junit/IonAssert.java      |    5 +-
 .../ion/streaming/BadIonStreamingTest.java    |    3 +-
 .../ion/streaming/BinaryStreamingTest.java    |   50 +-
 .../ion/streaming/GoodIonStreamingTest.java   |    6 +-
 .../ion/streaming/ReaderFacetTestCase.java    |   13 +-
 .../ion/streaming/ReaderIntegerSizeTest.java  |   11 +-
 .../ion/streaming/ReaderSkippingTest.java     |    4 +-
 test/com/amazon/ion/streaming/ReaderTest.java |  104 +
 .../ion/streaming/RoundTripStreamingTest.java |    8 +-
 .../ion/system/IonReaderBuilderTest.java      |   80 +
 49 files changed, 10914 insertions(+), 184 deletions(-)
 create mode 100644 src/com/amazon/ion/BufferConfiguration.java
 create mode 100644 src/com/amazon/ion/IonBufferConfiguration.java
 create mode 100644 src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
 create mode 100644 src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
 create mode 100644 src/com/amazon/ion/impl/IonTypeID.java
 create mode 100644 src/com/amazon/ion/impl/ReaderLookaheadBuffer.java
 create mode 100644 src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java
 create mode 100644 src/com/amazon/ion/impl/ResizingPipedInputStream.java
 create mode 100644 src/com/amazon/ion/impl/_Private_RecyclingStack.java
 create mode 100644 test/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java
 create mode 100644 test/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java
 create mode 100644 test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
 create mode 100644 test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java
 create mode 100644 test/com/amazon/ion/impl/IonReaderLookaheadBufferTestBase.java
 create mode 100644 test/com/amazon/ion/impl/ResizingPipedInputStreamTest.java

diff --git a/src/com/amazon/ion/BufferConfiguration.java b/src/com/amazon/ion/BufferConfiguration.java
new file mode 100644
index 0000000000..31a13fd41a
--- /dev/null
+++ b/src/com/amazon/ion/BufferConfiguration.java
@@ -0,0 +1,265 @@
+package com.amazon.ion;
+
+import com.amazon.ion.impl.ReaderLookaheadBuffer;
+
+/**
+ * Provides logic common to all BufferConfiguration implementations.
+ * @param <Configuration> the type of the concrete subclass of this BufferConfiguration that is applicable to the
+ *                        ReaderLookaheadBufferBase subclass.
+ */
+public abstract class BufferConfiguration<Configuration extends BufferConfiguration<Configuration>> {
+
+    /**
+     * Functional interface for handling oversized values.
+     */
+    public interface OversizedValueHandler {
+        /**
+         * Invoked each time a value (and any symbol tables that immediately precede it) exceed the buffer size limit
+         * specified by the LookaheadReaderWrapper instance, but the symbol tables by themselves do not exceed the
+         * limit. This is recoverable. If the implementation wishes to recover, it should simply return normally from
+         * this method. The oversized value will be flushed from the input pipe; normal processing will resume with the
+         * next value. If the implementation wishes to abort processing immediately, it may throw an exception from this
+         * method. Such an exception will propagate upward and will be thrown from
+         * {@link ReaderLookaheadBuffer#fillInput()}.
+         * @throws Exception if handler logic fails.
+         */
+        void onOversizedValue() throws Exception;
+    }
+
+    /**
+     * Functional interface for reporting processed data.
+     */
+    public interface DataHandler {
+        /**
+         * Invoked whenever the bytes from a value are processed, regardless of whether the bytes are buffered or
+         * skipped due to the value being oversized.
+         * @param numberOfBytes the number of bytes processed.
+         * @throws Exception if handler logic fails.
+         */
+        void onData(int numberOfBytes) throws Exception;
+    }
+
+    /**
+     * Provides logic common to all BufferConfiguration Builder implementations.
+     * @param <Configuration> the type of BufferConfiguration.
+     * @param <BuilderType> the type of Builder that builds BufferConfiguration subclasses of type `Configuration`.
+     */
+    public static abstract class Builder<
+        Configuration extends BufferConfiguration<Configuration>,
+        BuilderType extends BufferConfiguration.Builder<Configuration, BuilderType>
+    > {
+
+        /**
+         * Large enough that most streams will never need to grow the buffer. NOTE: this only needs to be large
+         * enough to exceed the length of the longest top-level value plus any system values that precede it.
+         */
+        static final int DEFAULT_INITIAL_BUFFER_SIZE = 32 * 1024; // bytes
+
+        /**
+         * The initial size of the lookahead buffer, in bytes.
+         */
+        private int initialBufferSize = DEFAULT_INITIAL_BUFFER_SIZE;
+
+        /**
+         * The maximum number of bytes that will be buffered.
+         */
+        private int maximumBufferSize = Integer.MAX_VALUE;
+
+        /**
+         * The handler that will be notified when oversized values are encountered.
+         */
+        private OversizedValueHandler oversizedValueHandler = null;
+
+        /**
+         * The handler that will be notified when data is processed.
+         */
+        private DataHandler dataHandler = null;
+
+        /**
+         * Sets the initial size of the buffer that will be used to hold the data between top-level values. Default:
+         * 32KB.
+         *
+         * @param initialBufferSizeInBytes the value.
+         * @return this Builder.
+         */
+        public final BuilderType withInitialBufferSize(final int initialBufferSizeInBytes) {
+            initialBufferSize = initialBufferSizeInBytes;
+            return (BuilderType) this;
+        }
+
+        /**
+         * @return the initial size of the lookahead buffer, in bytes.
+         */
+        public final int getInitialBufferSize() {
+            return initialBufferSize;
+        }
+
+        /**
+         * Sets the handler that will be notified when oversized values are encountered. If the maximum buffer size is
+         * finite (see {@link #withMaximumBufferSize(int)}, this handler is required to be non-null.
+         *
+         * @param handler the handler.
+         * @return this builder.
+         */
+        public final BuilderType onOversizedValue(final OversizedValueHandler handler) {
+            oversizedValueHandler = handler;
+            return (BuilderType) this;
+        }
+
+        /**
+         * Sets the handler that will be notified when data is processed. The handler may be null, in which case the
+         * number of bytes processed will not be reported.
+         *
+         * @param handler the handler.
+         * @return this builder.
+         */
+        public final BuilderType onData(final DataHandler handler) {
+            dataHandler = handler;
+            return (BuilderType) this;
+        }
+
+        /**
+         * @return the handler that will be notified when oversized values are encountered.
+         */
+        public final OversizedValueHandler getOversizedValueHandler() {
+            return oversizedValueHandler;
+        }
+
+        /**
+         * @return the handler that will be notified when data is processed.
+         */
+        public final DataHandler getDataHandler() {
+            return dataHandler;
+        }
+
+        /**
+         * Set the maximum number of bytes between top-level values. This can be used to limit growth of the internal
+         * buffer. For binary Ion, the minimum value is 5 because all valid binary Ion data begins with a 4-byte Ion
+         * version marker and the smallest value is 1 byte. For delimited text Ion, the minimum value is 2 because the
+         * smallest text Ion value is 1 byte and the smallest delimiter is 1 byte. Default: Integer.MAX_VALUE.
+         *
+         * @param maximumBufferSizeInBytes the value.
+         * @return this builder.
+         */
+        public final BuilderType withMaximumBufferSize(final int maximumBufferSizeInBytes) {
+            maximumBufferSize = maximumBufferSizeInBytes;
+            return (BuilderType) this;
+        }
+
+        /**
+         * @return the maximum number of bytes that will be buffered.
+         */
+        public int getMaximumBufferSize() {
+            return maximumBufferSize;
+        }
+
+        /**
+         * Gets the minimum allowed maximum buffer size.
+         * @return the value.
+         */
+        public abstract int getMinimumMaximumBufferSize();
+
+        /**
+         * @return the no-op {@link OversizedValueHandler} for the type of BufferConfiguration that this Builder builds.
+         */
+        public abstract OversizedValueHandler getNoOpOversizedValueHandler();
+
+        /**
+         * @return the no-op {@link DataHandler} for the type of BufferConfiguration that this Builder builds.
+         */
+        public abstract DataHandler getNoOpDataHandler();
+
+        /**
+         * Creates a new BufferConfiguration from the Builder's current settings.
+         * @return a new instance.
+         */
+        public abstract Configuration build();
+    }
+
+    /**
+     * The initial size of the lookahead buffer, in bytes.
+     */
+    private final int initialBufferSize;
+
+    /**
+     * The maximum number of bytes that will be buffered.
+     */
+    private final int maximumBufferSize;
+
+    /**
+     * The handler that will be notified when oversized values are encountered.
+     */
+    private final OversizedValueHandler oversizedValueHandler;
+
+    /**
+     * The handler that will be notified when data is processed.
+     */
+    private final DataHandler dataHandler;
+
+    /**
+     * Constructs an instance from the given Builder.
+     * @param builder the builder containing the settings to apply to the new configuration.
+     */
+    protected BufferConfiguration(Builder<Configuration, ?> builder) {
+        initialBufferSize = builder.getInitialBufferSize();
+        maximumBufferSize = builder.getMaximumBufferSize();
+        if (initialBufferSize > maximumBufferSize) {
+            throw new IllegalArgumentException("Initial buffer size may not exceed the maximum buffer size.");
+        }
+        if (maximumBufferSize < builder.getMinimumMaximumBufferSize()) {
+            throw new IllegalArgumentException(String.format(
+                "Maximum buffer size must be at least %d bytes.", builder.getMinimumMaximumBufferSize()
+            ));
+        }
+        if (builder.getOversizedValueHandler() == null) {
+            requireUnlimitedBufferSize();
+            oversizedValueHandler = builder.getNoOpOversizedValueHandler();
+        } else {
+            oversizedValueHandler = builder.getOversizedValueHandler();
+        }
+        if (builder.getDataHandler() == null) {
+            dataHandler = builder.getNoOpDataHandler();
+        } else {
+            dataHandler = builder.getDataHandler();
+        }
+    }
+
+    /**
+     * Requires that the maximum buffer size not be limited.
+     */
+    protected void requireUnlimitedBufferSize() {
+        if (maximumBufferSize < Integer.MAX_VALUE) {
+            throw new IllegalArgumentException(
+                "Must specify an OversizedValueHandler when a maximum buffer size is specified."
+            );
+        }
+    }
+
+    /**
+     * @return the initial size of the lookahead buffer, in bytes.
+     */
+    public final int getInitialBufferSize() {
+        return initialBufferSize;
+    }
+
+    /**
+     * @return the maximum number of bytes that will be buffered.
+     */
+    public final int getMaximumBufferSize() {
+        return maximumBufferSize;
+    }
+
+    /**
+     * @return the handler that will be notified when oversized values are encountered.
+     */
+    public final OversizedValueHandler getOversizedValueHandler() {
+        return oversizedValueHandler;
+    }
+
+    /**
+     * @return the handler that will be notified when data is processed.
+     */
+    public final DataHandler getDataHandler() {
+        return dataHandler;
+    }
+}
diff --git a/src/com/amazon/ion/IonBufferConfiguration.java b/src/com/amazon/ion/IonBufferConfiguration.java
new file mode 100644
index 0000000000..960ff4a074
--- /dev/null
+++ b/src/com/amazon/ion/IonBufferConfiguration.java
@@ -0,0 +1,164 @@
+package com.amazon.ion;
+
+import com.amazon.ion.impl.IonReaderLookaheadBuffer;
+
+/**
+ * Configures Ion lookahead buffers.
+ */
+public final class IonBufferConfiguration extends BufferConfiguration<IonBufferConfiguration> {
+
+    /**
+     * Functional interface for handling oversized symbol tables.
+     */
+    public interface OversizedSymbolTableHandler {
+        /**
+         * Invoked when the user specifies a finite maximum buffer size and that size is exceeded by symbol table(s)
+         * alone. Because symbol tables cannot be truncated without corrupting values that follow in the stream,
+         * this condition is not recoverable. After this method is called,
+         * {@link IonReaderLookaheadBuffer#fillInput()} has no effect.
+         * @throws Exception if handler logic fails.
+         */
+        void onOversizedSymbolTable() throws Exception;
+    }
+
+    /**
+     * Builds IonBufferConfiguration instances.
+     */
+    public static final class Builder extends BufferConfiguration.Builder<IonBufferConfiguration, Builder> {
+
+        /**
+         * 4-byte IVM + 1 byte user value.
+         */
+        private static final int MINIMUM_MAX_VALUE_SIZE = 5;
+
+        /**
+         * An OversizedValueHandler that does nothing.
+         */
+        private static final OversizedValueHandler NO_OP_OVERSIZED_VALUE_HANDLER = new OversizedValueHandler() {
+
+            @Override
+            public void onOversizedValue() {
+                // If no maximum buffer size is configured, values cannot be considered oversized and this
+                // implementation will never be called.
+                // If a maximum buffer size is configured, a handler must also be configured. In that case,
+                // this implementation will only be called if the user provides it to the builder manually.
+            }
+        };
+
+        /**
+         * A DataHandler that does nothing.
+         */
+        private static final DataHandler NO_OP_DATA_HANDLER = new DataHandler() {
+
+            @Override
+            public void onData(int bytes) {
+                // Do nothing.
+            }
+        };
+
+        /**
+         * An OversizedSymbolTableHandler that does nothing.
+         */
+        private static final OversizedSymbolTableHandler NO_OP_OVERSIZED_SYMBOL_TABLE_HANDLER
+            = new OversizedSymbolTableHandler() {
+
+            @Override
+            public void onOversizedSymbolTable() {
+                // If no maximum buffer size is configured, symbol tables cannot be considered oversized and this
+                // implementation will never be called.
+                // If a maximum buffer size is configured, a handler must also be configured. In that case,
+                // this implementation will only be called if the user provides it to the builder manually.
+            }
+        };
+
+        /**
+         * The handler that will be notified when oversized symbol tables are encountered.
+         */
+        private OversizedSymbolTableHandler oversizedSymbolTableHandler = null;
+
+        private Builder() {
+            // Must be publicly instantiated via the factory method.
+        }
+
+        /**
+         * Provides the standard builder with the default initial buffer size, an unbounded maximum buffer size, and
+         * an event handler that does nothing.
+         * @return a standard Builder.
+         */
+        public static Builder standard() {
+            return new Builder();
+        }
+
+        /**
+         * Sets the handler that will be notified when oversized symbol tables are encountered. If the maximum buffer
+         * size is finite (see {@link #withMaximumBufferSize(int)}, this handler is required to be non-null.
+         *
+         * @param handler the handler.
+         * @return this builder.
+         */
+        public Builder onOversizedSymbolTable(OversizedSymbolTableHandler handler) {
+            oversizedSymbolTableHandler = handler;
+            return this;
+        }
+
+        /**
+         * @return the handler that will be notified when oversized symbol tables are encountered.
+         */
+        public OversizedSymbolTableHandler getOversizedSymbolTableHandler() {
+            return oversizedSymbolTableHandler;
+        }
+
+        @Override
+        public int getMinimumMaximumBufferSize() {
+            return MINIMUM_MAX_VALUE_SIZE;
+        }
+
+        @Override
+        public OversizedValueHandler getNoOpOversizedValueHandler() {
+            return NO_OP_OVERSIZED_VALUE_HANDLER;
+        }
+
+        @Override
+        public DataHandler getNoOpDataHandler() {
+            return NO_OP_DATA_HANDLER;
+        }
+
+        /**
+         * @return an OversizedSymbolTableHandler that does nothing.
+         */
+        public OversizedSymbolTableHandler getNoOpOversizedSymbolTableHandler() {
+            return NO_OP_OVERSIZED_SYMBOL_TABLE_HANDLER;
+        }
+
+        @Override
+        public IonBufferConfiguration build() {
+            return new IonBufferConfiguration(this);
+        }
+    }
+
+    /**
+     * The handler that will be notified when oversized symbol tables are encountered.
+     */
+    private final OversizedSymbolTableHandler oversizedSymbolTableHandler;
+
+    /**
+     * Constructs an instance from the given Builder.
+     * @param builder the builder containing the settings to apply to the new configuration.
+     */
+    private IonBufferConfiguration(Builder builder) {
+        super(builder);
+        if (builder.getOversizedSymbolTableHandler() == null) {
+            requireUnlimitedBufferSize();
+            oversizedSymbolTableHandler = builder.getNoOpOversizedSymbolTableHandler();
+        } else {
+            oversizedSymbolTableHandler = builder.getOversizedSymbolTableHandler();
+        }
+    }
+
+    /**
+     * @return the handler that will be notified when oversized symbol tables are encountered.
+     */
+    public OversizedSymbolTableHandler getOversizedSymbolTableHandler() {
+        return oversizedSymbolTableHandler;
+    }
+}
diff --git a/src/com/amazon/ion/IonReader.java b/src/com/amazon/ion/IonReader.java
index 7675b4b436..9066c47326 100644
--- a/src/com/amazon/ion/IonReader.java
+++ b/src/com/amazon/ion/IonReader.java
@@ -226,7 +226,11 @@ public interface IonReader
      * iterator is empty (hasNext() returns false on the first call) if
      * there are no annotations on the current value.
      *
-     * @throws UnknownSymbolException if any annotation has unknown text.
+     * Implementations *may* throw {@link UnknownSymbolException} from
+     * this method if any annotation contains unknown text. Alternatively,
+     * implementations may provide an Iterator that throws
+     * {@link UnknownSymbolException} only when the user navigates the
+     * iterator to an annotation with unknown text.
      *
      * @return not null.
      */
diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
new file mode 100644
index 0000000000..542a4ea46b
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
@@ -0,0 +1,1957 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.ReadOnlyValueException;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.SimpleCatalog;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
+import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+/**
+ * <p>
+ * This implementation differs from the existing non-incremental binary reader implementation in that if
+ * {@link IonReader#next()} returns {@code null} at the top-level, it indicates that there is not (yet) enough data in
+ * the stream to complete a top-level value. The user may wait for more data to become available in the stream and
+ * call {@link IonReader#next()} again to continue reading. Unlike the non-incremental reader, the incremental reader
+ * will never throw an exception due to unexpected EOF during {@code next()}. If, however, {@link IonReader#close()} is
+ * called when an incomplete value is buffered, an {@link IonException} will be raised.
+ * </p>
+ * <p>
+ * Although the incremental binary reader implementation provides performance superior to the non-incremental reader
+ * implementation for both incremental and non-incremental use cases, there is one caveat: the incremental
+ * implementation must be able to buffer an entire top-level value and any preceding system values (Ion version
+ * marker(s) and symbol table(s)) in memory. This means that each value and preceding system values must be no larger
+ * than any of the following:
+ * <ul>
+ * <li>The configured maximum buffer size of the {@link IonBufferConfiguration}.</li>
+ * <li>The memory available to the JVM.</li>
+ * <li>2GB, because the buffer is held in a Java {@code byte[]}, which is indexed by an {@code int}.</li>
+ * </ul>
+ * This will not be a problem for the vast majority of Ion streams, as it is
+ * rare for a single top-level value or symbol table to exceed a few megabytes in size. However, if the size of the
+ * stream's values risk exceeding the available memory, then this implementation must not be used.
+ * </p>
+ * <p>
+ * To enable this implementation, use {@code IonReaderBuilder.withIncrementalReadingEnabled(true)}.
+ * </p>
+ */
+class IonReaderBinaryIncremental implements IonReader, _Private_ReaderWriter {
+
+    /*
+     * Potential future enhancements:
+     * - Split this implementation into a user-level reader and a system-level reader, like the existing implementation.
+     *   This allows this implementation to be used when the user requests a system reader.
+     * - Do not require buffering an entire top-level value. This would be a pretty major overhaul. It may be possible
+     *   to implement using different buffers for each depth. Doing this may also make it possible to avoid buffering
+     *   a value (at any depth) until stepIn() or *Value() is called on it, enabling faster skip-scanning.
+     * - Allow for this implementation to produce the same non-incremental behavior as the old implementation; namely,
+     *   that running out of data during next() would raise an IonException. See the note in the implementation of
+     *   close() below. Implementing this bullet and the previous two bullets would allow us to remove the old binary
+     *   IonReader implementation.
+     * - Add a builder/constructor option that uses a user-provided byte[] directly. This would allow data to be read
+     *   in-place without the need to copy to a separate buffer. Non-incremental behavior (as described in the previous
+     *   bullet) is likely a requirement of this feature.
+     * - System symbol table configuration needs to be generalized to support future Ion versions. See the constructor,
+     *   resetSymbolTable(), and resetImports().
+     * - When accessed via an iterator, annotations can be parsed incrementally instead of parsing the entire sequence
+     *   up-front.
+     * - Provide users the option to spawn a thread that pre-buffers the next value. There would be two buffers: one
+     *   for the user thread, and one for the pre-fetching thread. They are swapped every time the user calls next().
+     */
+
+    /**
+     * Holds the information that the binary reader must keep track of for containers at any depth.
+     */
+    private static class ContainerInfo {
+
+        /**
+         * The container's type.
+         */
+        private IonType type;
+
+        /**
+         * The byte position of the end of the container.
+         */
+        private int endPosition;
+    }
+
+    /**
+     * The standard {@link IonBufferConfiguration}. This will be used unless the user chooses custom settings.
+     */
+    private static final IonBufferConfiguration STANDARD_BUFFER_CONFIGURATION =
+        IonBufferConfiguration.Builder.standard().build();
+
+    // Constructs ContainerInfo instances.
+    private static final _Private_RecyclingStack.ElementFactory<ContainerInfo> CONTAINER_INFO_FACTORY =
+        new _Private_RecyclingStack.ElementFactory<ContainerInfo>() {
+
+        @Override
+        public ContainerInfo newElement() {
+            return new ContainerInfo();
+        }
+    };
+
+    // The Ion 1.0 system symbol table.
+    private static final List<String> SYSTEM_SYMBOLS_1_0 = Collections.unmodifiableList(Arrays.asList(
+        null,
+        "$ion",
+        "$ion_1_0",
+        "$ion_symbol_table",
+        "name",
+        "version",
+        "imports",
+        "symbols",
+        "max_id",
+        "$ion_shared_symbol_table"
+    ));
+
+    // The size of the Ion 1.0 system symbol table.
+    private static final int SYSTEM_SYMBOLS_1_0_SIZE = SYSTEM_SYMBOLS_1_0.size();
+
+    // Symbol IDs for symbols contained in the system symbol table.
+    private static class SystemSymbolIDs {
+
+        // The system symbol table SID for the text "$ion_symbol_table".
+        private static final int ION_SYMBOL_TABLE_ID = 3;
+
+        // The system symbol table SID for the text "name".
+        private static final int NAME_ID = 4;
+
+        // The system symbol table SID for the text "version".
+        private static final int VERSION_ID = 5;
+
+        // The system symbol table SID for the text "imports".
+        private static final int IMPORTS_ID = 6;
+
+        // The system symbol table SID for the text "symbols".
+        private static final int SYMBOLS_ID = 7;
+
+        // The system symbol table SID for the text "max_id".
+        private static final int MAX_ID_ID = 8;
+    }
+
+    // The size of the reusable UTF-8 decoding buffer.
+    private static final int UTF8_BUFFER_SIZE_IN_BYTES = 4 * 1024;
+
+    // The final byte of the binary IVM.
+    private static final int IVM_FINAL_BYTE = 0xEA;
+
+    // Isolates the highest bit in a byte.
+    private static final int HIGHEST_BIT_BITMASK = 0x80;
+
+    // Isolates the lowest seven bits in a byte.
+    private static final int LOWER_SEVEN_BITS_BITMASK = 0x7F;
+
+    // Isolates the lowest six bits in a byte.
+    private static final int LOWER_SIX_BITS_BITMASK = 0x3F;
+
+    // The number of significant bits in each UInt byte.
+    private static final int VALUE_BITS_PER_UINT_BYTE = 8;
+
+    // The number of significant bits in each VarUInt byte.
+    private static final int VALUE_BITS_PER_VARUINT_BYTE = 7;
+
+    // An IonCatalog containing zero shared symbol tables.
+    private static final IonCatalog EMPTY_CATALOG = new SimpleCatalog();
+
+    // Initial capacity of the stack used to hold ContainerInfo. Each additional level of nesting in the data requires
+    // a new ContainerInfo. Depths greater than 8 will be rare.
+    private static final int CONTAINER_STACK_INITIAL_CAPACITY = 8;
+
+    // Initial capacity of the ArrayList used to hold the symbol IDs of the annotations on the current value.
+    private static final int ANNOTATIONS_LIST_INITIAL_CAPACITY = 8;
+
+    // Initial capacity of the ArrayList used to hold the text in the current symbol table.
+    private static final int SYMBOLS_LIST_INITIAL_CAPACITY = 128;
+
+    // Single byte negative zero, represented as a VarInt. Often used in timestamp encodings to indicate unknown local
+    // offset.
+    private static final int VAR_INT_NEGATIVE_ZERO = 0xC0;
+
+    // The number of bytes occupied by a Java int.
+    private static final int INT_SIZE_IN_BYTES = 4;
+
+    // The number of bytes occupied by a Java long.
+    private static final int LONG_SIZE_IN_BYTES = 8;
+
+    // The smallest negative 8-byte integer that can fit in a long is -0x80_00_00_00_00_00_00_00.
+    private static final int MOST_SIGNIFICANT_BYTE_OF_MIN_LONG = 0x80;
+
+    // The largest positive 8-byte integer that can fit in a long is 0x7F_FF_FF_FF_FF_FF_FF_FF.
+    private static final int MOST_SIGNIFICANT_BYTE_OF_MAX_LONG = 0x7F;
+
+    // The second-most significant bit in the most significant byte of a VarInt is the sign.
+    private static final int VAR_INT_SIGN_BITMASK = 0x40;
+
+    // 32-bit floats must declare length 4.
+    private static final int FLOAT_32_BYTE_LENGTH = 4;
+
+    // The InputStream that provides the binary Ion data.
+    private final InputStream inputStream;
+
+    // Wrapper for the InputStream that ensures an entire top-level value is available.
+    private final IonReaderLookaheadBuffer lookahead;
+
+    // Buffer that stores top-level values.
+    private final ResizingPipedInputStream buffer;
+
+    // Converter between scalar types, allowing, for example, for a value encoded as an Ion float to be returned as a
+    // Java `long` via `IonReader.longValue()`.
+    private final _Private_ScalarConversions.ValueVariant scalarConverter;
+
+    // Stack to hold container info. Stepping into a container results in a push; stepping out results in a pop.
+    private final _Private_RecyclingStack<ContainerInfo> containerStack;
+
+    // UTF-8 string decoder.
+    private final CharsetDecoder utf8CharsetDecoder = Charset.forName("UTF-8").newDecoder();
+
+    // The symbol IDs for the annotations on the current value.
+    private final List<Integer> annotationSids;
+
+    // True if the annotation iterator will be reused across values; otherwise, false.
+    private final boolean isAnnotationIteratorReuseEnabled;
+
+    // Reusable iterator over the annotations on the current value.
+    private final AnnotationIterator annotationIterator;
+
+    // The text representations of the symbol table that is currently in scope, indexed by symbol ID. If the element at
+    // a particular index is null, that symbol has unknown text.
+    private final List<String> symbols;
+
+    // The catalog used by the reader to resolve shared symbol table imports.
+    private final IonCatalog catalog;
+
+    // The shared symbol tables imported by the local symbol table that is currently in scope. The key is the highest
+    // local symbol ID that resolves to a symbol contained in the value's symbol table.
+    private final TreeMap<Integer, SymbolTable> imports;
+
+    // A map of symbol ID to SymbolToken representation. Because most use cases only require symbol text, this
+    // is used only if necessary to avoid imposing the extra expense on all symbol lookups.
+    private List<SymbolToken> symbolTokensById = null;
+
+    // The highest local symbol ID that resolves to a symbol contained in a shared symbol table imported by the
+    // current local symbol table.
+    private int importMaxId;
+
+    // The cached SymbolTable representation of the current local symbol table. Invalidated whenever a local
+    // symbol table is encountered in the stream.
+    private SymbolTable cachedReadOnlySymbolTable = null;
+
+    // True if the current symbol table has already been transferred via pop_passed_symbol_table with the reader
+    // positioned at the current value; otherwise, false.
+    private boolean hasTransferredSymbolTable = false;
+
+    // The symbol ID of the current value's field name, or -1 if the current value is not in a struct.
+    private int fieldNameSid = -1;
+
+    // The major version of the Ion encoding currently being read.
+    private int majorVersion = 1;
+
+    // The minor version of the Ion encoding currently being read.
+    private int minorVersion = 0;
+
+    // The number of bytes of a lob value that the user has consumed, allowing for piecewise reads.
+    private int lobBytesRead = 0;
+
+    // A reusable scratch space to hold decoded UTF-8 bytes.
+    private CharBuffer utf8DecodingBuffer = CharBuffer.allocate(UTF8_BUFFER_SIZE_IN_BYTES);
+
+    // The type of value at which the reader is currently positioned.
+    private IonType valueType = null;
+
+    // Information about the type ID byte for the value at which the reader is currently positioned.
+    private IonTypeID valueTypeID = null;
+
+    // Indicates whether there are annotations on the current value.
+    private boolean hasAnnotations = false;
+
+    // Indicates whether a complete top-level value is currenty buffered.
+    private boolean completeValueBuffered = false;
+
+    // --- Byte position markers ---
+    // Note: absolute positions/indexes can be used because the bytes that represent a single top-level value are
+    // always handled in two sequential phases: first, the bytes are buffered, and then they are read. These operations
+    // will never be interleaved during the processing of a single value. As a result, the underlying buffer
+    // will always hold all of the bytes for a single top-level value in a contiguous sequence, even if the buffer
+    // has to grow to hold all of the value's bytes.
+
+    // The buffer position of the first byte of the value representation (after the type ID and optional length field).
+    private int valueStartPosition = -1;
+
+    // The buffer position of the byte after the last byte in the value representation.
+    private int valueEndPosition = -1;
+
+    // The buffer position of the first byte of the annotation wrapper for the current value.
+    private int annotationStartPosition = -1;
+
+    // The number of bytes occupied by the annotation SIDs in the annotation wrapper for the current value.
+    private int annotationsLength = -1;
+
+    // The index of the next byte to peek from the underlying buffer.
+    private int peekIndex = -1;
+
+    // ------
+
+    /**
+     * Constructor.
+     * @param builder the builder containing the configuration for the new reader.
+     * @param inputStream the InputStream that provides binary Ion data.
+     */
+    IonReaderBinaryIncremental(IonReaderBuilder builder, InputStream inputStream) {
+        this.inputStream = inputStream;
+        this.catalog = builder.getCatalog() == null ? EMPTY_CATALOG : builder.getCatalog();
+        if (builder.isAnnotationIteratorReuseEnabled()) {
+            isAnnotationIteratorReuseEnabled = true;
+            annotationIterator = new AnnotationIterator();
+        } else {
+            isAnnotationIteratorReuseEnabled = false;
+            annotationIterator = null;
+        }
+        if (builder.getBufferConfiguration() == null) {
+            lookahead = new IonReaderLookaheadBuffer(STANDARD_BUFFER_CONFIGURATION, inputStream);
+        } else {
+            lookahead = new IonReaderLookaheadBuffer(builder.getBufferConfiguration(), inputStream);
+        }
+        buffer = (ResizingPipedInputStream) lookahead.getPipe();
+        containerStack = new _Private_RecyclingStack<ContainerInfo>(
+            CONTAINER_STACK_INITIAL_CAPACITY,
+            CONTAINER_INFO_FACTORY
+        );
+        annotationSids = new ArrayList<Integer>(ANNOTATIONS_LIST_INITIAL_CAPACITY);
+        symbols = new ArrayList<String>(SYMBOLS_LIST_INITIAL_CAPACITY);
+        symbols.addAll(SYSTEM_SYMBOLS_1_0);
+        imports = new TreeMap<Integer, SymbolTable>();
+        scalarConverter = new _Private_ScalarConversions.ValueVariant();
+        resetImports();
+    }
+
+    /**
+     * Reusable iterator over the annotations on the current value.
+     */
+    private class AnnotationIterator implements Iterator<String> {
+
+        // All of the annotation SIDs on the current value.
+        protected List<Integer> annotationSids = Collections.emptyList();
+        // The index into `annotationSids` containing the next annotation to be returned.
+        protected int index = 0;
+
+        @Override
+        public boolean hasNext() {
+            return index < annotationSids.size();
+        }
+
+        @Override
+        public String next() {
+            int sid = annotationSids.get(index);
+            String annotation = getSymbol(sid);
+            if (annotation == null) {
+                throw new UnknownSymbolException(sid);
+            }
+            index++;
+            return annotation;
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException("This iterator does not support element removal.");
+        }
+
+        /**
+         * Reset the iterator so that it may be reused.
+         */
+        public void reset() {
+            index = 0;
+            annotationSids = getAnnotationSids();
+        }
+    }
+
+    /**
+     * Non-reusable iterator over the annotations on the current value. May be iterated even if the reader advances
+     * past the current value.
+     */
+    private class SingleUseAnnotationIterator extends AnnotationIterator {
+
+        SingleUseAnnotationIterator() {
+            index = 0;
+            annotationSids = new ArrayList<Integer>(getAnnotationSids());
+        }
+
+        @Override
+        public void reset() {
+            throw new IllegalStateException("Single-use annotation iterators cannot be reset.");
+        }
+    }
+
+    /**
+     * A SymbolToken's import location, allowing for symbols with unknown text to be mapped to a particular slot
+     * in a shared symbol table.
+     * NOTE: this is currently not publicly accessible, but it is an important step toward being able to correctly
+     * round-trip symbols with unknown text from shared symbol tables in different symbol table contexts. See
+     * https://github.com/amzn/ion-java/issues/126 . Support is added now to avoid risking the appearance of performance
+     * degradation if ImportLocation support were added after initial release of this IonReader implementation.
+     */
+    static class ImportLocation {
+
+        // The name of the shared symbol table.
+        final String name;
+
+        // The index into the shared symbol table.
+        final int sid;
+
+        ImportLocation(String name, int sid) {
+            this.name = name;
+            this.sid = sid;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public int getSid() {
+            return sid;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("ImportLocation::{name: %s, sid: %d}", name, sid);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof ImportLocation)) {
+                return false;
+            }
+            ImportLocation that = (ImportLocation) o;
+            return this.getName().equals(that.getName()) && this.getSid() == that.getSid();
+        }
+
+        @Override
+        public int hashCode() {
+            int result = 17;
+            result += 31 * getName().hashCode();
+            result += 31 * getSid();
+            return result;
+        }
+    }
+
+    /**
+     * SymbolToken implementation that includes ImportLocation.
+     */
+    static class SymbolTokenImpl implements _Private_SymbolToken {
+
+        // The symbol's text, or null if the text is unknown.
+        private final String text;
+
+        // The local symbol ID of this symbol within a particular local symbol table.
+        private final int sid;
+
+        // The import location of the symbol (only relevant if the text is unknown).
+        private final ImportLocation importLocation;
+
+        SymbolTokenImpl(String text, int sid, ImportLocation importLocation) {
+            this.text = text;
+            this.sid = sid;
+            this.importLocation = importLocation;
+        }
+
+        @Override
+        public String getText() {
+            return text;
+        }
+
+        @Override
+        public String assumeText() {
+            if (text == null) {
+                throw new UnknownSymbolException(sid);
+            }
+            return text;
+        }
+
+        @Override
+        public int getSid() {
+            return sid;
+        }
+
+        // Will be @Override once added to the SymbolToken interface.
+        public ImportLocation getImportLocation() {
+            return importLocation;
+        }
+
+        @Override
+        public String toString() {
+            return String.format("SymbolToken::{text: %s, sid: %d, importLocation: %s}", text, sid, importLocation);
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (this == o) return true;
+            if (!(o instanceof SymbolToken)) return false;
+
+            // NOTE: once ImportLocation is available via the SymbolToken interface, it should be compared here
+            // when text is null.
+            SymbolToken other = (SymbolToken) o;
+            if(getText() == null || other.getText() == null) {
+                return getText() == other.getText();
+            }
+            return getText().equals(other.getText());
+        }
+
+        @Override
+        public int hashCode() {
+            if(getText() != null) return getText().hashCode();
+            return 0;
+        }
+    }
+
+    /**
+     * Read-only snapshot of the local symbol table at the reader's current position.
+     */
+    private class LocalSymbolTableSnapshot implements SymbolTable {
+
+        // The system symbol table.
+        private final SymbolTable system = SharedSymbolTable.getSystemSymbolTable(majorVersion);
+
+        // The max ID of this local symbol table.
+        private final int maxId;
+
+        // The max ID that maps to a shared symbol table imported by this local symbol table.
+        private final int importedTablesMaxId;
+
+        // The shared symbol tables imported by this local symbol table.
+        private final SymbolTable[] importedTables;
+
+        // Map representation of this symbol table. Keys are symbol text; values are the lowest symbol ID that maps
+        // to that text.
+        final Map<String, Integer> mapView;
+
+        // List representation of this symbol table, indexed by symbol ID.
+        final List<String> listView;
+
+        LocalSymbolTableSnapshot() {
+            int numberOfSymbols = symbols.size();
+            maxId = numberOfSymbols - 1;
+            importedTablesMaxId = importMaxId;
+            // Map with initial size the number of symbols and load factor 1, meaning it must be full before growing.
+            // It is not expected to grow.
+            listView = new ArrayList<String>(symbols.subList(0, numberOfSymbols));
+            mapView = new HashMap<String, Integer>((int) Math.ceil(numberOfSymbols / 0.75), 0.75f);
+            for (int i = 0; i < numberOfSymbols; i++) {
+                String symbol = listView.get(i);
+                if (symbol != null) {
+                    mapView.put(symbol, i);
+                }
+            }
+            importedTables = new SymbolTable[imports.size()];
+            int i = 0;
+            for (SymbolTable importedTable : imports.values()) {
+                importedTables[i] = importedTable;
+                i++;
+            }
+        }
+
+        @Override
+        public String getName() {
+            return null;
+        }
+
+        @Override
+        public int getVersion() {
+            return 0;
+        }
+
+        @Override
+        public boolean isLocalTable() {
+            return true;
+        }
+
+        @Override
+        public boolean isSharedTable() {
+            return false;
+        }
+
+        @Override
+        public boolean isSubstitute() {
+            return false;
+        }
+
+        @Override
+        public boolean isSystemTable() {
+            return false;
+        }
+
+        @Override
+        public SymbolTable getSystemSymbolTable() {
+            return system;
+        }
+
+        @Override
+        public String getIonVersionId() {
+            return system.getIonVersionId();
+        }
+
+        @Override
+        public SymbolTable[] getImportedTables() {
+            return importedTables;
+        }
+
+        @Override
+        public int getImportedMaxId() {
+            return importedTablesMaxId;
+        }
+
+        @Override
+        public SymbolToken find(String text) {
+            Integer sid = mapView.get(text);
+            if (sid == null) {
+                return null;
+            }
+            // The following per-call allocation is intentional. When weighed against the alternative of making
+            // 'mapView' a 'Map<String, SymbolToken>` instead of a `Map<String, Integer>`, the following points should
+            // be considered:
+            // 1. A LocalSymbolTableSnapshot is only created when getSymbolTable() is called on the reader. The reader
+            // does not use the LocalSymbolTableSnapshot internally. There are two cases when getSymbolTable() would be
+            // called: a) when the user calls it, which will basically never happen, and b) when the user uses
+            // IonSystem.iterate over the reader, in which case each top-level value holds a reference to the symbol
+            // table that was in scope when it occurred. In case a), in addition to rarely being called at all, it
+            // would be even rarer for a user to use find() to retrieve each symbol (especially more than once) from the
+            // returned symbol table. Case b) may be called more frequently, but it remains equally rare that a user
+            // would retrieve each symbol at least once.
+            // 2. If we make mapView a Map<String, SymbolToken>, then we are guaranteeing that we will allocate at least
+            // one SymbolToken per symbol (because mapView is created in the constructor of LocalSymbolTableSnapshot)
+            // even though it's unlikely most will ever be needed.
+            return new SymbolTokenImpl(text, sid, null);
+        }
+
+        @Override
+        public int findSymbol(String name) {
+            Integer sid = mapView.get(name);
+            if (sid == null) {
+                return UNKNOWN_SYMBOL_ID;
+            }
+            return sid;
+        }
+
+        @Override
+        public String findKnownSymbol(int id) {
+            if (id < 0) {
+                throw new IllegalArgumentException("Symbol IDs must be at least 0.");
+            }
+            if (id >= symbols.size()) {
+                return null;
+            }
+            return listView.get(id);
+        }
+
+        @Override
+        public Iterator<String> iterateDeclaredSymbolNames() {
+            return new Iterator<String>() {
+
+                private int index = getImportedMaxId() + 1;
+
+                @Override
+                public boolean hasNext() {
+                    return index <= getMaxId();
+                }
+
+                @Override
+                public String next() {
+                    String symbol = listView.get(index);
+                    index++;
+                    return symbol;
+                }
+
+                @Override
+                public void remove() {
+                    throw new UnsupportedOperationException("This iterator does not support element removal.");
+                }
+            };
+        }
+
+        @Override
+        public SymbolToken intern(String text) {
+            SymbolToken token = find(text);
+            if (token != null) {
+                return token;
+            }
+            throw new ReadOnlyValueException();
+        }
+
+        @Override
+        public int getMaxId() {
+            return maxId;
+        }
+
+        @Override
+        public boolean isReadOnly() {
+            return true;
+        }
+
+        @Override
+        public void makeReadOnly() {
+            // The symbol table is already read-only.
+        }
+
+        @Override
+        public void writeTo(IonWriter writer) throws IOException {
+            IonReader reader = new SymbolTableReader(this);
+            writer.writeValues(reader);
+        }
+
+        @Override
+        public String toString() {
+            return "(LocalSymbolTable max_id:" + getMaxId() + ')';
+        }
+    }
+
+    /**
+     * Throw if the reader is attempting to process an Ion version that it does not support.
+     */
+    private void requireSupportedIonVersion() {
+        if (majorVersion != 1 || minorVersion != 0) {
+            throw new IonException(String.format("Unsupported Ion version: %d.%d", majorVersion, minorVersion));
+        }
+    }
+
+    /**
+     * Reset the local symbol table to the system symbol table.
+     */
+    private void resetSymbolTable() {
+        // Note: when there is a new version of Ion, check majorVersion and minorVersion here and set the appropriate
+        // system symbol table.
+        symbols.clear();
+        symbols.addAll(SYSTEM_SYMBOLS_1_0);
+        cachedReadOnlySymbolTable = null;
+        if (symbolTokensById != null) {
+            symbolTokensById.clear();
+        }
+    }
+
+    /**
+     * Clear the list of imported shared symbol tables.
+     */
+    private void resetImports() {
+        imports.clear();
+        SymbolTable system = SharedSymbolTable.getSystemSymbolTable(majorVersion);
+        importMaxId = system.getMaxId();
+    }
+
+    /**
+     * Add a shared symbol table import, resolving it from the catalog if possible.
+     * @param name the name of the shared symbol table.
+     * @param version the version of the shared symbol table.
+     * @param maxId the max_id of the shared symbol table. This value takes precedence over the actual max_id for the
+     *              shared symbol table at the requested version.
+     */
+    private void addImport(String name, int version, int maxId) {
+        SymbolTable shared = catalog.getTable(name, version);
+        importMaxId += maxId;
+        if (shared == null) {
+            // No match. All symbol IDs that fall within this shared symbol table's range will have unknown text.
+            imports.put(importMaxId, new SubstituteSymbolTable(name, version, maxId));
+        } else if (shared.getMaxId() != maxId || shared.getVersion() != version) {
+            // Partial match. If the requested max_id exceeds the actual max_id of the resolved shared symbol table,
+            // symbol IDs that exceed the max_id of the resolved shared symbol table will have unknown text.
+            imports.put(importMaxId, new SubstituteSymbolTable(shared, version, maxId));
+        } else {
+            // Exact match; the resolved shared symbol table may be used as-is.
+            imports.put(importMaxId, shared);
+        }
+    }
+
+    /**
+     * Retrieves from the `imports` the next-lowest key to the given key, or `null` if there is no key lower
+     * than the given key.
+     * @param key the key.
+     * @return the lower key, or null.
+     */
+    private Integer lowerKey(int key) {
+        // Note: with JDK 1.6+, this method is just `return imports.lowerKey(key);`
+        SortedMap<Integer, SymbolTable> sortedView = imports.headMap(key);
+        if (sortedView.isEmpty()) {
+            return null;
+        }
+        return sortedView.lastKey();
+    }
+
+    /**
+     * Gets the ImportLocation for the given local SID. The given SID must not point to a system symbol and must be
+     * less than or equal to `importMaxId`.
+     * @param sid the local SID.
+     * @return the ImportLocation for the given local SID.
+     */
+    private ImportLocation getImportLocation(int sid) {
+        // The system symbol table is never included in the imports map, so the local SID must be adjusted lower
+        // by the max ID of the system symbol table.
+        int systemMaxId = SharedSymbolTable.getSystemSymbolTable(majorVersion).getMaxId();
+        int systemAdjustedMaxId = sid - systemMaxId;
+        // Note: with JDK 1.6+, the following line would be
+        // Map.Entry<Integer, SymbolTable> entry = imports.ceilingEntry(systemAdjustedMaxId);
+        Map.Entry<Integer, SymbolTable> entry = imports.tailMap(systemAdjustedMaxId).entrySet().iterator().next();
+        Integer previousMaxId = lowerKey(systemAdjustedMaxId);
+        if (previousMaxId == null) {
+            previousMaxId = systemMaxId;
+        }
+        return new ImportLocation(entry.getValue().getName(), sid - previousMaxId);
+    }
+
+    /**
+     * Retrieves the String text for the given symbol ID.
+     * @param sid a symbol ID.
+     * @return a String.
+     */
+    private String getSymbol(int sid) {
+        if (sid >= symbols.size()) {
+            throw new IonException("Symbol ID exceeds the max ID of the symbol table.");
+        }
+        return symbols.get(sid);
+    }
+
+    /**
+     * Creates a SymbolToken representation of the given symbol ID.
+     * @param sid a symbol ID.
+     * @return a SymbolToken.
+     */
+    private SymbolToken getSymbolToken(int sid) {
+        if (symbolTokensById == null) {
+            symbolTokensById = new ArrayList<SymbolToken>(symbols.size());
+        }
+        if (symbolTokensById.size() < symbols.size()) {
+            for (int i = symbolTokensById.size(); i < symbols.size(); i++) {
+                symbolTokensById.add(null);
+            }
+        }
+        if (sid >= symbols.size()) {
+            throw new IonException("Symbol ID exceeds the max ID of the symbol table.");
+        }
+        SymbolToken token = symbolTokensById.get(sid);
+        if (token == null) {
+            String text = symbols.get(sid);
+            ImportLocation importLocation = null;
+            if (text == null) {
+                // Note: this will never be a system symbol.
+                if (sid > 0 && sid <= importMaxId) {
+                    importLocation = getImportLocation(sid);
+                } else {
+                    // All symbols with unknown text in the local symbol range are equivalent to symbol zero.
+                    sid = 0;
+                }
+            }
+            token = new SymbolTokenImpl(text, sid, importLocation);
+            symbolTokensById.set(sid, token);
+        }
+        return token;
+    }
+
+    /**
+     * Adds the symbols declared in the given shared symbol table to the reader's current local symbol table, stopping
+     * once the given max_id has been reached.
+     * @param shared a shared symbol table to import.
+     * @param maxId the maximum symbol ID to import from the shared symbol table.
+     */
+    private void addSymbolsFromImport(SymbolTable shared, int maxId) {
+        // The system symbol table is never included in the imports map, so the local SID must be adjusted lower
+        // by the max ID of the system symbol table.
+        int systemMaxId = SharedSymbolTable.getSystemSymbolTable(majorVersion).getMaxId();
+        Integer previousMaxId = lowerKey(maxId);
+        if (previousMaxId == null) {
+            previousMaxId = systemMaxId;
+        }
+        int adjustedMaxId = maxId - previousMaxId;
+        int id = 1;
+        Iterator<String> importedSymbols = shared.iterateDeclaredSymbolNames();
+        while (importedSymbols.hasNext() && id <= adjustedMaxId) {
+            symbols.add(importedSymbols.next());
+            id++;
+        }
+    }
+
+    /**
+     * Adds the symbols from all of the imported shared symbol tables to the reader's current local symbol table.
+     */
+    private void addSymbolsFromImports() {
+        for (Map.Entry<Integer, SymbolTable> entry : imports.entrySet()) {
+            addSymbolsFromImport(entry.getValue(), entry.getKey());
+        }
+    }
+
+    /**
+     * Reads a local symbol table from the buffer.
+     * @param marker marker for the start and end positions of the local symbol table in the buffer.
+     */
+    private void readSymbolTable(IonReaderLookaheadBuffer.SymbolTableMarker marker) {
+        peekIndex = marker.startIndex;
+        boolean isAppend = false;
+        boolean hasSeenImports = false;
+        boolean hasSeenSymbols = false;
+        int symbolsPosition = -1;
+        int symbolsEndPosition = -1;
+        while (peekIndex < marker.endIndex) {
+            fieldNameSid = readVarUInt();
+            IonTypeID typeID = readTypeId();
+            calculateEndPosition(typeID);
+            int currentValueEndPosition = valueEndPosition;
+            if (fieldNameSid == SystemSymbolIDs.IMPORTS_ID) {
+                if (hasSeenImports) {
+                    throw new IonException("Symbol table contained multiple imports fields.");
+                }
+                if (typeID.type == IonType.SYMBOL) {
+                    isAppend = readUInt(peekIndex, currentValueEndPosition) == SystemSymbolIDs.ION_SYMBOL_TABLE_ID;
+                    peekIndex = currentValueEndPosition;
+                } else if (typeID.type == IonType.LIST) {
+                    resetImports();
+                    stepIn();
+                    IonType type = next();
+                    while (type != null) {
+                        String name = null;
+                        int version = -1;
+                        int maxId = -1;
+                        if (type == IonType.STRUCT) {
+                            stepIn();
+                            type = next();
+                            while (type != null) {
+                                int fieldSid = getFieldId();
+                                if (fieldSid == SystemSymbolIDs.NAME_ID) {
+                                    if (type == IonType.STRING) {
+                                        name = stringValue();
+                                    }
+                                } else if (fieldSid == SystemSymbolIDs.VERSION_ID) {
+                                    if (type == IonType.INT) {
+                                        version = intValue();
+                                    }
+                                } else if (fieldSid == SystemSymbolIDs.MAX_ID_ID) {
+                                    if (type == IonType.INT) {
+                                        maxId = intValue();
+                                    }
+                                }
+                                type = next();
+                            }
+                            stepOut();
+                        }
+                        addImport(name, version, maxId);
+                        type = next();
+                    }
+                    stepOut();
+                }
+                if (!isAppend) {
+                    // Clear the existing symbols before adding the new imported symbols.
+                    resetSymbolTable();
+                    addSymbolsFromImports();
+                }
+                hasSeenImports = true;
+            } else if (fieldNameSid == SystemSymbolIDs.SYMBOLS_ID) {
+                if (hasSeenSymbols) {
+                    throw new IonException("Symbol table contained multiple symbols fields.");
+                }
+                if (typeID.type == IonType.LIST) {
+                    // Just record this position and skip forward. Come back after the imports (if any) are parsed.
+                    symbolsPosition = peekIndex;
+                    symbolsEndPosition = currentValueEndPosition;
+                }
+                hasSeenSymbols = true;
+            }
+            peekIndex = currentValueEndPosition;
+        }
+        if (!hasSeenImports) {
+            resetSymbolTable();
+            resetImports();
+        }
+        if (symbolsPosition > -1) {
+            peekIndex = symbolsPosition;
+            valueType = IonType.LIST;
+            valueEndPosition = symbolsEndPosition;
+            stepIn();
+            while (next() != null) {
+                if (valueType != IonType.STRING) {
+                    symbols.add(null);
+                } else {
+                    symbols.add(stringValue());
+                }
+            }
+            stepOut();
+            peekIndex = valueEndPosition;
+        }
+    }
+
+    /**
+     * Advance the reader to the next top-level value. Buffers an entire top-level value, reads any IVMs and/or local
+     * symbol tables that precede the value, and sets the byte positions of important components of the value.
+     */
+    private void nextAtTopLevel() {
+        if (completeValueBuffered) {
+            // There is already data buffered, but the user is choosing to skip it.
+            buffer.seekTo(valueEndPosition);
+            completeValueBuffered = false;
+        }
+        try {
+            lookahead.fillInput();
+        } catch (Exception e) {
+            throw new IonException(e);
+        }
+        if (lookahead.moreDataRequired()) {
+            valueType = null;
+            valueTypeID = null;
+            return;
+        }
+        completeValueBuffered = true;
+        if (lookahead.getIvmIndex() > -1) {
+            peekIndex = lookahead.getIvmIndex();
+            majorVersion = buffer.peek(peekIndex++);
+            minorVersion = buffer.peek(peekIndex++);
+            if (buffer.peek(peekIndex++) != IVM_FINAL_BYTE) {
+                throw new IonException("Invalid Ion version marker.");
+            }
+            requireSupportedIonVersion();
+            resetSymbolTable();
+            resetImports();
+            lookahead.resetIvmIndex();
+        }
+        List<IonReaderLookaheadBuffer.SymbolTableMarker> symbolTableMarkers = lookahead.getSymbolTableMarkers();
+        if (!symbolTableMarkers.isEmpty()) {
+            // The cached SymbolTable (if any) is a snapshot in time, so it must be cleared whenever a new symbol
+            // table is read regardless of whether the new LST is an append or a reset.
+            cachedReadOnlySymbolTable = null;
+            for (IonReaderLookaheadBuffer.SymbolTableMarker symbolTableMarker : symbolTableMarkers) {
+                readSymbolTable(symbolTableMarker);
+            }
+            lookahead.resetSymbolTableMarkers();
+        }
+        peekIndex = lookahead.getValueStart();
+        if (lookahead.getAnnotationSids().isEmpty()) {
+            valueTypeID = lookahead.getValueTid();
+            valueType = valueTypeID.type;
+        } else {
+            hasAnnotations = true;
+            valueTypeID = IonTypeID.TYPE_IDS[buffer.peek(peekIndex++)];
+            int wrappedValueLength = valueTypeID.length;
+            if (valueTypeID.variableLength) {
+                wrappedValueLength = readVarUInt();
+            }
+            valueType = valueTypeID.type;
+            if (valueType == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
+                throw new IonException("Nested annotations are invalid.");
+            }
+            if (peekIndex + wrappedValueLength != lookahead.getValueEnd()) {
+                throw new IonException("Mismatched annotation wrapper length.");
+            }
+        }
+        valueStartPosition = peekIndex;
+        valueEndPosition = lookahead.getValueEnd();
+        lookahead.resetNopPadIndex();
+    }
+
+    /**
+     * Reads the type ID byte.
+     * @return the TypeAndLength descriptor for the type ID byte.
+     */
+    private IonTypeID readTypeId() {
+        valueTypeID = IonTypeID.TYPE_IDS[buffer.peek(peekIndex++)];
+        valueType = valueTypeID.type;
+        return valueTypeID;
+    }
+
+    /**
+     * Calculates the end position for the given type ID descriptor.
+     * @param typeID the type ID descriptor.
+     */
+    private void calculateEndPosition(IonTypeID typeID) {
+        if (typeID.variableLength) {
+            valueEndPosition = readVarUInt() + peekIndex;
+        } else {
+            valueEndPosition = typeID.length + peekIndex;
+        }
+    }
+
+    @Override
+    public boolean hasNext() {
+        throw new UnsupportedOperationException("Not implemented");
+    }
+
+    /**
+     * Marks the end of the current container by indicating that the reader is no longer positioned on a value.
+     */
+    private void endContainer() {
+        valueType = null;
+        valueTypeID = null;
+        annotationStartPosition = -1;
+        annotationsLength = -1;
+        hasAnnotations = false;
+    }
+
+    /**
+     * Advance the reader to the next value within a container, which must already be buffered.
+     */
+    private void nextBelowTopLevel() {
+        // Seek past the previous value.
+        if (peekIndex < valueEndPosition) {
+            peekIndex = valueEndPosition;
+        }
+        if (peekIndex >= containerStack.peek().endPosition) {
+            endContainer();
+        } else {
+            if (containerStack.peek().type == IonType.STRUCT) {
+                fieldNameSid = readVarUInt();
+            }
+            IonTypeID typeID = readTypeId();
+            while (typeID.isNopPad) {
+                calculateEndPosition(typeID);
+                peekIndex = valueEndPosition;
+                if (peekIndex >= containerStack.peek().endPosition) {
+                    endContainer();
+                    return;
+                }
+                if (containerStack.peek().type == IonType.STRUCT) {
+                    fieldNameSid = readVarUInt();
+                }
+                typeID = readTypeId();
+            }
+            calculateEndPosition(typeID);
+            if (valueType == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
+                hasAnnotations = true;
+                annotationSids.clear();
+                annotationsLength = readVarUInt();
+                annotationStartPosition = peekIndex;
+                peekIndex = annotationStartPosition + annotationsLength;
+                typeID = readTypeId();
+                if (typeID.isNopPad) {
+                    throw new IonException(
+                        "Invalid annotation wrapper: NOP pad may not occur inside an annotation wrapper."
+                    );
+                }
+                if (valueType == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
+                    throw new IonException("Nested annotations are invalid.");
+                }
+                long annotationWrapperEndPosition = valueEndPosition;
+                calculateEndPosition(typeID);
+                if (annotationWrapperEndPosition != valueEndPosition) {
+                    throw new IonException(
+                        "Invalid annotation wrapper: end of the wrapper did not match end of the value."
+                    );
+                }
+            } else {
+                annotationStartPosition = -1;
+                annotationsLength = -1;
+                hasAnnotations = false;
+                if (valueEndPosition > containerStack.peek().endPosition) {
+                    throw new IonException("Value overflowed its container.");
+                }
+            }
+            if (!valueTypeID.isValid) {
+                throw new IonException("Invalid type ID.");
+            }
+            valueStartPosition = peekIndex;
+        }
+    }
+
+    @Override
+    public IonType next() {
+        fieldNameSid = -1;
+        lobBytesRead = 0;
+        valueStartPosition = -1;
+        hasTransferredSymbolTable = false;
+        hasAnnotations = false;
+        if (containerStack.isEmpty()) {
+            nextAtTopLevel();
+        } else {
+            nextBelowTopLevel();
+        }
+        // Note: the following check is necessary to catch empty ordered structs, which are prohibited by the spec.
+        // Unfortunately, this requires a check on every value for a condition that will probably never happen.
+        if (
+            valueType == IonType.STRUCT &&
+            valueTypeID.lowerNibble == IonTypeID.ORDERED_STRUCT_NIBBLE &&
+            valueStartPosition == valueEndPosition
+        ) {
+            throw new IonException("Ordered struct must not be empty.");
+        }
+        return valueType;
+    }
+
+    @Override
+    public void stepIn() {
+        if (!IonType.isContainer(valueType)) {
+            throw new IonException("Must be positioned on a container to step in.");
+        }
+        // Note: the IonReader interface dictates that stepping into a null container has the same behavior as
+        // an empty container.
+        ContainerInfo containerInfo = containerStack.push();
+        containerInfo.type = valueType;
+        containerInfo.endPosition = valueEndPosition;
+        valueType = null;
+        valueTypeID = null;
+        valueEndPosition = -1;
+        fieldNameSid = -1;
+        valueStartPosition = -1;
+    }
+
+    @Override
+    public void stepOut() {
+        if (containerStack.isEmpty()) {
+            // Note: this is IllegalStateException for consistency with the other binary IonReader implementation.
+            throw new IllegalStateException("Cannot step out at top level.");
+        }
+        ContainerInfo containerInfo = containerStack.pop();
+        valueEndPosition = containerInfo.endPosition;
+        valueType = null;
+        valueTypeID = null;
+        fieldNameSid = -1;
+        valueStartPosition = -1;
+    }
+
+    @Override
+    public int getDepth() {
+        return containerStack.size();
+    }
+
+    @Override
+    public SymbolTable getSymbolTable() {
+        if (cachedReadOnlySymbolTable == null) {
+            if (symbols.size() == SYSTEM_SYMBOLS_1_0_SIZE) {
+                cachedReadOnlySymbolTable = SharedSymbolTable.getSystemSymbolTable(majorVersion);
+            } else {
+                cachedReadOnlySymbolTable = new LocalSymbolTableSnapshot();
+            }
+        }
+        return cachedReadOnlySymbolTable;
+    }
+
+    @Override
+    public SymbolTable pop_passed_symbol_table() {
+        if (hasTransferredSymbolTable) {
+            // This symbol table has already been returned. Since the contract is that it is a "pop", it should not
+            // be returned twice.
+            return null;
+        }
+        hasTransferredSymbolTable = true;
+        return getSymbolTable();
+    }
+
+    @Override
+    public IonType getType() {
+        return valueType;
+    }
+
+    @Override
+    public IntegerSize getIntegerSize() {
+        if (valueType != IonType.INT || isNullValue()) {
+            return null;
+        }
+        if (valueTypeID.length < INT_SIZE_IN_BYTES) {
+            // Note: this is conservative. Most integers of size 4 also fit in an int, but since exactly the
+            // same parsing code is used for ints and longs, there is no point wasting the time to determine the
+            // smallest possible type.
+            return IntegerSize.INT;
+        } else if (valueTypeID.length < LONG_SIZE_IN_BYTES) {
+            return IntegerSize.LONG;
+        } else if (valueTypeID.length == LONG_SIZE_IN_BYTES) {
+            // Because creating BigIntegers is so expensive, it is worth it to look ahead and determine exactly
+            // which 8-byte integers can fit in a long.
+            if (valueTypeID.isNegativeInt) {
+                // The smallest negative 8-byte integer that can fit in a long is -0x80_00_00_00_00_00_00_00.
+                int firstByte = buffer.peek(valueStartPosition);
+                if (firstByte < MOST_SIGNIFICANT_BYTE_OF_MIN_LONG) {
+                    return IntegerSize.LONG;
+                } else if (firstByte > MOST_SIGNIFICANT_BYTE_OF_MIN_LONG) {
+                    return IntegerSize.BIG_INTEGER;
+                }
+                for (int i = valueStartPosition + 1; i < valueEndPosition; i++) {
+                    if (0x00 != buffer.peek(i)) {
+                        return IntegerSize.BIG_INTEGER;
+                    }
+                }
+            } else {
+                // The largest positive 8-byte integer that can fit in a long is 0x7F_FF_FF_FF_FF_FF_FF_FF.
+                if (buffer.peek(valueStartPosition) > MOST_SIGNIFICANT_BYTE_OF_MAX_LONG) {
+                    return IntegerSize.BIG_INTEGER;
+                }
+            }
+            return IntegerSize.LONG;
+        }
+        return IntegerSize.BIG_INTEGER;
+    }
+
+    /**
+     * Require that the given type matches the type of the current value.
+     * @param required the required type of current value.
+     */
+    private void requireType(IonType required) {
+        if (required != valueType) {
+            // Note: this is IllegalStateException to match the behavior of the other binary IonReader implementation.
+            throw new IllegalStateException(
+                String.format("Invalid type. Required %s but found %s.", required, valueType)
+            );
+        }
+    }
+
+    /**
+     * Reads a VarUInt.
+     * @return the value.
+     */
+    private int readVarUInt() {
+        int currentByte = 0;
+        int result = 0;
+        while ((currentByte & HIGHEST_BIT_BITMASK) == 0) {
+            currentByte = buffer.peek(peekIndex++);
+            result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
+        }
+        return result;
+    }
+
+    /**
+     * Reads a UInt.
+     * @param limit the position of the first byte after the end of the UInt value.
+     * @return the value.
+     */
+    private long readUInt(int startIndex, int limit) {
+        long result = 0;
+        for (int i = startIndex; i < limit; i++) {
+            result = (result << VALUE_BITS_PER_UINT_BYTE) | buffer.peek(i);
+        }
+        return result;
+    }
+
+    /**
+     * Reads a UInt starting at `valueStartPosition` and ending at `valueEndPosition`.
+     * @return the value.
+     */
+    private long readUInt() {
+        return readUInt(valueStartPosition, valueEndPosition);
+    }
+
+    /**
+     * Reads a VarInt.
+     * @param firstByte the first byte of the VarInt representation, which has already been retrieved from the buffer.
+     * @return the value.
+     */
+    private int readVarInt(int firstByte) {
+        int currentByte = firstByte;
+        int sign = (currentByte & VAR_INT_SIGN_BITMASK) == 0 ? 1 : -1;
+        int result = currentByte & LOWER_SIX_BITS_BITMASK;
+        while ((currentByte & HIGHEST_BIT_BITMASK) == 0) {
+            currentByte = buffer.peek(peekIndex++);
+            result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
+        }
+        return result * sign;
+    }
+
+    /**
+     * Reads a VarInt.
+     * @return the value.
+     */
+    private int readVarInt() {
+        return readVarInt(buffer.peek(peekIndex++));
+    }
+
+    // Scratch space for various byte sizes. Only for use while computing a single value.
+    private static final byte[][] SCRATCH_FOR_SIZE = new byte[][] {
+        new byte[0],
+        new byte[1],
+        new byte[2],
+        new byte[3],
+        new byte[4],
+        new byte[5],
+        new byte[6],
+        new byte[7],
+        new byte[8],
+        new byte[9],
+        new byte[10],
+        new byte[11],
+        new byte[12],
+    };
+
+    /**
+     * Copy the requested number of bytes from the buffer into a scratch buffer of exactly the requested length.
+     * @param startIndex the start index from which to copy.
+     * @param length the number of bytes to copy.
+     * @return the scratch byte array.
+     */
+    private byte[] copyBytesToScratch(int startIndex, int length) {
+        // Note: using reusable scratch buffers makes reading ints and decimals 1-5% faster and causes much less
+        // GC churn.
+        byte[] bytes = null;
+        if (length < SCRATCH_FOR_SIZE.length) {
+            bytes = SCRATCH_FOR_SIZE[length];
+        }
+        if (bytes == null) {
+            bytes = new byte[length];
+        }
+        // The correct number of bytes will be requested from the buffer, so the limit is set at the capacity to
+        // avoid having to calculate a limit.
+        buffer.copyBytes(startIndex, bytes, 0, bytes.length);
+        return bytes;
+    }
+
+    /**
+     * Reads a UInt value into a BigInteger.
+     * @param isNegative true if the resulting BigInteger value should be negative; false if it should be positive.
+     * @return the value.
+     */
+    private BigInteger readUIntAsBigInteger(boolean isNegative) {
+        int length = valueEndPosition - valueStartPosition;
+        // NOTE: unfortunately, there is no BigInteger(int signum, byte[] bits, int offset, int length) constructor
+        // until JDK 9, so copying to scratch space is always required. Migrating to the new constructor will
+        // lead to a significant performance improvement.
+        byte[] magnitude = copyBytesToScratch(valueStartPosition, length);
+        int signum = isNegative ? -1 : 1;
+        return new BigInteger(signum, magnitude);
+    }
+
+    /**
+     * Get and clear the most significant bit in the given byte array.
+     * @param intBytes bytes representing a signed int.
+     * @return -1 if the most significant bit was set; otherwise, 1.
+     */
+    private int getAndClearSignBit(byte[] intBytes) {
+        boolean isNegative = (intBytes[0] & HIGHEST_BIT_BITMASK) != 0;
+        int signum = isNegative ? -1 : 1;
+        if (isNegative) {
+            intBytes[0] &= LOWER_SEVEN_BITS_BITMASK;
+        }
+        return signum;
+    }
+
+    /**
+     * Reads an Int value into a BigInteger.
+     * @param limit the position of the first byte after the end of the UInt value.
+     * @return the value.
+     */
+    private BigInteger readIntAsBigInteger(int limit) {
+        BigInteger value;
+        int length = limit - peekIndex;
+        if (length > 0) {
+            // NOTE: unfortunately, there is no BigInteger(int signum, byte[] bits, int offset, int length) constructor
+            // until JDK 9, so copying to scratch space is always required. Migrating to the new constructor will
+            // lead to a significant performance improvement.
+            byte[] bytes = copyBytesToScratch(peekIndex, length);
+            value = new BigInteger(getAndClearSignBit(bytes), bytes);
+        }
+        else {
+            value = BigInteger.ZERO;
+        }
+        return value;
+    }
+
+    @Override
+    public long longValue() {
+        long value;
+        if (valueType == IonType.INT) {
+            if (valueTypeID.length == 0) {
+                return 0;
+            }
+            value = readUInt();
+            if (valueTypeID.isNegativeInt) {
+                if (value == 0) {
+                    throw new IonException("Int zero may not be negative.");
+                }
+                value *= -1;
+            }
+        } else if (valueType == IonType.FLOAT) {
+            scalarConverter.addValue(doubleValue());
+            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.double_value);
+            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.long_value));
+            value = scalarConverter.getLong();
+            scalarConverter.clear();
+        } else if (valueType == IonType.DECIMAL) {
+            scalarConverter.addValue(decimalValue());
+            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.decimal_value);
+            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.long_value));
+            value = scalarConverter.getLong();
+            scalarConverter.clear();
+        } else {
+            throw new IllegalStateException("longValue() may only be called on values of type int, float, or decimal.");
+        }
+        return value;
+    }
+
+    @Override
+    public BigInteger bigIntegerValue() {
+        BigInteger value;
+        if (valueType == IonType.INT) {
+            if (isNullValue()) {
+                // NOTE: this mimics existing behavior, but should probably be undefined (as, e.g., longValue() is in this
+                //  case).
+                return null;
+            }
+            if (valueTypeID.length == 0) {
+                return BigInteger.ZERO;
+            }
+            value = readUIntAsBigInteger(valueTypeID.isNegativeInt);
+            if (valueTypeID.isNegativeInt && value.signum() == 0) {
+                throw new IonException("Int zero may not be negative.");
+            }
+        } else if (valueType == IonType.FLOAT) {
+            if (isNullValue()) {
+                value = null;
+            } else {
+                scalarConverter.addValue(doubleValue());
+                scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.double_value);
+                scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.bigInteger_value));
+                value = scalarConverter.getBigInteger();
+                scalarConverter.clear();
+            }
+        } else if (valueType == IonType.DECIMAL) {
+            if (isNullValue()) {
+                value = null;
+            } else {
+                scalarConverter.addValue(decimalValue());
+                scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.decimal_value);
+                scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.bigInteger_value));
+                value = scalarConverter.getBigInteger();
+                scalarConverter.clear();
+            }
+        } else {
+            throw new IllegalStateException("longValue() may only be called on values of type int, float, or decimal.");
+        }
+        return value;
+    }
+
+    @Override
+    public Date dateValue() {
+        Timestamp timestamp = timestampValue();
+        if (timestamp == null) {
+            return null;
+        }
+        return timestamp.dateValue();
+    }
+
+    @Override
+    public int intValue() {
+        return (int) longValue();
+    }
+
+    @Override
+    public double doubleValue() {
+        double value;
+        if (valueType == IonType.FLOAT) {
+            int length = valueEndPosition - valueStartPosition;
+            if (length == 0) {
+                return 0.0d;
+            }
+            ByteBuffer bytes = buffer.getByteBuffer(valueStartPosition, valueEndPosition);
+            if (length == FLOAT_32_BYTE_LENGTH) {
+                value = bytes.getFloat();
+            } else {
+                // Note: there is no need to check for other lengths here; the type ID byte is validated during next().
+                value = bytes.getDouble();
+            }
+        }  else if (valueType == IonType.DECIMAL) {
+            scalarConverter.addValue(decimalValue());
+            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.decimal_value);
+            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.double_value));
+            value = scalarConverter.getDouble();
+            scalarConverter.clear();
+        } else {
+            throw new IllegalStateException("doubleValue() may only be called on values of type float or decimal.");
+        }
+        return value;
+    }
+
+    /**
+     * Decodes a string from the buffer into a String value.
+     * @param valueStart the position in the buffer of the first byte in the string.
+     * @param valueEnd the position in the buffer of the last byte in the string.
+     * @return the value.
+     */
+    private String readString(int valueStart, int valueEnd) {
+        ByteBuffer utf8InputBuffer = buffer.getByteBuffer(valueStart, valueEnd);
+
+        int numberOfBytes = valueEnd - valueStart;
+        if (numberOfBytes > utf8DecodingBuffer.capacity()) {
+            utf8DecodingBuffer = CharBuffer.allocate(numberOfBytes);
+        }
+
+        utf8DecodingBuffer.position(0);
+        utf8DecodingBuffer.limit(utf8DecodingBuffer.capacity());
+
+        utf8CharsetDecoder.reset();
+        CoderResult coderResult = utf8CharsetDecoder.decode(utf8InputBuffer, utf8DecodingBuffer, true);
+        if (coderResult.isError()) {
+            throw new IonException("Illegal value encountered while validating UTF-8 data in input stream. " + coderResult.toString());
+        }
+        utf8DecodingBuffer.flip();
+        return utf8DecodingBuffer.toString();
+    }
+
+    @Override
+    public String stringValue() {
+        String value;
+        if (valueType == IonType.STRING) {
+            if (isNullValue()) {
+                return null;
+            }
+            value = readString(valueStartPosition, valueEndPosition);
+        } else if (valueType == IonType.SYMBOL) {
+            if (isNullValue()) {
+                return null;
+            }
+            int sid = (int) readUInt();
+            value = getSymbol(sid);
+            if (value == null) {
+                throw new UnknownSymbolException(sid);
+            }
+        } else {
+            throw new IllegalStateException("Invalid type requested.");
+        }
+        return value;
+    }
+
+    @Override
+    public SymbolToken symbolValue() {
+        requireType(IonType.SYMBOL);
+        if (isNullValue()) {
+            return null;
+        }
+        int sid = (int) readUInt();
+        return getSymbolToken(sid);
+    }
+
+    @Override
+    public int byteSize() {
+        if (!IonType.isLob(valueType) && !isNullValue()) {
+            throw new IonException("Reader must be positioned on a blob or clob.");
+        }
+        return valueEndPosition - valueStartPosition;
+    }
+
+    @Override
+    public byte[] newBytes() {
+        byte[] bytes = new byte[byteSize()];
+        // The correct number of bytes will be requested from the buffer, so the limit is set at the capacity to
+        // avoid having to calculate a limit.
+        buffer.copyBytes(valueStartPosition, bytes, 0, bytes.length);
+        return bytes;
+    }
+
+    @Override
+    public int getBytes(byte[] bytes, int offset, int len) {
+        int length = Math.min(len, byteSize() - lobBytesRead);
+        // The correct number of bytes will be requested from the buffer, so the limit is set at the capacity to
+        // avoid having to calculate a limit.
+        buffer.copyBytes(valueStartPosition + lobBytesRead, bytes, offset, length);
+        lobBytesRead += length;
+        return length;
+    }
+
+    /**
+     * Reads a decimal value as a BigDecimal.
+     * @return the value.
+     */
+    private BigDecimal readBigDecimal() {
+        int length = valueEndPosition - peekIndex;
+        if (length == 0) {
+            return BigDecimal.ZERO;
+        }
+        int scale = -readVarInt();
+        BigDecimal value;
+        if (length < LONG_SIZE_IN_BYTES) {
+            // No need to allocate a BigInteger to hold the coefficient.
+            long coefficient = 0;
+            int sign = 1;
+            if (peekIndex < valueEndPosition) {
+                int firstByte = buffer.peek(peekIndex++);
+                sign = (firstByte & HIGHEST_BIT_BITMASK) == 0 ? 1 : -1;
+                coefficient = firstByte & LOWER_SEVEN_BITS_BITMASK;
+            }
+            while (peekIndex < valueEndPosition) {
+                coefficient = (coefficient << VALUE_BITS_PER_UINT_BYTE) | buffer.peek(peekIndex++);
+            }
+            value = BigDecimal.valueOf(coefficient * sign, scale);
+        } else {
+            // The coefficient may overflow a long, so a BigInteger is required.
+            value = new BigDecimal(readIntAsBigInteger(valueEndPosition), scale);
+        }
+        return value;
+    }
+
+    /**
+     * Reads a decimal value as a Decimal.
+     * @return the value.
+     */
+    private Decimal readDecimal() {
+        int length = valueEndPosition - peekIndex;
+        if (length == 0) {
+            return Decimal.ZERO;
+        }
+        int scale = -readVarInt();
+        BigInteger coefficient;
+        length = valueEndPosition - peekIndex;
+        if (length > 0) {
+            // NOTE: unfortunately, there is no BigInteger(int signum, byte[] bits, int offset, int length) constructor,
+            // so copying to scratch space is always required.
+            byte[] bits = copyBytesToScratch(peekIndex, length);
+            int signum = getAndClearSignBit(bits);
+            // NOTE: there is a BigInteger.valueOf(long unscaledValue, int scale) factory method that avoids allocating
+            // a BigInteger for coefficients that fit in a long. See its use in readBigDecimal() above. Unfortunately,
+            // it is not possible to use this for Decimal because the necessary BigDecimal constructor is
+            // package-private. If a compatible BigDecimal constructor is added in a future JDK revision, a
+            // corresponding factory method should be added to Decimal to enable this optimization.
+            coefficient = new BigInteger(signum, bits);
+            if (coefficient.signum() == 0 && signum < 0) {
+                return Decimal.negativeZero(scale);
+            }
+        }
+        else {
+            coefficient = BigInteger.ZERO;
+        }
+        return Decimal.valueOf(coefficient, scale);
+    }
+
+    @Override
+    public BigDecimal bigDecimalValue() {
+        requireType(IonType.DECIMAL);
+        if (isNullValue()) {
+            return null;
+        }
+        peekIndex = valueStartPosition;
+        return readBigDecimal();
+    }
+
+    @Override
+    public Decimal decimalValue() {
+        requireType(IonType.DECIMAL);
+        if (isNullValue()) {
+            return null;
+        }
+        peekIndex = valueStartPosition;
+        return readDecimal();
+    }
+
+    @Override
+    public Timestamp timestampValue() {
+        requireType(IonType.TIMESTAMP);
+        if (isNullValue()) {
+            return null;
+        }
+        peekIndex = valueStartPosition;
+        int firstByte = buffer.peek(peekIndex++);
+        Integer offset = null;
+        if (firstByte != VAR_INT_NEGATIVE_ZERO) {
+            offset = readVarInt(firstByte);
+        }
+        int year = readVarUInt();
+        int month = 0;
+        int day = 0;
+        int hour = 0;
+        int minute = 0;
+        int second = 0;
+        BigDecimal fractionalSecond = null;
+        Timestamp.Precision precision = Timestamp.Precision.YEAR;
+        if (peekIndex < valueEndPosition) {
+            month = readVarUInt();
+            precision = Timestamp.Precision.MONTH;
+            if (peekIndex < valueEndPosition) {
+                day = readVarUInt();
+                precision = Timestamp.Precision.DAY;
+                if (peekIndex < valueEndPosition) {
+                    hour = readVarUInt();
+                    if (peekIndex >= valueEndPosition) {
+                        throw new IonException("Timestamps may not specify hour without specifying minute.");
+                    }
+                    minute = readVarUInt();
+                    precision = Timestamp.Precision.MINUTE;
+                    if (peekIndex < valueEndPosition) {
+                        second = readVarUInt();
+                        precision = Timestamp.Precision.SECOND;
+                        if (peekIndex < valueEndPosition) {
+                            fractionalSecond = readBigDecimal();
+                            if (fractionalSecond.signum() < 0 || fractionalSecond.compareTo(BigDecimal.ONE) >= 0) {
+                                throw new IonException("The fractional seconds value in a timestamp must be greater" +
+                                        "than or equal to zero and less than one.");
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        try {
+            return Timestamp.createFromUtcFields(
+                    precision,
+                    year,
+                    month,
+                    day,
+                    hour,
+                    minute,
+                    second,
+                    fractionalSecond,
+                    offset
+            );
+        } catch (IllegalArgumentException e) {
+            throw new IonException("Illegal timestamp encoding. ", e);
+        }
+    }
+
+    /**
+     * Gets the annotation symbol IDs for the current value, reading them from the buffer first if necessary.
+     * @return the annotation symbol IDs, or an empty list if the current value is not annotated.
+     */
+    private List<Integer> getAnnotationSids() {
+        if (containerStack.isEmpty()) {
+            return lookahead.getAnnotationSids();
+        } else {
+            if (annotationSids.isEmpty()) {
+                int savedPeekIndex = peekIndex;
+                peekIndex = annotationStartPosition;
+                long annotationsEndPosition = peekIndex + annotationsLength;
+                while (peekIndex < annotationsEndPosition) {
+                    annotationSids.add(readVarUInt());
+                }
+                peekIndex = savedPeekIndex;
+            }
+            return annotationSids;
+        }
+    }
+
+    @Override
+    public String[] getTypeAnnotations() {
+        if (hasAnnotations) {
+            List<Integer> annotationSids = getAnnotationSids();
+            String[] annotationArray = new String[annotationSids.size()];
+            for (int i = 0; i < annotationArray.length; i++) {
+                String symbol = getSymbol(annotationSids.get(i));
+                if (symbol == null) {
+                    throw new UnknownSymbolException(annotationSids.get(i));
+                }
+                annotationArray[i] = symbol;
+            }
+            return annotationArray;
+        }
+        return _Private_Utils.EMPTY_STRING_ARRAY;
+    }
+
+    @Override
+    public SymbolToken[] getTypeAnnotationSymbols() {
+        if (hasAnnotations) {
+            List<Integer> annotationSids = getAnnotationSids();
+            SymbolToken[] annotationArray = new SymbolToken[annotationSids.size()];
+            for (int i = 0; i < annotationArray.length; i++) {
+                annotationArray[i] = getSymbolToken(annotationSids.get(i));
+            }
+            return annotationArray;
+        }
+        return SymbolToken.EMPTY_ARRAY;
+    }
+
+    private static final Iterator<String> EMPTY_ITERATOR = new Iterator<String>() {
+
+        @Override
+        public boolean hasNext() {
+            return false;
+        }
+
+        @Override
+        public String next() {
+            return null;
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException("Cannot remove from an empty iterator.");
+        }
+    };
+
+    @Override
+    public Iterator<String> iterateTypeAnnotations() {
+        if (hasAnnotations) {
+            if (isAnnotationIteratorReuseEnabled) {
+                annotationIterator.reset();
+                return annotationIterator;
+            } else {
+                return new SingleUseAnnotationIterator();
+            }
+        }
+        return EMPTY_ITERATOR;
+    }
+
+    @Override
+    public int getFieldId() {
+        return fieldNameSid;
+    }
+
+    @Override
+    public String getFieldName() {
+        if (fieldNameSid < 0) {
+            return null;
+        }
+        String fieldName = getSymbol(fieldNameSid);
+        if (fieldName == null) {
+            throw new UnknownSymbolException(fieldNameSid);
+        }
+        return fieldName;
+    }
+
+    @Override
+    public SymbolToken getFieldNameSymbol() {
+        if (fieldNameSid < 0) {
+            return null;
+        }
+        return getSymbolToken(fieldNameSid);
+    }
+
+    @Override
+    public boolean isNullValue() {
+        return valueTypeID != null && valueTypeID.isNull;
+    }
+
+    @Override
+    public boolean isInStruct() {
+        return !containerStack.isEmpty() && containerStack.peek().type == IonType.STRUCT;
+    }
+
+    @Override
+    public boolean booleanValue() {
+        requireType(IonType.BOOL);
+        return valueTypeID.lowerNibble == 1;
+    }
+
+    @Override
+    public <T> T asFacet(Class<T> facetType) {
+        return null;
+    }
+
+    @Override
+    public void close() throws IOException {
+        // NOTE: If we want to replace the other binary IonReader implementation with this one, the following
+        // validation could be performed in next() if incremental mode is not enabled. That would allow this
+        // implementation to behave in the same way as the other implementation when an incomplete value is
+        // encountered.
+        if (lookahead.isSkippingCurrentValue()) {
+            throw new IonException("Unexpected EOF.");
+        }
+        if (lookahead.available() > 0 && lookahead.moreDataRequired()) {
+            if (lookahead.getIvmIndex() < 0
+                || lookahead.available() != _Private_IonConstants.BINARY_VERSION_MARKER_SIZE) {
+                throw new IonException("Unexpected EOF.");
+            }
+        }
+        inputStream.close();
+    }
+
+}
diff --git a/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java b/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
new file mode 100644
index 0000000000..325daa9990
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
@@ -0,0 +1,921 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonType;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Monitors an InputStream over binary Ion data to ensure enough data is available to be navigated successfully by a
+ * non-incremental IonReader.
+ * <p>
+ * Error reporting: this wrapper reads the least amount of Ion data possible in order to determine whether a value
+ * is complete. As such, it will not raise any errors if invalid data exists anywhere outside the header of a
+ * top-level value. Any such invalid data will be detected as normal by the IonReader. In the few cases where this
+ * wrapper does detect an error (e.g. upon finding the illegal type 0xF), it will raise {@link IonException}.
+ */
+public final class IonReaderLookaheadBuffer extends ReaderLookaheadBufferBase {
+
+    private static final int LOWER_SEVEN_BITS_BITMASK = 0x7F;
+    private static final int HIGHEST_BIT_BITMASK = 0x80;
+    private static final int VALUE_BITS_PER_VARUINT_BYTE = 7;
+    // Note: because long is a signed type, Long.MAX_VALUE is represented in Long.SIZE - 1 bits.
+    private static final int MAXIMUM_SUPPORTED_VAR_UINT_BYTES = (Long.SIZE - 1) / VALUE_BITS_PER_VARUINT_BYTE;
+    private static final int IVM_START_BYTE = 0xE0;
+    private static final int IVM_REMAINING_LENGTH = 3; // Length of the IVM after the first byte.
+    private static final int ION_SYMBOL_TABLE_SID = 3;
+
+    /**
+     * Represents a VarUInt that may be read in multiple steps.
+     */
+    private static final class VarUInt {
+
+        /**
+         * The location of the VarUInt in the value header.
+         */
+        private enum Location {
+            /**
+             * The length field that is included when the low nibble of a value's type ID is VARIABLE_LENGTH_NIBBLE.
+             */
+            VALUE_LENGTH,
+            /**
+             * The length field that is included when the low nibble of an annotation wrapper's type ID is
+             * VARIABLE_LENGTH_NIBBLE.
+             */
+            ANNOTATION_WRAPPER_LENGTH,
+            /**
+             * The annot_length field that always precedes the SIDs in an annotation wrapper. Indicates the number
+             * of total bytes used to represent the SIDs that follow.
+             */
+            ANNOTATION_WRAPPER_SIDS_LENGTH,
+            /**
+             * A symbol ID. An annotation wrapper may contain more than one.
+             */
+            ANNOTATION_WRAPPER_SID
+        }
+
+        /**
+         * The location.
+         */
+        private VarUInt.Location location;
+
+        /**
+         * The value accumulated so far. This will only be the actual value when `isComplete` is true.
+         */
+        private long value;
+
+        /**
+         * The number of bytes in the VarUInt representation that have been read so far. This is only the total
+         * number of bytes in the representation when `isComplete` is true.
+         */
+        private int numberOfBytesRead;
+
+        /**
+         * True when the VarUInt is complete; otherwise, false.
+         */
+        private boolean isComplete;
+
+        /**
+         * Constructor.
+         */
+        private VarUInt() {
+            reset(Location.VALUE_LENGTH);
+        }
+
+        /**
+         * Resets the value to zero.
+         * @param nextLocation the location of the next VarUInt to read.
+         */
+        private void reset(final Location nextLocation) {
+            location = nextLocation;
+            value = 0;
+            numberOfBytesRead = 0;
+            isComplete = false;
+        }
+    }
+
+    /**
+     * The state of the wrapper.
+     */
+    private enum State {
+        /**
+         * Positioned before the type ID of a top-level value.
+         */
+        BEFORE_TYPE_ID,
+
+        /**
+         * Started reading a value's type ID, but did not finish because the byte was not yet available.
+         */
+        READING_TYPE_ID,
+
+        /**
+         * Reading the value's header, which includes all bytes between the type ID and the first byte of
+         * the value representation.
+         */
+        READING_HEADER,
+
+        /**
+         * Skipping over the value representation.
+         */
+        SKIPPING_VALUE,
+
+        /**
+         * Reading the type ID of a value annotated with $ion_symbol_table to determine whether it is a
+         * struct.
+         */
+        READING_VALUE_WITH_SYMBOL_TABLE_ANNOTATION,
+
+        /**
+         * Reading the length of a struct annotated with $ion_symbol_table.
+         */
+        READING_SYMBOL_TABLE_LENGTH,
+
+        /**
+         * There is nothing left to do.
+         */
+        DONE
+    }
+
+    /**
+     * Holds the start and end indices of a buffered symbol table.
+     */
+    static class SymbolTableMarker {
+        /**
+         * Index of the first byte of the symbol table struct's contents.
+         */
+        int startIndex;
+
+        /**
+         * Index of the first byte after the end of the symbol table.
+         */
+        int endIndex;
+
+        /**
+         * @param startIndex index of the first byte of the symbol table struct's contents.
+         * @param length the number of bytes that remain in the symbol table struct after 'startIndex'.
+         */
+        private SymbolTableMarker(final int startIndex, final int length) {
+            this.startIndex = startIndex;
+            this.endIndex = startIndex + length;
+        }
+    }
+
+    /**
+     * The number of bytes to attempt to buffer each time more bytes are required.
+     */
+    private final int pageSize;
+
+    /**
+     * The VarUInt currently in progress.
+     */
+    private final VarUInt inProgressVarUInt;
+
+    /**
+     * Markers for any symbol tables that occurred in the stream between the last value and the current value.
+     */
+    private final List<SymbolTableMarker> symbolTableMarkers = new ArrayList<SymbolTableMarker>(2);
+
+    /**
+     * The symbol IDs of any annotations on the current value.
+     */
+    private final List<Integer> annotationSids = new ArrayList<Integer>(3);
+
+    /**
+     * The handler that will be notified when a symbol table exceeds the maximum buffer size.
+     */
+    private final IonBufferConfiguration.OversizedSymbolTableHandler oversizedSymbolTableHandler;
+
+    /**
+     * The number of additional bytes that must be read from `input` and stored in `pipe` before
+     * {@link #moreDataRequired()} can return false.
+     */
+    private long additionalBytesNeeded;
+
+    /**
+     * True if the current value is a system value (IVM, symbol table, or NOP pad), not a user value.
+     * `IonReader#next()` consumes any system values before the next user value, so the wrapper
+     * must be able to identify system values so that their bytes can be included in `pipe` before
+     * {@link #moreDataRequired()} returns false.
+     */
+    private boolean isSystemValue;
+
+    /**
+     * True if the current value has an annotation wrapper whose first annotation is `$ion_symbol_table`.
+     * The value will be deemed a system value if it is later determined to be a struct.
+     */
+    private boolean isSymbolTableAnnotationFirst;
+
+    /**
+     * The number of bytes of annotation SIDs left to read from the value's annotation wrapper.
+     */
+    private long numberOfAnnotationSidBytesRemaining;
+
+    /**
+     * The number of annotations in the annotation wrapper that have been processed so far.
+     */
+    private long currentNumberOfAnnotations;
+
+    /**
+     * The current state of the wrapper.
+     */
+    private State state = State.BEFORE_TYPE_ID;
+
+    /**
+     * The write index of the start of the current value.
+     */
+    private int valueStartWriteIndex;
+
+    /**
+     * The number of bytes available in the buffer if truncated to `valueStartWriteIndex`.
+     */
+    private int valueStartAvailable;
+
+    /**
+     * The read index of the type ID byte of the current value.
+     */
+    private int valuePreHeaderIndex;
+
+    /**
+     * The read index of the first byte of the value representation of the current value (past the type ID and the
+     * optional length field).
+     */
+    private int valuePostHeaderIndex;
+
+    /**
+     * The type ID byte of the current value.
+     */
+    private IonTypeID valueTid;
+
+    /**
+     * The index of the first byte after the end of the current value.
+     */
+    private int valueEndIndex;
+
+    /**
+     * The index of the first byte of the first no-op pad that precedes the current value. -1 indicates either that
+     * the current value was not preceded by no-op padding or that the space occupied by the no-op padding that preceded
+     * the current value has already been reclaimed.
+     */
+    private int nopPadStartIndex = -1;
+
+    /**
+     * The index of the second byte of the IVM.
+     */
+    private int ivmSecondByteIndex = -1;
+
+    /**
+     * The index of the next byte to peek from the buffer.
+     */
+    private int peekIndex = 0;
+
+    /**
+     * True if the event handler has not yet been notified if the current value is oversized.
+     */
+    private boolean handlerNeedsToBeNotifiedOfOversizedValue = true;
+
+    /**
+     * Resets the wrapper to the start of a new value.
+     */
+    private void reset() {
+        additionalBytesNeeded = 0;
+        isSystemValue = false;
+        isSymbolTableAnnotationFirst = false;
+        numberOfAnnotationSidBytesRemaining = 0;
+        currentNumberOfAnnotations = 0;
+        valuePreHeaderIndex = -1;
+        valuePostHeaderIndex = -1;
+        valueTid = null;
+        valueEndIndex = -1;
+        annotationSids.clear();
+        valueStartAvailable = pipe.available();
+        startNewValue();
+    }
+
+    /**
+     * Constructs a wrapper with the given configuration.
+     * @param configuration the configuration for the new instance.
+     * @param inputStream an InputStream over binary Ion data.
+     */
+    public IonReaderLookaheadBuffer(final IonBufferConfiguration configuration, final InputStream inputStream) {
+        super(configuration, inputStream);
+        pipe.registerNotificationConsumer(
+            new ResizingPipedInputStream.NotificationConsumer() {
+                @Override
+                public void bytesConsolidatedToStartOfBuffer(int leftShiftAmount) {
+                    // The existing data in the buffer has been shifted to the start. Adjust the saved indexes
+                    // accordingly. -1 indicates that all indices starting at 0 will be shifted.
+                    shiftIndicesLeft(-1, leftShiftAmount);
+                }
+            }
+        );
+        pageSize = configuration.getInitialBufferSize();
+        oversizedSymbolTableHandler = configuration.getOversizedSymbolTableHandler();
+        inProgressVarUInt = new VarUInt();
+        reset();
+    }
+
+    /**
+     * Resets the `inProgressVarUInt`.
+     * @param location the VarUInt's location.
+     */
+    private void initializeVarUInt(final VarUInt.Location location) {
+        inProgressVarUInt.reset(location);
+        state = State.READING_HEADER;
+    }
+
+    /**
+     * Reads one byte, if possible.
+     * @return the byte, or -1 if none was available.
+     * @throws Exception if thrown by a handler method or if an IOException is thrown by the underlying InputStream.
+     */
+    private int readByte() throws Exception {
+        if (pipe.availableBeyondBoundary() == 0 && fillPage(1) < 1) {
+            return -1;
+        }
+        int b;
+        if (isSkippingCurrentValue()) {
+            // If the value is being skipped, the byte will not have been buffered.
+            b = getInput().read();
+        } else {
+            b = pipe.peek(peekIndex);
+            pipe.extendBoundary(1);
+            peekIndex++;
+        }
+        return b;
+    }
+
+    /**
+     * Reads a VarUInt. NOTE: the VarUInt must fit in a `long`. This is not a true limitation, as IonJava requires
+     * VarUInts to fit in an `int`.
+     * @throws Exception if thrown by a handler method or if an IOException is thrown by the underlying InputStream.
+     */
+    private void readVarUInt() throws Exception {
+        int currentByte;
+        while (inProgressVarUInt.numberOfBytesRead < MAXIMUM_SUPPORTED_VAR_UINT_BYTES) {
+            currentByte = readByte();
+            if (currentByte < 0) {
+                return;
+            }
+            inProgressVarUInt.numberOfBytesRead++;
+            inProgressVarUInt.value =
+                    (inProgressVarUInt.value << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
+            if ((currentByte & HIGHEST_BIT_BITMASK) != 0) {
+                inProgressVarUInt.isComplete = true;
+                dataHandler.onData(inProgressVarUInt.numberOfBytesRead);
+                return;
+            }
+        }
+        throw new IonException("Found a VarUInt that was too large to fit in a `long`");
+    }
+
+    /**
+     * Sets `additionalBytesNeeded` if and only if the value is not within an annotation wrapper. When the
+     * value is contained in an annotation wrapper, `additionalBytesNeeded` was set when reading the annotation
+     * wrapper's length and already includes the value's length.
+     * @param value the new value of `additionalBytesNeeded`.
+     * @param isUnannotated true if this type ID is not on a value within an annotation wrapper; false if it is.
+     */
+    private void setAdditionalBytesNeeded(final long value, final boolean isUnannotated) {
+        if (isUnannotated) {
+            additionalBytesNeeded = value;
+        }
+    }
+
+    /**
+     * Conveys the result of {@link #readTypeID(boolean)}.
+     */
+    private enum ReadTypeIdResult {
+        /**
+         * The type ID is for a struct value.
+         */
+        STRUCT,
+        /**
+         * The type ID is not for a struct value.
+         */
+        NOT_STRUCT,
+        /**
+         * The type ID could not be read because there is no data available. `readTypeID` should be called
+         * again when more data is available.
+         */
+        NO_DATA
+    }
+
+    /**
+     * Reads the type ID byte.
+     * @param isUnannotated true if this type ID is not on a value within an annotation wrapper; false if it is.
+     * @return the result as a {@link ReadTypeIdResult}.
+     * @throws Exception if thrown by a handler method or if an IOException is thrown by the underlying InputStream.
+     */
+    private ReadTypeIdResult readTypeID(final boolean isUnannotated) throws Exception {
+        int header = readByte();
+        if (header < 0) {
+            return ReadTypeIdResult.NO_DATA;
+        }
+        valueTid = IonTypeID.TYPE_IDS[header];
+        dataHandler.onData(1);
+        if (header == IVM_START_BYTE) {
+            if (!isUnannotated) {
+                throw new IonException("Invalid annotation header.");
+            }
+            additionalBytesNeeded = IVM_REMAINING_LENGTH;
+            isSystemValue = true;
+            // Encountering an IVM resets the symbol table context; no need to parse any previous symbol tables.
+            resetSymbolTableMarkers();
+            ivmSecondByteIndex = peekIndex;
+            state = State.SKIPPING_VALUE;
+        } else if (!valueTid.isValid) {
+            throw new IonException("Invalid type ID.");
+        } else if (valueTid.type == IonType.BOOL) {
+            // bool values are always a single byte.
+            state = State.BEFORE_TYPE_ID;
+        } else if (valueTid.type == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
+            // Annotation.
+            if (valueTid.variableLength) {
+                initializeVarUInt(VarUInt.Location.ANNOTATION_WRAPPER_LENGTH);
+            } else {
+                setAdditionalBytesNeeded(valueTid.length, isUnannotated);
+                initializeVarUInt(VarUInt.Location.ANNOTATION_WRAPPER_SIDS_LENGTH);
+            }
+        } else {
+            if (valueTid.isNull) {
+                // null values are always a single byte.
+                state = State.BEFORE_TYPE_ID;
+            } else {
+                // Not null
+                if (valueTid.variableLength) {
+                    initializeVarUInt(VarUInt.Location.VALUE_LENGTH);
+                } else {
+                    setAdditionalBytesNeeded(valueTid.length, isUnannotated);
+                    state = State.SKIPPING_VALUE;
+                }
+            }
+        }
+        if (valueTid.type == IonType.STRUCT) {
+            return ReadTypeIdResult.STRUCT;
+        }
+        return ReadTypeIdResult.NOT_STRUCT;
+    }
+
+    /**
+     * Reads the bytes of the value header that occur after the type ID byte and before the first value byte.
+     * @throws Exception if thrown by a handler method or if an IOException is thrown by the underlying InputStream.
+     */
+    private void readHeader() throws Exception {
+        if (inProgressVarUInt.location == VarUInt.Location.VALUE_LENGTH) {
+            readVarUInt();
+            if (inProgressVarUInt.isComplete) {
+                additionalBytesNeeded = inProgressVarUInt.value;
+                state = State.SKIPPING_VALUE;
+            }
+            return;
+        }
+        if (inProgressVarUInt.location == VarUInt.Location.ANNOTATION_WRAPPER_LENGTH) {
+            readVarUInt();
+            if (!inProgressVarUInt.isComplete) {
+                return;
+            }
+            additionalBytesNeeded = inProgressVarUInt.value;
+            initializeVarUInt(VarUInt.Location.ANNOTATION_WRAPPER_SIDS_LENGTH);
+        }
+        if (inProgressVarUInt.location == VarUInt.Location.ANNOTATION_WRAPPER_SIDS_LENGTH) {
+            readVarUInt();
+            if (!inProgressVarUInt.isComplete) {
+                return;
+            }
+            additionalBytesNeeded -= inProgressVarUInt.numberOfBytesRead;
+            numberOfAnnotationSidBytesRemaining = inProgressVarUInt.value;
+            initializeVarUInt(VarUInt.Location.ANNOTATION_WRAPPER_SID);
+        }
+        if (inProgressVarUInt.location == VarUInt.Location.ANNOTATION_WRAPPER_SID) {
+            while (true) {
+                readVarUInt();
+                if (inProgressVarUInt.isComplete) {
+                    currentNumberOfAnnotations++;
+                    if (currentNumberOfAnnotations == 1 && inProgressVarUInt.value == ION_SYMBOL_TABLE_SID) {
+                        isSymbolTableAnnotationFirst = true;
+                    }
+                    annotationSids.add((int) inProgressVarUInt.value);
+                    numberOfAnnotationSidBytesRemaining -= inProgressVarUInt.numberOfBytesRead;
+                    additionalBytesNeeded -= inProgressVarUInt.numberOfBytesRead;
+                    if (numberOfAnnotationSidBytesRemaining <= 0) {
+                        state = State.SKIPPING_VALUE;
+                    } else {
+                        initializeVarUInt(VarUInt.Location.ANNOTATION_WRAPPER_SID);
+                        continue;
+                    }
+                    if (isSymbolTableAnnotationFirst) {
+                        state = State.READING_VALUE_WITH_SYMBOL_TABLE_ANNOTATION;
+                    }
+                }
+                break;
+            }
+        }
+    }
+
+    /**
+     * Shift all indices after 'afterIndex' left by the given amount. This is used when data is moved in the underlying
+     * buffer either due to buffer growth or NOP padding being reclaimed to make room for a value that would otherwise
+     * exceed the buffer's maximum size.
+     * @param afterIndex all indices after this index will be shifted (-1 indicates that all indices should be shifted).
+     * @param shiftAmount the amount to shift left.
+     */
+    private void shiftIndicesLeft(int afterIndex, int shiftAmount) {
+        peekIndex = Math.max(peekIndex - shiftAmount, 0);
+        valuePreHeaderIndex -= shiftAmount;
+        valuePostHeaderIndex -= shiftAmount;
+        for (SymbolTableMarker symbolTableMarker : symbolTableMarkers) {
+            if (symbolTableMarker.startIndex > afterIndex) {
+                symbolTableMarker.startIndex -= shiftAmount;
+                symbolTableMarker.endIndex -= shiftAmount;
+            }
+        }
+        if (ivmSecondByteIndex > afterIndex) {
+            ivmSecondByteIndex -= shiftAmount;
+        }
+    }
+
+    /**
+     * Reclaim the NOP padding that occurred before the current value, making space for the value in the buffer.
+     */
+    private void reclaimNopPadding() {
+        pipe.consolidate(valuePreHeaderIndex, nopPadStartIndex);
+        shiftIndicesLeft(nopPadStartIndex, valuePreHeaderIndex - nopPadStartIndex);
+        resetNopPadIndex();
+    }
+
+    /**
+     * Skip bytes from the underlying InputStream without ever buffering them.
+     * @param numberOfBytesToSkip the number of bytes to attempt to skip.
+     * @return the number of bytes actually skipped.
+     * @throws IOException if thrown by the underlying InputStream.
+     */
+    private int skipBytesFromInput(int numberOfBytesToSkip) throws IOException {
+        try {
+            return (int) getInput().skip(numberOfBytesToSkip);
+        } catch (EOFException e) {
+            // Certain InputStream implementations (e.g. GZIPInputStream) throw EOFException if more bytes are requested
+            // to skip than are currently available (e.g. if a header or trailer is incomplete).
+            return 0;
+        }
+    }
+
+    /**
+     * Retrieve and buffer up to {@link #pageSize} bytes from the input.
+     * @param numberOfBytesRequested the minimum amount of space that must be available before the buffer reaches
+     *                               its configured maximum size.
+     * @return the number of bytes buffered by this operation.
+     * @throws Exception if thrown by the underlying InputStream.
+     */
+    private int fillPage(int numberOfBytesRequested) throws Exception {
+        int amountToFill = pipe.capacity() - pipe.size();
+        if (amountToFill <= 0) {
+            // Try to fill the remainder of the existing buffer to avoid growing unnecessarily. If there is no
+            // space, that indicates that a single value exceeds the size of a page. In that case, fill another page,
+            // growing the buffer only up to the configured maximum size.
+            int spaceAvailable = getMaximumBufferSize() - pipe.capacity();
+            if (numberOfBytesRequested > spaceAvailable) {
+                if (nopPadStartIndex > -1 && valuePreHeaderIndex - nopPadStartIndex >= numberOfBytesRequested) {
+                    // Reclaim the NOP pad space if doing so would allow the value to fit.
+                    reclaimNopPadding();
+                } else {
+                    startSkippingValue();
+                }
+                amountToFill = numberOfBytesRequested;
+            } else {
+                amountToFill = Math.min(pageSize, spaceAvailable);
+            }
+        }
+        int received;
+        if (isSkippingCurrentValue()) {
+            if (state == State.SKIPPING_VALUE) {
+                // This is a seek operation, meaning that the bytes don't need to be interpreted.
+                received = skipBytesFromInput(amountToFill);
+            } else {
+                // The bytes need to be interpreted, so they cannot be skipped. The caller must retrieve them from
+                // the input.
+                received = amountToFill;
+            }
+        } else {
+            received = pipe.receive(getInput(), amountToFill);
+        }
+        return received;
+    }
+
+    /**
+     * Notifies the event handler that the current value is oversized, if the handler has not already been notified.
+     * @throws Exception if thrown by the handler.
+     */
+    private void notifyHandlerOfOversizedValue() throws Exception {
+        if (handlerNeedsToBeNotifiedOfOversizedValue) {
+            if (isSystemValue) {
+                // Processing cannot continue after system values (symbol tables) are truncated because subsequent
+                // values may be unreadable. Notify the user.
+                oversizedSymbolTableHandler.onOversizedSymbolTable();
+            } else {
+                // An oversized user value has been encountered. Notify the user so they can decide whether to continue
+                // or abort.
+                oversizedValueHandler.onOversizedValue();
+            }
+        }
+        handlerNeedsToBeNotifiedOfOversizedValue = false;
+    }
+
+    /**
+     * Attempt to retrieve at least `additionalBytesNeeded` bytes from the input and either buffer them (if the value
+     * is being consumed) or skip them (if the value is being skipped due to being oversize).
+     * @return the number of bytes filled or skipped.
+     * @throws Exception if thrown by the event handler.
+     */
+    private int fillOrSkip() throws Exception {
+        // Clamping at the number of buffered bytes available guarantees that the buffer
+        // will never grow beyond its initial size.
+        int bytesRequested = (int) additionalBytesNeeded - pipe.availableBeyondBoundary();
+        int bytesFilled;
+        if (isSkippingCurrentValue()) {
+            bytesFilled = skipBytesFromInput(bytesRequested);
+        } else {
+            bytesFilled = fillPage(bytesRequested);
+        }
+        if (bytesFilled < 1) {
+            return 0;
+        }
+        if (isSkippingCurrentValue()) {
+            // The user cannot be notified of a size violation until it has been determined whether
+            // the value is a symbol table or user value, which is only true in the SKIPPING_VALUE
+            // state.
+            notifyHandlerOfOversizedValue();
+            // Skip all of the bytes skipped from the InputStream as well as all bytes previously
+            // buffered.
+            bytesFilled = bytesFilled + ((int) additionalBytesNeeded - bytesRequested);
+        } else {
+            bytesFilled = (int) Math.min(additionalBytesNeeded, bytesFilled);
+            pipe.extendBoundary(bytesFilled);
+            peekIndex += bytesFilled;
+        }
+        return bytesFilled;
+    }
+
+    /*
+     * The state transitions of the fillInput() method are summarized by the following diagram.
+     *
+     *                                 fillInput()
+     *                                       |
+     *                                       |   +----------------------------------------------------+
+     *                                       |   |                                                    |
+     *       Read first byte of IVM +--------v---v-+                                                  |
+     *   +--------------------------+BEFORE_TYPE_ID<--+                                               |
+     *   |   Or length was inferred |              +--+1-byte value(null or bool) read                |
+     *   |    from the type ID    +>+------+-------+                                                  |
+     *   |                        |        |                                                          |
+     *   |                        |        |No bytes available                                        |
+     *   |           1-byte value |        v                                                          |
+     *   |                        | +----------------+                                                |
+     *   |                        +-+READING_TYPE_ID <-+                                              |
+     *   |                          |                +-+No bytes available                            |
+     *   |                          +------+---------+                                                |
+     *   |                                 |Read type-id of multi-byte value                          |
+     *   |                                 v                                                          |
+     *   |      Finished header     +----------------+                                                |
+     *   | +------------------------+READING_HEADER  <--+                                             |
+     *   | |                        |                +--+Not enough bytes to complete header          |
+     *   | |                        +------+---------+                                                |
+     *   | |                               |Read annotation wrapper with symbol table annotation      |
+     *   | |                               v                                                          |
+     *   | |             +---------------------------------------------+                              |
+     *   | |             |READING_VALUE_WITH_SYMBOL_TABLE_ANNOTATION   <--+                           |
+     *   | |             |                                             +--+No bytes available         |
+     *   | |             +--+--------------+---------------------------+                              |
+     *   | |                |              |The wrapped value is a struct                             |
+     *   | | The wrapped    |              v                                                          |
+     *   | |  value is not  |  +-----------------------------+                                        |
+     *   | |   a struct     |  | READING_SYMBOL_TABLE_LENGTH <--+                                     |
+     *   | |                |  |                             +--+Not enough bytes to complete length  |
+     *   | |                |  +-----------+-----------------+                                        |
+     *   | |                |              |Read length                                               |
+     *   | |                |              v                                                          |
+     *   | |                |      +-----------------+                                                |
+     *   | +--------------->+----->| SKIPPING_VALUE  <--+                                             |
+     *   |                         |                 +--+More bytes needed to complete skip           |
+     *   +------------------------>+-------+---------+                                                |
+     *                                     |                                                          |
+     *                                     |All bytes skipped                                         |
+     *                                     |                                                          |
+     *                                     +----------------------------------------------------------+
+     */
+    @Override
+    protected void fillInputHelper() throws Exception {
+        while (true) {
+            if (state == State.BEFORE_TYPE_ID || state == State.READING_TYPE_ID) {
+                reset();
+                state = State.READING_TYPE_ID;
+                if (readTypeID(true) != ReadTypeIdResult.NO_DATA) {
+                    // The previous line transfers at most one byte, so the pre-header index is the write index minus
+                    // one.
+                    valuePostHeaderIndex = peekIndex;
+                    valuePreHeaderIndex = valuePostHeaderIndex - 1;
+                    valueStartWriteIndex = valuePreHeaderIndex;
+                }
+            }
+            if (state == State.READING_HEADER) {
+                readHeader();
+                if (!inProgressVarUInt.isComplete) {
+                    return;
+                }
+                valuePostHeaderIndex = peekIndex;
+            }
+            if (state == State.READING_VALUE_WITH_SYMBOL_TABLE_ANNOTATION) {
+                ReadTypeIdResult result = readTypeID(false);
+                if (result == ReadTypeIdResult.NO_DATA) {
+                    return;
+                }
+                // When successful, readTypeID reads exactly one byte.
+                additionalBytesNeeded--;
+                if (result == ReadTypeIdResult.STRUCT) {
+                    state = State.READING_SYMBOL_TABLE_LENGTH;
+                } else {
+                    state = State.SKIPPING_VALUE;
+                }
+            }
+            if (state == State.READING_SYMBOL_TABLE_LENGTH) {
+                isSystemValue = true;
+                if (inProgressVarUInt.location == VarUInt.Location.VALUE_LENGTH) {
+                    readVarUInt();
+                    if (!inProgressVarUInt.isComplete) {
+                        return;
+                    }
+                    additionalBytesNeeded = inProgressVarUInt.value;
+                }
+                symbolTableMarkers.add(new SymbolTableMarker(peekIndex, (int) additionalBytesNeeded));
+                state = State.SKIPPING_VALUE;
+            }
+            if (state == State.SKIPPING_VALUE) {
+                if (valueTid.isNopPad) {
+                    if (pipe.availableBeyondBoundary() <= additionalBytesNeeded) {
+                        // There cannot be any meaningful data beyond the NOP pad, so the buffer can be truncated
+                        // immediately and the rest of the NOP pad skipped.
+                        additionalBytesNeeded -= pipe.availableBeyondBoundary();
+                        startSkippingValue();
+                        // NOP padding will not be buffered, so it is never considered oversized.
+                        handlerNeedsToBeNotifiedOfOversizedValue = false;
+                    }
+                    // Else, the rest of the NOP pad is already buffered, and there is a value at least partially
+                    // buffered beyond it. The NOP pad will only be deleted from the buffer if the next value is
+                    // large enough that it doesn't fit within the buffer's configured maximum size.
+                }
+                while (additionalBytesNeeded > 0) {
+                    int numberOfBytesToRead;
+                    if (pipe.availableBeyondBoundary() >= additionalBytesNeeded) {
+                        numberOfBytesToRead = (int) additionalBytesNeeded;
+                        pipe.extendBoundary(numberOfBytesToRead);
+                        peekIndex += numberOfBytesToRead;
+                    } else {
+                        numberOfBytesToRead = fillOrSkip();
+                        if (numberOfBytesToRead < 1) {
+                            return;
+                        }
+                    }
+                    dataHandler.onData(numberOfBytesToRead);
+                    additionalBytesNeeded -= numberOfBytesToRead;
+                }
+                state = State.BEFORE_TYPE_ID;
+            }
+            if (state == State.BEFORE_TYPE_ID) {
+                valueEndIndex = peekIndex;
+                if (isSystemValue || isSkippingCurrentValue() || valueTid.isNopPad) {
+                    if (valueTid.isNopPad && nopPadStartIndex < 0) {
+                        // This is the first NOP before the next value. Mark the start index in case the space needs to
+                        // be reclaimed later.
+                        nopPadStartIndex = valuePreHeaderIndex;
+                    }
+                    if (isSystemValue && isSkippingCurrentValue()) {
+                        // The symbol table(s) currently buffered exceed the maximum buffer size. This is not
+                        // recoverable; future invocations of fillInput() will do nothing.
+                        reset();
+                        state = State.DONE;
+                    } else {
+                        if (isSystemValue && nopPadStartIndex > -1) {
+                            // Reclaim any NOP pad space that precedes system values. This will usually not be strictly
+                            // necessary, but it simplifies the implementation and will be rare in practice. Without
+                            // this simplification, we would need to keep track of a list of NOP pad start/end indexes
+                            // as we do with the symbol table markers. This way, we know that there can only be one
+                            // uninterrupted run of NOP pad bytes immediately preceding any user value, making it easy
+                            // to reclaim this space if necessary.
+                            reclaimNopPadding();
+                        }
+                        // Just skipped over system value or an oversized value. Consume the next value too so that a
+                        // call to reader.next() won't return null.
+                        continue;
+                    }
+                }
+            }
+            break;
+        }
+    }
+
+    @Override
+    void truncateToEndOfPreviousValue() {
+        peekIndex = valueStartWriteIndex;
+        pipe.truncate(valueStartWriteIndex, valueStartAvailable);
+        handlerNeedsToBeNotifiedOfOversizedValue = true;
+    }
+
+    @Override
+    public boolean moreDataRequired() {
+        return pipe.available() <= 0 || state != State.BEFORE_TYPE_ID;
+    }
+
+    /**
+     * Rewinds to the start of the value currently buffered. Does not include any system values that may precede
+     * the value. This method is not called in conjunction with {@link #mark()} / {@link #rewind()}, which may be
+     * used if the caller wants to rewind to the start of any system values that precede the current value. This
+     * method may be used to re-read the current value and may only be called after {@code IonReader.next()}
+     * has been called on the current value; otherwise, the data representing any system values that precede the
+     * current value would be lost.
+     *
+     * @throws IllegalStateException if there is no value currently buffered or if system value data would be lost
+     *   as a result of calling this method before {@code IonReader.next()} was called.
+     */
+    public void rewindToValueStart() {
+        if (valuePreHeaderIndex < 0) {
+            throw new IllegalStateException("A value must be buffered before calling rewindToValueStart().");
+        }
+        int availableAtValueStart = pipe.getBoundary() - valuePreHeaderIndex;
+        // If rewinding would reduce the amount of data available, that indicates that system value data would be lost.
+        if (availableAtValueStart < available()) {
+            throw new IllegalStateException(
+                "IonReader.next() must be called on the current value before calling rewindToValueStart()."
+            );
+        }
+        pipe.rewind(valuePreHeaderIndex, availableAtValueStart);
+        peekIndex = valuePreHeaderIndex;
+    }
+
+    /**
+     * @return the index of the second byte of the IVM.
+     */
+    int getIvmIndex() {
+        return ivmSecondByteIndex;
+    }
+
+    /**
+     * Clears the IVM index. Should be called between user values.
+     */
+    void resetIvmIndex() {
+        ivmSecondByteIndex = -1;
+    }
+
+    /**
+     * Clears the NOP pad index. Should be called between user values.
+     */
+    void resetNopPadIndex() {
+        nopPadStartIndex = -1;
+    }
+
+    /**
+     * @return the index of the first byte of the value representation (past the type ID and the optional length field).
+     */
+    int getValueStart() {
+        return valuePostHeaderIndex;
+    }
+
+    /**
+     * @return the type ID of the current value.
+     */
+    IonTypeID getValueTid() {
+        return valueTid;
+    }
+
+    /**
+     * @return the index of the first byte after the end of the current value.
+     */
+    int getValueEnd() {
+        return valueEndIndex;
+    }
+
+    /**
+     * @return markers for any symbol tables that occurred in the stream between the last value and the current value.
+     */
+    List<SymbolTableMarker> getSymbolTableMarkers() {
+        return symbolTableMarkers;
+    }
+
+    /**
+     * Clears the symbol table markers.
+     */
+    void resetSymbolTableMarkers() {
+        symbolTableMarkers.clear();
+    }
+
+    /**
+     * @return the symbol IDs of any annotations on the current value.
+     */
+    List<Integer> getAnnotationSids() {
+        return annotationSids;
+    }
+
+}
diff --git a/src/com/amazon/ion/impl/IonTypeID.java b/src/com/amazon/ion/impl/IonTypeID.java
new file mode 100644
index 0000000000..d94cce0d6a
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonTypeID.java
@@ -0,0 +1,116 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonType;
+
+/**
+ * Holds pre-computed information about a binary Ion type ID byte.
+ */
+final class IonTypeID {
+
+    private static final int NUMBER_OF_BYTES = 0x100;
+    private static final int BITS_PER_NIBBLE = 4;
+    private static final int LOW_NIBBLE_BITMASK = 0x0F;
+    private static final int NULL_VALUE_NIBBLE = 0xF;
+    private static final int VARIABLE_LENGTH_NIBBLE = 0xE;
+    private static final int NEGATIVE_INT_TYPE_CODE = 0x3;
+    private static final int TYPE_CODE_INVALID = 0xF;
+    private static final int ANNOTATION_WRAPPER_MIN_LENGTH = 0x3;
+    private static final int ANNOTATION_WRAPPER_MAX_LENGTH = 0xE;
+    static final int ORDERED_STRUCT_NIBBLE = 0x1;
+
+    // NOTE: 'annotation wrapper' is not an IonType, but it is simplest to treat it as one for the purposes of this
+    // implementation in order to have a direct mapping from binary type IDs to IonType enum values. IonType.DATAGRAM
+    // does not have a type ID, so we will use it to mean 'annotation wrapper' instead.
+    static final IonType ION_TYPE_ANNOTATION_WRAPPER = IonType.DATAGRAM;
+
+    // Lookup table from type ID to IonType. See https://amzn.github.io/ion-docs/docs/binary.html#typed-value-formats
+    static final IonType[] ION_TYPES = new IonType[] {
+        IonType.NULL,
+        IonType.BOOL,
+        IonType.INT,
+        IonType.INT,
+        IonType.FLOAT,
+        IonType.DECIMAL,
+        IonType.TIMESTAMP,
+        IonType.SYMBOL,
+        IonType.STRING,
+        IonType.CLOB,
+        IonType.BLOB,
+        IonType.LIST,
+        IonType.SEXP,
+        IonType.STRUCT,
+        ION_TYPE_ANNOTATION_WRAPPER,
+        null // The 0xF type code is illegal in Ion 1.0.
+    };
+
+    // Pre-compute all possible type ID bytes.
+    static final IonTypeID[] TYPE_IDS;
+    static {
+        TYPE_IDS = new IonTypeID[NUMBER_OF_BYTES];
+        for (int b = 0x00; b < NUMBER_OF_BYTES; b++) {
+            TYPE_IDS[b] = new IonTypeID((byte) b);
+        }
+    }
+
+    final IonType type;
+    final byte length;
+    final boolean variableLength;
+    final boolean isNull;
+    final boolean isNopPad;
+    final byte lowerNibble;
+    final boolean isValid;
+    final boolean isNegativeInt;
+
+    /**
+     * Determines whether the Ion spec allows this particular upperNibble/lowerNibble pair.
+     */
+    private static boolean isValid(byte upperNibble, byte lowerNibble, IonType type) {
+        if (upperNibble == TYPE_CODE_INVALID) {
+            // Type code F is unused in Ion 1.0.
+            return false;
+        }
+        if (type == IonType.BOOL) {
+            // Bool values can only be false (0), true (1), or null (F).
+            return lowerNibble <= 1 || lowerNibble == NULL_VALUE_NIBBLE;
+        }
+        if (type == IonType.INT && upperNibble == NEGATIVE_INT_TYPE_CODE) {
+            // There is no negative zero int.
+            return lowerNibble != 0;
+        }
+        if (type == IonType.FLOAT) {
+            // Floats are either 0e0 (0), 32-bit (4), 64-bit (8), or null (F).
+            return lowerNibble == 0 || lowerNibble == 4 || lowerNibble == 8 || lowerNibble == NULL_VALUE_NIBBLE;
+        }
+        if (type == IonType.TIMESTAMP) {
+            // There is no zero-length timestamp representation.
+            return lowerNibble > 1;
+        }
+        if (type == ION_TYPE_ANNOTATION_WRAPPER) {
+            return lowerNibble >= ANNOTATION_WRAPPER_MIN_LENGTH && lowerNibble <= ANNOTATION_WRAPPER_MAX_LENGTH;
+        }
+        return true;
+    }
+
+    private IonTypeID(byte id) {
+        byte upperNibble = (byte) ((id >> BITS_PER_NIBBLE) & LOW_NIBBLE_BITMASK);
+        this.lowerNibble = (byte) (id & LOW_NIBBLE_BITMASK);
+        this.type = ION_TYPES[upperNibble];
+        this.isValid = isValid(upperNibble, lowerNibble, type);
+        this.isNull = lowerNibble == NULL_VALUE_NIBBLE;
+        this.isNopPad = type == IonType.NULL && !isNull;
+        byte length = lowerNibble;
+        if ((type == IonType.NULL && !isNopPad) || type == IonType.BOOL || !isValid) {
+            variableLength = false;
+            length = 0;
+        } else if (type == IonType.STRUCT && length == ORDERED_STRUCT_NIBBLE) {
+            variableLength = true;
+        } else {
+            variableLength = length == VARIABLE_LENGTH_NIBBLE;
+        }
+        if (isNull) {
+            length = 0;
+        }
+        this.isNegativeInt = type == IonType.INT && upperNibble == NEGATIVE_INT_TYPE_CODE;
+        this.length = length;
+    }
+}
diff --git a/src/com/amazon/ion/impl/ReaderLookaheadBuffer.java b/src/com/amazon/ion/impl/ReaderLookaheadBuffer.java
new file mode 100644
index 0000000000..6264b31bd4
--- /dev/null
+++ b/src/com/amazon/ion/impl/ReaderLookaheadBuffer.java
@@ -0,0 +1,46 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonReader;
+import com.amazon.ion.system.IonReaderBuilder;
+
+/**
+ * Interface for lookahead buffers that enable incremental reading of streaming data.
+ */
+public interface ReaderLookaheadBuffer {
+
+    /**
+     * If possible, fills the input pipe with enough bytes to enable one more successful call to
+     * {@link IonReader#next()} on the non-incremental reader attached to the pipe. If not enough bytes were available
+     * in the raw input stream to complete the next top-level user value, calling {@link #moreDataRequired()} after this
+     * method returns will return `true`. In this case, this method must be called again before calling
+     * `IonReader.next()` to position the reader on this value. Otherwise, `moreDataRequired()` will return `false` and
+     * a call to `IonReader.next()` may be made to position the reader on this value. Implementations may throw
+     * `IonException` if invalid Ion data is detected. Implementations may define exceptional cases.
+     * @throws Exception if an IOException is thrown by the underlying InputStream.
+     */
+    void fillInput() throws Exception;
+
+    /**
+     * Indicates whether more data must become present in the raw input stream before a successful call to
+     * {@link IonReader#next()} may be made to position the reader on the most-recently-buffered value.
+     * @return true if more data is required to complete the next top-level user value; otherwise, false.
+     */
+    boolean moreDataRequired();
+
+    /**
+     * Indicates how many bytes are currently stored in the internal buffer. This can be used to detect whether
+     * calls to fillInput() are successfully retrieving data.
+     * @return The number of bytes waiting in the input buffer.
+     */
+    int available();
+
+    /**
+     * Builds a reader over the input pipe. NOTE: because IonReader construction consumes bytes from the stream
+     * (to determine whether the stream is binary or text Ion), {@link #fillInput()} must have been called (such that
+     * {@link #moreDataRequired()} returns `false`)  before calling this method. For the same reason, this method must
+     * only be called once per instance of this class.
+     * @param builder the builder containing the reader's configuration.
+     * @return a new IonReader.
+     */
+    IonReader newIonReader(IonReaderBuilder builder);
+}
diff --git a/src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java b/src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java
new file mode 100644
index 0000000000..2535b51750
--- /dev/null
+++ b/src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java
@@ -0,0 +1,194 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.BufferConfiguration;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.system.IonReaderBuilder;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Base class for lookahead buffers that enable incremental reading of streaming data.
+ */
+abstract class ReaderLookaheadBufferBase implements ReaderLookaheadBuffer {
+
+    /**
+     * An InputStream over binary Ion data.
+     */
+    private final InputStream input;
+
+    /**
+     * A buffer for the bytes required for a successful call to {@link IonReader#next()}.
+     */
+    protected final ResizingPipedInputStream pipe;
+
+    /**
+     * The maximum number of bytes that will be buffered.
+     */
+    private final int maximumBufferSize;
+
+    /**
+     * The handler that will be notified when a value exceeds the maximum buffer size.
+     */
+    protected final BufferConfiguration.OversizedValueHandler oversizedValueHandler;
+
+    /**
+     * The handler that will be notified when data is processed.
+     */
+    protected final BufferConfiguration.DataHandler dataHandler;
+
+    /**
+     * The current mark for the pipe's value of 'available'.
+     */
+    private int markedAvailable;
+
+    /**
+     * The current mark for the pipe's value of 'readIndex'.
+     */
+    private int markedReadIndex;
+
+    /**
+     * Indicates whether the current value is being skipped due to being oversized.
+     */
+    private boolean isSkippingCurrentValue;
+
+    /**
+     * Constructs a wrapper over the given stream using the given configuration.
+     * @param configuration the buffer configuration.
+     * @param inputStream an InputStream over Ion data.
+     */
+    ReaderLookaheadBufferBase(final BufferConfiguration<?> configuration, final InputStream inputStream) {
+        input = inputStream;
+        pipe = new ResizingPipedInputStream(
+            configuration.getInitialBufferSize(),
+            configuration.getMaximumBufferSize(),
+            true
+        );
+        maximumBufferSize = configuration.getMaximumBufferSize();
+        oversizedValueHandler = configuration.getOversizedValueHandler();
+        dataHandler = configuration.getDataHandler();
+        clearMark();
+    }
+
+    /**
+     * @inheritDoc
+     * @throws Exception if thrown by a handler method or if an IOException is thrown by the underlying InputStream.
+     */
+    @Override
+    public final void fillInput() throws Exception {
+        clearMark();
+        fillInputHelper();
+    }
+
+    /**
+     * Implements the behavior described in {@link #fillInput()}, except for clearing the mark.
+     * @throws IOException if thrown by the underlying input stream.
+     * @throws Exception if thrown by a handler method.
+     */
+    protected abstract void fillInputHelper() throws Exception;
+
+    @Override
+    public final int available() {
+        return pipe.available();
+    }
+
+    @Override
+    public final IonReader newIonReader(final IonReaderBuilder builder) {
+        return builder.build(pipe);
+    }
+
+    /**
+     * Marks the current read position in the underlying buffer. This mark remains valid only until the next call
+     * to {@link #fillInput()}.
+     * @throws IllegalStateException if more data is required to complete a value.
+     */
+    public final void mark() {
+        if (moreDataRequired()) {
+            throw new IllegalStateException("moreDataRequired() must be false before calling mark().");
+        }
+        uncheckedMark();
+    }
+
+    /**
+     * Sets the mark without verifying that a complete value is buffered.
+     */
+    final void uncheckedMark() {
+        markedAvailable = available();
+        markedReadIndex = pipe.getReadIndex();
+    }
+
+    /**
+     * Rewinds the underlying buffer to the mark.
+     * @see #mark()
+     * @throws IllegalStateException if there is no valid mark.
+     */
+    public final void rewind() {
+        if (markedReadIndex < 0 || markedAvailable < 0) {
+            throw new IllegalStateException("Must call mark() before rewind().");
+        }
+        pipe.rewind(markedReadIndex, markedAvailable);
+    }
+
+    /**
+     * Truncates the buffer to the end of the last complete value.
+     * @throws Exception if thrown by a handler.
+     */
+    abstract void truncateToEndOfPreviousValue() throws Exception;
+
+    /**
+     * Clears the mark.
+     * @see #mark()
+     */
+    public final void clearMark() {
+        markedAvailable = -1;
+        markedReadIndex = -1;
+    }
+
+    /**
+     * @return the underlying pipe.
+     */
+    protected InputStream getPipe() {
+        return pipe;
+    }
+
+    /**
+     * @return the underlying input.
+     */
+    protected InputStream getInput() {
+        return input;
+    }
+
+    /**
+     * Prepares for the start of a new value by clearing the {@link #isSkippingCurrentValue} flag.
+     */
+    protected void startNewValue() {
+        isSkippingCurrentValue = false;
+    }
+
+    /**
+     * Start skipping the current value, if it is not already being skipped. This should be called when the value
+     * is determined to be oversize. This truncates the buffer to the end of the previous value, reclaiming the space.
+     * @throws Exception if thrown by the event handler.
+     */
+    protected void startSkippingValue() throws Exception {
+        if (!isSkippingCurrentValue) {
+            isSkippingCurrentValue = true;
+            truncateToEndOfPreviousValue();
+        }
+    }
+
+    /**
+     * Indicates whether the current value is being skipped due to being oversized.
+     * @return true if the value is being skipped; otherwise, false.
+     */
+    protected boolean isSkippingCurrentValue() {
+        return isSkippingCurrentValue;
+    }
+
+    /**
+     * @return the maximum size of the buffer.
+     */
+    protected int getMaximumBufferSize() {
+        return maximumBufferSize;
+    }
+}
diff --git a/src/com/amazon/ion/impl/ResizingPipedInputStream.java b/src/com/amazon/ion/impl/ResizingPipedInputStream.java
new file mode 100644
index 0000000000..0c7f8ba26d
--- /dev/null
+++ b/src/com/amazon/ion/impl/ResizingPipedInputStream.java
@@ -0,0 +1,557 @@
+package com.amazon.ion.impl;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.BufferOverflowException;
+import java.nio.ByteBuffer;
+
+/**
+ * Manages a resizing buffer for production and consumption of data within a <strong>single thread</strong>.
+ * Buffered bytes may be consumed through the InputStream interface. This provides a few benefits over using
+ * a PipedOutputStream/PipedInputStream pair in a single thread:
+ * <ol>
+ *     <li>There is no risk of deadlock. Piped streams, which are intended for producing data in one
+ *     thread and consuming it in another, will block on read when no data is available and block on write
+ *     when the buffer is full. In a single-threaded context, avoiding deadlock on read requires checking
+ *     that bytes are available before every read. Avoiding deadlock on write would require checking that
+ *     the buffer is not full before every write, but there is no built-in, publicly-accessible way of doing
+ *     this with a PipedInputStream/PipedOutputStream.</li>
+ *     <li>The buffer can grow. Piped streams use a fixed-size buffer that causes blocking when full. If
+ *     used in a single-thread, this serves as a hard limit on the amount of data that can be written without
+ *     a matching read. This can require arbitrary limits on data size to be imposed by the application. The
+ *     ResizingPipedInputStream imposes no such limitation, but optionally allows for a maximum buffer
+ *     size to be configured to protect against unbounded growth.</li>
+ * </ol>
+ */
+public class ResizingPipedInputStream extends InputStream {
+
+    /**
+     * Handler of notifications provided by the ResizingPipedInputStream.
+     */
+    interface NotificationConsumer {
+
+        /**
+         * Bytes have been shifted to the start of the buffer in order to make room for additional bytes
+         * to be buffered.
+         * @param leftShiftAmount the amount of the left shift (also: the pre-shift read index of the first shifted
+         *                        byte).
+         */
+        void bytesConsolidatedToStartOfBuffer(int leftShiftAmount);
+    }
+
+    /**
+     * A NotificationConsumer that does nothing.
+     */
+    private static final NotificationConsumer NO_OP_NOTIFICATION_CONSUMER = new NotificationConsumer() {
+        @Override
+        public void bytesConsolidatedToStartOfBuffer(int leftShiftAmount) {
+            // Do nothing.
+        }
+    };
+
+    /**
+     * Mask to isolate a single byte.
+     */
+    private static final int SINGLE_BYTE_MASK = 0xFF;
+
+    /**
+     * The initial size of the buffer and the number of bytes by which the size of the buffer will increase
+     * each time it grows, unless it must grow by a smaller amount to fit within 'maximumBufferSize'.
+     */
+    private final int initialBufferSize;
+
+    /**
+     * The maximum size of the buffer. If the user attempts to buffer more bytes than this, an exception will be raised.
+     */
+    private final int maximumBufferSize;
+
+    /**
+     * Whether to use a boundary to limit the number of available bytes. This can be used to buffer
+     * arbitrarily-sized chunks of bytes without making them available for consumption. When true,
+     * the boundary must be manually extended (see {@link #extendBoundary(int)} to make these bytes
+     * available. When false, all buffered bytes will be available to read.
+     */
+    private final boolean useBoundary;
+
+    /**
+     * The NotificationConsumer currently registered.
+     */
+    private NotificationConsumer notificationConsumer = NO_OP_NOTIFICATION_CONSUMER;
+
+    /**
+     * The raw buffer.
+     */
+    private byte[] buffer;
+
+    /**
+     * View to the raw buffer.
+     */
+    private ByteBuffer byteBuffer;
+
+    /**
+     * @see #capacity()
+     */
+    private int capacity;
+
+    /**
+     * The index of the next byte in the buffer that is available to be read. Always less than or equal to `writeIndex`.
+     */
+    private int readIndex = 0;
+
+    /**
+     * The index at which the next byte received will be written. Always greater than or equal to `readIndex`.
+     */
+    private int writeIndex = 0;
+
+    /**
+     * @see #available()
+     */
+    private int available = 0;
+
+    /**
+     * @see #size()
+     */
+    private int size = 0;
+
+    /**
+     * @see #getBoundary()
+     */
+    private int boundary = 0;
+
+    /**
+     * Constructor.
+     * @param initialBufferSize the initial size of the buffer. When full, the buffer will grow by this
+     *                          many bytes. The buffer always stores bytes contiguously, so growth requires
+     *                          allocation of a new buffer capable of holding the new capacity and copying of the
+     *                          existing bytes into the new buffer. As such, a size should be chosen carefully
+     *                          such that growth is expected to occur rarely, if ever.
+     */
+    public ResizingPipedInputStream(final int initialBufferSize) {
+        this(initialBufferSize, Integer.MAX_VALUE, false);
+    }
+
+    /**
+     * Constructor.
+     * @param initialBufferSize the initial size of the buffer. When full, the buffer will grow by this
+     *                          many bytes. The buffer always stores bytes contiguously, so growth requires
+     *                          allocation of a new buffer capable of holding the new capacity and copying of the
+     *                          existing bytes into the new buffer. As such, a size should be chosen carefully
+     *                          such that growth is expected to occur rarely, if ever.
+     * @param maximumBufferSize the maximum size of the buffer. If a call to `receive` attempts to transfer an amount
+     *                          of bytes that would cause the buffer to exceed this size, a
+     *                          {@link BufferOverflowException} will be thrown. Must be greater than or equal to the
+     *                          initial buffer size.
+     * @param useBoundary whether to use a boundary to limit the number of available bytes. This can be used to buffer
+     *                    arbitrarily-sized chunks of bytes without making them available for consumption. When true,
+     *                    the boundary must be manually extended (see {@link #extendBoundary(int)} to make these bytes
+     *                    available. When false, all buffered bytes will be available to read.
+     */
+    ResizingPipedInputStream(final int initialBufferSize, final int maximumBufferSize, final boolean useBoundary) {
+        if (initialBufferSize < 1) {
+            throw new IllegalArgumentException("Initial buffer size must be at least 1.");
+        }
+        if (maximumBufferSize < initialBufferSize) {
+            throw new IllegalArgumentException("Maximum buffer size cannot be less than the initial buffer size.");
+        }
+        this.initialBufferSize = initialBufferSize;
+        this.maximumBufferSize = maximumBufferSize;
+        this.capacity = initialBufferSize;
+        buffer = new byte[initialBufferSize];
+        byteBuffer = ByteBuffer.wrap(buffer, 0, capacity);
+        this.useBoundary = useBoundary;
+    }
+
+    /**
+     * Moves all buffered (but not yet read) bytes from 'buffer' to the destination buffer. In total, {@link #size()}
+     * bytes will be moved.
+     * @param destinationBuffer the destination buffer, which may be 'buffer' itself or a new buffer.
+     */
+    private void moveBytesToStartOfBuffer(byte[] destinationBuffer) {
+        if (size > 0) {
+            System.arraycopy(buffer, readIndex, destinationBuffer, 0, size);
+        }
+        if (readIndex > 0) {
+            notificationConsumer.bytesConsolidatedToStartOfBuffer(readIndex);
+        }
+        readIndex = 0;
+        boundary = available;
+        writeIndex = size;
+    }
+
+    /**
+     * @return the number of bytes that can be written at the end of the buffer.
+     */
+    private int freeSpaceAtEndOfBuffer() {
+        return capacity - writeIndex;
+    }
+
+    /**
+     * Ensures that there is at least 'minimumNumberOfBytesRequired' bytes of free space in the buffer, growing the
+     * buffer if necessary. May consolidate buffered bytes, performing an in-order copy and resetting indices
+     * such that the `readIndex` points to the same byte and the `writeIndex` is positioned after the last
+     * byte that is available to read.
+     * @param minimumNumberOfBytesRequired the minimum amount of free space that needs to be available for writing.
+     */
+    private void ensureSpaceInBuffer(int minimumNumberOfBytesRequired) {
+        if (size < 1 || freeSpaceAtEndOfBuffer() < minimumNumberOfBytesRequired) {
+            int shortfall = minimumNumberOfBytesRequired - freeSpaceAtEndOfBuffer() - readIndex;
+            if (shortfall <= 0) {
+                // Free up space by moving any unread bytes to the start of the buffer and resetting the indices.
+                moveBytesToStartOfBuffer(buffer);
+            } else {
+                // There is not enough space in the buffer even though all available bytes have already been
+                // moved to the start of the buffer. Growth is required.
+                int amountToGrow = Math.max(initialBufferSize, shortfall);
+                if (capacity + amountToGrow > maximumBufferSize) {
+                    amountToGrow = shortfall;
+                    if (capacity + amountToGrow > maximumBufferSize) {
+                        throw new BufferOverflowException();
+                    }
+                }
+                byte[] newBuffer = new byte[buffer.length + amountToGrow];
+                moveBytesToStartOfBuffer(newBuffer);
+                capacity += amountToGrow;
+                buffer = newBuffer;
+                byteBuffer = ByteBuffer.wrap(buffer, readIndex, capacity);
+            }
+        }
+    }
+
+    /**
+     * Buffers a single additional byte, growing the buffer if it is already full.
+     * @param b the byte to buffer.
+     */
+    public void receive(final int b) {
+        ensureSpaceInBuffer(1);
+        buffer[writeIndex] = (byte) b;
+        writeIndex++;
+        size++;
+        if (!useBoundary) {
+            extendBoundary(1);
+        }
+    }
+
+    /**
+     * Buffers `len` additional bytes, growing the buffer if it is already full or if it would become full
+     * by writing `len` bytes.
+     * @param b the bytes to buffer.
+     * @param off the offset into `b` that points to the first byte to buffer.
+     * @param len the number of bytes to buffer.
+     */
+    public void receive(final byte[] b, final int off, final int len) {
+        ensureSpaceInBuffer(len);
+        System.arraycopy(b, off, buffer, writeIndex, len);
+        writeIndex += len;
+        size += len;
+        if (!useBoundary) {
+            extendBoundary(len);
+        }
+    }
+
+    /**
+     * Buffers `b.length` additional bytes.
+     * @see #receive(byte[], int, int)
+     * @param b the bytes to buffer.
+     */
+    public void receive(final byte[] b) {
+        receive(b, 0, b.length);
+    }
+
+    /**
+     * Buffers up to `len` additional bytes, growing the buffer if it is already full or if it would become full
+     * by writing `len` bytes. This method will block if and only if the given `InputStream`'s
+     * {@link InputStream#read(byte[], int, int)} blocks when trying to read `len` bytes. If this is not desired,
+     * the caller should ensure that the given `InputStream` has at least `len` bytes available before calling
+     * this method or provide an InputStream implementation that does not block.
+     * @param input the source of the bytes.
+     * @param len the number of bytes to attempt to write.
+     * @return the number of bytes actually written, which will only be less than `len` if
+     * {@link InputStream#read(byte[], int, int)} returns less than `len`.
+     * @throws IOException if thrown by the given `InputStream` during read, except for {@link EOFException}. If an
+     *   EOFException is thrown by the `InputStream`, it will be caught and this method will return the number of bytes
+     *   that were received before the exception was thrown.
+     */
+    public int receive(final InputStream input, final int len) throws IOException  {
+        ensureSpaceInBuffer(len);
+        int numberOfBytesRead;
+        try {
+            numberOfBytesRead = input.read(buffer, writeIndex, len);
+        } catch (EOFException e) {
+            // Some InputStream implementations (such as GZIPInputStream) will throw EOFException instead of
+            // returning -1.
+            numberOfBytesRead = -1;
+        }
+        if (numberOfBytesRead > 0) {
+            writeIndex += numberOfBytesRead;
+            size += numberOfBytesRead;
+        } else {
+            numberOfBytesRead = 0;
+        }
+        if (!useBoundary) {
+            extendBoundary(numberOfBytesRead);
+        }
+        return numberOfBytesRead;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * NOTE: This method adheres to the documented behavior of {@link InputStream#read(byte[], int, int)}
+     * <strong>except</strong> that it never blocks. If a read is attempted before the first write,
+     * this method will return -1.
+     */
+    @Override
+    public int read(final byte[] b, final int off, final int len) {
+        if (b.length == 0 || len == 0) {
+            return 0;
+        }
+        if (available < 1) {
+            return -1;
+        }
+        int bytesToRead = Math.min(available, len);
+        System.arraycopy(buffer, readIndex, b, off, bytesToRead);
+        readIndex += bytesToRead;
+        available -= bytesToRead;
+        size -= bytesToRead;
+        return bytesToRead;
+    }
+
+    /**
+     * Copies all of the available bytes in the buffer without changing the number of bytes available to subsequent
+     * reads.
+     * @param outputStream stream to which the bytes will be copied.
+     * @throws IOException if thrown by {@link OutputStream#write(byte[], int, int)}.
+     */
+    public void copyTo(final OutputStream outputStream) throws IOException {
+        outputStream.write(buffer, readIndex, available);
+    }
+
+    /**
+     * Seeks the read index to the given position.
+     * @param index the index to which to seek. Must not be negative.
+     */
+    void seekTo(int index) {
+        int amount = index - readIndex;
+        available -= amount;
+        size -= amount;
+        readIndex = index;
+    }
+
+    /**
+     * @return the current read index.
+     */
+    int getReadIndex() {
+        return readIndex;
+    }
+
+    /**
+     * @return the current write index.
+     */
+    int getWriteIndex() {
+        return writeIndex;
+    }
+
+    /**
+     * Rewinds the buffer to the given read index and sets 'available' to the given value. Subsequent
+     * behavior is undefined unless the values resulted from calling {@link #getReadIndex()} and
+     * {@link #available()} in immediate sequence, without any calls to 'receive' since.
+     * @param previousReadIndex the read index value to be set.
+     * @param previousAvailable the available value to be set.
+     */
+    void rewind(final int previousReadIndex, final int previousAvailable) {
+        readIndex = previousReadIndex;
+        available = previousAvailable;
+        boundary = previousReadIndex + previousAvailable;
+        size = writeIndex - readIndex;
+    }
+
+    /**
+     * Truncates the buffer to the given write index and sets both 'available' and 'size' to the to the given value.
+     * Subsequent behavior is undefined unless the values resulted from calling {@link #getWriteIndex()} and
+     * {@link #available()} in immediate sequence, without any calls to 'read' or 'skip' since. It is the caller's
+     * responsibility to ensure that calling this method will not result in loss of important data beyond the boundary.
+     * @param previousWriteIndex the write index value to be set.
+     * @param previousAvailable the available value to be set.
+     */
+    void truncate(final int previousWriteIndex, final int previousAvailable) {
+        writeIndex = previousWriteIndex;
+        available = previousAvailable;
+        boundary = writeIndex;
+        size = previousAvailable;
+    }
+
+    /**
+     * Skips up to `n` buffered bytes. Less than `n` bytes will be skipped if less than `n` bytes are
+     * available in the buffer.
+     * @param n the number of bytes to skip.
+     * @return the number of bytes actually skipped.
+     */
+    @Override
+    public long skip(final long n) {
+        if (n < 1 || available < 1) {
+            return 0;
+        }
+        int bytesSkipped = (int) Math.min(available, n);
+        readIndex += bytesSkipped;
+        available -= bytesSkipped;
+        size -= bytesSkipped;
+        return bytesSkipped;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * NOTE: This method adheres to the documented behavior of {@link InputStream#available()}
+     * <strong>except</strong> that it always returns the exact number of bytes that are available in the
+     * buffer.
+     * @return the exact number of bytes available in the buffer.
+     */
+    @Override
+    public int available() {
+        return available;
+    }
+
+    /**
+     * @return the number of bytes actually buffered, which will be greater than or equal to 'available' if a boundary
+     *   has been set, or equal to `available` if no boundary has been set.
+     */
+    int size() {
+        return size;
+    }
+
+    /**
+     * @return the number of bytes buffered beyond the boundary. This is equivalent to subtracting {@link #available()}
+     * from {@link #size()}.
+     */
+    int availableBeyondBoundary() {
+        return size - available;
+    }
+
+    /**
+     * @return the index of the boundary, which is used to mark the last buffered byte that is available for reading.
+     *   The boundary must always fall within [readIndex, writeIndex].
+     */
+    int getBoundary() {
+        return boundary;
+    }
+
+    /**
+     * Extends the boundary by the given number of bytes. It is the caller's responsibility to ensure that the
+     * resulting boundary includes only bytes that have been buffered (i.e. that it does not exceed `writeIndex`).
+     * @param numberOfBytes the number of bytes by which the boundary should be extended.
+     */
+    void extendBoundary(int numberOfBytes) {
+        boundary += numberOfBytes;
+        available += numberOfBytes;
+    }
+
+    /**
+     * {@inheritDoc}
+     * <p>
+     * NOTE: This method adheres to the documented behavior of {@link InputStream#read(byte[], int, int)}
+     * <strong>except</strong> that it never blocks. If a read is attempted before the first write,
+     * this method will return -1.
+     */
+    @Override
+    public int read() {
+        if (available < 1) {
+            return -1;
+        }
+        int b = buffer[readIndex];
+        readIndex++;
+        available--;
+        size--;
+        return b & SINGLE_BYTE_MASK;
+    }
+
+    /**
+     * Peeks the byte at the given index without modifying any internal indexes. It is the caller's responsibility to
+     * ensure that the given index points to an available byte.
+     * @param index the index of the byte to peek.
+     * @return the byte value.
+     */
+    int peek(int index) {
+        return buffer[index] & SINGLE_BYTE_MASK;
+    }
+
+    /**
+     * @return the capacity of the buffer, which is always less than or equal to 'maximumBufferSize'.
+     */
+    public int capacity() {
+        return capacity;
+    }
+
+    /**
+     * @return the initial capacity of the buffer.
+     */
+    int getInitialBufferSize() {
+        return initialBufferSize;
+    }
+
+    /**
+     * Clears the buffer.
+     */
+    void clear() {
+        readIndex = 0;
+        writeIndex = 0;
+        available = 0;
+        boundary = 0;
+        size = 0;
+    }
+
+    /**
+     * Returns a ByteBuffer view of the underlying buffer.
+     * @param position the start position of the ByteBuffer.
+     * @param limit the limit of the ByteBuffer.
+     * @return a ByteBuffer.
+     */
+    ByteBuffer getByteBuffer(int position, int limit) {
+        // Setting the limit to the capacity first is required because setting the position will fail if the new
+        // position is outside the limit.
+        byteBuffer.limit(capacity);
+        byteBuffer.position(position);
+        byteBuffer.limit(limit);
+        return byteBuffer;
+    }
+
+    /**
+     * Copies bytes from the underlying buffer. It is the caller's responsibility to ensure the requested bytes
+     * are available.
+     * @param position the start position from which to read.
+     * @param destination the buffer to copy into.
+     * @param destinationOffset the offset of the buffer to copy into.
+     * @param length the number of bytes to copy.
+     */
+    void copyBytes(int position, byte[] destination, int destinationOffset, int length) {
+        System.arraycopy(buffer, position, destination, destinationOffset, length);
+    }
+
+    /**
+     * Moves all bytes starting at 'fromPosition' to 'toPosition', overwriting the bytes in-between. It is the caller's
+     * responsibility to ensure that the overwritten bytes are not needed.
+     * @param fromPosition the position to move bytes from. Must be less than or equal to 'writeIndex' and 'boundary'.
+     * @param toPosition the position to move bytes to. Must be greater than or equal to 'readIndex'.
+     */
+    void consolidate(int fromPosition, int toPosition) {
+        if (fromPosition > writeIndex || fromPosition > boundary || toPosition < readIndex) {
+            throw new IllegalArgumentException("Tried to consolidate using an index that violates the constraints.");
+        }
+        int indexShift = fromPosition - toPosition;
+        System.arraycopy(buffer, fromPosition, buffer, toPosition, writeIndex - fromPosition);
+        size -= indexShift;
+        available -= indexShift;
+        writeIndex -= indexShift;
+        boundary -= indexShift;
+        // readIndex does not need to change, because none of the consolidated bytes have been read yet.
+    }
+
+    /**
+     * Registers the given NotificationConsumer.
+     * @param consumer the NotificationConsumer to register.
+     */
+    void registerNotificationConsumer(NotificationConsumer consumer) {
+        notificationConsumer = consumer;
+    }
+}
diff --git a/src/com/amazon/ion/impl/SymbolTokenImpl.java b/src/com/amazon/ion/impl/SymbolTokenImpl.java
index 91abb3b8b0..b464e1aef0 100644
--- a/src/com/amazon/ion/impl/SymbolTokenImpl.java
+++ b/src/com/amazon/ion/impl/SymbolTokenImpl.java
@@ -15,8 +15,6 @@
 
 package com.amazon.ion.impl;
 
-import static com.amazon.ion.util.IonTextUtils.printString;
-
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.UnknownSymbolException;
 
@@ -76,18 +74,18 @@ public String toString()
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (o == null || !(o instanceof SymbolToken)) return false;
 
-        SymbolTokenImpl other = (SymbolTokenImpl) o;
-        if(myText == null || other.myText == null){
-            return myText == other.myText;
+        SymbolToken other = (SymbolToken) o;
+        if(getText() == null || other.getText() == null){
+            return getText() == other.getText();
         }
-        return myText.equals(other.myText);
+        return getText().equals(other.getText());
     }
 
     @Override
     public int hashCode() {
-        if(myText != null) return myText.hashCode();
+        if(getText() != null) return getText().hashCode();
         return 0;
     }
 }
diff --git a/src/com/amazon/ion/impl/_Private_IonReaderFactory.java b/src/com/amazon/ion/impl/_Private_IonReaderFactory.java
index 8239e3ff50..4f4fafd623 100644
--- a/src/com/amazon/ion/impl/_Private_IonReaderFactory.java
+++ b/src/com/amazon/ion/impl/_Private_IonReaderFactory.java
@@ -19,12 +19,14 @@
 import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_SIZE;
 import static com.amazon.ion.util.IonStreamUtils.isIonBinary;
 
+import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.IonTextReader;
 import com.amazon.ion.IonValue;
+import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.util.IonStreamUtils;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -253,6 +255,11 @@ public static final IonReader makeSystemReader(IonSystem system,
         return new IonReaderTreeSystem(value);
     }
 
+    public static final IonReader makeIncrementalReader(IonReaderBuilder builder, InputStream is)
+    {
+        return new IonReaderBinaryIncremental(builder, is);
+    }
+
 
     //=========================================================================
 
diff --git a/src/com/amazon/ion/impl/_Private_RecyclingStack.java b/src/com/amazon/ion/impl/_Private_RecyclingStack.java
new file mode 100644
index 0000000000..a98e09d410
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_RecyclingStack.java
@@ -0,0 +1,95 @@
+package com.amazon.ion.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A stack whose elements are recycled. This can be useful when the stack needs to grow and shrink
+ * frequently and has a predictable maximum depth.
+ * @param <T> the type of elements stored.
+ */
+public final class _Private_RecyclingStack<T> {
+
+    /**
+     * Factory for new stack elements.
+     * @param <T> the type of element.
+     */
+    public interface ElementFactory<T> {
+
+        /**
+         * @return a new instance.
+         */
+        T newElement();
+    }
+
+    private final List<T> elements;
+    private final ElementFactory<T> elementFactory;
+    private int currentIndex;
+    private T top;
+
+    /**
+     * @param initialCapacity the initial capacity of the underlying collection.
+     * @param elementFactory the factory used to create a new element on {@link #push()} when the stack has
+     *                       not previously grown to the new depth.
+     */
+    public _Private_RecyclingStack(int initialCapacity, ElementFactory<T> elementFactory) {
+        elements = new ArrayList<T>(initialCapacity);
+        this.elementFactory = elementFactory;
+        currentIndex = -1;
+        top = null;
+    }
+
+    /**
+     * Pushes an element onto the top of the stack, instantiating a new element only if the stack has not
+     * previously grown to the new depth.
+     * @return the element at the top of the stack after the push. This element must be initialized by the caller.
+     */
+    public T push() {
+        currentIndex++;
+        if (currentIndex >= elements.size()) {
+            top = elementFactory.newElement();
+            elements.add(top);
+        }  else {
+            top = elements.get(currentIndex);
+        }
+        return top;
+    }
+
+    /**
+     * @return the element at the top of the stack, or null if the stack is empty.
+     */
+    public T peek() {
+        return top;
+    }
+
+    /**
+     * Pops an element from the stack, retaining a reference to the element so that it can be reused the
+     * next time the stack grows to the element's depth.
+     * @return the element that was at the top of the stack before the pop, or null if the stack was empty.
+     */
+    public T pop() {
+        T popped = top;
+        currentIndex--;
+        if (currentIndex >= 0) {
+            top = elements.get(currentIndex);
+        } else {
+            top = null;
+            currentIndex = -1;
+        }
+        return popped;
+    }
+
+    /**
+     * @return true if the stack is empty; otherwise, false.
+     */
+    public boolean isEmpty() {
+        return top == null;
+    }
+
+    /**
+     * @return the number of elements on the stack.
+     */
+    public int size() {
+        return currentIndex + 1;
+    }
+}
diff --git a/src/com/amazon/ion/impl/_Private_Utils.java b/src/com/amazon/ion/impl/_Private_Utils.java
index 62785fa277..cf0e22f3d7 100644
--- a/src/com/amazon/ion/impl/_Private_Utils.java
+++ b/src/com/amazon/ion/impl/_Private_Utils.java
@@ -68,7 +68,7 @@ public final class _Private_Utils
     /**
      * Marker for code points relevant to removal of IonReader.hasNext().
      */
-    public static final boolean READER_HASNEXT_REMOVED = false;
+    public static final boolean READER_HASNEXT_REMOVED = true;
 
 
     /** Just a zero-length byte array, used to avoid allocation. */
@@ -871,9 +871,16 @@ public static SymbolTable initialSymtab(_Private_LocalSymbolTableFactory lstFact
      * Trampoline to
      * {@link LocalSymbolTableAsStruct#getIonRepresentation()};
      */
-    public static IonStruct symtabTree(SymbolTable symtab)
+    public static IonStruct symtabTree(SymbolTable symtab, ValueFactory valueFactory)
     {
-        return ((LocalSymbolTableAsStruct)symtab).getIonRepresentation();
+        LocalSymbolTableAsStruct localSymbolTableAsStruct;
+        if (symtab instanceof  LocalSymbolTableAsStruct) {
+            localSymbolTableAsStruct = (LocalSymbolTableAsStruct) symtab;
+        } else {
+            localSymbolTableAsStruct = (LocalSymbolTableAsStruct) new LocalSymbolTableAsStruct.Factory(valueFactory)
+                    .newLocalSymtab(symtab.getSystemSymbolTable(), symtab.getImportedTables());
+        }
+        return localSymbolTableAsStruct.getIonRepresentation();
     }
 
     /**
diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 4df80f7993..7d2e5606d6 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -46,6 +46,7 @@
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl._Private_RecyclingStack;
 import com.amazon.ion.impl.bin.utf8.Utf8StringEncoder;
 import com.amazon.ion.impl.bin.utf8.Utf8StringEncoderPool;
 
@@ -471,90 +472,6 @@ public String toString()
         FLUSH
     }
 
-    /**
-     * A stack whose elements are recycled. This can be useful when the stack needs to grow and shrink
-     * frequently and has a predictable maximum depth.
-     * @param <T> the type of elements stored.
-     */
-    private static final class RecyclingStack<T> {
-
-        /**
-         * Factory for new stack elements.
-         * @param <T> the type of element.
-         */
-        public interface ElementFactory<T> {
-
-            /**
-             * @return a new instance.
-             */
-            T newElement();
-        }
-
-        private final List<T> elements;
-        private final ElementFactory<T> elementFactory;
-        private int currentIndex;
-        private T top;
-
-        /**
-         * @param initialCapacity the initial capacity of the underlying collection.
-         * @param elementFactory the factory used to create a new element on {@link #push()} when the stack has
-         *                       not previously grown to the new depth.
-         */
-        public RecyclingStack(int initialCapacity, ElementFactory<T> elementFactory) {
-            elements = new ArrayList<T>(initialCapacity);
-            this.elementFactory = elementFactory;
-            currentIndex = -1;
-            top = null;
-        }
-
-        /**
-         * Pushes an element onto the top of the stack, instantiating a new element only if the stack has not
-         * previously grown to the new depth.
-         * @return the element at the top of the stack after the push. This element must be initialized by the caller.
-         */
-        public T push() {
-            currentIndex++;
-            if (currentIndex >= elements.size()) {
-                top = elementFactory.newElement();
-                elements.add(top);
-            }  else {
-                top = elements.get(currentIndex);
-            }
-            return top;
-        }
-
-        /**
-         * @return the element at the top of the stack, or null if the stack is empty.
-         */
-        public T peek() {
-            return top;
-        }
-
-        /**
-         * Pops an element from the stack, retaining a reference to the element so that it can be reused the
-         * next time the stack grows to the element's depth.
-         * @return the element that was at the top of the stack before the pop, or null if the stack was empty.
-         */
-        public T pop() {
-            T popped = top;
-            currentIndex--;
-            if (currentIndex >= 0) {
-                top = elements.get(currentIndex);
-            } else {
-                top = null;
-                currentIndex = -1;
-            }
-            return popped;
-        }
-
-        /**
-         * @return true if the stack is empty; otherwise, false.
-         */
-        public boolean isEmpty() {
-            return top == null;
-        }
-    }
-
     private static final int SID_UNASSIGNED = -1;
 
     private final BlockAllocator                allocator;
@@ -566,7 +483,7 @@ public boolean isEmpty() {
     private final WriteBuffer                   buffer;
     private final WriteBuffer                   patchBuffer;
     private final PatchList                     patchPoints;
-    private final RecyclingStack<ContainerInfo> containers;
+    private final _Private_RecyclingStack<ContainerInfo> containers;
     private int                                 depth;
     private boolean                             hasWrittenValuesSinceFinished;
     private boolean                             hasWrittenValuesSinceConstructed;
@@ -601,9 +518,9 @@ public boolean isEmpty() {
         this.buffer            = new WriteBuffer(allocator);
         this.patchBuffer       = new WriteBuffer(allocator);
         this.patchPoints       = new PatchList();
-        this.containers        = new RecyclingStack<ContainerInfo>(
+        this.containers        = new _Private_RecyclingStack<ContainerInfo>(
             10,
-            new RecyclingStack.ElementFactory<ContainerInfo>() {
+            new _Private_RecyclingStack.ElementFactory<ContainerInfo>() {
                 public ContainerInfo newElement() {
                     return new ContainerInfo();
                 }
diff --git a/src/com/amazon/ion/impl/lite/IonDatagramLite.java b/src/com/amazon/ion/impl/lite/IonDatagramLite.java
index 75645fd862..9bb1a3d037 100644
--- a/src/com/amazon/ion/impl/lite/IonDatagramLite.java
+++ b/src/com/amazon/ion/impl/lite/IonDatagramLite.java
@@ -1040,7 +1040,7 @@ void load_current_symbol_table(IonValueLite prev_user_value)
                     }
                     else {
                         IonSystem sys = __iterator.get_datagram_system();
-                        rep = _Private_Utils.symtabTree(new_symbol_table);
+                        rep = _Private_Utils.symtabTree(new_symbol_table, sys);
                     }
                     assert(rep != null && __iterator.get_datagram_system() == rep.getSystem());
 
@@ -1147,7 +1147,7 @@ private static int count_system_values(IonSystem sys,
             int count = 0;
             while (curr.isLocalTable()) {
                 count++;
-                curr = _Private_Utils.symtabTree(curr).getSymbolTable();
+                curr = _Private_Utils.symtabTree(curr, sys).getSymbolTable();
             }
             // we should terminate when the symbol tables symbol table is the system symbol table
             assert(curr != null);
diff --git a/src/com/amazon/ion/system/IonReaderBuilder.java b/src/com/amazon/ion/system/IonReaderBuilder.java
index 755cbe1fa8..dd2810639d 100644
--- a/src/com/amazon/ion/system/IonReaderBuilder.java
+++ b/src/com/amazon/ion/system/IonReaderBuilder.java
@@ -15,8 +15,10 @@
 
 package com.amazon.ion.system;
 
+import static com.amazon.ion.impl._Private_IonReaderFactory.makeIncrementalReader;
 import static com.amazon.ion.impl._Private_IonReaderFactory.makeReader;
 
+import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
@@ -24,6 +26,11 @@
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.IonTextReader;
 import com.amazon.ion.IonValue;
+import com.amazon.ion.impl._Private_IonConstants;
+import com.amazon.ion.util.IonStreamUtils;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -42,6 +49,9 @@ public class IonReaderBuilder
 {
 
     private IonCatalog catalog = null;
+    private boolean isIncrementalReadingEnabled = false;
+    private IonBufferConfiguration bufferConfiguration = null;
+    private boolean isAnnotationIteratorReuseEnabled = true;
 
     private IonReaderBuilder()
     {
@@ -50,6 +60,8 @@ private IonReaderBuilder()
     private IonReaderBuilder(IonReaderBuilder that)
     {
         this.catalog = that.catalog;
+        this.isIncrementalReadingEnabled = that.isIncrementalReadingEnabled;
+        this.bufferConfiguration = that.bufferConfiguration;
     }
 
     /**
@@ -157,6 +169,172 @@ private IonCatalog validateCatalog()
         return catalog != null ? catalog : new SimpleCatalog();
     }
 
+    /**
+     * <p>
+     * Determines whether the IonReader will allow incremental reading of binary Ion data. When enabled, if
+     * {@link IonReader#next()} returns {@code null} at the top-level, it indicates that there is not enough data
+     * in the stream to complete a top-level value. The user may wait for more data to become available in the stream
+     * and call {@link IonReader#next()} again to continue reading. Unlike the non-incremental reader, the incremental
+     * reader will never throw an exception due to unexpected EOF during {@code next()}. If, however,
+     * {@link IonReader#close()} is called when an incomplete value is buffered, an {@link IonException} will be raised.
+     * </p>
+     * <p>
+     * There is currently no incremental text IonReader, so for text data a non-incremental IonReader will be
+     * returned regardless of the value of this option. If incremental text reading is supported in the future, it
+     * may be enabled via this option.
+     * </p>
+     * <p>
+     * When this option is enabled, auto-detection of GZIP data is not supported; the byte array or InputStream
+     * implementation provided to {@link #build(byte[])} or {@link #build(InputStream)} must return uncompressed bytes.
+     * This can be achieved by wrapping the data in a GZIPInputStream and passing it to {@link #build(InputStream)}.
+     * </p>
+     * <p>
+     * Additionally, when this option is enabled, annotation iterators are reused by default, improving performance.
+     * See {@link #withAnnotationIteratorReuseEnabled(boolean)} for more information and to disable that option.
+     * </p>
+     * <p>
+     * Although the incremental binary IonReader provides performance superior to the non-incremental binary IonReader
+     * for both incremental and non-incremental use cases, there is one caveat: the incremental implementation
+     * must be able to buffer an entire top-level value and any preceding system values (Ion version marker(s) and
+     * symbol table(s)) in memory. This will not be a problem for the vast majority of Ion streams, as it is rare for a
+     * single top-level value or symbol table to exceed a few megabytes in size. However, if the size of the stream's
+     * values risk exceeding the available memory, then this option must not be enabled.
+     * </p>
+     * @param isEnabled true if the option is enabled; otherwise, false.
+     *
+     * @return this builder instance, if mutable;
+     * otherwise a mutable copy of this builder.
+     *
+     * @see #setIncrementalReadingEnabled()
+     * @see #setIncrementalReadingDisabled()
+     */
+    public IonReaderBuilder withIncrementalReadingEnabled(boolean isEnabled) {
+        IonReaderBuilder b = mutable();
+        if (isEnabled) {
+            b.setIncrementalReadingEnabled();
+        } else {
+            b.setIncrementalReadingDisabled();
+        }
+        return b;
+    }
+
+    /**
+     * @see #withIncrementalReadingEnabled(boolean)
+     */
+    public void setIncrementalReadingEnabled() {
+        mutationCheck();
+        isIncrementalReadingEnabled = true;
+    }
+
+    /**
+     * @see #withIncrementalReadingEnabled(boolean)
+     */
+    public void setIncrementalReadingDisabled() {
+        mutationCheck();
+        isIncrementalReadingEnabled = false;
+    }
+
+    /**
+     * @see #withIncrementalReadingEnabled(boolean)
+     * @return true if incremental reading is enabled; otherwise, false.
+     */
+    public boolean isIncrementalReadingEnabled() {
+        return isIncrementalReadingEnabled;
+    }
+
+    /**
+     * Sets the buffer configuration. This can be used, for example, to set a maximum buffer size
+     * and receive notifications when values would exceed this size. Currently, this is ignored unless incremental
+     * reading has been enabled via {@link #withIncrementalReadingEnabled(boolean)}) or
+     * {@link #setIncrementalReadingEnabled()}. This configuration is optional. If not provided, the buffer size will
+     * be limited only by the available memory.
+     *
+     * @param configuration the configuration.
+     *
+     * @return this builder instance, if mutable;
+     * otherwise a mutable copy of this builder.
+     * 
+     * @see #setBufferConfiguration(IonBufferConfiguration)
+     */
+    public IonReaderBuilder withBufferConfiguration(IonBufferConfiguration configuration) {
+        IonReaderBuilder b = mutable();
+        b.setBufferConfiguration(configuration);
+        return b;
+    }
+
+    /**
+     * @see #withBufferConfiguration(IonBufferConfiguration)
+     */
+    public void setBufferConfiguration(IonBufferConfiguration configuration) {
+        mutationCheck();
+        bufferConfiguration = configuration;
+    }
+
+    /**
+     * @see #withBufferConfiguration(IonBufferConfiguration)
+     * @return the current configuration.
+     */
+    public IonBufferConfiguration getBufferConfiguration() {
+        return bufferConfiguration;
+    }
+
+    /**
+     * <p>
+     * Determines whether readers will reuse the annotation iterator returned by
+     * {@link IonReader#iterateTypeAnnotations()}. When enabled, the returned iterator remains valid only while the
+     * reader remains positioned at the current value; storing the iterator and iterating its values after that will
+     * cause undefined behavior. This provides improved performance and memory efficiency when frequently iterating
+     * annotations. When disabled, the returned iterator may be stored and used to retrieve the annotations that were
+     * on the value at the reader's position at the time of the call, regardless of where the reader is currently
+     * positioned.
+     * </p>
+     * <p>
+     * Currently, this option only has an effect when incremental reading is enabled (see
+     * {@link #withIncrementalReadingEnabled(boolean)}). In that case, it is enabled by default. Non-incremental readers
+     * always act as if this option were disabled.
+     * </p>
+     * @param isEnabled true if the option is enabled; otherwise, false.
+     *
+     * @return this builder instance, if mutable;
+     * otherwise a mutable copy of this builder.
+     *
+     * @see #setAnnotationIteratorReuseEnabled()
+     * @see #setAnnotationIteratorReuseDisabled()
+     */
+    public IonReaderBuilder withAnnotationIteratorReuseEnabled(boolean isEnabled) {
+        IonReaderBuilder b = mutable();
+        if (isEnabled) {
+            b.setAnnotationIteratorReuseEnabled();
+        } else {
+            b.setAnnotationIteratorReuseDisabled();
+        }
+        return b;
+    }
+
+    /**
+     * @see #withAnnotationIteratorReuseEnabled(boolean)
+     */
+    public void setAnnotationIteratorReuseEnabled() {
+        mutationCheck();
+        isAnnotationIteratorReuseEnabled = true;
+    }
+
+    /**
+     * @see #withAnnotationIteratorReuseEnabled(boolean)
+     */
+    public void setAnnotationIteratorReuseDisabled() {
+        mutationCheck();
+        isAnnotationIteratorReuseEnabled = false;
+    }
+
+    /**
+     * @see #withAnnotationIteratorReuseEnabled(boolean)
+     * @return true if annotation iterator reuse is enabled; otherwise, false.
+     */
+    public boolean isAnnotationIteratorReuseEnabled() {
+        return isAnnotationIteratorReuseEnabled;
+    }
+
     /**
      * Based on the builder's configuration properties, creates a new IonReader
      * instance over the given block of Ion data, detecting whether it's text or
@@ -175,7 +353,7 @@ private IonCatalog validateCatalog()
      */
     public IonReader build(byte[] ionData)
     {
-        return makeReader(validateCatalog(), ionData);
+        return build(ionData, 0, ionData.length);
     }
 
     /**
@@ -198,6 +376,15 @@ public IonReader build(byte[] ionData)
      */
     public IonReader build(byte[] ionData, int offset, int length)
     {
+        if (isIncrementalReadingEnabled) {
+            if (IonStreamUtils.isGzip(ionData, offset, length)) {
+                throw new IllegalArgumentException("Automatic GZIP detection is not supported with incremental" +
+                        "support enabled. Wrap the bytes with a GZIPInputStream and call build(InputStream).");
+            }
+            if (IonStreamUtils.isIonBinary(ionData, offset, length)) {
+                return makeIncrementalReader(this, new ByteArrayInputStream(ionData, offset, length));
+            }
+        }
         return makeReader(validateCatalog(), ionData, offset, length);
     }
 
@@ -223,7 +410,29 @@ public IonReader build(byte[] ionData, int offset, int length)
      */
     public IonReader build(InputStream ionData)
     {
-        return makeReader(validateCatalog(), ionData);
+        InputStream wrapper = ionData;
+        if (isIncrementalReadingEnabled) {
+            if (!ionData.markSupported()) {
+                wrapper = new BufferedInputStream(ionData);
+            }
+            wrapper.mark(_Private_IonConstants.BINARY_VERSION_MARKER_SIZE);
+            byte[] possibleIVM = new byte[_Private_IonConstants.BINARY_VERSION_MARKER_SIZE];
+            int bytesRead;
+            try {
+                bytesRead = wrapper.read(possibleIVM);
+                wrapper.reset();
+            } catch (IOException e) {
+                throw new IonException(e);
+            }
+            if (IonStreamUtils.isGzip(possibleIVM, 0, possibleIVM.length)) {
+                throw new IllegalArgumentException("Automatic GZIP detection is not supported with incremental" +
+                        "support enabled. Wrap the bytes with a GZIPInputStream and call build(InputStream).");
+            }
+            if (possibleIVM.length == bytesRead && IonStreamUtils.isIonBinary(possibleIVM)) {
+                return makeIncrementalReader(this, wrapper);
+            }
+        }
+        return makeReader(validateCatalog(), wrapper);
     }
 
     /**
diff --git a/test/AllTests.java b/test/AllTests.java
index 0e433b5b8b..6817e13d54 100644
--- a/test/AllTests.java
+++ b/test/AllTests.java
@@ -49,6 +49,9 @@
 import com.amazon.ion.NullTest;
 import com.amazon.ion.RawValueSpanReaderBasicTest;
 import com.amazon.ion.impl.IonReaderBinaryRawLargeStreamTest;
+import com.amazon.ion.impl.IonReaderLookaheadBufferTest;
+import com.amazon.ion.impl.ResizingPipedInputStreamTest;
+import com.amazon.ion.impl.IonReaderBinaryIncrementalTest;
 import com.amazon.ion.impl.RawValueSpanReaderTest;
 import com.amazon.ion.RoundTripTest;
 import com.amazon.ion.SexpTest;
@@ -209,6 +212,11 @@
     IonReaderBuilderTest.class,
     IonReaderBinaryRawLargeStreamTest.class,
 
+    // non-blocking binary reader tests
+    IonReaderBinaryIncrementalTest.class,
+    ResizingPipedInputStreamTest.class,
+    IonReaderLookaheadBufferTest.class,
+
     // experimental binary writer tests
     PooledBlockAllocatorProviderTest.class,
     WriteBufferTest.class,
diff --git a/test/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java b/test/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java
new file mode 100644
index 0000000000..f363b7c6b0
--- /dev/null
+++ b/test/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java
@@ -0,0 +1,35 @@
+package com.amazon.ion;
+
+import java.util.Iterator;
+
+public class BinaryIonReaderIteratorSystemProcessingTest
+    extends IteratorSystemProcessingTestCase
+{
+    private byte[] myBytes;
+
+    @Override
+    protected void prepare(String text)
+    {
+        myMissingSymbolTokensHaveText = false;
+        myBytes = encode(text);
+    }
+
+    @Override
+    protected Iterator<IonValue> iterate()
+    {
+        return system().iterate(getStreamingMode().newIonReader(system().getCatalog(), myBytes));
+    }
+
+    @Override
+    protected Iterator<IonValue> systemIterate()
+    {
+        return system().systemIterate(system().newSystemReader(myBytes));
+    }
+
+    @Override
+    protected int expectedLocalNullSlotSymbolId() {
+        // The spec allows for implementations to treat these malformed symbols as "null slots", and all "null slots"
+        // in local symbol tables as equivalent to symbol zero.
+        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+    }
+}
diff --git a/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java b/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
index c1894984bb..3373712a93 100644
--- a/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
+++ b/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
@@ -38,7 +38,7 @@ protected void prepare(String text)
     @Override
     public IonReader read() throws Exception
     {
-        return system().newReader(myBytes);
+        return getStreamingMode().newIonReader(system().getCatalog(), myBytes);
     }
 
     @Override
diff --git a/test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java b/test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java
index c1c5324abd..e545486de6 100644
--- a/test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java
+++ b/test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java
@@ -54,9 +54,8 @@ public class BinaryReaderWrappedValueLengthTest
     public void readInto() throws Exception
     {
         thrown.expect(IonException.class);
-        thrown.expectMessage("Wrapper length mismatch: wrapper 11 wrapped value 9 at position 8");
 
-        final IonReader in = system().newReader(OVERRUN);
+        final IonReader in = getStreamingMode().newIonReader(system().getCatalog(), OVERRUN);
 
         assertEquals(IonType.SYMBOL, in.next());
         assertEquals(asList("name"), asList(in.getTypeAnnotations()));
@@ -65,17 +64,18 @@ public void readInto() throws Exception
         assertEquals(IonType.SYMBOL, in.next());
         assertEquals(emptyList(), asList(in.getTypeAnnotations()));
         assertEquals("name", in.stringValue());
+        in.close();
     }
 
     @Test
     public void readOver() throws Exception
     {
         thrown.expect(IonException.class);
-        thrown.expectMessage("Wrapper length mismatch: wrapper 11 wrapped value 9 at position 8");
 
-        final IonReader in = system().newReader(OVERRUN);
+        final IonReader in = getStreamingMode().newIonReader(system().getCatalog(), OVERRUN);
 
         assertEquals(IonType.SYMBOL, in.next());
         assertEquals(IonType.SYMBOL, in.next());
+        in.close();
     }
 }
diff --git a/test/com/amazon/ion/BinaryTest.java b/test/com/amazon/ion/BinaryTest.java
index e7641ae01f..b29d3c998f 100644
--- a/test/com/amazon/ion/BinaryTest.java
+++ b/test/com/amazon/ion/BinaryTest.java
@@ -17,7 +17,10 @@
 
 import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
 
+import java.io.IOException;
 import java.util.Arrays;
+import java.util.Iterator;
+
 import org.junit.Test;
 
 public class BinaryTest extends IonTestCase
@@ -74,7 +77,26 @@ public static String bytesToHex(final byte[] bytes)
      */
     private IonValue ion(final String hex)
     {
-        return system().singleValue(hexToBytes(MAGIC_COOKIE + hex));
+        byte[] data = hexToBytes(MAGIC_COOKIE + hex);
+        // Note: when ion-java#379 is complete, the following branch should be removed.
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            IonReader reader = getStreamingMode().newIonReader(system().getCatalog(), data);
+            Iterator<IonValue> iterator = system().iterate(reader);
+            IonValue value = null;
+            if (iterator.hasNext()) {
+                value = iterator.next();
+            }
+            if (iterator.hasNext()) {
+                throw new IonException("not a single value");
+            }
+            try {
+                reader.close();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            return value;
+        }
+        return system().singleValue(data);
     }
 
     /** Converts a single value to bytes using an empty datagram */
diff --git a/test/com/amazon/ion/EquivsTestCase.java b/test/com/amazon/ion/EquivsTestCase.java
index 3cb88b345e..9421a63655 100644
--- a/test/com/amazon/ion/EquivsTestCase.java
+++ b/test/com/amazon/ion/EquivsTestCase.java
@@ -15,20 +15,23 @@
 
 package com.amazon.ion;
 
+import static com.amazon.ion.IonType.DATAGRAM;
+
 import com.amazon.ion.impl._Private_Utils;
 import com.amazon.ion.junit.IonAssert;
+
+import java.io.File;
+
+import org.junit.Test;
 import com.amazon.ion.system.IonBinaryWriterBuilder;
 import com.amazon.ion.system.IonSystemBuilder;
 import com.amazon.ion.system.IonTextWriterBuilder;
-import org.junit.Test;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 
-import static com.amazon.ion.IonType.DATAGRAM;
-
 public abstract class EquivsTestCase
     extends IonTestCase
 {
@@ -191,7 +194,7 @@ protected void checkEquivalence(final IonValue left,
         }
     }
 
-    protected static IonDatagram[] roundTripDatagram(IonDatagram input) throws IOException {
+    public IonDatagram[] roundTripDatagram(IonDatagram input) throws IOException {
         IonSystem system = IonSystemBuilder.standard().build();
         IonLoader loader = system.getLoader();
         ByteArrayOutputStream textOutputStream = new ByteArrayOutputStream();
@@ -215,7 +218,12 @@ protected static IonDatagram[] roundTripDatagram(IonDatagram input) throws IOExc
         }
         data[0] = input;
         data[1] = loader.load(new ByteArrayInputStream(textOutputStream.toByteArray()));
-        data[2] = loader.load(new ByteArrayInputStream(binaryOutputStream.toByteArray()));
+        binaryReader = getStreamingMode().newIonReader(
+            system().getCatalog(),
+            new ByteArrayInputStream(binaryOutputStream.toByteArray())
+        );
+        data[2] = loader.load(binaryReader);
+        binaryReader.close();
         return data;
     }
 
@@ -231,7 +239,9 @@ protected void roundTripEquivalence(IonDatagram input, boolean myExpectedEqualit
     public void testEquivsOverFile()
     throws Exception
     {
-        IonDatagram dg = loader().load(myTestFile);
+        IonReader reader = getStreamingMode().newIonReader(system().getCatalog(), new FileInputStream(myTestFile));
+        IonDatagram dg = loader().load(reader);
+        reader.close();
         runEquivalenceChecks(dg, myExpectedEquality);
         roundTripEquivalence(dg, myExpectedEquality);
     }
diff --git a/test/com/amazon/ion/GoodIonTest.java b/test/com/amazon/ion/GoodIonTest.java
index 9ee8505c95..c1bc3fa804 100644
--- a/test/com/amazon/ion/GoodIonTest.java
+++ b/test/com/amazon/ion/GoodIonTest.java
@@ -62,7 +62,7 @@ public void test()
 
         FileInputStream in = new FileInputStream(myTestFile);
         try {
-            IonReader fileReader = system().newReader(in);
+            IonReader fileReader = getStreamingMode().newIonReader(system().getCatalog(), in);
 
             ReaderCompare.compare(treeReader, fileReader);
         }
@@ -71,7 +71,7 @@ public void test()
         }
 
 
-        // Pass 3: Use Iterator
+        // Pass 3: Use Iterator over InputStream
         in = new FileInputStream(myTestFile);
         try {
             Iterator<IonValue> expected = datagram.iterator();
@@ -83,9 +83,21 @@ public void test()
             in.close();
         }
 
+        // Pass 4: Use Iterator over IonReader
+        in = new FileInputStream(myTestFile);
+        try {
+            Iterator<IonValue> expected = datagram.iterator();
+            Iterator<IonValue> actual = system().iterate(getStreamingMode().newIonReader(system().getCatalog(), in));
+
+            assertIonIteratorEquals(expected, actual);
+        }
+        finally {
+            in.close();
+        }
+
         treeReader = system().newReader(datagram);
         byte[] encoded = datagram.getBytes();
-        IonReader binaryReader = system().newReader(encoded);
+        IonReader binaryReader = getStreamingMode().newIonReader(system().getCatalog(), encoded);
         ReaderCompare.compare(treeReader, binaryReader);
     }
 
diff --git a/test/com/amazon/ion/IonTestCase.java b/test/com/amazon/ion/IonTestCase.java
index 9c96dc2635..170889ce33 100644
--- a/test/com/amazon/ion/IonTestCase.java
+++ b/test/com/amazon/ion/IonTestCase.java
@@ -22,9 +22,11 @@
 import com.amazon.ion.junit.Injected;
 import com.amazon.ion.junit.Injected.Inject;
 import com.amazon.ion.junit.IonAssert;
+import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.system.IonSystemBuilder;
 import com.amazon.ion.system.SimpleCatalog;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -58,13 +60,39 @@ public abstract class IonTestCase
         }
     }
 
-    protected enum StreamingMode { OLD_STREAMING, NEW_STREAMING }
+    protected enum StreamingMode {
+        NEW_STREAMING() {
+            @Override
+            public IonReader newIonReader(IonCatalog catalog, InputStream inputStream) {
+                return IonReaderBuilder.standard().withCatalog(catalog).build(inputStream);
+            }
+
+            @Override
+            public IonReader newIonReader(IonCatalog catalog, byte[] data) {
+                return IonReaderBuilder.standard().withCatalog(catalog).build(data);
+            }
+        },
+        NEW_STREAMING_INCREMENTAL() {
+            @Override
+            public IonReader newIonReader(IonCatalog catalog, InputStream inputStream) {
+                return IonReaderBuilder.standard().withCatalog(catalog).withIncrementalReadingEnabled(true).build(inputStream);
+            }
+
+            @Override
+            public IonReader newIonReader(IonCatalog catalog, byte[] data) {
+                return IonReaderBuilder.standard().withCatalog(catalog).withIncrementalReadingEnabled(true).build(data);
+            }
+        };
+
+        public abstract IonReader newIonReader(IonCatalog catalog, InputStream inputStream);
+        public abstract IonReader newIonReader(IonCatalog catalog, byte[] data);
+    }
 
     // Using an enum makes the test names more understandable than a boolean.
     protected enum StreamCopySpeed { COPY_OPTIMIZED, COPY_NON_OPTIMIZED }
 
     @Inject("streamingMode")
-    public static final StreamingMode[] STREAMING_DIMENSION = { StreamingMode.NEW_STREAMING };
+    public static final StreamingMode[] STREAMING_DIMENSION = StreamingMode.values();
 
     /**
      * Flag on whether IonSystems generated is
@@ -231,7 +259,16 @@ public IonDatagram load(File ionFile)
         throws IonException, IOException
     {
         IonLoader loader = loader();
-        IonDatagram dg = loader.load(ionFile);
+        IonDatagram dg;
+        // Note: when ion-java#379 is complete, the following branches should be replaced with
+        // `dg = loader.load(ionFile)`.
+        if (ionFile.getName().endsWith(".ion")) {
+            dg = loader.load(ionFile);
+        } else {
+            IonReader reader = myStreamingMode.newIonReader(system().getCatalog(), new FileInputStream(ionFile));
+            dg = loader.load(reader);
+            reader.close();
+        }
 
         // Flush out any encoding problems in the data.
         forceDeepMaterialization(dg);
@@ -739,14 +776,16 @@ public static void checkString(String text, IonValue value)
     public static void checkSymbol(String text, int sid, SymbolToken sym)
     {
         assertEquals("SymbolToken.text", text, sym.getText());
-        assertEquals("SymbolToken.id",   sid,  sym.getSid());
 
         if (text != null)
         {
+            assertEquals("SymbolToken.id", sid, sym.getSid());
             assertEquals("SymbolToken.assumeText", text, sym.assumeText());
         }
         else
         {
+            // Local symbols with unknown text may be treated equivalently to symbol zero.
+            assertTrue("SymbolToken.id", sid == sym.getSid() || 0 == sym.getSid());
             try
             {
                 sym.assumeText();
@@ -789,7 +828,7 @@ public static void checkSymbol(String name, int id, IonValue value)
 
         assertFalse(value.isNullValue());
 
-        if (name == null)
+        if (name == null && id != 0)
         {
             try {
                 sym.stringValue();
@@ -802,6 +841,7 @@ public static void checkSymbol(String name, int id, IonValue value)
         }
         else
         {
+            // Note: symbol zero follows this path because it causes stringValue() to return null rather than throw.
             assertEquals("symbol name", name, sym.stringValue());
         }
 
diff --git a/test/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java b/test/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java
new file mode 100644
index 0000000000..90ec7b306f
--- /dev/null
+++ b/test/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java
@@ -0,0 +1,31 @@
+package com.amazon.ion;
+
+public class LoadBinaryIonReaderSystemProcessingTest
+    extends DatagramIteratorSystemProcessingTest
+{
+    private byte[] myBytes;
+
+    @Override
+    protected void prepare(String text)
+    {
+        myMissingSymbolTokensHaveText = false;
+        myBytes = encode(text);
+    }
+
+    @Override
+    protected IonDatagram load() throws Exception
+    {
+        IonLoader loader = loader();
+        IonReader reader = getStreamingMode().newIonReader(system().getCatalog(), myBytes);
+        IonDatagram datagram = loader.load(reader);
+        reader.close();
+        return datagram;
+    }
+
+    @Override
+    protected int expectedLocalNullSlotSymbolId() {
+        // The spec allows for implementations to treat these malformed symbols as "null slots", and all "null slots"
+        // in local symbol tables as equivalent to symbol zero.
+        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+    }
+}
diff --git a/test/com/amazon/ion/NopPaddingTest.java b/test/com/amazon/ion/NopPaddingTest.java
index 2fd7fa3555..1ecf5eac65 100644
--- a/test/com/amazon/ion/NopPaddingTest.java
+++ b/test/com/amazon/ion/NopPaddingTest.java
@@ -126,8 +126,6 @@ public void testNopPaddingWithAnnotation()
         throws Exception
     {
         myExpectedException.expect(IonException.class);
-        myExpectedException.expectMessage("NOP padding is not allowed within annotation wrappers.");
-
         loadTestFile("bad/nopPadWithAnnotations.10n");
     }
 
diff --git a/test/com/amazon/ion/RawValueSpanReaderBasicTest.java b/test/com/amazon/ion/RawValueSpanReaderBasicTest.java
index f209214c13..4da4cafe95 100644
--- a/test/com/amazon/ion/RawValueSpanReaderBasicTest.java
+++ b/test/com/amazon/ion/RawValueSpanReaderBasicTest.java
@@ -30,7 +30,6 @@
  * Tests basic behavior of the {@link RawValueSpanProvider} reader facet, which
  * provides access to the reader's underlying byte buffer and vends OffsetSpans
  * that provide positions of the current value in that buffer.
- * @see RawValueSpanReaderTest
  */
 @SuppressWarnings({"deprecation", "javadoc"})
 public class RawValueSpanReaderBasicTest
@@ -53,6 +52,14 @@ public void testTextReaderReturnsNullFacet()
         assertNull(reader.asFacet(RawValueSpanProvider.class));
     }
 
+    @Test
+    public void incrementalBinaryReaderReturnsNullFacet()
+    {
+        IonReader reader = IonReaderBuilder.standard().withIncrementalReadingEnabled(true).build(dummyData);
+        assertNull(reader.asFacet(RawValueSpanProvider.class));
+        assertNull(reader.asFacet(SeekableReader.class));
+    }
+
     @Test
     public void testNonByteBackedReaderNotSupported()
     {
diff --git a/test/com/amazon/ion/ReaderChecker.java b/test/com/amazon/ion/ReaderChecker.java
index 7905173d80..f1fcc96557 100644
--- a/test/com/amazon/ion/ReaderChecker.java
+++ b/test/com/amazon/ion/ReaderChecker.java
@@ -158,7 +158,10 @@ public ReaderChecker annotation(String expectedText, int expectedSid)
             }
 
             try {
-                myReader.iterateTypeAnnotations();
+                Iterator<String> iterator = myReader.iterateTypeAnnotations();
+                while (iterator.hasNext()) {
+                    iterator.next();
+                }
                 fail("Expected " + UnknownSymbolException.class);
             }
             catch (UnknownSymbolException e)
diff --git a/test/com/amazon/ion/ReaderMaker.java b/test/com/amazon/ion/ReaderMaker.java
index ff5cc88fb7..b4a3e9a0ca 100644
--- a/test/com/amazon/ion/ReaderMaker.java
+++ b/test/com/amazon/ion/ReaderMaker.java
@@ -19,6 +19,8 @@
 import static com.amazon.ion.TestUtils.ensureText;
 
 import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.system.IonReaderBuilder;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -138,6 +140,33 @@ public IonReader newReader(IonSystem system, byte[] ionData)
         }
     },
 
+    FROM_INPUT_STREAM_BINARY_INCREMENTAL(Feature.BINARY, Feature.STREAM)
+    {
+        @Override
+        public IonReader newReader(IonSystem system, byte[] ionData,
+                                   InputStreamWrapper wrapper)
+            throws IOException
+        {
+            ionData = ensureBinary(system, ionData);
+            InputStream in = new ByteArrayInputStream(ionData);
+            InputStream wrapped = wrapper.wrap(in);
+            return newReader(system, wrapped);
+        }
+
+        @Override
+        public IonReader newReader(IonSystem system, byte[] ionData)
+        {
+            ionData = ensureBinary(system, ionData);
+            InputStream in = new ByteArrayInputStream(ionData);
+            return newReader(system, in);
+        }
+
+        @Override
+        public IonReader newReader(IonSystem system, InputStream inputStream) {
+            IonCatalog catalog = system.getCatalog();
+            return IonReaderBuilder.standard().withIncrementalReadingEnabled(true).withCatalog(catalog).build(inputStream);
+        }
+    },
 
     /**
      * Invokes {@link IonSystem#newReader(InputStream)} with Ion text.
diff --git a/test/com/amazon/ion/ReaderSystemProcessingTestCase.java b/test/com/amazon/ion/ReaderSystemProcessingTestCase.java
index de9b468221..e7c0f39a66 100644
--- a/test/com/amazon/ion/ReaderSystemProcessingTestCase.java
+++ b/test/com/amazon/ion/ReaderSystemProcessingTestCase.java
@@ -236,10 +236,6 @@ public void testIsInStruct()
         assertFalse(myReader.isInStruct());
         assertEquals(0, myReader.getDepth());
 
-        assertTrue(myReader.hasNext());
-        assertFalse(myReader.isInStruct());
-        assertEquals(0, myReader.getDepth());
-
         assertEquals(IonType.STRUCT, myReader.next());
         assertFalse(myReader.isInStruct());
         assertEquals(0, myReader.getDepth());
@@ -249,10 +245,6 @@ public void testIsInStruct()
             assertTrue(myReader.isInStruct());
             assertEquals(1, myReader.getDepth());
 
-            assertTrue(myReader.hasNext());    // List is coming up
-            assertTrue(myReader.isInStruct()); // but we're still at struct level
-            assertEquals(1, myReader.getDepth());
-
             assertSame(IonType.LIST, myReader.next());
             assertTrue(myReader.isInStruct());  // still in struct until we stepIn()
             assertEquals(1, myReader.getDepth());
@@ -293,10 +285,8 @@ public void testHasNextLeavesCurrentData()
         String text = "hello 2";
         startIteration(text);
 
-        assertTrue(myReader.hasNext());
         assertEquals(IonType.SYMBOL, myReader.next());
         assertEquals(IonType.SYMBOL, myReader.getType());
-        assertTrue(myReader.hasNext());
 
         // FIXed ME text reader was broken, now fixed
         // really the binary readers were returning the
diff --git a/test/com/amazon/ion/RoundTripTest.java b/test/com/amazon/ion/RoundTripTest.java
index 650bf5cac0..3024a40fd5 100644
--- a/test/com/amazon/ion/RoundTripTest.java
+++ b/test/com/amazon/ion/RoundTripTest.java
@@ -241,14 +241,18 @@ public void test()
 
         // Reload the first-trip binary
 
-        IonDatagram dgFromBinary = loader.load(binary1);
+        IonReader reader = getStreamingMode().newIonReader(system().getCatalog(), binary1);
+        IonDatagram dgFromBinary = loader.load(reader);
+        reader.close();
 
         String text2FromBinary   = renderUserView(dgFromBinary);
         byte[] binary2FromBinary = encode(dgFromBinary);
         checkBinaryHeader(binary2FromBinary);
 
         // check strict data equivalence
-        IonDatagram dgbinary2FromBinary = loader.load(binary2FromBinary);
+        reader = getStreamingMode().newIonReader(system().getCatalog(), binary2FromBinary);
+        IonDatagram dgbinary2FromBinary = loader.load(reader);
+        reader.close();
         assertIonEquals(dgFromBinary, dgbinary2FromBinary);
 
         if (!compareRenderedTextImages(text2FromText, text2FromBinary))
@@ -259,7 +263,9 @@ public void test()
         }
 
         // check strict data equivalence
-        IonDatagram dgBinary2FromText = loader.load(binary2FromText);
+        reader = getStreamingMode().newIonReader(system().getCatalog(), binary2FromText);
+        IonDatagram dgBinary2FromText = loader.load(reader);
+        reader.close();
         assertIonEquals(dgFromBinary, dgBinary2FromText);
     }
 
diff --git a/test/com/amazon/ion/SystemProcessingTestCase.java b/test/com/amazon/ion/SystemProcessingTestCase.java
index 6fce2cee24..24b9334787 100644
--- a/test/com/amazon/ion/SystemProcessingTestCase.java
+++ b/test/com/amazon/ion/SystemProcessingTestCase.java
@@ -325,7 +325,7 @@ public void testLocalTableReplacement()
 
         nextValue();
         checkSymbol("foo");
-        assertSame(table2, currentSymtab());
+        assertEquals(table2.getMaxId(), currentSymtab().getMaxId());
     }
 
     @Test
@@ -346,14 +346,26 @@ public void testTrivialLocalTableReplacement()
         checkInt(1);
 
         SymbolTable table1 = currentSymtab();
-        checkLocalTable(table1);
+        // Note: there's no need to require implementations to actually create an LST in this case. It's fine to
+        // treat it as a reset to the system symbol table.
+        assertFalse("table is substitute", table1.isSubstitute());
+        checkUnknownSymbol(" not defined ", UNKNOWN_SYMBOL_ID, table1);
+
+        SymbolTable system = table1.getSystemSymbolTable();
+        checkSystemTable(system);
+        assertEquals(system.getIonVersionId(), table1.getIonVersionId());
+        assertEquals(systemMaxId(), table1.getMaxId());
 
         nextValue();
         checkInt(2);
 
         SymbolTable table2 = currentSymtab();
-        checkLocalTable(table2);
-        assertNotSame(table1, table2);
+        assertFalse("table is substitute", table2.isSubstitute());
+        checkUnknownSymbol(" not defined ", UNKNOWN_SYMBOL_ID, table2);
+
+        system = table2.getSystemSymbolTable();
+        checkSystemTable(system);
+        assertEquals(system.getIonVersionId(), table2.getIonVersionId());
         assertEquals(systemMaxId(), table2.getMaxId());
     }
 
@@ -1130,6 +1142,10 @@ public void testIvmWithAnnotationSid()
         checkEof();
     }
 
+    protected int expectedLocalNullSlotSymbolId() {
+        return 10;
+    }
+
     protected void checkLocalSymtabWithMalformedSymbolEntry(String symbolValue)
         throws Exception
     {
@@ -1141,7 +1157,7 @@ protected void checkLocalSymtabWithMalformedSymbolEntry(String symbolValue)
         startIteration(text);
 
         nextValue();
-        checkSymbol(null, 10);
+        checkSymbol(null, expectedLocalNullSlotSymbolId());
 
         checkEof();
     }
diff --git a/test/com/amazon/ion/SystemProcessingTests.java b/test/com/amazon/ion/SystemProcessingTests.java
index 64e77e7f40..b08c029b82 100644
--- a/test/com/amazon/ion/SystemProcessingTests.java
+++ b/test/com/amazon/ion/SystemProcessingTests.java
@@ -24,6 +24,7 @@
     TextIteratorSystemProcessingTest.class,
     TextByteArrayIteratorSystemProcessingTest.class,
     BinaryByteArrayIteratorSystemProcessingTest.class,
+    BinaryIonReaderIteratorSystemProcessingTest.class,
     JavaReaderIteratorSystemProcessingTest.class,
     BinaryStreamIteratorSystemProcessingTest.class,
     TextStreamIteratorSystemProcessingTest.class,
@@ -31,6 +32,7 @@
     LoadTextStreamSystemProcessingTest.class,
     LoadBinaryBytesSystemProcessingTest.class,
     LoadBinaryStreamSystemProcessingTest.class,
+    LoadBinaryIonReaderSystemProcessingTest.class,
     DatagramIteratorSystemProcessingTest.class,
     BinaryReaderSystemProcessingTest.class,
     DatagramTreeReaderSystemProcessingTest.class,
diff --git a/test/com/amazon/ion/TestUtils.java b/test/com/amazon/ion/TestUtils.java
index 3f8a2bb241..f278c46ede 100644
--- a/test/com/amazon/ion/TestUtils.java
+++ b/test/com/amazon/ion/TestUtils.java
@@ -15,10 +15,14 @@
 
 package com.amazon.ion;
 
+import static com.amazon.ion.BitUtils.bytes;
 import static com.amazon.ion.impl._Private_Utils.READER_HASNEXT_REMOVED;
 
+import com.amazon.ion.impl._Private_IonConstants;
 import com.amazon.ion.impl._Private_Utils;
 import com.amazon.ion.util.IonStreamUtils;
+
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.math.BigDecimal;
@@ -138,6 +142,7 @@ public boolean accept(File dir, String name)
                       "bad/clobWithNullCharacter.ion"          // TODO amzn/ion-java/43
                       ,"bad/emptyAnnotatedInt.10n"             // TODO amzn/ion-java/55
                       ,"good/subfieldVarUInt32bit.ion"         // TODO amzn/ion-java/62
+                      ,"good/subfieldVarUInt.ion"              // Note: this passes but takes too long. That's fine; it's not a realistic use case.
                       ,"good/utf16.ion"                        // TODO amzn/ion-java/61
                       ,"good/utf32.ion"                        // TODO amzn/ion-java/61
                       ,"good/whitespace.ion"
@@ -551,4 +556,28 @@ public static boolean symbolTableEquals(final SymbolTable first, final SymbolTab
             throw new AssertionError("Broken encoding");
         }
     }
+
+    /**
+     * Byte appender for binary Ion streams.
+     */
+    public static class BinaryIonAppender {
+        private final ByteArrayOutputStream out = new ByteArrayOutputStream();
+
+        public BinaryIonAppender() throws Exception {
+            out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+        }
+
+        public BinaryIonAppender append(int... data) throws Exception {
+            return append(bytes(data));
+        }
+
+        public BinaryIonAppender append(byte[] data) throws Exception {
+            out.write(data);
+            return this;
+        }
+
+        public byte[] toByteArray() {
+            return out.toByteArray();
+        }
+    }
 }
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
new file mode 100644
index 0000000000..992737f5ed
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
@@ -0,0 +1,3158 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.BufferConfiguration;
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.TestUtils;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder;
+import com.amazon.ion.impl.bin._Private_IonManagedWriter;
+import com.amazon.ion.impl.bin._Private_IonRawWriter;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.SimpleCatalog;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static com.amazon.ion.BitUtils.bytes;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+public class IonReaderBinaryIncrementalTest {
+
+    private static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
+    private static final IonReaderBuilder STANDARD_READER_BUILDER = IonReaderBuilder.standard()
+        .withIncrementalReadingEnabled(true);
+    private static final IonBinaryWriterBuilder STANDARD_WRITER_BUILDER = IonBinaryWriterBuilder.standard();
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    // Builds the incremental reader. May be overwritten by individual tests.
+    private IonReaderBuilder readerBuilder;
+    // Builds binary writers for constructing test data. May be overwritten by individual tests.
+    private IonBinaryWriterBuilder writerBuilder;
+
+    @Before
+    public void setup() {
+        readerBuilder = STANDARD_READER_BUILDER;
+        writerBuilder = STANDARD_WRITER_BUILDER;
+    }
+
+    /**
+     * Writes binary Ion streams with a user-level writer.
+     */
+    private interface WriterFunction {
+        void write(IonWriter writer) throws IOException;
+    }
+
+    /**
+     * Writes binary Ion streams with a raw writer. Also allows bytes to be written directly to the stream.
+     */
+    private interface RawWriterFunction {
+        void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException;
+    }
+
+    /**
+     * Converts the given text Ion to the equivalent binary Ion.
+     * @param ion text Ion data.
+     * @return the equivalent binary Ion data.
+     * @throws Exception if the given data is invalid.
+     */
+    private static byte[] toBinary(String ion) throws Exception {
+        return TestUtils.ensureBinary(SYSTEM, ion.getBytes("UTF-8"));
+    }
+
+    /**
+     * Creates an incremental reader over the binary equivalent of the given text Ion.
+     * @param ion text Ion data.
+     * @return a new reader.
+     * @throws Exception if an exception is raised while converting the Ion data.
+     */
+    private IonReaderBinaryIncremental readerFor(String ion) throws Exception {
+        return new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(toBinary(ion)));
+    }
+
+    /**
+     * Creates an incremental reader over the binary Ion data created by invoking the given RawWriterFunction.
+     * @param writerFunction the function used to generate the data.
+     * @return a new reader.
+     * @throws Exception if an exception is raised while writing the Ion data.
+     */
+    private IonReaderBinaryIncremental readerFor(RawWriterFunction writerFunction) throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        _Private_IonRawWriter writer = writerBuilder.build(out)
+            .asFacet(_Private_IonManagedWriter.class)
+            .getRawWriter();
+        out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+        writerFunction.write(writer, out);
+        writer.close();
+        return new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(out.toByteArray()));
+    }
+
+    /**
+     * Creates an incremental reader over the binary Ion data created by invoking the given WriterFunction.
+     * @param writerFunction the function used to generate the data.
+     * @return a new reader.
+     * @throws Exception if an exception is raised while writing the Ion data.
+     */
+    private IonReaderBinaryIncremental readerFor(WriterFunction writerFunction) throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = writerBuilder.build(out);
+        writerFunction.write(writer);
+        writer.close();
+        return new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(out.toByteArray()));
+    }
+
+    /**
+     * Creates an incremental reader over the given bytes, prepended with the IVM.
+     * @param ion binary Ion bytes without an IVM.
+     * @return a new reader.
+     */
+    private IonReaderBinaryIncremental readerFor(int... ion) throws Exception {
+        return new IonReaderBinaryIncremental(
+            readerBuilder,
+            new ByteArrayInputStream(new TestUtils.BinaryIonAppender().append(ion).toByteArray())
+        );
+    }
+
+    @Test
+    public void readInts() throws Exception {
+        final int numberOfValues = 1000000;
+        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
+            @Override
+            public void write(IonWriter writer) throws IOException {
+                for (int i = -(numberOfValues / 2); i < numberOfValues / 2; i++) {
+                    writer.writeInt(i);
+                }
+            }
+        });
+        for (int i = -(numberOfValues / 2); i < numberOfValues / 2; i++) {
+            assertEquals(IonType.INT, reader.next());
+            assertEquals(i, reader.intValue());
+        }
+        reader.close();
+    }
+
+    @Test
+    public void emptyContainers() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("[{}, [], ()] 123");
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertTrue(reader.isInStruct());
+        reader.stepOut();
+        assertFalse(reader.isInStruct());
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertFalse(reader.isInStruct());
+        assertNull(reader.next());
+        // The following is repeated intentionally to ensure that the reader acts consistently and sanely when
+        // next() is called multiple times at the end of a container.
+        assertNull(reader.next());
+        reader.stepOut();
+        assertEquals(IonType.SEXP, reader.next());
+        reader.stepIn();
+        assertNull(reader.next());
+        reader.stepOut();
+        reader.stepOut();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(123, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    private static void drainAnnotations(IonReader reader, List<String> annotationsSink) {
+        Iterator<String> iterator = reader.iterateTypeAnnotations();
+        while (iterator.hasNext()) {
+            annotationsSink.add(iterator.next());
+        }
+    }
+
+    @Test
+    public void annotatedTopLevelIterator() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("foo::bar::123 baz::456");
+        assertEquals(IonType.INT, reader.next());
+        List<String> annotations = new ArrayList<String>();
+        drainAnnotations(reader, annotations);
+        assertEquals(Arrays.asList("foo", "bar"), annotations);
+        annotations.clear();
+        assertEquals(123, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        drainAnnotations(reader, annotations);
+        assertEquals(Collections.singletonList("baz"), annotations);
+        assertEquals(456, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void annotatedTopLevelAsStrings() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("foo::bar::123 baz::456");
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals(123, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(Collections.singletonList("baz"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals(456, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void annotatedInContainer() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("[foo::bar::123, baz::456]");
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals(123, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(Collections.singletonList("baz"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals(456, reader.intValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void annotatedInContainerIterator() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("[foo::bar::123, baz::456]");
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        List<String> annotations = new ArrayList<String>();
+        drainAnnotations(reader, annotations);
+        assertEquals(Arrays.asList("foo", "bar"), annotations);
+        annotations.clear();
+        assertEquals(123, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        drainAnnotations(reader, annotations);
+        assertEquals(Collections.singletonList("baz"), annotations);
+        assertEquals(456, reader.intValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void nestedContainers() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("{abc: foo::bar::(123), def: baz::[456, {}]}");
+        assertNull(reader.getType());
+        assertEquals(0, reader.getDepth());
+        assertEquals(IonType.STRUCT, reader.next());
+        assertEquals(IonType.STRUCT, reader.getType());
+        reader.stepIn();
+        assertTrue(reader.isInStruct());
+        assertNull(reader.getType());
+        assertEquals(1, reader.getDepth());
+        assertEquals(IonType.SEXP, reader.next());
+        assertEquals(IonType.SEXP, reader.getType());
+        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
+        reader.stepIn();
+        assertFalse(reader.isInStruct());
+        assertEquals(2, reader.getDepth());
+        assertNull(reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(123, reader.intValue());
+        assertNull(reader.next());
+        assertEquals(2, reader.getDepth());
+        assertNull(reader.getType());
+        reader.stepOut();
+        assertEquals(1, reader.getDepth());
+        assertNull(reader.getType());
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals(IonType.LIST, reader.getType());
+        assertEquals(Collections.singletonList("baz"), Arrays.asList(reader.getTypeAnnotations()));
+        reader.stepIn();
+        assertEquals(2, reader.getDepth());
+        assertNull(reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(456, reader.intValue());
+        assertEquals(IonType.STRUCT, reader.next());
+        assertEquals(IonType.STRUCT, reader.getType());
+        assertEquals(2, reader.getDepth());
+        assertNull(reader.next());
+        assertEquals(2, reader.getDepth());
+        assertNull(reader.getType());
+        reader.stepOut();
+        assertEquals(1, reader.getDepth());
+        assertNull(reader.getType());
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        assertEquals(1, reader.getDepth());
+        reader.stepOut();
+        assertEquals(0, reader.getDepth());
+        assertNull(reader.getType());
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        reader.close();
+    }
+
+    @Test
+    public void skipContainers() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            "[123] 456 {abc: foo::bar::123, def: baz::456} [123] 789 [foo::bar::123, baz::456] [123]"
+        );
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals(IonType.LIST, reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(IonType.STRUCT, reader.next());
+        assertEquals(IonType.STRUCT, reader.getType());
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals(IonType.LIST, reader.getType());
+        reader.stepIn();
+        assertNull(reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(123, reader.intValue());
+        reader.stepOut();
+        assertNull(reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(789, reader.intValue());
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals(IonType.LIST, reader.getType());
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals(IonType.LIST, reader.getType());
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        reader.close();
+    }
+
+    @Test
+    public void skipContainerAfterSteppingIn() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("{abc: foo::bar::123, def: baz::456} 789");
+        assertEquals(IonType.STRUCT, reader.next());
+        assertEquals(IonType.STRUCT, reader.getType());
+        reader.stepIn();
+        assertNull(reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals(123, reader.intValue());
+        assertEquals(IonType.INT, reader.getType());
+        // Step out before completing the value.
+        reader.stepOut();
+        assertNull(reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(789, reader.intValue());
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        reader.close();
+    }
+
+    @Test
+    public void skipValueInContainer() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("{foo: \"bar\", abc: 123, baz: a}");
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals("abc", reader.getFieldName());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("baz", reader.getFieldName());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void fieldNameLength14() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("{multipleValues: [\"first\", \"second\"]}");
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals("multipleValues", reader.getFieldName());
+        reader.stepIn();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("first", reader.stringValue());
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("second", reader.stringValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void annotatedStringLength14() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("value_type::\"StringValueLong\" 123");
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("StringValueLong", reader.stringValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(123, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void annotatedContainerLength14() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("value_type::[\"StringValueLong\"] 123");
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("StringValueLong", reader.stringValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(123, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void symbolsAsStrings() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("bar", reader.getFieldName());
+        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("def", reader.stringValue());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void lstAppend() throws Exception {
+        writerBuilder = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendEnabled();
+        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
+            @Override
+            public void write(IonWriter writer) throws IOException {
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("foo");
+                writer.addTypeAnnotation("uvw");
+                writer.writeSymbol("abc");
+                writer.setFieldName("bar");
+                writer.setTypeAnnotations("qrs", "xyz");
+                writer.writeSymbol("def");
+                writer.stepOut();
+                writer.flush();
+                writer.writeSymbol("orange");
+            }
+        });
+
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("bar", reader.getFieldName());
+        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("def", reader.stringValue());
+        reader.stepOut();
+        SymbolTable preAppend = reader.getSymbolTable();
+        assertEquals(IonType.SYMBOL, reader.next());
+        SymbolTable postAppend = reader.getSymbolTable();
+        assertEquals("orange", reader.stringValue());
+        assertNull(preAppend.find("orange"));
+        assertNotNull(postAppend.find("orange"));
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void lstNonAppend() throws Exception {
+        writerBuilder = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendDisabled();
+        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
+            @Override
+            public void write(IonWriter writer) throws IOException {
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("foo");
+                writer.addTypeAnnotation("uvw");
+                writer.writeSymbol("abc");
+                writer.setFieldName("bar");
+                writer.setTypeAnnotations("qrs", "xyz");
+                writer.writeSymbol("def");
+                writer.stepOut();
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("orange");
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbol("orange");
+            }
+        });
+
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("bar", reader.getFieldName());
+        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("def", reader.stringValue());
+        reader.stepOut();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("orange", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void ivmBetweenValues() throws Exception {
+        writerBuilder = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendDisabled();
+        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
+            @Override
+            public void write(IonWriter writer) throws IOException {
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("foo");
+                writer.addTypeAnnotation("uvw");
+                writer.writeSymbol("abc");
+                writer.setFieldName("bar");
+                writer.setTypeAnnotations("qrs", "xyz");
+                writer.writeSymbol("def");
+                writer.stepOut();
+                writer.finish();
+                writer.writeSymbol("orange");
+            }
+        });
+
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("bar", reader.getFieldName());
+        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("def", reader.stringValue());
+        reader.stepOut();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("orange", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void multipleSymbolTablesBetweenValues() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
+            @Override
+            public void write(IonWriter writer) throws IOException {
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("abc");
+                writer.stepOut();
+                writer.stepOut();
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("def");
+                writer.stepOut();
+                writer.setFieldName("imports");
+                writer.writeSymbol("$ion_symbol_table");
+                writer.stepOut();
+                writer.writeSymbol("abc");
+                writer.writeSymbol("def");
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("orange");
+                writer.stepOut();
+                writer.stepOut();
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("purple");
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbol("purple");
+            }
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("purple", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void multipleIvmsBetweenValues() throws Exception  {
+        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
+            @Override
+            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
+                writer.setTypeAnnotationSymbols(3);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(7);
+                writer.stepIn(IonType.LIST);
+                writer.writeString("abc");
+                writer.stepOut();
+                writer.stepOut();
+                writer.finish();
+                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+                writer.setTypeAnnotationSymbols(3);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(7);
+                writer.stepIn(IonType.LIST);
+                writer.writeString("def");
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.finish();
+                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+                writer.writeSymbolToken(4);
+            }
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("name", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void invalidVersion() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        out.write(bytes(0xE0, 0x01, 0x74, 0xEA, 0x20));
+        InputStream input = new ByteArrayInputStream(out.toByteArray());
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, input);
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void invalidVersionMarker() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        out.write(bytes(0xE0, 0x01, 0x00, 0xEB, 0x20));
+        InputStream input = new ByteArrayInputStream(out.toByteArray());
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, input);
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void incrementalRead() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        ByteArrayOutputStream firstValue = new ByteArrayOutputStream();
+        _Private_IonRawWriter firstValueWriter = IonBinaryWriterBuilder.standard().build(firstValue)
+            .asFacet(_Private_IonManagedWriter.class)
+            .getRawWriter();
+        firstValue.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+        firstValueWriter.setTypeAnnotationSymbols(3);
+        firstValueWriter.stepIn(IonType.STRUCT);
+        firstValueWriter.setFieldNameSymbol(7);
+        firstValueWriter.stepIn(IonType.LIST);
+        firstValueWriter.writeString("abc");
+        firstValueWriter.writeString("def");
+        firstValueWriter.stepOut();
+        firstValueWriter.stepOut();
+        firstValueWriter.stepIn(IonType.STRUCT);
+        firstValueWriter.setTypeAnnotationSymbols(11);
+        firstValueWriter.setFieldNameSymbol(10);
+        firstValueWriter.writeString("foo");
+        firstValueWriter.stepOut();
+        firstValueWriter.close();
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, pipe);
+        assertNull(reader.getType());
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        byte[] firstValueBytes = firstValue.toByteArray();
+        pipe.receive(firstValueBytes, 0, firstValueBytes.length / 2);
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        pipe.receive(
+            firstValueBytes,
+            firstValueBytes.length / 2,
+            firstValueBytes.length - firstValueBytes.length / 2
+        );
+        assertEquals(IonType.STRUCT, reader.next());
+        assertEquals(IonType.STRUCT, reader.getType());
+        reader.stepIn();
+        assertNull(reader.getType());
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("abc", reader.getFieldName());
+        assertEquals(Collections.singletonList("def"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("foo", reader.stringValue());
+        assertEquals(IonType.STRING, reader.getType());
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        reader.stepOut();
+        assertNull(reader.getType());
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        pipe.receive(0x71);
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        pipe.receive(0x0B);
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals(IonType.SYMBOL, reader.getType());
+        assertEquals("def", reader.stringValue());
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        reader.close();
+    }
+
+    @Test
+    public void incrementalValue() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, pipe);
+        byte[] bytes = toBinary("\"StringValueLong\"");
+        for (byte b : bytes) {
+            assertNull(reader.next());
+            pipe.receive(b);
+        }
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("StringValueLong", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void incrementalMultipleValues() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, pipe);
+        byte[] bytes = toBinary("value_type::\"StringValueLong\"");
+        for (byte b : bytes) {
+            assertNull(reader.next());
+            pipe.receive(b);
+        }
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("StringValueLong", reader.stringValue());
+        assertEquals(Collections.singletonList("value_type"), Arrays.asList(reader.getTypeAnnotations()));
+        bytes = toBinary("{foobar: \"StringValueLong\"}");
+        for (byte b : bytes) {
+            assertNull(reader.next());
+            pipe.receive(b);
+        }
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("foobar", reader.getFieldName());
+        assertEquals("StringValueLong", reader.stringValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void incrementalSymbolTables() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        ByteArrayOutputStream firstValue = new ByteArrayOutputStream();
+        _Private_IonRawWriter writer = IonBinaryWriterBuilder.standard().build(firstValue)
+            .asFacet(_Private_IonManagedWriter.class)
+            .getRawWriter();
+        firstValue.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+        writer.setTypeAnnotationSymbols(3);
+        writer.stepIn(IonType.STRUCT);
+        writer.setFieldNameSymbol(7);
+        writer.stepIn(IonType.LIST);
+        writer.writeString("abcdefghijklmnopqrstuvwxyz");
+        writer.writeString("def");
+        writer.stepOut();
+        writer.stepOut();
+        writer.stepIn(IonType.STRUCT);
+        writer.setTypeAnnotationSymbols(11);
+        writer.setFieldNameSymbol(10);
+        writer.writeString("foo");
+        writer.stepOut();
+        writer.close();
+
+        ByteArrayOutputStream secondValue = new ByteArrayOutputStream();
+        writer = IonBinaryWriterBuilder.standard().build(secondValue)
+            .asFacet(_Private_IonManagedWriter.class)
+            .getRawWriter();
+        writer.setTypeAnnotationSymbols(3);
+        writer.stepIn(IonType.STRUCT);
+        writer.setFieldNameSymbol(6);
+        writer.writeSymbolToken(3);
+        writer.setFieldNameSymbol(7);
+        writer.stepIn(IonType.LIST);
+        writer.writeString("foo");
+        writer.writeString("bar");
+        writer.stepOut();
+        writer.stepOut();
+        writer.stepIn(IonType.STRUCT);
+        writer.setFieldNameSymbol(10);
+        writer.setTypeAnnotationSymbols(12, 13);
+        writer.writeString("fairlyLongString");
+        writer.stepOut();
+        writer.close();
+
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, pipe);
+        byte[] bytes = firstValue.toByteArray();
+        for (byte b : bytes) {
+            assertNull(reader.next());
+            pipe.receive(b);
+        }
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals(Collections.singletonList("def"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.getFieldName());
+        assertEquals("foo", reader.stringValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        bytes = secondValue.toByteArray();
+        for (byte b : bytes) {
+            assertNull(reader.next());
+            pipe.receive(b);
+        }
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("fairlyLongString", reader.stringValue());
+        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.getFieldName());
+        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void floats() throws Exception {
+        double acceptableDelta = 1e-9;
+        writerBuilder = IonBinaryWriterBuilder.standard().withFloatBinary32Enabled();
+        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
+            @Override
+            public void write(IonWriter writer) throws IOException {
+                writer.writeFloat(0.);
+                writer.writeFloat(Double.MAX_VALUE);
+                writer.writeFloat(Double.MIN_VALUE);
+                writer.writeFloat(Float.MAX_VALUE);
+                writer.writeFloat(Float.MIN_VALUE);
+                writer.writeFloat(1.23e4);
+                writer.writeFloat(1.23e-4);
+                writer.writeFloat(-1.23e4);
+                writer.writeFloat(-1.23e-4);
+            }
+        });
+
+        assertNull(reader.getType());
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(0., reader.doubleValue(), acceptableDelta);
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(Double.MAX_VALUE, reader.doubleValue(), acceptableDelta);
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(Double.MIN_VALUE, reader.doubleValue(), acceptableDelta);
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(Float.MAX_VALUE, reader.doubleValue(), acceptableDelta);
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(IonType.FLOAT, reader.getType());
+        assertEquals(Float.MIN_VALUE, reader.doubleValue(), acceptableDelta);
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(1.23e4, reader.doubleValue(), acceptableDelta);
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(1.23e-4, reader.doubleValue(), acceptableDelta);
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(-1.23e4, reader.doubleValue(), acceptableDelta);
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(-1.23e-4, reader.doubleValue(), acceptableDelta);
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void timestamps() throws Exception {
+        final List<Timestamp> timestamps = new ArrayList<Timestamp>();
+        timestamps.add(Timestamp.valueOf("2000T"));
+        timestamps.add(Timestamp.valueOf("2000-01T"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04Z"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05Z"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.6Z"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.06Z"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.006Z"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.600Z"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.060Z"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.060-07:00"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.060+07:00"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05+07:00"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04+07:00"));
+        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.9999999Z"));
+
+        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
+            @Override
+            public void write(IonWriter writer) throws IOException {
+                for (Timestamp timestamp : timestamps) {
+                    writer.writeTimestamp(timestamp);
+                }
+            }
+        });
+
+        for (Timestamp timestamp : timestamps) {
+            assertEquals(IonType.TIMESTAMP, reader.next());
+            assertEquals(timestamp, reader.timestampValue());
+        }
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        reader.close();
+    }
+
+    @Test
+    public void nullValues() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            "null " +
+            "null.bool " +
+            "null.int " +
+            "null.float " +
+            "null.decimal " +
+            "null.timestamp " +
+            "null.symbol " +
+            "null.string " +
+            "null.blob " +
+            "null.clob " +
+            "null.list " +
+            "null.sexp " +
+            "foo::null.struct " +
+            "[null.null, null.bool, null.int, {zar: bar::baz::null.float, abc: null.decimal}]"
+        );
+
+        assertEquals(IonType.NULL, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.BOOL, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.INT, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.FLOAT, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.DECIMAL, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.TIMESTAMP, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.STRING, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.BLOB, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.CLOB, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.LIST, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.SEXP, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.STRUCT, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals(IonType.LIST, reader.next());
+        assertFalse(reader.isNullValue());
+        reader.stepIn();
+        assertFalse(reader.isNullValue());
+        assertEquals(IonType.NULL, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.BOOL, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.INT, reader.next());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertFalse(reader.isNullValue());
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(Arrays.asList("bar", "baz"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("zar", reader.getFieldName());
+        assertTrue(reader.isNullValue());
+        assertEquals(IonType.DECIMAL, reader.next());
+        assertEquals("abc", reader.getFieldName());
+        assertTrue(reader.isNullValue());
+        assertNull(reader.next());
+        assertFalse(reader.isNullValue());
+        reader.stepOut();
+        assertNull(reader.next());
+        assertFalse(reader.isNullValue());
+        reader.stepOut();
+        assertNull(reader.next());
+        assertFalse(reader.isNullValue());
+        reader.close();
+    }
+
+    @Test
+    public void booleans() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("true false foo::true {bar: true, baz: zar::false}");
+        assertEquals(IonType.BOOL, reader.next());
+        assertTrue(reader.booleanValue());
+        assertEquals(IonType.BOOL, reader.next());
+        assertFalse(reader.booleanValue());
+        assertEquals(IonType.BOOL, reader.next());
+        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
+        assertTrue(reader.booleanValue());
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.BOOL, reader.next());
+        assertEquals("bar", reader.getFieldName());
+        assertTrue(reader.booleanValue());
+        assertEquals(IonType.BOOL, reader.next());
+        assertEquals("baz", reader.getFieldName());
+        assertEquals(Collections.singletonList("zar"), Arrays.asList(reader.getTypeAnnotations()));
+        assertFalse(reader.booleanValue());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void lobsNewBytes() throws Exception {
+        final byte[] blobBytes = "abcdef".getBytes("UTF-8");
+        final byte[] clobBytes = "ghijklmnopqrstuv".getBytes("UTF-8");
+        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
+            @Override
+            public void write(IonWriter writer) throws IOException {
+                writer.writeBlob(blobBytes);
+                writer.writeClob(clobBytes);
+                writer.setTypeAnnotations("foo");
+                writer.writeBlob(blobBytes);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("bar");
+                writer.writeClob(clobBytes);
+                writer.stepOut();
+            }
+        });
+
+        assertEquals(IonType.BLOB, reader.next());
+        assertArrayEquals(blobBytes, reader.newBytes());
+        assertEquals(IonType.CLOB, reader.next());
+        assertArrayEquals(clobBytes, reader.newBytes());
+        assertEquals(IonType.BLOB, reader.next());
+        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
+        assertArrayEquals(blobBytes, reader.newBytes());
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.CLOB, reader.next());
+        assertEquals("bar", reader.getFieldName());
+        assertArrayEquals(clobBytes, reader.newBytes());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void lobsGetBytes() throws Exception {
+        final byte[] blobBytes = "abcdef".getBytes("UTF-8");
+        final byte[] clobBytes = "ghijklmnopqrstuv".getBytes("UTF-8");
+        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
+            @Override
+            public void write(IonWriter writer) throws IOException {
+                writer.writeBlob(blobBytes);
+                writer.writeClob(clobBytes);
+                writer.setTypeAnnotations("foo");
+                writer.writeBlob(blobBytes);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("bar");
+                writer.writeClob(clobBytes);
+                writer.stepOut();
+            }
+        });
+
+        assertEquals(IonType.BLOB, reader.next());
+        byte[] fullBlob = new byte[blobBytes.length];
+        assertEquals(fullBlob.length, reader.getBytes(fullBlob, 0, fullBlob.length));
+        assertArrayEquals(blobBytes, fullBlob);
+        assertEquals(IonType.CLOB, reader.next());
+        byte[] partialClob = new byte[clobBytes.length];
+        assertEquals(3, reader.getBytes(partialClob, 0, 3));
+        assertEquals(clobBytes.length - 3, reader.getBytes(partialClob, 3, clobBytes.length - 3));
+        assertArrayEquals(clobBytes, partialClob);
+        Arrays.fill(fullBlob, (byte) 0);
+        assertEquals(IonType.BLOB, reader.next());
+        assertEquals(fullBlob.length, reader.getBytes(fullBlob, 0, 100000));
+        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        Arrays.fill(partialClob, (byte) 0);
+        assertEquals(IonType.CLOB, reader.next());
+        assertEquals(5, reader.getBytes(partialClob, 0, 5));
+        assertEquals(clobBytes.length - 5, reader.getBytes(partialClob, 5, 100000));
+        assertArrayEquals(clobBytes, partialClob);
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void nopPad() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            // One byte no-op pad.
+            0x00,
+            // Two byte no-op pad.
+            0x01, 0xFF,
+            // Int 0.
+            0x20,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // 16-byte no-op pad.
+            0x0E, 0x8E,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Int 1.
+            0x21, 0x01,
+            // Struct with no-op pad at the start.
+            0xD9,
+            // Field SID 0.
+            0x80,
+            // Five byte no-op pad.
+            0x04, 0x00, 0x00, 0x00, 0x00,
+            // Field SID 4 ("name").
+            0x84,
+            // Int -1.
+            0x31, 0x01,
+            // Struct (empty) with no-op pad at the end.
+            0xD8,
+            // Field SID 0.
+            0x80,
+            // Seven byte no-op pad.
+            0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // List (empty) with long no-op pad.
+            0xBE,
+            // Length 16.
+            0x90,
+            // 16-byte no-op pad.
+            0x0E, 0x8E,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        );
+
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(-1, reader.intValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertNull(reader.next());
+        reader.stepOut();
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void decimals() throws Exception {
+        final List<BigDecimal> decimals = Arrays.asList(
+            Decimal.ZERO,
+            Decimal.NEGATIVE_ZERO,
+            Decimal.valueOf("1.23e4"),
+            Decimal.valueOf("1.23e-4"),
+            Decimal.valueOf("-1.23e4"),
+            Decimal.valueOf("-1.23e-4"),
+            Decimal.valueOf(Long.MAX_VALUE).add(BigDecimal.ONE),
+            Decimal.valueOf(Long.MIN_VALUE).subtract(BigDecimal.ONE)
+        );
+        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
+            @Override
+            public void write(IonWriter writer) throws IOException {
+                for (BigDecimal decimal : decimals) {
+                    writer.writeDecimal(decimal);
+                }
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("foo");
+                writer.setTypeAnnotations("bar");
+                writer.writeDecimal(Decimal.valueOf(Long.MAX_VALUE).add(BigDecimal.ONE).scaleByPowerOfTen(-7));
+                writer.stepOut();
+            }
+        });
+
+        for (BigDecimal decimal : decimals) {
+            assertEquals(IonType.DECIMAL, reader.next());
+            assertEquals(decimal, reader.decimalValue());
+        }
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.DECIMAL, reader.next());
+        assertEquals(
+            BigDecimal.valueOf(Long.MAX_VALUE).add(BigDecimal.ONE).scaleByPowerOfTen(-7),
+            reader.bigDecimalValue()
+        );
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void bigInts() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
+            @Override
+            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
+                writer.writeInt(0);
+                writer.writeInt(-1);
+                writer.writeInt(1);
+                writer.writeInt((long) Integer.MAX_VALUE + 1);
+                writer.writeInt((long) Integer.MIN_VALUE - 1);
+                writer.writeInt(Long.MIN_VALUE + 1); // Just shy of the boundary.
+                writer.writeInt(BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE));
+                writer.writeInt(BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.ONE));
+                writer.close();
+                out.write(bytes(0x38, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00));
+            }
+        });
+
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IntegerSize.INT, reader.getIntegerSize());
+        assertEquals(BigInteger.ZERO, reader.bigIntegerValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IntegerSize.INT, reader.getIntegerSize());
+        assertEquals(BigInteger.ONE.negate(), reader.bigIntegerValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IntegerSize.INT, reader.getIntegerSize());
+        assertEquals(BigInteger.ONE, reader.bigIntegerValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IntegerSize.LONG, reader.getIntegerSize());
+        assertEquals(BigInteger.valueOf(Integer.MAX_VALUE).add(BigInteger.ONE), reader.bigIntegerValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IntegerSize.LONG, reader.getIntegerSize());
+        assertEquals(BigInteger.valueOf(Integer.MIN_VALUE).subtract(BigInteger.ONE), reader.bigIntegerValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IntegerSize.LONG, reader.getIntegerSize());
+        assertEquals(Long.MIN_VALUE + 1, reader.longValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IntegerSize.BIG_INTEGER, reader.getIntegerSize());
+        assertEquals(BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE), reader.bigIntegerValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IntegerSize.BIG_INTEGER, reader.getIntegerSize());
+        assertEquals(BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.ONE), reader.bigIntegerValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IntegerSize.BIG_INTEGER, reader.getIntegerSize());
+        assertEquals(
+            new BigInteger(-1, bytes(0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)),
+            reader.bigIntegerValue()
+        );
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void symbolTableWithImportsThenSymbols() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
+        writerBuilder = IonBinaryWriterBuilder.standard().withCatalog(catalog);
+
+        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
+            @Override
+            public void write(IonWriter writer) throws IOException {
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("imports");
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("name");
+                writer.writeString("foo");
+                writer.setFieldName("version");
+                writer.writeInt(1);
+                writer.setFieldName("max_id");
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbol("abc");
+                writer.writeSymbol("def");
+                writer.writeSymbol("ghi");
+            }
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("ghi", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void symbolTableWithSymbolsThenImports() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
+
+        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
+            @Override
+            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+            }
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("ghi", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void symbolTableWithManySymbolsThenImports() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
+
+        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
+            @Override
+            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.writeString("jkl");
+                writer.writeString("mno");
+                writer.writeString("pqr");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+                writer.writeSymbolToken(13);
+                writer.writeSymbolToken(14);
+                writer.writeSymbolToken(15);
+            }
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("ghi", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("jkl", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("mno", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("pqr", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void multipleSymbolTablesWithSymbolsThenImports() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        catalog.putTable(SYSTEM.newSharedSymbolTable("bar", 1, Collections.singletonList("baz").iterator()));
+        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
+
+        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
+            @Override
+            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("xyz");
+                writer.writeString("uvw");
+                writer.writeString("rst");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("bar");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(1);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+                writer.writeSymbolToken(13);
+            }
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        SymbolTable[] imports = reader.getSymbolTable().getImportedTables();
+        assertEquals(1, imports.length);
+        assertEquals("foo", imports[0].getName());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("ghi", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("baz", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        imports = reader.getSymbolTable().getImportedTables();
+        assertEquals(1, imports.length);
+        assertEquals("bar", imports[0].getName());
+        assertEquals("xyz", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("uvw", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("rst", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void ivmResetsImports() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
+
+        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
+            @Override
+            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+                writer.close();
+                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+                out.write(0x20);
+            }
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        SymbolTable[] imports = reader.getSymbolTable().getImportedTables();
+        assertEquals(1, imports.length);
+        assertEquals("foo", imports[0].getName());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("ghi", reader.stringValue());
+        assertEquals(IonType.INT, reader.next());
+        assertTrue(reader.getSymbolTable().isSystemTable());
+        assertEquals(0, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    private static void assertSymbolEquals(
+        String expectedText,
+        IonReaderBinaryIncremental.ImportLocation expectedImportLocation,
+        SymbolToken actual
+    ) {
+        assertEquals(expectedText, actual.getText());
+        IonReaderBinaryIncremental.SymbolTokenImpl impl = (IonReaderBinaryIncremental.SymbolTokenImpl) actual;
+        assertEquals(expectedImportLocation, impl.getImportLocation());
+    }
+
+    @Test
+    public void symbolsAsTokens() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertSymbolEquals("foo", null, reader.getFieldNameSymbol());
+        SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
+        assertEquals(1, annotations.length);
+        assertSymbolEquals("uvw", null, annotations[0]);
+        assertSymbolEquals("abc", null, reader.symbolValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertSymbolEquals("bar", null, reader.getFieldNameSymbol());
+        annotations = reader.getTypeAnnotationSymbols();
+        assertEquals(2, annotations.length);
+        assertSymbolEquals("qrs", null, annotations[0]);
+        assertSymbolEquals("xyz", null, annotations[1]);
+        assertSymbolEquals("def", null, reader.symbolValue());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void nullContainers() throws Exception {
+        IonReader reader = readerFor("null.struct null.list null.sexp");
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertNull(reader.next());
+        reader.stepOut();
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertNull(reader.next());
+        reader.stepOut();
+        assertEquals(IonType.SEXP, reader.next());
+        reader.stepIn();
+        assertNull(reader.next());
+        reader.stepOut();
+        reader.close();
+    }
+
+    @Test
+    public void intNegativeZeroFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0x31, 0x00);
+        reader.next();
+        thrown.expect(IonException.class);
+        reader.longValue();
+    }
+
+    @Test
+    public void bigIntNegativeZeroFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0x31, 0x00);
+        reader.next();
+        thrown.expect(IonException.class);
+        reader.bigIntegerValue();
+    }
+
+    @Test
+    public void listWithLengthTooShortFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0xB1, 0x21, 0x01);
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void noOpPadTooShort1() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01);
+        assertEquals(IonType.INT, reader.next());
+        assertNull(reader.next());
+        thrown.expect(IonException.class);
+        reader.close();
+    }
+
+    @Test
+    public void noOpPadTooShort2() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            0x0e, 0x90, 0x00, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        );
+        assertNull(reader.next());
+        thrown.expect(IonException.class);
+        reader.close();
+    }
+
+    @Test
+    public void nopPadOneByte() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0);
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void localSidOutOfRangeStringValue() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0x71, 0x0A); // SID 10
+        assertEquals(IonType.SYMBOL, reader.next());
+        thrown.expect(IonException.class);
+        reader.stringValue();
+    }
+
+    @Test
+    public void localSidOutOfRangeSymbolValue() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0x71, 0x0A); // SID 10
+        assertEquals(IonType.SYMBOL, reader.next());
+        thrown.expect(IonException.class);
+        reader.symbolValue();
+    }
+
+    @Test
+    public void localSidOutOfRangeFieldName() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            0xD2, // Struct, length 2
+            0x8A, // SID 10
+            0x20 // int 0
+        );
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        thrown.expect(IonException.class);
+        reader.getFieldName();
+    }
+
+    @Test
+    public void localSidOutOfRangeFieldNameSymbol() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            0xD2, // Struct, length 2
+            0x8A, // SID 10
+            0x20 // int 0
+        );
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        thrown.expect(IonException.class);
+        reader.getFieldNameSymbol();
+    }
+
+    @Test
+    public void localSidOutOfRangeAnnotation() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            0xE3, // Annotation wrapper, length 3
+            0x81, // annotation SID length 1
+            0x8A, // SID 10
+            0x20 // int 0
+        );
+        assertEquals(IonType.INT, reader.next());
+        thrown.expect(IonException.class);
+        reader.getTypeAnnotations();
+    }
+
+    @Test
+    public void localSidOutOfRangeAnnotationSymbol() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            0xE3, // Annotation wrapper, length 3
+            0x81, // annotation SID length 1
+            0x8A, // SID 10
+            0x20 // int 0
+        );
+        assertEquals(IonType.INT, reader.next());
+        thrown.expect(IonException.class);
+        reader.getTypeAnnotationSymbols();
+    }
+
+    @Test
+    public void localSidOutOfRangeIterateAnnotations() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            0xE3, // Annotation wrapper, length 3
+            0x81, // annotation SID length 1
+            0x8A, // SID 10
+            0x20 // int 0
+        );
+        assertEquals(IonType.INT, reader.next());
+        Iterator<String> annotationIterator = reader.iterateTypeAnnotations();
+        thrown.expect(IonException.class);
+        annotationIterator.next();
+    }
+
+    @Test
+    public void stepInOnScalarFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0x20);
+        assertEquals(IonType.INT, reader.next());
+        thrown.expect(IonException.class);
+        reader.stepIn();
+    }
+
+    @Test
+    public void stepInBeforeNextFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0xD2, 0x84, 0xD0);
+        reader.next();
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.stepIn();
+    }
+
+    @Test
+    public void stepOutAtDepthZeroFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0x20);
+        reader.next();
+        thrown.expect(IllegalStateException.class);
+        reader.stepOut();
+    }
+
+    @Test
+    public void byteSizeNotOnLobFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0x20);
+        reader.next();
+        thrown.expect(IonException.class);
+        reader.byteSize();
+    }
+
+    @Test
+    public void doubleValueOnIntFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0x20);
+        reader.next();
+        thrown.expect(IllegalStateException.class);
+        reader.doubleValue();
+    }
+
+    @Test
+    public void floatWithInvalidLengthFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0x43, 0x01, 0x02, 0x03);
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void invalidTypeIdFFailsAtTopLevel() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0xF0);
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void invalidTypeIdFFailsBelowTopLevel() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(0xB1, 0xF0);
+        reader.next();
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void reallyLargeString() throws Exception {
+        StringBuilder sb = new StringBuilder();
+        // 8192 is a arbitrarily large; it requires a couple bytes of length, and it doesn't fit in the preallocated
+        // string decoding buffer of size 4096.
+        for (int i = 0; i < 8192; i++) {
+            sb.append('a');
+        }
+        String string = sb.toString();
+        IonReaderBinaryIncremental reader = readerFor("\"" + string + "\"");
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals(string, reader.stringValue());
+        reader.close();
+    }
+
+    @Test
+    public void nopPadInAnnotationWrapperFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            0xB5, // list
+            0xE4, // annotation wrapper
+            0x81, // 1 byte of annotations
+            0x84, // annotation: "name"
+            0x01, // 2-byte no-op pad
+            0x00
+        );
+        reader.next();
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void nestedAnnotationWrapperFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            0xB5, // list
+            0xE4, // annotation wrapper
+            0x81, // 1 byte of annotations
+            0x84, // annotation: "name"
+            0xE3, // annotation wrapper
+            0x81, // 1 byte of annotations
+            0x84, // annotation: "name"
+            0x20  // int 0
+        );
+        reader.next();
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void annotationWrapperLengthMismatchFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(
+            0xB5, // list
+            0xE4, // annotation wrapper
+            0x81, // 1 byte of annotations
+            0x84, // annotation: "name"
+            0x20, // int 0
+            0x20  // next value
+        );
+        reader.next();
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void multipleSymbolTableImportsFieldsFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
+            @Override
+            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("bar");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(1);
+                writer.stepOut();
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+            }
+        });
+
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void multipleSymbolTableSymbolsFieldsFails() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
+            @Override
+            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("bar");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(1);
+                writer.stepOut();
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("abc");
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+            }
+        });
+
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void nonStringInSymbolsListCreatesNullSlot() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
+            @Override
+            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString(null);
+                writer.writeString("abc");
+                writer.writeInt(123);
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+            }
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        SymbolToken symbolValue = reader.symbolValue();
+        assertNull(symbolValue.getText());
+        assertEquals(0, symbolValue.getSid());
+        assertEquals(IonType.SYMBOL, reader.next());
+        symbolValue = reader.symbolValue();
+        assertEquals("abc", symbolValue.getText());
+        assertEquals(IonType.SYMBOL, reader.next());
+        symbolValue = reader.symbolValue();
+        assertNull(symbolValue.getText());
+        assertEquals(0, symbolValue.getSid());
+        reader.close();
+    }
+
+    @Test
+    public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        catalog.putTable(SYSTEM.newSharedSymbolTable("bar", 1, Arrays.asList("123", "456").iterator()));
+        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
+
+        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
+            @Override
+            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(4); // The matching shared symbol table in the catalog only declares two symbols.
+                writer.stepOut();
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("bar");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                // The matching shared symbol table in the catalog declares two symbols, but only one is used.
+                writer.writeInt(1);
+                writer.stepOut();
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("baz"); // There is no match in the catalog; all symbols have unknown text.
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10); // abc
+                writer.writeSymbolToken(11); // def
+                writer.writeSymbolToken(12); // unknown text, import SID 3 (from foo)
+                writer.writeSymbolToken(13); // unknown text, import SID 4 (from foo)
+                writer.writeSymbolToken(14); // 123
+                writer.writeSymbolToken(15); // unknown text, import SID 1 (from baz)
+                writer.writeSymbolToken(16); // unknown text, import SID 2 (from baz)
+            }
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        IonReaderBinaryIncremental.SymbolTokenImpl symbolValue =
+            (IonReaderBinaryIncremental.SymbolTokenImpl) reader.symbolValue();
+        assertNull(symbolValue.getText());
+        assertEquals(new IonReaderBinaryIncremental.ImportLocation("foo", 3), symbolValue.getImportLocation());
+        assertEquals(IonType.SYMBOL, reader.next());
+        symbolValue = (IonReaderBinaryIncremental.SymbolTokenImpl) reader.symbolValue();
+        assertNull(symbolValue.getText());
+        assertEquals(new IonReaderBinaryIncremental.ImportLocation("foo", 4), symbolValue.getImportLocation());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("123", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        symbolValue = (IonReaderBinaryIncremental.SymbolTokenImpl) reader.symbolValue();
+        assertEquals(
+            new IonReaderBinaryIncremental.SymbolTokenImpl(
+                null,
+                15,
+                new IonReaderBinaryIncremental.ImportLocation("baz", 1)
+            ),
+            symbolValue
+        );
+        assertEquals(IonType.SYMBOL, reader.next());
+        symbolValue = (IonReaderBinaryIncremental.SymbolTokenImpl) reader.symbolValue();
+        assertEquals(
+            new IonReaderBinaryIncremental.SymbolTokenImpl(
+                null,
+                16,
+                new IonReaderBinaryIncremental.ImportLocation("baz", 2)
+            ),
+            symbolValue
+        );
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void symbolTableSnapshotImplementsBasicMethods() throws Exception {
+        IonReaderBinaryIncremental reader = readerFor("'abc'");
+        reader.next();
+        SymbolTable symbolTable = reader.getSymbolTable();
+        assertNull(symbolTable.getName());
+        assertEquals(0, symbolTable.getVersion());
+        assertTrue(symbolTable.isLocalTable());
+        assertTrue(symbolTable.isReadOnly());
+        assertFalse(symbolTable.isSharedTable());
+        assertFalse(symbolTable.isSystemTable());
+        assertFalse(symbolTable.isSubstitute());
+        symbolTable.makeReadOnly();
+        assertEquals(10, symbolTable.getMaxId());
+        assertEquals("abc", symbolTable.findKnownSymbol(10));
+        assertNull(symbolTable.findKnownSymbol(symbolTable.getMaxId() + 1));
+        thrown.expect(IllegalArgumentException.class);
+        symbolTable.findKnownSymbol(-1);
+    }
+
+    @Test
+    public void singleValueExceedsBufferSize() throws Exception {
+        readerBuilder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard().withInitialBufferSize(8).build()
+        );
+        IonReaderBinaryIncremental reader = readerFor("\"abcdefghijklmnopqrstuvwxyz\"");
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void maximumBufferSizeTooSmallFails() {
+        IonBufferConfiguration.Builder builder = IonBufferConfiguration.Builder.standard();
+        builder
+            .withMaximumBufferSize(builder.getMinimumMaximumBufferSize() - 1)
+            .withInitialBufferSize(builder.getMinimumMaximumBufferSize() - 1)
+            .onOversizedValue(builder.getNoOpOversizedValueHandler())
+            .onOversizedSymbolTable(builder.getNoOpOversizedSymbolTableHandler())
+            .onData(builder.getNoOpDataHandler());
+        thrown.expect(IllegalArgumentException.class);
+        builder.build();
+    }
+
+    @Test
+    public void maximumBufferSizeWithoutHandlerFails() {
+        IonBufferConfiguration.Builder builder = IonBufferConfiguration.Builder.standard();
+        builder
+            .withMaximumBufferSize(9)
+            .withInitialBufferSize(9);
+        thrown.expect(IllegalArgumentException.class);
+        builder.build();
+    }
+
+    /**
+     * Unified handler interface to reduce boilerplate when defining test handlers.
+     */
+    private interface UnifiedTestHandler extends
+        BufferConfiguration.OversizedValueHandler,
+        IonBufferConfiguration.OversizedSymbolTableHandler,
+        BufferConfiguration.DataHandler {
+        // Empty.
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringMultiByteRead() throws Exception {
+        byte[] bytes = toBinary(
+            "\"abcdefghijklmnopqrstuvwxyz\" " + // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+            "\"abc\" " +
+            "\"abcdefghijklmnopqrstuvwxyz\" " +
+            "\"def\""
+        );
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        final AtomicInteger byteCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onOversizedValue() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+                byteCounter.addAndGet(numberOfBytes);
+            }
+        };
+        readerBuilder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(8)
+                .withMaximumBufferSize(16)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(bytes));
+
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(1, oversizedCounter.get());
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(2, oversizedCounter.get());
+        assertEquals(bytes.length, byteCounter.get());
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringMultiByteReadIncremental() throws Exception {
+        byte[] bytes = toBinary(
+            "\"abcdefghijklmnopqrstuvwxyz\" " + // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+            "\"abc\" " +
+            "\"abcdefghijklmnopqrstuvwxyz\" " +
+            "\"def\""
+        );
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        final AtomicInteger byteCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onOversizedValue() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+                byteCounter.addAndGet(numberOfBytes);
+            }
+        };
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
+        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(8)
+                .withMaximumBufferSize(16)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
+        int valueCounter = 0;
+        for (byte b : bytes) {
+            pipe.receive(b);
+            IonType type = reader.next();
+            if (type != null) {
+                valueCounter++;
+                assertTrue(valueCounter < 3);
+                if (valueCounter == 1) {
+                    assertEquals(IonType.STRING, type);
+                    assertEquals("abc", reader.stringValue());
+                    assertEquals(1, oversizedCounter.get());
+                } else {
+                    assertEquals(2, valueCounter);
+                    assertEquals(IonType.STRING, type);
+                    assertEquals("def", reader.stringValue());
+                    assertEquals(2, oversizedCounter.get());
+                }
+            }
+        }
+        assertEquals(2, valueCounter);
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(2, oversizedCounter.get());
+        assertEquals(bytes.length, byteCounter.get());
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringSingleByteRead() throws Exception {
+        // Unlike the previous test, where excessive size is detected when trying to skip past the value portion,
+        // this test verifies that excessive size can be detected while reading a value header, which happens
+        // byte-by-byte.
+        byte[] bytes = toBinary("\"abcdefghijklmnopqrstuvwxyz\""); // Requires a 2-byte header.
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        final AtomicInteger byteCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onOversizedValue() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+                byteCounter.addAndGet(numberOfBytes);
+            }
+        };
+        readerBuilder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(5)
+                .withMaximumBufferSize(5)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(bytes));
+
+        // The maximum buffer size is 5, which will be exceeded after the IVM (4 bytes), the type ID (1 byte), and
+        // the length byte (1 byte).
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+        assertEquals(bytes.length, byteCounter.get());
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringSingleByteReadIncremental() throws Exception {
+        byte[] bytes = toBinary("\"abcdefghijklmnopqrstuvwxyz\""); // Requires a 2-byte header.
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        final AtomicInteger byteCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onOversizedValue() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+                byteCounter.addAndGet(numberOfBytes);
+            }
+        };
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
+        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(5)
+                .withMaximumBufferSize(5)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
+        for (byte b : bytes) {
+            assertNull(reader.next());
+            pipe.receive(b);
+        }
+        // The maximum buffer size is 5, which will be exceeded after the IVM (4 bytes), the type ID (1 byte), and
+        // the length byte (1 byte).
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+        assertEquals(bytes.length, byteCounter.get());
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringReadOfTypeIdOfSymbolTableAnnotatedValue() throws Exception {
+        // This value is not a symbol table, but follows most of the code path that symbol tables follow. Ensure that
+        // `onOversizedValue` (NOT `onOversizedSymbolTable`) is called, and that the stream continues to be read.
+        byte[] bytes = toBinary("$ion_symbol_table::123 \"a\"");
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        final AtomicInteger byteCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onOversizedValue() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+                byteCounter.addAndGet(numberOfBytes);
+            }
+        };
+        readerBuilder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(7)
+                .withMaximumBufferSize(7)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(bytes));
+
+        // The maximum buffer size is 7, which will be exceeded after the IVM (4 bytes), the annotation wrapper type ID
+        // (1 byte), the annotations length (1 byte), and the annotation SID 3 (1 byte). The next byte is the wrapped
+        // value type ID byte.
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("a", reader.stringValue());
+        assertEquals(1, oversizedCounter.get());
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(bytes.length, byteCounter.get());
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringReadOfTypeIdOfSymbolTableAnnotatedValueIncremental() throws Exception {
+        // This value is not a symbol table, but follows most of the code path that symbol tables follow. Ensure that
+        // `onOversizedValue` (NOT `onOversizedSymbolTable`) is called, and that the stream continues to be read.
+        byte[] bytes = toBinary("$ion_symbol_table::123 \"a\"");
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        final AtomicInteger byteCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onOversizedValue() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+                byteCounter.addAndGet(numberOfBytes);
+            }
+        };
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
+        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(7)
+                .withMaximumBufferSize(7)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
+
+        // The maximum buffer size is 7, which will be exceeded after the IVM (4 bytes), the annotation wrapper type ID
+        // (1 byte), the annotations length (1 byte), and the annotation SID 3 (1 byte). The next byte is the wrapped
+        // value type ID byte.
+        boolean foundValue = false;
+        for (byte b : bytes) {
+            pipe.receive(b);
+            IonType type = reader.next();
+            if (type != null) {
+                assertFalse(foundValue);
+                assertEquals(IonType.STRING, type);
+                assertEquals("a", reader.stringValue());
+                assertEquals(1, oversizedCounter.get());
+                foundValue = true;
+            }
+        }
+        assertTrue(foundValue);
+        assertEquals(1, oversizedCounter.get());
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(bytes.length, byteCounter.get());
+    }
+
+    @Test
+    public void oversizeValueWithSymbolTable() throws Exception {
+        // The first value is oversized because it cannot be buffered at the same time as the preceding symbol table
+        // without exceeding the maximum buffer size. The next value fits.
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
+        writer.writeString("12345678");
+        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+        writer.close();
+        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
+        // for symbol 10.
+        // The string "12345678" requires 9 bytes, bringing the total to ~49, above the max of 48.
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        final AtomicInteger byteCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onOversizedValue() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+                byteCounter.addAndGet(numberOfBytes);
+            }
+        };
+        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(8)
+                .withMaximumBufferSize(48)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(
+            builder,
+            new ByteArrayInputStream(out.toByteArray())
+        );
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals(1, oversizedCounter.get());
+        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+        assertEquals(out.size(), byteCounter.get());
+    }
+
+    @Test
+    public void oversizeValueWithSymbolTableIncremental() throws Exception {
+        // The first value is oversized because it cannot be buffered at the same time as the preceding symbol table
+        // without exceeding the maximum buffer size. The next value fits.
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
+        writer.writeString("12345678");
+        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+        writer.close();
+        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
+        // for symbol 10.
+        // The string "12345678" requires 9 bytes, bringing the total to ~49, above the max of 48.
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        final AtomicInteger byteCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onOversizedValue() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+                byteCounter.addAndGet(numberOfBytes);
+            }
+        };
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(out.size());
+        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(8)
+                .withMaximumBufferSize(48)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
+        byte[] bytes = out.toByteArray();
+        boolean foundValue = false;
+        for (byte b : bytes) {
+            pipe.receive(b);
+            IonType type = reader.next();
+            if (type != null) {
+                assertFalse(foundValue);
+                assertEquals(IonType.SYMBOL, type);
+                assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
+                assertEquals(1, oversizedCounter.get());
+                foundValue = true;
+            }
+        }
+        assertTrue(foundValue);
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+        assertEquals(out.size(), byteCounter.get());
+    }
+
+    private void oversizeSymbolTableDetectedInHeader(int maximumBufferSize) throws Exception {
+        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
+        // for symbol 10.
+        byte[] bytes = toBinary("abcdefghijklmnopqrstuvwxyz");
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onOversizedValue() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+
+            }
+        };
+        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(maximumBufferSize)
+                .withMaximumBufferSize(maximumBufferSize)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, new ByteArrayInputStream(bytes));
+        assertNull(reader.next());
+        assertEquals(1, oversizedCounter.get());
+        reader.close();
+    }
+
+    @Test
+    public void oversizeSymbolTableDetectedInHeader() throws Exception {
+        // The symbol table is determined to be oversized when reading the length of the annotation wrapper.
+        oversizeSymbolTableDetectedInHeader(5);
+        // The symbol table is determined to be oversized when reading the annotations length.
+        oversizeSymbolTableDetectedInHeader(6);
+        // The symbol table is determined to be oversized when reading SID 3.
+        oversizeSymbolTableDetectedInHeader(7);
+        // The symbol table is determined to be oversized when reading the type ID of the wrapped struct.
+        oversizeSymbolTableDetectedInHeader(8);
+        // The symbol table is determined to be oversized when reading the length of the wrapped struct.
+        oversizeSymbolTableDetectedInHeader(9);
+    }
+
+    private void oversizeSymbolTableDetectedInHeaderIncremental(int maximumBufferSize) throws Exception {
+        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
+        // for symbol 10.
+        byte[] bytes = toBinary("abcdefghijklmnopqrstuvwxyz");
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onOversizedValue() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+
+            }
+        };
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
+        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(maximumBufferSize)
+                .withMaximumBufferSize(maximumBufferSize)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
+        for (byte b : bytes) {
+            assertNull(reader.next());
+            pipe.receive(b);
+        }
+        assertNull(reader.next());
+        assertEquals(1, oversizedCounter.get());
+        reader.close();
+    }
+
+    @Test
+    public void oversizeSymbolTableDetectedInHeaderIncremental() throws Exception {
+        // The symbol table is determined to be oversized when reading the length of the annotation wrapper.
+        oversizeSymbolTableDetectedInHeaderIncremental(5);
+        // The symbol table is determined to be oversized when reading the annotations length.
+        oversizeSymbolTableDetectedInHeaderIncremental(6);
+        // The symbol table is determined to be oversized when reading SID 3.
+        oversizeSymbolTableDetectedInHeaderIncremental(7);
+        // The symbol table is determined to be oversized when reading the type ID of the wrapped struct.
+        oversizeSymbolTableDetectedInHeaderIncremental(8);
+        // The symbol table is determined to be oversized when reading the length of the wrapped struct.
+        oversizeSymbolTableDetectedInHeaderIncremental(9);
+    }
+
+    @Test
+    public void oversizeSymbolTableDetectedInTheMiddle() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
+        writer.writeString("12345678");
+        writer.finish();
+        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+        writer.close();
+        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
+        // for symbol 10.
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onOversizedValue() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+
+            }
+        };
+        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(8)
+                .withMaximumBufferSize(32)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(
+            builder,
+            new ByteArrayInputStream(out.toByteArray())
+        );
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("12345678", reader.stringValue());
+        assertNull(reader.next());
+        assertEquals(1, oversizedCounter.get());
+        reader.close();
+    }
+
+    @Test
+    public void oversizeSymbolTableDetectedInTheMiddleIncremental() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
+        writer.writeString("12345678");
+        writer.finish();
+        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+        writer.close();
+        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
+        // for symbol 10.
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onOversizedValue() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+
+            }
+        };
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(out.size());
+        byte[] bytes = out.toByteArray();
+        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(8)
+                .withMaximumBufferSize(32)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
+        boolean foundValue = false;
+        for (byte b : bytes) {
+            IonType type = reader.next();
+            if (type != null) {
+                assertFalse(foundValue);
+                assertEquals(IonType.STRING, type);
+                assertEquals("12345678", reader.stringValue());
+                foundValue = true;
+            }
+            pipe.receive(b);
+        }
+        assertTrue(foundValue);
+        assertNull(reader.next());
+        assertEquals(1, oversizedCounter.get());
+        reader.close();
+    }
+
+    private static void writeFirstStruct(IonWriter writer) throws IOException {
+        //{
+        //    foo: bar,
+        //    abc: [123, 456]
+        //}
+        writer.stepIn(IonType.STRUCT);
+        writer.setFieldName("foo");
+        writer.writeSymbol("bar");
+        writer.setFieldName("abc");
+        writer.stepIn(IonType.LIST);
+        writer.writeInt(123);
+        writer.writeInt(456);
+        writer.stepOut();
+        writer.stepOut();
+    }
+
+    private static void assertFirstStruct(IonReader reader) {
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals("bar", reader.stringValue());
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals("abc", reader.getFieldName());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(123, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(456, reader.intValue());
+        reader.stepOut();
+        reader.stepOut();
+    }
+
+    private static void writeSecondStruct(IonWriter writer) throws IOException {
+        //{
+        //    foo: baz,
+        //    abc: [42.0, 43e0]
+        //}
+        writer.stepIn(IonType.STRUCT);
+        writer.setFieldName("foo");
+        writer.writeSymbol("baz");
+        writer.setFieldName("abc");
+        writer.stepIn(IonType.LIST);
+        writer.writeDecimal(new BigDecimal("42.0"));
+        writer.writeFloat(43.);
+        writer.stepOut();
+        writer.stepOut();
+    }
+
+    private static void assertSecondStruct(IonReader reader) {
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals("baz", reader.stringValue());
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals("abc", reader.getFieldName());
+        reader.stepIn();
+        assertEquals(IonType.DECIMAL, reader.next());
+        assertEquals(new BigDecimal("42.0"), reader.decimalValue());
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(43., reader.doubleValue(), 1e-9);
+        reader.stepOut();
+        reader.stepOut();
+        assertNull(reader.next());
+    }
+
+    IonReader newBoundedIncrementalReader(byte[] bytes, int maximumBufferSize) {
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                Assert.fail("Oversized symbol table not expected.");
+            }
+
+            @Override
+            public void onOversizedValue() {
+                Assert.fail("Oversized value not expected.");
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+                // Do nothing.
+            }
+        };
+        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(maximumBufferSize)
+                .withMaximumBufferSize(maximumBufferSize)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        return new IonReaderBinaryIncremental(
+            builder,
+            new ByteArrayInputStream(bytes)
+        );
+    }
+
+    @Test
+    public void flushBetweenStructs() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = _Private_IonManagedBinaryWriterBuilder
+            .create(_Private_IonManagedBinaryWriterBuilder.AllocatorMode.BASIC)
+                .withLocalSymbolTableAppendEnabled()
+                .newWriter(out);
+        writeFirstStruct(writer);
+        writer.flush();
+        writeSecondStruct(writer);
+        writer.close();
+
+        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 64);
+        assertFirstStruct(reader);
+        assertSecondStruct(reader);
+        reader.close();
+    }
+
+    @Test
+    public void structsWithFloat32AndPreallocatedLength() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = _Private_IonManagedBinaryWriterBuilder
+            .create(_Private_IonManagedBinaryWriterBuilder.AllocatorMode.BASIC)
+                .withPaddedLengthPreallocation(2)
+                .withFloatBinary32Enabled()
+                .newWriter(out);
+        writeFirstStruct(writer);
+        writeSecondStruct(writer);
+        writer.close();
+
+        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 64);
+        assertFirstStruct(reader);
+        assertSecondStruct(reader);
+    }
+
+    @Test
+    public void nopPadThatFillsBufferFollowedByValueNotOversized() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            0x03, 0x00, 0x00, 0x00, // 4 byte NOP pad.
+            0x20 // Int 0.
+        );
+        // The IVM is 4 bytes and the NOP pad is 4 bytes. The first value is the 9th byte and should not be considered
+        // oversize because the NOP pad can be discarded.
+        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 8);
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, reader.intValue());
+        reader.close();
+    }
+
+    @Test
+    public void nopPadFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            0x03, 0x00, 0x00, 0x00, // 4 byte NOP pad.
+            0x21, 0x01 // Int 1.
+        );
+        // The IVM is 4 bytes and the NOP pad is 4 bytes. The first byte of the value is the 9th byte and fits in the
+        // buffer. Even though there is a 10th byte, the value should not be considered oversize because the NOP pad
+        // can be discarded.
+        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 9);
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        reader.close();
+    }
+
+    @Test
+    public void symbolTableFollowedByNopPadFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            0x00, // 1-byte NOP pad.
+            0x71, 0x0A // SID 10 (hello).
+        );
+        // The IVM is 4 bytes, the symbol table is 12 bytes, and the symbol value is 2 bytes (total 18). The 1-byte NOP
+        // pad needs to be reclaimed to make space for the value. Once that is done, the value will fit.
+        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 18);
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("hello", reader.stringValue());
+        reader.close();
+    }
+
+    @Test
+    public void multipleNopPadsFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // One byte no-op pad.
+            0x00,
+            // Two byte no-op pad.
+            0x01, 0xFF,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // Int 1
+            0x21, 0x01,
+            // IVM 1.0
+            0xE0, 0x01, 0x00, 0xEA,
+            // The following no-op pads exceed the maximum buffer size, but should not cause an error to be raised.
+            // 16-byte no-op pad.
+            0x0E, 0x8E,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // Int 2.
+            0x21, 0x02,
+            // 16-byte no-op pad.
+            0x0E, 0x8E,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        );
+
+        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 11);
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(2, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // One byte no-op pad.
+            0x00,
+            // Two byte no-op pad.
+            0x01, 0xFF,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // IVM 1.0
+            0xE0, 0x01, 0x00, 0xEA,
+            // 15-byte no-op pad.
+            0x0E, 0x8D,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // Symbol 10 (hello)
+            0x71, 0x0A
+        );
+
+        // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
+        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 22);
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("hello", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors2() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // One byte no-op pad.
+            0x00,
+            // Two byte no-op pad.
+            0x01, 0xFF,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // IVM 1.0
+            0xE0, 0x01, 0x00, 0xEA,
+            // 16-byte no-op pad.
+            0x0E, 0x8E,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // Symbol 10 (hello)
+            0x71, 0x0A
+        );
+
+        // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
+        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 22);
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("hello", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors3() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // One byte no-op pad.
+            0x00,
+            // Two byte no-op pad.
+            0x01, 0xFF,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // IVM 1.0
+            0xE0, 0x01, 0x00, 0xEA,
+            // 14-byte no-op pad.
+            0x0E, 0x8C,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // Symbol 10 (hello)
+            0x71, 0x0A
+        );
+
+        // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
+        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 22);
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("hello", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void nopPadSurroundingSymbolTableThatFitsInBuffer() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // 14-byte no-op pad.
+            0x0E, 0x8C,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            // 14-byte no-op pad.
+            0x0E, 0x8C,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // String abcdefg
+            0x87, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+            // Symbol 10 (hello)
+            0x71, 0x0A
+        );
+
+        // Set the maximum size at IVM (4 bytes) + 14-byte NOP pad + the symbol table (12 bytes) + 2 value bytes.
+        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 32);
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("abcdefg", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("hello", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    /**
+     * Compares an iterator to the given list.
+     * @param expected the list containing the elements to compare to.
+     * @param actual the iterator to be compared.
+     * @param isEqualityExpected true if the iterator is expected to contain the same elements as the list; otherwise,
+     *                           false.
+     */
+    private static void compareIterator(List<String> expected, Iterator<String> actual, boolean isEqualityExpected) {
+        int numberOfElements = 0;
+        while (actual.hasNext()) {
+            String actualValue = actual.next();
+            if (numberOfElements >= expected.size()) {
+                assertEquals(isEqualityExpected, !actual.hasNext());
+                break;
+            }
+            String expectedValue = expected.get(numberOfElements++);
+            if (isEqualityExpected) {
+                assertEquals(expectedValue, actualValue);
+            } else {
+                assertNotEquals(expectedValue, actualValue);
+            }
+        }
+        assertEquals(isEqualityExpected, numberOfElements == expected.size());
+    }
+
+    /**
+     * Tests the annotation iterator reuse option.
+     * @param isEnabled true if the option is enabled, false if it is disabled.
+     */
+    private void annotationIteratorReuse(boolean isEnabled) throws Exception {
+        readerBuilder = IonReaderBuilder.standard().withAnnotationIteratorReuseEnabled(isEnabled);
+        IonReaderBinaryIncremental reader = readerFor("foo::bar::123 baz::456");
+
+        assertEquals(IonType.INT, reader.next());
+        Iterator<String> firstValueAnnotationIterator = reader.iterateTypeAnnotations();
+        assertEquals(123, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        compareIterator(Arrays.asList("foo", "bar"), firstValueAnnotationIterator, !isEnabled);
+        Iterator<String> secondValueAnnotationIterator = reader.iterateTypeAnnotations();
+        assertEquals(456, reader.intValue());
+        assertNull(reader.next());
+        compareIterator(Collections.singletonList("baz"), secondValueAnnotationIterator, !isEnabled);
+        reader.close();
+    }
+
+    @Test
+    public void annotationIteratorReuseEnabled() throws Exception {
+        annotationIteratorReuse(true);
+    }
+
+    @Test
+    public void annotationIteratorReuseDisabled() throws Exception {
+        annotationIteratorReuse(false);
+    }
+}
diff --git a/test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java b/test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java
new file mode 100644
index 0000000000..d560275075
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java
@@ -0,0 +1,1197 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.BufferConfiguration;
+import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.TestUtils;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.util.Equivalence;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+import static com.amazon.ion.BitUtils.bytes;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+@RunWith(Parameterized.class)
+public class IonReaderLookaheadBufferTest
+    extends IonReaderLookaheadBufferTestBase<IonBufferConfiguration, IonBufferConfiguration.Builder>
+{
+
+    private static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
+
+    // The source of data that the standard lookahead buffer will draw from.
+    private ResizingPipedInputStream input;
+    // The lookahead buffer to test.
+    private IonReaderLookaheadBuffer lookahead;
+    // Builds IonBufferConfigurations used by 'lookahead'. May be overwritten by individual tests.
+    private IonBufferConfiguration.Builder builder;
+
+    @Before
+    public void reset() {
+        input = null;
+        lookahead = null;
+        builder = IonBufferConfiguration.Builder.standard();
+    }
+
+    /**
+     * Creates a standard buffer (`lookahead`) that draws from a ResizingPipedInputStream (`input`) that can be
+     * incrementally filled with data.
+     */
+    private void initializeStandardPipedBuffer() {
+        input = new ResizingPipedInputStream(1);
+        if (initialBufferSize != null) {
+            builder.withInitialBufferSize(initialBufferSize);
+        }
+        lookahead = new IonReaderLookaheadBuffer(builder.build(), input);
+    }
+
+    /**
+     * Creates a lookahead buffer over the given bytes, prepended with the IVM.
+     * @param ion binary Ion bytes without an IVM.
+     * @return a new buffer.
+     */
+    private IonReaderLookaheadBuffer bufferFor(int... ion) throws Exception {
+        return new IonReaderLookaheadBuffer(
+            builder.build(),
+            new ByteArrayInputStream(new TestUtils.BinaryIonAppender().append(ion).toByteArray())
+        );
+    }
+
+    @Override
+    BuilderSupplier<IonBufferConfiguration, IonBufferConfiguration.Builder> defaultBuilderSupplier() {
+        return new BuilderSupplier<IonBufferConfiguration, IonBufferConfiguration.Builder>() {
+
+            @Override
+            public IonBufferConfiguration.Builder get() {
+                return IonBufferConfiguration.Builder.standard();
+            }
+        };
+    }
+
+    @Override
+    ReaderLookaheadBufferBase build(
+        IonBufferConfiguration.Builder configuration,
+        InputStream inputStream
+    ) {
+        return new IonReaderLookaheadBuffer(configuration.build(), inputStream);
+    }
+
+    @Override
+    void createThrowingOversizedEventHandlers(IonBufferConfiguration.Builder builder) {
+        builder.onOversizedValue(new BufferConfiguration.OversizedValueHandler() {
+            @Override
+            public void onOversizedValue() {
+                throw new IllegalStateException();
+            }
+        })
+        .onOversizedSymbolTable(new IonBufferConfiguration.OversizedSymbolTableHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                throw new IllegalStateException();
+            }
+        });
+    }
+
+    @Override
+    void createCountingEventHandler(IonBufferConfiguration.Builder builder, final AtomicLong byteCount) {
+        createThrowingOversizedEventHandlers(builder);
+        builder.onData(new BufferConfiguration.DataHandler() {
+            @Override
+            public void onData(int numberOfBytes) {
+                byteCount.addAndGet(numberOfBytes);
+            }
+        });
+    }
+
+    @Override
+    byte[] toBytes(String textIon) throws IOException {
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        _Private_IonSystem system = (_Private_IonSystem) IonSystemBuilder.standard().build();
+        IonReader reader = system.newSystemReader(textIon);
+        IonWriter writer = IonBinaryWriterBuilder.standard().build(output);
+        writer.writeValues(reader);
+        reader.close();
+        writer.close();
+        return output.toByteArray();
+    }
+
+    @Override
+    byte[] intZeroWithoutIvm() {
+        return bytes(0x20);
+    }
+
+    @Test
+    public void nopPadding() throws Exception {
+        byte[] threeByteNopPadBeforeIntegerZero = bytes(0xE0, 0x01, 0x00, 0xEA, 0x0E, 0x81, 0x00, 0x20);
+        readSingleValueOneByteAtATime(
+            threeByteNopPadBeforeIntegerZero,
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.INT, reader.next());
+                    assertEquals(0, reader.intValue());
+                }
+            }
+        );
+    }
+
+    @Test
+    public void annotationWithMultiByteSID() throws Exception {
+        // The SID 1010 takes multiple bytes to express, but the total length of the annotation wrapper is still small
+        // enough that the length is encoded in the lower nibble of the type ID. This test verifies that the
+        // annot_length VarUInt is correctly treated as a length of the SIDs, not the number of SIDs.
+        readSingleValueOneByteAtATime(
+            toBytes("$ion_symbol_table::{imports:[{name:\"foo\", version:1, max_id:1000}], symbols:[\"abc\"]} $1010::123"),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.INT, reader.next());
+                    String[] annotations = reader.getTypeAnnotations();
+                    assertEquals(1, annotations.length);
+                    assertEquals("abc", annotations[0]);
+                    assertEquals(123, reader.intValue());
+                }
+            }
+        );
+        // This test is similar, except that the annotation wrapper's length requires the 'length' VarUInt.
+        readSingleValueOneByteAtATime(
+            toBytes("$ion_symbol_table::{imports:[{name:\"foo\", version:1, max_id:1000}], symbols:[\"abc\"]} $1010::\"abcdefghijklmnopqrstuvwxyz0123456789\""),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.STRING, reader.next());
+                    String[] annotations = reader.getTypeAnnotations();
+                    assertEquals(1, annotations.length);
+                    assertEquals("abc", annotations[0]);
+                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
+                }
+            }
+        );
+        // Two multibyte SIDs.
+        readSingleValueOneByteAtATime(
+            toBytes("$ion_symbol_table::{imports:[{name:\"foo\", version:1, max_id:1000}], symbols:[\"abc\"]} $1010::$1010::123"),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.INT, reader.next());
+                    String[] annotations = reader.getTypeAnnotations();
+                    assertEquals(2, annotations.length);
+                    assertEquals("abc", annotations[0]);
+                    assertEquals("abc", annotations[1]);
+                    assertEquals(123, reader.intValue());
+                }
+            }
+        );
+        // One multibyte SID and one one-byte SID.
+        readSingleValueOneByteAtATime(
+            toBytes("$ion_symbol_table::{imports:[{name:\"foo\", version:1, max_id:1000}], symbols:[\"abc\"]} $4::$1010::\"abcdefghijklmnopqrstuvwxyz0123456789\""),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.STRING, reader.next());
+                    String[] annotations = reader.getTypeAnnotations();
+                    assertEquals(2, annotations.length);
+                    assertEquals("name", annotations[0]); // SID 4 is "name"
+                    assertEquals("abc", annotations[1]);
+                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
+                }
+            }
+        );
+    }
+
+    @Test
+    public void symbolTableAnnotationOnStructNotFirst() throws Exception {
+        readSingleValueOneByteAtATime(
+            // Note: the following more readable line will be possible once ion-java#222 is fixed.
+            // toBytes("name::$ion_symbol_table::{}"),
+            bytes(0xE0, 0x01, 0x00, 0xEA, 0xE4, 0x82, 0x84, 0x83, 0xD0),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.STRUCT, reader.next());
+                    String[] annotations = reader.getTypeAnnotations();
+                    assertEquals(2, annotations.length);
+                    assertEquals("name", annotations[0]);
+                    assertEquals("$ion_symbol_table", annotations[1]);
+                    reader.stepIn();
+                    assertNull(reader.next());
+                    reader.stepOut();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void errorOnInvalidTypeF() throws Exception {
+        // Type F is illegal in Ion 1.0.
+        thrown.expect(IonException.class);
+        readSingleValueOneByteAtATime(
+            bytes(0xE0, 0x01, 0x00, 0xEA, 0xF0),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    fail();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void errorOnInvalidAnnotationTooShort() throws Exception {
+        // Annotation wrappers must have length at least three.
+        thrown.expect(IonException.class);
+        readSingleValueOneByteAtATime(
+            bytes(0xE0, 0x01, 0x00, 0xEA, 0xE2, 0x81, 0x80),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    fail();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void errorOnInvalidAnnotationNull() throws Exception {
+        // Annotation wrappers cannot be null.
+        thrown.expect(IonException.class);
+        readSingleValueOneByteAtATime(
+            bytes(0xE0, 0x01, 0x00, 0xEA, 0xE2),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    fail();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void errorOnIVMInAnnotation() throws Exception {
+        // The IVM must only occur at the top level.
+        thrown.expect(IonException.class);
+        readSingleValueOneByteAtATime(
+            bytes(0xE0, 0x01, 0x00, 0xEA, 0xE6, 0x81, 0x83, 0xE0, 0x01, 0x00, 0xEA),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    fail();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void errorOnInvalidAnnotationWithinAnnotation() throws Exception {
+        // An annotation wrapper cannot wrap another annotation wrapper. This is an example of invalid Ion
+        // that is not detected by the lookahead wrapper. The error will be conveyed by the reader as normal.
+        readSingleValueOneByteAtATime(
+            bytes(0xE0, 0x01, 0x00, 0xEA, 0xE6, 0x81, 0x84, 0xE3, 0x81, 0x84, 0x20),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    thrown.expect(IonException.class);
+                    reader.next();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void errorOnSpecifiedMaxSizeAndNullSymbolTableHandler() {
+        IonBufferConfiguration.Builder builder = builderSupplier.get();
+        thrown.expect(IllegalArgumentException.class);
+        build(
+            builder
+                .withMaximumBufferSize(10)
+                .onOversizedValue(builder.getNoOpOversizedValueHandler())
+                .onOversizedSymbolTable(null),
+            new ByteArrayInputStream(new byte[]{})
+        );
+    }
+
+    private static final int VALUE_BITS_PER_VARUINT_BYTE = 7;
+    private static final int LOWER_SEVEN_BITS_BITMASK = 0x7F;
+
+    @Test
+    public void succeedsOnVarUIntMaxLong() throws Exception {
+        initializeStandardPipedBuffer();
+        // The IVM and the start of a variable-length NOP pad.
+        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x0E));
+        lookahead.fillInput();
+        assertTrue(lookahead.moreDataRequired());
+        // The following writes the VarUInt representation of Long.MAX_VALUE one byte at a time.
+        // Note: Long.MAX_VALUE is represented in Long.SIZE - 1 bits because long is signed.
+        for (int i = Long.SIZE - 1; i > 0; i -= VALUE_BITS_PER_VARUINT_BYTE) {
+            int bitsToShift = i - VALUE_BITS_PER_VARUINT_BYTE;
+            int endMask = 0;
+            if (i <= VALUE_BITS_PER_VARUINT_BYTE) {
+                endMask = 0x80;
+                bitsToShift = 0;
+            }
+            input.receive((byte) (((Long.MAX_VALUE >>> bitsToShift) & LOWER_SEVEN_BITS_BITMASK) | endMask));
+            lookahead.fillInput();
+            assertTrue(lookahead.moreDataRequired());
+        }
+        // This is the first of the Long.MAX_VALUE bytes of NOP pad that the Ion reader would skip. Writing
+        // all of them is out of scope for this test, but testing that the first one succeeds verifies that
+        // the lookahead wrapper has exited its VarUInt parsing state.
+        input.receive(0);
+        lookahead.fillInput();
+        assertTrue(lookahead.moreDataRequired());
+    }
+
+    @Test
+    public void errorOnVarUIntTooLarge() throws Exception {
+        BigInteger longPlusOne = BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE);
+        initializeStandardPipedBuffer();
+        // The IVM and the start of a variable-length NOP pad.
+        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x0E));
+        lookahead.fillInput();
+        // The following writes the VarUInt representation of `longPlusOne` one byte at a time.
+        for (int i = longPlusOne.bitLength(); i > 0; i -= VALUE_BITS_PER_VARUINT_BYTE) {
+            assertTrue(lookahead.moreDataRequired());
+            if (i >= VALUE_BITS_PER_VARUINT_BYTE) {
+                int bitsToShift = i - VALUE_BITS_PER_VARUINT_BYTE;
+                input.receive(
+                    longPlusOne
+                        .shiftRight(bitsToShift)
+                        .and(BigInteger.valueOf(LOWER_SEVEN_BITS_BITMASK))
+                        .byteValue()
+                );
+                if (bitsToShift < VALUE_BITS_PER_VARUINT_BYTE) {
+                    // This is the second-to-last byte. A failure is expected because this is not the end
+                    // byte, so no matter what the next byte is, the value can't fit in a long.
+                    thrown.expect(IonException.class);
+                }
+                lookahead.fillInput();
+            } else {
+                fail("Reached the last byte, which should not be possible.");
+            }
+        }
+    }
+
+    @Test
+    public void errorOnRewindAtBeginning() {
+        initializeStandardPipedBuffer();
+        thrown.expect(IllegalStateException.class);
+        lookahead.rewind();
+    }
+
+    @Test
+    public void errorOnRewindToValueStartAtBeginning() {
+        initializeStandardPipedBuffer();
+        thrown.expect(IllegalStateException.class);
+        lookahead.rewindToValueStart();
+    }
+
+    @Test
+    public void errorOnMarkWhenMoreDataIsRequired() throws Exception {
+        initializeStandardPipedBuffer();
+        // The IVM and the start of a variable-length NOP pad.
+        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0xE0));
+        lookahead.fillInput();
+        assertTrue(lookahead.moreDataRequired());
+        thrown.expect(IllegalStateException.class);
+        lookahead.mark();
+    }
+
+    @Test
+    public void errorOnRewindToValueStartWhenDataWouldBeLost() throws Exception {
+        initializeStandardPipedBuffer();
+        // The IVM and the start of a variable-length NOP pad.
+        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0xE0));
+        lookahead.fillInput();
+        assertTrue(lookahead.moreDataRequired());
+        thrown.expect(IllegalStateException.class);
+        lookahead.rewindToValueStart();
+    }
+
+    @Test
+    public void errorOnRewindAfterClear() throws Exception {
+        initializeStandardPipedBuffer();
+        // The IVM followed by int 0.
+        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x20));
+        lookahead.fillInput();
+        lookahead.mark();
+        lookahead.clearMark();
+        thrown.expect(IllegalStateException.class);
+        lookahead.rewind();
+    }
+
+    @Test
+    public void errorOnRewindToValueStartWhenNoValueIsBuffered() throws Exception {
+        initializeStandardPipedBuffer();
+        // The IVM followed by int 0.
+        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x20));
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, reader.intValue());
+        lookahead.fillInput();
+        assertTrue(lookahead.moreDataRequired());
+        thrown.expect(IllegalStateException.class);
+        lookahead.rewindToValueStart();
+    }
+
+    @Test
+    public void errorOnRewindAfterFillInput() throws Exception {
+        initializeStandardPipedBuffer();
+        // The IVM followed by int 0.
+        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x20));
+        lookahead.fillInput();
+        lookahead.mark();
+        input.receive(bytes(0x20));
+        lookahead.fillInput();
+        thrown.expect(IllegalStateException.class);
+        lookahead.rewind();
+    }
+
+    @Test
+    public void rewind() throws Exception {
+        initializeStandardPipedBuffer();
+        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x20));
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        lookahead.mark();
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, reader.intValue());
+        lookahead.rewind();
+        // 4-byte IVM + 1-byte value
+        assertEquals(5, lookahead.available());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, reader.intValue());
+        input.receive(bytes(0x21, 0x01));
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        lookahead.mark();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        lookahead.rewind();
+        assertEquals(2, lookahead.available());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        lookahead.rewind();
+        assertEquals(2, lookahead.available());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        assertTrue(lookahead.moreDataRequired());
+        assertEquals(0, lookahead.available());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void rewindToValueStart() throws Exception {
+        initializeStandardPipedBuffer();
+        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x20));
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, reader.intValue());
+        lookahead.rewindToValueStart();
+        // No IVM, just 1-byte value.
+        assertEquals(1, lookahead.available());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, reader.intValue());
+        input.receive(bytes(0x21, 0x01));
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        lookahead.rewindToValueStart();
+        assertEquals(2, lookahead.available());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        lookahead.rewindToValueStart();
+        assertEquals(2, lookahead.available());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        assertTrue(lookahead.moreDataRequired());
+        assertEquals(0, lookahead.available());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    private static class RecordingEventHandler implements
+        BufferConfiguration.OversizedValueHandler,
+        IonBufferConfiguration.OversizedSymbolTableHandler,
+        BufferConfiguration.DataHandler {
+
+        int oversizedSymbolTableCount = 0;
+        int oversizedValueCount = 0;
+        long numberOfBytesProcessed = 0;
+
+        @Override
+        public void onOversizedSymbolTable() {
+            oversizedSymbolTableCount++;
+        }
+
+        @Override
+        public void onOversizedValue() {
+            oversizedValueCount++;
+        }
+
+        @Override
+        public void onData(int numberOfBytes) {
+            numberOfBytesProcessed += numberOfBytes;
+        }
+    }
+
+    @Test
+    public void skipOversizedValues() throws Exception {
+        if (initialBufferSize == null) {
+            // This test tests buffers of limited size, while an initialBufferSize of null indicates that the size
+            // of the buffer is unlimited. Skip.
+            return;
+        }
+        // 14 values ranging in size from 1-14 bytes. There are 14 - x values larger than x bytes.
+        TestUtils.BinaryIonAppender appender = new TestUtils.BinaryIonAppender().append(
+            0x11, // boolean true
+            0x21, 0x00, // int 0 (overpadded)
+            0x22, 0x00, 0x01, // int 1 (overpadded)
+            0x33, 0x00, 0x00, 0x02, // int -2 (overpadded)
+            0x44, 0x00, 0x00, 0x00, 0x00, // float 0e0
+            0x55, 0x00, 0x00, 0x80, 0x00, 0x00, // decimal 0d0 (overpadded)
+            0x66, 0x80, 0x81, 0x81, 0x81, 0x80, 0x80, // timestamp 0001-01-01T00:00Z
+            0x7E, 0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, // symbol 0 (overpadded length and value)
+            0x88, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', // string abcdefgh
+            0x99, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', // clob abcdefghi
+            0xAA, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, // blob
+            // list with ten int 0
+            0xBB, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+            // sexp with ten decimal 0d0
+            0xCC, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50,
+            // struct with system symbol field names and int 0 values (some overpadded)
+            0xDD, 0x84, 0x20, 0x85, 0x20, 0x86, 0x20, 0x87, 0x21, 0x00, 0x88, 0x22, 0x00, 0x00
+        );
+        byte[] data = appender.toByteArray();
+        IonDatagram expectedValues = SYSTEM.getLoader().load(data);;
+        for (int maxValueSize : Arrays.asList(5, 7, 8, 10, 13)) {
+            if (maxValueSize < initialBufferSize) {
+                // This would violate the IonBufferConfiguration contract; no need to test here.
+                continue;
+            }
+            ByteArrayInputStream input = new ByteArrayInputStream(data);
+            RecordingEventHandler eventHandler = new RecordingEventHandler();
+            IonBufferConfiguration.Builder builder = IonBufferConfiguration.Builder.standard()
+                .withMaximumBufferSize(maxValueSize)
+                .onOversizedValue(eventHandler)
+                .onOversizedSymbolTable(eventHandler)
+                .onData(eventHandler)
+                .withInitialBufferSize(initialBufferSize);
+            IonReaderLookaheadBuffer lookahead = new IonReaderLookaheadBuffer(builder.build(), input);
+            IonReader reader = null;
+            try {
+                int valueIndex = 0;
+                while (true) {
+                    lookahead.fillInput();
+                    if (lookahead.moreDataRequired()) {
+                        break;
+                    }
+                    if (reader == null) {
+                        reader = lookahead.newIonReader(IonReaderBuilder.standard());
+                    }
+                    assertNotNull(reader.next());
+                    assertTrue(Equivalence.ionEquals(expectedValues.get(valueIndex), SYSTEM.newValue(reader)));
+                    valueIndex++;
+                }
+                // There is one value per size. For a max size of x, `moreDataRequired` should be false x times.
+                assertEquals(valueIndex, maxValueSize);
+            } finally {
+                if (reader != null) {
+                    reader.close();
+                }
+            }
+            int expectedOversizedValues = expectedValues.size() - maxValueSize;
+            assertEquals(
+                String.format("Expect %d oversized values for max size %d", expectedOversizedValues, maxValueSize),
+                expectedOversizedValues,
+                eventHandler.oversizedValueCount
+            );
+            assertEquals(0, eventHandler.oversizedSymbolTableCount);
+            ResizingPipedInputStream buffer = (ResizingPipedInputStream) lookahead.getPipe();
+            // The buffer grows in increments of its initial buffer size. Therefore, the final capacity will be at
+            // most `initialBufferSize` larger than the lookahead wrapper's configured max value size.
+            assertTrue(buffer.capacity() <= maxValueSize + buffer.getInitialBufferSize());
+        }
+    }
+
+    @Test
+    public void skipOversizedValuesButRetainSymbolTablesWhenReadingOneByOne() throws Exception {
+        if (initialBufferSize == null) {
+            // This test tests buffers of limited size, while an initialBufferSize of null indicates that the size
+            // of the buffer is unlimited. Skip.
+            return;
+        }
+        // 4 byte IVM + 30 bytes for the symbol tables + 2 bytes for a symbol value.
+        final int maximumSize = 36;
+        RecordingEventHandler eventHandler = new RecordingEventHandler();
+        builder = IonBufferConfiguration.Builder.standard()
+            .withMaximumBufferSize(maximumSize)
+            .onOversizedValue(eventHandler)
+            .onOversizedSymbolTable(eventHandler)
+            .onData(eventHandler)
+            .withInitialBufferSize(initialBufferSize);
+        lookahead = bufferFor(
+            // Total buffered data: 4 bytes. The following value is 33 bytes in order to exceed the max of 36.
+            0xBE, 0x9F, // list of size 31
+            0x7E, 0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, // symbol 0 (overpadded length and value)
+            0xAA, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, // blob
+            0xBB, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, // list with ten int 0
+            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'A', // symbol table declaring the symbol 'A'.
+            // Total buffered data: 4 + 8 = 12 bytes. The following value is 25 bytes in order to exceed the max of 36.
+            0xBE, 0x97, // list of size 23
+            0xAA, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, // blob
+            0xBB, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, // list with ten int 0
+            0xEA, 0x81, 0x83, 0xD7, 0x86, 0x71, 0x03, 0x87, 0xB2, 0x81, 'B', // symbol table appending the symbol 'B'.
+            // Total buffered data: 4 + 8 + 11 = 23 bytes. The following value is 14 bytes in order to exceed the max of 36.
+            // struct with system symbol field names and int 0 values (some overpadded)
+            0xDD, 0x84, 0x20, 0x85, 0x20, 0x86, 0x20, 0x87, 0x21, 0x00, 0x88, 0x22, 0x00, 0x00,
+            0xEA, 0x81, 0x83, 0xD7, 0x86, 0x71, 0x03, 0x87, 0xB2, 0x81, 'C', // symbol table appending the symbol 'C'.
+            // Total buffered data: 4 + 8 + 11 + 11 = 34 bytes. The following value is 3 bytes in order to exceed the max of 36.
+            0x22, 0x00, 0x01, // int 1 (overpadded)
+            0x71, 0x0A, // symbol 'A'
+            // Since the previous value was successfully read, the buffer is now empty. A 3-byte value can be read.
+            0x72, 0x00, 0x0B, // symbol 'B'
+            0x71, 0x0C // symbol 'C'
+        );
+
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("A", reader.stringValue());
+
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("B", reader.stringValue());
+
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("C", reader.stringValue());
+
+        lookahead.fillInput();
+        assertTrue(lookahead.moreDataRequired());
+        reader.close();
+
+        assertEquals(4, eventHandler.oversizedValueCount);
+        assertEquals(0, eventHandler.oversizedSymbolTableCount);
+        ResizingPipedInputStream buffer = (ResizingPipedInputStream) lookahead.getPipe();
+        // The buffer grows in increments of its initial buffer size. Therefore, the final capacity will be at
+        // most `initialBufferSize` larger than the lookahead wrapper's configured max value size.
+        assertTrue(buffer.capacity() <= maximumSize + buffer.getInitialBufferSize());
+    }
+
+    @Test
+    public void skipOversizedValuesButRetainSymbolTablesWhenReadingAllAtOnce() throws Exception {
+        if (initialBufferSize == null) {
+            // This test tests buffers of limited size, while an initialBufferSize of null indicates that the size
+            // of the buffer is unlimited. Skip.
+            return;
+        }
+        // 4 byte IVM + 8 bytes for the symbol tables + 6 bytes for the integer and symbol values.
+        final int maximumSize = 18;
+        RecordingEventHandler eventHandler = new RecordingEventHandler();
+        builder = IonBufferConfiguration.Builder.standard()
+            .withMaximumBufferSize(maximumSize)
+            .onOversizedValue(eventHandler)
+            .onOversizedSymbolTable(eventHandler)
+            .onData(eventHandler)
+            .withInitialBufferSize(initialBufferSize);
+        lookahead = bufferFor(
+            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'A', // symbol table declaring the symbol 'A'.
+            // Total buffered data: 12 bytes. The following value is 7 bytes in order to exceed the max of 18.
+            0x66, 0x80, 0x81, 0x81, 0x81, 0x80, 0x80, // timestamp 0001-01-01T00:00Z
+            0x21, 0x01, // int 1
+            0x71, 0x0A, // symbol 'A'
+            0x31, 0x01  // int -1
+        );
+
+        // Skips the oversized values and buffers the int 1.
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+
+        // Buffers the symbol value 'A'.
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+
+        // Buffers the int -1.
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+
+        // End of the input.
+        lookahead.fillInput();
+        assertTrue(lookahead.moreDataRequired());
+
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("A", reader.stringValue());
+
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(-1, reader.intValue());
+
+        assertNull(reader.next());
+        reader.close();
+
+        assertEquals(1, eventHandler.oversizedValueCount);
+        assertEquals(0, eventHandler.oversizedSymbolTableCount);
+        ResizingPipedInputStream buffer = (ResizingPipedInputStream) lookahead.getPipe();
+        // The buffer grows in increments of its initial buffer size. Therefore, the final capacity will be at
+        // most `initialBufferSize` larger than the lookahead wrapper's configured max value size.
+        assertTrue(buffer.capacity() <= maximumSize + buffer.getInitialBufferSize());
+    }
+
+    @Test
+    public void oversizedSymbolTable() throws Exception {
+        // 4 byte IVM + 3 byte value.
+        final int maximumSize = 7;
+        if (initialBufferSize == null || initialBufferSize > maximumSize) {
+            // This test tests buffers of limited size, while an initialBufferSize of null indicates that the size
+            // of the buffer is unlimited. Skip.
+            return;
+        }
+        RecordingEventHandler eventHandler = new RecordingEventHandler();
+        builder = IonBufferConfiguration.Builder.standard()
+            .withMaximumBufferSize(maximumSize)
+            .onOversizedValue(eventHandler)
+            .onOversizedSymbolTable(eventHandler)
+            .onData(eventHandler)
+            .withInitialBufferSize(initialBufferSize);
+        lookahead = bufferFor(
+            0x22, 0x00, 0x01, // int 1 (overpadded)
+            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'A', // symbol table declaring the symbol 'A'.
+            0x71, 0x0A // symbol 'A'
+        );
+
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+
+        // This causes the oversized symbol table to be skipped.
+        lookahead.fillInput();
+        assertEquals(0, lookahead.available());
+        assertTrue(lookahead.moreDataRequired());
+        assertEquals(1, eventHandler.oversizedSymbolTableCount);
+
+        // Subsequent invocations of fillInput have no effect.
+        lookahead.fillInput();
+        assertEquals(0, lookahead.available());
+        assertTrue(lookahead.moreDataRequired());
+        assertEquals(1, eventHandler.oversizedSymbolTableCount);
+        reader.close();
+
+        assertEquals(0, eventHandler.oversizedValueCount);
+        ResizingPipedInputStream buffer = (ResizingPipedInputStream) lookahead.getPipe();
+        // The buffer grows in increments of its initial buffer size. Therefore, the final capacity will be at
+        // most `initialBufferSize` larger than the lookahead wrapper's configured max value size.
+        assertTrue(buffer.capacity() <= maximumSize + buffer.getInitialBufferSize());
+    }
+
+    @Test
+    public void moreDataRequiredInTheMiddleOfOversizedValue() throws Exception {
+        // 4 byte IVM + 3 byte value.
+        final int maximumSize = 7;
+        if (initialBufferSize == null || initialBufferSize > maximumSize) {
+            // This test tests buffers of limited size, while an initialBufferSize of null indicates that the size
+            // of the buffer is unlimited. Skip.
+            return;
+        }
+        TestUtils.BinaryIonAppender appender = new TestUtils.BinaryIonAppender().append(
+            // Once the fourth byte in the following value is reached, the value is considered oversized. It will remain
+            // that way even though fillInput yields back to the user for every remaining byte in the value.
+            0x66, 0x80, 0x81, 0x81, 0x81, 0x80, 0x80, // timestamp 0001-01-01T00:00Z
+            0x20 // int 0
+        );
+        final RecordingEventHandler eventHandler = new RecordingEventHandler();
+        builderSupplier = new BuilderSupplier<IonBufferConfiguration, IonBufferConfiguration.Builder>() {
+            @Override
+            public IonBufferConfiguration.Builder get() {
+                return IonBufferConfiguration.Builder.standard()
+                    .withMaximumBufferSize(maximumSize)
+                    .onOversizedValue(eventHandler)
+                    .onOversizedSymbolTable(eventHandler)
+                    .onData(eventHandler);
+            }
+        } ;
+
+        readSingleValueOneByteAtATime(
+            appender.toByteArray(),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.INT, reader.next());
+                    assertEquals(0, reader.intValue());
+                    assertNull(reader.next());
+                }
+            }
+        );
+
+        assertEquals(1, eventHandler.oversizedValueCount);
+        assertEquals(0, eventHandler.oversizedSymbolTableCount);
+    }
+
+    @Test
+    public void oversizedIncompleteGzipValueDoesNotThrow() throws Exception {
+        // Tests that InputStream implementations that throw EOFException when too many bytes are requested to be
+        // skipped do not cause the lookahead wrapper to throw.
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        OutputStream gzip = new GZIPOutputStream(out);
+        gzip.write(bytes(0xE0, 0x01, 0x00, 0xEA));
+        gzip.write(bytes(0x66, 0x80, 0x81, 0x81, 0x81, 0x80, 0x80)); // timestamp 0001-01-01T00:00Z
+        gzip.close();
+        byte[] bytes = out.toByteArray();
+        final int maximumSize = 5; // Less than the length of the timestamp value.
+        // Cutting off 15 bytes removes the entire GZIP trailer and part of the value.
+        byte[] truncatedBytes = new byte[bytes.length - 15];
+        System.arraycopy(bytes, 0, truncatedBytes, 0, truncatedBytes.length);
+        final RecordingEventHandler eventHandler = new RecordingEventHandler();
+        builderSupplier = new BuilderSupplier<IonBufferConfiguration, IonBufferConfiguration.Builder>() {
+            @Override
+            public IonBufferConfiguration.Builder get() {
+                return IonBufferConfiguration.Builder.standard()
+                    .withMaximumBufferSize(maximumSize)
+                    .withInitialBufferSize(maximumSize)
+                    .onOversizedValue(eventHandler)
+                    .onOversizedSymbolTable(eventHandler)
+                    .onData(eventHandler);
+            }
+        };
+
+        InputStream input = new GZIPInputStream(new ByteArrayInputStream(truncatedBytes));
+        IonReaderLookaheadBuffer lookahead = new IonReaderLookaheadBuffer(builder.build(), input);
+        lookahead.fillInput();
+        assertTrue(lookahead.moreDataRequired());
+        lookahead.fillInput();
+        assertTrue(lookahead.moreDataRequired());
+        input.close();
+        // Note: even though the value would be considered oversize, the event handler may not have been notified
+        // before the input is closed, so nothing is asserted here. The purpose of this test is to verify that
+        // an EOFException is not thrown.
+    }
+
+    @Test
+    public void rewindToValueStartWithLstAppend() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendEnabled().build(out);
+        writer.writeSymbol("abc");
+        writer.flush();
+        writer.writeSymbol("def");
+        writer.close();
+        InputStream input = new ByteArrayInputStream(out.toByteArray());
+        IonReaderLookaheadBuffer lookahead = new IonReaderLookaheadBuffer(builder.build(), input);
+        lookahead.fillInput();
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertTrue(lookahead.moreDataRequired());
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        lookahead.rewindToValueStart();
+        // 2-byte value (0x71 0x0B). No IVM or symbol table.
+        assertEquals(2, lookahead.available());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        // Note: if mark() / rewind() is used instead of rewindToValueStart(), the following lines will fail; there
+        // will be 12 local symbols and "def" will occur twice in the symbol table. That's because mark() includes
+        // the symbol table (in this case an LST append), and rewinding past the symbol table causes the append
+        // to be processed a second time by IonReader.next().
+        SymbolTable symbolTable = reader.getSymbolTable();
+        assertEquals(symbolTable.getSystemSymbolTable().getMaxId() + 2, reader.getSymbolTable().getMaxId());
+        List<String> symbols = new ArrayList<String>(2);
+        Iterator<String> iterator = symbolTable.iterateDeclaredSymbolNames();
+        while (iterator.hasNext()) {
+            symbols.add(iterator.next());
+        }
+        assertEquals(Arrays.asList("abc", "def"), symbols);
+        input.close();
+    }
+
+    private static void assertIonTypeId(IonType expectedType, int expectedLowerNibble, IonTypeID actualTypeID) {
+        assertEquals(expectedType, actualTypeID.type);
+        assertEquals(expectedLowerNibble, actualTypeID.lowerNibble);
+    }
+
+    /**
+     * Returns one of the provided indices, depending on the value of the 'initialBufferSize' test parameter. Bytes may
+     * occur at different indices in the buffer depending on the buffer's initial size because space will be reclaimed
+     * when possible to avoid unnecessary growth. So a buffer that starts out larger than the total size of the data,
+     * for example, will have ever-increasing indices, while smaller buffers may have indices that roll back to the
+     * beginning when space is reclaimed.
+     * @param indexIfSizeIs1 the expected index when the initial buffer size is 1.
+     * @param indexIfSizeIs10 the expected index when the initial buffer size is 10.
+     * @param indexIfSizeIsLarge the expected index when the initial buffer size is larger than the test data.
+     * @return the index for the current value of initialBufferSize.
+     */
+    private int indexForInitialBufferSize(int indexIfSizeIs1, int indexIfSizeIs10, int indexIfSizeIsLarge) {
+        if (initialBufferSize == null) {
+            return indexIfSizeIsLarge;
+        }
+        if (initialBufferSize == 1) {
+            return indexIfSizeIs1;
+        }
+        if (initialBufferSize == 10) {
+            return indexIfSizeIs10;
+        }
+        throw new IllegalStateException("Add a branch for initialBufferSize " + initialBufferSize);
+    }
+
+    @Test
+    public void valueMarkersAreSet() throws Exception {
+        if (initialBufferSize != null) {
+            builder.withInitialBufferSize(initialBufferSize);
+        }
+        lookahead = bufferFor(
+            // Value start is at byte index 5. Type ID is 0x21. Value end is at byte index 6.
+            0x21, 0x0D,
+            // The value will be consumed, so the indices reset if the initial buffer size is smaller than the data size.
+            0xE0, 0x01, 0x00, 0xEA,
+            // Type ID is 0xD1.
+            0xD1, 0x82, 0x84, 0x20,
+            // The value will not be consumed, so the indices continue.
+            // Annotations are SIDs 4 (name) and 5 (version). Type ID is 0xE5.
+            0xE5, 0x82, 0x84, 0x85, 0x31, 0x01,
+            // The value will not be consumed, so the indices continue.
+            // Type ID is 0x20.
+            0x20
+        );
+
+        lookahead.fillInput();
+        assertEquals(1, lookahead.getIvmIndex());
+        assertTrue(lookahead.getAnnotationSids().isEmpty());
+        assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
+        assertEquals(5, lookahead.getValueStart());
+        assertIonTypeId(IonType.INT, 0x1, lookahead.getValueTid());
+        assertEquals(6, lookahead.getValueEnd());
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0x0D, reader.intValue());
+        assertTrue(lookahead.moreDataRequired());
+
+        lookahead.fillInput();
+        assertEquals(indexForInitialBufferSize(1, 1, 7), lookahead.getIvmIndex());
+        lookahead.resetIvmIndex();
+        assertEquals(-1, lookahead.getIvmIndex());
+        assertTrue(lookahead.getAnnotationSids().isEmpty());
+        assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
+        assertEquals(indexForInitialBufferSize(6, 6, 12), lookahead.getValueStart());
+        assertIonTypeId(IonType.STRUCT, 0x1, lookahead.getValueTid());
+        assertEquals(indexForInitialBufferSize(8, 8, 14), lookahead.getValueEnd());
+
+        lookahead.fillInput();
+        assertEquals(-1, lookahead.getIvmIndex());
+        assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
+        assertEquals(Arrays.asList(4, 5), lookahead.getAnnotationSids());
+        assertEquals(indexForInitialBufferSize(12, 12, 18), lookahead.getValueStart());
+        assertIonTypeId(IonTypeID.ION_TYPE_ANNOTATION_WRAPPER, 0x5, lookahead.getValueTid());
+        assertEquals(indexForInitialBufferSize(14, 14, 20), lookahead.getValueEnd());
+
+        lookahead.fillInput();
+        assertEquals(-1, lookahead.getIvmIndex());
+        assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
+        assertTrue(lookahead.getAnnotationSids().isEmpty());
+        assertEquals(indexForInitialBufferSize(15, 15, 21), lookahead.getValueStart());
+        assertIonTypeId(IonType.INT, 0x0, lookahead.getValueTid());
+        assertEquals(indexForInitialBufferSize(15, 15, 21), lookahead.getValueEnd());
+
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals("name", reader.getFieldName());
+        assertEquals(0, reader.intValue());
+        reader.stepOut();
+
+        assertEquals(IonType.INT, reader.next());
+        assertArrayEquals(new String[]{"name", "version"}, reader.getTypeAnnotations());
+        assertEquals(-1, reader.intValue());
+
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, reader.intValue());
+
+        assertTrue(lookahead.moreDataRequired());
+        reader.close();
+    }
+
+    @Test
+    public void symbolTableMarkersAreSet() throws Exception {
+        if (initialBufferSize != null) {
+            builder.withInitialBufferSize(initialBufferSize);
+        }
+        lookahead = bufferFor(
+            // Symbol table declaring symbol 'x'.
+            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'x',
+            // Symbol value with SID 10 ('x').
+            0x71, 0x0A,
+            // The value will not be consumed, so the indices continue.
+            // Symbol table appending symbol 'y'.
+            0xEA, 0x81, 0x83, 0xD7, 0x86, 0x71, 0x03, 0x87, 0xB2, 0x81, 'y',
+            // Symbol value with SID 11 ('y').
+            0x71, 0x0B,
+            // The value will be consumed, so the indices reset if the initial buffer size is smaller than the data size.
+            // Second byte of IVM is at byte index 1. The IVM resets the symbol table markers.
+            0xE0, 0x01, 0x00, 0xEA,
+            // Symbol table declaring symbol 'a'.
+            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'a',
+            // Symbol table declaring symbol 'b'.
+            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'b',
+            // The IVM resets the symbol table markers.
+            0xE0, 0x01, 0x00, 0xEA,
+            // Symbol table declaring symbol 'c'.
+            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'c',
+            // Symbol table declaring symbol 'd'.
+            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'd',
+            // Symbol value with SID 10 ('d').
+            0x71, 0x0A
+        );
+        lookahead.fillInput();
+        assertEquals(1, lookahead.getIvmIndex());
+        assertTrue(lookahead.getAnnotationSids().isEmpty());
+        List<IonReaderLookaheadBuffer.SymbolTableMarker> symbolTableMarkers = lookahead.getSymbolTableMarkers();
+        assertEquals(1, symbolTableMarkers.size());
+        assertEquals(8, symbolTableMarkers.get(0).startIndex);
+        assertEquals(12, symbolTableMarkers.get(0).endIndex);
+        assertEquals(13, lookahead.getValueStart());
+        assertIonTypeId(IonType.SYMBOL, 0x1, lookahead.getValueTid());
+        assertEquals(14, lookahead.getValueEnd());
+        lookahead.resetSymbolTableMarkers();
+        assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
+
+        lookahead.fillInput();
+        symbolTableMarkers = lookahead.getSymbolTableMarkers();
+        assertEquals(1, symbolTableMarkers.size());
+        assertEquals(18, symbolTableMarkers.get(0).startIndex);
+        assertEquals(25, symbolTableMarkers.get(0).endIndex);
+        assertEquals(26, lookahead.getValueStart());
+        assertIonTypeId(IonType.SYMBOL, 0x1, lookahead.getValueTid());
+        assertEquals(27, lookahead.getValueEnd());
+
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("x", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("y", reader.stringValue());
+
+        lookahead.fillInput();
+        symbolTableMarkers = lookahead.getSymbolTableMarkers();
+        assertEquals(2, symbolTableMarkers.size());
+        assertEquals(indexForInitialBufferSize(28, 28, 55), symbolTableMarkers.get(0).startIndex);
+        assertEquals(indexForInitialBufferSize(32, 32, 59), symbolTableMarkers.get(0).endIndex);
+        assertEquals(indexForInitialBufferSize(36, 36, 63), symbolTableMarkers.get(1).startIndex);
+        assertEquals(indexForInitialBufferSize(40, 40, 67), symbolTableMarkers.get(1).endIndex);
+        assertEquals(indexForInitialBufferSize(41, 41, 68), lookahead.getValueStart());
+        assertIonTypeId(IonType.SYMBOL, 0x1, lookahead.getValueTid());
+        assertEquals(indexForInitialBufferSize(42, 42, 69), lookahead.getValueEnd());
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("d", reader.stringValue());
+
+        assertTrue(lookahead.moreDataRequired());
+        reader.close();
+    }
+
+    @Test
+    public void nopPadFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
+        if (initialBufferSize == null || initialBufferSize != 1) {
+            return;
+        }
+        builder = IonBufferConfiguration.Builder.standard()
+            .withInitialBufferSize(9)
+            .withMaximumBufferSize(9);
+        createCountingEventHandler(builder, new AtomicLong());
+        lookahead = bufferFor(
+            0x03, 0x00, 0x00, 0x00, // 4 byte NOP pad.
+            0x21, 0x01 // Int 1.
+        );
+        // The IVM is 4 bytes and the NOP pad is 4 bytes. The first byte of the value is the 9th byte and fits in the
+        // buffer. Even though there is a 10th byte, the value should not be considered oversize because the NOP pad
+        // can be discarded.
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        lookahead.resetNopPadIndex();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        reader.close();
+    }
+
+    @Test
+    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors() throws Exception {
+        if (initialBufferSize == null || initialBufferSize != 1) {
+            return;
+        }
+        // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
+        builder = IonBufferConfiguration.Builder.standard()
+            .withInitialBufferSize(22)
+            .withMaximumBufferSize(22);
+        createCountingEventHandler(builder, new AtomicLong());
+        lookahead = bufferFor(
+            // One byte no-op pad.
+            0x00,
+            // Two byte no-op pad.
+            0x01, 0xFF,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // IVM 1.0
+            0xE0, 0x01, 0x00, 0xEA,
+            // 15-byte no-op pad.
+            0x0E, 0x8D,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // Symbol 10 (hello)
+            0x71, 0x0A
+        );
+
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("hello", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+    }
+}
diff --git a/test/com/amazon/ion/impl/IonReaderLookaheadBufferTestBase.java b/test/com/amazon/ion/impl/IonReaderLookaheadBufferTestBase.java
new file mode 100644
index 0000000000..98135f7e7c
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonReaderLookaheadBufferTestBase.java
@@ -0,0 +1,679 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.BufferConfiguration;
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonLob;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonText;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.runners.Parameterized.Parameter;
+import static org.junit.runners.Parameterized.Parameters;
+
+public abstract class IonReaderLookaheadBufferTestBase<
+    Configuration extends BufferConfiguration<Configuration>,
+    Builder extends BufferConfiguration.Builder<Configuration, Builder>
+> {
+
+    private static final IonSystem ION_SYSTEM = IonSystemBuilder.standard().build();
+    private static final Charset UTF_8 = Charset.forName("UTF-8");
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Parameters(name = "initialBufferSize={0}")
+    public static Iterable<Integer> initialBufferSizes() {
+        return Arrays.asList(1, 10, null);
+    }
+
+    @Parameter
+    public Integer initialBufferSize;
+
+    interface IonReaderAssertion {
+        void evaluate(IonReader reader);
+    }
+
+    static class Value {
+        byte[] stream;
+        IonReaderAssertion assertion;
+
+        Value(byte[] stream, IonReaderAssertion assertion) {
+            this.stream = stream;
+            this.assertion = assertion;
+        }
+    }
+
+    interface BuilderSupplier<
+        Configuration extends BufferConfiguration<Configuration>,
+        Builder extends BufferConfiguration.Builder<Configuration, Builder>
+    > {
+        Builder get();
+    }
+
+    BuilderSupplier<Configuration, Builder> builderSupplier = null;
+
+    abstract BuilderSupplier<Configuration, Builder> defaultBuilderSupplier();
+
+    @Before
+    public void setup() {
+        builderSupplier = defaultBuilderSupplier();
+    }
+
+    abstract ReaderLookaheadBufferBase build(Builder builder, InputStream inputStream);
+
+    abstract void createThrowingOversizedEventHandlers(Builder builder);
+    abstract void createCountingEventHandler(Builder builder, AtomicLong byteCount);
+
+    void readValuesOneByteAtATime(Value... values) throws Exception {
+        IonReader reader = null;
+        ResizingPipedInputStream input = new ResizingPipedInputStream(1);
+        Builder builder = builderSupplier.get();
+        if (initialBufferSize != null) {
+            builder.withInitialBufferSize(initialBufferSize);
+        }
+        ReaderLookaheadBufferBase lookahead = build(builder, input);
+        try {
+            for (Value value : values) {
+                for (int i = -1; i < value.stream.length; i++) {
+                    if (i >= 0) {
+                        input.receive(value.stream[i]);
+                        lookahead.fillInput();
+                    }
+                    assertEquals(i < value.stream.length - 1, lookahead.moreDataRequired());
+                }
+                if (reader == null) {
+                    reader = lookahead.newIonReader(IonReaderBuilder.standard());
+                }
+                value.assertion.evaluate(reader);
+            }
+        } finally {
+            if (reader != null) {
+                reader.close();
+            }
+        }
+    }
+
+    void readSingleValueOneByteAtATime(byte[] stream, IonReaderAssertion assertion) throws Exception {
+        readValuesOneByteAtATime(new Value(stream, assertion));
+    }
+
+    abstract byte[] toBytes(String textIon) throws IOException;
+    abstract byte[] intZeroWithoutIvm();
+
+    private void typedNull(final IonType type) throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes("null." + type.name().toLowerCase()),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(type, reader.next());
+                    assertTrue(reader.isNullValue());
+                }
+            }
+        );
+    }
+
+    @Test
+    public void nulls() throws Exception {
+        for (IonType type : IonType.values()) {
+            if (type == IonType.DATAGRAM) continue;
+            typedNull(type);
+        }
+    }
+
+    private void booleanValue(final boolean value) throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes("" + value),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.BOOL, reader.next());
+                    assertEquals(value, reader.booleanValue());
+                }
+            }
+        );
+    }
+
+    @Test
+    public void booleans() throws Exception {
+        booleanValue(true);
+        booleanValue(false);
+    }
+
+    private void integerValue(final int value) throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes("" + value),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.INT, reader.next());
+                    assertEquals(value, reader.intValue());
+                }
+            }
+        );
+    }
+
+    @Test
+    public void integers() throws Exception {
+        integerValue(0);
+        integerValue(-1);
+        integerValue(Integer.MAX_VALUE);
+        integerValue(Integer.MIN_VALUE);
+    }
+
+    private void floatValue(final String ion, final double value) throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes(ion),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.FLOAT, reader.next());
+                    assertEquals(value, reader.doubleValue(), 1e-9);
+                }
+            }
+        );
+    }
+
+    @Test
+    public void floats() throws Exception {
+        floatValue("0e0", 0.);
+        floatValue("nan", Double.NaN);
+        floatValue("+inf", Double.POSITIVE_INFINITY);
+        floatValue("-inf", Double.NEGATIVE_INFINITY);
+    }
+
+    private void decimalValue(final String ion, final Decimal value) throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes(ion),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.DECIMAL, reader.next());
+                    assertEquals(value, reader.decimalValue());
+                }
+            }
+        );
+    }
+
+    @Test
+    public void decimals() throws Exception {
+        decimalValue("0.", Decimal.ZERO);
+        decimalValue("-0.", Decimal.NEGATIVE_ZERO);
+        decimalValue("1000000000000.0", Decimal.valueOf(new BigDecimal("1000000000000.0")));
+    }
+
+    private void timestampValue(final Timestamp value) throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes(value.toString()),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.TIMESTAMP, reader.next());
+                    assertEquals(value, reader.timestampValue());
+                }
+            }
+        );
+    }
+
+    @Test
+    public void timestamps() throws Exception {
+        timestampValue(Timestamp.valueOf("2000T"));
+        timestampValue(Timestamp.valueOf("2000-01T"));
+        timestampValue(Timestamp.valueOf("2000-01-01"));
+        timestampValue(Timestamp.valueOf("2000-01-01T00:00Z"));
+        timestampValue(Timestamp.valueOf("2000-01-01T00:00:00Z"));
+        timestampValue(Timestamp.valueOf("2000-01-01T00:00:00.000Z"));
+        timestampValue(Timestamp.valueOf("2000-01-01T00:00:00.000-07:00"));
+    }
+
+    private void textValue(final IonText value) throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes(value.toString()),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(value.getType(), reader.next());
+                    assertEquals(value.stringValue(), reader.stringValue());
+                }
+            }
+        );
+    }
+
+    @Test
+    public void symbols() throws Exception {
+        // NOTE: these exercise skipping over a symbol table.
+        textValue(ION_SYSTEM.newSymbol(""));
+        textValue(ION_SYSTEM.newString("abc"));
+        textValue(ION_SYSTEM.newString("abcdefghijklmnopqrstuvwxyz0123456789"));
+    }
+
+    @Test
+    public void symbolWithUnknownText() throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes("$0"),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.SYMBOL, reader.next());
+                    SymbolToken symbolToken = reader.symbolValue();
+                    assertNull(symbolToken.getText());
+                    assertEquals(0, symbolToken.getSid());
+                }
+            }
+        );
+    }
+
+    @Test
+    public void strings() throws Exception {
+        textValue(ION_SYSTEM.newString(""));
+        textValue(ION_SYSTEM.newString("abc"));
+        textValue(ION_SYSTEM.newString("abcdefghijklmnopqrstuvwxyz0123456789"));
+    }
+
+    private void lobValue(final IonLob lob) throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes(lob.toString()),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(lob.getType(), reader.next());
+                    assertArrayEquals(lob.getBytes(), reader.newBytes());
+                }
+            }
+        );
+    }
+
+    @Test
+    public void clobs() throws Exception {
+        lobValue(ION_SYSTEM.newClob("a".getBytes(UTF_8)));
+        lobValue(ION_SYSTEM.newClob("abcdefghijklmnopqrstuvwxyz0123456789".getBytes(UTF_8)));
+    }
+
+    @Test
+    public void blobs() throws Exception {
+        lobValue(ION_SYSTEM.newBlob(new byte[]{}));
+        lobValue(ION_SYSTEM.newBlob(new byte[]{ 0x01 }));
+        lobValue(ION_SYSTEM.newBlob("abcdefghijklmnopqrstuvwxyz0123456789".getBytes(UTF_8)));
+    }
+
+    private void emptyContainer(final String ion, final IonType type) throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes(ion),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(type, reader.next());
+                    reader.stepIn();
+                    assertNull(reader.next());
+                    reader.stepOut();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void emptyContainers() throws Exception {
+        emptyContainer("[]", IonType.LIST);
+        emptyContainer("()", IonType.SEXP);
+        emptyContainer("{}", IonType.STRUCT);
+    }
+
+    @Test
+    public void annotations() throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes("abc::0"),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.INT, reader.next());
+                    String[] annotations = reader.getTypeAnnotations();
+                    assertEquals(1, annotations.length);
+                    assertEquals("abc", annotations[0]);
+                    assertEquals(0, reader.intValue());
+                }
+            }
+        );
+        readSingleValueOneByteAtATime(
+            toBytes("abc::abcdefghijklmnopqrstuvwxyz0123456789"),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.SYMBOL, reader.next());
+                    String[] annotations = reader.getTypeAnnotations();
+                    assertEquals(1, annotations.length);
+                    assertEquals("abc", annotations[0]);
+                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
+                }
+            }
+        );
+        readSingleValueOneByteAtATime(
+            toBytes("abc::def::abcdefghijklmnopqrstuvwxyz0123456789::\"abcdefghijklmnopqrstuvwxyz0123456789\""),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.STRING, reader.next());
+                    String[] annotations = reader.getTypeAnnotations();
+                    assertEquals(3, annotations.length);
+                    assertEquals("abc", annotations[0]);
+                    assertEquals("def", annotations[1]);
+                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", annotations[2]);
+                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
+                }
+            }
+        );
+    }
+
+    @Test
+    public void list() throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes("[-0., 2000T, (abc)]"),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.LIST, reader.next());
+                    reader.stepIn();
+                    assertEquals(IonType.DECIMAL, reader.next());
+                    assertEquals(Decimal.NEGATIVE_ZERO, reader.decimalValue());
+                    assertEquals(IonType.TIMESTAMP, reader.next());
+                    assertEquals(Timestamp.valueOf("2000T"), reader.timestampValue());
+                    assertEquals(IonType.SEXP, reader.next());
+                    assertNull(reader.next());
+                    reader.stepOut();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void sexp() throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes("'123'::($ion_symbol_table::{} abcdefghijklmnopqrstuvwxyz0123456789)"),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.SEXP, reader.next());
+                    String[] annotations = reader.getTypeAnnotations();
+                    assertEquals(1, annotations.length);
+                    assertEquals("123", annotations[0]);
+                    reader.stepIn();
+                    assertEquals(IonType.STRUCT, reader.next());
+                    annotations = reader.getTypeAnnotations();
+                    assertEquals(1, annotations.length);
+                    assertEquals("$ion_symbol_table", annotations[0]);
+                    reader.stepIn();
+                    assertNull(reader.next());
+                    reader.stepOut();
+                    assertEquals(IonType.SYMBOL, reader.next());
+                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
+                    assertNull(reader.next());
+                    reader.stepOut();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void struct() throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes("{'':[-1], a:b::nan, xyz:null.clob, bool:true}"),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.STRUCT, reader.next());
+                    reader.stepIn();
+                    assertEquals(IonType.LIST, reader.next());
+                    assertEquals("", reader.getFieldName());
+                    reader.stepIn();
+                    assertEquals(IonType.INT, reader.next());
+                    assertEquals(-1, reader.intValue());
+                    assertNull(reader.next());
+                    reader.stepOut();
+                    assertEquals(IonType.FLOAT, reader.next());
+                    assertEquals("a", reader.getFieldName());
+                    String[] annotations = reader.getTypeAnnotations();
+                    assertEquals(1, annotations.length);
+                    assertEquals("b", annotations[0]);
+                    assertEquals(Double.NaN, reader.doubleValue(), 1e-9);
+                    assertEquals(IonType.CLOB, reader.next());
+                    assertTrue(reader.isNullValue());
+                    assertEquals(IonType.BOOL, reader.next());
+                    assertEquals("bool", reader.getFieldName());
+                    assertTrue(reader.booleanValue());
+                    assertNull(reader.next());
+                    reader.stepOut();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void multipleTopLevelScalars() throws Exception {
+        readValuesOneByteAtATime(
+            new Value(
+                toBytes("abc"),
+                new IonReaderAssertion() {
+                    @Override
+                    public void evaluate(IonReader reader) {
+                        assertEquals(IonType.SYMBOL, reader.next());
+                        assertEquals("abc", reader.stringValue());
+                    }
+                }
+            ),
+            new Value(
+                intZeroWithoutIvm(),
+                new IonReaderAssertion() {
+                    @Override
+                    public void evaluate(IonReader reader) {
+                        assertEquals(IonType.INT, reader.next());
+                        assertEquals(0, reader.intValue());
+                    }
+                }
+            )
+        );
+    }
+
+    @Test
+    public void multipleTopLevelValuesWithSystemValuesInBetween() throws Exception {
+        readValuesOneByteAtATime(
+            new Value(
+                toBytes("0e0"),
+                new IonReaderAssertion() {
+                    @Override
+                    public void evaluate(IonReader reader) {
+                        assertEquals(IonType.FLOAT, reader.next());
+                        assertEquals(0., reader.doubleValue(), 0e-9);
+                    }
+                }
+            ),
+            new Value(
+                toBytes("abcdefghijklmnopqrstuvwxyz0123456789"), // Includes an IVM and symbol table.
+                new IonReaderAssertion() {
+                    @Override
+                    public void evaluate(IonReader reader) {
+                        assertEquals(IonType.SYMBOL, reader.next());
+                        assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
+                    }
+                }
+            ),
+            new Value(
+                toBytes("{foo:abc::2001-01T}"), // Includes an IVM and symbol table.
+                new IonReaderAssertion() {
+                    @Override
+                    public void evaluate(IonReader reader) {
+                        assertEquals(IonType.STRUCT, reader.next());
+                        reader.stepIn();
+                        assertEquals(IonType.TIMESTAMP, reader.next());
+                        assertEquals("foo", reader.getFieldName());
+                        String[] annotations = reader.getTypeAnnotations();
+                        assertEquals(1, annotations.length);
+                        assertEquals("abc", annotations[0]);
+                        assertEquals(Timestamp.valueOf("2001-01T"), reader.timestampValue());
+                        assertNull(reader.next());
+                        reader.stepOut();
+                    }
+                }
+            )
+        );
+    }
+
+    @Test
+    public void multipleTopLevelContainers() throws Exception {
+        readValuesOneByteAtATime(
+            new Value(
+                toBytes("{foo:abc::2001-01T}"),
+                new IonReaderAssertion() {
+                    @Override
+                    public void evaluate(IonReader reader) {
+                        assertEquals(IonType.STRUCT, reader.next());
+                        reader.stepIn();
+                        assertEquals(IonType.TIMESTAMP, reader.next());
+                        assertEquals("foo", reader.getFieldName());
+                        String[] annotations = reader.getTypeAnnotations();
+                        assertEquals(1, annotations.length);
+                        assertEquals("abc", annotations[0]);
+                        assertEquals(Timestamp.valueOf("2001-01T"), reader.timestampValue());
+                        assertNull(reader.next());
+                        reader.stepOut();
+                    }
+                }
+            ),
+            new Value(
+                toBytes("[{foo:bar}, (baz zar), 123]"),
+                new IonReaderAssertion() {
+                    @Override
+                    public void evaluate(IonReader reader) {
+                        assertEquals(IonType.LIST, reader.next());
+                        reader.stepIn();
+                        assertEquals(IonType.STRUCT, reader.next());
+                        reader.stepIn();
+                        assertEquals(IonType.SYMBOL, reader.next());
+                        assertEquals("foo", reader.getFieldName());
+                        assertEquals("bar", reader.stringValue());
+                        reader.stepOut();
+                        assertEquals(IonType.SEXP, reader.next());
+                        assertEquals(IonType.INT, reader.next());
+                        assertEquals(123, reader.intValue());
+                        assertNull(reader.next());
+                        reader.stepOut();
+                    }
+                }
+            ),
+            new Value(
+                toBytes("()"),
+                new IonReaderAssertion() {
+                    @Override
+                    public void evaluate(IonReader reader) {
+                        assertEquals(IonType.SEXP, reader.next());
+                        reader.stepIn();
+                        assertNull(reader.next());
+                        reader.stepOut();
+                    }
+                }
+            )
+        );
+    }
+
+    @Test
+    public void symbolTableAnnotationOnNonSymbolTable() throws Exception {
+        readSingleValueOneByteAtATime(
+            toBytes("$ion_symbol_table::[123]"),
+            new IonReaderAssertion() {
+                @Override
+                public void evaluate(IonReader reader) {
+                    assertEquals(IonType.LIST, reader.next());
+                    String[] annotations = reader.getTypeAnnotations();
+                    assertEquals(1, annotations.length);
+                    assertEquals("$ion_symbol_table", annotations[0]);
+                    reader.stepIn();
+                    assertEquals(IonType.INT, reader.next());
+                    assertEquals(123, reader.intValue());
+                    reader.stepOut();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void handlerWithUnlimitedMaxSizeCountsBytesProcessed() throws Exception {
+        final AtomicLong totalBytesProcessed = new AtomicLong();
+        builderSupplier = new BuilderSupplier<Configuration, Builder>() {
+            @Override
+            public Builder get() {
+                Builder builder = defaultBuilderSupplier().get();
+                builder.withMaximumBufferSize(Integer.MAX_VALUE);
+                createCountingEventHandler(builder, totalBytesProcessed);
+                return builder;
+            }
+        };
+        byte[] valueBytes = toBytes("[{foo:bar}, (baz zar), 123]");
+        readValuesOneByteAtATime(
+            new Value(
+                valueBytes,
+                new IonReaderAssertion() {
+                    @Override
+                    public void evaluate(IonReader reader) {
+                        assertEquals(IonType.LIST, reader.next());
+                        reader.stepIn();
+                        assertEquals(IonType.STRUCT, reader.next());
+                        reader.stepIn();
+                        assertEquals(IonType.SYMBOL, reader.next());
+                        assertEquals("foo", reader.getFieldName());
+                        assertEquals("bar", reader.stringValue());
+                        reader.stepOut();
+                        assertEquals(IonType.SEXP, reader.next());
+                        assertEquals(IonType.INT, reader.next());
+                        assertEquals(123, reader.intValue());
+                        assertNull(reader.next());
+                        reader.stepOut();
+                    }
+                }
+            )
+        );
+        assertEquals(valueBytes.length, totalBytesProcessed.longValue());
+    }
+
+    @Test
+    public void errorOnSpecifiedMaxSizeAndNullHandler() {
+        thrown.expect(IllegalArgumentException.class);
+        build(
+            builderSupplier.get()
+                .withMaximumBufferSize(10)
+                .onOversizedValue(null),
+            new ByteArrayInputStream(new byte[]{})
+        );
+    }
+
+    @Test
+    public void errorOnMaximumSizeLessThanFive() {
+        Builder builder = builderSupplier.get();
+        int minimumMaximumBufferSize = builder.getMinimumMaximumBufferSize();
+        builder.withMaximumBufferSize(minimumMaximumBufferSize - 1);
+        createThrowingOversizedEventHandlers(builder);
+        thrown.expect(IllegalArgumentException.class);
+        build(
+            builder,
+            new ByteArrayInputStream(new byte[]{})
+        );
+    }
+}
diff --git a/test/com/amazon/ion/impl/ResizingPipedInputStreamTest.java b/test/com/amazon/ion/impl/ResizingPipedInputStreamTest.java
new file mode 100644
index 0000000000..126476ac8b
--- /dev/null
+++ b/test/com/amazon/ion/impl/ResizingPipedInputStreamTest.java
@@ -0,0 +1,789 @@
+package com.amazon.ion.impl;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.EOFException;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.BufferOverflowException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+import static com.amazon.ion.BitUtils.bytes;
+import static org.junit.Assert.assertTrue;
+import static org.junit.runners.Parameterized.Parameter;
+import static org.junit.runners.Parameterized.Parameters;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class ResizingPipedInputStreamTest {
+
+    private enum ReceiveMethod {
+        BYTE_ARRAY {
+            @Override
+            void receive(ResizingPipedInputStream input, byte[] bytes, int off, int len) {
+                if (off == 0 && len == bytes.length) {
+                    // Not necessary, but provides coverage of this method.
+                    input.receive(bytes);
+                } else {
+                    input.receive(bytes, off, len);
+                }
+            }
+        },
+        INDIVIDUAL_BYTES {
+            @Override
+            void receive(ResizingPipedInputStream input, byte[] bytes, int off, int len) {
+                for (int i = off; i < off + len; i++) {
+                    input.receive(bytes[i]);
+                }
+            }
+        },
+        INPUT_STREAM {
+            @Override
+            void receive(ResizingPipedInputStream input, byte[] bytes, int off, int len) throws IOException {
+                byte[] subset = bytes;
+                if (off > 0) {
+                    int subsetLen = bytes.length - off;
+                    subset = new byte[subsetLen];
+                    System.arraycopy(bytes, off, subset, 0, subsetLen);
+                }
+                ByteArrayInputStream inputStream = new ByteArrayInputStream(subset);
+                assertEquals(len, input.receive(inputStream, len));
+            }
+        }
+        ;
+
+        abstract void receive(ResizingPipedInputStream input, byte[] bytes, int off, int len) throws IOException;
+    }
+
+    @Parameters(name = "initialSize={0}, receive={1}, boundary={2}")
+    public static Iterable<Object[]> bufferSizes() {
+        List<Object[]> parameters = new ArrayList<Object[]>();
+        for (int initialSize : Arrays.asList(1, 2, 3, 4, 5, 6, 7)) {
+            for (ReceiveMethod receiveMethod : ReceiveMethod.values()) {
+                parameters.add(new Object[]{initialSize, receiveMethod, true});
+                parameters.add(new Object[]{initialSize, receiveMethod, false});
+            }
+        }
+        return parameters;
+    }
+
+    @Parameter
+    public int bufferSize;
+
+    @Parameter(1)
+    public ReceiveMethod receiveMethod;
+
+    @Parameter(2)
+    public boolean useBoundary;
+
+    public ResizingPipedInputStream input;
+    public int knownCapacity;
+
+    @Before
+    public void setup() {
+        input = new ResizingPipedInputStream(bufferSize, Integer.MAX_VALUE, useBoundary);
+        knownCapacity = input.capacity();
+    }
+
+    private void handleBoundary(int len) {
+        if (useBoundary) {
+            assertTrue(input.available() <= input.size());
+            assertEquals(len, input.availableBeyondBoundary());
+            assertTrue(input.getBoundary() <= input.getWriteIndex());
+            input.extendBoundary(len);
+        }
+        assertEquals(input.available(), input.size());
+        assertEquals(input.getBoundary(), input.getWriteIndex());
+        assertEquals(0, input.availableBeyondBoundary());
+    }
+
+    private void receive(int b) {
+        input.receive(b);
+        handleBoundary(1);
+    }
+
+    private void receive(byte[] bytes, int off, int len) throws IOException {
+        receiveMethod.receive(input, bytes, off, len);
+        handleBoundary(len);
+    }
+
+    private void receive(byte[] bytes) throws IOException {
+        receive(bytes, 0, bytes.length);
+    }
+
+    private int receive(InputStream stream, int len) throws IOException {
+        int received = input.receive(stream, len);
+        handleBoundary(received);
+        return received;
+    }
+
+    // Asserts that growth (since the start of the test or the last time this method was called) only occurs
+    // if the initial buffer size less than the given threshold.
+    private void assertGrowthThreshold(int growthThreshold) {
+        if (bufferSize < growthThreshold) {
+            assertTrue("Growth was expected but did not occur.", knownCapacity < input.capacity());
+        } else {
+            assertEquals("Growth occurred but was not expected.", knownCapacity, input.capacity());
+        }
+        knownCapacity = input.capacity();
+    }
+
+    // Asserts that growth (since the start of the test or the last time this method was called) did not occur.
+    private void assertNoGrowth() {
+        assertGrowthThreshold(0);
+    }
+
+    @Test
+    public void basicWriteRead() throws Exception {
+        assertEquals(0, input.available());
+        receive(1);
+        assertNoGrowth();
+        assertEquals(1, input.available());
+        assertEquals(1, input.read());
+        assertEquals(0, input.available());
+        receive(bytes(2, 3), 0, 2);
+        assertGrowthThreshold(2);
+        assertEquals(2, input.available());
+        byte[] readTwo = new byte[2];
+        assertEquals(2, input.read(readTwo));
+        assertArrayEquals(bytes(2, 3), readTwo);
+        assertEquals(0, input.available());
+    }
+
+    @Test
+    public void alternatingWriteRead() throws Exception {
+        receive((byte) 1);
+        assertNoGrowth();
+        assertEquals(1, input.read());
+        receive(bytes(2, 3));
+        assertGrowthThreshold(2);
+        assertEquals(2, input.read(new byte[2]));
+        receive(bytes(4, 5, 6));
+        assertGrowthThreshold(3);
+        assertEquals(3, input.read(new byte[3]));
+        receive(bytes(14, 15));
+        assertNoGrowth();
+        assertEquals(2, input.read(new byte[2]));
+        receive(bytes(16));
+        assertNoGrowth();
+        assertEquals(16, input.read());
+    }
+
+    @Test
+    public void consecutiveReads() throws Exception {
+        assertEquals(0, input.available());
+        receive(bytes(1, 2, 3), 0, 3);
+        assertGrowthThreshold(3);
+        assertEquals(3, input.available());
+        assertEquals(1, input.read());
+        assertEquals(2, input.available());
+        assertEquals(2, input.read());
+        assertEquals(1, input.available());
+        assertEquals(3, input.read());
+        assertEquals(0, input.available());
+    }
+
+    @Test
+    public void consecutiveSkips() throws Exception {
+        assertEquals(0, input.available());
+        receive(bytes(1, 2, 3), 0, 3);
+        assertGrowthThreshold(3);
+        assertEquals(3, input.available());
+        assertEquals(1, input.skip(1));
+        assertEquals(2, input.available());
+        assertEquals(1, input.skip(1));
+        assertEquals(1, input.available());
+        assertEquals(1, input.skip(1));
+        assertEquals(0, input.available());
+    }
+
+    @Test
+    public void growsMultipleTimesOnOneWrite() throws Exception {
+        // Grows multiple times when the buffer size is less than 3.
+        receive(bytes(1, 2, 3, 4, 5), 0, 5);
+        assertGrowthThreshold(5);
+        assertEquals(5, input.available());
+        byte[] readFive = new byte[5];
+        assertEquals(5, input.read(readFive));
+        assertArrayEquals(bytes(1, 2, 3, 4, 5), readFive);
+        assertEquals(0, input.available());
+    }
+
+    @Test
+    public void returnsNegativeOneFromRead() throws Exception {
+        assertEquals(0, input.available());
+        assertEquals(-1, input.read());
+        assertEquals(0, input.available());
+        assertEquals(-1, input.read(new byte[5]));
+        assertEquals(0, input.available());
+        assertNoGrowth();
+    }
+
+    @Test
+    public void readsLessBytesThanRequested() throws Exception {
+        receive(bytes(1, 2, 3, 4, 5));
+        assertGrowthThreshold(5);
+        assertEquals(5, input.available());
+        byte[] tryReadSix = bytes(0, 0, 0, 0, 0, 42);
+        assertEquals(5, input.read(tryReadSix));
+        assertArrayEquals(bytes(1, 2, 3, 4, 5, 42), tryReadSix);
+        assertEquals(0, input.available());
+    }
+
+    @Test
+    public void skipsLessBytesThanRequested() throws Exception {
+        receive(bytes(1));
+        assertEquals(1, input.skip(10));
+        assertEquals(-1, input.read());
+        assertEquals(0, input.available());
+        assertEquals(0, input.skip(1));
+        assertNoGrowth();
+    }
+
+    @Test
+    public void skipsLessBytesThanRequestedLongMaxValue() throws Exception {
+        receive(bytes(1, 2, 3, 4, 5));
+        assertGrowthThreshold(5);
+        assertEquals(5, input.skip(Long.MAX_VALUE));
+        assertEquals(-1, input.read());
+        assertEquals(0, input.available());
+        assertEquals(0, input.skip(1));
+        assertNoGrowth();
+    }
+
+    @Test
+    public void skipsLessBytesThanRequestedWhenEmpty() throws Exception {
+        assertEquals(0, input.skip(10));
+        receive( bytes(1));
+        assertEquals(1, input.read());
+        assertNoGrowth();
+    }
+
+    @Test
+    public void receiveSubsetOfBufferAfterStart() throws Exception {
+        receive(bytes(1, 2, 3, 4), 1, 3);
+        assertGrowthThreshold(3);
+        assertEquals(3, input.available());
+        byte[] readThree = new byte[3];
+        assertEquals(3, input.read(readThree));
+        assertArrayEquals(bytes(2, 3, 4), readThree);
+        assertEquals(0, input.available());
+    }
+
+    @Test
+    public void receiveSubsetOfBufferBeforeEnd() throws Exception {
+        receive(bytes(1, 2, 3, 4), 1, 2);
+        assertGrowthThreshold(2);
+        assertEquals(2, input.available());
+        byte[] readTwo = new byte[2];
+        assertEquals(2, input.read(readTwo));
+        assertArrayEquals(bytes(2, 3), readTwo);
+        assertEquals(0, input.available());
+    }
+
+    @Test
+    public void receiveLessBytesThanRequestedFromInputStream() throws Exception {
+        receive(bytes(1, 2));
+        assertGrowthThreshold(2);
+        ByteArrayInputStream source = new ByteArrayInputStream(new byte[]{3, 4});
+        assertEquals(2, receive(source, 3));
+        assertEquals(4, input.available());
+        byte[] readFour = new byte[4];
+        assertEquals(4, input.read(readFour));
+        assertArrayEquals(bytes(1, 2, 3, 4), readFour);
+        assertEquals(0, input.available());
+    }
+
+    @Test
+    public void readZeroReturnsZero() throws Exception {
+        receive( bytes(42));
+        assertEquals(1, input.available());
+        assertEquals(0, input.read(new byte[0]));
+        assertEquals(0, input.read(new byte[5], 0, 0));
+        assertEquals(1, input.available());
+        assertNoGrowth();
+    }
+
+    @Test
+    public void skipZeroReturnsZero() throws Exception {
+        receive(bytes(42));
+        assertEquals(1, input.available());
+        assertEquals(0, input.skip(0));
+        assertEquals(1, input.available());
+        assertNoGrowth();
+    }
+
+    @Test
+    public void readReturnsToStart() throws Exception {
+        receive(bytes(1, 2));
+        assertGrowthThreshold(2);
+        assertEquals(1, input.read());
+        assertEquals(2, input.read());
+        assertEquals(0, input.available());
+        assertEquals(-1, input.read());
+        // Because there are no un-read bytes, the following should write at the beginning of the buffer and
+        // set the write and read indexes appropriately.
+        receive(bytes(3));
+        assertNoGrowth();
+        assertEquals(1, input.available());
+        assertEquals(3, input.read());
+    }
+
+    @Test
+    public void skipReturnsToStart() throws Exception {
+        receive(bytes(1, 2));
+        assertGrowthThreshold(2);
+        assertEquals(1, input.skip(1));
+        assertEquals(1, input.skip(1));
+        assertEquals(0, input.available());
+        assertEquals(-1, input.read());
+        // Because there are no un-read bytes, the following should write at the beginning of the buffer and
+        // set the write and read indexes appropriately.
+        receive(bytes(3));
+        assertNoGrowth();
+        assertEquals(1, input.available());
+        assertEquals(1, input.skip(1));
+    }
+
+    @Test
+    public void skipsAndReads() throws Exception {
+        receive(bytes(1, 42, 2, 42, 42, 3, 4, 42, 42, 42, 5, 6, 7));
+        assertEquals(1, input.read());
+        assertEquals(1, input.skip(1));
+        assertEquals(2, input.read());
+        assertEquals(2, input.skip(2));
+        byte[] readTwo = new byte[2];
+        assertEquals(2, input.read(readTwo));
+        assertArrayEquals(bytes(3, 4), readTwo);
+        assertEquals(3, input.skip(3));
+        byte[] readThree = new byte[3];
+        assertEquals(3, input.read(readThree));
+        assertArrayEquals(bytes(5, 6, 7), readThree);
+        assertEquals(0, input.skip(1));
+        assertEquals(-1, input.read());
+        assertEquals(0, input.available());
+    }
+
+    @Test
+    public void rewind() throws Exception {
+        receive(bytes(1, 2, 3));
+        assertEquals(1, input.read());
+        int available = input.available();
+        int readIndex = input.getReadIndex();
+        int size = input.size();
+        assertEquals(2, input.read());
+        assertEquals(3, input.read());
+        input.rewind(readIndex, available);
+        assertEquals(available, input.available());
+        assertEquals(readIndex, input.getReadIndex());
+        assertEquals(size, input.size());
+        assertEquals(2, input.read());
+        assertEquals(3, input.read());
+        assertEquals(-1, input.read());
+        assertEquals(0, input.available());
+        input.rewind(0, 3);
+        assertEquals(3, input.available());
+        assertEquals(3, input.size());
+        assertEquals(0, input.availableBeyondBoundary());
+        assertEquals(0, input.getReadIndex());
+        byte[] readThree = new byte[3];
+        assertEquals(3, input.read(readThree));
+        assertArrayEquals(bytes(1, 2, 3), readThree);
+
+    }
+
+    private void assertCopyEquals(byte[] expected) throws Exception {
+        final int startAvailable = input.available();
+        final int startReadIndex = input.getReadIndex();
+        final int startCapacity = input.capacity();
+        ByteArrayOutputStream copiedBytes = new ByteArrayOutputStream();
+        input.copyTo(copiedBytes);
+        assertArrayEquals(expected, copiedBytes.toByteArray());
+        // copyTo never mutates internal state.
+        assertEquals(startAvailable, input.available());
+        assertEquals(startReadIndex, input.getReadIndex());
+        assertEquals(startCapacity, input.capacity());
+    }
+
+    @Test
+    public void copyTo() throws Exception {
+        byte[] data = bytes(1, 2, 3, 4, 5);
+        receive(data);
+        assertCopyEquals(data);
+        assertEquals(1, input.read());
+        assertCopyEquals(bytes(2, 3, 4, 5));
+        assertEquals(2, input.read());
+        assertCopyEquals(bytes(3, 4, 5));
+        assertEquals(3, input.read());
+        assertCopyEquals(bytes(4, 5));
+        assertEquals(4, input.read());
+        assertCopyEquals(bytes(5));
+        assertEquals(5, input.read());
+        assertCopyEquals(bytes());
+        receive(bytes(6));
+        assertCopyEquals(bytes(6));
+        receive(bytes(7, 8));
+        assertEquals(6, input.read());
+        assertCopyEquals(bytes(7, 8));
+        assertCopyEquals(bytes(7, 8));
+        assertEquals(7, input.read());
+        assertCopyEquals(bytes(8));
+        assertEquals(8, input.read());
+        assertCopyEquals(bytes());
+    }
+
+    @Test
+    public void truncate() throws Exception {
+        int markedAvailable = input.available();
+        int markedWriteIndex = input.getWriteIndex();
+        receive(bytes(9, 9));
+        input.truncate(markedWriteIndex, markedAvailable);
+        assertEquals(0, input.available());
+        receive(bytes(1, 2));
+        markedAvailable = input.available();
+        markedWriteIndex = input.getWriteIndex();
+        receive(bytes(9, 9, 9, 9, 9));
+        input.truncate(markedWriteIndex, markedAvailable);
+        assertEquals(2, input.available());
+        receive(bytes(3, 4, 5));
+        markedAvailable = input.available();
+        markedWriteIndex = input.getWriteIndex();
+        input.truncate(markedWriteIndex, markedAvailable);
+        assertEquals(5, input.available());
+        byte[] readFive = new byte[5];
+        assertEquals(5, input.read(readFive));
+        assertArrayEquals(bytes(1, 2, 3, 4, 5), readFive);
+        assertEquals(0, input.available());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void errorsOnInvalidInitialBufferSize() {
+        new ResizingPipedInputStream(0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void errorsOnInvalidMaximumBufferSize() {
+        new ResizingPipedInputStream(10, 9, useBoundary);
+    }
+
+    @Test
+    public void initialBufferSizeAndCapacity() {
+        assertEquals(bufferSize, input.getInitialBufferSize());
+        assertEquals(bufferSize, input.capacity());
+    }
+
+    private static class ThrowingInputStream extends FilterInputStream {
+
+        ThrowingInputStream(InputStream in) {
+            super(in);
+        }
+
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            throw new EOFException();
+        }
+    }
+
+    @Test
+    public void receiveOfThrowingInputStreamDoesNotThrow() throws Exception {
+        // Tests that InputStream implementations that throw EOFException when too many bytes are requested do not
+        // cause ResizingPipedInputStream.receive to throw.
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        out.write("abc".getBytes("UTF-8"));
+        InputStream in = new ThrowingInputStream(new ByteArrayInputStream(out.toByteArray()));
+        assertEquals(0, receive(in, 100));
+        in.close();
+    }
+
+    @Test
+    public void receiveOfPartialGzipStreamDoesNotThrow() throws Exception {
+        // Similar to the previous test, but specifically tests with GZIPInputStream since it is probably the most
+        // commonly-used InputStream implementation that has been known to exhibit this behavior.
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        OutputStream gzipOut = new GZIPOutputStream(out);
+        gzipOut.write("abc".getBytes("UTF-8"));
+        gzipOut.close();
+        byte[] completeGzip = out.toByteArray();
+        // Cutting off 7 bytes removes part of the GZIP trailer.
+        byte[] truncatedGzip = new byte[completeGzip.length - 7];
+        System.arraycopy(completeGzip, 0, truncatedGzip, 0, truncatedGzip.length);
+        InputStream gzipIn = new GZIPInputStream(new ByteArrayInputStream(truncatedGzip));
+        // Ask for more bytes than are available. The GZIPInputStream will throw EOFException because the trailer
+        // is incomplete. The ResizingPipedInputStream should handle this exception in the same way as a
+        // graceful EOF conveyed by any other InputStream implementation. Since only the trailer was missing, all
+        // three data bytes will be read.
+        assertEquals(3, receive(gzipIn, 100));
+        assertEquals(0, receive(gzipIn, 100));
+        byte[] bytesRead = new byte[3];
+        assertEquals(3, input.read(bytesRead));
+        assertEquals("abc", new String(bytesRead, "UTF-8"));
+        gzipIn.close();
+    }
+
+    @Test
+    public void seekTo() throws Exception {
+        receive(bytes(1, 2, 3));
+        assertEquals(3, input.available());
+        assertEquals(1, input.read());
+        assertEquals(2, input.available());
+        input.seekTo(0);
+        assertEquals(3, input.available());
+        input.seekTo(2);
+        assertEquals(1, input.available());
+        assertEquals(3, input.read());
+        assertEquals(0, input.available());
+        input.seekTo(1);
+        assertEquals(2, input.available());
+        assertEquals(2, input.read());
+        input.seekTo(3);
+        assertEquals(0, input.available());
+        assertEquals(-1, input.read());
+        input.seekTo(0);
+        assertEquals(3, input.available());
+        byte[] readThree = new byte[3];
+        assertEquals(3, input.read(readThree));
+        assertArrayEquals(bytes(1, 2, 3), readThree);
+        assertEquals(0, input.available());
+        input.seekTo(3);
+        assertEquals(0, input.available());
+    }
+
+    @Test
+    public void clear() throws Exception {
+        receive(bytes(1, 2, 3));
+        assertEquals(1, input.read());
+        input.clear();
+        assertEquals(-1, input.read());
+        assertEquals(0, input.available());
+        receive(bytes(4, 5, 6));
+        assertEquals(3, input.available());
+        byte[] readThree = new byte[3];
+        assertEquals(3, input.read(readThree));
+        assertArrayEquals(bytes(4, 5, 6), readThree);
+        assertEquals(0, input.available());
+        input.clear();
+        assertEquals(-1, input.read());
+        assertEquals(0, input.available());
+    }
+
+    @Test
+    public void getByteBuffer() throws Exception {
+        receive((byte) 1);
+        java.nio.ByteBuffer byteBuffer = input.getByteBuffer(0, 1);
+        assertEquals(1, byteBuffer.get());
+        receive(bytes(2, 3));
+        byteBuffer = input.getByteBuffer(0, 3);
+        byte[] bytes = new byte[3];
+        byteBuffer.get(bytes);
+        assertArrayEquals(new byte[]{1, 2, 3}, bytes);
+        receive(bytes(4, 5, 6));
+        bytes = new byte[3];
+        byteBuffer = input.getByteBuffer(3, 6);
+        byteBuffer.get(bytes);
+        assertArrayEquals(new byte[]{4, 5, 6}, bytes);
+    }
+
+    @Test
+    public void boundary() throws Exception {
+        if (!useBoundary) {
+            return;
+        }
+        input.receive(bytes(1, 2, 3));
+        assertEquals(1, input.peek(0));
+        assertEquals(2, input.peek(1));
+        assertEquals(3, input.peek(2));
+        byte[] twoThree = new byte[2];
+        input.copyBytes(1, twoThree, 0, 2);
+        assertArrayEquals(bytes(2, 3), twoThree);
+        // The boundary has not been extended, so bytes are available through the InputStream interface.
+        assertEquals(0, input.available());
+        assertEquals(0, input.getBoundary());
+        assertEquals(-1, input.read());
+        // size() indicates the total number of bytes.
+        assertEquals(3, input.size());
+        assertEquals(3, input.availableBeyondBoundary());
+        // Now extend the boundary and verify bytes become available.
+        input.extendBoundary(1);
+        assertEquals(1, input.getBoundary());
+        assertEquals(1, input.available());
+        assertEquals(2, input.availableBeyondBoundary());
+        assertEquals(3, input.size());
+        assertEquals(1, input.read());
+        input.extendBoundary(2);
+        assertEquals(3, input.getBoundary());
+        assertEquals(2, input.available());
+        assertEquals(0, input.availableBeyondBoundary());
+        assertEquals(2, input.size());
+        twoThree = new byte[2];
+        assertEquals(2, input.read(twoThree));
+        assertArrayEquals(bytes(2, 3), twoThree);
+        assertEquals(0, input.available());
+        assertEquals(0, input.availableBeyondBoundary());
+        assertEquals(0, input.size());
+        input.receive(4);
+        assertEquals(0, input.available());
+        assertEquals(1, input.availableBeyondBoundary());
+        assertEquals(1, input.size());
+        byte[] fourFive = new byte[3];
+        assertEquals(-1, input.read(fourFive));
+        assertArrayEquals(bytes(0, 0, 0), fourFive);
+        input.receive(5);
+        assertEquals(0, input.available());
+        assertEquals(2, input.availableBeyondBoundary());
+        assertEquals(2, input.size());
+        input.extendBoundary(1);
+        assertEquals(1, input.available());
+        assertEquals(1, input.availableBeyondBoundary());
+        assertEquals(2, input.size());
+        assertEquals(1, input.read(fourFive));
+        assertArrayEquals(bytes(4, 0, 0), fourFive);
+        assertEquals(0, input.available());
+        assertEquals(1, input.availableBeyondBoundary());
+        assertEquals(1, input.size());
+        input.extendBoundary(1);
+        assertEquals(1, input.available());
+        assertEquals(0, input.availableBeyondBoundary());
+        assertEquals(1, input.size());
+        assertEquals(1, input.read(fourFive, 1, 2));
+        assertArrayEquals(bytes(4, 5, 0), fourFive);
+        assertEquals(0, input.available());
+        assertEquals(0, input.availableBeyondBoundary());
+        assertEquals(0, input.size());
+    }
+
+    @Test
+    public void rewindWithBoundary() throws Exception {
+        if (!useBoundary) {
+            return;
+        }
+        input.receive(bytes(1, 2, 3));
+        input.extendBoundary(2);
+        assertEquals(1, input.read());
+        int available = input.available();
+        int readIndex = input.getReadIndex();
+        int size = input.size();
+        int availableBeyondBoundary = input.availableBeyondBoundary();
+        assertEquals(2, input.read());
+        assertEquals(1, input.availableBeyondBoundary());
+        input.rewind(readIndex, available);
+        assertEquals(available, input.available());
+        assertEquals(readIndex, input.getReadIndex());
+        assertEquals(size, input.size());
+        assertEquals(availableBeyondBoundary, input.availableBeyondBoundary());
+        assertEquals(2, input.read());
+        assertEquals(0, input.available());
+        assertEquals(1, input.availableBeyondBoundary());
+        input.extendBoundary(1);
+        assertEquals(3, input.read());
+        assertEquals(0, input.available());
+        assertEquals(0, input.availableBeyondBoundary());
+        assertEquals(-1, input.read());
+        input.rewind(0, 3);
+        assertEquals(3, input.available());
+        assertEquals(0, input.availableBeyondBoundary());
+        assertEquals(0, input.getReadIndex());
+        assertEquals(3, input.getBoundary());
+        byte[] readThree = new byte[3];
+        assertEquals(3, input.read(readThree));
+        assertArrayEquals(bytes(1, 2, 3), readThree);
+    }
+
+    @Test
+    public void consolidate() throws Exception {
+        receive(bytes(1, 2, 98, 99, 3));
+        assertEquals(5, input.available());
+        assertEquals(5, input.size());
+        input.consolidate(4, 2);
+        assertEquals(3, input.available());
+        assertEquals(3, input.size());
+        byte[] readThree = new byte[3];
+        assertEquals(3, input.read(readThree));
+        assertArrayEquals(bytes(1, 2, 3), readThree);
+        receive(bytes(4, 5));
+        assertEquals(2, input.available());
+        assertEquals(2, input.size());
+        input.consolidate(input.getWriteIndex() - 1, input.getReadIndex());
+        assertEquals(1, input.available());
+        assertEquals(1, input.size());
+        assertEquals(5, input.read());
+        receive(bytes(6));
+        assertEquals(1, input.available());
+        assertEquals(1, input.size());
+        input.consolidate(input.getWriteIndex(), input.getReadIndex());
+        assertEquals(0, input.available());
+        assertEquals(0, input.size());
+        assertEquals(-1, input.read());
+    }
+
+    @Test
+    public void consolidateWithBadIndicesFails() throws Exception {
+        receive(bytes(1, 2, 3));
+        try {
+            input.consolidate(4, 1);
+            Assert.fail("Expected exception because fromIndex 4 is beyond the writeIndex.");
+        } catch (IllegalArgumentException e) {
+            // Expected.
+        }
+        assertEquals(1, input.read());
+        try {
+            input.consolidate(2, 0);
+            Assert.fail("Expected exception because toIndex 0 is before the readIndex.");
+        } catch (IllegalArgumentException e) {
+            // Expected.
+        }
+        input.receive(4);
+        if (useBoundary) {
+            // The boundary has not been extended beyond the last received byte.
+            try {
+                input.consolidate(input.getBoundary() + 1, input.getReadIndex());
+                Assert.fail("Expected exception because fromIndex 4 is beyond the boundary.");
+            } catch (IllegalArgumentException e) {
+                // Expected.
+            }
+        }
+    }
+
+    @Test(expected = BufferOverflowException.class)
+    public void errorsWhenMaximumSizeExceeded() {
+        input = new ResizingPipedInputStream(bufferSize, bufferSize, useBoundary);
+        input.receive(new byte[bufferSize + 1]);
+    }
+
+    private static class RecordingNotificationConsumer implements ResizingPipedInputStream.NotificationConsumer {
+
+        int leftShiftAmount = 0;
+
+        @Override
+        public void bytesConsolidatedToStartOfBuffer(int leftShiftAmount) {
+            this.leftShiftAmount = leftShiftAmount;
+        }
+    }
+
+    @Test
+    public void registerNotificationConsumer() throws Exception {
+        RecordingNotificationConsumer notificationConsumer = new RecordingNotificationConsumer();
+        input.registerNotificationConsumer(notificationConsumer);
+        receive(bytes(1, 2));
+        assertEquals(1, input.read());
+        assertEquals(2, input.read());
+        assertEquals(2, input.getReadIndex());
+        // Receive one more byte than is available at the end of the buffer, requiring the bytes currently
+        // buffered to be moved to the start of the buffer.
+        receive(new byte[input.capacity() - input.getWriteIndex() + 1]);
+        // The bytes will have been shifted left by 2 since the readIndex was 2 before the shift.
+        assertEquals(2, notificationConsumer.leftShiftAmount);
+    }
+}
diff --git a/test/com/amazon/ion/impl/SymbolTableTest.java b/test/com/amazon/ion/impl/SymbolTableTest.java
index 41ec83340f..a1a49073c7 100644
--- a/test/com/amazon/ion/impl/SymbolTableTest.java
+++ b/test/com/amazon/ion/impl/SymbolTableTest.java
@@ -973,9 +973,9 @@ public void testSymtabImageMaintenance()
         IonSystem system = system();
         SymbolTable st = ((_Private_ValueFactory)system).getLstFactory().newLocalSymtab(system.getSystemSymbolTable());
         st.intern("foo");
-        IonStruct image = symtabTree(st);
+        IonStruct image = symtabTree(st, system);
         st.intern("bar");
-        image = symtabTree(st);
+        image = symtabTree(st, system);
         IonList symbols = (IonList) image.get(SYMBOLS);
         assertEquals("[\"foo\",\"bar\"]", symbols.toString());
     }
diff --git a/test/com/amazon/ion/junit/IonAssert.java b/test/com/amazon/ion/junit/IonAssert.java
index 163d5eddc2..c50a2e6427 100644
--- a/test/com/amazon/ion/junit/IonAssert.java
+++ b/test/com/amazon/ion/junit/IonAssert.java
@@ -112,12 +112,11 @@ public static void assertNoCurrentValue(IonReader in)
     @SuppressWarnings("deprecation")
     public static void assertEof(IonReader in)
     {
-        assertFalse(in.hasNext());
-        assertFalse(in.hasNext());
         assertNull(in.next());
         assertNoCurrentValue(in);
         assertNull(in.next());
-        assertFalse(in.hasNext());
+        // The following is repeated intentionally to ensure that the reader acts consistently and sanely when
+        // next() is called multiple times at EOF.
         assertNull(in.next());
     }
 
diff --git a/test/com/amazon/ion/streaming/BadIonStreamingTest.java b/test/com/amazon/ion/streaming/BadIonStreamingTest.java
index b9dcf008c1..b847fd79e0 100644
--- a/test/com/amazon/ion/streaming/BadIonStreamingTest.java
+++ b/test/com/amazon/ion/streaming/BadIonStreamingTest.java
@@ -54,8 +54,9 @@ public void testReadingScalars()
         try
         {
             byte[] buf = _Private_Utils.loadFileBytes(myTestFile);
-            IonReader it = system().newReader(buf);
+            IonReader it = getStreamingMode().newIonReader(system().getCatalog(), buf);
             TestUtils.deepRead(it, true);
+            it.close();
         }
         catch (IonException e)
         {
diff --git a/test/com/amazon/ion/streaming/BinaryStreamingTest.java b/test/com/amazon/ion/streaming/BinaryStreamingTest.java
index 05de4a40e3..46b843f646 100644
--- a/test/com/amazon/ion/streaming/BinaryStreamingTest.java
+++ b/test/com/amazon/ion/streaming/BinaryStreamingTest.java
@@ -529,7 +529,7 @@ public void testAllValues()
             throw new Exception(e);
         }
 
-        IonReader r = system().newReader(buffer);
+        IonReader r = getStreamingMode().newIonReader(system().getCatalog(), buffer);
         IonType t;
 
         t = r.next();
@@ -539,6 +539,7 @@ public void testAllValues()
         for (TestValue tv : testvalues) {
             tv.readAndTestValue(r);
         }
+        r.close();
     }
 
     @Test
@@ -587,6 +588,12 @@ public void testValue2()
         wr.writeValues(ir);
         byte[] buffer = wr.getBytes();
         dumpBuffer(buffer, buffer.length);
+
+        ir = getStreamingMode().newIonReader(system().getCatalog(), buffer);
+        wr = system().newBinaryWriter(u);
+        wr.writeValues(ir);
+        buffer = wr.getBytes();
+        dumpBuffer(buffer, buffer.length);
     }
     void dumpBuffer(byte[] buffer, int len)
     {
@@ -638,25 +645,27 @@ public void testBoolValue()
             throw new Exception(e);
         }
 
-        IonReader ir = system().newReader(buffer);
-        if (ir.hasNext()) {
-            ir.next();
+        IonReader ir = getStreamingMode().newIonReader(system().getCatalog(), buffer);
+        IonType t = ir.next();
+        if (t != null) {
             ir.stepIn();
-            while (ir.hasNext()) {
-                IonType t = ir.next();
+            t = ir.next();
+            while (t != null) {
                 String name = ir.getFieldName();
                 boolean value = ir.booleanValue();
                 assertTrue( value );
                 if (BinaryStreamingTest._debug_flag) {
                     System.out.println(t + " " + name +": " + value);
                 }
+                t = ir.next();
             }
         }
+        ir.close();
     }
 
 
     @Test
-    public void testTwoMagicCookies() {
+    public void testTwoMagicCookies() throws Exception {
         IonBinaryWriter wr = system().newBinaryWriter();
         byte[] buffer = null;
 
@@ -675,7 +684,7 @@ public void testTwoMagicCookies() {
         System.arraycopy(buffer, 0, doublebuffer, 0, buffer.length);
         System.arraycopy(buffer, 0, doublebuffer, buffer.length, buffer.length);
 
-        IonReader ir = system().newReader(doublebuffer);
+        IonReader ir = getStreamingMode().newIonReader(system().getCatalog(), doublebuffer);
 
         // first copy
         assertEquals(IonType.STRUCT, ir.next());
@@ -704,11 +713,12 @@ public void testTwoMagicCookies() {
         ir.stepOut();
 
         assertEquals(null, ir.next());
+        ir.close();
     }
 
 
     @Test
-    public void testBoolean() {
+    public void testBoolean() throws Exception {
         IonBinaryWriter wr = system().newBinaryWriter();
         byte[] buffer = null;
 
@@ -723,12 +733,13 @@ public void testBoolean() {
             throw new RuntimeException(e);
         }
 
-        IonReader ir = system().newReader(buffer);
-        if (ir.hasNext()) {
-            ir.next();
+        IonReader ir = getStreamingMode().newIonReader(system().getCatalog(), buffer);
+        IonType t = ir.next();
+        if (t != null) {
             ir.stepIn();
-            while (ir.hasNext()) {
-                assertEquals(ir.next(), IonType.BOOL);
+            t = ir.next();
+            while (t != null) {
+                assertEquals(t, IonType.BOOL);
                 expectField(ir, "Foo");
                 //assertEquals(ir.getAnnotations(), new String[] { "boolean" });
                 String[] annotations = ir.getTypeAnnotations();
@@ -737,14 +748,16 @@ public void testBoolean() {
                     assertTrue("boolean".equals(annotations[0]));
                 }
                 assertEquals(ir.booleanValue(), true);
+                t = ir.next();
             }
         }
+        ir.close();
     }
 
     //Test Sample map.
     //{hello=true, Almost Done.=true, This is a test String.=true, 12242.124598129=12242.124598129, Something=null, false=false, true=true, long=9326, 12=-12}
     @Test
-    public void testSampleMap() {
+    public void testSampleMap() throws Exception {
         IonBinaryWriter wr = system().newBinaryWriter();
         byte[] buffer = null;
 
@@ -785,7 +798,7 @@ public void testSampleMap() {
             throw new RuntimeException(e);
         }
 
-        IonReader ir = system().newReader(buffer);
+        IonReader ir = getStreamingMode().newIonReader(system().getCatalog(), buffer);
         if (ir.next() != null) {
             ir.stepIn();
             while (ir.next() != null) {
@@ -829,6 +842,7 @@ public void testSampleMap() {
                 assertEquals(ir.intValue(), -12);
             }
         }
+        ir.close();
     }
 
     @Test
@@ -871,7 +885,7 @@ public void testBenchmarkDirect() throws IOException {
 
         bytes = wr.getBytes();
 
-        IonReader ir = system().newReader(bytes);
+        IonReader ir = getStreamingMode().newIonReader(system().getCatalog(), bytes);
         assertEquals(IonType.STRUCT, ir.next());
         ir.stepIn();
 
@@ -915,5 +929,7 @@ public void testBenchmarkDirect() throws IOException {
         ir.stepOut();
         if (! _Private_Utils.READER_HASNEXT_REMOVED) assertFalse(ir.hasNext());
         assertEquals(null, ir.next());
+
+        ir.close();
     }
 }
diff --git a/test/com/amazon/ion/streaming/GoodIonStreamingTest.java b/test/com/amazon/ion/streaming/GoodIonStreamingTest.java
index 04336f132b..164bffb20e 100644
--- a/test/com/amazon/ion/streaming/GoodIonStreamingTest.java
+++ b/test/com/amazon/ion/streaming/GoodIonStreamingTest.java
@@ -58,9 +58,11 @@ void iterateIon(File myTestFile)
     {
         byte[] buf = _Private_Utils.loadFileBytes(myTestFile);
 
-        IonReader reader = system().newReader(buf);
+        IonReader reader = getStreamingMode().newIonReader(system().getCatalog(), buf);
         TestUtils.deepRead(reader);
-        IonReader reader2 = system().newReader(buf);
+        reader.close();
+        IonReader reader2 = getStreamingMode().newIonReader(system().getCatalog(), buf);
         TestUtils.deepRead(reader2, false);
+        reader2.close();
     }
 }
diff --git a/test/com/amazon/ion/streaming/ReaderFacetTestCase.java b/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
index bfbbeb0d78..3627a839eb 100644
--- a/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
+++ b/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
@@ -38,13 +38,19 @@ public abstract class ReaderFacetTestCase
      */
     public static final ReaderMaker[] NON_SPAN_READERS =
     {
+        ReaderMaker.FROM_INPUT_STREAM_BINARY_INCREMENTAL
     };
 
     /**
      * These are the readers that don't support {@link OffsetSpan}s.
      */
-    public static final ReaderMaker[] NON_OFFSET_SPAN_READERS =
-        ReaderMaker.valuesWith(ReaderMaker.Feature.DOM);
+    public static final ReaderMaker[] NON_OFFSET_SPAN_READERS;
+    static {
+        ReaderMaker[] domReaders = ReaderMaker.valuesWith(ReaderMaker.Feature.DOM);
+        NON_OFFSET_SPAN_READERS = new ReaderMaker[domReaders.length + 1];
+        System.arraycopy(domReaders, 0, NON_OFFSET_SPAN_READERS, 0, domReaders.length);
+        NON_OFFSET_SPAN_READERS[domReaders.length] = ReaderMaker.FROM_INPUT_STREAM_BINARY_INCREMENTAL;
+    }
 
     /**
      * These are the readers that don't support {@link TextSpan}s.
@@ -61,7 +67,8 @@ public abstract class ReaderFacetTestCase
     {
         ReaderMaker.FROM_INPUT_STREAM_BINARY,
         ReaderMaker.FROM_INPUT_STREAM_TEXT,
-        ReaderMaker.FROM_READER
+        ReaderMaker.FROM_READER,
+        ReaderMaker.FROM_INPUT_STREAM_BINARY_INCREMENTAL
     };
 
 
diff --git a/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java b/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
index 983d2b23e5..73fcb7193b 100644
--- a/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
+++ b/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
@@ -142,9 +142,11 @@ public void testGetIntegerSizeNegativeIntBoundary()
     private void testGetIntegerSizeIntBoundary(int boundaryValue, long pastBoundary)
     {
         in.next();
-        assertEquals(IntegerSize.INT, in.getIntegerSize());
+        // It's fine if IntegerSize recommends a larger-than-necessary type, just not a smaller one.
+        assertTrue(IntegerSize.INT == in.getIntegerSize() || IntegerSize.LONG == in.getIntegerSize());
         assertEquals(boundaryValue, in.intValue());
-        assertEquals(IntegerSize.INT, in.getIntegerSize()); // assert nothing changes until next()
+        // assert nothing changes until next()
+        assertTrue(IntegerSize.INT == in.getIntegerSize() || IntegerSize.LONG == in.getIntegerSize());
         in.next();
         assertEquals(IntegerSize.LONG, in.getIntegerSize());
         assertEquals(pastBoundary, in.longValue());
@@ -154,9 +156,10 @@ private void testGetIntegerSizeIntBoundary(int boundaryValue, long pastBoundary)
     private void testGetIntegerSizeLongBoundary(long boundaryValue, BigInteger pastBoundary)
     {
         in.next();
-        assertEquals(IntegerSize.LONG, in.getIntegerSize());
+        // It's fine if IntegerSize recommends a larger-than-necessary type, just not a smaller one.
+        assertTrue(IntegerSize.LONG == in.getIntegerSize() || IntegerSize.BIG_INTEGER == in.getIntegerSize());
         assertEquals(boundaryValue, in.longValue());
-        assertEquals(IntegerSize.LONG, in.getIntegerSize());
+        assertTrue(IntegerSize.LONG == in.getIntegerSize() || IntegerSize.BIG_INTEGER == in.getIntegerSize());
         in.next();
         assertEquals(IntegerSize.BIG_INTEGER, in.getIntegerSize());
         assertEquals(pastBoundary, in.bigIntegerValue());
diff --git a/test/com/amazon/ion/streaming/ReaderSkippingTest.java b/test/com/amazon/ion/streaming/ReaderSkippingTest.java
index 6a45032cbc..887210bbaa 100644
--- a/test/com/amazon/ion/streaming/ReaderSkippingTest.java
+++ b/test/com/amazon/ion/streaming/ReaderSkippingTest.java
@@ -72,8 +72,8 @@ public void setUp()
     throws Exception
     {
         super.setUp();
-        myFullReader = system().newReader(new FileInputStream(myTestFile));
-        mySkipReader = system().newReader(new FileInputStream(myTestFile));
+        myFullReader = getStreamingMode().newIonReader(system().getCatalog(), new FileInputStream(myTestFile));
+        mySkipReader = getStreamingMode().newIonReader(system().getCatalog(), new FileInputStream(myTestFile));
 
         myRandom = new Random(SEED);
     }
diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/test/com/amazon/ion/streaming/ReaderTest.java
index 04c18a3cfb..4ca247ce29 100644
--- a/test/com/amazon/ion/streaming/ReaderTest.java
+++ b/test/com/amazon/ion/streaming/ReaderTest.java
@@ -178,6 +178,45 @@ public void testSymbolValueOnNonSymbol()
         }
     }
 
+    @Test
+    public void testReadingDecimalAsInteger()
+    {
+        // decimal value <space> int conversion
+        read(
+            "0. 0 " +
+            "-2147483648. -2147483648 " + // Min int
+            "2147483647. 2147483647 " // Max int
+        );
+        while (in.next() != null)
+        {
+            int actual = in.intValue();
+
+            in.next();
+            int expected = in.intValue();
+
+            assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testReadingDecimalAsLong()
+    {
+        // decimal value <space> int conversion
+        read(
+            "0. 0 " +
+            "2147483647. 2147483647 " + // Max int
+            "9223372036854775807. 9223372036854775807 " // Max long
+        );
+        while (in.next() != null)
+        {
+            long actual = in.longValue();
+
+            in.next();
+            long expected = in.longValue();
+
+            assertEquals(expected, actual);
+        }
+    }
 
     @Test
     public void testReadingDecimalAsBigInteger()
@@ -201,6 +240,71 @@ public void testReadingDecimalAsBigInteger()
         }
     }
 
+    @Test
+    public void testReadingDecimalAsDouble()
+    {
+        // decimal value <space> float conversion
+        read(
+            "0. 0e0 " +
+            "1.23 123e-2 " +
+            "-1.23 -1.23e0 " +
+            "2d24 2e24 "
+        );
+
+        while (in.next() != null)
+        {
+            double actual = in.doubleValue();
+
+            in.next();
+            double expected = in.doubleValue();
+
+            assertEquals(expected, actual, 1e-9);
+        }
+    }
+
+    @Test
+    public void testReadingFloatAsInteger()
+    {
+        // float value <space> int conversion
+        read(
+            "-0e0 0 " +
+            " 0e0 0 " +
+            "-2147483648e0 -2147483648 " + // Min int
+            "2147483647e0 2147483647 " // Max int
+        );
+
+        while (in.next() != null)
+        {
+            int actual = in.intValue();
+
+            in.next();
+            int expected = in.intValue();
+
+            assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testReadingFloatAsLong()
+    {
+        // float value <space> int conversion
+        read(
+            "-0e0 0 " +
+            " 0e0 0 " +
+            "-2147483648e0 -2147483648 " + // Min int
+            "2147483647e0 2147483647 " // Max int
+        );
+
+        while (in.next() != null)
+        {
+            long actual = in.longValue();
+
+            in.next();
+            long expected = in.longValue();
+
+            assertEquals(expected, actual);
+        }
+    }
 
     @Test
     public void testReadingFloatAsBigInteger()
diff --git a/test/com/amazon/ion/streaming/RoundTripStreamingTest.java b/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
index f1eb07e002..98b27e1dcf 100644
--- a/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
+++ b/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
@@ -134,6 +134,7 @@ private byte[] makeText(byte[] buffer, boolean prettyPrint)
 
         tw.writeValues(in);
         tw.close();
+        in.close();
 
         byte[] buf = out.toByteArray(); // this is utf-8
         return buf;
@@ -156,7 +157,7 @@ private byte[] makeBinary(byte[] buffer)
 
         bw.writeValues(in);
         byte[] buf = bw.getBytes(); // this is binary
-
+        in.close();
         return buf;
     }
 
@@ -174,7 +175,7 @@ private IonDatagram makeTree(byte[] buffer)
 
         tw.writeValues(in);
         //IonValue v = tw.getContentAsIonValue();
-
+        in.close();
         return dg;
     }
 
@@ -381,8 +382,7 @@ roundTripBufferResults roundTripBuffer(String pass, byte[] testBuffer)
     }
 
     IonReader makeIterator(byte [] testBuffer) {
-        IonReader inputIterator = system().newReader(testBuffer);
-        return inputIterator;
+        return getStreamingMode().newIonReader(system().getCatalog(), testBuffer);
     }
 
 
diff --git a/test/com/amazon/ion/system/IonReaderBuilderTest.java b/test/com/amazon/ion/system/IonReaderBuilderTest.java
index 6b15bb458b..f4433f2136 100644
--- a/test/com/amazon/ion/system/IonReaderBuilderTest.java
+++ b/test/com/amazon/ion/system/IonReaderBuilderTest.java
@@ -16,16 +16,27 @@
 package com.amazon.ion.system;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonWriter;
 import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
+
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.zip.GZIPOutputStream;
+
+import com.amazon.ion.impl._Private_IonConstants;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -111,4 +122,73 @@ public void testSystemFreeRoundtrip() throws IOException
         assertEquals(42, reader.intValue());
     }
 
+    @Test
+    public void testEnableIncrementalReading() throws IOException
+    {
+        IonReaderBuilder builder = IonReaderBuilder.standard();
+        assertFalse(builder.isIncrementalReadingEnabled());
+        builder.withIncrementalReadingEnabled(true);
+        assertTrue(builder.isIncrementalReadingEnabled());
+        builder.setIncrementalReadingDisabled();
+        assertFalse(builder.isIncrementalReadingEnabled());
+        builder.setIncrementalReadingEnabled();
+        assertTrue(builder.isIncrementalReadingEnabled());
+        builder.withIncrementalReadingEnabled(false);
+        assertFalse(builder.isIncrementalReadingEnabled());
+        ByteArrayOutputStream data = new ByteArrayOutputStream();
+        data.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+        data.write(0xE5); // 5-byte annotation wrapper (incomplete).
+        IonReader reader1 = builder.build(data.toByteArray());
+        try {
+            reader1.next();
+            fail();
+        } catch (IonException e) {
+            // Expected; this is a non-incremental reader, but a complete value was not available.
+        }
+        builder.withIncrementalReadingEnabled(true);
+        IonReader reader2 = builder.build(data.toByteArray());
+        assertNull(reader2.next());
+        IonReader reader3 = builder.build(new ByteArrayInputStream(data.toByteArray()));
+        assertNull(reader3.next());
+    }
+
+    @Test
+    public void testBufferConfiguration()
+    {
+        IonBufferConfiguration configuration1 = IonBufferConfiguration.Builder.standard().build();
+        IonBufferConfiguration configuration2 = IonBufferConfiguration.Builder.standard().build();
+        IonReaderBuilder builder = IonReaderBuilder.standard();
+        assertNull(builder.getBufferConfiguration());
+        builder.withBufferConfiguration(configuration1);
+        assertSame(configuration1, builder.getBufferConfiguration());
+        builder.setBufferConfiguration(configuration2);
+        assertSame(configuration2, builder.getBufferConfiguration());
+        builder.withBufferConfiguration(null);
+        assertNull(builder.getBufferConfiguration());
+    }
+
+    @Test
+    public void testIncrementalReadingDoesNotSupportAutoGzip() throws IOException
+    {
+        IonReaderBuilder builder = IonReaderBuilder.standard();
+        builder.withIncrementalReadingEnabled(true);
+        ByteArrayOutputStream data = new ByteArrayOutputStream();
+        GZIPOutputStream gzip = new GZIPOutputStream(data);
+        gzip.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+        gzip.write(0x20); // int 0.
+        gzip.close();
+        try {
+            builder.build(data.toByteArray());
+            fail();
+        } catch (IllegalArgumentException e) {
+            // Expected; non-incremental readers do not support auto-deflate of GZIP.
+        }
+        try {
+            builder.build(new ByteArrayInputStream(data.toByteArray()));
+            fail();
+        } catch (IllegalArgumentException e) {
+            // Expected; non-incremental readers do not support auto-deflate of GZIP.
+        }
+    }
+
 }

From 9e03a92303cd43aa7064126a031473930f85d76c Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Tue, 21 Sep 2021 16:39:01 -0700
Subject: [PATCH 136/490] Clean up assertions in ReaderTest (#384)

Fixes #380
---
 test/com/amazon/ion/streaming/ReaderTest.java | 233 +++++++-----------
 1 file changed, 91 insertions(+), 142 deletions(-)

diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/test/com/amazon/ion/streaming/ReaderTest.java
index 4ca247ce29..ea822acdd8 100644
--- a/test/com/amazon/ion/streaming/ReaderTest.java
+++ b/test/com/amazon/ion/streaming/ReaderTest.java
@@ -20,6 +20,7 @@
 
 import com.amazon.ion.BinaryTest;
 import com.amazon.ion.Decimal;
+import com.amazon.ion.IonReader;
 import com.amazon.ion.IonType;
 import com.amazon.ion.ReaderMaker;
 import com.amazon.ion.SymbolTable;
@@ -178,132 +179,104 @@ public void testSymbolValueOnNonSymbol()
         }
     }
 
-    @Test
-    public void testReadingDecimalAsInteger()
-    {
-        // decimal value <space> int conversion
-        read(
-            "0. 0 " +
-            "-2147483648. -2147483648 " + // Min int
-            "2147483647. 2147483647 " // Max int
-        );
-        while (in.next() != null)
-        {
-            int actual = in.intValue();
+    int readInt(String text) {
+        IonReader r = myReaderMaker.newReader(system(), text);
+        if (r.next() == null) {
+            fail("Expected to read an integer");
+        }
+        return r.intValue();
+    }
 
-            in.next();
-            int expected = in.intValue();
+    long readLong(String text) {
+        IonReader r = myReaderMaker.newReader(system(), text);
+        if (r.next() == null) {
+            fail("Expected to read a long");
+        }
+        return r.longValue();
+    }
 
-            assertEquals(expected, actual);
+    double readDouble(String text) {
+        IonReader r = myReaderMaker.newReader(system(), text);
+        if (r.next() == null) {
+            fail("Expected to read a double");
         }
+        return r.doubleValue();
     }
 
-    @Test
-    public void testReadingDecimalAsLong()
-    {
-        // decimal value <space> int conversion
-        read(
-            "0. 0 " +
-            "2147483647. 2147483647 " + // Max int
-            "9223372036854775807. 9223372036854775807 " // Max long
-        );
-        while (in.next() != null)
-        {
-            long actual = in.longValue();
+    BigInteger readBigInteger(String text) {
+        IonReader r = myReaderMaker.newReader(system(), text);
+        if (r.next() == null) {
+            fail("Expected to read a BigInteger");
+        }
+        return r.bigIntegerValue();
+    }
 
-            in.next();
-            long expected = in.longValue();
+    Decimal readDecimal(String text) {
+        IonReader r = myReaderMaker.newReader(system(), text);
+        if (r.next() == null) {
+            fail("Expected to read a Decimal");
+        }
+        return r.decimalValue();
+    }
 
-            assertEquals(expected, actual);
+    BigDecimal readBigDecimal(String text) {
+        IonReader r = myReaderMaker.newReader(system(), text);
+        if (r.next() == null) {
+            fail("Expected to read an BigDecimal");
         }
+        return r.bigDecimalValue();
     }
 
     @Test
-    public void testReadingDecimalAsBigInteger()
+    public void testReadingDecimalAsInteger()
     {
-        //    decimal value         int conversion
-        read("null.decimal          null.int                  " +
-             "0.                                            0 " +
-             "9223372036854775807.        9223372036854775807 " + // Max long
-             "2d24                  2000000000000000000000000 "
-             );
-
-        while (in.next() != null)
-        {
-            BigInteger actual = in.bigIntegerValue();
-            assertEquals(in.isNullValue(), actual == null);
+        assertEquals(readInt("0."), readInt("0"));
+        assertEquals(readInt("-2147483648."), readInt("-2147483648")); // Min int
+        assertEquals(readInt("2147483647."), readInt("2147483647")); // Max int
+    }
 
-            in.next();
-            BigInteger expected = in.bigIntegerValue();
+    @Test
+    public void testReadingDecimalAsLong()
+    {
+        assertEquals(readLong("0."), readLong("0"));
+        assertEquals(readLong("2147483647."), readLong("2147483647")); // Max int
+        assertEquals(readLong("9223372036854775807."), readLong("9223372036854775807")); // Max long
+    }
 
-            assertEquals(expected, actual);
-        }
+    @Test
+    public void testReadingDecimalAsBigInteger()
+    {
+        assertEquals(readBigInteger("0."), readBigInteger("0"));
+        assertEquals(readBigInteger("null.decimal"), readBigInteger("null.int"));
+        assertEquals(readBigInteger("9223372036854775807."), readBigInteger("9223372036854775807")); // Max long
+        assertEquals(readBigInteger("2d24"), readBigInteger("2000000000000000000000000"));
     }
 
     @Test
     public void testReadingDecimalAsDouble()
     {
-        // decimal value <space> float conversion
-        read(
-            "0. 0e0 " +
-            "1.23 123e-2 " +
-            "-1.23 -1.23e0 " +
-            "2d24 2e24 "
-        );
-
-        while (in.next() != null)
-        {
-            double actual = in.doubleValue();
-
-            in.next();
-            double expected = in.doubleValue();
-
-            assertEquals(expected, actual, 1e-9);
-        }
+        assertEquals(readDouble("0."), readDouble("0e0"));
+        assertEquals(readDouble("1.23"), readDouble("123e-2"));
+        assertEquals(readDouble("-1.23"), readDouble("-1.23e0"));
+        assertEquals(readDouble("2d24"), readDouble("2e24"));
     }
 
     @Test
     public void testReadingFloatAsInteger()
     {
-        // float value <space> int conversion
-        read(
-            "-0e0 0 " +
-            " 0e0 0 " +
-            "-2147483648e0 -2147483648 " + // Min int
-            "2147483647e0 2147483647 " // Max int
-        );
-
-        while (in.next() != null)
-        {
-            int actual = in.intValue();
-
-            in.next();
-            int expected = in.intValue();
-
-            assertEquals(expected, actual);
-        }
+        assertEquals(readInt("-0e0"), readInt("0"));
+        assertEquals(readInt("-0e0"), readInt("0"));
+        assertEquals(readInt("-2147483648e0"), readInt("-2147483648")); // Min int
+        assertEquals(readInt("2147483647e0"), readInt("2147483647")); // Max int
     }
 
     @Test
     public void testReadingFloatAsLong()
     {
-        // float value <space> int conversion
-        read(
-            "-0e0 0 " +
-            " 0e0 0 " +
-            "-2147483648e0 -2147483648 " + // Min int
-            "2147483647e0 2147483647 " // Max int
-        );
-
-        while (in.next() != null)
-        {
-            long actual = in.longValue();
-
-            in.next();
-            long expected = in.longValue();
-
-            assertEquals(expected, actual);
-        }
+        assertEquals(readLong("0e0"), readLong("0"));
+        assertEquals(readLong("0e0"), readLong("0"));
+        assertEquals(readLong("-2147483648e0"), readLong("-2147483648")); // Min int
+        assertEquals(readLong("2147483647e0"), readLong("2147483647")); // Max int
     }
 
     @Test
@@ -311,26 +284,16 @@ public void testReadingFloatAsBigInteger()
     {
         // Note that one can't represent Long.MAX_VALUE as a double, there's
         // not enough bits in the mantissa!
-
-        //    float value            int conversion
-        read("null.float             null.int                  " +
-             "-0e0                                           0 " +
-             " 0e0                                           0 " +
-             "9223372036854776000e0        9223372036854776000 " +
-             "2e24                   2000000000000000000000000 " +
-             ""
-             );
-
-        while (in.next() != null)
-        {
-            BigInteger actual = in.bigIntegerValue();
-            assertEquals(in.isNullValue(), actual == null);
-
-            in.next();
-            BigInteger expected = in.bigIntegerValue();
-
-            assertEquals(expected, actual);
-        }
+        BigInteger actual = readBigInteger("null.float");
+        assertNull(actual);
+        BigInteger expected = readBigInteger("null.int");
+        assertNull(expected);
+        assertEquals(actual, expected);
+
+        assertEquals(readBigInteger("-0e0"), readBigInteger("0"));
+        assertEquals(readBigInteger("0e0"), readBigInteger("0"));
+        assertEquals(readBigInteger("9223372036854776000e0"), readBigInteger("9223372036854776000"));
+        assertEquals(readBigInteger("2e24"), readBigInteger("2000000000000000000000000"));
     }
 
 
@@ -345,33 +308,19 @@ public void testReadingFloatAsBigInteger()
     @Test @Ignore
     public void testReadingFloatAsBigDecimal() // TODO amzn/ion-java/issues/56
     {
+        BigDecimal actualBd = readBigDecimal("null.float");
+        assertEquals(in.isNullValue(), actualBd  == null);
+        Decimal actualDec = readDecimal("null.decimal");
+        assertEquals(in.isNullValue(), actualDec == null);
+        assertEquals(actualBd, actualDec);
+
         // Note that one can't represent Long.MAX_VALUE as a double, there's
         // not enough bits in the mantissa!
-
-        //    float value             decimal conversion
-        read("null.float              null.decimal                " +
-             "-0e0                                          -0.   " +
-             " 0e0                                           0.   " +
-             "9223372036854776000e0        9223372036854776000.   " +
-             "9223372036854776000e12       9223372036854776000d12 " +
-             "2e24                    2000000000000000000000000.  " +
-             ""
-             );
-
-        while (in.next() != null)
-        {
-            BigDecimal actualBd  = in.bigDecimalValue();
-            Decimal    actualDec = in.decimalValue();
-            assertEquals(in.isNullValue(), actualBd  == null);
-            assertEquals(in.isNullValue(), actualDec == null);
-
-            in.next();
-            BigDecimal expectedBd  = in.bigDecimalValue();
-            Decimal    expectedDec = in.decimalValue();
-
-            assertEquals(expectedBd,  actualBd);
-            assertEquals(expectedDec, actualDec);
-        }
+        assertEquals(readBigDecimal("-0e0"), readDecimal("-0."));
+        assertEquals(readBigDecimal("0e0"), readDecimal("0."));
+        assertEquals(readBigDecimal("9223372036854776000e0"), readDecimal("9223372036854776000."));
+        assertEquals(readBigDecimal("9223372036854776000e12"), readDecimal("9223372036854776000d12"));
+        assertEquals(readBigDecimal("2e24"), readDecimal("2000000000000000000000000."));
     }
 
 

From de7fefe285a6e59f125c274da55efa047361e4af Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Fri, 24 Sep 2021 17:16:05 -0700
Subject: [PATCH 137/490] Adds an option to IonSystemBuilder to allow the
 incremental reader to be used by the DOM. (#385)

---
 .../ion/impl/IonReaderBinaryIncremental.java  |  28 ++-
 .../ion/impl/_Private_IncrementalReader.java  |  14 ++
 .../ion/impl/_Private_IonReaderBuilder.java   | 172 ++++++++++++++++++
 .../ion/impl/_Private_IonReaderFactory.java   |   5 +-
 src/com/amazon/ion/impl/_Private_Utils.java   |   7 +
 .../amazon/ion/impl/lite/IonLoaderLite.java   |  31 +++-
 .../amazon/ion/impl/lite/IonSymbolLite.java   |   4 +-
 .../amazon/ion/impl/lite/IonSystemLite.java   |  15 +-
 .../amazon/ion/system/IonReaderBuilder.java   | 108 ++---------
 .../amazon/ion/system/IonSystemBuilder.java   |  62 ++++++-
 ...ByteArrayIteratorSystemProcessingTest.java |   5 +
 ...aryStreamIteratorSystemProcessingTest.java |   5 +
 test/com/amazon/ion/BinaryTest.java           |  18 --
 ...atagramTreeReaderSystemProcessingTest.java |   8 +
 test/com/amazon/ion/IonSystemTest.java        |  17 ++
 test/com/amazon/ion/IonTestCase.java          |  44 ++---
 .../LoadBinaryBytesSystemProcessingTest.java  |   5 +
 .../LoadBinaryStreamSystemProcessingTest.java |   5 +
 .../impl/IonReaderBinaryIncrementalTest.java  | 109 +++++++++++
 .../impl/OptimizedBinaryWriterTestCase.java   |   5 +-
 .../streaming/OffsetSpanBinaryReaderTest.java |  10 +
 .../ion/streaming/OffsetSpanReaderTest.java   |  10 +
 .../ion/streaming/SeekableReaderTest.java     |  35 ++++
 .../amazon/ion/streaming/SpanReaderTest.java  |  60 ++++++
 24 files changed, 608 insertions(+), 174 deletions(-)
 create mode 100644 src/com/amazon/ion/impl/_Private_IncrementalReader.java
 create mode 100644 src/com/amazon/ion/impl/_Private_IonReaderBuilder.java

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
index 542a4ea46b..b5fe5c74d8 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
@@ -64,7 +64,7 @@
  * To enable this implementation, use {@code IonReaderBuilder.withIncrementalReadingEnabled(true)}.
  * </p>
  */
-class IonReaderBinaryIncremental implements IonReader, _Private_ReaderWriter {
+class IonReaderBinaryIncremental implements IonReader, _Private_ReaderWriter, _Private_IncrementalReader {
 
     /*
      * Potential future enhancements:
@@ -266,9 +266,8 @@ private static class SystemSymbolIDs {
     // symbol table is encountered in the stream.
     private SymbolTable cachedReadOnlySymbolTable = null;
 
-    // True if the current symbol table has already been transferred via pop_passed_symbol_table with the reader
-    // positioned at the current value; otherwise, false.
-    private boolean hasTransferredSymbolTable = false;
+    // The SymbolTable that was transferred via the last call to pop_passed_symbol_table.
+    private SymbolTable symbolTableLastTransferred = null;
 
     // The symbol ID of the current value's field name, or -1 if the current value is not in a struct.
     private int fieldNameSid = -1;
@@ -1033,6 +1032,12 @@ private void nextAtTopLevel() {
             resetSymbolTable();
             resetImports();
             lookahead.resetIvmIndex();
+        } else if (peekIndex < 0) {
+            // peekIndex is initialized to -1 and only increases. This branch is reached if the IVM does not occur
+            // first in the stream. This is necessary because currently a binary incremental reader will be created if
+            // an empty stream is provided to the IonReaderBuilder. If, once bytes appear in the stream, those bytes do
+            // not represent valid binary Ion, a quick failure is necessary.
+            throw new IonException("Binary Ion must start with an Ion version marker.");
         }
         List<IonReaderLookaheadBuffer.SymbolTableMarker> symbolTableMarkers = lookahead.getSymbolTableMarkers();
         if (!symbolTableMarkers.isEmpty()) {
@@ -1176,7 +1181,6 @@ public IonType next() {
         fieldNameSid = -1;
         lobBytesRead = 0;
         valueStartPosition = -1;
-        hasTransferredSymbolTable = false;
         hasAnnotations = false;
         if (containerStack.isEmpty()) {
             nextAtTopLevel();
@@ -1245,13 +1249,14 @@ public SymbolTable getSymbolTable() {
 
     @Override
     public SymbolTable pop_passed_symbol_table() {
-        if (hasTransferredSymbolTable) {
+        SymbolTable currentSymbolTable = getSymbolTable();
+        if (currentSymbolTable == symbolTableLastTransferred) {
             // This symbol table has already been returned. Since the contract is that it is a "pop", it should not
             // be returned twice.
             return null;
         }
-        hasTransferredSymbolTable = true;
-        return getSymbolTable();
+        symbolTableLastTransferred = currentSymbolTable;
+        return symbolTableLastTransferred;
     }
 
     @Override
@@ -1937,7 +1942,7 @@ public <T> T asFacet(Class<T> facetType) {
     }
 
     @Override
-    public void close() throws IOException {
+    public void requireCompleteValue() {
         // NOTE: If we want to replace the other binary IonReader implementation with this one, the following
         // validation could be performed in next() if incremental mode is not enabled. That would allow this
         // implementation to behave in the same way as the other implementation when an incomplete value is
@@ -1951,6 +1956,11 @@ public void close() throws IOException {
                 throw new IonException("Unexpected EOF.");
             }
         }
+    }
+
+    @Override
+    public void close() throws IOException {
+        requireCompleteValue();
         inputStream.close();
     }
 
diff --git a/src/com/amazon/ion/impl/_Private_IncrementalReader.java b/src/com/amazon/ion/impl/_Private_IncrementalReader.java
new file mode 100644
index 0000000000..aebb1db0ce
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_IncrementalReader.java
@@ -0,0 +1,14 @@
+package com.amazon.ion.impl;
+
+/**
+ * Interface to be implemented by all incremental IonReaders. See
+ * {@link com.amazon.ion.system.IonReaderBuilder#withIncrementalReadingEnabled(boolean)}.
+ */
+public interface _Private_IncrementalReader {
+
+    /**
+     * Requires that the reader not currently be buffering an incomplete value.
+     * @throws com.amazon.ion.IonException if the reader is buffering an incomplete value.
+     */
+    void requireCompleteValue();
+}
diff --git a/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java b/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
new file mode 100644
index 0000000000..6e4f29263c
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
@@ -0,0 +1,172 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonTextReader;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.util.IonStreamUtils;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Reader;
+
+import static com.amazon.ion.impl.LocalSymbolTable.DEFAULT_LST_FACTORY;
+import static com.amazon.ion.impl._Private_IonReaderFactory.makeIncrementalReader;
+import static com.amazon.ion.impl._Private_IonReaderFactory.makeReader;
+
+/**
+ * {@link IonReaderBuilder} extension for internal use only.
+ */
+public class _Private_IonReaderBuilder extends IonReaderBuilder {
+
+    private _Private_LocalSymbolTableFactory lstFactory;
+
+    private _Private_IonReaderBuilder() {
+        super();
+        lstFactory = DEFAULT_LST_FACTORY;
+    }
+
+    private _Private_IonReaderBuilder(_Private_IonReaderBuilder that) {
+        super(that);
+        this.lstFactory = that.lstFactory;
+    }
+
+    /**
+     * Declares the {@link _Private_LocalSymbolTableFactory} to use when constructing applicable readers.
+     *
+     * @param factory the factory to use, or {@link LocalSymbolTable#DEFAULT_LST_FACTORY} if null.
+     *
+     * @return this builder instance, if mutable;
+     * otherwise a mutable copy of this builder.
+     *
+     * @see #setLstFactory(_Private_LocalSymbolTableFactory)
+     */
+    public IonReaderBuilder withLstFactory(_Private_LocalSymbolTableFactory factory) {
+        _Private_IonReaderBuilder b = (_Private_IonReaderBuilder) mutable();
+        b.setLstFactory(factory);
+        return b;
+    }
+
+    /**
+     * @see #withLstFactory(_Private_LocalSymbolTableFactory)
+     */
+    public void setLstFactory(_Private_LocalSymbolTableFactory factory) {
+        mutationCheck();
+        if (factory == null) {
+            lstFactory = DEFAULT_LST_FACTORY;
+        } else {
+            lstFactory = factory;
+        }
+    }
+
+    public static class Mutable extends _Private_IonReaderBuilder {
+
+        public Mutable() {
+        }
+
+        public Mutable(IonReaderBuilder that) {
+            super((_Private_IonReaderBuilder) that);
+        }
+
+        @Override
+        public IonReaderBuilder immutable() {
+            return new _Private_IonReaderBuilder(this);
+        }
+
+        @Override
+        public IonReaderBuilder mutable() {
+            return this;
+        }
+
+        @Override
+        protected void mutationCheck() {
+        }
+
+    }
+
+    @Override
+    public IonReader build(byte[] ionData, int offset, int length)
+    {
+        if (isIncrementalReadingEnabled()) {
+            if (IonStreamUtils.isGzip(ionData, offset, length)) {
+                throw new IllegalArgumentException("Automatic GZIP detection is not supported with incremental" +
+                    "support enabled. Wrap the bytes with a GZIPInputStream and call build(InputStream).");
+            }
+            if (IonStreamUtils.isIonBinary(ionData, offset, length)) {
+                return makeIncrementalReader(this, new ByteArrayInputStream(ionData, offset, length));
+            }
+        }
+        return makeReader(validateCatalog(), ionData, offset, length, lstFactory);
+    }
+
+    /**
+     * Determines whether a stream that begins with the bytes in the provided buffer could be binary Ion.
+     * @param buffer up to the first four bytes in a stream.
+     * @param length the actual number of bytes in the buffer.
+     * @return true if the first 'length' bytes in 'buffer' match the first 'length' bytes in the binary IVM.
+     */
+    private static boolean startsWithIvm(byte[] buffer, int length) {
+        for (int i = 0; i < length; i++) {
+            if (_Private_IonConstants.BINARY_VERSION_MARKER_1_0[i] != buffer[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public IonReader build(InputStream ionData)
+    {
+        InputStream wrapper = ionData;
+        if (isIncrementalReadingEnabled()) {
+            if (!ionData.markSupported()) {
+                wrapper = new BufferedInputStream(ionData);
+            }
+            wrapper.mark(_Private_IonConstants.BINARY_VERSION_MARKER_SIZE);
+            byte[] possibleIVM = new byte[_Private_IonConstants.BINARY_VERSION_MARKER_SIZE];
+            int bytesRead;
+            try {
+                bytesRead = wrapper.read(possibleIVM);
+                wrapper.reset();
+            } catch (IOException e) {
+                throw new IonException(e);
+            }
+            if (IonStreamUtils.isGzip(possibleIVM, 0, possibleIVM.length)) {
+                throw new IllegalArgumentException("Automatic GZIP detection is not supported with incremental" +
+                    "support enabled. Wrap the bytes with a GZIPInputStream and call build(InputStream).");
+            }
+            // If the input stream is growing, it is possible that fewer than BINARY_VERSION_MARKER_SIZE bytes are
+            // available yet. Simply check whether the stream *could* contain binary Ion based on the available bytes.
+            // If it can't, fall back to text.
+            // NOTE: if incremental text reading is added, there will need to be logic that handles the case where
+            // the reader is created with 0 bytes available, as it is impossible to determine text vs. binary without
+            // reading at least one byte. Currently, in that case, just create a binary incremental reader. Either the
+            // stream will always be empty (in which case it doesn't matter whether a text or binary reader is used)
+            // or it's a binary stream (in which case the correct reader was created) or it's a growing text stream
+            // (which has always been unsupported).
+            if (startsWithIvm(possibleIVM, bytesRead)) {
+                return makeIncrementalReader(this, wrapper);
+            }
+        }
+        return makeReader(validateCatalog(), wrapper, lstFactory);
+    }
+
+    @Override
+    public IonReader build(Reader ionText) {
+        return makeReader(validateCatalog(), ionText, lstFactory);
+    }
+
+    @Override
+    public IonReader build(IonValue value) {
+        return makeReader(validateCatalog(), value, lstFactory);
+    }
+
+    @Override
+    public IonTextReader build(String ionText) {
+        return makeReader(validateCatalog(), ionText, lstFactory);
+    }
+
+}
diff --git a/src/com/amazon/ion/impl/_Private_IonReaderFactory.java b/src/com/amazon/ion/impl/_Private_IonReaderFactory.java
index 4f4fafd623..be09960dc4 100644
--- a/src/com/amazon/ion/impl/_Private_IonReaderFactory.java
+++ b/src/com/amazon/ion/impl/_Private_IonReaderFactory.java
@@ -241,9 +241,10 @@ public static final IonReader makeSystemReader(Reader chars)
     }
 
     public static final IonReader makeReader(IonCatalog catalog,
-                                             IonValue value)
+                                             IonValue value,
+                                             _Private_LocalSymbolTableFactory lstFactory)
     {
-        return new IonReaderTreeUserX(value, catalog, LocalSymbolTable.DEFAULT_LST_FACTORY);
+        return new IonReaderTreeUserX(value, catalog, lstFactory);
     }
 
     public static final IonReader makeSystemReader(IonSystem system,
diff --git a/src/com/amazon/ion/impl/_Private_Utils.java b/src/com/amazon/ion/impl/_Private_Utils.java
index cf0e22f3d7..e957377b32 100644
--- a/src/com/amazon/ion/impl/_Private_Utils.java
+++ b/src/com/amazon/ion/impl/_Private_Utils.java
@@ -879,6 +879,13 @@ public static IonStruct symtabTree(SymbolTable symtab, ValueFactory valueFactory
         } else {
             localSymbolTableAsStruct = (LocalSymbolTableAsStruct) new LocalSymbolTableAsStruct.Factory(valueFactory)
                     .newLocalSymtab(symtab.getSystemSymbolTable(), symtab.getImportedTables());
+            Iterator<String> localSymbolsIterator = symtab.iterateDeclaredSymbolNames();
+            while (localSymbolsIterator.hasNext()) {
+                String localSymbol = localSymbolsIterator.next();
+                if (localSymbol != null) {
+                    localSymbolTableAsStruct.intern(localSymbol);
+                }
+            }
         }
         return localSymbolTableAsStruct.getIonRepresentation();
     }
diff --git a/src/com/amazon/ion/impl/lite/IonLoaderLite.java b/src/com/amazon/ion/impl/lite/IonLoaderLite.java
index 62e963de4c..e0a2aff94e 100644
--- a/src/com/amazon/ion/impl/lite/IonLoaderLite.java
+++ b/src/com/amazon/ion/impl/lite/IonLoaderLite.java
@@ -15,8 +15,6 @@
 
 package com.amazon.ion.impl.lite;
 
-import static com.amazon.ion.impl._Private_IonReaderFactory.makeReader;
-
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonException;
@@ -24,8 +22,10 @@
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.IonWriter;
+import com.amazon.ion.impl._Private_IncrementalReader;
 import com.amazon.ion.impl._Private_IonWriterFactory;
-import com.amazon.ion.impl._Private_LocalSymbolTableFactory;
+import com.amazon.ion.system.IonReaderBuilder;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -41,7 +41,7 @@ final class IonLoaderLite
     /** Not null. */
     private final IonCatalog    _catalog;
 
-    private final _Private_LocalSymbolTableFactory _lstFactory;
+    private final IonReaderBuilder _readerBuilder;
 
     /**
      * @param system must not be null.
@@ -54,7 +54,13 @@ public IonLoaderLite(IonSystemLite system, IonCatalog catalog)
 
         _system = system;
         _catalog = catalog;
-        _lstFactory = _system.getLstFactory();
+        if (catalog == system.getCatalog()) {
+            _readerBuilder = system.getReaderBuilder();
+        } else {
+            // The IonCatalog provided in the constructor always takes precedence over the one already configured on the
+            // system's IonReaderBuilder.
+            _readerBuilder = system.getReaderBuilder().withCatalog(catalog).immutable();
+        }
     }
 
     public IonSystem getSystem()
@@ -99,7 +105,7 @@ public IonDatagram load(File ionFile) throws IonException, IOException
     public IonDatagram load(String ionText) throws IonException
     {
         try {
-            IonReader reader = makeReader(_catalog, ionText, _lstFactory);
+            IonReader reader = _readerBuilder.build(ionText);
             IonDatagramLite datagram = load_helper(reader);
             return datagram;
         }
@@ -111,7 +117,7 @@ public IonDatagram load(String ionText) throws IonException
     public IonDatagram load(Reader ionText) throws IonException, IOException
     {
         try {
-            IonReader reader = makeReader(_catalog, ionText, _lstFactory);
+            IonReader reader = _readerBuilder.build(ionText);
             IonDatagramLite datagram = load_helper(reader);
             return datagram;
         }
@@ -124,7 +130,7 @@ public IonDatagram load(Reader ionText) throws IonException, IOException
 
     public IonDatagram load(byte[] ionData) throws IonException
     {
-        IonReader reader = makeReader(_catalog, ionData, 0, ionData.length, _lstFactory);
+        IonReader reader = _readerBuilder.build(ionData, 0, ionData.length);
         try {
             return load(reader);
         }
@@ -142,14 +148,21 @@ public IonDatagram load(byte[] ionData) throws IonException
     public IonDatagram load(InputStream ionData)
         throws IonException, IOException
     {
+        IonReader reader = null;
         try {
-            IonReader reader = makeReader(_catalog, ionData, _lstFactory);
+            reader = _readerBuilder.build(ionData);
             return load(reader);
         }
         catch (IonException e) {
             IOException io = e.causeOfType(IOException.class);
             if (io != null) throw io;
             throw e;
+        } finally {
+            // If a value was incomplete, incremental readers will not yet have raised an error. Force an error
+            // to be raised in this case.
+            if (_readerBuilder.isIncrementalReadingEnabled() && reader instanceof _Private_IncrementalReader) {
+                ((_Private_IncrementalReader) reader).requireCompleteValue();
+            }
         }
     }
 
diff --git a/src/com/amazon/ion/impl/lite/IonSymbolLite.java b/src/com/amazon/ion/impl/lite/IonSymbolLite.java
index 88ba206756..01bf587afb 100644
--- a/src/com/amazon/ion/impl/lite/IonSymbolLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSymbolLite.java
@@ -308,8 +308,8 @@ private String stringValue(SymbolTableProvider symbolTableProvider)
             return null;
         }
         String name = _stringValue(symbolTableProvider);
-        if (name == null && _sid != 0) {
-            assert(_sid > 0);
+        if (name == null) {
+            assert(_sid >= 0);
             throw new UnknownSymbolException(_sid);
         }
         return name;
diff --git a/src/com/amazon/ion/impl/lite/IonSystemLite.java b/src/com/amazon/ion/impl/lite/IonSystemLite.java
index 95bfa4d08a..415bb3933a 100644
--- a/src/com/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSystemLite.java
@@ -18,7 +18,6 @@
 import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
 import static com.amazon.ion.SystemSymbols.ION_1_0;
 import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static com.amazon.ion.impl._Private_IonReaderFactory.makeReader;
 import static com.amazon.ion.impl._Private_IonReaderFactory.makeSystemReader;
 import static com.amazon.ion.impl._Private_Utils.addAllNonNull;
 import static com.amazon.ion.impl._Private_Utils.initialSymtab;
@@ -43,6 +42,7 @@
 import com.amazon.ion.UnexpectedEofException;
 import com.amazon.ion.UnsupportedIonVersionException;
 import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
+import com.amazon.ion.impl._Private_IonReaderBuilder;
 import com.amazon.ion.impl._Private_IonSystem;
 import com.amazon.ion.impl._Private_IonWriterFactory;
 import com.amazon.ion.impl._Private_ScalarConversions.CantConvertException;
@@ -89,6 +89,7 @@ public IonSystemLite(IonTextWriterBuilder twb,
         assert catalog == rb.getCatalog();
 
         _catalog = catalog;
+        myReaderBuilder = ((_Private_IonReaderBuilder) rb).withLstFactory(_lstFactory).immutable();
         _loader = new IonLoaderLite(this, catalog);
         _system_symbol_table = bwb.getInitialSymbolTable();
         assert _system_symbol_table.isSystemTable();
@@ -99,8 +100,10 @@ public IonSystemLite(IonTextWriterBuilder twb,
 
         bwb.setSymtabValueFactory(this);
         myBinaryWriterBuilder = bwb.immutable();
+    }
 
-        myReaderBuilder = rb.immutable();
+    IonReaderBuilder getReaderBuilder() {
+        return myReaderBuilder;
     }
 
     //==========================================================================
@@ -179,7 +182,7 @@ public SymbolTable getSystemSymbolTable(String ionVersionId)
 
     public Iterator<IonValue> iterate(Reader ionText)
     {
-        IonReader reader = makeReader(_catalog, ionText, _lstFactory);
+        IonReader reader = myReaderBuilder.build(ionText);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
@@ -187,13 +190,13 @@ public Iterator<IonValue> iterate(Reader ionText)
     public Iterator<IonValue> iterate(InputStream ionData)
     {
         // This method causes a memory leak when reading a gzipped stream, see deprecation notice.
-        IonReader reader = makeReader(_catalog, ionData, _lstFactory);
+        IonReader reader = myReaderBuilder.build(ionData);
         return iterate(reader);
     }
 
     public Iterator<IonValue> iterate(String ionText)
     {
-        IonReader reader = makeReader(_catalog, ionText, _lstFactory);
+        IonReader reader = myReaderBuilder.build(ionText);
         ReaderIterator iterator = new ReaderIterator(this, reader);
         return iterator;
     }
@@ -201,7 +204,7 @@ public Iterator<IonValue> iterate(String ionText)
     public Iterator<IonValue> iterate(byte[] ionData)
     {
         // This method causes a memory leak when reading a gzipped stream, see deprecation notice.
-        IonReader reader = makeReader(_catalog, ionData, _lstFactory);
+        IonReader reader = myReaderBuilder.build(ionData);
         return iterate(reader);
     }
 
diff --git a/src/com/amazon/ion/system/IonReaderBuilder.java b/src/com/amazon/ion/system/IonReaderBuilder.java
index dd2810639d..17a99c1110 100644
--- a/src/com/amazon/ion/system/IonReaderBuilder.java
+++ b/src/com/amazon/ion/system/IonReaderBuilder.java
@@ -15,9 +15,6 @@
 
 package com.amazon.ion.system;
 
-import static com.amazon.ion.impl._Private_IonReaderFactory.makeIncrementalReader;
-import static com.amazon.ion.impl._Private_IonReaderFactory.makeReader;
-
 import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
@@ -26,11 +23,8 @@
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.IonTextReader;
 import com.amazon.ion.IonValue;
-import com.amazon.ion.impl._Private_IonConstants;
-import com.amazon.ion.util.IonStreamUtils;
+import com.amazon.ion.impl._Private_IonReaderBuilder;
 
-import java.io.BufferedInputStream;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -45,7 +39,7 @@
  * in this class.
  */
 @SuppressWarnings("deprecation")
-public class IonReaderBuilder
+public abstract class IonReaderBuilder
 {
 
     private IonCatalog catalog = null;
@@ -53,15 +47,16 @@ public class IonReaderBuilder
     private IonBufferConfiguration bufferConfiguration = null;
     private boolean isAnnotationIteratorReuseEnabled = true;
 
-    private IonReaderBuilder()
+    protected IonReaderBuilder()
     {
     }
 
-    private IonReaderBuilder(IonReaderBuilder that)
+    protected IonReaderBuilder(IonReaderBuilder that)
     {
         this.catalog = that.catalog;
         this.isIncrementalReadingEnabled = that.isIncrementalReadingEnabled;
         this.bufferConfiguration = that.bufferConfiguration;
+        this.isAnnotationIteratorReuseEnabled = that.isAnnotationIteratorReuseEnabled;
     }
 
     /**
@@ -72,7 +67,7 @@ private IonReaderBuilder(IonReaderBuilder that)
      */
     public static IonReaderBuilder standard()
     {
-        return new Mutable();
+        return new _Private_IonReaderBuilder.Mutable();
     }
 
     /**
@@ -82,7 +77,7 @@ public static IonReaderBuilder standard()
      */
     public IonReaderBuilder copy()
     {
-        return new Mutable(this);
+        return new _Private_IonReaderBuilder.Mutable(this);
     }
 
     /**
@@ -163,7 +158,7 @@ public IonCatalog getCatalog()
         return catalog;
     }
 
-    private IonCatalog validateCatalog()
+    protected IonCatalog validateCatalog()
     {
         // matches behavior in IonSystemBuilder when no catalog provided
         return catalog != null ? catalog : new SimpleCatalog();
@@ -374,19 +369,7 @@ public IonReader build(byte[] ionData)
      *
      * @see IonSystem#newReader(byte[], int, int)
      */
-    public IonReader build(byte[] ionData, int offset, int length)
-    {
-        if (isIncrementalReadingEnabled) {
-            if (IonStreamUtils.isGzip(ionData, offset, length)) {
-                throw new IllegalArgumentException("Automatic GZIP detection is not supported with incremental" +
-                        "support enabled. Wrap the bytes with a GZIPInputStream and call build(InputStream).");
-            }
-            if (IonStreamUtils.isIonBinary(ionData, offset, length)) {
-                return makeIncrementalReader(this, new ByteArrayInputStream(ionData, offset, length));
-            }
-        }
-        return makeReader(validateCatalog(), ionData, offset, length);
-    }
+    public abstract IonReader build(byte[] ionData, int offset, int length);
 
     /**
      * Based on the builder's configuration properties, creates a new IonReader
@@ -408,32 +391,7 @@ public IonReader build(byte[] ionData, int offset, int length)
      *
      * @see IonSystem#newReader(InputStream)
      */
-    public IonReader build(InputStream ionData)
-    {
-        InputStream wrapper = ionData;
-        if (isIncrementalReadingEnabled) {
-            if (!ionData.markSupported()) {
-                wrapper = new BufferedInputStream(ionData);
-            }
-            wrapper.mark(_Private_IonConstants.BINARY_VERSION_MARKER_SIZE);
-            byte[] possibleIVM = new byte[_Private_IonConstants.BINARY_VERSION_MARKER_SIZE];
-            int bytesRead;
-            try {
-                bytesRead = wrapper.read(possibleIVM);
-                wrapper.reset();
-            } catch (IOException e) {
-                throw new IonException(e);
-            }
-            if (IonStreamUtils.isGzip(possibleIVM, 0, possibleIVM.length)) {
-                throw new IllegalArgumentException("Automatic GZIP detection is not supported with incremental" +
-                        "support enabled. Wrap the bytes with a GZIPInputStream and call build(InputStream).");
-            }
-            if (possibleIVM.length == bytesRead && IonStreamUtils.isIonBinary(possibleIVM)) {
-                return makeIncrementalReader(this, wrapper);
-            }
-        }
-        return makeReader(validateCatalog(), wrapper);
-    }
+    public abstract IonReader build(InputStream ionData);
 
     /**
      * Based on the builder's configuration properties, creates a new
@@ -452,10 +410,7 @@ public IonReader build(InputStream ionData)
      *
      * @see IonSystem#newReader(Reader)
      */
-    public IonReader build(Reader ionText)
-    {
-        return makeReader(validateCatalog(), ionText);
-    }
+    public abstract IonReader build(Reader ionText);
 
     /**
      * Based on the builder's configuration properties, creates a new
@@ -470,10 +425,7 @@ public IonReader build(Reader ionText)
      *
      * @see IonSystem#newReader(IonValue)
      */
-    public IonReader build(IonValue value)
-    {
-        return makeReader(validateCatalog(), value);
-    }
+    public abstract IonReader build(IonValue value);
 
     /**
      * Based on the builder's configuration properties, creates an new
@@ -483,40 +435,6 @@ public IonReader build(IonValue value)
      *
      * @see IonSystem#newReader(String)
      */
-    public IonTextReader build(String ionText)
-    {
-        return makeReader(validateCatalog(), ionText);
-    }
-
-    private static class Mutable extends IonReaderBuilder
-    {
-
-        private Mutable()
-        {
-        }
-
-        private Mutable(IonReaderBuilder that)
-        {
-            super(that);
-        }
-
-        @Override
-        public IonReaderBuilder immutable()
-        {
-            return new IonReaderBuilder(this);
-        }
-
-        @Override
-        public IonReaderBuilder mutable()
-        {
-            return this;
-        }
-
-        @Override
-        protected void mutationCheck()
-        {
-        }
-
-    }
+    public abstract IonTextReader build(String ionText);
 
 }
diff --git a/src/com/amazon/ion/system/IonSystemBuilder.java b/src/com/amazon/ion/system/IonSystemBuilder.java
index 22141e83b7..c6c69c74f8 100644
--- a/src/com/amazon/ion/system/IonSystemBuilder.java
+++ b/src/com/amazon/ion/system/IonSystemBuilder.java
@@ -101,6 +101,7 @@ public static IonSystemBuilder standard()
 
     IonCatalog myCatalog;
     boolean myStreamCopyOptimized = false;
+    IonReaderBuilder readerBuilder;
 
 
     /** You no touchy. */
@@ -113,6 +114,7 @@ private IonSystemBuilder(IonSystemBuilder that)
     {
         this.myCatalog      = that.myCatalog;
         this.myStreamCopyOptimized = that.myStreamCopyOptimized;
+        this.readerBuilder = that.readerBuilder;
     }
 
     //=========================================================================
@@ -271,6 +273,59 @@ public final IonSystemBuilder withStreamCopyOptimized(boolean optimized)
 
 
 
+    //=========================================================================
+
+    /**
+     * Gets the reader builder whose options will be used when building an
+     * {@link IonSystem}. By default, {@link IonReaderBuilder#standard()} will
+     * be used.
+     *
+     * @see #setReaderBuilder(IonReaderBuilder)
+     * @see #withReaderBuilder(IonReaderBuilder)
+     */
+    public final IonReaderBuilder getReaderBuilder() {
+        return readerBuilder;
+    }
+
+    /**
+     * Sets the reader builder whose options will be used to use when building
+     * an {@link IonSystem}. The reader builder's catalog will never be used; the
+     * catalog provided to {@link #setCatalog(IonCatalog)} or
+     * {@link #withCatalog(IonCatalog)} will always be used instead.
+     *
+     * @param builder the reader builder to use in built systems.
+     *  If null, each system will be built with {@link IonReaderBuilder#standard()}.
+     *
+     * @see #getReaderBuilder()
+     * @see #withReaderBuilder(IonReaderBuilder)
+     *
+     * @throws UnsupportedOperationException if this is immutable.
+     */
+    public final void setReaderBuilder(IonReaderBuilder builder) {
+        mutationCheck();
+        readerBuilder = builder;
+    }
+
+    /**
+     * Declares the reader builder whose options will be used to use when building
+     * an {@link IonSystem}, returning a new mutable builder if this is immutable.
+     * The reader builder's catalog will never be used; the catalog provided to
+     * {@link #setCatalog(IonCatalog)} or {@link #withCatalog(IonCatalog)} will
+     * always be used instead.
+     *
+     * @param builder the reader builder to use in built systems.
+     *  If null, each system will be built with {@link IonReaderBuilder#standard()}.
+     *
+     * @see #getReaderBuilder()
+     * @see #setReaderBuilder(IonReaderBuilder)
+     */
+    public final IonSystemBuilder withReaderBuilder(IonReaderBuilder builder)
+    {
+        IonSystemBuilder b = mutable();
+        b.setReaderBuilder(builder);
+        return b;
+    }
+
     //=========================================================================
 
     /**
@@ -298,10 +353,9 @@ public final IonSystem build()
         bwb.setInitialSymbolTable(systemSymtab);
         // This is what we need, more or less.
 //        bwb = bwb.fillDefaults();
-        IonReaderBuilder rb = IonReaderBuilder.standard().withCatalog(catalog);
-        IonSystem sys = newLiteSystem(twb, bwb, rb);
-
-        return sys;
+        IonReaderBuilder rb = readerBuilder == null ? IonReaderBuilder.standard() : readerBuilder;
+        rb = rb.withCatalog(catalog);
+        return newLiteSystem(twb, bwb, rb);
     }
 
     //=========================================================================
diff --git a/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java b/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
index 1bc2fac1a7..cfa28c8f3c 100644
--- a/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
@@ -23,6 +23,11 @@ public class BinaryByteArrayIteratorSystemProcessingTest
 {
     private byte[] myBytes;
 
+    @Override
+    protected int expectedLocalNullSlotSymbolId()
+    {
+        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+    }
 
     @Override
     protected void prepare(String text)
diff --git a/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java b/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
index a0986d1201..e814e2982b 100644
--- a/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
@@ -26,6 +26,11 @@ public class BinaryStreamIteratorSystemProcessingTest
     private byte[] myBytes;
     private InputStream myStream;
 
+    @Override
+    protected int expectedLocalNullSlotSymbolId()
+    {
+        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+    }
 
     @Override
     protected void prepare(String text)
diff --git a/test/com/amazon/ion/BinaryTest.java b/test/com/amazon/ion/BinaryTest.java
index b29d3c998f..5cfe3d6995 100644
--- a/test/com/amazon/ion/BinaryTest.java
+++ b/test/com/amazon/ion/BinaryTest.java
@@ -78,24 +78,6 @@ public static String bytesToHex(final byte[] bytes)
     private IonValue ion(final String hex)
     {
         byte[] data = hexToBytes(MAGIC_COOKIE + hex);
-        // Note: when ion-java#379 is complete, the following branch should be removed.
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            IonReader reader = getStreamingMode().newIonReader(system().getCatalog(), data);
-            Iterator<IonValue> iterator = system().iterate(reader);
-            IonValue value = null;
-            if (iterator.hasNext()) {
-                value = iterator.next();
-            }
-            if (iterator.hasNext()) {
-                throw new IonException("not a single value");
-            }
-            try {
-                reader.close();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-            return value;
-        }
         return system().singleValue(data);
     }
 
diff --git a/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java b/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
index f8077abb08..9c328e8043 100644
--- a/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
+++ b/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
@@ -40,6 +40,14 @@ public void setDatagramMaker(DatagramMaker maker)
         myDatagramMaker = maker;
     }
 
+    @Override
+    protected int expectedLocalNullSlotSymbolId()
+    {
+        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL  && myDatagramMaker.sourceIsBinary()
+            ? 0
+            : 10;
+    }
+
     /**
      * Load the datagram. The datagram is only loaded during
      * {@link #read()} and {@link #systemRead()}.
diff --git a/test/com/amazon/ion/IonSystemTest.java b/test/com/amazon/ion/IonSystemTest.java
index 9aa5df6ce5..ff1f20d486 100644
--- a/test/com/amazon/ion/IonSystemTest.java
+++ b/test/com/amazon/ion/IonSystemTest.java
@@ -29,12 +29,19 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.zip.GZIPOutputStream;
+
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 
 public class IonSystemTest
     extends IonTestCase
 {
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
     //========================================================================
     // iterate(Reader)
 
@@ -312,6 +319,12 @@ private void checkGzipDetection(byte[] bytes)
         checkInt(1234, dg.get(0));
     }
 
+    private void expectIncrementalReaderToFail() {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            thrown.expect(IllegalArgumentException.class);
+        }
+    }
+
     @Test
     public void testGzipDetection()
         throws Exception
@@ -321,12 +334,14 @@ public void testGzipDetection()
         byte[] gzipTextBytes = gzip(textBytes);
 
         checkGzipDetection(textBytes);
+        expectIncrementalReaderToFail();
         checkGzipDetection(gzipTextBytes);
 
         byte[] binaryBytes = loader().load(ionText).getBytes();
         byte[] gzipBinaryBytes = gzip(binaryBytes);
 
         checkGzipDetection(binaryBytes);
+        expectIncrementalReaderToFail();
         checkGzipDetection(gzipBinaryBytes);
     }
 
@@ -347,6 +362,7 @@ public void singleValueTextGzip() throws IOException
         String ionText = "1234";
         byte[] textBytes = _Private_Utils.utf8(ionText);
         byte[] gzipTextBytes = gzip(textBytes);
+        expectIncrementalReaderToFail();
         IonInt ionValue = (IonInt) system().singleValue(gzipTextBytes);
 
         assertEquals(1234, ionValue.intValue());
@@ -358,6 +374,7 @@ public void singleValueBinaryGzip() throws IOException
         String ionText = "1234";
         byte[] binaryIon = toBinaryIon(ionText);
         byte[] gzipBytes = gzip(binaryIon);
+        expectIncrementalReaderToFail();
         IonInt ionValue = (IonInt) system().singleValue(gzipBytes);
 
         assertEquals(1234, ionValue.intValue());
diff --git a/test/com/amazon/ion/IonTestCase.java b/test/com/amazon/ion/IonTestCase.java
index 170889ce33..92af228d3c 100644
--- a/test/com/amazon/ion/IonTestCase.java
+++ b/test/com/amazon/ion/IonTestCase.java
@@ -63,29 +63,26 @@ public abstract class IonTestCase
     protected enum StreamingMode {
         NEW_STREAMING() {
             @Override
-            public IonReader newIonReader(IonCatalog catalog, InputStream inputStream) {
-                return IonReaderBuilder.standard().withCatalog(catalog).build(inputStream);
-            }
-
-            @Override
-            public IonReader newIonReader(IonCatalog catalog, byte[] data) {
-                return IonReaderBuilder.standard().withCatalog(catalog).build(data);
+            public IonReaderBuilder getReaderBuilder() {
+                return IonReaderBuilder.standard();
             }
         },
         NEW_STREAMING_INCREMENTAL() {
             @Override
-            public IonReader newIonReader(IonCatalog catalog, InputStream inputStream) {
-                return IonReaderBuilder.standard().withCatalog(catalog).withIncrementalReadingEnabled(true).build(inputStream);
-            }
-
-            @Override
-            public IonReader newIonReader(IonCatalog catalog, byte[] data) {
-                return IonReaderBuilder.standard().withCatalog(catalog).withIncrementalReadingEnabled(true).build(data);
+            public IonReaderBuilder getReaderBuilder() {
+                return IonReaderBuilder.standard().withIncrementalReadingEnabled(true);
             }
         };
 
-        public abstract IonReader newIonReader(IonCatalog catalog, InputStream inputStream);
-        public abstract IonReader newIonReader(IonCatalog catalog, byte[] data);
+        public abstract IonReaderBuilder getReaderBuilder();
+
+        public final IonReader newIonReader(IonCatalog catalog, InputStream inputStream) {
+            return getReaderBuilder().withCatalog(catalog).build(inputStream);
+        }
+
+        public final IonReader newIonReader(IonCatalog catalog, byte[] data) {
+            return getReaderBuilder().withCatalog(catalog).build(data);
+        }
     }
 
     // Using an enum makes the test names more understandable than a boolean.
@@ -259,16 +256,7 @@ public IonDatagram load(File ionFile)
         throws IonException, IOException
     {
         IonLoader loader = loader();
-        IonDatagram dg;
-        // Note: when ion-java#379 is complete, the following branches should be replaced with
-        // `dg = loader.load(ionFile)`.
-        if (ionFile.getName().endsWith(".ion")) {
-            dg = loader.load(ionFile);
-        } else {
-            IonReader reader = myStreamingMode.newIonReader(system().getCatalog(), new FileInputStream(ionFile));
-            dg = loader.load(reader);
-            reader.close();
-        }
+        IonDatagram dg = loader.load(ionFile);
 
         // Flush out any encoding problems in the data.
         forceDeepMaterialization(dg);
@@ -317,6 +305,7 @@ protected _Private_IonSystem newSystem(IonCatalog catalog)
         IonSystemBuilder b = IonSystemBuilder.standard().withCatalog(catalog);
 
         b.withStreamCopyOptimized(myStreamCopyOptimized);
+        b.withReaderBuilder(getStreamingMode().getReaderBuilder());
 
         IonSystem system = b.build();
         return (_Private_IonSystem) system;
@@ -828,7 +817,7 @@ public static void checkSymbol(String name, int id, IonValue value)
 
         assertFalse(value.isNullValue());
 
-        if (name == null && id != 0)
+        if (name == null)
         {
             try {
                 sym.stringValue();
@@ -841,7 +830,6 @@ public static void checkSymbol(String name, int id, IonValue value)
         }
         else
         {
-            // Note: symbol zero follows this path because it causes stringValue() to return null rather than throw.
             assertEquals("symbol name", name, sym.stringValue());
         }
 
diff --git a/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java b/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
index d90dffb0e2..5e46a99545 100644
--- a/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
+++ b/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
@@ -23,6 +23,11 @@ public class LoadBinaryBytesSystemProcessingTest
 {
     private byte[] myBytes;
 
+    @Override
+    protected int expectedLocalNullSlotSymbolId()
+    {
+        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+    }
 
     @Override
     protected void prepare(String text)
diff --git a/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java b/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
index d938fd9a3b..487c0203bd 100644
--- a/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
+++ b/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
@@ -24,6 +24,11 @@ public class LoadBinaryStreamSystemProcessingTest
 {
     private byte[] myBytes;
 
+    @Override
+    protected int expectedLocalNullSlotSymbolId()
+    {
+        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+    }
 
     @Override
     protected void prepare(String text)
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
index 992737f5ed..5d114b19a4 100644
--- a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
+++ b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
@@ -4,10 +4,15 @@
 import com.amazon.ion.Decimal;
 import com.amazon.ion.IntegerSize;
 import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonException;
+import com.amazon.ion.IonLoader;
 import com.amazon.ion.IonReader;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
 import com.amazon.ion.IonWriter;
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SymbolToken;
@@ -790,6 +795,110 @@ public void incrementalMultipleValues() throws Exception {
         reader.close();
     }
 
+    @Test
+    public void incrementalMultipleValuesLoadFromReader() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        final IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, pipe);
+        final IonLoader loader = SYSTEM.getLoader();
+        byte[] bytes = toBinary("value_type::\"StringValueLong\"");
+        for (byte b : bytes) {
+            IonDatagram empty = loader.load(reader);
+            assertTrue(empty.isEmpty());
+            pipe.receive(b);
+        }
+        IonDatagram firstValue = loader.load(reader);
+        assertEquals(1, firstValue.size());
+        IonString string = (IonString) firstValue.get(0);
+        assertEquals("StringValueLong", string.stringValue());
+        assertEquals(Collections.singletonList("value_type"), Arrays.asList(string.getTypeAnnotations()));
+        bytes = toBinary("{foobar: \"StringValueLong\"}");
+        for (byte b : bytes) {
+            IonDatagram empty = loader.load(reader);
+            assertTrue(empty.isEmpty());
+            pipe.receive(b);
+        }
+        IonDatagram secondValue = loader.load(reader);
+        assertEquals(1, secondValue.size());
+        IonStruct struct = (IonStruct) secondValue.get(0);
+        string = (IonString) struct.get("foobar");
+        assertEquals("StringValueLong", string.stringValue());
+        IonDatagram empty = loader.load(reader);
+        assertTrue(empty.isEmpty());
+        reader.close();
+    }
+
+    @Test
+    public void incrementalMultipleValuesLoadFromInputStreamFails() throws Exception {
+        final ResizingPipedInputStream pipe = new ResizingPipedInputStream(1);
+        final IonLoader loader = IonSystemBuilder.standard()
+            .withReaderBuilder(STANDARD_READER_BUILDER)
+            .build()
+            .getLoader();
+        IonDatagram empty = loader.load(pipe);
+        assertTrue(empty.isEmpty());
+        pipe.receive(_Private_IonConstants.BINARY_VERSION_MARKER_1_0[0]);
+        // Because reader does not persist across load invocations, the loader must throw an exception if the reader
+        // had an incomplete value buffered.
+        thrown.expect(IonException.class);
+        loader.load(pipe);
+    }
+
+    private static void incrementalMultipleValuesIterate(
+        Iterator<IonValue> iterator,
+        ResizingPipedInputStream pipe
+    ) throws Exception {
+        byte[] bytes = toBinary("value_type::\"StringValueLong\"");
+        for (byte b : bytes) {
+            assertFalse(iterator.hasNext());
+            pipe.receive(b);
+        }
+        assertTrue(iterator.hasNext());
+        IonString string = (IonString) iterator.next();
+        assertEquals("StringValueLong", string.stringValue());
+        assertEquals(Collections.singletonList("value_type"), Arrays.asList(string.getTypeAnnotations()));
+        bytes = toBinary("{foobar: \"StringValueLong\"}");
+        for (byte b : bytes) {
+            assertFalse(iterator.hasNext());
+            pipe.receive(b);
+        }
+        assertTrue(iterator.hasNext());
+        IonStruct struct = (IonStruct) iterator.next();
+        string = (IonString) struct.get("foobar");
+        assertEquals("StringValueLong", string.stringValue());
+        assertFalse(iterator.hasNext());
+    }
+
+    @Test
+    public void incrementalMultipleValuesIterateFromReader() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        IonReader reader = STANDARD_READER_BUILDER.build(pipe);
+        Iterator<IonValue> iterator = SYSTEM.iterate(reader);
+        incrementalMultipleValuesIterate(iterator, pipe);
+        reader.close();
+    }
+
+    @Test
+    public void incrementalMultipleValuesIterateFromInputStream() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        IonSystem system = IonSystemBuilder.standard().withReaderBuilder(STANDARD_READER_BUILDER).build();
+        Iterator<IonValue> iterator = system.iterate(pipe);
+        incrementalMultipleValuesIterate(iterator, pipe);
+    }
+
+    @Test
+    public void incrementalReadInitiallyEmptyStreamThatTurnsOutToBeText() {
+        // Note: if incremental text read support is added, this test will start failing, which is expected. For now,
+        // we ensure that this fails quickly.
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(1);
+        IonReader reader = STANDARD_READER_BUILDER.build(pipe);
+        assertNull(reader.next());
+        // Valid text Ion. Also hex 0x20, which is binary int 0. However, it is not preceded by the IVM, so it must be
+        // interpreted as text. The binary reader must fail.
+        pipe.receive(' ');
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
     @Test
     public void incrementalSymbolTables() throws Exception {
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java b/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
index f03707ab21..cb44b93335 100644
--- a/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
+++ b/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
@@ -180,7 +180,10 @@ protected void checkWriteValue(boolean expectedTransferInvoked)
 
         // TODO amzn/ion-java/issues/16 - Currently, doesn't copy annotations or field names,
         //      so we always expect no transfer of raw bytes
-        if (ir.isInStruct() || ir.getTypeAnnotationSymbols().length > 0)
+        // TODO amzn/ion-java/issues/381 - IonReaderBinaryIncremental currently doesn't support the byte transfer
+        //      facet. Once this is fixed, remove the `asFacet` check below.
+        if (ir.isInStruct() || ir.getTypeAnnotationSymbols().length > 0
+            || ir.asFacet(_Private_ByteTransferReader.class) == null)
         {
             expectedTransferInvoked = false;
         }
diff --git a/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java b/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
index 665eb853d2..5720b15701 100644
--- a/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
+++ b/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
@@ -65,6 +65,11 @@ private void readBeyondMaxInt(byte[] data, IonType valueType)
     @Test
     public void testCurrentSpanBeyondMaxInt()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         IonDatagram dg = system().newDatagram();
         dg.add().newBlob(new byte[2000]);
         byte[] binary = dg.getBytes();
@@ -80,6 +85,11 @@ public void testCurrentSpanBeyondMaxInt()
     @Test
     public void testCurrentSpanBeyondMaxIntForOrderedStruct()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         // Value is ordered-struct { name:{{ /* 1024 bytes */}} }
 
         byte[] data = hexToBytes("E0 01 00 EA "
diff --git a/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java b/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
index 9c62e0312f..5c6fa61776 100644
--- a/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
+++ b/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
@@ -55,6 +55,11 @@ public void checkCurrentSpan(int binaryStart, int binaryFinish, int textStart)
     @Test
     public void testCurrentSpan()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         read("'''hello''' 1 2 3 4 5 6 7 8 9 10 '''Kumo the fluffy dog! He is so fluffy and yet so happy!'''");
         assertSame(IonType.STRING, in.next());
         checkCurrentSpan(4, 10, 0);
@@ -72,6 +77,11 @@ public void testCurrentSpan()
 
     @Test
     public void testCurrentSpanFromStreamMed() throws IOException {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         final ByteArrayOutputStream buf = new ByteArrayOutputStream();
         final int count = 8000;
         for (int i = 0; i < count; i++) {
diff --git a/test/com/amazon/ion/streaming/SeekableReaderTest.java b/test/com/amazon/ion/streaming/SeekableReaderTest.java
index cc6ce61cda..b31c2ad9aa 100644
--- a/test/com/amazon/ion/streaming/SeekableReaderTest.java
+++ b/test/com/amazon/ion/streaming/SeekableReaderTest.java
@@ -58,6 +58,11 @@ private void checkSpans(IonDatagram dg, Span[] positions)
     @Test
     public void testTrivialSpan()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         String text = "null";
         read(text);
         in.next();
@@ -73,6 +78,11 @@ public void testTrivialSpan()
     @Test
     public void testWalkingBackwards()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         String text =
             "null true 3 4e0 5.0 6666-06-06T '7' \"8\" {{\"\"}} {{}} [] () {}";
 
@@ -113,6 +123,11 @@ public void testWalkingBackwards()
     @Test
     public void testHoistingWithinContainers()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         read("{f:v,g:[c, (d), e], /* h */ $0:null} s");
 
         in.next();
@@ -188,6 +203,11 @@ public void testHoistingWithinContainers()
     @Test
     public void testHoistingLongValue()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         // This value is "long" in that it has a length subfield in the prefix.
         String text = " \"123456789012345\" ";
         read(text);
@@ -205,6 +225,11 @@ public void testHoistingLongValue()
     public void testHoistingOrderedStruct()
     throws IOException
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         File file = getTestdataFile("good/structOrdered.10n");
         byte[] binary = _Private_Utils.loadFileBytes(file);
 
@@ -224,6 +249,11 @@ public void testHoistingOrderedStruct()
     public void testHoistingAnnotatedTopLevelValue()
         throws IOException
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         read("a::v");
         in.next();
         Span span = sr.currentSpan();
@@ -241,6 +271,11 @@ public void testHoistingAnnotatedTopLevelValue()
     public void testHoistingAnnotatedContainedValue()
         throws IOException
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         read("[a::v]");
         in.next();
         in.stepIn();
diff --git a/test/com/amazon/ion/streaming/SpanReaderTest.java b/test/com/amazon/ion/streaming/SpanReaderTest.java
index 646906caca..d582049b36 100644
--- a/test/com/amazon/ion/streaming/SpanReaderTest.java
+++ b/test/com/amazon/ion/streaming/SpanReaderTest.java
@@ -43,6 +43,11 @@ public SpanReaderTest()
     @Test
     public void testCallingCurrentSpan()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         String text =
             "null true 3 4e0 5.0 6666-06-06T '7' \"8\" {{\"\"}} {{}} [] () {}";
 
@@ -80,6 +85,11 @@ public void testCallingCurrentSpan()
     @Test
     public void testCurrentSpanWithinContainers()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         read("{f:v,g:[c]} s");
 
         in.next();
@@ -110,6 +120,11 @@ public void testCurrentSpanWithinContainers()
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanBeforeFirstTopLevel()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            throw new IllegalStateException();
+        }
         read("foo");
         sp.currentSpan();
     }
@@ -117,6 +132,11 @@ public void testCurrentSpanBeforeFirstTopLevel()
 
     private void callCurrentSpanBeforeFirstChild(String ionText)
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         read(ionText);
         in.next();
         in.stepIn();
@@ -126,24 +146,44 @@ private void callCurrentSpanBeforeFirstChild(String ionText)
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanBeforeFirstListChild()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            throw new IllegalStateException();
+        }
         callCurrentSpanBeforeFirstChild("[v]");
     }
 
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanBeforeFirstSexpChild()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            throw new IllegalStateException();
+        }
         callCurrentSpanBeforeFirstChild("(v)");
     }
 
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanBeforeFirstStructChild()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            throw new IllegalStateException();
+        }
         callCurrentSpanBeforeFirstChild("{f:v}");
     }
 
 
     private void callCurrentSpanAfterLastChild(String ionText)
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            return;
+        }
         read(ionText);
         in.next();
         in.stepIn();
@@ -155,18 +195,33 @@ private void callCurrentSpanAfterLastChild(String ionText)
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanAfterLastListChild()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            throw new IllegalStateException();
+        }
         callCurrentSpanAfterLastChild("[v]");
     }
 
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanAfterLastSexpChild()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            throw new IllegalStateException();
+        }
         callCurrentSpanAfterLastChild("(v)");
     }
 
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanAfterLastStructChild()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            throw new IllegalStateException();
+        }
         callCurrentSpanAfterLastChild("{f:v}");
     }
 
@@ -174,6 +229,11 @@ public void testCurrentSpanAfterLastStructChild()
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanAtEndOfStream()
     {
+        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
+            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
+            //      See ion-java/issues/382 and ion-java/issues/383.
+            throw new IllegalStateException();
+        }
         read("foo");
         in.next();
         assertEquals(null, in.next());

From f6fa517d9368deabab14e8ea2c1220faa3635fc6 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Fri, 24 Sep 2021 17:28:48 -0700
Subject: [PATCH 138/490] Adds caching of the IonStruct representations of
 local symbol tables created by the incremental reader, improving performance
 for repetitive system iterates/gets. (#386)

---
 .../ion/impl/IonReaderBinaryIncremental.java  |  14 +-
 .../ion/impl/LocalSymbolTableAsStruct.java    | 148 ++----------------
 .../amazon/ion/impl/SymbolTableAsStruct.java  |  18 +++
 .../ion/impl/SymbolTableStructCache.java      | 137 ++++++++++++++++
 src/com/amazon/ion/impl/_Private_Utils.java   |  14 +-
 5 files changed, 190 insertions(+), 141 deletions(-)
 create mode 100644 src/com/amazon/ion/impl/SymbolTableAsStruct.java
 create mode 100644 src/com/amazon/ion/impl/SymbolTableStructCache.java

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
index b5fe5c74d8..94c5d053d7 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
@@ -6,6 +6,7 @@
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonWriter;
 import com.amazon.ion.ReadOnlyValueException;
@@ -13,6 +14,7 @@
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.Timestamp;
 import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.ValueFactory;
 import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.system.SimpleCatalog;
 
@@ -534,7 +536,7 @@ public int hashCode() {
     /**
      * Read-only snapshot of the local symbol table at the reader's current position.
      */
-    private class LocalSymbolTableSnapshot implements SymbolTable {
+    private class LocalSymbolTableSnapshot implements SymbolTable, SymbolTableAsStruct {
 
         // The system symbol table.
         private final SymbolTable system = SharedSymbolTable.getSystemSymbolTable(majorVersion);
@@ -555,6 +557,8 @@ private class LocalSymbolTableSnapshot implements SymbolTable {
         // List representation of this symbol table, indexed by symbol ID.
         final List<String> listView;
 
+        private SymbolTableStructCache structCache = null;
+
         LocalSymbolTableSnapshot() {
             int numberOfSymbols = symbols.size();
             maxId = numberOfSymbols - 1;
@@ -729,6 +733,14 @@ public void writeTo(IonWriter writer) throws IOException {
         public String toString() {
             return "(LocalSymbolTable max_id:" + getMaxId() + ')';
         }
+
+        @Override
+        public IonStruct getIonRepresentation(ValueFactory valueFactory) {
+            if (structCache == null) {
+                structCache = new SymbolTableStructCache(this, getImportedTables(), null);
+            }
+            return structCache.getIonRepresentation(valueFactory);
+        }
     }
 
     /**
diff --git a/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java b/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
index 98d325174b..eba71e282e 100644
--- a/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
@@ -15,19 +15,9 @@
 
 package com.amazon.ion.impl;
 
-import static com.amazon.ion.SystemSymbols.IMPORTS;
-import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static com.amazon.ion.SystemSymbols.MAX_ID;
-import static com.amazon.ion.SystemSymbols.NAME;
-import static com.amazon.ion.SystemSymbols.SYMBOLS;
-import static com.amazon.ion.SystemSymbols.VERSION;
-
 import com.amazon.ion.IonCatalog;
-import com.amazon.ion.IonList;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonStruct;
-import com.amazon.ion.IonType;
-import com.amazon.ion.IonValue;
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.ValueFactory;
 import java.util.ArrayList;
@@ -41,6 +31,7 @@
 @Deprecated
 class LocalSymbolTableAsStruct
     extends LocalSymbolTable
+    implements SymbolTableAsStruct
 {
 
     static class Factory implements _Private_LocalSymbolTableFactory
@@ -72,7 +63,7 @@ public SymbolTable newLocalSymtab(IonCatalog catalog,
                 // This was an LST append, so the existing symbol table was updated.
                 return currentSymbolTable;
             }
-            return new LocalSymbolTableAsStruct(imageFactory, imports, symbolsList);
+            return new LocalSymbolTableAsStruct(imports, symbolsList, null);
         }
 
         public SymbolTable newLocalSymtab(SymbolTable defaultSystemSymtab,
@@ -81,9 +72,7 @@ public SymbolTable newLocalSymtab(SymbolTable defaultSystemSymtab,
             LocalSymbolTableImports unifiedSymtabImports =
                 new LocalSymbolTableImports(defaultSystemSymtab, imports);
 
-            return new LocalSymbolTableAsStruct(imageFactory,
-                                                unifiedSymtabImports,
-                                                null /* local symbols */);
+            return new LocalSymbolTableAsStruct(unifiedSymtabImports, null /* local symbols */, null);
         }
 
         /**
@@ -109,49 +98,32 @@ public SymbolTable newLocalSymtab(IonCatalog catalog,
                                                                    symbolsList,
                                                                    ionRep.getSymbolTable());
 
-            LocalSymbolTableAsStruct table = new LocalSymbolTableAsStruct(imageFactory,
-                                                                          imports,
-                                                                          symbolsList);
-            table.myImage = ionRep;
-
-            return table;
+            return new LocalSymbolTableAsStruct(imports, symbolsList, ionRep);
         }
 
     }
 
-    /**
-     * The factory used to build the {@link #myImage} of a local symtab.
-     * It's used by the datagram level to maintain the tree representation.
-     * It cannot be changed since local symtabs can't be moved between trees.
-     */
-    private final ValueFactory myImageFactory;
-
-    /**
-     * Memoized result of {@link #getIonRepresentation()};
-     * Once this is created, we maintain it as symbols are added.
-     */
-    private IonStruct myImage;
+    private final SymbolTableStructCache structCache;
 
     /**
-     * @param imageFactory      never null
      * @param imports           never null
      * @param symbolsList       may be null or empty
      */
-    private LocalSymbolTableAsStruct(ValueFactory imageFactory,
-                                     LocalSymbolTableImports imports,
-                                     List<String> symbolsList)
+    private LocalSymbolTableAsStruct(LocalSymbolTableImports imports,
+                                     List<String> symbolsList,
+                                     IonStruct image)
     {
         super(imports, symbolsList);
-        myImageFactory = imageFactory;
+        structCache = new SymbolTableStructCache(this, imports.getImportedTablesNoCopy(), image);
     }
 
     @Override
     int putSymbol(String symbolName)
     {
         int sid = super.putSymbol(symbolName);
-        if (myImage != null)
+        if (structCache.hasStruct())
         {
-            recordLocalSymbolInIonRep(myImage, symbolName, sid);
+            structCache.addSymbol(symbolName, sid);
         }
         return sid;
     }
@@ -170,102 +142,10 @@ int putSymbol(String symbolName)
     //       then extra content doesn't matter.
     //
 
-    /**
-     * Only valid on local symtabs that already have an _image_factory set.
-     *
-     * @return Not null.
-     */
-    IonStruct getIonRepresentation()
-    {
-        synchronized (this)
-        {
-            IonStruct image = myImage;
-
-            if (image == null)
-            {
-                // Start a new image from scratch
-                myImage = image = makeIonRepresentation(myImageFactory);
-            }
-
-            return image;
-        }
-    }
-
-    /**
-     * NOT SYNCHRONIZED! Call only from a synch'd method.
-     *
-     * @return a new struct, not null.
-     */
-    private IonStruct makeIonRepresentation(ValueFactory factory)
-    {
-        IonStruct ionRep = factory.newEmptyStruct();
-
-        ionRep.addTypeAnnotation(ION_SYMBOL_TABLE);
-
-        SymbolTable[] importedTables = getImportedTablesNoCopy();
-
-        if (importedTables.length > 1)
-        {
-            IonList importsList = factory.newEmptyList();
-            for (int i = 1; i < importedTables.length; i++)
-            {
-                SymbolTable importedTable = importedTables[i];
-                IonStruct importStruct = factory.newEmptyStruct();
-
-                importStruct.add(NAME,
-                                 factory.newString(importedTable.getName()));
-                importStruct.add(VERSION,
-                                 factory.newInt(importedTable.getVersion()));
-                importStruct.add(MAX_ID,
-                                 factory.newInt(importedTable.getMaxId()));
-
-                importsList.add(importStruct);
-            }
-            ionRep.add(IMPORTS, importsList);
-        }
-
-        if (mySymbolsCount > 0)
-        {
-            int sid = myFirstLocalSid;
-            for (int offset = 0; offset < mySymbolsCount; offset++, sid++)
-            {
-                String symbolName = mySymbolNames[offset];
-                recordLocalSymbolInIonRep(ionRep, symbolName, sid);
-            }
-        }
-
-        return ionRep;
-    }
-
-    /**
-     * NOT SYNCHRONIZED! Call within constructor or from synched method.
-     * @param symbolName can be null when there's a gap in the local symbols list.
-     */
-    private void recordLocalSymbolInIonRep(IonStruct ionRep,
-                                           String symbolName,
-                                           int sid)
+    @Override
+    public IonStruct getIonRepresentation(ValueFactory factory)
     {
-        assert sid >= myFirstLocalSid;
-
-        ValueFactory sys = ionRep.getSystem();
-
-        // TODO this is crazy inefficient and not as reliable as it looks
-        // since it doesn't handle the case where's theres more than one list
-        IonValue syms = ionRep.get(SYMBOLS);
-        while (syms != null && syms.getType() != IonType.LIST)
-        {
-            ionRep.remove(syms);
-            syms = ionRep.get(SYMBOLS);
-        }
-        if (syms == null)
-        {
-            syms = sys.newEmptyList();
-            ionRep.put(SYMBOLS, syms);
-        }
-
-        int this_offset = sid - myFirstLocalSid;
-        IonValue name = sys.newString(symbolName);
-        ((IonList)syms).add(this_offset, name);
+        return structCache.getIonRepresentation(factory);
     }
 
 }
diff --git a/src/com/amazon/ion/impl/SymbolTableAsStruct.java b/src/com/amazon/ion/impl/SymbolTableAsStruct.java
new file mode 100644
index 0000000000..6987a0e6b9
--- /dev/null
+++ b/src/com/amazon/ion/impl/SymbolTableAsStruct.java
@@ -0,0 +1,18 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.ValueFactory;
+
+/**
+ * Identifies {@link SymbolTable} implementations capable of producing IonStruct representations of themselves.
+ */
+interface SymbolTableAsStruct {
+
+    /**
+     * Provides an IonStruct representation of the SymbolTable.
+     * @param valueFactory the {@link ValueFactory} from which to construct the IonStruct.
+     * @return an IonStruct representing the SymbolTable.
+     */
+    IonStruct getIonRepresentation(ValueFactory valueFactory);
+}
diff --git a/src/com/amazon/ion/impl/SymbolTableStructCache.java b/src/com/amazon/ion/impl/SymbolTableStructCache.java
new file mode 100644
index 0000000000..df88e600ea
--- /dev/null
+++ b/src/com/amazon/ion/impl/SymbolTableStructCache.java
@@ -0,0 +1,137 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonList;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.ValueFactory;
+
+import java.util.Iterator;
+
+import static com.amazon.ion.SystemSymbols.IMPORTS;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
+import static com.amazon.ion.SystemSymbols.MAX_ID;
+import static com.amazon.ion.SystemSymbols.NAME;
+import static com.amazon.ion.SystemSymbols.SYMBOLS;
+import static com.amazon.ion.SystemSymbols.VERSION;
+
+/**
+ * Caches the IonStruct representation of a {@link SymbolTable}.
+ */
+class SymbolTableStructCache {
+
+    private final SymbolTable symbolTable;
+    private final SymbolTable[] importedTables;
+    private final int firstLocalSid;
+
+    /**
+     * Memoized result of {@link #getIonRepresentation(ValueFactory)};
+     * Once this is created, it may be mutated as symbols are added using {@link #addSymbol(String, int)}.
+     */
+    private IonStruct image;
+
+    /**
+     * @param symbolTable the SymbolTable to represent as an IonStruct.
+     * @param importedTables the symbol table's imported shared symbol tables.
+     * @param image the IonStruct representation, if available. If null, an IonStruct will be created lazily.
+     */
+    SymbolTableStructCache(SymbolTable symbolTable, SymbolTable[] importedTables, IonStruct image) {
+        this.symbolTable = symbolTable;
+        this.importedTables = importedTables;
+        this.firstLocalSid = symbolTable.getImportedMaxId() + 1;
+        this.image = image;
+    }
+
+    /**
+     * Returns the IonStruct representation of the symbol table. Creates and stores a new IonStruct on the first
+     * invocation.
+     * @param factory the {@link ValueFactory} from which to construct the IonStruct.
+     * @return an IonStruct representing the symbol table.
+     */
+    public IonStruct getIonRepresentation(ValueFactory factory) {
+        synchronized (this) {
+            if (image == null) {
+                makeIonRepresentation(factory);
+            }
+            return image;
+        }
+    }
+
+    /**
+     * @return true if an IonStruct has already been created for the symbol table; otherwise, false.
+     */
+    public boolean hasStruct() {
+        return image != null;
+    }
+
+    /**
+     * Create a new IonStruct representation of the symbol table.
+     * @param factory the {@link ValueFactory} from which to construct the IonStruct.
+     */
+    private void makeIonRepresentation(ValueFactory factory) {
+        image = factory.newEmptyStruct();
+
+        image.addTypeAnnotation(ION_SYMBOL_TABLE);
+
+        if (importedTables.length > 0) {
+            // The system symbol table may be the first import. If it is, skip it.
+            int i = importedTables[0].isSystemTable() ? 1 : 0;
+            if (i < importedTables.length) {
+                IonList importsList = factory.newEmptyList();
+                while (i < importedTables.length) {
+                    SymbolTable importedTable = importedTables[i];
+                    IonStruct importStruct = factory.newEmptyStruct();
+
+                    importStruct.add(NAME,
+                        factory.newString(importedTable.getName()));
+                    importStruct.add(VERSION,
+                        factory.newInt(importedTable.getVersion()));
+                    importStruct.add(MAX_ID,
+                        factory.newInt(importedTable.getMaxId()));
+
+                    importsList.add(importStruct);
+                    i++;
+                }
+                image.add(IMPORTS, importsList);
+            }
+        }
+
+        if (symbolTable.getMaxId() > symbolTable.getImportedMaxId()) {
+            Iterator<String> localSymbolIterator = symbolTable.iterateDeclaredSymbolNames();
+            int sid = symbolTable.getImportedMaxId() + 1;
+            while (localSymbolIterator.hasNext()) {
+                addSymbol(localSymbolIterator.next(), sid);
+                sid++;
+            }
+        }
+    }
+
+    /**
+     * Adds a new symbol table with the given symbol ID to the IonStruct's 'symbols' list.
+     * @param symbolName can be null when there's a gap in the local symbols list.
+     * @param sid the symbol ID to assign to the new symbol.
+     */
+    void addSymbol(String symbolName, int sid) {
+        assert sid >= firstLocalSid;
+
+        ValueFactory sys = image.getSystem();
+
+        IonValue syms = image.get(SYMBOLS);
+        // If the user has manually created a symbol table via an IonStruct, it may be malformed.
+        // The following removes any "symbols" fields that aren't lists, then creates a list for
+        // the symbols field if necessary.
+        while (syms != null && syms.getType() != IonType.LIST) {
+            image.remove(syms);
+            syms = image.get(SYMBOLS);
+        }
+        if (syms == null) {
+            syms = sys.newEmptyList();
+            image.put(SYMBOLS, syms);
+        }
+
+        int thisOffset = sid - firstLocalSid;
+        IonValue name = sys.newString(symbolName);
+        ((IonList) syms).add(thisOffset, name);
+    }
+}
diff --git a/src/com/amazon/ion/impl/_Private_Utils.java b/src/com/amazon/ion/impl/_Private_Utils.java
index e957377b32..09fff660d7 100644
--- a/src/com/amazon/ion/impl/_Private_Utils.java
+++ b/src/com/amazon/ion/impl/_Private_Utils.java
@@ -873,21 +873,23 @@ public static SymbolTable initialSymtab(_Private_LocalSymbolTableFactory lstFact
      */
     public static IonStruct symtabTree(SymbolTable symtab, ValueFactory valueFactory)
     {
-        LocalSymbolTableAsStruct localSymbolTableAsStruct;
-        if (symtab instanceof  LocalSymbolTableAsStruct) {
-            localSymbolTableAsStruct = (LocalSymbolTableAsStruct) symtab;
+        SymbolTableAsStruct localSymbolTableAsStruct;
+        if (symtab instanceof SymbolTableAsStruct) {
+            localSymbolTableAsStruct = (SymbolTableAsStruct) symtab;
         } else {
-            localSymbolTableAsStruct = (LocalSymbolTableAsStruct) new LocalSymbolTableAsStruct.Factory(valueFactory)
+            LocalSymbolTableAsStruct table =
+                (LocalSymbolTableAsStruct) new LocalSymbolTableAsStruct.Factory(valueFactory)
                     .newLocalSymtab(symtab.getSystemSymbolTable(), symtab.getImportedTables());
             Iterator<String> localSymbolsIterator = symtab.iterateDeclaredSymbolNames();
             while (localSymbolsIterator.hasNext()) {
                 String localSymbol = localSymbolsIterator.next();
                 if (localSymbol != null) {
-                    localSymbolTableAsStruct.intern(localSymbol);
+                    table.intern(localSymbol);
                 }
             }
+            localSymbolTableAsStruct = table;
         }
-        return localSymbolTableAsStruct.getIonRepresentation();
+        return localSymbolTableAsStruct.getIonRepresentation(valueFactory);
     }
 
     /**

From e1a24e862ec9fabd04afb183e8263b15dcb8002d Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Tue, 5 Oct 2021 16:51:38 -0700
Subject: [PATCH 139/490] Updates actions/setup-java to v2 in Github Actions
 main workflow

---
 .github/workflows/main.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4f4d7d7917..9d242e2d16 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,8 +18,9 @@ jobs:
         with:
           submodules: recursive
       - name: Use java ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
+          distribution: 'zulu'
           java-version: ${{ matrix.java }}
       - run: mvn test
       - run: mvn package -f ion-java-cli/pom.xml

From 2518f3107555f4f3e4c2b9a4274658257afea308 Mon Sep 17 00:00:00 2001
From: Gregg <greggt@a07817abbd56.ant.amazon.com>
Date: Fri, 6 Aug 2021 16:28:09 -0700
Subject: [PATCH 140/490] Adds a pool of UTF-8 decoders, making reader
 instantiation less expensive.

---
 .../ion/impl/IonReaderBinaryIncremental.java  | 33 ++-----
 .../amazon/ion/impl/IonReaderBinaryRawX.java  | 55 +++--------
 .../ion/impl/bin/IonRawBinaryWriter.java      |  2 +-
 .../ion/impl/bin/utf8/ByteBufferPool.java     | 26 +++++
 src/com/amazon/ion/impl/bin/utf8/Pool.java    | 64 ++++++++++++
 .../amazon/ion/impl/bin/utf8/Poolable.java    | 30 ++++++
 .../ion/impl/bin/utf8/PoolableByteBuffer.java | 33 +++++++
 .../ion/impl/bin/utf8/Utf8StringDecoder.java  | 97 +++++++++++++++++++
 .../impl/bin/utf8/Utf8StringDecoderPool.java  | 26 +++++
 .../ion/impl/bin/utf8/Utf8StringEncoder.java  | 29 +-----
 .../impl/bin/utf8/Utf8StringEncoderPool.java  | 51 ++--------
 11 files changed, 313 insertions(+), 133 deletions(-)
 create mode 100644 src/com/amazon/ion/impl/bin/utf8/ByteBufferPool.java
 create mode 100644 src/com/amazon/ion/impl/bin/utf8/Pool.java
 create mode 100644 src/com/amazon/ion/impl/bin/utf8/Poolable.java
 create mode 100644 src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java
 create mode 100644 src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoder.java
 create mode 100644 src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoderPool.java

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
index 94c5d053d7..054a7f6902 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
@@ -16,6 +16,8 @@
 import com.amazon.ion.UnknownSymbolException;
 import com.amazon.ion.ValueFactory;
 import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.impl.bin.utf8.Utf8StringDecoder;
+import com.amazon.ion.impl.bin.utf8.Utf8StringDecoderPool;
 import com.amazon.ion.system.SimpleCatalog;
 
 import java.io.IOException;
@@ -23,11 +25,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CoderResult;
 import java.util.Arrays;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
@@ -161,9 +160,6 @@ private static class SystemSymbolIDs {
         private static final int MAX_ID_ID = 8;
     }
 
-    // The size of the reusable UTF-8 decoding buffer.
-    private static final int UTF8_BUFFER_SIZE_IN_BYTES = 4 * 1024;
-
     // The final byte of the binary IVM.
     private static final int IVM_FINAL_BYTE = 0xEA;
 
@@ -233,8 +229,7 @@ private static class SystemSymbolIDs {
     // Stack to hold container info. Stepping into a container results in a push; stepping out results in a pop.
     private final _Private_RecyclingStack<ContainerInfo> containerStack;
 
-    // UTF-8 string decoder.
-    private final CharsetDecoder utf8CharsetDecoder = Charset.forName("UTF-8").newDecoder();
+    private final Utf8StringDecoder utf8Decoder = Utf8StringDecoderPool.getInstance().getOrCreate();
 
     // The symbol IDs for the annotations on the current value.
     private final List<Integer> annotationSids;
@@ -283,9 +278,6 @@ private static class SystemSymbolIDs {
     // The number of bytes of a lob value that the user has consumed, allowing for piecewise reads.
     private int lobBytesRead = 0;
 
-    // A reusable scratch space to hold decoded UTF-8 bytes.
-    private CharBuffer utf8DecodingBuffer = CharBuffer.allocate(UTF8_BUFFER_SIZE_IN_BYTES);
-
     // The type of value at which the reader is currently positioned.
     private IonType valueType = null;
 
@@ -1599,22 +1591,8 @@ public double doubleValue() {
      */
     private String readString(int valueStart, int valueEnd) {
         ByteBuffer utf8InputBuffer = buffer.getByteBuffer(valueStart, valueEnd);
-
         int numberOfBytes = valueEnd - valueStart;
-        if (numberOfBytes > utf8DecodingBuffer.capacity()) {
-            utf8DecodingBuffer = CharBuffer.allocate(numberOfBytes);
-        }
-
-        utf8DecodingBuffer.position(0);
-        utf8DecodingBuffer.limit(utf8DecodingBuffer.capacity());
-
-        utf8CharsetDecoder.reset();
-        CoderResult coderResult = utf8CharsetDecoder.decode(utf8InputBuffer, utf8DecodingBuffer, true);
-        if (coderResult.isError()) {
-            throw new IonException("Illegal value encountered while validating UTF-8 data in input stream. " + coderResult.toString());
-        }
-        utf8DecodingBuffer.flip();
-        return utf8DecodingBuffer.toString();
+        return utf8Decoder.decode(utf8InputBuffer, numberOfBytes);
     }
 
     @Override
@@ -1974,6 +1952,7 @@ public void requireCompleteValue() {
     public void close() throws IOException {
         requireCompleteValue();
         inputStream.close();
+        utf8Decoder.close();
     }
 
 }
diff --git a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
index 656000c3aa..8d23590b47 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
@@ -27,16 +27,16 @@
 import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
 import com.amazon.ion.impl._Private_ScalarConversions.AS_TYPE;
 import com.amazon.ion.impl._Private_ScalarConversions.ValueVariant;
+import com.amazon.ion.impl.bin.utf8.ByteBufferPool;
+import com.amazon.ion.impl.bin.utf8.PoolableByteBuffer;
+import com.amazon.ion.impl.bin.utf8.Utf8StringDecoder;
+import com.amazon.ion.impl.bin.utf8.Utf8StringDecoderPool;
 
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.MathContext;
 import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CoderResult;
 
 
 /**
@@ -58,7 +58,6 @@ abstract class IonReaderBinaryRawX
     static final int DEFAULT_CONTAINER_STACK_SIZE = 12; // a multiple of 3
     static final int DEFAULT_ANNOTATION_SIZE = 10;
     static final int NO_LIMIT = Integer.MIN_VALUE;
-    static final int UTF8_BUFFER_SIZE_IN_BYTES = 4 * 1024;
 
     protected enum State {
         S_INVALID,
@@ -104,18 +103,13 @@ protected enum State {
     int                 _container_top;
     long[]              _container_stack; // triples of: position, type, local_end
 
-
-    // `StandardCharsets.UTF_8` wasn't introduced until Java 7, so we have to use Charset#forName(String) instead.
-    private static final Charset UTF8 = Charset.forName("UTF-8");
-    private CharsetDecoder utf8CharsetDecoder = UTF8.newDecoder();
+    // Pooled decoder for UTF-8 strings.
+    private final Utf8StringDecoder utf8Decoder = Utf8StringDecoderPool.getInstance().getOrCreate();
 
     // Calling read() to pull in the next byte of a string requires an EOF check to be performed for each byte.
     // This reusable buffer allows us to call read(utf8InputBuffer) instead, letting us can pay the cost of an EOF check
     // once per buffer rather than once per byte.
-    private ByteBuffer utf8InputBuffer = ByteBuffer.allocate(UTF8_BUFFER_SIZE_IN_BYTES);
-
-    // A reusable scratch space to hold the decoded bytes as they're read from the utf8InputBuffer.
-    private CharBuffer utf8DecodingBuffer = CharBuffer.allocate(UTF8_BUFFER_SIZE_IN_BYTES);
+    private final PoolableByteBuffer pooledUtf8InputBuffer = ByteBufferPool.getInstance().getOrCreate();
 
     protected IonReaderBinaryRawX() {
     }
@@ -169,6 +163,8 @@ public void close()
         throws IOException
     {
         _input.close();
+        utf8Decoder.close();
+        pooledUtf8InputBuffer.close();
     }
 
     static private final int  POS_OFFSET        = 0;
@@ -1200,16 +1196,14 @@ protected final Timestamp readTimestamp(int len) throws IOException
 
     protected final String readString(int numberOfBytes) throws IOException
     {
+        ByteBuffer utf8InputBuffer = pooledUtf8InputBuffer.getBuffer();
         // If the string we're reading is small enough to fit in our reusable buffer, we can avoid the overhead
         // of looping and bounds checking.
         if (numberOfBytes <= utf8InputBuffer.capacity()) {
-            return readStringWithReusableBuffer(numberOfBytes);
+            return readStringWithReusableBuffer(numberOfBytes, utf8InputBuffer);
         }
 
-        // Otherwise, allocate a one-off decoding buffer that's large enough to hold the string
-        // and prepare to decode the string in chunks.
-        CharBuffer decodingBuffer = CharBuffer.allocate(numberOfBytes);
-        utf8CharsetDecoder.reset();
+        utf8Decoder.prepareDecode(numberOfBytes);
 
         int save_limit = NO_LIMIT;
         if (_local_remaining != NO_LIMIT) {
@@ -1246,14 +1240,7 @@ protected final String readString(int numberOfBytes) throws IOException
             utf8InputBuffer.position(0);
             utf8InputBuffer.limit(carryoverBytes + bytesRead);
 
-            CoderResult coderResult = utf8CharsetDecoder.decode(
-                    utf8InputBuffer,
-                    decodingBuffer,
-                    totalBytesRead >= numberOfBytes
-            );
-            if (coderResult.isError()) {
-                throw new IonException("Illegal value encountered while validating UTF-8 data in input stream. " + coderResult.toString());
-            }
+            utf8Decoder.partialDecode(utf8InputBuffer, totalBytesRead >= numberOfBytes);
 
             // Shift leftover partial character bytes (if any) to the beginning of the buffer
             carryoverBytes = utf8InputBuffer.remaining();
@@ -1270,11 +1257,10 @@ protected final String readString(int numberOfBytes) throws IOException
 
         _local_remaining = save_limit;
 
-        decodingBuffer.flip();
-        return decodingBuffer.toString();
+        return utf8Decoder.finishDecode();
     }
 
-    private String readStringWithReusableBuffer(int numberOfBytes) throws IOException {
+    private String readStringWithReusableBuffer(int numberOfBytes, ByteBuffer utf8InputBuffer) throws IOException {
         int save_limit = NO_LIMIT;
         if (_local_remaining != NO_LIMIT) {
             save_limit = _local_remaining - numberOfBytes;
@@ -1286,16 +1272,7 @@ private String readStringWithReusableBuffer(int numberOfBytes) throws IOExceptio
         utf8InputBuffer.position(0);
         utf8InputBuffer.limit(numberOfBytes);
 
-        utf8DecodingBuffer.position(0);
-        utf8DecodingBuffer.limit(utf8DecodingBuffer.capacity());
-
-        utf8CharsetDecoder.reset();
-        CoderResult coderResult = utf8CharsetDecoder.decode(utf8InputBuffer, utf8DecodingBuffer, true);
-        if (coderResult.isError()) {
-            throw new IonException("Illegal value encountered while validating UTF-8 data in input stream. " + coderResult.toString());
-        }
-        utf8DecodingBuffer.flip();
-        return utf8DecodingBuffer.toString();
+        return utf8Decoder.decode(utf8InputBuffer, numberOfBytes);
     }
 
     private final void throwUnexpectedEOFException() throws IOException {
diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 7d2e5606d6..bc7d63b5ee 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -126,7 +126,7 @@ private static byte[] bytes(int... vals) {
 
     final Utf8StringEncoder utf8StringEncoder = Utf8StringEncoderPool
             .getInstance()
-            .getOrCreateUtf8Encoder();
+            .getOrCreate();
 
     private static final byte[] makeTypedPreallocatedBytes(final int typeDesc, final int length)
     {
diff --git a/src/com/amazon/ion/impl/bin/utf8/ByteBufferPool.java b/src/com/amazon/ion/impl/bin/utf8/ByteBufferPool.java
new file mode 100644
index 0000000000..fe6a7608a2
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/utf8/ByteBufferPool.java
@@ -0,0 +1,26 @@
+package com.amazon.ion.impl.bin.utf8;
+
+/**
+ * A thread-safe shared pool of {@link PoolableByteBuffer}s.
+ */
+public class ByteBufferPool extends Pool<PoolableByteBuffer> {
+
+    private static final ByteBufferPool INSTANCE = new ByteBufferPool();
+
+    // Do not allow instantiation; all classes should share the singleton instance.
+    private ByteBufferPool() {
+        super(new Allocator<PoolableByteBuffer>() {
+            @Override
+            public PoolableByteBuffer newInstance(Pool<PoolableByteBuffer> pool) {
+                return new PoolableByteBuffer(pool);
+            }
+        });
+    }
+
+    /**
+     * @return a threadsafe shared instance of {@link ByteBufferPool}.
+     */
+    public static ByteBufferPool getInstance() {
+        return INSTANCE;
+    }
+}
diff --git a/src/com/amazon/ion/impl/bin/utf8/Pool.java b/src/com/amazon/ion/impl/bin/utf8/Pool.java
new file mode 100644
index 0000000000..647055bcc4
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/utf8/Pool.java
@@ -0,0 +1,64 @@
+package com.amazon.ion.impl.bin.utf8;
+
+import java.util.concurrent.ArrayBlockingQueue;
+
+abstract class Pool<T extends Poolable<?>> {
+
+    /**
+     * Allocates objects to be pooled.
+     * @param <T> the type of object.
+     */
+    interface Allocator<T extends Poolable<?>> {
+
+        /**
+         * Allocate a new object and link it to the given pool.
+         * @param pool the pool to which the new object will be linked.
+         * @return a new instance.
+         */
+        T newInstance(Pool<T> pool);
+    }
+
+    // The maximum number of objects that can be waiting in the queue before new ones will be discarded.
+    private static final int MAX_QUEUE_SIZE = 128;
+
+    // A queue of previously initialized objects that can be loaned out.
+    private final ArrayBlockingQueue<T> bufferQueue;
+
+    // Allocator of objects to be pooled.
+    private final Allocator<T> allocator;
+
+    Pool(Allocator<T> allocator) {
+        this.allocator = allocator;
+        bufferQueue = new ArrayBlockingQueue<T>(MAX_QUEUE_SIZE);
+    }
+
+    /**
+     * If the pool is not empty, removes an object from the pool and returns it;
+     * otherwise, constructs a new object.
+     *
+     * @return An object.
+     */
+    public T getOrCreate() {
+        // The `poll` method does not block. If the queue is empty it returns `null` immediately.
+        T object = bufferQueue.poll();
+        if (object == null) {
+            // No buffers were available in the pool. Create a new one.
+            object = allocator.newInstance(this);
+        }
+        return object;
+    }
+
+    /**
+     * Adds the provided instance to the pool. If the pool is full, the instance will
+     * be discarded.
+     *
+     * Callers MUST NOT use an object after returning it to the pool.
+     *
+     * @param object   An object to add to the pool.
+     */
+    public void returnToPool(T object) {
+        // The `offer` method does not block. If the queue is full, it returns `false` immediately.
+        // If the provided instance cannot be added to the pool, we discard it silently.
+        bufferQueue.offer(object);
+    }
+}
diff --git a/src/com/amazon/ion/impl/bin/utf8/Poolable.java b/src/com/amazon/ion/impl/bin/utf8/Poolable.java
new file mode 100644
index 0000000000..52a86ca367
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/utf8/Poolable.java
@@ -0,0 +1,30 @@
+package com.amazon.ion.impl.bin.utf8;
+
+import java.io.Closeable;
+
+/**
+ * Base class for types that may be pooled.
+ * @param <T> the concrete type.
+ */
+abstract class Poolable<T extends Poolable<T>> implements Closeable {
+
+    // The pool to which this object is linked.
+    private final Pool<T> pool;
+
+    /**
+     * @param pool the pool to which the object will be returned upon {@link #close()}.
+     */
+    Poolable(Pool<T> pool) {
+        this.pool = pool;
+    }
+
+    /**
+     * Attempts to return this instance to the pool with which it is associated, if any.
+     *
+     * Do not continue to use this instance after calling this method.
+     */
+    @Override
+    public void close() {
+        pool.returnToPool((T) this);
+    }
+}
diff --git a/src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java b/src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java
new file mode 100644
index 0000000000..df43d079da
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java
@@ -0,0 +1,33 @@
+package com.amazon.ion.impl.bin.utf8;
+
+import java.nio.ByteBuffer;
+
+/**
+ * Holds a reusable {@link ByteBuffer}. Instances of this class are reusable but are NOT threadsafe.
+ *
+ * Instances are vended by {@link ByteBufferPool#getOrCreate()}.
+ *
+ * Users are expected to call {@link #close()} when the decoder is no longer needed.
+ */
+public class PoolableByteBuffer extends Poolable<PoolableByteBuffer> {
+
+    static final int BUFFER_SIZE_IN_BYTES = 4 * 1024;
+
+    // The reusable buffer.
+    private final ByteBuffer buffer;
+
+    /**
+     * @param pool the pool to which the object will be returned upon {@link #close()}.
+     */
+    PoolableByteBuffer(Pool<PoolableByteBuffer> pool) {
+        super(pool);
+        buffer = ByteBuffer.allocate(BUFFER_SIZE_IN_BYTES);
+    }
+
+    /**
+     * @return the buffer.
+     */
+    public ByteBuffer getBuffer() {
+        return buffer;
+    }
+}
diff --git a/src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoder.java b/src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoder.java
new file mode 100644
index 0000000000..6302d77194
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoder.java
@@ -0,0 +1,97 @@
+package com.amazon.ion.impl.bin.utf8;
+
+import com.amazon.ion.IonException;
+
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CoderResult;
+
+/**
+ * Decodes {@link String}s from UTF-8. Instances of this class are reusable but are NOT threadsafe.
+ *
+ * Instances are vended by {@link Utf8StringDecoderPool#getOrCreate()}.
+ *
+ * Users are expected to call {@link #close()} when the decoder is no longer needed.
+ *
+ * There are two ways of using this class:
+ * <ol>
+ *     <li>Use {@link #decode(ByteBuffer, int)} to decode the requested number of bytes from the given ByteBuffer in
+ *     a single step. Or,</li>
+ *     <li>Use the following sequence of method calls:
+ *     <ol>
+ *         <li>{@link #prepareDecode(int)} to prepare the decoder to decode the requested number of bytes.</li>
+ *         <li>{@link #partialDecode(ByteBuffer, boolean)} to decode the available bytes from the byte buffer. This may
+ *         be repeated as more bytes are made available in the ByteBuffer, which is the caller's responsibility.</li>
+ *         <li>{@link #finishDecode()} to finish decoding and return the resulting String.</li>
+ *     </ol>
+ *     Note: {@link #decode(ByteBuffer, int)} must not be called between calls to {@link #prepareDecode(int)} and
+ *     {@link #finishDecode()}.
+ *     </li>
+ * </ol>
+ */
+public class Utf8StringDecoder extends Poolable<Utf8StringDecoder> {
+
+    // The size of the UTF-8 decoding buffer.
+    private static final int UTF8_BUFFER_SIZE_IN_BYTES = 4 * 1024;
+
+    private final CharBuffer reusableUtf8DecodingBuffer;
+    private final CharsetDecoder utf8CharsetDecoder;
+    private CharBuffer utf8DecodingBuffer;
+
+    Utf8StringDecoder(Pool<Utf8StringDecoder> pool) {
+        super(pool);
+        reusableUtf8DecodingBuffer = CharBuffer.allocate(UTF8_BUFFER_SIZE_IN_BYTES);
+        utf8CharsetDecoder = Charset.forName("UTF-8").newDecoder();
+    }
+
+    /**
+     * Prepares the decoder to decode the given number of UTF-8 bytes.
+     * @param numberOfBytes the number of bytes to decode.
+     */
+    public void prepareDecode(int numberOfBytes) {
+        utf8CharsetDecoder.reset();
+        utf8DecodingBuffer = reusableUtf8DecodingBuffer;
+        if (numberOfBytes > reusableUtf8DecodingBuffer.capacity()) {
+            utf8DecodingBuffer = CharBuffer.allocate(numberOfBytes);
+        }
+    }
+
+    /**
+     * Decodes the available bytes from the given ByteBuffer.
+     * @param utf8InputBuffer a ByteBuffer containing UTF-8 bytes.
+     * @param endOfInput true if the end of the UTF-8 sequence is expected to occur in the buffer; otherwise, false.
+     */
+    public void partialDecode(ByteBuffer utf8InputBuffer, boolean endOfInput) {
+        CoderResult coderResult = utf8CharsetDecoder.decode(utf8InputBuffer, utf8DecodingBuffer, endOfInput);
+        if (coderResult.isError()) {
+            throw new IonException("Illegal value encountered while validating UTF-8 data in input stream. " + coderResult.toString());
+        }
+    }
+
+    /**
+     * Finishes decoding and returns the resulting String.
+     * @return the decoded Java String.
+     */
+    public String finishDecode() {
+        utf8DecodingBuffer.flip();
+        return utf8DecodingBuffer.toString();
+    }
+
+    /**
+     * Decodes the given number of UTF-8 bytes from the given ByteBuffer into a Java String.
+     * @param utf8InputBuffer a ByteBuffer containing UTF-8 bytes.
+     * @param numberOfBytes the number of bytes from the utf8InputBuffer to decode.
+     * @return the decoded Java String.
+     */
+    public String decode(ByteBuffer utf8InputBuffer, int numberOfBytes) {
+        prepareDecode(numberOfBytes);
+
+        utf8DecodingBuffer.position(0);
+        utf8DecodingBuffer.limit(utf8DecodingBuffer.capacity());
+
+        partialDecode(utf8InputBuffer, true);
+        return finishDecode();
+    }
+}
diff --git a/src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoderPool.java b/src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoderPool.java
new file mode 100644
index 0000000000..97a801bb63
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoderPool.java
@@ -0,0 +1,26 @@
+package com.amazon.ion.impl.bin.utf8;
+
+/**
+ * A thread-safe shared pool of {@link Utf8StringDecoder}s that can be used for UTF8 decoding.
+ */
+public class Utf8StringDecoderPool extends Pool<Utf8StringDecoder> {
+
+    private static final Utf8StringDecoderPool INSTANCE = new Utf8StringDecoderPool();
+
+    // Do not allow instantiation; all classes should share the singleton instance.
+    private Utf8StringDecoderPool() {
+        super(new Allocator<Utf8StringDecoder>() {
+            @Override
+            public Utf8StringDecoder newInstance(Pool<Utf8StringDecoder> pool) {
+                return new Utf8StringDecoder(pool);
+            }
+        });
+    }
+
+    /**
+     * @return a threadsafe shared instance of {@link Utf8StringDecoderPool}.
+     */
+    public static Utf8StringDecoderPool getInstance() {
+        return INSTANCE;
+    }
+}
diff --git a/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java b/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java
index d890e1beaf..8a4f780c1b 100644
--- a/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java
+++ b/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java
@@ -1,7 +1,5 @@
 package com.amazon.ion.impl.bin.utf8;
 
-import java.io.Closeable;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
@@ -11,35 +9,30 @@
 /**
  * Encodes {@link String}s to UTF-8. Instances of this class are reusable but are NOT threadsafe.
  *
- * Users are strongly encouraged to get instances from {@link Utf8StringEncoderPool#getOrCreateUtf8Encoder()}.
+ * Instances are vended by {@link Utf8StringEncoderPool#getOrCreate()}.
+ *
  * {@link #encode(String)} can be called any number of times. Users are expected to call {@link #close()} when
  * the encoder is no longer needed.
  */
-public class Utf8StringEncoder implements Closeable {
+public class Utf8StringEncoder extends Poolable<Utf8StringEncoder> {
     // The longest String (as measured by {@link java.lang.String#length()}) that this instance can encode without
     // requiring additional allocations.
     private static final int SMALL_STRING_SIZE = 4 * 1024;
 
     // Reusable resources for encoding Strings as UTF-8 bytes
-    final Utf8StringEncoderPool utf8StringEncoderPool;
     final CharsetEncoder utf8Encoder;
     final ByteBuffer utf8EncodingBuffer;
     final char[] charArray;
     final CharBuffer charBuffer;
 
-    public Utf8StringEncoder(Utf8StringEncoderPool pool) {
-        utf8StringEncoderPool = pool;
+    Utf8StringEncoder(Pool<Utf8StringEncoder> pool) {
+        super(pool);
         utf8Encoder = Charset.forName("UTF-8").newEncoder();
         utf8EncodingBuffer = ByteBuffer.allocate((int) (SMALL_STRING_SIZE * utf8Encoder.maxBytesPerChar()));
         charArray = new char[SMALL_STRING_SIZE];
         charBuffer = CharBuffer.wrap(charArray);
     }
 
-    public Utf8StringEncoder() {
-        // This instance is not associated with a Utf8StringEncoderPool
-        this(null);
-    }
-
     /**
      * Encodes the provided String's text to UTF-8. Unlike {@link String#getBytes(Charset)}, this method will not
      * silently replace characters that cannot be encoded with a substitute character. Instead, it will throw
@@ -125,18 +118,6 @@ enough for us to reuse our buffers ("small strings"), and those which are not ("
         return new Result(utf8Length, encodingBuffer.array());
     }
 
-    /**
-     * Attempts to return this instance to the Utf8StringEncoderPool with which it is associated, if any.
-     *
-     * Do not continue to use this encoder after calling this method.
-     */
-    @Override
-    public void close() {
-        if (utf8StringEncoderPool != null) {
-            utf8StringEncoderPool.returnEncoderToPool(this);
-        }
-    }
-
     /**
      * Represents the result of a {@link Utf8StringEncoder#encode(String)} operation.
      */
diff --git a/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java b/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java
index e926df4a75..fda772a198 100644
--- a/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java
+++ b/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java
@@ -1,23 +1,20 @@
 package com.amazon.ion.impl.bin.utf8;
 
-import java.util.concurrent.ArrayBlockingQueue;
-
 /**
- * A thread-safe shared pool of {@link Utf8StringEncoder}s that can be used for UTF8 encoding and decoding.
+ * A thread-safe shared pool of {@link Utf8StringEncoder}s that can be used for UTF8 encoding.
  */
-public enum Utf8StringEncoderPool {
-    // The only enum variant; a singleton instance.
-    INSTANCE;
-
-    // The maximum number of Utf8Encoders that can be waiting in the queue before new ones will be discarded.
-    private static final int MAX_QUEUE_SIZE = 128;
+public class Utf8StringEncoderPool extends Pool<Utf8StringEncoder> {
 
-    // A queue of previously initialized encoders that can be loaned out.
-    private final ArrayBlockingQueue<Utf8StringEncoder> bufferQueue;
+    private static final Utf8StringEncoderPool INSTANCE = new Utf8StringEncoderPool();
 
     // Do not allow instantiation; all classes should share the singleton instance.
     private Utf8StringEncoderPool() {
-        bufferQueue = new ArrayBlockingQueue<Utf8StringEncoder>(MAX_QUEUE_SIZE);
+        super(new Allocator<Utf8StringEncoder>() {
+            @Override
+            public Utf8StringEncoder newInstance(Pool<Utf8StringEncoder> pool) {
+                return new Utf8StringEncoder(pool);
+            }
+        });
     }
 
     /**
@@ -27,34 +24,4 @@ public static Utf8StringEncoderPool getInstance() {
         return INSTANCE;
     }
 
-    /**
-     * If the pool is not empty, removes an instance of {@link Utf8StringEncoder} from the pool and returns it;
-     * otherwise, constructs a new instance.
-     *
-     * @return An instance of {@link Utf8StringEncoder}.
-     */
-    public Utf8StringEncoder getOrCreateUtf8Encoder() {
-        // The `poll` method does not block. If the queue is empty it returns `null` immediately.
-        Utf8StringEncoder encoder = bufferQueue.poll();
-        if (encoder == null) {
-            // No buffers were available in the pool. Create a new one.
-            encoder = new Utf8StringEncoder(this);
-        }
-        return encoder;
-    }
-
-    /**
-     * Adds the provided instance of {@link Utf8StringEncoder} to the pool. If the pool is full, the instance will
-     * be discarded.
-     *
-     * Callers MUST NOT use an encoder after returning it to the pool.
-     *
-     * @param encoder   A {@link Utf8StringEncoder} to add to the pool.
-     */
-    public void returnEncoderToPool(Utf8StringEncoder encoder) {
-        // The `offer` method does not block. If the queue is full, it returns `false` immediately.
-        // If the provided instance cannot be added to the pool, we discard it silently.
-        bufferQueue.offer(encoder);
-    }
-
 }

From 82478a85ad7a378e59467e8b4a12b5062363760e Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 11 Oct 2021 12:57:24 -0700
Subject: [PATCH 141/490] Eliminates the use of ConcurrentLinkedQueue.size() is
 PooledBlockAllocator, improving performance when the queue gets large.

---
 .../bin/PooledBlockAllocatorProvider.java     | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java b/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
index b3d58e2c5f..3918e00b55 100644
--- a/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
+++ b/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
@@ -18,6 +18,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * A singleton implementation of {@link BlockAllocatorProvider} offering a thread-safe free block list
@@ -37,6 +38,7 @@ private static final class PooledBlockAllocator extends BlockAllocator
     {
         private final int blockSize, blockLimit;
         private final ConcurrentLinkedQueue<Block> freeBlocks;
+        private final AtomicInteger size = new AtomicInteger(0);
         static final int FREE_CAPACITY = 1024 * 1024 * 64; // 64MB
 
         public PooledBlockAllocator(final int blockSize)
@@ -57,13 +59,31 @@ public Block allocateBlock()
                     @Override
                     public void close()
                     {
-                        if (freeBlocks.size() < blockLimit) {
+                        // In the common case, the pool is not full. Optimistically increment the size.
+                        if (size.getAndIncrement() < blockLimit)
+                        {
                             reset();
                             freeBlocks.add(this);
                         }
+                        else
+                        {
+                            // The pool was full. Since the size was optimistically incremented, decrement it now.
+                            // Note: there is a race condition here that is deliberately allowed as an optimization.
+                            // Under high contention, multiple threads could end up here before the first one
+                            // decrements the size, causing blocks to be dropped wastefully. This is not harmful
+                            // because blocks will be re-allocated when necessary; the pool is kept as close as
+                            // possible to capacity on a best-effort basis. This race condition should not be "fixed"
+                            // without a thorough study of the performance implications.
+                            size.decrementAndGet();
+                        }
                     }
                 };
             }
+            else
+            {
+                // A block was retrieved from the pool; decrement the pool size.
+                size.decrementAndGet();
+            }
             return block;
         }
 

From 2d1eddc969fb38348e57a9262729a68964830cdb Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 13 Oct 2021 16:22:53 -0700
Subject: [PATCH 142/490] Prepares version 1.9.0 for release.

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index dad1504b2d..c5a1c7a6b9 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.3</version>
+  <version>1.9.0</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index eb601e57b4..3ca0f05e5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.8.4-SNAPSHOT</version>
+  <version>1.9.0</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 44aabbc8a47afe12b7f03ef5e3c91a62674ff096 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Wed, 13 Oct 2021 16:55:17 -0700
Subject: [PATCH 143/490] Bumps version to 1.9.1-SNAPSHOT.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3ca0f05e5c..978df8b635 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.0</version>
+  <version>1.9.1-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 8870d73fac8881677a4fbd4ab58775337b32772b Mon Sep 17 00:00:00 2001
From: Eric Chen <67451029+cheqianh@users.noreply.github.com>
Date: Fri, 19 Nov 2021 14:56:45 -0800
Subject: [PATCH 144/490] Adds README for ion-java-cli (#394)

* Adds README for ion-java-cli

This PR set up description of Ion-java-cli including setup instruction and a link to its design doc.

* Adds a Getting Started section.
---
 ion-java-cli/README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 ion-java-cli/README.md

diff --git a/ion-java-cli/README.md b/ion-java-cli/README.md
new file mode 100644
index 0000000000..6bc6d9b84e
--- /dev/null
+++ b/ion-java-cli/README.md
@@ -0,0 +1,18 @@
+# Amazon Ion Java CLI
+A Java implementation of CLI where its design document is located in [here](https://github.com/amzn/ion-test-driver#design).
+
+The package is stored under `ion-java/ion-java-cli`.
+
+## Setup
+Build ion-java-cli. Note that using -f option for ion-java-cli's `pom.xml`.
+```
+$ mvn -f ion-java-cli/pom.xml install
+```
+
+## Getting Started
+Invoking `ion-java-cli-x.y.jar` under `ion-java-cli/target/` directory. <br/> 
+
+For example:
+```
+java -jar ion-java-cli/target/ion-java-cli-1.0.jar process test_file.ion -f pretty -o output.ion
+```

From ac594aca46bccad84b736348efb5bd8c780deded Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Mon, 22 Nov 2021 15:36:33 -0800
Subject: [PATCH 145/490] Fixes performance regression detector so that it
 refreshes the git submodules when checking out the prior commit

---
 .github/workflows/ion-java-performance-regression-detector.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 6bf0cd43c5..abf209448c 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -68,7 +68,7 @@ jobs:
         run : rm -r /home/runner/.m2
 
       - name: Build ion-java from the previous commit
-        run: cd ion-java && git checkout HEAD^ && mvn clean install
+        run: cd ion-java && git checkout HEAD^ && git submodule update --recursive && mvn clean install
 
       - name: Build ion-java-benchmark-cli
         run: cd ion-java-benchmark-cli && mvn clean install

From 676455a0309ac3141bdd68d37bb435dbcfdd16ad Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Tue, 23 Nov 2021 14:16:16 -0800
Subject: [PATCH 146/490] Fixes Ion Binary Reader to fail fast when an IVM type
 code is encountered in an illegal position

---
 ion-tests                                        | 2 +-
 src/com/amazon/ion/impl/IonReaderBinaryRawX.java | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ion-tests b/ion-tests
index c125f571d2..ef0451a72a 160000
--- a/ion-tests
+++ b/ion-tests
@@ -1 +1 @@
-Subproject commit c125f571d2b459e0e610eac5ca11900bd3b6d493
+Subproject commit ef0451a72a39f572175ad8e90b1a77110e9aec4c
diff --git a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
index 8d23590b47..3c3494c678 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
@@ -283,6 +283,12 @@ private final void has_next_helper_raw() throws IOException
                 else if (_value_tid == _Private_IonConstants.tidTypedecl) {
                     assert (_value_tid == (BINARY_VERSION_MARKER_TID & 0xff)); // the bvm tid happens to be type decl
                     if (_value_len == BINARY_VERSION_MARKER_LEN ) {
+                        if (getDepth() != 0) {
+                            // In Ion text, we can interpret an IVM in the wrong position as an ordinary Symbol,
+                            // but in Ion binary, the BVM is unambiguously an IVM rather than a Symbol, and it
+                            // is not allowed in any container type.
+                            throw newErrorAt("Encountered IVM type code E0 below the top level");
+                        }
                         // this isn't valid for any type descriptor except the first byte
                         // of a 4 byte version marker - so lets read the rest
                         load_version_marker();

From ba4cda5c2ce49712130daf831f9884d212e07c8b Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Wed, 19 Jan 2022 14:57:58 -0800
Subject: [PATCH 147/490] Adds members to the IonNumber interface and makes
 IonDecimal, IonFloat, and IonInt implement IonNumber

---
 src/com/amazon/ion/IonFloat.java              |  5 ++-
 src/com/amazon/ion/IonInt.java                | 12 +++++-
 src/com/amazon/ion/IonNumber.java             | 39 ++++++++++++++++---
 .../amazon/ion/impl/lite/IonDecimalLite.java  |  6 +++
 .../amazon/ion/impl/lite/IonFloatLite.java    |  2 +
 src/com/amazon/ion/impl/lite/IonIntLite.java  | 16 ++++++++
 test/com/amazon/ion/DecimalTest.java          | 10 +++++
 test/com/amazon/ion/IntTest.java              | 26 +++++++++++++
 8 files changed, 109 insertions(+), 7 deletions(-)

diff --git a/src/com/amazon/ion/IonFloat.java b/src/com/amazon/ion/IonFloat.java
index e4fa2be69d..e6890da3e0 100644
--- a/src/com/amazon/ion/IonFloat.java
+++ b/src/com/amazon/ion/IonFloat.java
@@ -37,7 +37,7 @@
  * @see IonDecimal
  */
 public interface IonFloat
-    extends IonValue
+    extends IonNumber
 {
     /**
      * Gets the value of this Ion <code>float</code> as a Java
@@ -66,6 +66,8 @@ public double doubleValue()
      * recommended to call {@link IonFloat#isNumericValue()} before calling
      * this method.
      *
+     * If you need negative zeros, use {@link #doubleValue()}.
+     *
      * @return the {@link BigDecimal} value, or {@code null} if
      * {@code this.isNullValue()}.
      *
@@ -73,6 +75,7 @@ public double doubleValue()
      * {@code +inf}, or {@code -inf}, because {@link BigDecimal} cannot
      * represent those values.
      */
+    @Override
     public BigDecimal bigDecimalValue()
         throws NullValueException;
 
diff --git a/src/com/amazon/ion/IonInt.java b/src/com/amazon/ion/IonInt.java
index 2270b0a918..bf8d44a3dd 100644
--- a/src/com/amazon/ion/IonInt.java
+++ b/src/com/amazon/ion/IonInt.java
@@ -15,6 +15,7 @@
 
 package com.amazon.ion;
 
+import java.math.BigDecimal;
 import java.math.BigInteger;
 
 /**
@@ -24,7 +25,7 @@
  * code outside of this library.
  */
 public interface IonInt
-    extends IonValue
+    extends IonNumber
 {
     /**
      * Gets the content of this Ion <code>int</code> as a Java
@@ -56,6 +57,15 @@ public long longValue()
      */
     public BigInteger bigIntegerValue();
 
+    /**
+     * Gets the value of this Ion {@code int} as a {@link BigDecimal}.
+     * The scale of the {@code BigDecimal} is zero.
+     *
+     * @return the {@code BigDecimal} value,
+     * or {@code null} if {@code this.isNullValue()}.
+     */
+    public BigDecimal bigDecimalValue();
+
     /**
      * Gets an {@link IntegerSize} representing the smallest-possible
      * Java type of the underlying content, or {@code null} if this is
diff --git a/src/com/amazon/ion/IonNumber.java b/src/com/amazon/ion/IonNumber.java
index dd17c55975..88002c6842 100644
--- a/src/com/amazon/ion/IonNumber.java
+++ b/src/com/amazon/ion/IonNumber.java
@@ -15,16 +15,45 @@
 
 package com.amazon.ion;
 
+import java.math.BigDecimal;
+
 /**
- * The IonNumber interface is a fore runner of a common base for the
- * ion numeric value types.  Currently only IonDecimal extends this
- * interface. In due course IonFloat and IonInt will be added to the
- * the family.
+ * Common functionality of Ion {@code int}, {@code decimal}, and {@code float}
+ * types.
  * <p>
  * <b>WARNING:</b> This interface should not be implemented or extended by
  * code outside of this library.
  */
-public interface IonNumber // TODO amzn/ion-java/issues/53 Complete this interface
+public interface IonNumber
     extends IonValue
 {
+    /**
+     * Gets the value of this Ion number as a {@link BigDecimal}.
+     *
+     * <p>This method will throw an exception for non-null, non-numeric values.
+     * It's recommended to call {@link #isNumericValue()} before calling
+     * this method.</p>
+     *
+     * <p>Negative zero is supported by {@link IonDecimal} and {@link IonFloat},
+     * but not by {@link BigDecimal}. If you need to distinguish positive and
+     * negative zero, you should call {@link IonDecimal#decimalValue()} or
+     * {@link IonFloat#doubleValue()} after casting to the appropriate type.</p>
+     *
+     * @return the {@link BigDecimal} value, or {@code null} if
+     * {@code this.isNullValue()}.
+     *
+     * @throws NumberFormatException if this value is {@code nan},
+     * {@code +inf}, or {@code -inf}, because {@link BigDecimal} cannot
+     * represent those values.
+     */
+    public BigDecimal bigDecimalValue();
+
+    /**
+     * Determines whether this value is numeric. Returns true if this value
+     * is none of {@code null}, {@code nan}, {@code +inf}, and {@code -inf},
+     * and false if it is any of them.
+     *
+     * @return a checked condition whether this value is numeric.
+     */
+    public boolean isNumericValue();
 }
diff --git a/src/com/amazon/ion/impl/lite/IonDecimalLite.java b/src/com/amazon/ion/impl/lite/IonDecimalLite.java
index 4a8d71e7a1..63ecea4fdd 100644
--- a/src/com/amazon/ion/impl/lite/IonDecimalLite.java
+++ b/src/com/amazon/ion/impl/lite/IonDecimalLite.java
@@ -124,6 +124,7 @@ public double doubleValue()
         return d;
     }
 
+    @Override
     public BigDecimal bigDecimalValue()
         throws NullValueException
     {
@@ -136,6 +137,11 @@ public Decimal decimalValue()
         return Decimal.valueOf(_decimal_value); // Works for null.
     }
 
+    @Override
+    public boolean isNumericValue() {
+        return !isNullValue();
+    }
+
     public void setValue(long value)
     {
         // base setValue will check for the lock
diff --git a/src/com/amazon/ion/impl/lite/IonFloatLite.java b/src/com/amazon/ion/impl/lite/IonFloatLite.java
index 66118c291d..551ceb6d84 100644
--- a/src/com/amazon/ion/impl/lite/IonFloatLite.java
+++ b/src/com/amazon/ion/impl/lite/IonFloatLite.java
@@ -95,6 +95,7 @@ public double doubleValue()
         return _float_value.doubleValue();
     }
 
+    @Override
     public BigDecimal bigDecimalValue()
         throws NullValueException
     {
@@ -151,6 +152,7 @@ final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider
         }
     }
 
+    @Override
     public boolean isNumericValue()
     {
         return !(isNullValue() || _float_value.isNaN() || _float_value.isInfinite());
diff --git a/src/com/amazon/ion/impl/lite/IonIntLite.java b/src/com/amazon/ion/impl/lite/IonIntLite.java
index 3fce4810aa..89747dd600 100644
--- a/src/com/amazon/ion/impl/lite/IonIntLite.java
+++ b/src/com/amazon/ion/impl/lite/IonIntLite.java
@@ -146,6 +146,22 @@ public BigInteger bigIntegerValue()
         return _big_int_value;
     }
 
+    @Override
+    public BigDecimal bigDecimalValue() {
+        if (isNullValue()) {
+            return null;
+        } else if (_big_int_value == null) {
+            return BigDecimal.valueOf(_long_value);
+        } else {
+            return new BigDecimal(_big_int_value);
+        }
+    }
+
+    @Override
+    public boolean isNumericValue() {
+        return !isNullValue();
+    }
+
     public void setValue(int value)
     {
         setValue((long)value);
diff --git a/test/com/amazon/ion/DecimalTest.java b/test/com/amazon/ion/DecimalTest.java
index 6d79dacfe7..eb009d0a85 100644
--- a/test/com/amazon/ion/DecimalTest.java
+++ b/test/com/amazon/ion/DecimalTest.java
@@ -31,6 +31,7 @@ public static void checkNullDecimal(IonDecimal value)
     {
         assertSame(IonType.DECIMAL, value.getType());
         assertTrue("isNullValue is false", value.isNullValue());
+        assertFalse(value.isNumericValue());
 
         try
         {
@@ -346,4 +347,13 @@ public void testSetValue()
         checkDecimal(123, 0, value.bigDecimalValue());
     }
 
+    @Test
+    public void testIsNumeric()
+    {
+        IonNumber value = (IonNumber) oneValue("1.23");
+        assertTrue(value.isNumericValue());
+
+        IonNumber nullValue = (IonNumber) oneValue("null.decimal");
+        assertFalse(nullValue.isNumericValue());
+    }
 }
diff --git a/test/com/amazon/ion/IntTest.java b/test/com/amazon/ion/IntTest.java
index d21e29042c..969098362d 100644
--- a/test/com/amazon/ion/IntTest.java
+++ b/test/com/amazon/ion/IntTest.java
@@ -32,6 +32,7 @@ public static void checkNullInt(IonInt value)
     {
         assertSame(IonType.INT, value.getType());
         assertTrue("isNullValue() is false",   value.isNullValue());
+        assertFalse(value.isNumericValue());
 
         try
         {
@@ -48,6 +49,7 @@ public static void checkNullInt(IonInt value)
         catch (NullValueException e) { }
 
         assertNull("toBigInteger() isn't null", value.bigIntegerValue());
+        assertNull("bigDecimalValue() isn't null", value.bigDecimalValue());
     }
 
 
@@ -63,6 +65,7 @@ public void modifyInt(IonInt value)
         value.setValue(A_LONG_INT);
         assertEquals(A_LONG_INT, value.longValue());
         assertEquals(BigInteger.valueOf(A_LONG_INT), value.bigIntegerValue());
+        assertEquals(BigDecimal.valueOf(A_LONG_INT), value.bigDecimalValue());
 
         value.setValue(null);
         checkNullInt(value);
@@ -224,6 +227,9 @@ public void testBigDecimals() {
         assertEquals(SUPER_BIG_TRUNC_32, val.intValue());
 
         assertEquals(SUPER_BIG.hashCode(), val.hashCode());
+
+        IonNumber result = (IonNumber) reload(val);
+        assertEquals(0, big.compareTo(result.bigDecimalValue()));
     }
 
     @Test
@@ -481,6 +487,26 @@ public void testGetIntegerSizeNegativeIntBoundary() {
         testGetIntegerSizeIntBoundary(Integer.MIN_VALUE);
     }
 
+    @Test
+    public void testIsNumeric()
+    {
+        IonNumber value = (IonNumber) oneValue("1");
+        assertTrue(value.isNumericValue());
+
+        IonNumber nullValue = (IonNumber) oneValue("null.int");
+        assertFalse(nullValue.isNumericValue());
+    }
+
+    @Test
+    public void testBigDecimalValue()
+    {
+        IonNumber value = (IonNumber) oneValue("1");
+        assertEquals(BigDecimal.valueOf(1), value.bigDecimalValue());
+
+        IonNumber nullValue = (IonNumber) oneValue("null.int");
+        assertNull(nullValue.bigDecimalValue());
+    }
+
     private void testGetIntegerSizeLongBoundary(long boundaryValue) {
         BigInteger boundary = BigInteger.valueOf(boundaryValue);
         IonInt boundaryIon = (IonInt)oneValue(boundary.toString());

From cf97f97c04cda01a9e2806b1a27e8d04394bda3f Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Fri, 21 Jan 2022 12:32:37 -0500
Subject: [PATCH 148/490] Compacts preallocated headers when possible (#401)

`IonRawBinaryWriter` can be configured to preallocate buffer bytes to
hold the length prefix of a new container or annotations wrapper. This
option trades processing speed for data size. Preallocating more bytes
makes the encoded data larger, but increases the chances that the
container's length (once calculated) can be written directly into the
existing buffer.

This patch modifies the writer such that, when finalizing the encoding
of a container or annotations wrapper, the writer will check to see if
the encoded length is small enough to fit in the type descriptor byte.
If it is, the encoded bytes are shifted backwards in the buffer to
eliminate the unnecessary preallocation. This means that the encoding of
small containers isn't penalized for having preallocation enabled.

Benchmarks showed no substantial difference in processing speed from the
previous release, so this data size improvement does not come at the
cost of throughput.
---
 .../ion/impl/bin/IonRawBinaryWriter.java      |  75 +++++++----
 src/com/amazon/ion/impl/bin/WriteBuffer.java  | 116 ++++++++++++++++++
 .../amazon/ion/impl/bin/WriteBufferTest.java  |  38 ++++++
 3 files changed, 207 insertions(+), 22 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index bc7d63b5ee..de6a719b1c 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -202,6 +202,15 @@ private PreallocationMode(final int contentMaxLength, final int typedLength)
 
         /*package*/ abstract void patchLength(final WriteBuffer buffer, final long position, final long length);
 
+        /**
+         * Returns the number of header bytes that this mode would preallocate to hold the VarUInt-encoded length of
+         * the current value. This number is equal to the total header length (i.e. `typedLength`) minus one, as it does
+         * not include the type descriptor byte. (Examples: PREALLOCATE_0 returns `0`, PREALLOCATE_1 returns `1`, etc.)
+         */
+        int numberOfLengthBytes() {
+            return typedLength - 1;
+        }
+
         /*package*/ static PreallocationMode withPadSize(final int pad)
         {
             switch (pad)
@@ -723,48 +732,70 @@ private void extendPatchPoints(final PatchList patches)
 
     private ContainerInfo popContainer()
     {
-        final ContainerInfo current = containers.pop();
-        if (current == null)
+        final ContainerInfo currentContainer = containers.pop();
+        if (currentContainer == null)
         {
             throw new IllegalStateException("Tried to pop container state without said container");
         }
 
         // only patch for real containers and annotations -- we use VALUE for tracking only
-        final long length = current.length;
-        if (current.type != ContainerType.VALUE)
+        long length = currentContainer.length;
+        if (currentContainer.type != ContainerType.VALUE)
         {
             // patch in the length
-            final long position = current.position;
-            if (current.length <= preallocationMode.contentMaxLength && preallocationMode != PreallocationMode.PREALLOCATE_0)
+            final long positionOfFirstLengthByte = currentContainer.position;
+            if (length <= 0xD) {
+                // The body of this container/wrapper is small enough that its length can fit in the lower nibble of
+                // the type descriptor byte; we don't need the extra length bytes that were preallocated (if any).
+                // We'll shift the encoded body of the container/wrapper backwards in the buffer to overwrite them.
+
+                // The number of bytes we need to shift by is determined by the writer's preallocation mode.
+                final int numberOfBytesToShiftBy = preallocationMode.numberOfLengthBytes();
+
+                // `length` is the encoded length of the container/wrapper we're stepping out of. It does not
+                // include any header bytes. In this `if` branch, we've confirmed that `length` is <= 0xD,
+                // so this downcast from `long` to `int` is safe.
+                final int lengthOfSliceToShift = (int) length;
+
+                // Shift the container/wrapper body backwards in the buffer. Because this only happens when
+                // `lengthOfSliceToShift` is 13 or fewer bytes, this will usually be a very fast memcpy.
+                // It's slightly more work if the slice we're shifting happens to straddle two memory blocks
+                // inside the buffer.
+                buffer.shiftBytesLeft(lengthOfSliceToShift, numberOfBytesToShiftBy);
+
+                // Overwrite the lower nibble of the original type descriptor byte with the body's encoded length.
+                final long typeDescriptorPosition = positionOfFirstLengthByte - 1;
+                final long type = (buffer.getUInt8At(typeDescriptorPosition) & 0xF0) | length;
+                buffer.writeUInt8At(typeDescriptorPosition, type);
+
+                // We've reclaimed some number of bytes; adjust the container length as appropriate.
+                length -= numberOfBytesToShiftBy;
+            }
+            else if (currentContainer.length <= preallocationMode.contentMaxLength)
             {
-                preallocationMode.patchLength(buffer, position, length);
+                // The container's encoded body is too long to fit the length in the type descriptor byte, but it will
+                // fit in the preallocated length bytes that were added to the buffer when the container was started.
+                // Update those bytes with the VarUInt encoding of the length value.
+                preallocationMode.patchLength(buffer, positionOfFirstLengthByte, length);
             }
             else
             {
-                // side patch
-                if (current.length <= 0xD && preallocationMode == PreallocationMode.PREALLOCATE_0)
-                {
-                    // XXX if we're not using padding we can get here and optimize the length a little without side patching!
-                    final long typePosition = position - 1;
-                    final long type = (buffer.getUInt8At(typePosition) & 0xF0) | current.length;
-                    buffer.writeUInt8At(typePosition, type);
-                }
-                else
-                {
-                    addPatchPoint(position, preallocationMode.typedLength - 1, length);
-                }
+                // The container's encoded body is too long to fit in the length bytes that were preallocated.
+                // Write the VarUInt encoding of the length in a secondary buffer and make a note to include that
+                // when we go to flush the primary buffer to the output stream.
+                addPatchPoint(positionOfFirstLengthByte, preallocationMode.numberOfLengthBytes(), length);
             }
         }
-        if (current.patches != null)
+        if (currentContainer.patches != null)
         {
             // at this point, we've appended our patch points upward, lets make sure we get
             // our child patch points in
-            extendPatchPoints(current.patches);
+            extendPatchPoints(currentContainer.patches);
         }
 
         // make sure to record length upward
         updateLength(length);
-        return current;
+        return currentContainer;
     }
 
     private void writeVarUInt(final long value)
diff --git a/src/com/amazon/ion/impl/bin/WriteBuffer.java b/src/com/amazon/ion/impl/bin/WriteBuffer.java
index e3973c56e4..0df5ba6895 100644
--- a/src/com/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/com/amazon/ion/impl/bin/WriteBuffer.java
@@ -170,6 +170,122 @@ public void writeBytes(final byte[] bytes, final int off, final int len)
         block.limit += len;
     }
 
+    /**
+     * Shifts the last `length` bytes in the buffer to the left. This can be used when a value's header was
+     * preallocated but the value's encoded size proved to be much smaller than anticipated.
+     *
+     * The caller must guarantee that the buffer contains enough bytes to perform the requested shift.
+     *
+     * @param length    The number of bytes at the end of the buffer that we'll be shifting to the left.
+     * @param shiftBy   The number of bytes to the left that we'll be shifting.
+     */
+    public void shiftBytesLeft(int length, int shiftBy) {
+        if (shiftBy == 0) {
+            // Nothing to do.
+            return;
+        }
+
+        // If all of the bytes that we need to shift are in the current block, do a simple memcpy.
+        if (current.limit >= length + shiftBy) {
+            shiftBytesLeftWithinASingleBlock(length, shiftBy);
+            return;
+        }
+
+        // Otherwise, the slice we're shifting straddles multiple blocks. We'll need to iterate across those blocks
+        // applying shifting logic to each one.
+        shiftBytesLeftAcrossBlocks(length, shiftBy);
+    }
+
+    /**
+     * Shifts the last `length` bytes in the buffer to the left. The caller must guarantee that the `current` Block
+     * contains at least `length + shiftBy` bytes. This ensures that we're shifting a contiguous slice of bytes within
+     * a single block.
+     *
+     * @param length    The number of bytes at the end of the buffer that we'll be shifting to the left.
+     * @param shiftBy   The number of bytes to the left that we'll be shifting.
+     */
+    private void shiftBytesLeftWithinASingleBlock(int length, int shiftBy) {
+        int startOfSliceToShift = current.limit - length;
+        System.arraycopy(
+                current.data,
+                startOfSliceToShift,
+                current.data,
+                startOfSliceToShift - shiftBy,
+                length
+        );
+        // Update the `limit` (cursor position) within the current block to reflect that
+        // we have reclaimed `length` bytes of space in the buffer.
+        current.limit -= shiftBy;
+    }
+
+    /**
+     * Shifts the last `length` bytes in the buffer to the left. Unlike
+     * {@link #shiftBytesLeftWithinASingleBlock(int, int)}, this method supports shifting bytes across multiple blocks
+     * in the buffer.
+     *
+     * @param length    The number of bytes at the end of the buffer that we'll be shifting to the left.
+     * @param shiftBy   The number of bytes to the left that we'll be shifting.
+     */
+    private void shiftBytesLeftAcrossBlocks(int length, int shiftBy) {
+        // Our starting position is the first byte that we plan to shift backwards. The `bufferOffset` is the cursor's
+        // current position in the stream; we can use this to derive which block it's in as well as its position within
+        // that block.
+        long bufferOffset = position() - length;
+
+        Block block = null;
+        while (length > 0)
+        {
+            // Using the `bufferOffset`, determine which block we're in...
+            int blockIndex = index(bufferOffset);
+            block = blocks.get(blockIndex);
+            // ...and our offset within that block.
+            int blockOffset = offset(bufferOffset);
+
+            // If the block offset is within `shiftBy` bytes of beginning of the block, some bytes we're shifting
+            // will end up in the previous block. Here's an illustrated example:
+            //
+            // shiftBy = 2, blockIndex = 1, blockOffset = 1
+            //                        v---- Cursor is here
+            // Before: [A B C D E] [F G H I J]
+            // After : [A B C D G] [F G H I J]
+            //  Now this is G --^       ^-- And the cursor is here, ready to continue copy the rest.
+            if (blockOffset < shiftBy) {
+                Block previousBlock = blocks.get(blockIndex - 1);
+                int numberOfBytesToShift = Math.min(length, shiftBy) - blockOffset;
+                System.arraycopy(block.data, blockOffset, previousBlock.data, previousBlock.data.length - numberOfBytesToShift, numberOfBytesToShift);
+
+                // Now that we've shifted some bytes, update our position within the buffer.
+                bufferOffset += numberOfBytesToShift;
+                length -= numberOfBytesToShift;
+
+                // If there are no more bytes to shift...
+                if (length == 0) {
+                    // ...lower the `limit` because we've reclaimed some bytes in this block...
+                    block.limit -= numberOfBytesToShift;
+                    // ...and early return.
+                    return;
+                }
+                // Otherwise, use our new buffer offset to recalculate our block-specific position.
+                blockIndex = index(bufferOffset);
+                block = blocks.get(blockIndex);
+                blockOffset = offset(bufferOffset);
+            }
+
+            // At this point, the block offset is at least `shiftBy` bytes away from the beginning of the block, so
+            // we can do a memcpy to shift the rest of the bytes in the block.
+            int numberOfBytesToShift = Math.min(length, block.data.length - blockOffset);
+            System.arraycopy(block.data, blockOffset, block.data, blockOffset - shiftBy, numberOfBytesToShift);
+
+            // Update our counters and see if there are any more bytes to shift.
+            bufferOffset += numberOfBytesToShift;
+            length -= numberOfBytesToShift;
+        }
+        if (block != null) {
+            // We've reclaimed some space in this block; lower the `limit` accordingly.
+            block.limit -= shiftBy;
+        }
+    }
+
     /** Writes an array of bytes to the buffer expanding if necessary, defaulting to the entire array. */
     public void writeBytes(byte[] bytes)
     {
diff --git a/test/com/amazon/ion/impl/bin/WriteBufferTest.java b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
index 5a5ddb5acf..24822820a2 100644
--- a/test/com/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
@@ -921,4 +921,42 @@ public void testTruncate() throws IOException
         buf.truncate(3);
         assertBuffer("ARG".getBytes("UTF-8"));
     }
+
+    @Test
+    public void shiftBytesLeftWithinFirstBufferBlock() throws IOException {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        // All bytes are being shifted within the first buffer block.
+        buf.writeBytes("01234567".getBytes());
+        buf.shiftBytesLeft(4, 1);
+        assertBuffer("0124567".getBytes());
+    }
+
+    @Test
+    public void shiftBytesLeftWithinLastBufferBlock() throws IOException {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        // All bytes are being shifted within the last buffer block.
+        buf.writeBytes("0123456789ABCDEF".getBytes());
+        buf.shiftBytesLeft(3, 2);
+        assertBuffer("0123456789ADEF".getBytes());
+    }
+
+    @Test
+    public void shiftBytesLeftAcrossBufferBlocks() throws IOException {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        // Some bytes are shifted to the previous block, some are shifted within
+        // the last block.
+        buf.writeBytes("0123456789ABCDEF".getBytes());
+        buf.shiftBytesLeft(8, 3);
+        assertBuffer("0123489ABCDEF".getBytes());
+    }
+
+    @Test
+    public void shiftBytesLeftAcrossBufferBlocksExclusively() throws IOException {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        // Unlike `shiftBytesLeftAcrossBufferBlocks`, EVERY byte that is shifted
+        // in the buffer ends up in the previous block.
+        buf.writeBytes("0123456789ABCDEF".getBytes());
+        buf.shiftBytesLeft(5, 5);
+        assertBuffer("012345BCDEF".getBytes());
+    }
 }

From eb3766e975d23ae54455064b8440f49e6a6ff3a5 Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Mon, 24 Jan 2022 17:44:05 -0500
Subject: [PATCH 149/490] Eliminates allocations in the binary writer (#404)

This patch changes some very hot code paths in the binary writer
to eliminate unnecessary allocations.

In particular:
* Setting the annotations list no longer constructs a temporary
  array of `SymbolToken`s.
* `prepareValue` (which is called for every value in the stream)
  now uses a plain `for` loop instead of an iterator to encode
  each annotation.
* `IonRawBinaryWriter` now uses a custom class called `IntList`
  to store its annotation symbol ID ints instead of a
  `List<Integer>`, which required each int to be boxed.
---
 src/com/amazon/ion/impl/bin/IntList.java      | 105 ++++++++++++++++++
 .../ion/impl/bin/IonManagedBinaryWriter.java  |  20 ++--
 .../ion/impl/bin/IonRawBinaryWriter.java      |   8 +-
 test/com/amazon/ion/impl/bin/IntListTest.java |  59 ++++++++++
 4 files changed, 178 insertions(+), 14 deletions(-)
 create mode 100644 src/com/amazon/ion/impl/bin/IntList.java
 create mode 100644 test/com/amazon/ion/impl/bin/IntListTest.java

diff --git a/src/com/amazon/ion/impl/bin/IntList.java b/src/com/amazon/ion/impl/bin/IntList.java
new file mode 100644
index 0000000000..8c0ba5c214
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/IntList.java
@@ -0,0 +1,105 @@
+package com.amazon.ion.impl.bin;
+
+/**
+ * A list of integer values that grows as necessary.
+ *
+ * Unlike {@link java.util.List}, IntList does not require each int to be boxed. This makes it helpful in use cases
+ * where storing {@link Integer} leads to excessive time spent in garbage collection.
+ */
+public class IntList {
+    public static final int DEFAULT_INITIAL_CAPACITY = 8;
+    private static final int GROWTH_MULTIPLIER = 2;
+    private int[] data;
+    private int numberOfValues;
+
+    /**
+     * Constructs a new IntList with a capacity of {@link IntList#DEFAULT_INITIAL_CAPACITY}.
+     */
+    public IntList() {
+        this(DEFAULT_INITIAL_CAPACITY);
+    }
+
+    /**
+     * Constructs a new IntList with the specified capacity.
+     * @param initialCapacity   The number of ints that can be stored in this IntList before it will need to be
+     *                          reallocated.
+     */
+    public IntList(final int initialCapacity) {
+        data = new int[initialCapacity];
+        numberOfValues = 0;
+    }
+
+    /**
+     * Accessor.
+     * @return  The number of ints currently stored in the list.
+     */
+    public int size() {
+        return numberOfValues;
+    }
+
+    /**
+     * @return {@code true} if there are ints stored in the list.
+     */
+    public boolean isEmpty() {
+        return numberOfValues == 0;
+    }
+
+    /**
+     * Empties the list.
+     *
+     * Note that this method does not shrink the size of the backing data store.
+     */
+    public void clear() {
+        numberOfValues = 0;
+    }
+
+    /**
+     * Returns the {@code index}th int in the list.
+     * @param index     The list index of the desired int.
+     * @return          The int at index {@code index} in the list.
+     * @throws IndexOutOfBoundsException    if the index is negative or greater than the number of ints stored in the
+     *                                      list.
+     */
+    public int get(int index) {
+        if (index < 0 || index >= numberOfValues) {
+            throw new IndexOutOfBoundsException(
+                    "Invalid index " + index + " requested from IntList with " + numberOfValues + " values."
+            );
+        }
+        return data[index];
+    }
+
+    /**
+     * Appends an int to the end of the list, growing the list if necessary.
+     * @param value     The int to add to the end of the list.
+     */
+    public void add(int value) {
+        if (numberOfValues == data.length) {
+            grow();
+        }
+        data[numberOfValues] = value;
+        numberOfValues += 1;
+    }
+
+    /**
+     * Reallocates the backing array to accommodate storing more ints.
+     */
+    private void grow() {
+        int[] newData = new int[data.length * GROWTH_MULTIPLIER];
+        System.arraycopy(data, 0, newData, 0, data.length);
+        data = newData;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("IntList{data=[");
+        if (numberOfValues > 0) {
+            for (int m = 0; m < numberOfValues; m++) {
+                builder.append(data[m]).append(",");
+            }
+        }
+        builder.append("]}");
+        return builder.toString();
+    }
+}
diff --git a/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
index 003dc70abe..75ca54c574 100644
--- a/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
@@ -927,18 +927,16 @@ public void requireLocalSymbolTable() throws IOException
 
     public void setTypeAnnotations(final String... annotations)
     {
-        if (annotations == null)
-        {
-            user.setTypeAnnotationSymbols((SymbolToken[]) null);
+        // Clear the current list of annotations
+        user.setTypeAnnotationSymbols((SymbolToken[]) null);
+        if (annotations == null) {
+            return;
         }
-        else
-        {
-            final SymbolToken[] tokens = new SymbolToken[annotations.length];
-            for (int i = 0; i < tokens.length; i++)
-            {
-                tokens[i] = intern(annotations[i]);
-            }
-            user.setTypeAnnotationSymbols(tokens);
+
+        // Add each string to the annotations list.
+        // XXX: This is a very hot path. This code avoids allocating temporary iterators/arrays.
+        for (int i = 0; i < annotations.length; i++) {
+            addTypeAnnotation(annotations[i]);
         }
     }
 
diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index de6a719b1c..8bc415829a 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -498,7 +498,7 @@ public String toString()
     private boolean                             hasWrittenValuesSinceConstructed;
 
     private int                     currentFieldSid;
-    private final List<Integer>     currentAnnotationSids;
+    private final IntList     currentAnnotationSids;
     // XXX this is for managed detection of TLV that is a LST--this is easier to track here than at the managed level
     private boolean                     hasTopLevelSymbolTableAnnotation;
 
@@ -540,7 +540,7 @@ public ContainerInfo newElement() {
         this.hasWrittenValuesSinceConstructed = false;
 
         this.currentFieldSid                  = SID_UNASSIGNED;
-        this.currentAnnotationSids            = new ArrayList<Integer>();
+        this.currentAnnotationSids            = new IntList();
         this.hasTopLevelSymbolTableAnnotation = false;
 
         this.closed = false;
@@ -847,8 +847,10 @@ private void prepareValue()
             final long annotationsLengthPosition = buffer.position();
             buffer.writeVarUInt(0L);
             int annotationsLength = 0;
-            for (final int symbol : currentAnnotationSids)
+            // XXX: This is a very hot path. This code intentionally avoids creating iterators.
+            for (int m = 0; m < currentAnnotationSids.size(); m++)
             {
+                final int symbol = currentAnnotationSids.get(m);
                 checkSid(symbol);
                 final int symbolLength = buffer.writeVarUInt(symbol);
                 annotationsLength += symbolLength;
diff --git a/test/com/amazon/ion/impl/bin/IntListTest.java b/test/com/amazon/ion/impl/bin/IntListTest.java
new file mode 100644
index 0000000000..4adcf57ec1
--- /dev/null
+++ b/test/com/amazon/ion/impl/bin/IntListTest.java
@@ -0,0 +1,59 @@
+package com.amazon.ion.impl.bin;
+
+import junit.framework.TestCase;
+
+public class IntListTest extends TestCase {
+
+    public void testSize() {
+        IntList intList = new IntList();
+        assertEquals(intList.size(), 0);
+        
+        intList.add(0);
+        assertEquals(intList.size(), 1);
+        
+        intList.add(0);
+        assertEquals(intList.size(), 2);
+        
+        intList.clear();
+        assertEquals(intList.size(), 0);
+    }
+
+    public void testIsEmpty() {
+        IntList intList = new IntList();
+        assertTrue(intList.isEmpty());
+        intList.add(1);
+        assertFalse(intList.isEmpty());
+    }
+
+    public void testClear() {
+        IntList intList = new IntList();
+        assertTrue(intList.isEmpty());
+        intList.add(1);
+        intList.add(2);
+        intList.add(3);
+        assertFalse(intList.isEmpty());
+        intList.clear();
+        assertTrue(intList.isEmpty());
+    }
+
+    public void testAddAndGet() {
+        IntList intList = new IntList();
+        intList.add(1);
+        intList.add(2);
+        intList.add(3);
+        assertEquals(intList.get(0), 1);
+        assertEquals(intList.get(1), 2);
+        assertEquals(intList.get(2), 3);
+    }
+
+    public void testGrow() {
+        // Create the list with insufficient capacity
+        IntList intList = new IntList(1);
+        intList.add(1);
+        intList.add(2);
+        intList.add(3);
+        assertEquals(intList.get(0), 1);
+        assertEquals(intList.get(1), 2);
+        assertEquals(intList.get(2), 3);
+    }
+}
\ No newline at end of file

From 0747831d0d8a8fe05a65f94e612f669e209c2f52 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 24 Jan 2022 16:47:24 -0800
Subject: [PATCH 150/490] Backs Pool with ConcurrentLinkedQueue instead of
 ArrayBlockingQueue.

---
 src/com/amazon/ion/impl/bin/utf8/Pool.java | 33 ++++++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/utf8/Pool.java b/src/com/amazon/ion/impl/bin/utf8/Pool.java
index 647055bcc4..3647541872 100644
--- a/src/com/amazon/ion/impl/bin/utf8/Pool.java
+++ b/src/com/amazon/ion/impl/bin/utf8/Pool.java
@@ -1,6 +1,8 @@
 package com.amazon.ion.impl.bin.utf8;
 
-import java.util.concurrent.ArrayBlockingQueue;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicInteger;
 
 abstract class Pool<T extends Poolable<?>> {
 
@@ -22,14 +24,19 @@ interface Allocator<T extends Poolable<?>> {
     private static final int MAX_QUEUE_SIZE = 128;
 
     // A queue of previously initialized objects that can be loaned out.
-    private final ArrayBlockingQueue<T> bufferQueue;
+    private final Queue<T> objectQueue;
+
+    // The current size of the queue. Note: some implementations of Queue.size() (including ConcurrentLinkedQueue's)
+    // are not constant-time operations. Tracking the size externally is a performance optimization.
+    private final AtomicInteger size;
 
     // Allocator of objects to be pooled.
     private final Allocator<T> allocator;
 
     Pool(Allocator<T> allocator) {
         this.allocator = allocator;
-        bufferQueue = new ArrayBlockingQueue<T>(MAX_QUEUE_SIZE);
+        objectQueue = new ConcurrentLinkedQueue<T>();
+        size = new AtomicInteger(0);
     }
 
     /**
@@ -40,10 +47,13 @@ interface Allocator<T extends Poolable<?>> {
      */
     public T getOrCreate() {
         // The `poll` method does not block. If the queue is empty it returns `null` immediately.
-        T object = bufferQueue.poll();
+        T object = objectQueue.poll();
         if (object == null) {
-            // No buffers were available in the pool. Create a new one.
+            // No objects were available in the pool. Create a new one.
             object = allocator.newInstance(this);
+        } else {
+            // An object was retrieved from the pool; decrement the pool size.
+            size.decrementAndGet();
         }
         return object;
     }
@@ -59,6 +69,17 @@ public T getOrCreate() {
     public void returnToPool(T object) {
         // The `offer` method does not block. If the queue is full, it returns `false` immediately.
         // If the provided instance cannot be added to the pool, we discard it silently.
-        bufferQueue.offer(object);
+        if (size.getAndIncrement() < MAX_QUEUE_SIZE) {
+            objectQueue.offer(object);
+        } else {
+            // The pool was full. Since the size was optimistically incremented, decrement it now.
+            // Note: there is a race condition here that is deliberately allowed as an optimization.
+            // Under high contention, multiple threads could end up here before the first one
+            // decrements the size, causing objects to be dropped wastefully. This is not harmful
+            // because objects will be re-allocated when necessary; the pool is kept as close as
+            // possible to capacity on a best-effort basis. This race condition should not be "fixed"
+            // without a thorough study of the performance implications.
+            size.decrementAndGet();
+        }
     }
 }

From 1baad70fa6d6ce6b0f20b3f2f92297465b00adf6 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 24 Jan 2022 18:49:01 -0800
Subject: [PATCH 151/490] Optimizes the incremental reader's symbol table
 reading logic for tables with imports.

---
 src/com/amazon/ion/impl/ImportLocation.java   |  53 ++++
 .../ion/impl/IonReaderBinaryIncremental.java  | 270 ++++++------------
 .../ion/impl/LocalSymbolTableImports.java     |  15 +
 .../impl/IonReaderBinaryIncrementalTest.java  |  10 +-
 4 files changed, 155 insertions(+), 193 deletions(-)
 create mode 100644 src/com/amazon/ion/impl/ImportLocation.java

diff --git a/src/com/amazon/ion/impl/ImportLocation.java b/src/com/amazon/ion/impl/ImportLocation.java
new file mode 100644
index 0000000000..acd5873887
--- /dev/null
+++ b/src/com/amazon/ion/impl/ImportLocation.java
@@ -0,0 +1,53 @@
+package com.amazon.ion.impl;
+
+/**
+ * A SymbolToken's import location, allowing for symbols with unknown text to be mapped to a particular slot
+ * in a shared symbol table.
+ * NOTE: this is currently not publicly accessible, but it is an important step toward being able to correctly
+ * round-trip symbols with unknown text from shared symbol tables in different symbol table contexts. See
+ * https://github.com/amzn/ion-java/issues/126 . Support is added now to avoid risking the appearance of performance
+ * degradation if ImportLocation support were added after initial release of the incremental IonReader.
+ */
+class ImportLocation {
+
+    // The name of the shared symbol table.
+    final String name;
+
+    // The index into the shared symbol table.
+    final int sid;
+
+    ImportLocation(String name, int sid) {
+        this.name = name;
+        this.sid = sid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getSid() {
+        return sid;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("ImportLocation::{name: %s, sid: %d}", name, sid);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof ImportLocation)) {
+            return false;
+        }
+        ImportLocation that = (ImportLocation) o;
+        return this.getName().equals(that.getName()) && this.getSid() == that.getSid();
+    }
+
+    @Override
+    public int hashCode() {
+        int result = 17;
+        result += 31 * getName().hashCode();
+        result += 31 * getSid();
+        return result;
+    }
+}
diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
index 054a7f6902..7ff310702d 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
@@ -25,7 +25,6 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -34,8 +33,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
 
 /**
  * <p>
@@ -121,23 +118,6 @@ public ContainerInfo newElement() {
         }
     };
 
-    // The Ion 1.0 system symbol table.
-    private static final List<String> SYSTEM_SYMBOLS_1_0 = Collections.unmodifiableList(Arrays.asList(
-        null,
-        "$ion",
-        "$ion_1_0",
-        "$ion_symbol_table",
-        "name",
-        "version",
-        "imports",
-        "symbols",
-        "max_id",
-        "$ion_shared_symbol_table"
-    ));
-
-    // The size of the Ion 1.0 system symbol table.
-    private static final int SYSTEM_SYMBOLS_1_0_SIZE = SYSTEM_SYMBOLS_1_0.size();
-
     // Symbol IDs for symbols contained in the system symbol table.
     private static class SystemSymbolIDs {
 
@@ -213,6 +193,10 @@ private static class SystemSymbolIDs {
     // 32-bit floats must declare length 4.
     private static final int FLOAT_32_BYTE_LENGTH = 4;
 
+    // The imports for Ion 1.0 data with no shared user imports.
+    private static final LocalSymbolTableImports ION_1_0_IMPORTS
+        = new LocalSymbolTableImports(SharedSymbolTable.getSystemSymbolTable(1));
+
     // The InputStream that provides the binary Ion data.
     private final InputStream inputStream;
 
@@ -247,18 +231,13 @@ private static class SystemSymbolIDs {
     // The catalog used by the reader to resolve shared symbol table imports.
     private final IonCatalog catalog;
 
-    // The shared symbol tables imported by the local symbol table that is currently in scope. The key is the highest
-    // local symbol ID that resolves to a symbol contained in the value's symbol table.
-    private final TreeMap<Integer, SymbolTable> imports;
+    // The shared symbol tables imported by the local symbol table that is currently in scope.
+    private LocalSymbolTableImports imports = ION_1_0_IMPORTS;
 
     // A map of symbol ID to SymbolToken representation. Because most use cases only require symbol text, this
     // is used only if necessary to avoid imposing the extra expense on all symbol lookups.
     private List<SymbolToken> symbolTokensById = null;
 
-    // The highest local symbol ID that resolves to a symbol contained in a shared symbol table imported by the
-    // current local symbol table.
-    private int importMaxId;
-
     // The cached SymbolTable representation of the current local symbol table. Invalidated whenever a local
     // symbol table is encountered in the stream.
     private SymbolTable cachedReadOnlySymbolTable = null;
@@ -341,8 +320,6 @@ private static class SystemSymbolIDs {
         );
         annotationSids = new ArrayList<Integer>(ANNOTATIONS_LIST_INITIAL_CAPACITY);
         symbols = new ArrayList<String>(SYMBOLS_LIST_INITIAL_CAPACITY);
-        symbols.addAll(SYSTEM_SYMBOLS_1_0);
-        imports = new TreeMap<Integer, SymbolTable>();
         scalarConverter = new _Private_ScalarConversions.ValueVariant();
         resetImports();
     }
@@ -404,58 +381,6 @@ public void reset() {
         }
     }
 
-    /**
-     * A SymbolToken's import location, allowing for symbols with unknown text to be mapped to a particular slot
-     * in a shared symbol table.
-     * NOTE: this is currently not publicly accessible, but it is an important step toward being able to correctly
-     * round-trip symbols with unknown text from shared symbol tables in different symbol table contexts. See
-     * https://github.com/amzn/ion-java/issues/126 . Support is added now to avoid risking the appearance of performance
-     * degradation if ImportLocation support were added after initial release of this IonReader implementation.
-     */
-    static class ImportLocation {
-
-        // The name of the shared symbol table.
-        final String name;
-
-        // The index into the shared symbol table.
-        final int sid;
-
-        ImportLocation(String name, int sid) {
-            this.name = name;
-            this.sid = sid;
-        }
-
-        public String getName() {
-            return name;
-        }
-
-        public int getSid() {
-            return sid;
-        }
-
-        @Override
-        public String toString() {
-            return String.format("ImportLocation::{name: %s, sid: %d}", name, sid);
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (!(o instanceof ImportLocation)) {
-                return false;
-            }
-            ImportLocation that = (ImportLocation) o;
-            return this.getName().equals(that.getName()) && this.getSid() == that.getSid();
-        }
-
-        @Override
-        public int hashCode() {
-            int result = 17;
-            result += 31 * getName().hashCode();
-            result += 31 * getSid();
-            return result;
-        }
-    }
-
     /**
      * SymbolToken implementation that includes ImportLocation.
      */
@@ -525,22 +450,30 @@ public int hashCode() {
         }
     }
 
+    /**
+     * Gets the system symbol table for the Ion version currently active.
+     * @return a system SymbolTable.
+     */
+    private SymbolTable getSystemSymbolTable() {
+        // Note: Ion 1.1 currently proposes changes to the system symbol table. If this is finalized, then
+        // 'majorVersion' cannot be used to look up the system symbol table; both 'majorVersion' and 'minorVersion'
+        // will need to be used.
+        return SharedSymbolTable.getSystemSymbolTable(majorVersion);
+    }
+
     /**
      * Read-only snapshot of the local symbol table at the reader's current position.
      */
     private class LocalSymbolTableSnapshot implements SymbolTable, SymbolTableAsStruct {
 
         // The system symbol table.
-        private final SymbolTable system = SharedSymbolTable.getSystemSymbolTable(majorVersion);
+        private final SymbolTable system = IonReaderBinaryIncremental.this.getSystemSymbolTable();
 
         // The max ID of this local symbol table.
         private final int maxId;
 
-        // The max ID that maps to a shared symbol table imported by this local symbol table.
-        private final int importedTablesMaxId;
-
         // The shared symbol tables imported by this local symbol table.
-        private final SymbolTable[] importedTables;
+        private final LocalSymbolTableImports importedTables;
 
         // Map representation of this symbol table. Keys are symbol text; values are the lowest symbol ID that maps
         // to that text.
@@ -552,25 +485,21 @@ private class LocalSymbolTableSnapshot implements SymbolTable, SymbolTableAsStru
         private SymbolTableStructCache structCache = null;
 
         LocalSymbolTableSnapshot() {
-            int numberOfSymbols = symbols.size();
-            maxId = numberOfSymbols - 1;
-            importedTablesMaxId = importMaxId;
+            int importsMaxId = imports.getMaxId();
+            int numberOfLocalSymbols = symbols.size();
+            // Note: 'imports' is immutable, so a clone is not needed.
+            importedTables = imports;
+            maxId = importsMaxId + numberOfLocalSymbols;
             // Map with initial size the number of symbols and load factor 1, meaning it must be full before growing.
             // It is not expected to grow.
-            listView = new ArrayList<String>(symbols.subList(0, numberOfSymbols));
-            mapView = new HashMap<String, Integer>((int) Math.ceil(numberOfSymbols / 0.75), 0.75f);
-            for (int i = 0; i < numberOfSymbols; i++) {
+            listView = new ArrayList<String>(symbols.subList(0, numberOfLocalSymbols));
+            mapView = new HashMap<String, Integer>((int) Math.ceil(numberOfLocalSymbols / 0.75), 0.75f);
+            for (int i = 0; i < numberOfLocalSymbols; i++) {
                 String symbol = listView.get(i);
                 if (symbol != null) {
-                    mapView.put(symbol, i);
+                    mapView.put(symbol, i + importsMaxId + 1);
                 }
             }
-            importedTables = new SymbolTable[imports.size()];
-            int i = 0;
-            for (SymbolTable importedTable : imports.values()) {
-                importedTables[i] = importedTable;
-                i++;
-            }
         }
 
         @Override
@@ -615,16 +544,20 @@ public String getIonVersionId() {
 
         @Override
         public SymbolTable[] getImportedTables() {
-            return importedTables;
+            return importedTables.getImportedTables();
         }
 
         @Override
         public int getImportedMaxId() {
-            return importedTablesMaxId;
+            return importedTables.getMaxId();
         }
 
         @Override
         public SymbolToken find(String text) {
+            SymbolToken token = importedTables.find(text);
+            if (token != null) {
+                return token;
+            }
             Integer sid = mapView.get(text);
             if (sid == null) {
                 return null;
@@ -648,7 +581,11 @@ public SymbolToken find(String text) {
 
         @Override
         public int findSymbol(String name) {
-            Integer sid = mapView.get(name);
+            Integer sid = importedTables.findSymbol(name);
+            if (sid > UNKNOWN_SYMBOL_ID) {
+                return sid;
+            }
+            sid = mapView.get(name);
             if (sid == null) {
                 return UNKNOWN_SYMBOL_ID;
             }
@@ -660,21 +597,21 @@ public String findKnownSymbol(int id) {
             if (id < 0) {
                 throw new IllegalArgumentException("Symbol IDs must be at least 0.");
             }
-            if (id >= symbols.size()) {
+            if (id > getMaxId()) {
                 return null;
             }
-            return listView.get(id);
+            return IonReaderBinaryIncremental.this.getSymbolString(id, importedTables, listView);
         }
 
         @Override
         public Iterator<String> iterateDeclaredSymbolNames() {
             return new Iterator<String>() {
 
-                private int index = getImportedMaxId() + 1;
+                private int index = 0;
 
                 @Override
                 public boolean hasNext() {
-                    return index <= getMaxId();
+                    return index < listView.size();
                 }
 
                 @Override
@@ -751,7 +688,6 @@ private void resetSymbolTable() {
         // Note: when there is a new version of Ion, check majorVersion and minorVersion here and set the appropriate
         // system symbol table.
         symbols.clear();
-        symbols.addAll(SYSTEM_SYMBOLS_1_0);
         cachedReadOnlySymbolTable = null;
         if (symbolTokensById != null) {
             symbolTokensById.clear();
@@ -762,68 +698,54 @@ private void resetSymbolTable() {
      * Clear the list of imported shared symbol tables.
      */
     private void resetImports() {
-        imports.clear();
-        SymbolTable system = SharedSymbolTable.getSystemSymbolTable(majorVersion);
-        importMaxId = system.getMaxId();
+        // Note: when support for the next version of Ion is added, conditionals on 'majorVersion' and 'minorVersion'
+        // must be added here.
+        imports = ION_1_0_IMPORTS;
     }
 
     /**
-     * Add a shared symbol table import, resolving it from the catalog if possible.
+     * Creates a shared symbol table import, resolving it from the catalog if possible.
      * @param name the name of the shared symbol table.
      * @param version the version of the shared symbol table.
      * @param maxId the max_id of the shared symbol table. This value takes precedence over the actual max_id for the
      *              shared symbol table at the requested version.
      */
-    private void addImport(String name, int version, int maxId) {
+    private SymbolTable createImport(String name, int version, int maxId) {
         SymbolTable shared = catalog.getTable(name, version);
-        importMaxId += maxId;
         if (shared == null) {
             // No match. All symbol IDs that fall within this shared symbol table's range will have unknown text.
-            imports.put(importMaxId, new SubstituteSymbolTable(name, version, maxId));
+            return new SubstituteSymbolTable(name, version, maxId);
         } else if (shared.getMaxId() != maxId || shared.getVersion() != version) {
             // Partial match. If the requested max_id exceeds the actual max_id of the resolved shared symbol table,
             // symbol IDs that exceed the max_id of the resolved shared symbol table will have unknown text.
-            imports.put(importMaxId, new SubstituteSymbolTable(shared, version, maxId));
+            return new SubstituteSymbolTable(shared, version, maxId);
         } else {
             // Exact match; the resolved shared symbol table may be used as-is.
-            imports.put(importMaxId, shared);
+            return shared;
         }
     }
 
     /**
-     * Retrieves from the `imports` the next-lowest key to the given key, or `null` if there is no key lower
-     * than the given key.
-     * @param key the key.
-     * @return the lower key, or null.
+     * Gets the String representation of the given symbol ID. It is the caller's responsibility to ensure that the
+     * given symbol ID is within the max ID of the symbol table.
+     * @param sid the symbol ID.
+     * @param importedSymbols the symbol table's shared symbol table imports.
+     * @param localSymbols the symbol table's local symbols.
+     * @return a String, which will be null if the requested symbol ID has undefined text.
      */
-    private Integer lowerKey(int key) {
-        // Note: with JDK 1.6+, this method is just `return imports.lowerKey(key);`
-        SortedMap<Integer, SymbolTable> sortedView = imports.headMap(key);
-        if (sortedView.isEmpty()) {
-            return null;
+    private String getSymbolString(int sid, LocalSymbolTableImports importedSymbols, List<String> localSymbols) {
+        if (sid <= importedSymbols.getMaxId()) {
+            return importedSymbols.findKnownSymbol(sid);
         }
-        return sortedView.lastKey();
+        return localSymbols.get(sid - (importedSymbols.getMaxId() + 1));
     }
 
     /**
-     * Gets the ImportLocation for the given local SID. The given SID must not point to a system symbol and must be
-     * less than or equal to `importMaxId`.
-     * @param sid the local SID.
-     * @return the ImportLocation for the given local SID.
+     * Calculates the symbol table's max ID.
+     * @return the max ID.
      */
-    private ImportLocation getImportLocation(int sid) {
-        // The system symbol table is never included in the imports map, so the local SID must be adjusted lower
-        // by the max ID of the system symbol table.
-        int systemMaxId = SharedSymbolTable.getSystemSymbolTable(majorVersion).getMaxId();
-        int systemAdjustedMaxId = sid - systemMaxId;
-        // Note: with JDK 1.6+, the following line would be
-        // Map.Entry<Integer, SymbolTable> entry = imports.ceilingEntry(systemAdjustedMaxId);
-        Map.Entry<Integer, SymbolTable> entry = imports.tailMap(systemAdjustedMaxId).entrySet().iterator().next();
-        Integer previousMaxId = lowerKey(systemAdjustedMaxId);
-        if (previousMaxId == null) {
-            previousMaxId = systemMaxId;
-        }
-        return new ImportLocation(entry.getValue().getName(), sid - previousMaxId);
+    private int maxSymbolId() {
+        return symbols.size() + imports.getMaxId();
     }
 
     /**
@@ -832,10 +754,10 @@ private ImportLocation getImportLocation(int sid) {
      * @return a String.
      */
     private String getSymbol(int sid) {
-        if (sid >= symbols.size()) {
+        if (sid > maxSymbolId()) {
             throw new IonException("Symbol ID exceeds the max ID of the symbol table.");
         }
-        return symbols.get(sid);
+        return getSymbolString(sid, imports, symbols);
     }
 
     /**
@@ -844,25 +766,26 @@ private String getSymbol(int sid) {
      * @return a SymbolToken.
      */
     private SymbolToken getSymbolToken(int sid) {
+        int symbolTableSize = maxSymbolId() + 1;
         if (symbolTokensById == null) {
-            symbolTokensById = new ArrayList<SymbolToken>(symbols.size());
+            symbolTokensById = new ArrayList<SymbolToken>(symbolTableSize);
         }
-        if (symbolTokensById.size() < symbols.size()) {
-            for (int i = symbolTokensById.size(); i < symbols.size(); i++) {
+        if (symbolTokensById.size() < symbolTableSize) {
+            for (int i = symbolTokensById.size(); i < symbolTableSize; i++) {
                 symbolTokensById.add(null);
             }
         }
-        if (sid >= symbols.size()) {
+        if (sid >= symbolTableSize) {
             throw new IonException("Symbol ID exceeds the max ID of the symbol table.");
         }
         SymbolToken token = symbolTokensById.get(sid);
         if (token == null) {
-            String text = symbols.get(sid);
+            String text = getSymbolString(sid, imports, symbols);
             ImportLocation importLocation = null;
             if (text == null) {
                 // Note: this will never be a system symbol.
-                if (sid > 0 && sid <= importMaxId) {
-                    importLocation = getImportLocation(sid);
+                if (sid > 0 && sid <= imports.getMaxId()) {
+                    importLocation = imports.getImportLocation(sid);
                 } else {
                     // All symbols with unknown text in the local symbol range are equivalent to symbol zero.
                     sid = 0;
@@ -874,38 +797,6 @@ private SymbolToken getSymbolToken(int sid) {
         return token;
     }
 
-    /**
-     * Adds the symbols declared in the given shared symbol table to the reader's current local symbol table, stopping
-     * once the given max_id has been reached.
-     * @param shared a shared symbol table to import.
-     * @param maxId the maximum symbol ID to import from the shared symbol table.
-     */
-    private void addSymbolsFromImport(SymbolTable shared, int maxId) {
-        // The system symbol table is never included in the imports map, so the local SID must be adjusted lower
-        // by the max ID of the system symbol table.
-        int systemMaxId = SharedSymbolTable.getSystemSymbolTable(majorVersion).getMaxId();
-        Integer previousMaxId = lowerKey(maxId);
-        if (previousMaxId == null) {
-            previousMaxId = systemMaxId;
-        }
-        int adjustedMaxId = maxId - previousMaxId;
-        int id = 1;
-        Iterator<String> importedSymbols = shared.iterateDeclaredSymbolNames();
-        while (importedSymbols.hasNext() && id <= adjustedMaxId) {
-            symbols.add(importedSymbols.next());
-            id++;
-        }
-    }
-
-    /**
-     * Adds the symbols from all of the imported shared symbol tables to the reader's current local symbol table.
-     */
-    private void addSymbolsFromImports() {
-        for (Map.Entry<Integer, SymbolTable> entry : imports.entrySet()) {
-            addSymbolsFromImport(entry.getValue(), entry.getKey());
-        }
-    }
-
     /**
      * Reads a local symbol table from the buffer.
      * @param marker marker for the start and end positions of the local symbol table in the buffer.
@@ -917,6 +808,7 @@ private void readSymbolTable(IonReaderLookaheadBuffer.SymbolTableMarker marker)
         boolean hasSeenSymbols = false;
         int symbolsPosition = -1;
         int symbolsEndPosition = -1;
+        List<SymbolTable> newImports;
         while (peekIndex < marker.endIndex) {
             fieldNameSid = readVarUInt();
             IonTypeID typeID = readTypeId();
@@ -931,6 +823,8 @@ private void readSymbolTable(IonReaderLookaheadBuffer.SymbolTableMarker marker)
                     peekIndex = currentValueEndPosition;
                 } else if (typeID.type == IonType.LIST) {
                     resetImports();
+                    newImports = new ArrayList<SymbolTable>(3);
+                    newImports.add(getSystemSymbolTable());
                     stepIn();
                     IonType type = next();
                     while (type != null) {
@@ -959,15 +853,15 @@ private void readSymbolTable(IonReaderLookaheadBuffer.SymbolTableMarker marker)
                             }
                             stepOut();
                         }
-                        addImport(name, version, maxId);
+                        newImports.add(createImport(name, version, maxId));
                         type = next();
                     }
                     stepOut();
+                    imports = new LocalSymbolTableImports(newImports);
                 }
                 if (!isAppend) {
                     // Clear the existing symbols before adding the new imported symbols.
                     resetSymbolTable();
-                    addSymbolsFromImports();
                 }
                 hasSeenImports = true;
             } else if (fieldNameSid == SystemSymbolIDs.SYMBOLS_ID) {
@@ -1242,8 +1136,8 @@ public int getDepth() {
     @Override
     public SymbolTable getSymbolTable() {
         if (cachedReadOnlySymbolTable == null) {
-            if (symbols.size() == SYSTEM_SYMBOLS_1_0_SIZE) {
-                cachedReadOnlySymbolTable = SharedSymbolTable.getSystemSymbolTable(majorVersion);
+            if (symbols.size() == 0 && imports == ION_1_0_IMPORTS) {
+                cachedReadOnlySymbolTable = imports.getSystemSymbolTable();
             } else {
                 cachedReadOnlySymbolTable = new LocalSymbolTableSnapshot();
             }
diff --git a/src/com/amazon/ion/impl/LocalSymbolTableImports.java b/src/com/amazon/ion/impl/LocalSymbolTableImports.java
index 3d9bfe7e58..b4b7b5e131 100644
--- a/src/com/amazon/ion/impl/LocalSymbolTableImports.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTableImports.java
@@ -278,6 +278,21 @@ SymbolTable[] getImportedTablesNoCopy()
         return myImports;
     }
 
+    /**
+     * Gets the {@link ImportLocation} for the given symbol ID.
+     * @param sid the symbol ID.
+     * @return an ImportLocation, or null if the given symbol ID is not present in the imports.
+     */
+    ImportLocation getImportLocation(int sid) {
+        // TODO once ion-java moves to Java 1.6+, the search for the import could use Arrays.binarySearch.
+        for (int i = myBaseSids.length - 1; i >= 0; i--) {
+            if (myBaseSids[i] < sid) {
+                return new ImportLocation(myImports[i].getName(), sid - myBaseSids[i]);
+            }
+        }
+        return null;
+    }
+
     @Override
     public String toString()
     {
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
index 5d114b19a4..a00c3c2c6d 100644
--- a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
+++ b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
@@ -1675,7 +1675,7 @@ public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throw
 
     private static void assertSymbolEquals(
         String expectedText,
-        IonReaderBinaryIncremental.ImportLocation expectedImportLocation,
+        ImportLocation expectedImportLocation,
         SymbolToken actual
     ) {
         assertEquals(expectedText, actual.getText());
@@ -2162,11 +2162,11 @@ public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throw
         IonReaderBinaryIncremental.SymbolTokenImpl symbolValue =
             (IonReaderBinaryIncremental.SymbolTokenImpl) reader.symbolValue();
         assertNull(symbolValue.getText());
-        assertEquals(new IonReaderBinaryIncremental.ImportLocation("foo", 3), symbolValue.getImportLocation());
+        assertEquals(new ImportLocation("foo", 3), symbolValue.getImportLocation());
         assertEquals(IonType.SYMBOL, reader.next());
         symbolValue = (IonReaderBinaryIncremental.SymbolTokenImpl) reader.symbolValue();
         assertNull(symbolValue.getText());
-        assertEquals(new IonReaderBinaryIncremental.ImportLocation("foo", 4), symbolValue.getImportLocation());
+        assertEquals(new ImportLocation("foo", 4), symbolValue.getImportLocation());
         assertEquals(IonType.SYMBOL, reader.next());
         assertEquals("123", reader.stringValue());
         assertEquals(IonType.SYMBOL, reader.next());
@@ -2175,7 +2175,7 @@ public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throw
             new IonReaderBinaryIncremental.SymbolTokenImpl(
                 null,
                 15,
-                new IonReaderBinaryIncremental.ImportLocation("baz", 1)
+                new ImportLocation("baz", 1)
             ),
             symbolValue
         );
@@ -2185,7 +2185,7 @@ public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throw
             new IonReaderBinaryIncremental.SymbolTokenImpl(
                 null,
                 16,
-                new IonReaderBinaryIncremental.ImportLocation("baz", 2)
+                new ImportLocation("baz", 2)
             ),
             symbolValue
         );

From 4266318af556322c00f7178336ad571f3636df7f Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 26 Jan 2022 17:47:48 -0800
Subject: [PATCH 152/490] Enables the incremental reader to iterate annotations
 lazily.

---
 .../ion/impl/IonReaderBinaryIncremental.java  | 139 ++++++++++-------
 .../ion/impl/IonReaderLookaheadBuffer.java    | 141 +++++++++++-------
 src/com/amazon/ion/impl/bin/IntList.java      |  10 ++
 .../impl/IonReaderLookaheadBufferTest.java    |  84 ++++++++---
 4 files changed, 245 insertions(+), 129 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
index 7ff310702d..22d774173b 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
@@ -15,6 +15,7 @@
 import com.amazon.ion.Timestamp;
 import com.amazon.ion.UnknownSymbolException;
 import com.amazon.ion.ValueFactory;
+import com.amazon.ion.impl.bin.IntList;
 import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.impl.bin.utf8.Utf8StringDecoder;
 import com.amazon.ion.impl.bin.utf8.Utf8StringDecoderPool;
@@ -27,7 +28,6 @@
 import java.nio.ByteBuffer;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -216,7 +216,7 @@ private static class SystemSymbolIDs {
     private final Utf8StringDecoder utf8Decoder = Utf8StringDecoderPool.getInstance().getOrCreate();
 
     // The symbol IDs for the annotations on the current value.
-    private final List<Integer> annotationSids;
+    private final IntList annotationSids;
 
     // True if the annotation iterator will be reused across values; otherwise, false.
     private final boolean isAnnotationIteratorReuseEnabled;
@@ -285,8 +285,8 @@ private static class SystemSymbolIDs {
     // The buffer position of the first byte of the annotation wrapper for the current value.
     private int annotationStartPosition = -1;
 
-    // The number of bytes occupied by the annotation SIDs in the annotation wrapper for the current value.
-    private int annotationsLength = -1;
+    // The buffer position of the byte after the last byte in the annotation wrapper for the current value.
+    private int annotationEndPosition = -1;
 
     // The index of the next byte to peek from the underlying buffer.
     private int peekIndex = -1;
@@ -318,7 +318,7 @@ private static class SystemSymbolIDs {
             CONTAINER_STACK_INITIAL_CAPACITY,
             CONTAINER_INFO_FACTORY
         );
-        annotationSids = new ArrayList<Integer>(ANNOTATIONS_LIST_INITIAL_CAPACITY);
+        annotationSids = new IntList(ANNOTATIONS_LIST_INITIAL_CAPACITY);
         symbols = new ArrayList<String>(SYMBOLS_LIST_INITIAL_CAPACITY);
         scalarConverter = new _Private_ScalarConversions.ValueVariant();
         resetImports();
@@ -329,24 +329,25 @@ private static class SystemSymbolIDs {
      */
     private class AnnotationIterator implements Iterator<String> {
 
-        // All of the annotation SIDs on the current value.
-        protected List<Integer> annotationSids = Collections.emptyList();
-        // The index into `annotationSids` containing the next annotation to be returned.
-        protected int index = 0;
+        // The byte position of the annotation to return from the next call to next().
+        private int nextAnnotationPeekIndex;
 
         @Override
         public boolean hasNext() {
-            return index < annotationSids.size();
+            return nextAnnotationPeekIndex < annotationEndPosition;
         }
 
         @Override
         public String next() {
-            int sid = annotationSids.get(index);
+            int savedPeekIndex = peekIndex;
+            peekIndex = nextAnnotationPeekIndex;
+            int sid = readVarUInt();
+            nextAnnotationPeekIndex = peekIndex;
+            peekIndex = savedPeekIndex;
             String annotation = getSymbol(sid);
             if (annotation == null) {
                 throw new UnknownSymbolException(sid);
             }
-            index++;
             return annotation;
         }
 
@@ -356,11 +357,18 @@ public void remove() {
         }
 
         /**
-         * Reset the iterator so that it may be reused.
+         * Prepare the iterator to iterate over the annotations on the current value.
+         */
+        void ready() {
+            nextAnnotationPeekIndex = annotationStartPosition;
+        }
+
+        /**
+         * Invalidate the iterator so that all future calls to {@link #hasNext()} will return false until the
+         * next call to {@link #ready()}.
          */
-        public void reset() {
-            index = 0;
-            annotationSids = getAnnotationSids();
+        void invalidate() {
+            nextAnnotationPeekIndex = Integer.MAX_VALUE;
         }
     }
 
@@ -368,16 +376,36 @@ public void reset() {
      * Non-reusable iterator over the annotations on the current value. May be iterated even if the reader advances
      * past the current value.
      */
-    private class SingleUseAnnotationIterator extends AnnotationIterator {
+    private class SingleUseAnnotationIterator implements Iterator<String> {
+
+        // All of the annotation SIDs on the current value.
+        private final IntList annotationSids;
+        // The index into `annotationSids` containing the next annotation to be returned.
+        private int index = 0;
 
         SingleUseAnnotationIterator() {
-            index = 0;
-            annotationSids = new ArrayList<Integer>(getAnnotationSids());
+            annotationSids = new IntList(getAnnotationSids());
         }
 
         @Override
-        public void reset() {
-            throw new IllegalStateException("Single-use annotation iterators cannot be reset.");
+        public boolean hasNext() {
+            return index < annotationSids.size();
+        }
+
+        @Override
+        public String next() {
+            int sid = annotationSids.get(index);
+            String annotation = getSymbol(sid);
+            if (annotation == null) {
+                throw new UnknownSymbolException(sid);
+            }
+            index++;
+            return annotation;
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException("This iterator does not support element removal.");
         }
     }
 
@@ -694,6 +722,16 @@ private void resetSymbolTable() {
         }
     }
 
+    /**
+     * Resets the value's annotations.
+     */
+    private void resetAnnotations() {
+        hasAnnotations = false;
+        if (isAnnotationIteratorReuseEnabled) {
+            annotationIterator.invalidate();
+        }
+    }
+
     /**
      * Clear the list of imported shared symbol tables.
      */
@@ -801,7 +839,7 @@ private SymbolToken getSymbolToken(int sid) {
      * Reads a local symbol table from the buffer.
      * @param marker marker for the start and end positions of the local symbol table in the buffer.
      */
-    private void readSymbolTable(IonReaderLookaheadBuffer.SymbolTableMarker marker) {
+    private void readSymbolTable(IonReaderLookaheadBuffer.Marker marker) {
         peekIndex = marker.startIndex;
         boolean isAppend = false;
         boolean hasSeenImports = false;
@@ -937,22 +975,24 @@ private void nextAtTopLevel() {
             // not represent valid binary Ion, a quick failure is necessary.
             throw new IonException("Binary Ion must start with an Ion version marker.");
         }
-        List<IonReaderLookaheadBuffer.SymbolTableMarker> symbolTableMarkers = lookahead.getSymbolTableMarkers();
+        List<IonReaderLookaheadBuffer.Marker> symbolTableMarkers = lookahead.getSymbolTableMarkers();
         if (!symbolTableMarkers.isEmpty()) {
             // The cached SymbolTable (if any) is a snapshot in time, so it must be cleared whenever a new symbol
             // table is read regardless of whether the new LST is an append or a reset.
             cachedReadOnlySymbolTable = null;
-            for (IonReaderLookaheadBuffer.SymbolTableMarker symbolTableMarker : symbolTableMarkers) {
+            for (IonReaderLookaheadBuffer.Marker symbolTableMarker : symbolTableMarkers) {
                 readSymbolTable(symbolTableMarker);
             }
             lookahead.resetSymbolTableMarkers();
         }
         peekIndex = lookahead.getValueStart();
-        if (lookahead.getAnnotationSids().isEmpty()) {
-            valueTypeID = lookahead.getValueTid();
-            valueType = valueTypeID.type;
-        } else {
-            hasAnnotations = true;
+        hasAnnotations = lookahead.hasAnnotations();
+        if (hasAnnotations) {
+            annotationSids.clear();
+            IonReaderLookaheadBuffer.Marker annotationSidsMarker = lookahead.getAnnotationSidsMarker();
+            annotationStartPosition = annotationSidsMarker.startIndex;
+            annotationEndPosition = annotationSidsMarker.endIndex;
+            peekIndex = annotationEndPosition;
             valueTypeID = IonTypeID.TYPE_IDS[buffer.peek(peekIndex++)];
             int wrappedValueLength = valueTypeID.length;
             if (valueTypeID.variableLength) {
@@ -965,6 +1005,9 @@ private void nextAtTopLevel() {
             if (peekIndex + wrappedValueLength != lookahead.getValueEnd()) {
                 throw new IonException("Mismatched annotation wrapper length.");
             }
+        } else {
+            valueTypeID = lookahead.getValueTid();
+            valueType = valueTypeID.type;
         }
         valueStartPosition = peekIndex;
         valueEndPosition = lookahead.getValueEnd();
@@ -1005,7 +1048,7 @@ private void endContainer() {
         valueType = null;
         valueTypeID = null;
         annotationStartPosition = -1;
-        annotationsLength = -1;
+        annotationEndPosition = -1;
         hasAnnotations = false;
     }
 
@@ -1040,9 +1083,10 @@ private void nextBelowTopLevel() {
             if (valueType == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
                 hasAnnotations = true;
                 annotationSids.clear();
-                annotationsLength = readVarUInt();
+                int annotationsLength = readVarUInt();
                 annotationStartPosition = peekIndex;
-                peekIndex = annotationStartPosition + annotationsLength;
+                annotationEndPosition = annotationStartPosition + annotationsLength;
+                peekIndex = annotationEndPosition;
                 typeID = readTypeId();
                 if (typeID.isNopPad) {
                     throw new IonException(
@@ -1061,7 +1105,7 @@ private void nextBelowTopLevel() {
                 }
             } else {
                 annotationStartPosition = -1;
-                annotationsLength = -1;
+                annotationEndPosition = -1;
                 hasAnnotations = false;
                 if (valueEndPosition > containerStack.peek().endPosition) {
                     throw new IonException("Value overflowed its container.");
@@ -1079,7 +1123,7 @@ public IonType next() {
         fieldNameSid = -1;
         lobBytesRead = 0;
         valueStartPosition = -1;
-        hasAnnotations = false;
+        resetAnnotations();
         if (containerStack.isEmpty()) {
             nextAtTopLevel();
         } else {
@@ -1701,27 +1745,22 @@ public Timestamp timestampValue() {
      * Gets the annotation symbol IDs for the current value, reading them from the buffer first if necessary.
      * @return the annotation symbol IDs, or an empty list if the current value is not annotated.
      */
-    private List<Integer> getAnnotationSids() {
-        if (containerStack.isEmpty()) {
-            return lookahead.getAnnotationSids();
-        } else {
-            if (annotationSids.isEmpty()) {
-                int savedPeekIndex = peekIndex;
-                peekIndex = annotationStartPosition;
-                long annotationsEndPosition = peekIndex + annotationsLength;
-                while (peekIndex < annotationsEndPosition) {
-                    annotationSids.add(readVarUInt());
-                }
-                peekIndex = savedPeekIndex;
+    private IntList getAnnotationSids() {
+        if (annotationSids.isEmpty()) {
+            int savedPeekIndex = peekIndex;
+            peekIndex = annotationStartPosition;
+            while (peekIndex < annotationEndPosition) {
+                annotationSids.add(readVarUInt());
             }
-            return annotationSids;
+            peekIndex = savedPeekIndex;
         }
+        return annotationSids;
     }
 
     @Override
     public String[] getTypeAnnotations() {
         if (hasAnnotations) {
-            List<Integer> annotationSids = getAnnotationSids();
+            IntList annotationSids = getAnnotationSids();
             String[] annotationArray = new String[annotationSids.size()];
             for (int i = 0; i < annotationArray.length; i++) {
                 String symbol = getSymbol(annotationSids.get(i));
@@ -1738,7 +1777,7 @@ public String[] getTypeAnnotations() {
     @Override
     public SymbolToken[] getTypeAnnotationSymbols() {
         if (hasAnnotations) {
-            List<Integer> annotationSids = getAnnotationSids();
+            IntList annotationSids = getAnnotationSids();
             SymbolToken[] annotationArray = new SymbolToken[annotationSids.size()];
             for (int i = 0; i < annotationArray.length; i++) {
                 annotationArray[i] = getSymbolToken(annotationSids.get(i));
@@ -1770,7 +1809,7 @@ public void remove() {
     public Iterator<String> iterateTypeAnnotations() {
         if (hasAnnotations) {
             if (isAnnotationIteratorReuseEnabled) {
-                annotationIterator.reset();
+                annotationIterator.ready();
                 return annotationIterator;
             } else {
                 return new SingleUseAnnotationIterator();
diff --git a/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java b/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
index 325daa9990..c510b3af11 100644
--- a/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
+++ b/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
@@ -142,24 +142,24 @@ private enum State {
     }
 
     /**
-     * Holds the start and end indices of a buffered symbol table.
+     * Holds the start and end indices of a slice of the buffer.
      */
-    static class SymbolTableMarker {
+    static class Marker {
         /**
-         * Index of the first byte of the symbol table struct's contents.
+         * Index of the first byte in the slice.
          */
         int startIndex;
 
         /**
-         * Index of the first byte after the end of the symbol table.
+         * Index of the first byte after the end of the slice.
          */
         int endIndex;
 
         /**
-         * @param startIndex index of the first byte of the symbol table struct's contents.
-         * @param length the number of bytes that remain in the symbol table struct after 'startIndex'.
+         * @param startIndex index of the first byte in the slice.
+         * @param length the number of bytes in the slice.
          */
-        private SymbolTableMarker(final int startIndex, final int length) {
+        private Marker(final int startIndex, final int length) {
             this.startIndex = startIndex;
             this.endIndex = startIndex + length;
         }
@@ -178,12 +178,13 @@ private SymbolTableMarker(final int startIndex, final int length) {
     /**
      * Markers for any symbol tables that occurred in the stream between the last value and the current value.
      */
-    private final List<SymbolTableMarker> symbolTableMarkers = new ArrayList<SymbolTableMarker>(2);
+    private final List<Marker> symbolTableMarkers = new ArrayList<Marker>(2);
 
     /**
-     * The symbol IDs of any annotations on the current value.
+     * Marker for the sequence of annotation symbol IDs on the current value. If there are no annotations on the
+     * current value, the startIndex will be negative.
      */
-    private final List<Integer> annotationSids = new ArrayList<Integer>(3);
+    private final Marker annotationSidsMarker = new Marker(-1, 0);
 
     /**
      * The handler that will be notified when a symbol table exceeds the maximum buffer size.
@@ -204,12 +205,6 @@ private SymbolTableMarker(final int startIndex, final int length) {
      */
     private boolean isSystemValue;
 
-    /**
-     * True if the current value has an annotation wrapper whose first annotation is `$ion_symbol_table`.
-     * The value will be deemed a system value if it is later determined to be a struct.
-     */
-    private boolean isSymbolTableAnnotationFirst;
-
     /**
      * The number of bytes of annotation SIDs left to read from the value's annotation wrapper.
      */
@@ -284,14 +279,13 @@ private SymbolTableMarker(final int startIndex, final int length) {
     private void reset() {
         additionalBytesNeeded = 0;
         isSystemValue = false;
-        isSymbolTableAnnotationFirst = false;
         numberOfAnnotationSidBytesRemaining = 0;
         currentNumberOfAnnotations = 0;
         valuePreHeaderIndex = -1;
         valuePostHeaderIndex = -1;
         valueTid = null;
         valueEndIndex = -1;
-        annotationSids.clear();
+        annotationSidsMarker.startIndex = -1;
         valueStartAvailable = pipe.available();
         startNewValue();
     }
@@ -490,29 +484,21 @@ private void readHeader() throws Exception {
             additionalBytesNeeded -= inProgressVarUInt.numberOfBytesRead;
             numberOfAnnotationSidBytesRemaining = inProgressVarUInt.value;
             initializeVarUInt(VarUInt.Location.ANNOTATION_WRAPPER_SID);
+            annotationSidsMarker.startIndex = peekIndex;
+            annotationSidsMarker.endIndex = annotationSidsMarker.startIndex + (int) numberOfAnnotationSidBytesRemaining;
         }
         if (inProgressVarUInt.location == VarUInt.Location.ANNOTATION_WRAPPER_SID) {
-            while (true) {
-                readVarUInt();
-                if (inProgressVarUInt.isComplete) {
-                    currentNumberOfAnnotations++;
-                    if (currentNumberOfAnnotations == 1 && inProgressVarUInt.value == ION_SYMBOL_TABLE_SID) {
-                        isSymbolTableAnnotationFirst = true;
-                    }
-                    annotationSids.add((int) inProgressVarUInt.value);
-                    numberOfAnnotationSidBytesRemaining -= inProgressVarUInt.numberOfBytesRead;
-                    additionalBytesNeeded -= inProgressVarUInt.numberOfBytesRead;
-                    if (numberOfAnnotationSidBytesRemaining <= 0) {
-                        state = State.SKIPPING_VALUE;
-                    } else {
-                        initializeVarUInt(VarUInt.Location.ANNOTATION_WRAPPER_SID);
-                        continue;
-                    }
-                    if (isSymbolTableAnnotationFirst) {
-                        state = State.READING_VALUE_WITH_SYMBOL_TABLE_ANNOTATION;
-                    }
+            // Read the first annotation SID, which is all that is required to determine whether the value is a
+            // symbol table.
+            readVarUInt();
+            if (inProgressVarUInt.isComplete) {
+                numberOfAnnotationSidBytesRemaining -= inProgressVarUInt.numberOfBytesRead;
+                additionalBytesNeeded -= inProgressVarUInt.numberOfBytesRead;
+                if (inProgressVarUInt.value == ION_SYMBOL_TABLE_SID) {
+                    state = State.READING_VALUE_WITH_SYMBOL_TABLE_ANNOTATION;
+                } else {
+                    state = State.SKIPPING_VALUE;
                 }
-                break;
             }
         }
     }
@@ -528,12 +514,16 @@ private void shiftIndicesLeft(int afterIndex, int shiftAmount) {
         peekIndex = Math.max(peekIndex - shiftAmount, 0);
         valuePreHeaderIndex -= shiftAmount;
         valuePostHeaderIndex -= shiftAmount;
-        for (SymbolTableMarker symbolTableMarker : symbolTableMarkers) {
+        for (Marker symbolTableMarker : symbolTableMarkers) {
             if (symbolTableMarker.startIndex > afterIndex) {
                 symbolTableMarker.startIndex -= shiftAmount;
                 symbolTableMarker.endIndex -= shiftAmount;
             }
         }
+        if (annotationSidsMarker.startIndex > afterIndex) {
+            annotationSidsMarker.startIndex -= shiftAmount;
+            annotationSidsMarker.endIndex -= shiftAmount;
+        }
         if (ivmSecondByteIndex > afterIndex) {
             ivmSecondByteIndex -= shiftAmount;
         }
@@ -660,6 +650,27 @@ private int fillOrSkip() throws Exception {
         return bytesFilled;
     }
 
+    /**
+     * Attempts to skip the requested number of bytes.
+     * @param numberOfBytesToSkip the number of bytes to attempt to skip.
+     * @return the number of bytes actually skipped.
+     * @throws Exception if thrown by the event handler.
+     */
+    private long skip(long numberOfBytesToSkip) throws Exception {
+        int numberOfBytesSkipped;
+        if (pipe.availableBeyondBoundary() >= numberOfBytesToSkip) {
+            numberOfBytesSkipped = (int) numberOfBytesToSkip;
+            pipe.extendBoundary(numberOfBytesSkipped);
+            peekIndex += numberOfBytesSkipped;
+        } else {
+            numberOfBytesSkipped = fillOrSkip();
+        }
+        if (numberOfBytesSkipped > 0) {
+            dataHandler.onData(numberOfBytesSkipped);
+        }
+        return numberOfBytesSkipped;
+    }
+
     /*
      * The state transitions of the fillInput() method are summarized by the following diagram.
      *
@@ -729,6 +740,15 @@ protected void fillInputHelper() throws Exception {
                 valuePostHeaderIndex = peekIndex;
             }
             if (state == State.READING_VALUE_WITH_SYMBOL_TABLE_ANNOTATION) {
+                // Skip annotations until positioned on the value's type ID.
+                while (numberOfAnnotationSidBytesRemaining > 0) {
+                    long numberOfBytesSkipped = skip(numberOfAnnotationSidBytesRemaining);
+                    if (numberOfBytesSkipped < 1) {
+                        return;
+                    }
+                    numberOfAnnotationSidBytesRemaining -= numberOfBytesSkipped;
+                    additionalBytesNeeded -= numberOfBytesSkipped;
+                }
                 ReadTypeIdResult result = readTypeID(false);
                 if (result == ReadTypeIdResult.NO_DATA) {
                     return;
@@ -750,7 +770,7 @@ protected void fillInputHelper() throws Exception {
                     }
                     additionalBytesNeeded = inProgressVarUInt.value;
                 }
-                symbolTableMarkers.add(new SymbolTableMarker(peekIndex, (int) additionalBytesNeeded));
+                symbolTableMarkers.add(new Marker(peekIndex, (int) additionalBytesNeeded));
                 state = State.SKIPPING_VALUE;
             }
             if (state == State.SKIPPING_VALUE) {
@@ -768,19 +788,11 @@ protected void fillInputHelper() throws Exception {
                     // large enough that it doesn't fit within the buffer's configured maximum size.
                 }
                 while (additionalBytesNeeded > 0) {
-                    int numberOfBytesToRead;
-                    if (pipe.availableBeyondBoundary() >= additionalBytesNeeded) {
-                        numberOfBytesToRead = (int) additionalBytesNeeded;
-                        pipe.extendBoundary(numberOfBytesToRead);
-                        peekIndex += numberOfBytesToRead;
-                    } else {
-                        numberOfBytesToRead = fillOrSkip();
-                        if (numberOfBytesToRead < 1) {
-                            return;
-                        }
+                    long numberOfBytesSkipped = skip(additionalBytesNeeded);
+                    if (numberOfBytesSkipped < 1) {
+                        return;
                     }
-                    dataHandler.onData(numberOfBytesToRead);
-                    additionalBytesNeeded -= numberOfBytesToRead;
+                    additionalBytesNeeded -= numberOfBytesSkipped;
                 }
                 state = State.BEFORE_TYPE_ID;
             }
@@ -880,6 +892,9 @@ void resetNopPadIndex() {
      * @return the index of the first byte of the value representation (past the type ID and the optional length field).
      */
     int getValueStart() {
+        if (hasAnnotations()) {
+            return annotationSidsMarker.endIndex;
+        }
         return valuePostHeaderIndex;
     }
 
@@ -898,9 +913,12 @@ int getValueEnd() {
     }
 
     /**
-     * @return markers for any symbol tables that occurred in the stream between the last value and the current value.
+     * Returns markers for any symbol tables that occurred in the stream between the last value and the current value.
+     * The startIndex of the returned markers is the index of the first byte of the symbol table struct's contents.
+     * The endIndex of the returned markers is the index of the first byte after the end of the symbol table.
+     * @return the markers.
      */
-    List<SymbolTableMarker> getSymbolTableMarkers() {
+    List<Marker> getSymbolTableMarkers() {
         return symbolTableMarkers;
     }
 
@@ -912,10 +930,19 @@ void resetSymbolTableMarkers() {
     }
 
     /**
-     * @return the symbol IDs of any annotations on the current value.
+     * @return true if the current value has annotations; otherwise, false.
+     */
+    boolean hasAnnotations() {
+        return annotationSidsMarker.startIndex >= 0;
+    }
+    /**
+     * Returns the marker for the sequence of annotation symbol IDs on the current value. The startIndex of the
+     * returned marker is the index of the first byte of the first annotation symbol ID in the sequence. The endIndex
+     * of the returned marker is the index of the type ID byte of the value to which the annotations are applied.
+     * @return  the marker.
      */
-    List<Integer> getAnnotationSids() {
-        return annotationSids;
+    Marker getAnnotationSidsMarker() {
+        return annotationSidsMarker;
     }
 
 }
diff --git a/src/com/amazon/ion/impl/bin/IntList.java b/src/com/amazon/ion/impl/bin/IntList.java
index 8c0ba5c214..3ff039cc44 100644
--- a/src/com/amazon/ion/impl/bin/IntList.java
+++ b/src/com/amazon/ion/impl/bin/IntList.java
@@ -29,6 +29,16 @@ public IntList(final int initialCapacity) {
         numberOfValues = 0;
     }
 
+    /**
+     * Constructs a new IntList that contains all the elements of the given IntList.
+     * @param other the IntList to copy.
+     */
+    public IntList(final IntList other) {
+        this.numberOfValues = other.numberOfValues;
+        this.data = new int[other.data.length];
+        System.arraycopy(other.data, 0, this.data, 0, numberOfValues);
+    }
+
     /**
      * Accessor.
      * @return  The number of ints currently stored in the list.
diff --git a/test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java b/test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java
index d560275075..bac28697eb 100644
--- a/test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java
+++ b/test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java
@@ -1000,7 +1000,7 @@ public void valueMarkersAreSet() throws Exception {
 
         lookahead.fillInput();
         assertEquals(1, lookahead.getIvmIndex());
-        assertTrue(lookahead.getAnnotationSids().isEmpty());
+        assertFalse(lookahead.hasAnnotations());
         assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
         assertEquals(5, lookahead.getValueStart());
         assertIonTypeId(IonType.INT, 0x1, lookahead.getValueTid());
@@ -1014,7 +1014,7 @@ public void valueMarkersAreSet() throws Exception {
         assertEquals(indexForInitialBufferSize(1, 1, 7), lookahead.getIvmIndex());
         lookahead.resetIvmIndex();
         assertEquals(-1, lookahead.getIvmIndex());
-        assertTrue(lookahead.getAnnotationSids().isEmpty());
+        assertFalse(lookahead.hasAnnotations());
         assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
         assertEquals(indexForInitialBufferSize(6, 6, 12), lookahead.getValueStart());
         assertIonTypeId(IonType.STRUCT, 0x1, lookahead.getValueTid());
@@ -1023,7 +1023,9 @@ public void valueMarkersAreSet() throws Exception {
         lookahead.fillInput();
         assertEquals(-1, lookahead.getIvmIndex());
         assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
-        assertEquals(Arrays.asList(4, 5), lookahead.getAnnotationSids());
+        assertTrue(lookahead.hasAnnotations());
+        assertEquals(indexForInitialBufferSize(10, 10, 16), lookahead.getAnnotationSidsMarker().startIndex);
+        assertEquals(indexForInitialBufferSize(12, 12, 18), lookahead.getAnnotationSidsMarker().endIndex);
         assertEquals(indexForInitialBufferSize(12, 12, 18), lookahead.getValueStart());
         assertIonTypeId(IonTypeID.ION_TYPE_ANNOTATION_WRAPPER, 0x5, lookahead.getValueTid());
         assertEquals(indexForInitialBufferSize(14, 14, 20), lookahead.getValueEnd());
@@ -1031,7 +1033,7 @@ public void valueMarkersAreSet() throws Exception {
         lookahead.fillInput();
         assertEquals(-1, lookahead.getIvmIndex());
         assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
-        assertTrue(lookahead.getAnnotationSids().isEmpty());
+        assertFalse(lookahead.hasAnnotations());
         assertEquals(indexForInitialBufferSize(15, 15, 21), lookahead.getValueStart());
         assertIonTypeId(IonType.INT, 0x0, lookahead.getValueTid());
         assertEquals(indexForInitialBufferSize(15, 15, 21), lookahead.getValueEnd());
@@ -1060,8 +1062,8 @@ public void symbolTableMarkersAreSet() throws Exception {
             builder.withInitialBufferSize(initialBufferSize);
         }
         lookahead = bufferFor(
-            // Symbol table declaring symbol 'x'.
-            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'x',
+            // Symbol table with extra annotation 'name' declaring symbol 'x'.
+            0xE8, 0x82, 0x83, 0x84, 0xD4, 0x87, 0xB2, 0x81, 'x',
             // Symbol value with SID 10 ('x').
             0x71, 0x0A,
             // The value will not be consumed, so the indices continue.
@@ -1087,25 +1089,25 @@ public void symbolTableMarkersAreSet() throws Exception {
         );
         lookahead.fillInput();
         assertEquals(1, lookahead.getIvmIndex());
-        assertTrue(lookahead.getAnnotationSids().isEmpty());
-        List<IonReaderLookaheadBuffer.SymbolTableMarker> symbolTableMarkers = lookahead.getSymbolTableMarkers();
+        assertFalse(lookahead.hasAnnotations());
+        List<IonReaderLookaheadBuffer.Marker> symbolTableMarkers = lookahead.getSymbolTableMarkers();
         assertEquals(1, symbolTableMarkers.size());
-        assertEquals(8, symbolTableMarkers.get(0).startIndex);
-        assertEquals(12, symbolTableMarkers.get(0).endIndex);
-        assertEquals(13, lookahead.getValueStart());
+        assertEquals(9, symbolTableMarkers.get(0).startIndex);
+        assertEquals(13, symbolTableMarkers.get(0).endIndex);
+        assertEquals(14, lookahead.getValueStart());
         assertIonTypeId(IonType.SYMBOL, 0x1, lookahead.getValueTid());
-        assertEquals(14, lookahead.getValueEnd());
+        assertEquals(15, lookahead.getValueEnd());
         lookahead.resetSymbolTableMarkers();
         assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
 
         lookahead.fillInput();
         symbolTableMarkers = lookahead.getSymbolTableMarkers();
         assertEquals(1, symbolTableMarkers.size());
-        assertEquals(18, symbolTableMarkers.get(0).startIndex);
-        assertEquals(25, symbolTableMarkers.get(0).endIndex);
-        assertEquals(26, lookahead.getValueStart());
+        assertEquals(19, symbolTableMarkers.get(0).startIndex);
+        assertEquals(26, symbolTableMarkers.get(0).endIndex);
+        assertEquals(27, lookahead.getValueStart());
         assertIonTypeId(IonType.SYMBOL, 0x1, lookahead.getValueTid());
-        assertEquals(27, lookahead.getValueEnd());
+        assertEquals(28, lookahead.getValueEnd());
 
         IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
         assertEquals(IonType.SYMBOL, reader.next());
@@ -1116,13 +1118,13 @@ public void symbolTableMarkersAreSet() throws Exception {
         lookahead.fillInput();
         symbolTableMarkers = lookahead.getSymbolTableMarkers();
         assertEquals(2, symbolTableMarkers.size());
-        assertEquals(indexForInitialBufferSize(28, 28, 55), symbolTableMarkers.get(0).startIndex);
-        assertEquals(indexForInitialBufferSize(32, 32, 59), symbolTableMarkers.get(0).endIndex);
-        assertEquals(indexForInitialBufferSize(36, 36, 63), symbolTableMarkers.get(1).startIndex);
-        assertEquals(indexForInitialBufferSize(40, 40, 67), symbolTableMarkers.get(1).endIndex);
-        assertEquals(indexForInitialBufferSize(41, 41, 68), lookahead.getValueStart());
+        assertEquals(indexForInitialBufferSize(28, 28, 56), symbolTableMarkers.get(0).startIndex);
+        assertEquals(indexForInitialBufferSize(32, 32, 60), symbolTableMarkers.get(0).endIndex);
+        assertEquals(indexForInitialBufferSize(36, 36, 64), symbolTableMarkers.get(1).startIndex);
+        assertEquals(indexForInitialBufferSize(40, 40, 68), symbolTableMarkers.get(1).endIndex);
+        assertEquals(indexForInitialBufferSize(41, 41, 69), lookahead.getValueStart());
         assertIonTypeId(IonType.SYMBOL, 0x1, lookahead.getValueTid());
-        assertEquals(indexForInitialBufferSize(42, 42, 69), lookahead.getValueEnd());
+        assertEquals(indexForInitialBufferSize(42, 42, 70), lookahead.getValueEnd());
 
         assertEquals(IonType.SYMBOL, reader.next());
         assertEquals("d", reader.stringValue());
@@ -1194,4 +1196,42 @@ public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors() throw
         assertNull(reader.next());
         reader.close();
     }
+
+    @Test
+    public void annotationMarkersAreCorrectlyShifted() throws Exception {
+        if (initialBufferSize == null || initialBufferSize != 1) {
+            return;
+        }
+        // Set the maximum size at 1 IVM (4 bytes) + the symbol table (12 bytes) + the value (2 bytes) + part of the
+        // next value (3 bytes).
+        builder = IonBufferConfiguration.Builder.standard()
+            .withInitialBufferSize(21)
+            .withMaximumBufferSize(21);
+        createCountingEventHandler(builder, new AtomicLong());
+        lookahead = bufferFor(
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            // Symbol 10 (hello)
+            0x71, 0x0A,
+            // name::hello
+            0xE4, 0x81, 0x84, 0x71, 0x0A
+        );
+
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertFalse(lookahead.hasAnnotations());
+        // The buffer will reach its maximum size after recording the annotation marker. The marker's indices will
+        // be shifted left when space is reclaimed to fit the value.
+        lookahead.fillInput();
+        assertFalse(lookahead.moreDataRequired());
+        assertEquals("hello", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertTrue(lookahead.hasAnnotations());
+        assertEquals(2, lookahead.getAnnotationSidsMarker().startIndex);
+        assertEquals(3, lookahead.getAnnotationSidsMarker().endIndex);
+        assertNull(reader.next());
+        reader.close();
+    }
 }

From 01f813a54c57fd03a892990ea11d2c7c6a920d1f Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Mon, 31 Jan 2022 16:55:47 -0800
Subject: [PATCH 153/490] Adds CodeQL analysis

---
 .github/workflows/codeql-analysis.yml | 66 +++++++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 0000000000..6364966701
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,66 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '0 22 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 https://git.io/JvXDl
+
+      # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+      #    and modify them (or add more) to build your code if your project
+      #    uses a compiled language
+
+      #- run: |
+      #   make bootstrap
+      #   make release
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

From dcaa4a36bca914f329b4d8d568d7f93b7c0740e0 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Tue, 1 Feb 2022 13:29:23 -0800
Subject: [PATCH 154/490] Adds explicit narrowing casts in
 Timestamp.apply_offset

---
 src/com/amazon/ion/Timestamp.java | 32 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/com/amazon/ion/Timestamp.java b/src/com/amazon/ion/Timestamp.java
index 591d865222..0480090eae 100644
--- a/src/com/amazon/ion/Timestamp.java
+++ b/src/com/amazon/ion/Timestamp.java
@@ -216,7 +216,7 @@ private boolean alwaysUnknownOffset()
     private static final int[] LEAP_DAYS_IN_MONTH   = { 0,  31,  29,  31,  30,  31,  30,  31,  31,  30,  31,  30,  31 };
     private static final int[] NORMAL_DAYS_IN_MONTH = { 0,  31,  28,  31,  30,  31,  30,  31,  31,  30,  31,  30,  31 };
 
-    private static int last_day_in_month(int year, int month) {
+    private static byte last_day_in_month(int year, int month) {
         boolean is_leap;
         if ((year % 4) == 0) {
             // divisible by 4 (lower 2 bits are zero) - may be a leap year
@@ -237,7 +237,7 @@ private static int last_day_in_month(int year, int month) {
         else {
             is_leap = false;
         }
-        return is_leap ? LEAP_DAYS_IN_MONTH[month] : NORMAL_DAYS_IN_MONTH[month];
+        return (byte) (is_leap ? LEAP_DAYS_IN_MONTH[month] : NORMAL_DAYS_IN_MONTH[month]);
     }
 
     /**
@@ -256,19 +256,19 @@ private void apply_offset(int offset)
         }
         // To convert _to_ UTC you must SUBTRACT the local offset
         offset = -offset;
-        int hour_offset = offset / 60;
-        int min_offset = offset - (hour_offset * 60);
+        byte hour_offset = (byte) (offset / 60);
+        byte min_offset = (byte) (offset - (hour_offset * 60));
 
         if (offset < 0) {
             _minute += min_offset;  // lower the minute value by adding a negative offset
             _hour += hour_offset;
             if (_minute < 0) {
-                _minute += 60;
+                _minute += (byte) 60;
                 _hour -= 1;
             }
             if (_hour >= 0) return;  // hour is 0-23
-            _hour += 24;
-            _day -= 1;
+            _hour += (byte) 24;
+            _day -= (byte) 1;
             if (_day >= 1) return;  // day is 1-31
             // we can't do this until we've figured out the month and year: _day += last_day_in_month(_year, _month);
             _month -= 1;
@@ -277,8 +277,8 @@ private void apply_offset(int offset)
                 assert(_day == last_day_in_month(_year, _month));
                 return;  // 1-12
             }
-            _month += 12;
-            _year -= 1;
+            _month += (byte) 12;
+            _year -= (short) 1;
             if (_year < 1) throw new IllegalArgumentException("year is less than 1");
             _day += last_day_in_month(_year, _month);  // and now we know, even if the year did change
             assert(_day == last_day_in_month(_year, _month));
@@ -287,21 +287,21 @@ private void apply_offset(int offset)
             _minute += min_offset;  // lower the minute value by adding a negative offset
             _hour += hour_offset;
             if (_minute > 59) {
-                _minute -= 60;
-                _hour += 1;
+                _minute -= (byte) 60;
+                _hour += (byte) 1;
             }
             if (_hour < 24) return;  // hour is 0-23
-            _hour -= 24;
-            _day += 1;
+            _hour -= (byte) 24;
+            _day += (byte) 1;
             if (_day <= last_day_in_month(_year, _month)) return;  // day is 1-31
             // we can't do this until we figure out the final month and year: _day -= last_day_in_month(_year, _month);
             _day = 1; // this is always the case
-            _month += 1;
+            _month += (byte) 1;
             if (_month <= 12) {
                 return;  // 1-12
             }
-            _month -= 12;
-            _year += 1;
+            _month -= (byte) 12;
+            _year += (short) 1;
             if (_year > 9999) throw new IllegalArgumentException("year exceeds 9999");
         }
     }

From e7efcbf1652681a40d14f0f725d055e043aed654 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 31 Jan 2022 18:41:39 -0800
Subject: [PATCH 155/490] Properly sizes the buffer when a fixed-size stream is
 provided to the incremental reader with default configuration.

---
 .../amazon/ion/IonBufferConfiguration.java    | 15 +++++
 .../ion/impl/IonReaderBinaryIncremental.java  | 61 +++++++++++++++++--
 2 files changed, 72 insertions(+), 4 deletions(-)

diff --git a/src/com/amazon/ion/IonBufferConfiguration.java b/src/com/amazon/ion/IonBufferConfiguration.java
index 960ff4a074..9845b9d501 100644
--- a/src/com/amazon/ion/IonBufferConfiguration.java
+++ b/src/com/amazon/ion/IonBufferConfiguration.java
@@ -89,6 +89,21 @@ public static Builder standard() {
             return new Builder();
         }
 
+        /**
+         * Provides a new builder that would build IonBufferConfiguration instances with configuration identical to
+         * the given configuration.
+         * @param existingConfiguration an existing configuration.
+         * @return a new mutable builder.
+         */
+        public static Builder from(IonBufferConfiguration existingConfiguration) {
+            return IonBufferConfiguration.Builder.standard()
+                .onData(existingConfiguration.getDataHandler())
+                .onOversizedValue(existingConfiguration.getOversizedValueHandler())
+                .onOversizedSymbolTable(existingConfiguration.getOversizedSymbolTableHandler())
+                .withInitialBufferSize(existingConfiguration.getInitialBufferSize())
+                .withMaximumBufferSize(existingConfiguration.getMaximumBufferSize());
+        }
+
         /**
          * Sets the handler that will be notified when oversized symbol tables are encountered. If the maximum buffer
          * size is finite (see {@link #withMaximumBufferSize(int)}, this handler is required to be non-null.
diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
index 22d774173b..9cf786a823 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
@@ -21,6 +21,7 @@
 import com.amazon.ion.impl.bin.utf8.Utf8StringDecoderPool;
 import com.amazon.ion.system.SimpleCatalog;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -140,6 +141,36 @@ private static class SystemSymbolIDs {
         private static final int MAX_ID_ID = 8;
     }
 
+    /**
+     * @param value a non-negative number.
+     * @return the exponent of the next power of two greater than the given number.
+     */
+    private static int logBase2(int value) {
+        return 32 - Integer.numberOfLeadingZeros(value == 0 ? 0 : value - 1);
+    }
+
+    /**
+     * Cache of configurations for fixed-sized streams. FIXED_SIZE_CONFIGURATIONS[i] returns a configuration with
+     * buffer size max(8, 2^i). Retrieve a configuration large enough for a given size using
+     * FIXED_SIZE_CONFIGURATIONS(logBase2(size)). Only supports sizes less than or equal to
+     * STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize().
+     */
+    private static final IonBufferConfiguration[] FIXED_SIZE_CONFIGURATIONS;
+
+    static {
+        int maxBufferSizeExponent = logBase2(STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize());
+        FIXED_SIZE_CONFIGURATIONS = new IonBufferConfiguration[maxBufferSizeExponent + 1];
+        for (int i = 0; i <= maxBufferSizeExponent; i++) {
+            // Create a buffer configuration for buffers of size 2^i. The minimum size is 8: the smallest power of two
+            // larger than the minimum buffer size allowed.
+            int size = Math.max(8, (int) Math.pow(2, i));
+            FIXED_SIZE_CONFIGURATIONS[i] = IonBufferConfiguration.Builder.from(STANDARD_BUFFER_CONFIGURATION)
+                .withInitialBufferSize(size)
+                .withMaximumBufferSize(size)
+                .build();
+        }
+    }
+
     // The final byte of the binary IVM.
     private static final int IVM_FINAL_BYTE = 0xEA;
 
@@ -308,11 +339,27 @@ private static class SystemSymbolIDs {
             isAnnotationIteratorReuseEnabled = false;
             annotationIterator = null;
         }
-        if (builder.getBufferConfiguration() == null) {
-            lookahead = new IonReaderLookaheadBuffer(STANDARD_BUFFER_CONFIGURATION, inputStream);
-        } else {
-            lookahead = new IonReaderLookaheadBuffer(builder.getBufferConfiguration(), inputStream);
+        IonBufferConfiguration configuration = builder.getBufferConfiguration();
+        if (configuration == null) {
+            configuration = STANDARD_BUFFER_CONFIGURATION;
+            if (inputStream instanceof ByteArrayInputStream) {
+                // ByteArrayInputStreams are fixed-size streams. Clamp the reader's internal buffer size at the size of
+                // the stream to avoid wastefully allocating extra space that will never be needed. It is still
+                // preferable for the user to manually specify the buffer size if it's less than the default, as doing
+                // so allows this branch to be skipped.
+                int fixedBufferSize;
+                try {
+                    fixedBufferSize = inputStream.available();
+                } catch (IOException e) {
+                    // ByteArrayInputStream.available() does not throw.
+                    throw new IllegalStateException(e);
+                }
+                if (configuration.getInitialBufferSize() > fixedBufferSize) {
+                    configuration = FIXED_SIZE_CONFIGURATIONS[logBase2(fixedBufferSize)];
+                }
+            }
         }
+        lookahead = new IonReaderLookaheadBuffer(configuration, inputStream);
         buffer = (ResizingPipedInputStream) lookahead.getPipe();
         containerStack = new _Private_RecyclingStack<ContainerInfo>(
             CONTAINER_STACK_INITIAL_CAPACITY,
@@ -988,6 +1035,9 @@ private void nextAtTopLevel() {
         peekIndex = lookahead.getValueStart();
         hasAnnotations = lookahead.hasAnnotations();
         if (hasAnnotations) {
+            if (peekIndex >= lookahead.getValueEnd()) {
+                throw new IonException("Annotation wrappers without values are invalid.");
+            }
             annotationSids.clear();
             IonReaderLookaheadBuffer.Marker annotationSidsMarker = lookahead.getAnnotationSidsMarker();
             annotationStartPosition = annotationSidsMarker.startIndex;
@@ -1020,6 +1070,9 @@ private void nextAtTopLevel() {
      */
     private IonTypeID readTypeId() {
         valueTypeID = IonTypeID.TYPE_IDS[buffer.peek(peekIndex++)];
+        if (!valueTypeID.isValid) {
+            throw new IonException("Invalid type ID.");
+        }
         valueType = valueTypeID.type;
         return valueTypeID;
     }

From 521961bca3f80c00b81bf8ad27fd25a1685ff35e Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Tue, 15 Feb 2022 15:00:21 -0800
Subject: [PATCH 156/490] Prepares version 1.9.1 for release. (#413)

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c5a1c7a6b9..e025fbfd54 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.0</version>
+  <version>1.9.1</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 978df8b635..4b208eefe5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.1-SNAPSHOT</version>
+  <version>1.9.1</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 3efa93a44479890e14e48501160a69b53a872af4 Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Wed, 16 Feb 2022 08:18:18 -0800
Subject: [PATCH 157/490] Bumps version to 1.9.2-SNAPSHOT (#414)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4b208eefe5..cddd77cb0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.1</version>
+  <version>1.9.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From af464e44f3b4828cd57c062d9f423e1aa58c5425 Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Thu, 3 Mar 2022 10:25:07 -0500
Subject: [PATCH 158/490] Fixes a bug in WriteBuffer#shiftBytesLeft (#416)

This patch fixes a bug in the `WriteBuffer` that caused the
`shiftBytesLeft` method to corrupt data if it was called such that the
final `Block` in the list was emptied AND the second-to-last block
reclaimed some capacity. This would only occur if the writer
was configured to use length preallocation greater than 0 and if they
were writing more than 32KB of Ion (the default block size) between
flushes.

This change accounts for that case and, if the last `Block`
is emptied, returns it to the pool for reuse.
---
 src/com/amazon/ion/impl/bin/WriteBuffer.java  | 121 ++++++++++--------
 .../amazon/ion/impl/bin/WriteBufferTest.java  | 114 +++++++++++++++++
 2 files changed, 180 insertions(+), 55 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/WriteBuffer.java b/src/com/amazon/ion/impl/bin/WriteBuffer.java
index 0df5ba6895..c4550dc398 100644
--- a/src/com/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/com/amazon/ion/impl/bin/WriteBuffer.java
@@ -180,7 +180,7 @@ public void writeBytes(final byte[] bytes, final int off, final int len)
      * @param shiftBy   The number of bytes to the left that we'll be shifting.
      */
     public void shiftBytesLeft(int length, int shiftBy) {
-        if (shiftBy == 0) {
+        if (length == 0 || shiftBy == 0) {
             // Nothing to do.
             return;
         }
@@ -227,63 +227,74 @@ private void shiftBytesLeftWithinASingleBlock(int length, int shiftBy) {
      * @param shiftBy   The number of bytes to the left that we'll be shifting.
      */
     private void shiftBytesLeftAcrossBlocks(int length, int shiftBy) {
-        // Our starting position is the first byte that we plan to shift backwards. The `bufferOffset` is the cursor's
-        // current position in the stream; we can use this to derive which block it's in as well as its position within
-        // that block.
-        long bufferOffset = position() - length;
-
-        Block block = null;
-        while (length > 0)
-        {
-            // Using the `bufferOffset`, determine which block we're in...
-            int blockIndex = index(bufferOffset);
-            block = blocks.get(blockIndex);
-            // ...and our offset within that block.
-            int blockOffset = offset(bufferOffset);
-
-            // If the block offset is within `shiftBy` bytes of beginning of the block, some bytes we're shifting
-            // will end up in the previous block. Here's an illustrated example:
-            //
-            // shiftBy = 2, blockIndex = 1, blockOffset = 1
-            //                        v---- Cursor is here
-            // Before: [A B C D E] [F G H I J]
-            // After : [A B C D G] [F G H I J]
-            //  Now this is G --^       ^-- And the cursor is here, ready to continue copy the rest.
-            if (blockOffset < shiftBy) {
-                Block previousBlock = blocks.get(blockIndex - 1);
-                int numberOfBytesToShift = Math.min(length, shiftBy) - blockOffset;
-                System.arraycopy(block.data, blockOffset, previousBlock.data, previousBlock.data.length - numberOfBytesToShift, numberOfBytesToShift);
-
-                // Now that we've shifted some bytes, update our position within the buffer.
-                bufferOffset += numberOfBytesToShift;
-                length -= numberOfBytesToShift;
-
-                // If there are no more bytes to shift...
-                if (length == 0) {
-                    // ...lower the `limit` because we've reclaimed some bytes in this block...
-                    block.limit -= numberOfBytesToShift;
-                    // ...and early return.
-                    return;
-                }
-                // Otherwise, use our new buffer offset to recalculate our block-specific position.
-                blockIndex = index(bufferOffset);
-                block = blocks.get(blockIndex);
-                blockOffset = offset(bufferOffset);
-            }
-
-            // At this point, the block offset is at least `shiftBy` bytes away from the beginning of the block, so
-            // we can do a memcpy to shift the rest of the bytes in the block.
-            int numberOfBytesToShift = Math.min(length, block.data.length - blockOffset);
-            System.arraycopy(block.data, blockOffset, block.data, blockOffset - shiftBy, numberOfBytesToShift);
-
-            // Update our counters and see if there are any more bytes to shift.
-            bufferOffset += numberOfBytesToShift;
+        // In this method, "buffer offsets" are absolute indexes into the WriteBuffer and
+        // "block offsets" are indexes that are relative to the beginning of the current Block.
+
+        // The first buffer offset that does not yet contain data.
+        long position = position();
+        // This is the buffer offset of the first byte that we will be shifting backwards.
+        long sourceBufferOffset = position - length;
+        // When we're done, this will be the first offset in the buffer that does not contain data.
+        long writeBufferLimit = position - shiftBy;
+
+        while (length > 0) {
+            // Convert the source buffer offset into a (Block, block offset) pair.
+            int sourceBlockIndex = index(sourceBufferOffset);
+            Block sourceBlock = blocks.get(sourceBlockIndex);
+            int sourceBlockOffset = offset(sourceBufferOffset);
+
+            // Convert the destination buffer offset into a (Block, block offset) pair.
+            // Because buffer offsets are absolute, the `destinationBufferOffset` in each loop iteration is
+            // `shiftBy` positions behind the `sourceBufferOffset`.
+            long destinationBufferOffset = sourceBufferOffset - shiftBy;
+            int destinationBlockIndex = index(destinationBufferOffset);
+            Block destinationBlock = blocks.get(destinationBlockIndex);
+            int destinationBlockOffset = offset(destinationBufferOffset);
+
+            // Determine how many bytes are left in the source and destination blocks following their respective
+            // block offsets.
+            int bytesLeftInSourceBlock = sourceBlock.limit - sourceBlockOffset;
+            int bytesLeftInDestinationBlock = destinationBlock.limit - destinationBlockOffset;
+            // Whichever block has fewer bytes remaining will determine how many bytes we consider to be
+            // available for shifting in this pass.
+            int bytesAvailableToCopy = Math.min(bytesLeftInSourceBlock, bytesLeftInDestinationBlock);
+
+            // If there are more bytes available than we need to finish the shifting operation, take `length` instead.
+            int numberOfBytesToShift = Math.min(length, bytesAvailableToCopy);
+
+            // Copy the bytes from the source to the destination.
+            System.arraycopy(
+                    sourceBlock.data,
+                    sourceBlockOffset,
+                    destinationBlock.data,
+                    destinationBlockOffset,
+                    numberOfBytesToShift
+            );
+
+            // Update our record of how many bytes to shift remain...
             length -= numberOfBytesToShift;
+            // ...and from which point we should resume in the next iteration.
+            sourceBufferOffset += numberOfBytesToShift;
         }
-        if (block != null) {
-            // We've reclaimed some space in this block; lower the `limit` accordingly.
-            block.limit -= shiftBy;
+
+        // At this point, the shifting is complete. However, we have reclaimed some amount of space in the WriteBuffer.
+        // Using the `writeBufferLimit` we calculated at the beginning of the method, find the last Block that still
+        // contains data.
+        int lastBlockIndex = index(writeBufferLimit);
+        Block lastBlock = blocks.get(lastBlockIndex);
+        int lastBlockOffset = offset(writeBufferLimit);
+
+        // Update that Block's limit...
+        lastBlock.limit = lastBlockOffset;
+        // ...and return any empty blocks at the tail of the `blocks` list to the pool.
+        for (int m = blocks.size() - 1; m > lastBlockIndex; m--) {
+            Block emptyBlock = blocks.remove(m);
+            emptyBlock.close();
         }
+
+        // Update the WriteBuffer's member fields to reflect the changes we've made.
+        current = lastBlock;
+        index = lastBlockIndex;
     }
 
     /** Writes an array of bytes to the buffer expanding if necessary, defaulting to the entire array. */
diff --git a/test/com/amazon/ion/impl/bin/WriteBufferTest.java b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
index 24822820a2..babf113abc 100644
--- a/test/com/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
@@ -959,4 +959,118 @@ public void shiftBytesLeftAcrossBufferBlocksExclusively() throws IOException {
         buf.shiftBytesLeft(5, 5);
         assertBuffer("012345BCDEF".getBytes());
     }
+
+    @Test
+    public void shiftBytesLeftAcrossBufferBlocksEmptyingLastBlock() throws IOException {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        // The "B" is the first and only byte in the second block.
+        // Shifting 1 byte left by one empties the last block.
+        buf.writeBytes("0123456789AB".getBytes());
+        buf.shiftBytesLeft(1, 1);
+        assertBuffer("0123456789B".getBytes());
+    }
+
+    @Test
+    public void shiftEntireBlock() throws IOException {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        // The buffer contains two full blocks
+        buf.writeBytes("0123456789|ABCDEFGHIJ|".getBytes());
+        // We shift an entire block left by the block size
+        buf.shiftBytesLeft(11, 11);
+        assertBuffer("ABCDEFGHIJ|".getBytes());
+    }
+
+    @Test
+    public void shiftBytesLeftByMoreThanTheBlockSize() {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        // We have 5 blocks' worth of data
+        buf.writeBytes("0123456789|0123456789|0123456789|0123456789|0123456789|".getBytes());
+        // We can shift left amounts greater than the block size
+        buf.shiftBytesLeft(24, 24);
+        assertBuffer("01234569|0123456789|0123456789|".getBytes());
+    }
+
+    @Test
+    public void shiftBytesLeftAcrossBufferBlocksShorteningNextToLastBlock() throws IOException {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        // The "B" is the first and only byte in the second block.
+        // Shifting 2 bytes left by two empties the last block and shortens the next-to-last block by 1 byte.
+        // Following this operation, the next-to-last block becomes the last block.
+        buf.writeBytes("0123456789AB".getBytes());
+        buf.shiftBytesLeft(2, 2);
+        assertBuffer("01234567AB".getBytes());
+    }
+
+    @Test
+    public void writingAfterLastBlockChanges() throws IOException {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        // The "B" is the first and only byte in the second block.
+        // Shifting 2 bytes left by two empties the last block and shortens the next-to-last block by 1 byte.
+        // Following this operation, the next-to-last block becomes the last block.
+        buf.writeBytes("0123456789AB".getBytes());
+        buf.shiftBytesLeft(2, 2);
+        assertBuffer("01234567AB".getBytes());
+        // After shifting and changing the last block, we can still append data without issue.
+        buf.writeBytes("CDE".getBytes());
+        assertBuffer("01234567ABCDE".getBytes());
+    }
+
+    @Test
+    public void updateLastBlock() throws IOException {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        // The "B" is the first and only byte in the second block.
+        // Shifting 2 bytes left by two empties the last block and shortens the next-to-last block by 1 byte.
+        // Following this operation, the next-to-last block becomes the last block.
+        buf.writeBytes("0123456789AB".getBytes());
+        buf.shiftBytesLeft(2, 2);
+        assertBuffer("01234567AB".getBytes());
+        // We write some more data to the buffer. If the last block has been discarded correctly, we can do another
+        // shift operation without getting corrupt data.
+        buf.writeBytes("CDEFGH".getBytes());
+        assertBuffer("01234567ABCDEFGH".getBytes());
+        buf.shiftBytesLeft(4, 2);
+        assertBuffer("01234567ABEFGH".getBytes());
+    }
+
+    @Test
+    public void shiftNBytesLeftByMoreThanNBytes() {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        buf.writeBytes("0123456789AB".getBytes());
+        // Shift left by more bytes than we're shifting (shiftBy > length)
+        buf.shiftBytesLeft(2, 5);
+        assertBuffer("01234AB".getBytes());
+    }
+
+    @Test
+    public void shiftLeftToBeginning() {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        buf.writeBytes("01234567AB".getBytes());
+        buf.shiftBytesLeft(2, 8);
+        assertBuffer("AB".getBytes());
+    }
+
+    @Test
+    public void shiftLeftToBeginningAcrossBlocks() {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        buf.writeBytes("0123456789AB".getBytes());
+        buf.shiftBytesLeft(2, 10);
+        assertBuffer("AB".getBytes());
+    }
+
+    @Test
+    public void shiftBytesLeftAcrossBufferBlocksToStartThenWritePastBlockBoundary() throws IOException {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        // The "B" is the first and only byte in the second block.
+        // Shifting 2 bytes left by 10 empties the last block and positions the shifted bytes at the start of the first
+        // block.
+        buf.writeBytes("0123456789AB".getBytes());
+        buf.shiftBytesLeft(2, 10);
+        assertBuffer("AB".getBytes());
+        // Write enough bytes to expand back into the next block.
+        buf.writeBytes("CDE0123456789AB".getBytes());
+        assertBuffer("ABCDE0123456789AB".getBytes());
+        // Shift one byte left past the block boundary. This should once again empty the last block.
+        buf.shiftBytesLeft(1, 6);
+        assertBuffer("ABCDE01234B".getBytes());
+    }
 }

From ee0832d20906d4a63ebb598d709e7c5b1f0300a2 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 3 Mar 2022 21:28:47 -0800
Subject: [PATCH 159/490] Increases the non-incremental binary reader's
 container length limit from 2GB to 72PB.

---
 .../amazon/ion/impl/IonReaderBinaryRawX.java  | 134 +++++---
 .../ion/impl/IonReaderBinarySystemX.java      |  14 +-
 .../ion/impl/IonReaderLookaheadBuffer.java    |  38 ++-
 .../IonReaderBinaryRawLargeStreamTest.java    | 315 +++++++++++++++++-
 .../amazon/ion/util/RepeatInputStream.java    |   2 +-
 5 files changed, 434 insertions(+), 69 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
index 3c3494c678..a1585d6ed5 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
@@ -69,7 +69,7 @@ protected enum State {
     }
     State               _state;
     UnifiedInputStreamX _input;
-    int                 _local_remaining;
+    long                _local_remaining;
     boolean             _eof;
     boolean             _has_next_needed;
     ValueVariant        _v;
@@ -83,7 +83,7 @@ protected enum State {
      */
     int                 _value_field_id;
     int                 _value_tid;
-    int                 _value_len;
+    long                _value_len;
     long                _value_start;
     int                 _value_lob_remaining;
     boolean             _value_lob_is_ready;
@@ -169,11 +169,14 @@ public void close()
 
     static private final int  POS_OFFSET        = 0;
     static private final int  TYPE_LIMIT_OFFSET = 1;
-    static private final long TYPE_MASK         = 0xffffffff;
-    static private final int  LIMIT_SHIFT       = 32;
+    // All type IDs can fit in one byte.
+    static private final long TYPE_MASK         = 0xff;
+    // The limit is restricted to 7 bytes (see readVarUIntOrEOF(boolean longAllowed)), leaving space for one byte
+    // to hold the type ID. Shift the limit 8 bits left to make room for the type ID byte.
+    static private final int  LIMIT_SHIFT       = 8;
     static private final int  POS_STACK_STEP    = 2;
 
-    private final void push(int type, long position, int local_remaining)
+    private final void push(int type, long position, long local_remaining)
     {
         int oldlen = _container_stack.length;
         if ((_container_top + POS_STACK_STEP) >= oldlen) {
@@ -203,11 +206,10 @@ private final int get_top_type() {
         }
         return type;
     }
-    private final int get_top_local_remaining() {
+    private final long get_top_local_remaining() {
         assert(_container_top > 0);
         long type_limit = _container_stack[_container_top - POS_STACK_STEP + TYPE_LIMIT_OFFSET];
-        int  local_remaining = (int)((type_limit >> LIMIT_SHIFT) & TYPE_MASK);
-        return local_remaining;
+        return type_limit >> LIMIT_SHIFT;
     }
     private final void pop() {
         assert(_container_top > 0);
@@ -404,7 +406,7 @@ protected final int load_annotations() {
         case S_BEFORE_VALUE:
         case S_AFTER_VALUE:
             if (_annotations.isDefined()) {
-                int local_remaining_save = _local_remaining;
+                long local_remaining_save = _local_remaining;
                 _input._save_points.savePointPushActive(_annotations, getPosition(), 0);
                 _local_remaining =  NO_LIMIT; // limit will be handled by the save point
                 _annotation_count = 0;
@@ -475,7 +477,7 @@ private final int read_type_id() throws IOException
             return UnifiedInputStreamX.EOF;
         }
         int tid = _Private_IonConstants.getTypeCode(td);
-        int len = _Private_IonConstants.getLowNibble(td);
+        long len = _Private_IonConstants.getLowNibble(td);
 
         // NOP Padding
         if (tid == _Private_IonConstants.tidNull && len != _Private_IonConstants.lnIsNull) {
@@ -486,7 +488,16 @@ private final int read_type_id() throws IOException
             tid = _Private_IonConstants.tidNopPad; // override typeId to use Pad marker
         }
         else if (len == _Private_IonConstants.lnIsVarLen) {
-            len = readVarUInt();
+            // For now, only allow *container* lengths to exceed Integer.MAX_VALUE.
+            // Note: for annotated scalars that exceed the limit, this method will be called again for the wrapped
+            // value's type ID, and will fail.
+            boolean isLongLengthAllowed = (
+                tid == _Private_IonConstants.tidTypedecl // Annotation wrapper
+                    || tid == _Private_IonConstants.tidList
+                    || tid == _Private_IonConstants.tidSexp
+                    || tid == _Private_IonConstants.tidStruct
+            );
+            len = readVarUInt(isLongLengthAllowed);
             start_of_value = _input.getPosition();
         }
         else if (tid == _Private_IonConstants.tidNull) {
@@ -500,7 +511,7 @@ else if (len == _Private_IonConstants.lnIsNull) {
             _state = State.S_AFTER_VALUE;
         }
         else if (tid == _Private_IonConstants.tidBoolean) {
-            switch (len) {
+            switch ((int) len) {
                 case _Private_IonConstants.lnBooleanFalse:
                     _value_is_true = false;
                     break;
@@ -518,7 +529,7 @@ else if (tid == _Private_IonConstants.tidStruct) {
             if ((_struct_is_ordered = (len == 1))) {
                 // special case of an ordered struct, it gets the
                 // otherwise impossible to have length of 1
-                len = readVarUInt();
+                len = readVarUInt(true);
                 if (len == 0) {
                     throwErrorAt("Structs flagged as having ordered keys must contain at least one key/value pair.");
                 }
@@ -621,7 +632,7 @@ public void stepIn()
         // value processing when we step out
         long curr_position = getPosition();
         long next_position = curr_position + _value_len;
-        int  next_remaining = _local_remaining;
+        long  next_remaining = _local_remaining;
         if (next_remaining != NO_LIMIT) {
             next_remaining -= _value_len;
             if (next_remaining < 0) {
@@ -644,7 +655,7 @@ public void stepOut()
         // first we get the top values, then we
         // pop them all off in one fell swoop.
         long next_position   = get_top_position();
-        int  local_remaining = get_top_local_remaining();
+        long local_remaining = get_top_local_remaining();
         int  parent_tid      = get_top_type();
         pop();
         _eof = false;
@@ -672,8 +683,7 @@ public void stepOut()
                     distance -= max_skip;
                 }
                 if (distance > 0) {
-                    assert( distance < Integer.MAX_VALUE );
-                    skip((int)distance);
+                    skip(distance);
                 }
             }
             catch (IOException e) {
@@ -705,7 +715,7 @@ public int byteSize()
                 len = 0;
             }
             else {
-                len = _value_len;
+                len = (int) _value_len;
             }
             _value_lob_remaining = len;
             _value_lob_is_ready = true;
@@ -808,7 +818,7 @@ private final int read(byte[] dst, int start, int len) throws IOException
                 if (_local_remaining < 1) {
                     throwUnexpectedEOFException();
                 }
-                len = _local_remaining;
+                len = (int) _local_remaining;
             }
             read = _input.read(dst, start, len);
             _local_remaining -= read;
@@ -848,7 +858,7 @@ private final long getPosition() {
         long pos = _input.getPosition();
         return pos;
     }
-    private final void skip(int len) throws IOException
+    private final void skip(long len) throws IOException
     {
         if (len < 0) {
             // no need to test this start >= dst.length ||
@@ -856,7 +866,11 @@ private final void skip(int len) throws IOException
             throw new IllegalArgumentException();
         }
         if (_local_remaining == NO_LIMIT) {
-            _input.skip(len);
+            while (len > 0) {
+                int toSkip = (int) Math.min(Integer.MAX_VALUE, len);
+                _input.skip(toSkip);
+                len -= toSkip;
+            }
         }
         else {
             if (len > _local_remaining) {
@@ -865,8 +879,12 @@ private final void skip(int len) throws IOException
                 }
                 len = _local_remaining;
             }
-            _input.skip(len);
             _local_remaining -= len;
+            while (len > 0) {
+                int toSkip = (int) Math.min(Integer.MAX_VALUE, len);
+                _input.skip(toSkip);
+                len -= toSkip;
+            }
         }
         return;
     }
@@ -986,7 +1004,7 @@ private int readVarInt(int firstByte) throws IOException {
             if ((b & 0x80) != 0) break;
 
             // Don't support anything above a 5-byte VarInt for now, see https://github.com/amzn/ion-java/issues/146
-            throwVarIntOverflowException();
+            throwVarIntOverflowException(5);
         }
 
         if (isNegative) {
@@ -995,13 +1013,24 @@ private int readVarInt(int firstByte) throws IOException {
 
         int retValueAsInt = (int) retValue;
         if (retValue != ((long) retValueAsInt)) {
-            throwVarIntOverflowException();
+            throwVarIntOverflowException(4);
         }
 
         return retValueAsInt;
     }
 
     protected final int readVarUIntOrEOF() throws IOException
+    {
+        return (int) readVarUIntOrEOF(false);
+    }
+
+    /**
+     * Attempts to read a VarUInt.
+     * @param longAllowed true if values over Integer.MAX_VALUE are allowed. If false, such values will raise an error.
+     * @return the value of the VarUInt, or -1 if EOF has been reached.
+     * @throws IOException if thrown when reading from the stream.
+     */
+    protected final long readVarUIntOrEOF(boolean longAllowed) throws IOException
     {
 // VarUInt uses the high-order bit of the last octet as a marker; some (but not all) 5-byte VarUInt can fit
         // into a Java int.
@@ -1034,26 +1063,49 @@ protected final int readVarUIntOrEOF() throws IOException
             retvalue = (retvalue << 7) | (b & 0x7F);
             if ((b & 0x80) != 0) break;
 
-            // Don't support anything above a 5-byte VarUInt for now, see https://github.com/amzn/ion-java/issues/146
-            throwVarIntOverflowException();
-        }
+            if ((b = read()) < 0) throwUnexpectedEOFException();
+            retvalue = (retvalue << 7) | (b & 0x7F);
+            if ((b & 0x80) != 0) break;
+
+            if ((b = read()) < 0) throwUnexpectedEOFException();
+            retvalue = (retvalue << 7) | (b & 0x7F);
+            if ((b & 0x80) != 0) break;
 
-        int retValueAsInt = (int) retvalue;
-        if (retvalue != ((long) retValueAsInt)) {
-            throwVarIntOverflowException();
+            // Don't support anything above a 7-byte VarUInt for now, see https://github.com/amzn/ion-java/issues/146
+            throwVarIntOverflowException(7);
         }
 
-        return retValueAsInt;
+        if (!longAllowed) {
+            int retValueAsInt = (int) retvalue;
+            if (retvalue != ((long) retValueAsInt)) {
+                throwVarIntOverflowException(4);
+            }
+
+            return retValueAsInt;
+        }
+        return retvalue;
     }
     protected final int readVarUInt() throws IOException
     {
-        int varUInt = readVarUIntOrEOF();
+        return (int) readVarUInt(false);
+    }
+
+    /**
+     * Attempts to read a VarUInt, raising an error if EOF is encountered.
+     * @param longAllowed true if values over Integer.MAX_VALUE are allowed. If false, such values will raise an error.
+     * @return the value of the VarUInt.
+     * @throws IOException if thrown when reading from the stream.
+     */
+    protected final long readVarUInt(boolean longAllowed) throws IOException
+    {
+        long varUInt = readVarUIntOrEOF(longAllowed);
         if (varUInt == UnifiedInputStreamX.EOF) {
             throwUnexpectedEOFException();
         }
 
         return varUInt;
     }
+
     protected final double readFloat(int len) throws IOException
     {
         if (len == 0)
@@ -1083,7 +1135,7 @@ protected final Decimal readDecimal(int len) throws IOException
         }
         else {
             // otherwise we to it the hard way ....
-            int save_limit = NO_LIMIT;
+            long save_limit = NO_LIMIT;
             if (_local_remaining != NO_LIMIT) {
                 save_limit = _local_remaining - len;
             }
@@ -1093,8 +1145,8 @@ protected final Decimal readDecimal(int len) throws IOException
             int signum;
             if (_local_remaining > 0)
             {
-                byte[] bits = new byte[_local_remaining];
-                readAll(bits, 0, _local_remaining);
+                byte[] bits = new byte[(int) _local_remaining];
+                readAll(bits, 0, (int) _local_remaining);
                 signum = 1;
                 if (bits[0] < 0)
                 {
@@ -1136,7 +1188,7 @@ protected final Timestamp readTimestamp(int len) throws IOException
 
         int         year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0;
         BigDecimal  frac = null;
-        int         save_limit = NO_LIMIT;
+        long        save_limit = NO_LIMIT;
         if (_local_remaining != NO_LIMIT) {
             save_limit = _local_remaining - len;
         }
@@ -1172,7 +1224,7 @@ protected final Timestamp readTimestamp(int len) throws IOException
                         p = Precision.SECOND;
                         if (_local_remaining > 0) {
                             // now we read in our actual "milliseconds since the epoch"
-                            frac = readDecimal(_local_remaining);
+                            frac = readDecimal((int) _local_remaining);
                             if (frac.compareTo(BigDecimal.ZERO) < 0 || frac.compareTo(BigDecimal.ONE) >= 0) {
                                 throwErrorAt(
                                         "The fractional seconds value in a timestamp must be greater than or "
@@ -1211,7 +1263,7 @@ protected final String readString(int numberOfBytes) throws IOException
 
         utf8Decoder.prepareDecode(numberOfBytes);
 
-        int save_limit = NO_LIMIT;
+        long save_limit = NO_LIMIT;
         if (_local_remaining != NO_LIMIT) {
             save_limit = _local_remaining - numberOfBytes;
         }
@@ -1267,7 +1319,7 @@ protected final String readString(int numberOfBytes) throws IOException
     }
 
     private String readStringWithReusableBuffer(int numberOfBytes, ByteBuffer utf8InputBuffer) throws IOException {
-        int save_limit = NO_LIMIT;
+        long save_limit = NO_LIMIT;
         if (_local_remaining != NO_LIMIT) {
             save_limit = _local_remaining - numberOfBytes;
         }
@@ -1284,8 +1336,8 @@ private String readStringWithReusableBuffer(int numberOfBytes, ByteBuffer utf8In
     private final void throwUnexpectedEOFException() throws IOException {
         throwErrorAt("unexpected EOF in value");
     }
-    private final void throwVarIntOverflowException() throws IOException {
-        throwErrorAt("int in stream is too long for a Java int 32");
+    private final void throwVarIntOverflowException(int byteLimit) throws IOException {
+        throwErrorAt("int in stream is too long to fit in " + byteLimit + " bytes.");
     }
 
     protected IonException newErrorAt(String msg) {
diff --git a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
index 840d8336a3..b18c819b2b 100644
--- a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
@@ -189,7 +189,7 @@ private final void load_scalar_value() throws IOException
                 _v.setAuthoritativeType(AS_TYPE.int_value);
             }
             else if (_value_len <= MAX_BINARY_LENGTH_LONG) {
-                long v = readULong(_value_len);
+                long v = readULong((int) _value_len);
 
                 if (v < 0) {
                     // we probably can't fit this magnitude properly into a Java long
@@ -222,7 +222,7 @@ else if (_value_len <= MAX_BINARY_LENGTH_LONG) {
                 }
             }
             else {
-                BigInteger v = readBigInteger(_value_len, is_negative);
+                BigInteger v = readBigInteger((int) _value_len, is_negative);
                 _v.setValue(v);
                 _v.setAuthoritativeType(AS_TYPE.bigInteger_value);
             }
@@ -233,24 +233,24 @@ else if (_value_len <= MAX_BINARY_LENGTH_LONG) {
                 d = 0.0;
             }
             else {
-                d = readFloat(_value_len);
+                d = readFloat((int) _value_len);
             }
             _v.setValue(d);
             _v.setAuthoritativeType(AS_TYPE.double_value);
             break;
         case DECIMAL:
-            Decimal dec = readDecimal(_value_len);
+            Decimal dec = readDecimal((int) _value_len);
             _v.setValue(dec);
             _v.setAuthoritativeType(AS_TYPE.decimal_value);
             break;
         case TIMESTAMP:
             // TODO: it looks like a 0 length return a null timestamp - is that right?
-            Timestamp t = readTimestamp(_value_len);
+            Timestamp t = readTimestamp((int) _value_len);
             _v.setValue(t);
             _v.setAuthoritativeType(AS_TYPE.timestamp_value);
             break;
         case SYMBOL:
-            long sid = readULong(_value_len);
+            long sid = readULong((int) _value_len);
             if (sid < 0 || sid > Integer.MAX_VALUE) {
                 String message = "symbol id ["
                                + sid
@@ -265,7 +265,7 @@ else if (_value_len <= MAX_BINARY_LENGTH_LONG) {
             _v.setAuthoritativeType(AS_TYPE.int_value);
             break;
         case STRING:
-            String s = readString(_value_len);
+            String s = readString((int) _value_len);
             _v.setValue(s);
             _v.setAuthoritativeType(AS_TYPE.string_value);
             break;
diff --git a/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java b/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
index c510b3af11..174045c30e 100644
--- a/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
+++ b/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
@@ -29,6 +29,8 @@ public final class IonReaderLookaheadBuffer extends ReaderLookaheadBufferBase {
     private static final int IVM_START_BYTE = 0xE0;
     private static final int IVM_REMAINING_LENGTH = 3; // Length of the IVM after the first byte.
     private static final int ION_SYMBOL_TABLE_SID = 3;
+    // The following is a limitation imposed by this implementation, not the Ion specification.
+    private static final long MAXIMUM_VALUE_SIZE = Integer.MAX_VALUE;
 
     /**
      * Represents a VarUInt that may be read in multiple steps.
@@ -544,9 +546,9 @@ private void reclaimNopPadding() {
      * @return the number of bytes actually skipped.
      * @throws IOException if thrown by the underlying InputStream.
      */
-    private int skipBytesFromInput(int numberOfBytesToSkip) throws IOException {
+    private long skipBytesFromInput(long numberOfBytesToSkip) throws IOException {
         try {
-            return (int) getInput().skip(numberOfBytesToSkip);
+            return getInput().skip(numberOfBytesToSkip);
         } catch (EOFException e) {
             // Certain InputStream implementations (e.g. GZIPInputStream) throw EOFException if more bytes are requested
             // to skip than are currently available (e.g. if a header or trailer is incomplete).
@@ -584,7 +586,7 @@ private int fillPage(int numberOfBytesRequested) throws Exception {
         if (isSkippingCurrentValue()) {
             if (state == State.SKIPPING_VALUE) {
                 // This is a seek operation, meaning that the bytes don't need to be interpreted.
-                received = skipBytesFromInput(amountToFill);
+                received = (int) skipBytesFromInput(amountToFill);
             } else {
                 // The bytes need to be interpreted, so they cannot be skipped. The caller must retrieve them from
                 // the input.
@@ -621,15 +623,18 @@ private void notifyHandlerOfOversizedValue() throws Exception {
      * @return the number of bytes filled or skipped.
      * @throws Exception if thrown by the event handler.
      */
-    private int fillOrSkip() throws Exception {
+    private long fillOrSkip() throws Exception {
         // Clamping at the number of buffered bytes available guarantees that the buffer
         // will never grow beyond its initial size.
-        int bytesRequested = (int) additionalBytesNeeded - pipe.availableBeyondBoundary();
-        int bytesFilled;
+        long bytesRequested = additionalBytesNeeded - pipe.availableBeyondBoundary();
+        long bytesFilled;
         if (isSkippingCurrentValue()) {
             bytesFilled = skipBytesFromInput(bytesRequested);
         } else {
-            bytesFilled = fillPage(bytesRequested);
+            if (additionalBytesNeeded > MAXIMUM_VALUE_SIZE) {
+                throw new IonException("The size of the value exceeds the limits of the implementation.");
+            }
+            bytesFilled = fillPage((int) bytesRequested);
         }
         if (bytesFilled < 1) {
             return 0;
@@ -643,9 +648,9 @@ private int fillOrSkip() throws Exception {
             // buffered.
             bytesFilled = bytesFilled + ((int) additionalBytesNeeded - bytesRequested);
         } else {
-            bytesFilled = (int) Math.min(additionalBytesNeeded, bytesFilled);
-            pipe.extendBoundary(bytesFilled);
-            peekIndex += bytesFilled;
+            bytesFilled = Math.min(additionalBytesNeeded, bytesFilled);
+            pipe.extendBoundary((int) bytesFilled);
+            peekIndex += (int) bytesFilled;
         }
         return bytesFilled;
     }
@@ -657,16 +662,21 @@ private int fillOrSkip() throws Exception {
      * @throws Exception if thrown by the event handler.
      */
     private long skip(long numberOfBytesToSkip) throws Exception {
-        int numberOfBytesSkipped;
+        long numberOfBytesSkipped;
         if (pipe.availableBeyondBoundary() >= numberOfBytesToSkip) {
             numberOfBytesSkipped = (int) numberOfBytesToSkip;
-            pipe.extendBoundary(numberOfBytesSkipped);
-            peekIndex += numberOfBytesSkipped;
+            pipe.extendBoundary((int) numberOfBytesSkipped);
+            peekIndex += (int) numberOfBytesSkipped;
         } else {
             numberOfBytesSkipped = fillOrSkip();
         }
         if (numberOfBytesSkipped > 0) {
-            dataHandler.onData(numberOfBytesSkipped);
+            long numberOfBytesToReport = numberOfBytesSkipped;
+            while (numberOfBytesToReport > 0) {
+                int numberOfBytesToReportThisIteration = (int) Math.min(Integer.MAX_VALUE, numberOfBytesToReport);
+                dataHandler.onData(numberOfBytesToReportThisIteration);
+                numberOfBytesToReport -= numberOfBytesToReportThisIteration;
+            }
         }
         return numberOfBytesSkipped;
     }
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java b/test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
index 9ed965105a..cd94276dc9 100644
--- a/test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
+++ b/test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
@@ -1,5 +1,6 @@
 package com.amazon.ion.impl;
 
+import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonWriter;
@@ -7,25 +8,27 @@
 import com.amazon.ion.system.IonBinaryWriterBuilder;
 import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.util.RepeatInputStream;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.SequenceInputStream;
 import java.math.BigDecimal;
 
 import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
+import static junit.framework.TestCase.assertNull;
 import static org.junit.Assert.assertEquals;
 
+// NOTE: these tests each take several seconds to complete.
 public class IonReaderBinaryRawLargeStreamTest {
 
-    // NOTE: this test takes several seconds to complete.
-    @Test
-    public void testReadLargeScalarStream() throws Exception {
+    private byte[] testData(Timestamp timestamp) throws IOException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
-        final Timestamp timestamp = Timestamp.forDay(2000, 1, 1);
         writer.writeString("foo");
         writer.writeDecimal(BigDecimal.TEN);
         writer.writeTimestamp(timestamp);
@@ -34,6 +37,12 @@ public void testReadLargeScalarStream() throws Exception {
         // Strip the IVM, as this needs to be one continuous stream to avoid resetting the reader's internals.
         byte[] data = new byte[dataWithIvm.length - BINARY_VERSION_MARKER_1_0.length];
         System.arraycopy(dataWithIvm, BINARY_VERSION_MARKER_1_0.length, data, 0, data.length);
+        return data;
+    }
+
+    public void readLargeScalarStream(IonReaderBuilder readerBuilder) throws Exception {
+        final Timestamp timestamp = Timestamp.forDay(2000, 1, 1);
+        byte[] data = testData(timestamp);
         // The binary reader uses Integer.MIN_VALUE to mean NO_LIMIT for its _local_remaining value, which keeps track
         // of the remaining number of bytes in the current value. Between values at the top level, this should always be
         // NO_LIMIT. No arithmetic should ever be performed on the value when it is set to NO_LIMIT. If bugs exist that
@@ -49,12 +58,12 @@ public void testReadLargeScalarStream() throws Exception {
         // the stream reached Integer.MAX_VALUE in length.
         // Repeat the batch a sufficient number of times to exceed a total stream length of Integer.MAX_VALUE, plus
         // a few more to make sure batches continue to be read correctly.
-        final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 7;
+        final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 7; // 7 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
         InputStream inputStream = new SequenceInputStream(
             new ByteArrayInputStream(BINARY_VERSION_MARKER_1_0),
             new RepeatInputStream(data, totalNumberOfBatches - 1) // This will provide the data 'totalNumberOfBatches' times
         );
-        IonReader reader = IonReaderBuilder.standard().build(inputStream);
+        IonReader reader = readerBuilder.build(inputStream);
         reader.next();
         assertEquals("foo", reader.stringValue());
         reader.next();
@@ -70,4 +79,298 @@ public void testReadLargeScalarStream() throws Exception {
         }
         assertEquals(totalNumberOfBatches, batchesRead);
     }
+
+    @Test
+    public void readLargeScalarStreamNonIncremental() throws Exception {
+        readLargeScalarStream(IonReaderBuilder.standard());
+    }
+
+    @Test
+    public void readLargeScalarStreamIncremental() throws Exception {
+        readLargeScalarStream(IonReaderBuilder.standard().withIncrementalReadingEnabled(true));
+    }
+
+    @Test
+    public void readLargeContainer() throws Exception {
+        final Timestamp timestamp = Timestamp.forDay(2000, 1, 1);
+
+        byte[] data = testData(timestamp);
+
+        final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 32768; // 32768 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
+        ByteArrayOutputStream header = new ByteArrayOutputStream();
+        header.write(BINARY_VERSION_MARKER_1_0);
+        header.write(0xBE); // List with length subfield.
+        IonBinary.writeVarUInt(header, (long) data.length * totalNumberOfBatches); // Length
+        InputStream inputStream = new SequenceInputStream(
+            new ByteArrayInputStream(header.toByteArray()),
+            new RepeatInputStream(data, totalNumberOfBatches - 1) // This will provide the data 'totalNumberOfBatches' times
+        );
+
+        IonReader reader = IonReaderBuilder.standard().build(inputStream);
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        int batchesRead = 0;
+        while (reader.next() != null) {
+            // Materializing on every iteration makes the tests take too long. Do it on every 100.
+            boolean materializeValues = (batchesRead % 100) == 0;
+            assertEquals(IonType.STRING, reader.getType());
+            if (materializeValues) {
+                assertEquals("foo", reader.stringValue());
+            }
+            assertEquals(IonType.DECIMAL, reader.next());
+            if (materializeValues) {
+                assertEquals(BigDecimal.TEN, reader.decimalValue());
+            }
+            assertEquals(IonType.TIMESTAMP, reader.next());
+            if (materializeValues) {
+                assertEquals(timestamp, reader.timestampValue());
+            }
+            batchesRead++;
+        }
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        assertEquals(totalNumberOfBatches, batchesRead);
+    }
+
+    @Test
+    public void skipLargeContainer() throws Exception {
+        final Timestamp timestamp = Timestamp.forDay(2000, 1, 1);
+
+        byte[] data = testData(timestamp);
+
+        final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 17; // 17 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
+        ByteArrayOutputStream header = new ByteArrayOutputStream();
+        header.write(BINARY_VERSION_MARKER_1_0);
+        header.write(0xCE); // S-exp with length subfield.
+        IonBinary.writeVarUInt(header, (long) data.length * totalNumberOfBatches); // Length
+        InputStream inputStream = new SequenceInputStream(
+            new ByteArrayInputStream(header.toByteArray()),
+            new SequenceInputStream(
+                new RepeatInputStream(data, totalNumberOfBatches - 1), // This will provide the data 'totalNumberOfBatches' times
+                new ByteArrayInputStream(new byte[]{(byte) 0x83, 'b', 'a', 'r'}) // The string "bar"
+            )
+        );
+
+        IonReader reader = IonReaderBuilder.standard().build(inputStream);
+        assertEquals(IonType.SEXP, reader.next());
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("bar", reader.stringValue());
+        assertNull(reader.next());
+    }
+
+    @Test
+    public void skipLargeNestedContainer() throws Exception {
+        final Timestamp timestamp = Timestamp.forDay(2000, 1, 1);
+
+        byte[] data = testData(timestamp);
+
+        final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 512; // 512 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
+        final long nestedDataLength = (long) data.length * totalNumberOfBatches;
+        ByteArrayOutputStream header = new ByteArrayOutputStream();
+        header.write(BINARY_VERSION_MARKER_1_0);
+        header.write(0xCE); // S-exp with length subfield.
+        IonBinary.writeVarUInt(header, 1 + IonBinary.lenVarUInt(nestedDataLength) + nestedDataLength); // Length
+        header.write(0xBE); // List with length subfield.
+        IonBinary.writeVarUInt(header, nestedDataLength);
+        InputStream inputStream = new SequenceInputStream(
+            new ByteArrayInputStream(header.toByteArray()),
+            new SequenceInputStream(
+                new RepeatInputStream(data, totalNumberOfBatches - 1), // This will provide the data 'totalNumberOfBatches' times
+                new ByteArrayInputStream(new byte[]{(byte) 0x83, 'b', 'a', 'r'}) // The string "bar"
+            )
+        );
+
+        IonReader reader = IonReaderBuilder.standard().build(inputStream);
+        assertEquals(IonType.SEXP, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.LIST, reader.next());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("bar", reader.stringValue());
+        assertNull(reader.next());
+    }
+
+    @Test
+    public void readLargeAnnotatedContainer() throws Exception {
+        final Timestamp timestamp = Timestamp.forDay(2000, 1, 1);
+        byte[] raw = testData(timestamp);
+        ByteArrayOutputStream dataBuilder = new ByteArrayOutputStream();
+        dataBuilder.write(0x85); // Field name. Conveniently use SID 5 ("version"), which is in the system symbol table.
+        dataBuilder.write(0xBE); // List with length subfield.
+        IonBinary.writeVarUInt(dataBuilder, raw.length);
+        dataBuilder.write(raw);
+        byte[] data = dataBuilder.toByteArray();
+
+        final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 100000; // 100000 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
+        ByteArrayOutputStream header = new ByteArrayOutputStream();
+        header.write(BINARY_VERSION_MARKER_1_0);
+        long containerLength = (long) data.length * totalNumberOfBatches;
+        header.write(0xEE); // Annotation wrapper with length subfield.
+        IonBinary.writeVarUInt(header, containerLength + 3 + IonBinary.lenVarUInt(containerLength));
+        header.write(0x81); // One byte of annotations.
+        header.write(0x84); // Conveniently use SID 4 ("name"), which is in the system symbol table.
+        header.write(0xDE); // Struct with length subfield.
+        IonBinary.writeVarUInt(header, containerLength); // Length
+        InputStream inputStream = new SequenceInputStream(
+            new ByteArrayInputStream(header.toByteArray()),
+            new RepeatInputStream(data, totalNumberOfBatches - 1) // This will provide the data 'totalNumberOfBatches' times
+        );
+        IonReader reader = IonReaderBuilder.standard().build(inputStream);
+        assertEquals(IonType.STRUCT, reader.next());
+        String[] annotations = reader.getTypeAnnotations();
+        assertEquals(1, annotations.length);
+        assertEquals("name", annotations[0]);
+        reader.stepIn();
+        int batchesRead = 0;
+        while (reader.next() != null) {
+            assertEquals(IonType.LIST, reader.getType());
+            // Materializing on every iteration makes the tests take too long. Do it on every 100.
+            boolean materializeValues = (batchesRead % 100) == 0;
+            if (materializeValues) {
+                assertEquals("version", reader.getFieldName());
+                reader.stepIn();
+                assertEquals(IonType.STRING, reader.next());
+                assertEquals("foo", reader.stringValue());
+                assertEquals(IonType.DECIMAL, reader.next());
+                assertEquals(BigDecimal.TEN, reader.decimalValue());
+                assertEquals(IonType.TIMESTAMP, reader.next());
+                assertEquals(timestamp, reader.timestampValue());
+                assertNull(reader.next());
+                reader.stepOut();
+            }
+            batchesRead++;
+        }
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        assertEquals(totalNumberOfBatches, batchesRead);
+    }
+
+    @Test
+    public void skipLargeAnnotatedContainer() throws Exception {
+        final Timestamp timestamp = Timestamp.forDay(2000, 1, 1);
+        byte[] raw = testData(timestamp);
+        ByteArrayOutputStream dataBuilder = new ByteArrayOutputStream();
+        dataBuilder.write(0xEE); // Annotation wrapper with length subfield.
+        IonBinary.writeVarUInt(dataBuilder, 3 + IonBinary.lenVarUInt(raw.length) + raw.length);
+        dataBuilder.write(0x81); // One byte of annotations.
+        dataBuilder.write(0x85); // Annotation. Conveniently use SID 5 ("version"), which is in the system symbol table.
+        dataBuilder.write(0xCE); // S-exp with length subfield.
+        IonBinary.writeVarUInt(dataBuilder, raw.length);
+        dataBuilder.write(raw);
+        byte[] data = dataBuilder.toByteArray();
+
+        final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 1000000; // 1000000 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
+        ByteArrayOutputStream header = new ByteArrayOutputStream();
+        header.write(BINARY_VERSION_MARKER_1_0);
+        long containerLength = (long) data.length * totalNumberOfBatches;
+        header.write(0xEE); // Annotation wrapper with length subfield.
+        IonBinary.writeVarUInt(header, containerLength + 3 + IonBinary.lenVarUInt(containerLength));
+        header.write(0x81); // One byte of annotations.
+        header.write(0x84); // Conveniently use SID 4 ("name"), which is in the system symbol table.
+        header.write(0xBE); // List with length subfield.
+        IonBinary.writeVarUInt(header, containerLength); // Length
+        InputStream inputStream = new SequenceInputStream(
+            new ByteArrayInputStream(header.toByteArray()),
+            new RepeatInputStream(data, totalNumberOfBatches - 1) // This will provide the data 'totalNumberOfBatches' times
+        );
+        IonReader reader = IonReaderBuilder.standard().build(inputStream);
+        assertEquals(IonType.LIST, reader.next());
+        String[] annotations = reader.getTypeAnnotations();
+        assertEquals(1, annotations.length);
+        assertEquals("name", annotations[0]);
+        assertNull(reader.next());
+    }
+
+    // Note: the objective of the following tests is not to assert that large scalars *should* fail, but rather that
+    // when they *do* fail due to limitations of the current implementation, they fail by throwing an IonException
+    // and not something unexpected and ugly.
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    private void cleanlyFailsOnLargeScalar(IonReaderBuilder readerBuilder) throws Exception {
+        byte[] data = "foobarbaz".getBytes("UTF-8");
+        final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 123; // 123 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
+        ByteArrayOutputStream header = new ByteArrayOutputStream();
+        header.write(BINARY_VERSION_MARKER_1_0);
+        header.write(0x8E); // String with length subfield.
+        IonBinary.writeVarUInt(header, (long) totalNumberOfBatches * data.length);
+        InputStream inputStream = new SequenceInputStream(
+            new ByteArrayInputStream(header.toByteArray()),
+            new RepeatInputStream(data, totalNumberOfBatches - 1) // This will provide the data 'totalNumberOfBatches' times
+        );
+        IonReader reader = readerBuilder.build(inputStream);
+        // If support for large scalars is added, the following line will be deleted and the rest of the test
+        // completed to assert the correctness of the value.
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void cleanlyFailsOnLargeScalarNonIncremental() throws Exception {
+        cleanlyFailsOnLargeScalar(IonReaderBuilder.standard());
+    }
+
+    @Test
+    public void cleanlyFailsOnLargeScalarIncremental() throws Exception {
+        cleanlyFailsOnLargeScalar(IonReaderBuilder.standard().withIncrementalReadingEnabled(true));
+    }
+
+    private void cleanlyFailsOnLargeAnnotatedScalar(IonReaderBuilder readerBuilder) throws Exception {
+        byte[] data = "foobarbaz".getBytes("UTF-8");
+        final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 9999; // 9999 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
+        final long stringLength = (long) totalNumberOfBatches * data.length;
+        ByteArrayOutputStream header = new ByteArrayOutputStream();
+        header.write(BINARY_VERSION_MARKER_1_0);
+        header.write(0xEE); // Annotation wrapper with length subfield.
+        IonBinary.writeVarUInt(header, 3 + IonBinary.lenVarUInt(stringLength) + stringLength);
+        header.write(0x81); // One byte of annotations.
+        header.write(0x84); // Conveniently use SID 4 ("name"), which is in the system symbol table.
+        header.write(0x8E); // String with length subfield.
+        IonBinary.writeVarUInt(header, stringLength);
+        InputStream inputStream = new SequenceInputStream(
+            new ByteArrayInputStream(header.toByteArray()),
+            new RepeatInputStream(data, totalNumberOfBatches - 1) // This will provide the data 'totalNumberOfBatches' times
+        );
+        IonReader reader = readerBuilder.build(inputStream);
+        // If support for large scalars is added, the following line will be deleted and the rest of the test
+        // completed to assert the correctness of the value.
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void cleanlyFailsOnLargeAnnotatedScalarNonIncremental() throws Exception {
+        cleanlyFailsOnLargeAnnotatedScalar(IonReaderBuilder.standard());
+    }
+
+    @Test
+    public void cleanlyFailsOnLargeAnnotatedScalarIncremental() throws Exception {
+        cleanlyFailsOnLargeAnnotatedScalar(IonReaderBuilder.standard().withIncrementalReadingEnabled(true));
+    }
+
+    @Test
+    public void cleanlyFailsOnLargeContainerIncremental() throws Exception {
+        final Timestamp timestamp = Timestamp.forDay(2000, 1, 1);
+
+        byte[] data = testData(timestamp);
+
+        final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 42; // 42 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
+        ByteArrayOutputStream header = new ByteArrayOutputStream();
+        header.write(BINARY_VERSION_MARKER_1_0);
+        header.write(0xCE); // S-exp with length subfield.
+        IonBinary.writeVarUInt(header, (long) data.length * totalNumberOfBatches); // Length
+        InputStream inputStream = new SequenceInputStream(
+            new ByteArrayInputStream(header.toByteArray()),
+            new RepeatInputStream(data, totalNumberOfBatches - 1) // This will provide the data 'totalNumberOfBatches' times
+        );
+
+        IonReader reader = IonReaderBuilder.standard().withIncrementalReadingEnabled(true).build(inputStream);
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
 }
diff --git a/test/com/amazon/ion/util/RepeatInputStream.java b/test/com/amazon/ion/util/RepeatInputStream.java
index c9e254af42..fb58fd2135 100644
--- a/test/com/amazon/ion/util/RepeatInputStream.java
+++ b/test/com/amazon/ion/util/RepeatInputStream.java
@@ -77,7 +77,7 @@ public int read(byte[] b, int off, int len) throws IOException
             return -1;
         }
 
-        int rem = len - off;
+        int rem = len;
         int consumed = 0;
         while (rem > 0 && !isDone())
         {

From 8356c932326e6091d65b20e43c344bf90475f80f Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Mon, 7 Mar 2022 12:13:11 -0800
Subject: [PATCH 160/490] Bumps version to 1.9.3-SNAPSHOT (#419)

Looks like we dropped this in the blur of the 1.9.2 release
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cddd77cb0c..dbada93957 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.2-SNAPSHOT</version>
+  <version>1.9.3-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 939db897d4cccc3bad2eab633031f3cd65e34e73 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 7 Mar 2022 17:55:22 -0800
Subject: [PATCH 161/490] Fixes a bug in header compaction for empty
 containers; adds testing for all writer option combinations over all good
 ion-tests files.

---
 src/com/amazon/ion/impl/bin/WriteBuffer.java  |   2 +-
 test/AllTests.java                            |   4 +-
 .../bin/IonManagedBinaryWriterGoodTest.java   |  56 ++++++
 .../impl/bin/IonManagedBinaryWriterTest.java  | 169 +++---------------
 .../bin/IonManagedBinaryWriterTestCase.java   | 152 ++++++++++++++++
 .../amazon/ion/impl/bin/WriteBufferTest.java  |  20 +++
 6 files changed, 256 insertions(+), 147 deletions(-)
 create mode 100644 test/com/amazon/ion/impl/bin/IonManagedBinaryWriterGoodTest.java
 create mode 100644 test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java

diff --git a/src/com/amazon/ion/impl/bin/WriteBuffer.java b/src/com/amazon/ion/impl/bin/WriteBuffer.java
index c4550dc398..88e5db1749 100644
--- a/src/com/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/com/amazon/ion/impl/bin/WriteBuffer.java
@@ -180,7 +180,7 @@ public void writeBytes(final byte[] bytes, final int off, final int len)
      * @param shiftBy   The number of bytes to the left that we'll be shifting.
      */
     public void shiftBytesLeft(int length, int shiftBy) {
-        if (length == 0 || shiftBy == 0) {
+        if (shiftBy == 0) {
             // Nothing to do.
             return;
         }
diff --git a/test/AllTests.java b/test/AllTests.java
index 6817e13d54..8ed4056d4b 100644
--- a/test/AllTests.java
+++ b/test/AllTests.java
@@ -77,6 +77,7 @@
 import com.amazon.ion.impl.SharedSymbolTableTest;
 import com.amazon.ion.impl.SymbolTableTest;
 import com.amazon.ion.impl.TreeReaderTest;
+import com.amazon.ion.impl.bin.IonManagedBinaryWriterGoodTest;
 import com.amazon.ion.impl.bin.IonManagedBinaryWriterTest;
 import com.amazon.ion.impl.bin.IonRawBinaryWriterTest;
 import com.amazon.ion.impl.bin.PooledBlockAllocatorProviderTest;
@@ -217,11 +218,12 @@
     ResizingPipedInputStreamTest.class,
     IonReaderLookaheadBufferTest.class,
 
-    // experimental binary writer tests
+    // binary writer tests
     PooledBlockAllocatorProviderTest.class,
     WriteBufferTest.class,
     IonRawBinaryWriterTest.class,
     IonManagedBinaryWriterTest.class,
+    IonManagedBinaryWriterGoodTest.class,
 
     // Hash code tests
     HashCodeCorrectnessTest.class,
diff --git a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterGoodTest.java b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterGoodTest.java
new file mode 100644
index 0000000000..db5c997d81
--- /dev/null
+++ b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterGoodTest.java
@@ -0,0 +1,56 @@
+package com.amazon.ion.impl.bin;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.junit.Injected;
+import com.amazon.ion.system.IonReaderBuilder;
+import org.junit.Test;
+
+import java.io.File;
+
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.hexDump;
+import static com.amazon.ion.TestUtils.testdataFiles;
+
+/**
+ * Re-writes and verifies all "good" ion-tests files using all combinations of IonManagedBinaryWriter options.
+ */
+public class IonManagedBinaryWriterGoodTest extends IonManagedBinaryWriterTestCase {
+
+    @Injected.Inject("testFile")
+    public static final File[] FILES =
+        testdataFiles(GLOBAL_SKIP_LIST,
+            GOOD_IONTESTS_FILES);
+
+
+    private File myTestFile;
+
+    public void setTestFile(File file)
+    {
+        myTestFile = file;
+    }
+
+    @Test
+    public void allGoodFiles() throws Exception {
+        byte[] testData = _Private_Utils.loadFileBytes(myTestFile);
+        IonReader reader = IonReaderBuilder.standard().build(testData);
+        writer.writeValues(reader);
+        reader.close();
+
+        writer.finish();
+        final byte[] data = writer.getBytes();
+        final IonValue actual;
+        try {
+            actual = system().getLoader().load(data);
+        } catch (final Exception e) {
+            throw new IonException("Bad generated data:\n" + hexDump(data), e);
+        }
+        final IonValue expected = system().getLoader().load(testData);
+        assertEquals(expected, actual);
+
+        additionalValueAssertions(actual);
+    }
+}
diff --git a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
index 853136c59f..c808a8458a 100644
--- a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
@@ -15,165 +15,21 @@
 
 package com.amazon.ion.impl.bin;
 
-import static java.util.Arrays.asList;
-import static java.util.Collections.unmodifiableList;
-import static java.util.Collections.unmodifiableMap;
-
-import com.amazon.ion.IonContainer;
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonInt;
-import com.amazon.ion.IonMutableCatalog;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonSymbol;
 import com.amazon.ion.IonType;
-import com.amazon.ion.IonValue;
 import com.amazon.ion.IonWriter;
-import com.amazon.ion.SymbolTable;
-import com.amazon.ion.SymbolToken;
-import com.amazon.ion.SystemSymbols;
-import com.amazon.ion.impl.bin.IonManagedBinaryWriter.ImportedSymbolResolverMode;
-import com.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder.AllocatorMode;
-import com.amazon.ion.junit.Injected.Inject;
 
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import org.junit.Test;
 
 @SuppressWarnings("deprecation")
-public class IonManagedBinaryWriterTest extends IonRawBinaryWriterTest
+public class IonManagedBinaryWriterTest extends IonManagedBinaryWriterTestCase
 {
-    @SuppressWarnings("unchecked")
-    private static final List<List<String>> SHARED_SYMBOLS = unmodifiableList(asList(
-        unmodifiableList(asList(
-            "a",
-            "b",
-            "c"
-        )),
-        unmodifiableList(asList(
-            "d",
-            "e"
-        ))
-    ));
-
-    private static final Map<String, Integer> SHARED_SYMBOL_LOCAL_SIDS ;
-    static
-    {
-        final Map<String, Integer> sidMap = new HashMap<String, Integer>();
-
-        for (final SymbolToken token : Symbols.systemSymbols())
-        {
-            sidMap.put(token.getText(), token.getSid());
-        }
-        int sid = SystemSymbols.ION_1_0_MAX_ID + 1;
-        for (final List<String> symbolList : SHARED_SYMBOLS)
-        {
-            for (final String symbol : symbolList) {
-                sidMap.put(symbol, sid);
-                sid++;
-            }
-        }
-        SHARED_SYMBOL_LOCAL_SIDS = unmodifiableMap(sidMap);
-    }
-
-    private enum LSTAppendMode
-    {
-        LST_APPEND_DISABLED,
-        LST_APPEND_ENABLED;
-        public boolean isEnabled() { return this == LST_APPEND_ENABLED; }
-    }
-
-    @Inject("lstAppendMode")
-    public static final LSTAppendMode[] LST_APPEND_ENABLED_DIMENSIONS = LSTAppendMode.values();
-    private LSTAppendMode lstAppendMode;
-    public void setLstAppendMode(final LSTAppendMode mode)
-    {
-        this.lstAppendMode = mode;
-    }
-
-    private void checkSymbolTokenAgainstImport(final SymbolToken token)
-    {
-        final Integer sid = SHARED_SYMBOL_LOCAL_SIDS.get(token.getText());
-        if (sid != null)
-        {
-            assertEquals(sid.intValue(), token.getSid());
-        }
-    }
-
-    @Override
-    protected void additionalValueAssertions(final IonValue value)
-    {
-        for (final SymbolToken token : value.getTypeAnnotationSymbols()) {
-            checkSymbolTokenAgainstImport(token);
-        }
-        final IonType type = value.getType();
-        if (type == IonType.SYMBOL && !value.isNullValue())
-        {
-            checkSymbolTokenAgainstImport(((IonSymbol) value).symbolValue());
-        }
-        else if (IonType.isContainer(type))
-        {
-            for (final IonValue child : ((IonContainer) value))
-            {
-                additionalValueAssertions(child);
-            }
-        }
-    }
-
-    @Override
-    public int ivmLength() {
-        return 4;
-    }
-
-
-    @Inject("importedSymbolResolverMode")
-    public static final ImportedSymbolResolverMode[] RESOLVER_DIMENSIONS = ImportedSymbolResolverMode.values();
-
-    private ImportedSymbolResolverMode importedSymbolResolverMode;
-
-    public void setImportedSymbolResolverMode(final ImportedSymbolResolverMode mode)
-    {
-        importedSymbolResolverMode = mode;
-    }
-
-    @Override
-    protected IonWriter createWriter(final OutputStream out) throws IOException
-    {
-        final IonMutableCatalog catalog = ((IonMutableCatalog) system().getCatalog());
-
-        final List<SymbolTable> symbolTables = new ArrayList<SymbolTable>();
-        int i = 1;
-        for (final List<String> symbols : SHARED_SYMBOLS) {
-            final SymbolTable table = system().newSharedSymbolTable("test_" + (i++), 1, symbols.iterator());
-            symbolTables.add(table);
-            catalog.putTable(table);
-        }
-
-        final _Private_IonManagedBinaryWriterBuilder builder = _Private_IonManagedBinaryWriterBuilder
-            .create(AllocatorMode.POOLED)
-            .withImports(importedSymbolResolverMode, symbolTables)
-            .withPreallocationMode(preallocationMode)
-            .withFloatBinary32Enabled();
-
-        if (lstAppendMode.isEnabled()) {
-            builder.withLocalSymbolTableAppendEnabled();
-        } else {
-            builder.withLocalSymbolTableAppendDisabled();
-        }
-
-        final IonWriter writer = builder.newWriter(out);
-
-        final SymbolTable locals = writer.getSymbolTable();
-        assertEquals(14, locals.getImportedMaxId());
-
-        return writer;
-    }
 
     @Test
     public void testSetStringAnnotations() throws Exception
@@ -374,4 +230,27 @@ public void testSymbolTableExport() throws Exception {
         bos.toByteArray();
 
     }
+
+    @Test
+    public void testNestedEmptyContainer() throws Exception
+    {
+        writer.stepIn(IonType.STRUCT);
+        writer.setFieldName("bar");
+        writer.stepIn(IonType.LIST);
+        writer.stepOut();
+        writer.stepOut();
+        assertValue("{bar: []}");
+    }
+
+    @Test
+    public void testNestedEmptyAnnotatedContainer() throws Exception
+    {
+        writer.stepIn(IonType.STRUCT);
+        writer.setFieldName("bar");
+        writer.addTypeAnnotation("foo");
+        writer.stepIn(IonType.LIST);
+        writer.stepOut();
+        writer.stepOut();
+        assertValue("{bar: foo::[]}");
+    }
 }
diff --git a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java
new file mode 100644
index 0000000000..fcc28498a8
--- /dev/null
+++ b/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java
@@ -0,0 +1,152 @@
+package com.amazon.ion.impl.bin;
+
+import com.amazon.ion.IonContainer;
+import com.amazon.ion.IonMutableCatalog;
+import com.amazon.ion.IonSymbol;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.junit.Injected;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Arrays.asList;
+import static java.util.Collections.unmodifiableList;
+import static java.util.Collections.unmodifiableMap;
+
+public class IonManagedBinaryWriterTestCase extends IonRawBinaryWriterTest {
+
+    @SuppressWarnings("unchecked")
+    private static final List<List<String>> SHARED_SYMBOLS = unmodifiableList(asList(
+        unmodifiableList(asList(
+            "a",
+            "b",
+            "c"
+        )),
+        unmodifiableList(asList(
+            "d",
+            "e"
+        ))
+    ));
+
+    private static final Map<String, Integer> SHARED_SYMBOL_LOCAL_SIDS ;
+    static
+    {
+        final Map<String, Integer> sidMap = new HashMap<String, Integer>();
+
+        for (final SymbolToken token : Symbols.systemSymbols())
+        {
+            sidMap.put(token.getText(), token.getSid());
+        }
+        int sid = SystemSymbols.ION_1_0_MAX_ID + 1;
+        for (final List<String> symbolList : SHARED_SYMBOLS)
+        {
+            for (final String symbol : symbolList) {
+                sidMap.put(symbol, sid);
+                sid++;
+            }
+        }
+        SHARED_SYMBOL_LOCAL_SIDS = unmodifiableMap(sidMap);
+    }
+
+    protected enum LSTAppendMode
+    {
+        LST_APPEND_DISABLED,
+        LST_APPEND_ENABLED;
+        public boolean isEnabled() { return this == LST_APPEND_ENABLED; }
+    }
+
+    @Injected.Inject("lstAppendMode")
+    public static final LSTAppendMode[] LST_APPEND_ENABLED_DIMENSIONS = LSTAppendMode.values();
+    protected LSTAppendMode lstAppendMode;
+    public void setLstAppendMode(final LSTAppendMode mode)
+    {
+        this.lstAppendMode = mode;
+    }
+
+    private void checkSymbolTokenAgainstImport(final SymbolToken token)
+    {
+        final Integer sid = SHARED_SYMBOL_LOCAL_SIDS.get(token.getText());
+        if (sid != null)
+        {
+            assertEquals(sid.intValue(), token.getSid());
+        }
+    }
+
+    @Override
+    protected void additionalValueAssertions(final IonValue value)
+    {
+        for (final SymbolToken token : value.getTypeAnnotationSymbols()) {
+            checkSymbolTokenAgainstImport(token);
+        }
+        final IonType type = value.getType();
+        if (type == IonType.SYMBOL && !value.isNullValue())
+        {
+            checkSymbolTokenAgainstImport(((IonSymbol) value).symbolValue());
+        }
+        else if (IonType.isContainer(type))
+        {
+            for (final IonValue child : ((IonContainer) value))
+            {
+                additionalValueAssertions(child);
+            }
+        }
+    }
+
+    @Override
+    public int ivmLength() {
+        return 4;
+    }
+
+
+    @Injected.Inject("importedSymbolResolverMode")
+    public static final IonManagedBinaryWriter.ImportedSymbolResolverMode[] RESOLVER_DIMENSIONS = IonManagedBinaryWriter.ImportedSymbolResolverMode.values();
+
+    private IonManagedBinaryWriter.ImportedSymbolResolverMode importedSymbolResolverMode;
+
+    public void setImportedSymbolResolverMode(final IonManagedBinaryWriter.ImportedSymbolResolverMode mode)
+    {
+        importedSymbolResolverMode = mode;
+    }
+
+    @Override
+    protected IonWriter createWriter(final OutputStream out) throws IOException
+    {
+        final IonMutableCatalog catalog = ((IonMutableCatalog) system().getCatalog());
+
+        final List<SymbolTable> symbolTables = new ArrayList<SymbolTable>();
+        int i = 1;
+        for (final List<String> symbols : SHARED_SYMBOLS) {
+            final SymbolTable table = system().newSharedSymbolTable("test_" + (i++), 1, symbols.iterator());
+            symbolTables.add(table);
+            catalog.putTable(table);
+        }
+
+        final _Private_IonManagedBinaryWriterBuilder builder = _Private_IonManagedBinaryWriterBuilder
+            .create(_Private_IonManagedBinaryWriterBuilder.AllocatorMode.POOLED)
+            .withImports(importedSymbolResolverMode, symbolTables)
+            .withPreallocationMode(preallocationMode)
+            .withFloatBinary32Enabled();
+
+        if (lstAppendMode.isEnabled()) {
+            builder.withLocalSymbolTableAppendEnabled();
+        } else {
+            builder.withLocalSymbolTableAppendDisabled();
+        }
+
+        final IonWriter writer = builder.newWriter(out);
+
+        final SymbolTable locals = writer.getSymbolTable();
+        assertEquals(14, locals.getImportedMaxId());
+
+        return writer;
+    }
+}
diff --git a/test/com/amazon/ion/impl/bin/WriteBufferTest.java b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
index babf113abc..27b566d162 100644
--- a/test/com/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
@@ -1073,4 +1073,24 @@ public void shiftBytesLeftAcrossBufferBlocksToStartThenWritePastBlockBoundary()
         buf.shiftBytesLeft(1, 6);
         assertBuffer("ABCDE01234B".getBytes());
     }
+
+    @Test
+    public void shiftBytesLeftWithLengthZero() {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        buf.writeBytes("012345".getBytes());
+        // Shift left by two, retaining zero bytes (i.e. truncate).
+        // In Ion, this situation occurs when a length bytes are preallocated for containers that end up being empty.
+        buf.shiftBytesLeft(0, 2);
+        assertBuffer("0123".getBytes());
+    }
+
+    @Test
+    public void shiftBytesLeftWithLengthZeroAcrossBlocks() {
+        assertEquals(11, ALLOCATOR.getBlockSize());
+        buf.writeBytes("0123456789|0".getBytes());
+        // Shift left by two, retaining zero bytes (i.e. truncate).
+        // In Ion, this situation occurs when a length bytes are preallocated for containers that end up being empty.
+        buf.shiftBytesLeft(0, 2);
+        assertBuffer("0123456789".getBytes());
+    }
 }

From 400eebf8c00852cb3c6f2c7a5eef22863b0fbfb7 Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Wed, 23 Mar 2022 13:05:12 -0700
Subject: [PATCH 162/490] Release 1.9.3 (#423)

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e025fbfd54..79505eb868 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.1</version>
+  <version>1.9.3</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index dbada93957..e4843549ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.3-SNAPSHOT</version>
+  <version>1.9.3</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 9d1b3659a97810fe840bc41a4e87f13096167c08 Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Wed, 23 Mar 2022 17:12:42 -0700
Subject: [PATCH 163/490] Bump version to 1.9.4-SNAPSHOT (#424)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e4843549ad..1813fe61f4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.3</version>
+  <version>1.9.4-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From 05f4b1df23380d6f95d463b21ffd8daed5142181 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 30 Mar 2022 13:53:48 -0700
Subject: [PATCH 164/490] Fixes a bug that prevented the incremental reader
 from recovering from an oversized value that occurred mid-stream.

---
 .../ion/impl/IonReaderLookaheadBuffer.java    |   1 +
 .../impl/IonReaderBinaryIncrementalTest.java  | 124 ++++++++++++++++++
 2 files changed, 125 insertions(+)

diff --git a/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java b/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
index 174045c30e..7012cdfab3 100644
--- a/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
+++ b/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
@@ -516,6 +516,7 @@ private void shiftIndicesLeft(int afterIndex, int shiftAmount) {
         peekIndex = Math.max(peekIndex - shiftAmount, 0);
         valuePreHeaderIndex -= shiftAmount;
         valuePostHeaderIndex -= shiftAmount;
+        valueStartWriteIndex -= shiftAmount;
         for (Marker symbolTableMarker : symbolTableMarkers) {
             if (symbolTableMarker.startIndex > afterIndex) {
                 symbolTableMarker.startIndex -= shiftAmount;
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
index a00c3c2c6d..a99654fc09 100644
--- a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
+++ b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
@@ -2671,6 +2671,130 @@ public void onData(int numberOfBytes) {
         assertEquals(out.size(), byteCounter.get());
     }
 
+    /**
+     * Calls next() on the given reader and returns the result.
+     * @param reader an Ion reader.
+     * @param pipe the stream from which the reader pulls data. If null, all data is available up front.
+     * @param source the source of data to be fed into the pipe. Only used if pipe is not null.
+     * @return the result of the first non-null call to reader.next(), or null if the source data is exhausted before
+     *  reader.next() returns non-null.
+     */
+    private static IonType ionReaderNext(IonReader reader, ResizingPipedInputStream pipe, ByteArrayInputStream source) {
+        if (pipe == null) {
+            return reader.next();
+        }
+        while (source.available() > 0) {
+            pipe.receive(source.read());
+            if (reader.next() != null) {
+                return reader.getType();
+            }
+        }
+        return null;
+    }
+
+    /**
+     * Verifies that oversized value handling works properly when the second value is oversized.
+     * @param withSymbolTable true if the first value should be preceded by a symbol table.
+     * @param withThirdValue true if the second (oversized) value should be followed by a third value that fits.
+     * @param byteByByte true if bytes should be fed to the reader one at a time.
+     * @throws Exception if thrown unexpectedly.
+     */
+    private static void oversizedSecondValue(
+        boolean withSymbolTable,
+        boolean withThirdValue,
+        boolean byteByByte
+    ) throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
+        String firstValue = "12345678";
+        if (withSymbolTable) {
+            writer.writeSymbol(firstValue);
+        } else {
+            writer.writeString(firstValue);
+        }
+        writer.writeString("abcdefghijklmnopqrstuvwxyz");
+        String thirdValue = "abc";
+        if (withThirdValue) {
+            writer.writeString(thirdValue);
+        }
+        writer.close();
+
+        final AtomicInteger oversizedCounter = new AtomicInteger();
+        final AtomicInteger byteCounter = new AtomicInteger();
+        UnifiedTestHandler handler = new UnifiedTestHandler() {
+            @Override
+            public void onOversizedSymbolTable() {
+                throw new IllegalStateException("not expected");
+            }
+
+            @Override
+            public void onOversizedValue() {
+                oversizedCounter.incrementAndGet();
+            }
+
+            @Override
+            public void onData(int numberOfBytes) {
+                byteCounter.addAndGet(numberOfBytes);
+            }
+        };
+        // Greater than the first value (and symbol table, if any), less than the second and third values.
+        int maximumBufferSize = 25;
+        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(maximumBufferSize)
+                .withMaximumBufferSize(maximumBufferSize)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+        ResizingPipedInputStream pipe = null;
+        ByteArrayInputStream source = new ByteArrayInputStream(out.toByteArray());
+        InputStream in;
+        if (byteByByte) {
+            pipe = new ResizingPipedInputStream(out.size());
+            in = pipe;
+        } else {
+            in = source;
+        }
+        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, in);
+        assertEquals(withSymbolTable ? IonType.SYMBOL : IonType.STRING, ionReaderNext(reader, pipe, source));
+        assertEquals(0, oversizedCounter.get());
+        assertEquals(firstValue, reader.stringValue());
+        if (withThirdValue) {
+            assertEquals(IonType.STRING, ionReaderNext(reader, pipe, source));
+            assertEquals(thirdValue, reader.stringValue());
+        }
+        assertNull(ionReaderNext(reader, pipe, source));
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+        assertEquals(out.size(), byteCounter.get());
+    }
+
+    @Test
+    public void oversizedSecondValueWithoutSymbolTable() throws Exception {
+        oversizedSecondValue(false, false, false);
+        oversizedSecondValue(false, true, false);
+    }
+
+    @Test
+    public void oversizedSecondValueWithoutSymbolTableIncremental() throws Exception {
+        oversizedSecondValue(false, false, true);
+        oversizedSecondValue(false, true, true);
+    }
+
+    @Test
+    public void oversizedSecondValueWithSymbolTable() throws Exception {
+        oversizedSecondValue(true, false, false);
+        oversizedSecondValue(true, true, false);
+    }
+
+    @Test
+    public void oversizedSecondValueWithSymbolTableIncremental() throws Exception {
+        oversizedSecondValue(true, false, true);
+        oversizedSecondValue(true, true, true);
+    }
+
     private void oversizeSymbolTableDetectedInHeader(int maximumBufferSize) throws Exception {
         // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
         // for symbol 10.

From fb9ddf792ac50f6494715c794d2a98ee29702e0f Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 1 Apr 2022 12:32:31 -0700
Subject: [PATCH 165/490] Adds missing validation for the length of symbol
 table child values.

---
 .../ion/impl/IonReaderBinaryIncremental.java   |  3 +++
 .../impl/IonReaderBinaryIncrementalTest.java   | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
index 9cf786a823..43e67d52e1 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
@@ -962,6 +962,9 @@ private void readSymbolTable(IonReaderLookaheadBuffer.Marker marker) {
             }
             peekIndex = currentValueEndPosition;
         }
+        if (peekIndex > marker.endIndex) {
+            throw new IonException("Malformed symbol table. Child values exceeded the length declared in the header.");
+        }
         if (!hasSeenImports) {
             resetSymbolTable();
             resetImports();
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
index a99654fc09..60e4d8fa64 100644
--- a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
+++ b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
@@ -3388,4 +3388,22 @@ public void annotationIteratorReuseEnabled() throws Exception {
     public void annotationIteratorReuseDisabled() throws Exception {
         annotationIteratorReuse(false);
     }
+
+    @Test
+    public void failsOnMalformedSymbolTable() {
+        byte[] data = bytes(
+            0xE0, 0x01, 0x00, 0xEA, // Binary IVM
+            0xE6, // 6-byte annotation wrapper
+            0x81, // 1 byte of annotation SIDs
+            0x83, // SID 3 ($ion_symbol_table)
+            0xD3, // 3-byte struct
+            0x84, // Field name SID 4 (name)
+            0xE7, // 7-byte annotation wrapper (error: there should only be two bytes remaining).
+            0x81, // Junk byte to fill the 6 bytes of the annotation wrapper and 3 bytes of the struct.
+            0x20  // Next top-level value (int 0).
+        );
+        IonReader reader = newBoundedIncrementalReader(data, 1024);
+        thrown.expect(IonException.class);
+        reader.next();
+    }
 }

From 90569aefb6fb4cf3f3830fa8bcd255fd48635044 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 5 Apr 2022 15:49:00 -0700
Subject: [PATCH 166/490] Fixes an incorrect comment in
 IonReaderBinaryIncrementalTest.

---
 test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
index 60e4d8fa64..534cffdbdb 100644
--- a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
+++ b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
@@ -2737,7 +2737,7 @@ public void onData(int numberOfBytes) {
                 byteCounter.addAndGet(numberOfBytes);
             }
         };
-        // Greater than the first value (and symbol table, if any), less than the second and third values.
+        // Greater than the first value (and symbol table, if any) and third value, less than the second value.
         int maximumBufferSize = 25;
         IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
             IonBufferConfiguration.Builder.standard()

From 9f97a6d0e20a414d010087701d37f6506e22460f Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 5 Apr 2022 16:15:58 -0700
Subject: [PATCH 167/490] Prepares version 1.9.4 for release.

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 79505eb868..04add8c946 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.3</version>
+  <version>1.9.4</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 1813fe61f4..24253ca539 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.4-SNAPSHOT</version>
+  <version>1.9.4</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From ab41cd18e6727ad53ca354752cdefcaa374a503c Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Wed, 6 Apr 2022 10:52:19 -0700
Subject: [PATCH 168/490] Bumps version to 1.9.5-SNAPSHOT (#431)

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 24253ca539..4a3d696a2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.4</version>
+  <version>1.9.5-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From ee2a306d3ecb509973b708afcbf0ddab9dd31887 Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Wed, 11 May 2022 12:57:37 -0700
Subject: [PATCH 169/490] Jar info changes (#433)

* adds changes for JarInfo file

* adds build.properties
* modfies JarInfo build logic
* removes manifest file logic
* modifies unit test for JarInfo

* Use filtering to get properties interpolation

Also clean up pom.xml

* Look for the correct .properties file, add tests

Co-authored-by: Khushboo Desai <desaikd@amazon.com>
---
 pom.xml                                   |  74 ++++++++-------
 src/com/amazon/ion/util/JarInfo.java      | 108 +++++++++-------------
 src/main/resources/build.properties       |   4 +
 test/com/amazon/ion/util/JarInfoTest.java |  98 ++++----------------
 4 files changed, 102 insertions(+), 182 deletions(-)
 create mode 100644 src/main/resources/build.properties

diff --git a/pom.xml b/pom.xml
index 4a3d696a2c..781b0d20f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,17 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
     <build.year>${maven.build.timestamp}</build.year>
-    <jdkVersion>1.6</jdkVersion>
+    <!-- As of 2022 we still need to use a parallel property to actually get formatting
+      Don't be fooled if removing the .format line below looks to have no effect- try changing it.
+      See: https://issues.apache.org/jira/browse/MRESOURCES-99
+      -->
+    <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssXXX</maven.build.timestamp.format>
+    <build.time>${maven.build.timestamp}</build.time>
+    <!-- Can't target 6 from 8
+      https://stackoverflow.com/questions/48146930/is-it-possible-to-compile-project-on-java-8-for-target-java-6
+    -->
+    <jdk.source.version>6</jdk.source.version>
+    <jdk.target.version>6</jdk.target.version>
   </properties>
 
   <dependencies>
@@ -76,6 +86,13 @@
       <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
+    <!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest -->
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>pl.pragmatists</groupId>
       <artifactId>JUnitParams</artifactId>
@@ -85,43 +102,29 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <!-- src/main/resources is the default resources directory but it looks like we need to list it explicitly in
+             order to set filtering=true, which does the interpolation in properties files
+             -->
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
     <sourceDirectory>src</sourceDirectory>
     <testSourceDirectory>test</testSourceDirectory>
     <plugins>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
+        <version>3.8.1</version>
         <configuration>
-          <source>${jdkVersion}</source>
-          <target>${jdkVersion}</target>
+          <source>${jdk.source.version}</source>
+          <target>${jdk.target.version}</target>
         </configuration>
       </plugin>
-      <plugin>
-        <!--
-        Since the format of maven.build.timestamp cannot be changed
-        during the build, define the build.time property here.
-        -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
-        <executions>
-          <execution>
-            <phase>initialize</phase>
-            <goals>
-              <goal>run</goal>
-            </goals>
-            <configuration>
-              <exportAntProperties>true</exportAntProperties>
-              <target>
-                <tstamp>
-                  <format property="build.time" pattern="yyyy-MM-dd'T'HH:mm:ssXXX"/>
-                </tstamp>
-              </target>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
+
       <plugin>
         <!-- Run the unit tests. -->
         <groupId>org.apache.maven.plugins</groupId>
@@ -134,6 +137,7 @@
           <argLine>-ea -Xmx3000M ${argLine}</argLine>
         </configuration>
       </plugin>
+
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
@@ -148,13 +152,11 @@
             </Export-Package>
             <!-- This can be used to retrieve the compiled JarInfo. -->
             <Main-Class>com.amazon.ion.impl._Private_CommandLine</Main-Class>
-            <!-- Add these properties to the manifest so they may be retrieved at runtime. -->
-            <Ion-Java-Build-Time>${build.time}</Ion-Java-Build-Time>
-            <Ion-Java-Project-Version>${project.version}</Ion-Java-Project-Version>
             <Automatic-Module-Name>com.amazon.ion</Automatic-Module-Name>
           </instructions>
         </configuration>
       </plugin>
+
       <!-- Code Coverage -->
       <plugin>
         <groupId>org.jacoco</groupId>
@@ -271,11 +273,9 @@
   <profiles>
     <profile>
       <id>release</id>
-      <properties>
-        <jdkVersion>1.5</jdkVersion>
-      </properties>
       <build>
         <plugins>
+
           <plugin>
             <!-- Package the source jar. -->
             <groupId>org.apache.maven.plugins</groupId>
@@ -290,6 +290,7 @@
               </execution>
             </executions>
           </plugin>
+
           <plugin>
             <!-- Package the javadoc jar. -->
             <groupId>org.apache.maven.plugins</groupId>
@@ -318,6 +319,7 @@
               </execution>
             </executions>
           </plugin>
+
           <plugin>
             <!-- GPG signing. -->
             <groupId>org.apache.maven.plugins</groupId>
@@ -333,6 +335,7 @@
               </execution>
             </executions>
           </plugin>
+
           <plugin>
             <!-- Publish the artifacts. -->
             <groupId>org.sonatype.plugins</groupId>
@@ -345,6 +348,7 @@
               <autoReleaseAfterClose>true</autoReleaseAfterClose>
             </configuration>
           </plugin>
+
         </plugins>
       </build>
     </profile>
diff --git a/src/com/amazon/ion/util/JarInfo.java b/src/com/amazon/ion/util/JarInfo.java
index 1f0ba4807f..061ee2340c 100644
--- a/src/com/amazon/ion/util/JarInfo.java
+++ b/src/com/amazon/ion/util/JarInfo.java
@@ -16,10 +16,12 @@
 package com.amazon.ion.util;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Properties;
 import java.util.jar.Attributes;
 import java.util.jar.Manifest;
 import com.amazon.ion.IonException;
@@ -31,11 +33,6 @@
  */
 public final class JarInfo
 {
-
-    private static final String MANIFEST_FILE = "META-INF/MANIFEST.MF";
-    private static final String BUILD_TIME_ATTRIBUTE = "Ion-Java-Build-Time";
-    private static final String PROJECT_VERSION_ATTRIBUTE = "Ion-Java-Project-Version";
-
     private String ourProjectVersion;
 
     private Timestamp ourBuildTime;
@@ -49,34 +46,9 @@ public final class JarInfo
      */
     public JarInfo() throws IonException
     {
-        Enumeration<URL> manifestUrls;
-        try
-        {
-            manifestUrls = getClass().getClassLoader().getResources(MANIFEST_FILE);
-        }
-        catch (IOException e)
-        {
-            throw new IonException("Unable to load manifests.", e);
-        }
-        List<Manifest> manifests = new ArrayList<Manifest>();
-        while (manifestUrls.hasMoreElements())
-        {
-            try
-            {
-                manifests.add(new Manifest(manifestUrls.nextElement().openStream()));
-            }
-            catch (IOException e)
-            {
-                continue; // try the next manifest
-            }
-        }
-        loadBuildProperties(manifests);
+        loadBuildProperties();
     }
 
-    JarInfo(List<Manifest> manifests)
-    {
-        loadBuildProperties(manifests);
-    }
 
     /**
      * Gets the ion-java project version of this build.
@@ -101,50 +73,54 @@ public Timestamp getBuildTime()
     // TODO writeTo(IonWriter)
 
     // ========================================================================
-
-    private void loadBuildProperties(List<Manifest> manifests) throws IonException
+    /**
+     * @return null but not empty string
+     */
+    private static String nonEmptyProperty(Properties props, String name)
     {
-        boolean propertiesLoaded = false;
-        for(Manifest manifest : manifests)
-        {
-            boolean success = tryLoadBuildProperties(manifest);
-            if(success && propertiesLoaded)
-            {
-                // In the event of conflicting manifests, fail instead of risking returning incorrect version info.
-                throw new IonException("Found multiple manifests with ion-java version info on the classpath.");
-            }
-            propertiesLoaded |= success;
-        }
-        if (!propertiesLoaded)
-        {
-            throw new IonException("Unable to locate manifest with ion-java version info on the classpath.");
-        }
+        String value = props.getProperty(name, "");
+        if (value.length() == 0) value = null;
+        return value;
     }
 
-    /*
-     * Returns true if the properties were loaded, otherwise false.
-     */
-    private boolean tryLoadBuildProperties(Manifest manifest)
+    private void loadBuildProperties()
+            throws IonException
     {
-        Attributes mainAttributes = manifest.getMainAttributes();
-        String projectVersion = mainAttributes.getValue(PROJECT_VERSION_ATTRIBUTE);
-        String time = mainAttributes.getValue(BUILD_TIME_ATTRIBUTE);
-
-        if (projectVersion == null || time == null)
+        String file = "/build.properties";
+        try
         {
-            return false;
-        }
+            Properties props = new Properties();
 
-        ourProjectVersion = projectVersion;
+            InputStream in = getClass().getResourceAsStream(file);
+            if (in != null)
+            {
+                try
+                {
+                    props.load(in);
+                }
+                finally
+                {
+                    in.close();
+                }
+            }
 
-        try
-        {
-            ourBuildTime = Timestamp.valueOf(time);
+            ourProjectVersion = nonEmptyProperty(props, "build.version");
+
+            String time = nonEmptyProperty(props, "build.time");
+            if (time != null)
+            {
+                try {
+                    ourBuildTime = Timestamp.valueOf(time);
+                }
+                catch (IllegalArgumentException e)
+                {
+                    // Badly formatted timestamp. Ignore it.
+                }
+            }
         }
-        catch (IllegalArgumentException e)
+        catch (IOException e)
         {
-            // Badly formatted timestamp. Ignore it.
+            throw new IonException("Unable to load " + file, e);
         }
-        return true;
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/build.properties b/src/main/resources/build.properties
new file mode 100644
index 0000000000..3894cedaa4
--- /dev/null
+++ b/src/main/resources/build.properties
@@ -0,0 +1,4 @@
+# These values are defined in pom.xml
+build.version=${pom.version}
+build.time=${build.time}
+build.name=${pom.name}
diff --git a/test/com/amazon/ion/util/JarInfoTest.java b/test/com/amazon/ion/util/JarInfoTest.java
index 3994ed4e15..f51e17892d 100644
--- a/test/com/amazon/ion/util/JarInfoTest.java
+++ b/test/com/amazon/ion/util/JarInfoTest.java
@@ -15,95 +15,31 @@
 
 package com.amazon.ion.util;
 
-import com.amazon.ion.IonException;
 import com.amazon.ion.Timestamp;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.jar.Manifest;
-
-import static org.junit.Assert.*;
-
-public class JarInfoTest
-{
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    private static String getAttributes(String manifestVersion)
-    {
-        return "Manifest-Version: " + manifestVersion + "\n";
-    }
-
-    private static String getIonJavaAttributes(String buildTime, String version)
-    {
-        return getAttributes("1.0")
-                + "Ion-Java-Build-Time: " + buildTime + "\n"
-                + "Ion-Java-Project-Version: " + version + "\n";
-    }
-
-    private static Manifest getManifest(String attributes) throws IOException
-    {
-        return new Manifest(new ByteArrayInputStream(attributes.getBytes("UTF-8")));
-    }
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.matchesPattern;
 
+public class JarInfoTest {
     @Test
-    public void testSingleManifest() throws Exception
-    {
-        String expectedBuildTime = "1984T";
-        String expectedVersion = "42.0";
-
-        Manifest manifest = getManifest(getIonJavaAttributes(expectedBuildTime, expectedVersion));
-        JarInfo info = new JarInfo(Collections.singletonList(manifest));
-
-        assertEquals(expectedVersion, info.getProjectVersion());
-        assertEquals(Timestamp.valueOf(expectedBuildTime), info.getBuildTime());
+    public void getBuildTime() {
+        JarInfo info = new JarInfo();
+        Timestamp timestamp = info.getBuildTime();
+        // This test was written at the timestamp below, the loaded time should always be greater
+        Timestamp original = Timestamp.valueOf("2022-05-10T22:56:48Z");
+        assertThat(timestamp, greaterThan(original));
     }
 
     @Test
-    public void testMultipleManifests() throws Exception
-    {
-        String expectedBuildTime = "1984T";
-        String expectedVersion = "42.0";
-
-        List<Manifest> manifests = new ArrayList<Manifest>();
-        manifests.add(getManifest(getAttributes("1.0")));
-        manifests.add(getManifest(getIonJavaAttributes(expectedBuildTime, expectedVersion)));
-        manifests.add(getManifest(getAttributes("2.0")));
-
-        JarInfo info = new JarInfo(manifests);
-
-        assertEquals(expectedVersion, info.getProjectVersion());
-        assertEquals(Timestamp.valueOf(expectedBuildTime), info.getBuildTime());
-    }
-
-    @Test
-    public void testNoMatchingManifests() throws Exception
-    {
-        List<Manifest> manifests = new ArrayList<Manifest>();
-        manifests.add(getManifest(getAttributes("1.0")));
-        manifests.add(getManifest(getAttributes("2.0")));
-        manifests.add(getManifest(getAttributes("3.0")));
-
-        thrown.expect(IonException.class);
-        new JarInfo(manifests);
-    }
-
-    @Test
-    public void testConflictingManifests() throws Exception
-    {
-        List<Manifest> manifests = new ArrayList<Manifest>();
-        manifests.add(getManifest(getIonJavaAttributes("1984T", "42.0")));
-        manifests.add(getManifest(getAttributes("1.0")));
-        manifests.add(getManifest(getIonJavaAttributes("1985T", "43.0")));
-
-        thrown.expect(IonException.class);
-        new JarInfo(manifests);
+    public void getProjectVersion() {
+        JarInfo info = new JarInfo();
+        String projectVersion = info.getProjectVersion();
+        // Semantic version MAJOR.MINOR.PATCH with optional -SNAPSHOT suffix
+        // Should always match our project version
+        String projectVersionPattern = "\\d+\\.\\d+\\.\\d+(-SNAPSHOT)?";
+        assertThat(projectVersion, matchesPattern(projectVersionPattern));
     }
 
 }
\ No newline at end of file

From 53394b6c5ab92280f6f727d33acde93125087b8f Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Tue, 9 Aug 2022 15:14:55 -0700
Subject: [PATCH 170/490] Updates ion-java-performance-regression-detector
 workflow. (#435)

---
 .../ion-java-performance-regression-detector.yml   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index abf209448c..216331a1c5 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -43,9 +43,9 @@ jobs:
       - name: Generate test Ion Data
         run: |
           mkdir -p testData
-          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/benchmark/testStruct.isl testData/testStruct.10n
-          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/benchmark/testList.isl testData/testList.10n
-          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/benchmark/testNestedStruct.isl testData/testNestedStruct.10n
+          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/nestedStruct.isl testData/testStructs.10n
+          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/nestedList.isl testData/testLists.10n
+          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/sexp.isl testData/testSexps.10n
 
       - name: Upload test Ion Data to artifacts
         uses: actions/upload-artifact@v2
@@ -106,9 +106,9 @@ jobs:
         id: regression_result
         run: |
           result=true
-          cd benchmarkResults && for FILE in *; do message=$(java -jar /home/runner/work/ion-java/ion-java/ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar compare --benchmark-result-previous $FILE/previous.ion --benchmark-result-new $FILE/new.ion $FILE/report.ion | tee /dev/stderr) && if [ "$message" != "" ]; then result=false; fi; done
+          cd benchmarkResults && for FILE in *; do message=$(java -jar /home/runner/work/ion-java/ion-java/ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar compare --benchmark-result-previous $FILE/previous.ion --benchmark-result-new $FILE/new.ion $FILE/report.ion | tee /dev/stderr) && if [ "$message" != "no regression detected" ]; then result=false; fi; done
           echo "::set-output name=regression-result::$result"
-          echo $result
+          if [ "$result" = "true" ]; then echo "No regression detected!" >> $GITHUB_STEP_SUMMARY; fi
 
       - name: Upload comparison reports to the benchmark results directory
         uses: actions/upload-artifact@v2
@@ -120,4 +120,6 @@ jobs:
         env:
           regression_detect: ${{steps.regression_result.outputs.regression-result}}
         if: ${{ env.regression_detect == 'false' }}
-        run: exit 1
+        run: |
+          cd benchmarkResults && echo "| Benchmark command | GC Allocation Rate | Heap Usage | Speed |" >> $GITHUB_STEP_SUMMARY && echo "| ----------- | ----------- |----------- | ----------- |" >> $GITHUB_STEP_SUMMARY && for FILE in *; do regressionDetection=$(java -jar /home/runner/work/ion-java/ion-java/ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar compare --benchmark-result-previous $FILE/previous.ion --benchmark-result-new $FILE/new.ion $FILE/report.ion) && if [ "$regressionDetection" != "no regression detected" ]; then command=$(echo $FILE | sed "s/_/ /g") && read gc heapUsage speed <<< $( echo ${regressionDetection} | awk -F", " '{print $1" "$2" "$3}' ) && echo "|$command|$gc|$heapUsage|$speed|" >> $GITHUB_STEP_SUMMARY; fi; done
+          exit 1

From e90a6361dd7fdd28b569b3a16405e6708f19f1fd Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 16 Aug 2022 17:53:25 -0700
Subject: [PATCH 171/490] Fixes a bug in the incremental reader that caused
 certain Decimal, BigDecimal, and BigInteger values to be read incorrectly in
 multi-reader contexts.

---
 src/com/amazon/ion/impl/IonReaderBinaryIncremental.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
index 43e67d52e1..f5487b7dbc 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
@@ -1374,7 +1374,7 @@ private int readVarInt() {
     }
 
     // Scratch space for various byte sizes. Only for use while computing a single value.
-    private static final byte[][] SCRATCH_FOR_SIZE = new byte[][] {
+    private final byte[][] scratchForSize = new byte[][] {
         new byte[0],
         new byte[1],
         new byte[2],
@@ -1400,8 +1400,8 @@ private byte[] copyBytesToScratch(int startIndex, int length) {
         // Note: using reusable scratch buffers makes reading ints and decimals 1-5% faster and causes much less
         // GC churn.
         byte[] bytes = null;
-        if (length < SCRATCH_FOR_SIZE.length) {
-            bytes = SCRATCH_FOR_SIZE[length];
+        if (length < scratchForSize.length) {
+            bytes = scratchForSize[length];
         }
         if (bytes == null) {
             bytes = new byte[length];

From a90e7ca511e77ee23da63781587f0b44459f5164 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 16 Aug 2022 21:34:25 -0700
Subject: [PATCH 172/490] Prepares version 1.9.5 for release.

---
 README.md | 2 +-
 pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 04add8c946..a77b9d7215 100644
--- a/README.md
+++ b/README.md
@@ -60,7 +60,7 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.4</version>
+  <version>1.9.5</version>
 </dependency>
 ```
 
diff --git a/pom.xml b/pom.xml
index 781b0d20f2..e6822cef39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.5-SNAPSHOT</version>
+  <version>1.9.5</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From b885cbc6334c8ec85928f78dbfdad15ef1b42cb3 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Tue, 16 Aug 2022 23:21:20 -0700
Subject: [PATCH 173/490] Bumps version to 1.9.6-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e6822cef39..1d8e61fb7f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.5</version>
+  <version>1.9.6-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <name>${project.groupId}:${project.artifactId}</name>

From d8deff1c38b01616cf5ad27bf93b3f2ef8bc6241 Mon Sep 17 00:00:00 2001
From: Rob Marrowstone <99764876+rmarrowstone@users.noreply.github.com>
Date: Wed, 7 Sep 2022 16:27:38 -0700
Subject: [PATCH 174/490] Fix Annotated Dot in Sexp Parser Error (#440)

This fixes GH 434 by adding the proper transition to the state
machine.

There are two trivial code cleanups in related code. One drops
duplicate branch logic in the switch to the next state. The other
removes a boolean comparison by negating the variable instead.

I am adding a regression test to the ion-tests in a seperate PR.
---
 src/com/amazon/ion/impl/IonReaderTextRawTokensX.java |  5 +----
 src/com/amazon/ion/impl/IonReaderTextRawX.java       |  1 +
 src/com/amazon/ion/impl/IonReaderTextUserX.java      |  2 +-
 test/com/amazon/ion/SexpTest.java                    | 11 +++++++++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java b/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java
index bdf3462fb4..c74bb36406 100644
--- a/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java
@@ -616,9 +616,6 @@ public final int nextToken() throws IOException
         switch (c) {
         case -1:
             return next_token_finish(IonTokenConstsX.TOKEN_EOF, true);
-        case '/':
-            unread_char(c);
-            return next_token_finish(IonTokenConstsX.TOKEN_SYMBOL_OPERATOR, true);
         case ':':
             c2 = read_char();
             if (c2 != ':') {
@@ -670,7 +667,7 @@ public final int nextToken() throws IOException
             }
             unread_char(c);
             return next_token_finish(IonTokenConstsX.TOKEN_SYMBOL_OPERATOR, true);
-        case '#':
+        case '#': case '/':
         case '<': case '>': case '*': case '=': case '^': case '&': case '|':
         case '~': case ';': case '!': case '?': case '@': case '%': case '`':
             unread_char(c);
diff --git a/src/com/amazon/ion/impl/IonReaderTextRawX.java b/src/com/amazon/ion/impl/IonReaderTextRawX.java
index 437094c920..7729340369 100644
--- a/src/com/amazon/ion/impl/IonReaderTextRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextRawX.java
@@ -202,6 +202,7 @@ static final int[][] makeTransitionActionArray()
         actions[STATE_BEFORE_VALUE_CONTENT_SEXP][IonTokenConstsX.TOKEN_SYMBOL_IDENTIFIER]= ACTION_LOAD_SCALAR;
         actions[STATE_BEFORE_VALUE_CONTENT_SEXP][IonTokenConstsX.TOKEN_SYMBOL_QUOTED]    = ACTION_LOAD_SCALAR;
         actions[STATE_BEFORE_VALUE_CONTENT_SEXP][IonTokenConstsX.TOKEN_SYMBOL_OPERATOR]  = ACTION_LOAD_SCALAR;
+        actions[STATE_BEFORE_VALUE_CONTENT_SEXP][IonTokenConstsX.TOKEN_DOT]              = ACTION_LOAD_SCALAR;
 
         actions[STATE_BEFORE_FIELD_NAME][IonTokenConstsX.TOKEN_EOF]                      = 0;
         actions[STATE_BEFORE_FIELD_NAME][IonTokenConstsX.TOKEN_SYMBOL_IDENTIFIER]        = ACTION_LOAD_FIELD_NAME;
diff --git a/src/com/amazon/ion/impl/IonReaderTextUserX.java b/src/com/amazon/ion/impl/IonReaderTextUserX.java
index 1b0d0dcd7d..61e09041ef 100644
--- a/src/com/amazon/ion/impl/IonReaderTextUserX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextUserX.java
@@ -167,7 +167,7 @@ private final boolean has_next_user_value()
                 }
             }
         }
-        return (_eof != true);
+        return (!_eof);
     }
 
     private static boolean isIonVersionMarker(String text)
diff --git a/test/com/amazon/ion/SexpTest.java b/test/com/amazon/ion/SexpTest.java
index 18ceca29e6..aa5dc90994 100644
--- a/test/com/amazon/ion/SexpTest.java
+++ b/test/com/amazon/ion/SexpTest.java
@@ -149,6 +149,17 @@ public void testTrickyParsing()
         assertEquals(3, value.size());
     }
 
+    @Test
+    public void testAnnotatedDotInSexp()
+            throws Exception
+    {
+        IonSexp value = (IonSexp) oneValue("(a::.)");
+        assertEquals(1, value.size());
+        IonSymbol item = (IonSymbol) value.get(0);
+        checkSymbol(".", item);
+        checkAnnotation("a", item);
+    }
+
     @Test
     public void testNegativeNumbersInSexp()
         throws Exception

From c939aed27e4d3596ff48c3196a8766c5c77aa976 Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Mon, 12 Sep 2022 13:35:15 -0700
Subject: [PATCH 175/490] Adds real-world-data schema to generate more test
 data. (#446)

---
 .github/workflows/ion-java-performance-regression-detector.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 216331a1c5..e222ec9e0e 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -46,6 +46,9 @@ jobs:
           java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/nestedStruct.isl testData/testStructs.10n
           java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/nestedList.isl testData/testLists.10n
           java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/sexp.isl testData/testSexps.10n
+          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/realWorldDataSchema01.isl testData/realWorldData01.10n
+          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/realWorldDataSchema02.isl testData/realWorldData02.10n
+          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/realWorldDataSchema03.isl testData/realWorldData03.10n
 
       - name: Upload test Ion Data to artifacts
         uses: actions/upload-artifact@v2

From 3fa498079b28ec51b1def16478a6f43f4f47741f Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Wed, 14 Sep 2022 11:06:22 -0700
Subject: [PATCH 176/490] Update ion-java-regression-detection workflow. (#449)

---
 ...on-java-performance-regression-detector.yml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index e222ec9e0e..0473069243 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -20,12 +20,11 @@ jobs:
       - name: Checkout ion-java from the new commit.
         uses: actions/checkout@v2
         with:
-          fetch-depth: 2
-          submodules: recursive
-          path: ion-java
+          ref: ${{ github.event.pull_request.head.sha }}
+          path: ion-java-new
 
       - name: Build ion-java from the new commit
-        run: cd ion-java && mvn clean install
+        run: cd ion-java-new && git submodule init && git submodule update && mvn clean install
 
       - name: Checkout ion-java-benchmark-cli
         uses: actions/checkout@v2
@@ -70,8 +69,15 @@ jobs:
       - name: Clean maven dependencies repository
         run : rm -r /home/runner/.m2
 
+      - name: Checkout the current commit
+        uses: actions/checkout@v2
+        with:
+          repository: amzn/ion-java
+          ref: master
+          path: ion-java
+
       - name: Build ion-java from the previous commit
-        run: cd ion-java && git checkout HEAD^ && git submodule update --recursive && mvn clean install
+        run: cd ion-java && git submodule init && git submodule update && mvn clean install
 
       - name: Build ion-java-benchmark-cli
         run: cd ion-java-benchmark-cli && mvn clean install
@@ -125,4 +131,4 @@ jobs:
         if: ${{ env.regression_detect == 'false' }}
         run: |
           cd benchmarkResults && echo "| Benchmark command | GC Allocation Rate | Heap Usage | Speed |" >> $GITHUB_STEP_SUMMARY && echo "| ----------- | ----------- |----------- | ----------- |" >> $GITHUB_STEP_SUMMARY && for FILE in *; do regressionDetection=$(java -jar /home/runner/work/ion-java/ion-java/ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar compare --benchmark-result-previous $FILE/previous.ion --benchmark-result-new $FILE/new.ion $FILE/report.ion) && if [ "$regressionDetection" != "no regression detected" ]; then command=$(echo $FILE | sed "s/_/ /g") && read gc heapUsage speed <<< $( echo ${regressionDetection} | awk -F", " '{print $1" "$2" "$3}' ) && echo "|$command|$gc|$heapUsage|$speed|" >> $GITHUB_STEP_SUMMARY; fi; done
-          exit 1
+          exit 1
\ No newline at end of file

From 57bd49bca6ec6d8b1f66f5648f1846ed48f18a4d Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Tue, 18 Oct 2022 17:33:54 -0700
Subject: [PATCH 177/490] Adds workflows to create ion-java prerelease on
 GitHub. (#452)

---
 ...ub-prerelease-after-fast-forward-check.yml | 74 +++++++++++++++
 .../version-bump-and-fast-forward-check.yml   | 91 +++++++++++++++++++
 2 files changed, 165 insertions(+)
 create mode 100644 .github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
 create mode 100644 .github/workflows/version-bump-and-fast-forward-check.yml

diff --git a/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml b/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
new file mode 100644
index 0000000000..d28a958a74
--- /dev/null
+++ b/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
@@ -0,0 +1,74 @@
+name: Create GitHub prerelease after fast-forward check
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  check-version-change:
+    if: github.event.pull_request.merged == true
+    name: check-version-change
+    runs-on: ubuntu-latest
+    outputs:
+      output1: ${{ steps.check-version-change.outputs.result }}
+    steps:
+      - name: Checkout the current repository master branch
+        uses: actions/checkout@v3
+        with:
+          repository: amzn/ion-java
+          ref: master
+          fetch-depth: 2
+          path: ion-java-current
+
+      - name: Check whether the pull request contains version number bump
+        id: check-version-change
+        run: |
+          cd ion-java-current
+          versionNew=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          git reset --hard HEAD^
+          versionPrevious=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          if [[ $versionNew != $versionPrevious ]]; then echo "::set-output name=result::pass"; else echo "::set-output name=result::failed"; fi
+
+  prerelease:
+    name: prerelease
+    needs: check-version-change
+    if: ${{ needs.check-version-change.outputs.output1 == 'pass' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Access to the incoming release
+        uses: actions/checkout@v3
+        with:
+          repository: amzn/ion-java
+          path: current_release
+
+      - name: Build ion-java
+        run: |
+          cd current_release
+          mvn clean install -DskipTests
+
+      - name: Get the parameters of executable jar
+        run: |
+          cd current_release/target
+          echo "path=$(readlink -f $(ls *.jar))" >> $GITHUB_ENV
+          echo "file_name=$(ls *.jar)" >> $GITHUB_ENV
+          cd .. && echo "version_number=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+
+      - name: Create new release
+        id: create_new_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: v${{ env.version_number }}
+          release_name: v${{ env.version_number }}
+          prerelease: true
+
+      - name: Upload release asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_new_release.outputs.upload_url }}
+          asset_path: ${{ env.path }}
+          asset_name: ${{ env.file_name }}
+          asset_content_type: application/zip
\ No newline at end of file
diff --git a/.github/workflows/version-bump-and-fast-forward-check.yml b/.github/workflows/version-bump-and-fast-forward-check.yml
new file mode 100644
index 0000000000..d355144565
--- /dev/null
+++ b/.github/workflows/version-bump-and-fast-forward-check.yml
@@ -0,0 +1,91 @@
+name: Version-bump-and-fast-forward-check
+on: [pull_request]
+
+jobs:
+  check-version-bump:
+    name: check-version-bump
+    runs-on: ubuntu-latest
+    outputs:
+      output1: ${{ steps.check-version-change.outputs.result }}
+    steps:
+      - name: Switch to the branch of the pull request
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          path: ion-java-new
+
+      - name: Checkout the current repository master branch
+        uses: actions/checkout@v3
+        with:
+          repository: amzn/ion-java
+          ref: master
+          path: ion-java-current
+
+      - name: Check whether the pull request contains version number bump
+        id: check-version-change
+        run: |
+          cd /home/runner/work/ion-java/ion-java/ion-java-new
+          versionNew=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          commitID=$(git rev-parse HEAD)
+          cd /home/runner/work/ion-java/ion-java/ion-java-current
+          versionCurrent=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          if [[ $versionNew != $versionCurrent ]]; then echo "::set-output name=result::pass"; else echo "::set-output name=result::failed"; fi
+
+  fast-forward-check:
+    needs: check-version-bump
+    name: fast-forward-check
+    if: ${{ needs.check-version-bump.outputs.output1 == 'pass' }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Access to the last release
+        uses: oprypin/find-latest-tag@v1
+        id: check_last_release
+        with:
+          repository: amzn/ion-java
+          releases-only: true
+
+      - name: Checkout the last release
+        uses: actions/checkout@v3
+        with:
+          repository: amzn/ion-java
+          ref: ${{ steps.check_last_release.outputs.tag }}
+          path: last-release
+
+      - name: Get the commit id of the last release
+        run: |
+          cd last-release
+          echo "last_release_commit_id=$(git rev-parse HEAD)" >> $GITHUB_ENV
+
+      - name: Access to the incoming release
+        uses: actions/checkout@v3
+        with:
+          repository: amzn/ion-java
+          ref: ${{ github.event.pull_request.head.sha }}
+          path: ion-java-new
+
+      - name: Get the commit id of the incoming release
+        run: |
+          cd ion-java-new
+          echo "current_release_commit_id=$(git rev-parse HEAD)" >> $GITHUB_ENV
+          echo $(git rev-parse HEAD)
+
+      - name: Check whether the incoming release is fast-forward compared to the last release
+        run: |
+          cd ion-java-new 
+          if git merge-base --is-ancestor ${{env.last_release_commit_id}} ${{env.current_release_commit_id}}; then echo "Trigger github release"; else exit 1; fi
+
+      - name: comment
+        if: ${{ success() }}
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            This PR passes version bump check and fast-forward check, please double check the version number and merge this PR. After merging this PR, "Create gitHub prerelease after fast-forward check" workflow will be automatically triggered to create prerelease.
+
+      - name: comment
+        if: ${{ failure() }}
+        uses: peter-evans/create-or-update-comment@v2
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            This PR is not fast-forward compared to the last release, please check.

From 2e673e31bc470d7b5fd14a3554c196e83c29fe32 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Thu, 10 Nov 2022 10:12:43 -0800
Subject: [PATCH 178/490] Use Gradle build system

---
 ...ub-prerelease-after-fast-forward-check.yml |   8 +-
 ...n-java-performance-regression-detector.yml |   4 +-
 .github/workflows/main.yml                    |  20 +-
 .../version-bump-and-fast-forward-check.yml   |   4 +-
 README.md                                     |  11 +-
 build.gradle.kts                              | 160 ++++++++
 gradle.properties                             |   6 +
 gradle/wrapper/gradle-wrapper.jar             | Bin 0 -> 60756 bytes
 gradle/wrapper/gradle-wrapper.properties      |   5 +
 gradlew                                       | 240 ++++++++++++
 gradlew.bat                                   |  91 +++++
 ion-java-cli/README.md                        |   9 +-
 ion-java-cli/build.gradle.kts                 |  28 ++
 ion-java-cli/pom.xml                          | 121 ------
 ion-test-driver-run                           |   2 +
 ion-test-driver-setup                         |   2 +
 pom.xml                                       | 357 ------------------
 project.version                               |   1 +
 settings.gradle.kts                           |   2 +
 src/com/amazon/ion/util/JarInfo.java          |   2 +-
 src/main/resources/build.properties           |   4 -
 21 files changed, 567 insertions(+), 510 deletions(-)
 create mode 100644 build.gradle.kts
 create mode 100644 gradle.properties
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 gradle/wrapper/gradle-wrapper.properties
 create mode 100755 gradlew
 create mode 100644 gradlew.bat
 create mode 100644 ion-java-cli/build.gradle.kts
 delete mode 100644 ion-java-cli/pom.xml
 create mode 100755 ion-test-driver-run
 create mode 100755 ion-test-driver-setup
 delete mode 100644 pom.xml
 create mode 100644 project.version
 create mode 100644 settings.gradle.kts
 delete mode 100644 src/main/resources/build.properties

diff --git a/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml b/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
index d28a958a74..aa54308bd3 100644
--- a/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
+++ b/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
@@ -24,9 +24,9 @@ jobs:
         id: check-version-change
         run: |
           cd ion-java-current
-          versionNew=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          versionNew="$(<project.version)"
           git reset --hard HEAD^
-          versionPrevious=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          versionPrevious="$(<project.version)"
           if [[ $versionNew != $versionPrevious ]]; then echo "::set-output name=result::pass"; else echo "::set-output name=result::failed"; fi
 
   prerelease:
@@ -44,14 +44,14 @@ jobs:
       - name: Build ion-java
         run: |
           cd current_release
-          mvn clean install -DskipTests
+          ./gradlew build
 
       - name: Get the parameters of executable jar
         run: |
           cd current_release/target
           echo "path=$(readlink -f $(ls *.jar))" >> $GITHUB_ENV
           echo "file_name=$(ls *.jar)" >> $GITHUB_ENV
-          cd .. && echo "version_number=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
+          cd .. && echo "version_number=$(<project.version)" >> $GITHUB_ENV
 
       - name: Create new release
         id: create_new_release
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 0473069243..277ccff505 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -24,7 +24,7 @@ jobs:
           path: ion-java-new
 
       - name: Build ion-java from the new commit
-        run: cd ion-java-new && git submodule init && git submodule update && mvn clean install
+        run: cd ion-java-new && git submodule init && git submodule update && ./gradlew clean publishToMavenLocal
 
       - name: Checkout ion-java-benchmark-cli
         uses: actions/checkout@v2
@@ -77,7 +77,7 @@ jobs:
           path: ion-java
 
       - name: Build ion-java from the previous commit
-        run: cd ion-java && git submodule init && git submodule update && mvn clean install
+        run: cd ion-java && git submodule init && git submodule update && ./gradlew clean publishToMavenLocal
 
       - name: Build ion-java-benchmark-cli
         run: cd ion-java-benchmark-cli && mvn clean install
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9d242e2d16..d5ed52e144 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,9 +22,10 @@ jobs:
         with:
           distribution: 'zulu'
           java-version: ${{ matrix.java }}
-      - run: mvn test
-      - run: mvn package -f ion-java-cli/pom.xml
-      - run: java -jar ion-java-cli/target/ion-java-cli-1.0.jar version
+      - uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build
+      - run: ./ion-test-driver-run version
 
   report-generation:
     runs-on: ubuntu-latest
@@ -36,17 +37,12 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: 11
-      - run: mvn test site
-      - uses: codecov/codecov-action@v1
+      - uses: gradle/gradle-build-action@v2
         with:
-          file: target/site/jacoco/jacoco.xml
-      - name: deploy gh-pages
-        if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' }}
-        uses: JamesIves/github-pages-deploy-action@3.7.1
+          arguments: test
+      - uses: codecov/codecov-action@v1
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: "./target/site"
+          file: build/reports/jacoco/test/jacocoTestReport.xml
 
 
 
diff --git a/.github/workflows/version-bump-and-fast-forward-check.yml b/.github/workflows/version-bump-and-fast-forward-check.yml
index d355144565..1d27f5acd5 100644
--- a/.github/workflows/version-bump-and-fast-forward-check.yml
+++ b/.github/workflows/version-bump-and-fast-forward-check.yml
@@ -25,10 +25,10 @@ jobs:
         id: check-version-change
         run: |
           cd /home/runner/work/ion-java/ion-java/ion-java-new
-          versionNew=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          versionNew="$(<project.version)"
           commitID=$(git rev-parse HEAD)
           cd /home/runner/work/ion-java/ion-java/ion-java-current
-          versionCurrent=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+          versionCurrent="$(<project.version)"
           if [[ $versionNew != $versionCurrent ]]; then echo "::set-output name=result::pass"; else echo "::set-output name=result::failed"; fi
 
   fast-forward-check:
diff --git a/README.md b/README.md
index a77b9d7215..c715520b82 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ specified in `ion-java`'s `.gitmodules` file.
 the following command.
 
 ```
-$ mvn install
+$ ./gradlew publishToMavenLocal
 ```
 
 ### Pulling in Upstream Changes
@@ -56,7 +56,7 @@ For detailed walkthroughs of git submodule usage, see the
 To start using `ion-java` in your code with Maven, insert the following
 dependency into your project's `pom.xml`:
 
-```
+```xml
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
@@ -64,6 +64,13 @@ dependency into your project's `pom.xml`:
 </dependency>
 ```
 
+For Gradle (Kotlin DSL), use:
+```kotlin
+dependencies {
+    implementation("com.amazon.ion:ion-java:1.9.5")
+}
+```
+
 #### Legacy group id
 
 Originally ion-java was published using the group id `software.amazon.ion`. Since 1.4.0 the
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000000..d877473aed
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,160 @@
+import java.net.URI
+import java.time.Instant
+import java.util.Properties
+
+plugins {
+    java
+    `maven-publish`
+    jacoco
+    signing
+    // TODO: static analysis. E.g.:
+    // id("com.diffplug.spotless") version "6.11.0"
+    // id("com.github.spotbugs") version "4.8.0"
+}
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    testImplementation("junit:junit:4.13.1")
+    testImplementation("org.hamcrest:hamcrest:2.2")
+    testImplementation("pl.pragmatists:JUnitParams:1.1.1")
+}
+
+group = "com.amazon.ion"
+// The version is stored in a separate file so that we can easily create CI workflows that run when the version changes
+// and so that any tool can access the version without having to do any special parsing.
+version = File(project.rootDir.path + "/project.version").readLines().single()
+description = "A Java implementation of the Amazon Ion data notation."
+// Can't target 6 from 8
+// https://stackoverflow.com/questions/48146930/is-it-possible-to-compile-project-on-java-8-for-target-java-6
+java.sourceCompatibility = JavaVersion.VERSION_1_6
+
+val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
+val generatedJarInfoDir = "${buildDir}/generated/jar-info"
+lateinit var sourcesArtifact: PublishArtifact
+lateinit var javadocArtifact: PublishArtifact
+
+sourceSets {
+    main {
+        java.srcDir("src")
+        resources.srcDir(generatedJarInfoDir)
+    }
+    test {
+        java.srcDir("test")
+    }
+}
+
+tasks {
+    withType<JavaCompile> { options.encoding = "UTF-8" }
+
+    javadoc {
+        // Suppressing Javadoc warnings is clunky, but there doesn't seem to be any nicer way to do it.
+        // https://stackoverflow.com/questions/52205209/configure-gradle-build-to-suppress-javadoc-console-warnings
+        options {
+            (this as CoreJavadocOptions).addStringOption("Xdoclint:none", "-quiet")
+        }
+    }
+
+    create<Jar>("sourcesJar") sourcesJar@ {
+        archiveClassifier.set("sources")
+        from(sourceSets["main"].java.srcDirs)
+        artifacts { sourcesArtifact = archives(this@sourcesJar) }
+    }
+
+    create<Jar>("javadocJar") javadocJar@ {
+        archiveClassifier.set("javadoc")
+        from(javadoc)
+        artifacts { javadocArtifact = archives(this@javadocJar) }
+    }
+
+    /**
+     * This task creates a properties file that will be included in the compiled jar. It contains information about
+     * the build/version of the library used in [com.amazon.ion.util.JarInfo]. See https://github.com/amzn/ion-java/pull/433
+     * for why this is done with a properties file rather than the Jar manifest.
+     */
+    val generateJarInfo by creating<Task> {
+        doLast {
+        val propertiesFile = File("$generatedJarInfoDir/${project.name}.properties")
+            propertiesFile.parentFile.mkdirs()
+            val properties = Properties()
+            properties.setProperty("build.version", version.toString())
+            properties.setProperty("build.time", Instant.now().toString())
+            properties.store(propertiesFile.writer(), null)
+        }
+        outputs.dir(generatedJarInfoDir)
+    }
+
+    processResources { dependsOn(generateJarInfo) }
+
+    jacocoTestReport {
+        dependsOn(test)
+        reports {
+            xml.isEnabled = true
+            html.isEnabled = true
+        }
+        doLast {
+            logger.quiet("Coverage report written to file://${reports.html.destination}/index.html")
+        }
+    }
+
+    test {
+        // report is always generated after tests run
+        finalizedBy(jacocoTestReport)
+    }
+
+    withType<Sign> {
+        setOnlyIf { isReleaseVersion && gradle.taskGraph.hasTask("publish") }
+    }
+}
+
+publishing {
+    publications.create<MavenPublication>("IonJava") {
+        from(components["java"])
+        artifact(sourcesArtifact)
+        artifact(javadocArtifact)
+
+        pom {
+            name.set("Ion Java")
+            description.set(project.description)
+            url.set("https://github.com/amzn/ion-java/")
+
+            licenses {
+                license {
+                    name.set("The Apache License, Version 2.0")
+                    url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                }
+            }
+            developers {
+                developer {
+                    name.set("Amazon Ion Team")
+                    email.set("ion-team@amazon.com")
+                    organization.set("Amazon Ion")
+                    organizationUrl.set("https://github.com/amazon-ion")
+                }
+            }
+            scm {
+                connection.set("scm:git:git@github.com:amzn/ion-java.git")
+                developerConnection.set("scm:git:git@github.com:amzn/ion-java.git")
+                url.set("git@github.com:amzn/ion-java.git")
+            }
+        }
+    }
+    repositories.mavenCentral {
+        credentials {
+            username = properties["ossrhUsername"].toString()
+            password = properties["ossrhPassword"].toString()
+        }
+        url = URI.create("https://aws.oss.sonatype.org/service/local/staging/deploy/maven2")
+    }
+}
+
+signing {
+    // Allow publishing to maven local even if we don't have the signing keys
+    // This works because when not required, the signing task will be skipped
+    // if signing.keyId, signing.password, signing.secretKeyRingFile, etc are
+    // not present in gradle.properties.
+    isRequired = isReleaseVersion
+    sign(publishing.publications["IonJava"])
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000000..1808671847
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,6 @@
+signing.keyId=EMPTY
+signing.password=EMPTY
+signing.secretKeyRingFile=EMPTY
+
+ossrhUsername=EMPTY
+ossrhPassword=EMPTY
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196
GIT binary patch
literal 60756
zcmb5WV{~QRw(p$^Dz<H#6;^E9wry+0wkoz!v2EKnEB2dnp51QS&)(;ryWbCEt<_q_
z%vf{Ij$i-xF_)Yq2q+W~5CjAe5D@>@00IL3?^hro$gg*4VI_WAaTyVM5Foj~O|-84
z$;0<Gf%j{m{PRR<ei?BQVMQf6X^~s$@i8e$TDlonNm{DO@u_+RhI!`ggFoZ6!{QUt
z6V&1~-=IzbM#=jH8kEiGq(%D$R6*#ZXeb3}Hx4%r-~MIAuSNdPR|Ea}Z0lh9Z{O;l
z=Rp5sj;Vvbk(KfPIu-fvQ(YbO?d*&l{_PMsht{<6ud70f1_VU)KOZ9c-;1gK^$(==
z&28umt@Irov(&)dP=-)Hz_S{P7xEnP!ichkxx$E~7}a_a2q8(l2>6hMwt*rV;^8iB
z1~&0XWp<s4<3+-8i_yvLp=2@>YJmG?Ts^K9PC62H*`G}xom%S%yq|xvG~FIfP=9*f
zZo<U;yqPuzvK$}+n^LL;n^MT#U2$-W#`#sg?M@{@(gHfAYL^m#{&XY2t3v`wuX2Ob
zJ|E-g(=OFBrmQ4BNYySt*Qqd2Zl}{zt~_o(QZ0X@(Jm9-p$YdmymL==Ie?AQJ`?lf
z`Njkl*jD~p1=ZOtBV40hyN64OCJFd*fD3i~XsAso=-LMLs^|UBS%-sLHqPeN5cpej
zP96&U@H4ow7X*CS6N3Vk2xHMM5uO4=)iyB|+fIBqm)%MXwL_oiyPH}M@t<2mhnqdB
zpZ>DRJBm*Y0aId=qJ?7dyb)6)JGWGwe)MHeNSzhi)Ko6J<-m@v=a%NsP537lHe0R*
z`If4$aaBA#S=w!2z&m>{lpTy^Lm^mg*3?M&7HFv}7K6x*cukLIGX;bQG|QWdn{%_6
zHnwBKr84#B7Z+AnBXa16a?or^R?+>$4`}{*a_>IhbjvyTtWkHw)|ay)ahWUd-qq$~
zMbh6roVsj;_qnC-R{G+Cy6bApVOinSU-;(DxUEl!i2)1EeQ9`hrfqj(nKI7?Z>Xur
zoJz-a`PxkYit1HEbv|jy%~DO^13J-ut986EEG=66S}D3!L}Efp;Bez~7tNq{QsUMm
zh9~(HYg1pA*=37C0}n4g&bFbQ+?-h-W}onYeE{q;cIy<G6>%eZK9wZjSwGvT+&Cgv
z?~{9p(;bY_1+k|wkt_|N!@J~aoY@|U_RGoWX<;p{Nu*D*&_phw`8jYkMNpRTWx1H*
z>J-Mi_!`M468#5Aix$$u1M@rJEIOc?k^QBc?<b59)xNczO{#+_)9&wFZVex;^4Vl#
z>T(#=n&*5eS#u*Y)?L8Ha$9wRWdH^3D4|Ps)Y?m0q~SiKiSfEkJ!=^`lJ(%W3o|CZ
zSrZL-Xxc{OrmsQD&s~zPfNJOpSZUl%V8tdG%ei}lQkM+z@-4etFPR>GO<GhYd~TtJ
zwBkK^Mf~X+_zkRIz?y=<$$)%45zt~zJgiQCTcppoxe=pu88AJHVU3fzN(qJSGX29E
zfbGs2RA>H9+Y_F<3=~SXln9Kb-o~f>2a6Xz@AS3cn^;c_>l<hcV+2`3y`U@%b10Ti
zcsAuz3qW@}1&hcn9e|iQZ-*nRdQA=6HE0WZ=-IqLdFH?}s(4A4Su|ovlG8OIY!~1g
zV*}qrf+P~DZYbWlHL~*vJjRpSRBJ|RB}1Yk#lDowyB!0p;et0q>UwlK(n>z?A>NbC
z`Ud8^aQy>wy=$)w;JZzA)_*Y$Z5hU=KAG&htLw1Uh00yE!|Nu{<IBoPg2E_>EZkch
zY9O6x7Y??>!7pUNME*d!=R#s)ghr|R#41l!c?~=3CS8&zr6*aA7n9*)*PWBV2w+&I
zpW1-9fr3j{VTcls1><EmORLr6^_*km(FaYTm!{FpN(j*&ipG9#Bx7MzETdKx3MQix
zP9g$MFZr%m`tSm-g<Nl^j9AagC^~K|67C*eGSlxRu0?PgNMupvPEj}+ToIMPS(h_Y
z=br$^g2gKPI4Ilij?qSjH4rcN?$oLnmWI|kQy-!uDx_L8FFnwQg1LxHyC}zG(tlAZ
zH8z|S<;cL4*pQkj32mX3%Ut({&Q<B&y6N^XSz#?>ua}F*bbju_Xq%^v;-W~paSqlf
zolj*dt`BBjHI)H9{zrkBo<O`!SS6B=LKl>=B%>8}4jeBO<T-1a7W52S<GA6)qpHuH
zr-%V#6TJ~zK#}#SZ%KJiS%=&s@yJ4k(HVsTu!ro=zMmxYi)tO}vgJ_O50@u`M|%Ri
zphwWiXYN$*r|>~kWqO!~Thi!I1H(in=n^fS%nuL=X2+s!p}HfTU#NBGiwEBF^^tKU
zbhhv+0dE-sbK$>J#t-J!B$TMgN@Wh5wTtK2BG}4BGfsZOoRUS#G8Cxv|6EI*n&Xxq
zt{&OxCC+BNqz$9b0WM7_PyBJEVObHFh%%`~!@MNZlo*oXDCwDcFwT~Rls!aApL<)^
zbBftGKKBRhB!{?fX@l2_y~%ygNFfF(XJzHh#?`WlSL{1lK<Z@o#;*SdVGNH>T*gJM
zs>bd^H9NCxqxn(IOky5k-wALFowQr(gw%|`0991u#9jXQh?4l|l>pd6a&rx|v=fPJ
z1mutj{YzpJ_gsClbWFk(G}bSlFi-6@mwoQh-XeD*j@~huW4(8ub%^I|azA)h2t#yG
z7e_V_<4jlM3D(I+qX}yEtqj)cpzN*oCdYHa!nm%0t^wHm)EmFP*|FMw!tb@&`G-u~
zK)=Sf6z+BiTAI}}i{*_Ac$ffr*Wrv$F7_0gJkjx;@)XjYSh`RjAgrCck`x!zP>Ifu
z&%he4P|S)H*(9oB4uvH67^0}I-_ye_!w)u3v2+EY>eD3#8QR24<;7?*hj8k~rS)~7
zSXs5ww)T(0eHSp$hEIBnW|Iun<_i`}VE0Nc$|-R}wlSIs5pV{g_Dar(Zz<4X3`W?K
z6&CAIl4U(Qk-tTcK{|zYF6QG<GoVw~LX_9wmCyLIg5HrC)J9)r!7|t}PwF9G3L#(i
znq(TLP8w3<iIfL!hDIR3?YNM8r9A6!N(o8YBZ@w;24dkA6!cN#{d&#a!)STfC3#`w
zn~!m@(Thc7Y<7g`lPf7tavkY|IpA1z!Xc-);I@t+8Vv2n<pCz^dd3h3=M+#Ee$$px
z67Z%5xz9Jl=z|J4Mo=+AB<rDYZ9L~g-KY{Q-jka~-Ae^NqTXdE>5ArrEB!;5s?tW7
zrE3hcFY&k)+)e{+YOJ0X2uDE_hd2{|m_dC}kgEKqiE9Q^A-+>2UonB+L@v3$9?AYw
zVQv?X*pK;X4Ovc6Ev5Gbg{{Eu*7{N3#0@9oMI~}KnObQE#Y{&3mM4`w%wN+xrKYgD
zB-ay0Q}m{QI;iY`s1Z^NqIkjrTlf`B)B#M<jM!$tg=k5lp}=|!gJ`-A3NITdMu8RC
zj1XQSG|ZmbdcDW!n80TC;X9x@;5D9oK%Ld~mq|EemE{}fSaq-zyX$@FTX}$Oc0g22
zzETfvk4&(H@-vz=*ZPqWh};?ig{1!LM(TkY4LO&>ajZ#9u41oRBC1oM1vq0i|F59>
z#StM@bHt|#`2)cpl_rWB($DNJ3Lap}QM-+A$3pe}NyP(@+<iN(x4wVJ+_gbEd-^Zb
zWBwY%U*j*Br2PjW(*8Hx+37o((b+lJej%fixv?WP#pslTG#zE5G`)n>i1>o^<jA}~
z(^v!&G?YSwQv@?ogo0voxWugllcS<_%l`tol>fe-oxX#<wXu`21Fg;1yW>Bt`mcQc
zb?pD4W%#ep|3%CHAYnr*^M6Czg>~L4?l16H1OozM{P*en298b+`i4$|w$|4AHbzqB
zHpYUsHZET$Z0ztC;U+0*+amF!@PI%^oUIZy{`L{%O^i{Xk}X0&nl)n~tVEpcAJSJ}
zverw15zP1P-O8h9nd!&hj$zuwjg?DoxYIw{<nX*|aXj4I;Pv(W_%0{1!UxR7=>jWM
zW5_pj+wF<yrjE;j>y8Tsa9g<7Qa21WaV&;ejoYflRKcz?#fSH_)@*QVlN2l4(QNk|
z4aPnv&mrS&0|6NHq05XQw$J^RR9T{3SOcMKCXIR1iSf+xJ0E_Wv?jEc*I#ZPzyJN2
zUG0UOXHl+PikM*&g$U@g+KbG-RY>uaIl&DEtw_Q=FYq?etc!;hEC_}UX{eyh%dw2V
zTTSlap&5>PY{6I#(6`j-9`D&I#|YPP8a;(sOzgeKDWsLa!i-$frD>zr-oid!Hf&yS
z!i^cr&7tN}OOGmX2)`8k?Tn!!4=tz~3hCTq_9CdiV!NIblUDxHh(FJ$zs)B2(t5@u
z-`^RA1ShrLCkg0<B?}_ts1DQjgp}W5VwQK_f$?l4FP6>)OhfoM;4Z{&oZmAec$qV@
zGQ(7(!CBk<5;Ar%DLJ0p0!ResC#U<+3i<|vib1?{5gC<oG^96_Cm0(UK10{w?+e+7
zEH(oxs^u==fa{@(*SXRYQr1OsHi@`@+xSt3wKAa_>ebG7$F7URKZXuX-2WgF>YJ^i
zMhHDBsh9PDU8dlZ$yJKtc6JA#y!y$57%sE>4Nt+wF1lfNIWyA`=hF=9Gj%sRwi@vd
z%2eVV3y&dvAgyuJ=eNJR+*080dbO_t@BFJO<@&#yqTK&+xc|FRR;p;KVk@J3$S{p`
zGaMj6isho#%m)?pOG^G0mzOAw0z?!AEMsv=0T>WWcE>??WS=fII$t$(^PDPMU(P>o
z_*0s^W#|x)%tx8jIgZY~A2yG;US0m2ZOQt6yJqW@XNY_>_R7(Nxb<qz*Zby*O0$bc
z&bwd!3N`yA)-yDGrw923g#%FdDs9(c!1zBe1RB8u-MYi3o@&Spv(9|!3<U?#VR{nH
z(>8Ged6BdYW6{prd!|zuX$@Q2o6Ona8zzYC1u!+2!Y$Jc9a;wy+pXt}o6~Bu1oF1c
zp7Y|SBTNi@=I(K%A60PMjM#sfH$y*c{xUgeSpi#HB`?|`!Tb&-qJ3;vxS!TIz<?2E
z;?m$vD?eW$Ky=1Yq)adqhc?p&C{7b5o?=)unOeZDH>uTZs-&%#bAkAyw9m4PJgvey
zM5?up*b}eDEY+#@tKec)-c(#QF0P?MRlD1+7%Yk*jW;)`f;0a-ZJ<A1MM6Y&2Bjrl
znqSWxYPQP0xd?S^aF>6CQA?E%>i2Dt7T9?s|9ZF|KP4;CNWvaVK<?o_JIw;}zDT`U
z8L9-eX*7(^ut$2QBvx;9WC*DK4d0Kl9Aoah9FvKFLU*E)t<DB)E+Hfy@{d<s5TtbK
z3@*SWX?`UQ;LR6RwJlyE3z}ZE!swzdANx@XuTjkujJwae)D4vw=Dql$%nf#rij0A7
zPZHIZfP9Y{HHIH6!OIl6HIjQP7s$4hLQfM=Y5?9w6~3&f-&54yS(z79jhWNyU*0R2
z2LGB!DxIQ?IKWc4-r|9{@l3idCG70wl#Y>Z+Qeut;Jith_y{v*Ny6Co6!8MZx;Wgo
z=qAi%&S;8J{iyD&>3CLCQdTX*$+Rx1AwA*D_J^0>suTgBMBb=*hefV+Ar<cd*@2&D
z8;>s#mmr+YsI3#!F@Xc1t4F-gB@6aoyT+5O(qMz*zG<9Qq*f0w^V!03rpr*-WLH};
zfM{xSPJeu6D(%8HU%0GEa%waFHE$G?FH^kMS-&I3)ycx|iv{T6Wx}9$$D&6{%1N_8
z_CLw)_9+O4&u94##vI9b-HHm_95m)fa??q07`DniVjAy`t7;)4NpeyAY(aAk(+T_O
z1om+b5K2g_B&b2DCTK<>SE$Ode1DopAi)xaJjU>**AJK3hZrnhEQ9E`2=|HHe<^tv
z63e(b<X3pR+d94@m}tS^Z3?)AN+iBxpwZ<D7`?_tGq?BO;qYoIK%|`4<lnL)z<I(0
zu_t<sVb~sefyW>n#fMWuz>4erc47}!J>U58%<&N<6AOAewyzNTqi7hJc|X{782&cM
zHZYclNbBwU6673=!ClmxMfkC$(CykGR@10F!zN1S<PPl%@(Hn|^OfVI^X@u=eB4LB
zU*t+xZ0wF<m*ErqYAYp>e83LR&a~$Ht&>~43OX22mt7tcZUpa;9@q}KDX3<tKWF1f
zxw`aDW9rcd*xv(|cjctJ=r<rB$*=tRKjhAT3QznFrq0&JHcrBBhQ@YI=C=P(hmztZ
zBtRHZf@NQr^M5yLSW}<&UN$I$ud6^2LG^C;CST5(r;3;$jf|I6ACztPf?wzMlh7(R
zK$zGkcsg9U$_~E{oniYivq)0tjRjewJEOw_A7w)SdVn|$`QY&`&=C?ozE>O&Ugp6<
zLZLfIMO5;pTee1vNyVC$FGxzK2f>0Z-6hM82zKg44nWo|n}$Zk6&;5ry3`(JFEX$q
zK&KivAe${e^5ZGc3a9hOt|!UOE&OocpVryE$Y4sPcs4rJ>>Kbi2_subQ9($2VN(3o
zb~tEzMsHaBmBtaHAyES+d3A(qURgiskSSwUc9CfJ@99&MKp2sooSYZu+-0t0+L*!I
zYagjOlPgx|lep9tiU%ts&McF6b0VE57%E0Ho%2oi?=Ks<h7|XGdLNwTI)ib?N6{Eu
z;h2l5*eV93*R)?j|9)5Mw{~AJzwV0Z*IoH9lKK|_`lq|{FC-HsFD==}hu}T8I5=Nj
zMm|Nv0wu!DR!AT$4?#iVwpDaiN4hcWqWH4L{RHwRzsnYkBn73d=5jdE`3OkM-m10*
zdSrK<cD9qSi<hEpW()G6&#VKxRV)hnG-x*2O9Ur9cji6_gKVb~I_9QB{xCNxI)s~q
zuptRHAY00`Qzhr7(2tu@2-Cypx8Giobh`{rL+hNjig(}@FZ>+5%aj#au^OBwNwhec
zta6QAeQI^V!dF1C)>RHAmB`HnxyqWx?td@4sd15zPd*Fc9hpDXP23kbBenBxGeD$k
z;<D{TYW<{z_^}oSud&ZuHEyD44V>%0VBQEJ-C)&dTAw_yW@k0u?IUk*NrkJ)(XEeI
z9Y>6Vel>#s_v@=@0<{4A{p<R|0RfTyuh&=hpG-YVMbi~o8Dk@%D2pXcC$zylS8Jch
zTmbubLr&$o2Hk+p^ded~#GH{7cu^WdnjPYm>l=9cQ&Iah0iD0H`q)7NeCIRz8zx;!
z^OO;1+IqoQNak&pV`qKW+K0^Hqp!~gSohcyS)?^P`JNZXw@gc6{A3OLZ?@1Uc^I2v
z+X!^R*HCm3{7JPq{8*Tn>5;B|X7n4QQ0Bs79uTU%nbqOJh`nX(BVj!#f;#J+WZxx4
z_yM&1Y`2XzhfqkIMO7tB3raJKQS+H5F%o83bM+hxbQ<YF8%f26g@w6?b)_6@vyLk>
zeeJm=Dvix$2j|b4?mDacb67v-1^lTp${z=jc1=j~QD>7c*@+1?py>%Kj%Ejp7Y-!?
z8iYRUlGVrQPandAaxFfks53@2EC#0)%mrnmGRn&>=$H$S8q|kE_iWko4`^vCS2aWg
z#!`RHUGyOt*k?bBYu3*j3u0gB#v<VSU``i9)i((*A4_MYpA70V(O^YWl0>(3tsije
zgIuNNWNtrOkx@Pzs;A9un+2LX!zw+p3_NX^Sh09HZAf>m8l@O*rXy_82aWT$Q>iyy
zqO7Of)D=wcSn!0+467&!Hl))eff=$aneB?R!YykdKW@k^_uR!+Q1tR)+IJb`-6=jj
zymzA>Sv4>Z&g&WWu#|~GcP7qP&m*w-S$)7Xr;(duqCTe7p8H3k5>Y-n8438+%^9~K
z3r^LIT_K{i7DgEJjIocw_6d0!<;wKT`X;&vv+&msmhAAnIe!OTdybPctzcEzBy88_
zWO{6i4YT%e4<cORn@|6PX^%-74fBfvI*qb65lguos^u7L67Q8>^WQZB)KHCvA(0tS
zHu_Bg+6Ko%a9~$EjRB90`P(2~6uI@SFibxct{H#o&y40MdiXblu@VFXbhz>Nko;7R
z70Ntmm-FePqhb%9gL+7U8@(ch|JfH5Fm)5${8|`Lef>LttM_iww6LW2X61ldBmG0z
zax3y)njFe>j*T{i0s8D4=L>X^j0)({R5lMGVS#7(2C9@AxL&C-lZQx~czI7Iv+{%1
z2<eOr>hEG>RzX4S8x3v#9sgGAnPzptM)g&LB}@%E>fy0vGSa(&q0ch|=ncK<Ys%|-
z$8{E%Rw4?D_8re!3!SBF?$73?o3k7+`5vm8pITte_z3-f7CoPck#W)v4slR3Zzqx8
zNVDE$E-!|FmIAfj{mDQ%vc<UpiEaVi&qHP&p?bTbEWARJ?xHePge3YNpI92C>jNrK
z`jA~jObJhrJ^ri|-)J^HUyeZXz~XkBp$VhcTEcTdc#a2EUOGVX?@mYx#Vy*!qO$Jv
zQ4rgOJ~M*o-_Wptam=~krnmG*p^j!JAqoQ%+YsDFW7Cc9M%YPiBOrVcD^RY>m9Pd<
zu}#9M?K{+;UIO!D9qOpq9yxUquQRmQNMo0pT`@$pVt=rMvyX)ph(-CCJLvUJy71DI
z<CI*+r=tVTlgn@b%PV`RM<s@b7^3<nL0kgliJ>Bk7oc7)-%ngdj~s@76Yse3L^gV0
z2==qfp&Q~L(+%RHP0n}+xH#k(hPRx(!AdBM$JCfJ5*C=<wG1tvhicE*gpY`ZCMnhj
z1G=jh5z6O!^6nUl+c3`w0_ln^hFS56L}g>K3ts>P?@@SZ_+{U2qFZb>4kZ{Go37{#
zSQc+-dq*a-Vy4?taS&{Ht|MLRiS)Sn14JOONyXqPNnpq&2y~)6wEG0oNy>qvod$FF
z`9o&?&6uZjhZ4_*5qWVrEfu(>_n2Xi2{@Gz9MZ8!YmjYvIMasE9yVQL10NBrTCczq
zcTY1q^PF2l!Eraguf{+PtHV3=2A?Cu&NN<O6VN>&a8V(y;q(^_mFc6)%Yfn&X&~Pq
zU1?qCj^LF(EQB1F`8NxNjyV%fde}dEa(Hx=r7$~ts2dzDwyi6ByBAIx$NllB4%K=O
z$AHz1<2bTUb>(MCVPpK(E9wlLElo(aSd(Os)^Raum`d(g9Vd_+Bf&V;l=@mM=cC>)
z)9b0enb)u_7V!!E_bl>u5nf&Rl|2r=2F3rHMdb7y9E}}F82^$Rf+P8%dKnOeKh1vs
zhH^P*4Ydr^$)$h@4<HY{kkgz6jX&Mdasz@VEoye!fw>KVzxrHyy#cKmWEa9P5DJ|-
zG;!Qi35Tp7XNj60=$!S6U#!(${6hyh7d4q=pF{`0t|N^|L^d8pD{O9@tF~W;#Je*P
z&ah%W!KOIN;SyAEhAeTafJ4uEL`(RtnovM+cb(O#>xQnk?dzAjG^~4$dFn^<@-Na3
z395;wBnS{t*H;Jef2eE!2}u5Ns{AHj>WYZDgQJt8v%x?9{MXqJsGP|l%OiZqQ1aB!
z%E=*Ig`(!tHh>}4_z5IMpg{49UvD*Pp9!pxt_gdAW%sIf3k6CTycOT1McPl=_#0?8
zVjz8Hj*Vy9c5-krd-{BQ{6Xy|P$6L<o)r^R5`ZQ`GQhYqfOupFa9l!9lz>JvMuX$*
zA+@I_66_ET5l2&gk9n4$1<ixm5Z@RUb^v5fP{&E>M3LN8(yEV<DNCy-M+F%4k9cS;
zC^^RKH!iKb*+NTZ($+>iRx&mtd#LD}AqEs?RW=xKC(OCWH;~>(X6h!uDxXIPH06xh
z*`F4cVlbD<GpM@G3X6T;YA>P`A)-fzf>MuScYsmq&1LUMGaQ3bRm6i7OsJ|%uhTDT
zlvZA1M}nz*SalJWNT|`dBm1$x<Um4i*)m*aUZO##LwDk6q63h|IW;0Cr>laA>CCiQ
zK`xD-RuEn>-`Z?M{1%@wewf#8?F|(@1e0+T4>nmlSRrNK5f)BJ2H*$q(H>zGD0>eL
zQ!tl_Wk)k*e6v^m*{~A;@6+JGeWU-q9>?+L_#UNT%G?4&BnOgvm9@o7l?ov~XL+et
zbGT)|G7)KAeqb=wHSPk+J1bdg7N3$vp(ekjI1D9V$G5Cj!=R2w=3*4!z*J-r-cyeb
zd(i2KmX!|Lh<K2eIYJREpvNMi&Z#7*f45@XYFPFRp`27wgA7b{lxe_pm*^6y<RLhc
z8e%Fbj59XhBop+|s8G!j;y`1~`5Wy@K-#-nr2&8P(UZtm7KDzi`O}$kr#>ey!snRw
z?#$Gu%S^SQEKt&kep)up#j&9}e+3=JJBS(s>MH+|=R(`8xK{mmndWo_r`-w<m*k89
zcV!Q$3TQF>1#SeRD&YtAJ#GiVI*TkQZ}&aq<+bU2+coU3!jCI6E+Ad_xFW*ghnZ$q
zAoF*i&3n1j#?B8x;kjSJD${1jdRB;)R*)Ao!9bd|C7{;iqDo|T&>KSh6*hCD!rwv=
zyK#F@2+cv3=|S1Kef(E6Niv8kyLVLX&e=U;{0x{$tDfShqkjUME>f8d(5nzSkY6@!
z^<s1zrx%Y{GxOAQiaP`zX4pWwf(3Q?%k(n<-*ko(!rd%~BRbzOMd+_y^a4+aH{F5%
zJscHc3gzd06%1tHe@VXo_oCsSee^HDb^OaWE0e5ck@*pZK0RqW9B3O#2!5)9`cvEa
zg%b@5T@#X^O2>-0>DM)wa&%m#UF1F?zR`8Y3X#tA!*7Q$P3lZJ%*KNlrk_uaPkxw~
zxZ1qlE;Zo;nb@!SMazSjM>;34ROOoygo%SF);LL>rRonWwR>bmSd1XD^~sGSu$Gg#
zFZ`|yKU0%!v07dz^v(tY%;So(e`o{ZYTX`hm;@b0%8|H>VW`*cr8R%<Wzeb1B(_7j
zj%jg9z(<Muj+rwUU3J`9Kkr9fxe1hx2`oE|97F-6%bXb;NK9gbaH21ZD{h@XeCBlS
zTkbMM03Wrp)E~*3bm**>3n|ehw2`(9B+V72`>SY}9^8oh$En80mZK9T4abVG*to;E
z1_S6bgDOW?!Oy1LwYy=w3q~KKdbNtyH#d24PFjX)KYMY93{3-mPP-H>@M-_>N~DDu
zENh~reh?JBAK=TFN-SfDfT^=+{w4ea2KNWXq2Y<;?(gf(FgVp8Zp-oEjKzB<XiW@L
z4DJ=*jZ)bsSD44~x>%2Iqj;48GmY3h=bcdYJ}~&4tS`Q1sb=^emaW$IC$|R+r-8V-
zf0$gGE(CS_n4s>oicVk)MfvVg#I>iDvf~Ov8bk}sSxluG!6#^Z_zhB&U^`eIi1@j(
z^CK$z^stBHtaDDHxn+R;3u+>Lil^}fj?7eaG<FRml8CUEBOnAV8CmKw;V=T((V6h(
z;KHNVT}hTA4oyjv0NUAbK-AxArk$+6ITFf=ABoS3b^1vXdN5Y3$j$Gn7L0qB<*F>B
z&5nl^STqcaBxI@v>%zG|j))G(rVa4aY=B@^2{TFkW~YP!8!9TG#(-nOf^^X-%m9{Z
zCC?iC`G-^RcBSCuk=Z`(FaUUe?hf3{0C>>$?<OA^A&va@m6n{p_RDbpCmC44*u>Vs
z`2Uud9M+T&KB6o4o9kvdi^Q=Bw!asPdxbe#W-Oaa#_NP(qpyF@bVxv5D5))srkU#m
zj_KA+#7sqDn*Ipf!F5Byco4HOSd!Ui$l94|IbW%Ny(s1>f4|Mv^#NfB31N~kya9!k
zWCGL-$0ZQztBate^fd>R<KTx+Kn<12wUG%9I!9v@uJ1RK?y>!hXY_N9ZjYp3V~4_V
z#eB)Kjr8yW=+oG)BuNdZG?jaZlw+l_ma8aET(s+-x+=F-t#Qoiuu1i`^x8Sj>b^U}
zs<v<BrDUuc#V%G@XYC{+Sg}|bZ*&$Xmy?7Y(n?p_lr<7QNavDlGr?4z!qaMY=`TAM
zFH`)mW};}4R%}`-v*@TwSk0p!c2gBZF<0Y~yAY5urGWuSR(DcbqvUph8QXsf(x2A!
z>^z<()YMFP7CmjUC@M=&lA5W7t&cxTlzJAts*%PBDAPuqcV5o7HEnqjif_7xGt)F%
zGx2b4w{@!tE)$p=l3&?Bf#`+!-RLOleeR<bP1HAuJwpA7V6w3e&7FnVSAlVevD>k3
z7#pF|w@6_sBmn1nECqdunmG^}pr5(ZJQVvAt$6p3H(16~;vO>?sTE`Y+mq5YP&PBo
zvq!7#W$Gewy`;%6o^!Dtjz~x)T}Bdk*BS#=EY=ODD&B=V6TD2z^hj1m5^d6s)D*wk
zu$z~D7QuZ2b?5`p)<Zk5N<LwAw|NY@XF!9G7+>E8e2_L38v3WE{V`bVk;6fl#o2`)
z99JsWhh?$oVRn@$S#)uK&8DL8>An0&S<%V8hnGD7Z^;Y(%6;^9!7kDQ5bjR_V+~wp
zfx4m3z6CWmmZ<8gDGUyg3>t8wgJ5NkkiEm^(sedCicP^&3D%}6LtIUq>mXCAt{9eF
zNXL$kGcoUTf_Lhm`t;hD-SE)m=iBnxRU(NyL}f6~1uH)`K!hmYZjLI%H}AmEF5RZt
z06$wn63<H*D^}!!_~!rctzB?W+<x$IW(W<z1pS(B1aK00$0*UbQ&o~2AGrgPX{+%L
zjpNNy?injFg0d#OC9*3D`YWIJp4knE9&uEHc=jswzMs5P)Ct~!Qhd!W;4aD36N5rn
zR-$WHi87V$r>GHnApHXZZJ}s^s)j9(BM6e*7IBK6Bq(!)d~zR#rbxK9NVIlgquoMq
z=eGZ9NR<I_0;qaLkr^sqs*eI>!SEqP6=9UQg#@!rtbbSBUM#ynF);zKX+|!Zm}*{H
z+j=d?<x8+W+YzUX8`Wzx$M0@ats$ISI!}Y&e$baoEyt_PL67D-!l9jd$-U47GPlhn
zFZ(p{^KerTig5@++3nwFz)bDI^Rg#*4JrNT%{~<3KmSD&ZJ;XGkp4=fS6_`Bk^dyB
z2<kf;i`zIF+c=s#nY$P(Iysozn0`U;e|0>aZ2!?@EL7C~%B?6ouCKLnO$uWn;Y6Xz
zX8dSwj732u(o*U3F$F=7xwxm>E-B+SVZH;O-4XPuPkLSt_?S0)lb7EEg)Mglk0#eS
z9@jl(OnH4juMxY+*r03VDfPx_IM!Lmc(5hOI;`?d3<n0O2)hcsP_2=f#ul^%8WEjH
z_45k7p1r2G5<EoD-7_hh0-~>7f>jPP$?9jQQIQU@i4vuG6MagEoJrQ=RD7xt@8E;c
z<Z~cp<{k@e+=yUE(YejRT8|zYjy+~C+(wP9bf2{6?hB`L=aUc<odY()WVr`t9nSc0
zAeWGRrle!<ccgxgu=eN|0Q>eGV*+Pt+t$@pt!|McETOE$9k=_C!70uhwRS9X#b%ZK
z%q(TIUXSS^F0`4Cx?Rk07C6wI4!UVPeI~-fxY6`YH$kABdOuiRtl73MqG|~AzZ@<e
z70bZ1Xfg@ML9rX@!O{Xhvx6+$D#ej982$eGa_sxL;&>iL&^s?24iS;RK_pdlWkhcF
z@Wv-Om(Aealfg)D^adlXh9Nv<v-}opkLv5Ft~N;ilf%n_18GR>f~Uf@y;g3Y)i(YP
zEXDnb1V}1pJT5ZWyw=1i+0fni9yINurD=EqH^ciOwLUGi)C%Da)tyt=zq2P7pV5-G
zR7!oq28-Fgn5pW|<Sr(TR-f}>nlu^b!S1Z#r7!Wtr{5J5PQ>pd+2P7RSD?>(U7-|Y
z7ZQ5lhYIl_IF<9?T9^IPK<(Hp;l5bl5tF9>X-zG14_7PfsA>6<$~A338iYRT{a@r_
zuXBaT=`T5x3=s&3=RYx6NgG>No4?5KFBVjE(swfcivcIpPQFx5l+O;fiGsOrl5teR
z_Cm+;PW}O0Dwe_(4Z@XZ)O0W-v2X><&L*<~*q3dg;bQW3g7)a#3KiQP>+qj|qo*Hk
z?57>f2?f@`=Fj^nkDKeRkN2d$Z@2eNKpHo}ksj-$`QKb6n?*$^*%Fb3_Kb<??RAja
zk0V>f1(*W9K>{L$mud2WHJ=j0^=g30Xhg8$<s&?w=aRQaO9t&giJ1(RsSL3%_cC6M
z*CW9(Zh9c_42B<|)&oM^-GzGdz1}f&d3F5BYqWb4q+Sw(ib=VNbJPT@^wT=3tW(7y
zrx1-UKq0(c(u-_d3s{C`aQ&0%#$*~vtZCzBHFqiV3;VEe=EsFn^iO}7H|DQJkk9H;
zB0P{n&~U<*$_g%{-r&>#g^?36`p1fm;;1@0Lrx+8t`?vN0ZorM<NTJbjJv2{-dI;>
zS<hDSyFi<GVb++PZX@XtOI*=$j*U@=`@o~{Gi!F-NK(%gyI#{g6|hETm*WG_p}s8L
zjZRCuf%OK?g`?(Q%o?EJIq8XN^)7E@6pk&Uqpm7^VOiV00>W?rhjCE8$C|@p^sXdx
z|NOHHg+fL;HIlqyLp~SSdIF`TnSHehNCU9t89yr@)FY<~hu+X`tjg(aSVae$wDG*C
zq$nY(Y494R)hD!i1|IIyP*&PD_c2FPgeY)&mX1qujB1VHPG9`yFQpLFVQ0>EKS@Bp
zAfP5`C(sWGLI?AC{XEjLKR4FVNw(4+9b?kba95ukgR1H?w<8F7)G+6&(zUhIE5Ef%
z=fFkL3QKA~M@h{nzjRq!Y_t!%U66#L8!(2-GgFxkD1=JRRqk=n%G(yHKn%^&$dW>;
zSjAcjETMz1%205se$iH_)ZCpfg_LwvnsZQAUCS#^FExp8O4CrJb6>JquNV@qPq~3A
zZ<6dOU#6|8+fcgiA#~MDmcpIEaUO02L<Rkl`=Q>5#T$HV0$EMD94HT_eXLZ2Zi&(!
z&5E>%&|FZ`)CN10tM%tLSPD*~r#--K(H-CZqIOb99_;m|D5wdgJ<1iOJz@h2Zkq?}
z%8_KXb&hf=2Wza(Wgc;3v3TN*;HTU*q2?#z&tLn_U0Nt!y>Oo>+2T)He6%XuP;fgn
z-G!#h$Y2`9>Jtf}hbVrm6D70|ERzLAU>3zoWhJmjWfgM^))T+2u$~5>HF9jQDkrXR
z=IzX36)V75PrFjkQ%TO+iqKGCQ-DDXbaE;C#}!-CoWQx&v*vHfyI>$HNRbpvm<`O(
zlx9NBWD6_e&J%Ous4yp~s<!5el5C5+U(6q$naw*;HMpy|CU=dglNI1EQ%|HQk4H*H
z4vZmq8i&o(xLex%_9CXr+V#E5;>6)Ghni!I6)0W;9(9$y1wWu`$gs<$9Mcf$L*piP
zPR0Av*2%ul`W;?-1_-5Zy0~}?`e@Y5A&0H!^ApyVTT}BiOm4GeFo$_oPlDEyeGBbh
z1h3q&Dx~GmUS|3@4V36&$2uO8!Yp&^pD7J5&TN{?xphf*-js1fP?B|`>p_K>lh{ij
zP(?H%e}AIP?_i^f&Li=FDSQ`2<P4}YJBR3<86=L)lNLn?n<UqJ){hazu7oE1W<WpM
zkEayA#3<YDk5vng9{R3EwAsH9RNs3PX=z8hou#I@lclzVbk)C_>_NWxL+BB=nQr=$
zHojMlXNGauvvwPU>ZLq!`bX-5F4jBJ&So{kE5+ms9UEYD{66!|k~3vsP+mE}x!>%P
za98bAU0!h0&ka4EoiDvBM#CP#dRNdXJcb*(%=<(g+M@<)DZ!@v1V>;54En?igcHR2
zhubQMq}VSOK)onqHfc<PBSX0Qkle<U&d;N1BT|$4=Uqpo2tm04^j~@drYI0P7duc%
zes@lg1;1w}#p3u@$yb(xFl7Q9B8k2c_rQZ?>zM7YA@s=9*ow;k;8)&?J3@0JiGcP!
zP#00KZ1t)GyZeRJ=f0^gc+58lc4Qh*S7RqPIC6GugG1gXe$LIQMRCo8cHf^qXgAa2
z`}t>u2Cq1CbSEpLr~E=c7~=Qkc9-vLE%(v9N*&HF`(d~(0`iukl5aQ9u4rUvc8%m)
zr2GwZN4!s;{SB87lJB;veebPmqE}tSpT>+`t?<457Q9iV$th%i__Z1kOMAswFldD6
ztbOvO337S5o#ZZgN2G99_AVqPv!?Gmt3pzgD+Hp3QPQ`9qJ(g=kjvD+fUSS3upJn!
zqoG7acIKEFRX~S}3|{EWT$kdz#zrDlJU(rPkxjws_iyLKU8+v|*oS_W*-guAb&Pj1
z35Z`3z<&Jb@2Mwz=KXucNYdY#SNO$tcVFr9KdKm|%^e-TXzs6M`PBper%ajkrIyUe
zp$vVxVs9*>Vp4_1NC~Zg)WOCPmOxI1V34QlG4!aSFOH{QqS<og-9*{m%{>Vq1^1)-
z0P!Z?tT&E-ll(pwf0?=F=yOzik=@nh1Clxr9}Vij89z)ePDSCYAqw?lVI?v?+&*zH
z)p$CScFI8rrwId~`}9YWPFu0cW1Sf@vRELs&cbntRU6QfPK-SO*mqu|u~}8AJ!Q$z
znzu}50O=YbjwKCuSVBs6&CZR#0FTu)3{}qJJYX(>QPr4$RqWiwX3NT~;>cLn*_&1H
zaKpIW)JVJ>b{uo2oq>oQt3y=zJ<SzS^-D>jb%fU@wLqM{SyaC6x2snMx-}ivfU<1-
znu1Lh;i$3Tf$Kh5Uk))G!D1UhE8pvx&nO~w^fG)BC&L!_hQk%^p`Kp@F{cz>80W&T
ziOK=Sq3fdRu*V0=S53rcIfWFazI}Twj63CG(jOB;$*b`*#B9uEnBM`hDk*E<oidpi
zVi-YCX)u~YCBI+laYqXSo<EX9^<PNdjZ=BtK`_ZYngaDtG5R2}vTD}f!DiphZC8q*
z6i0u#X*zYGRu)lm1ElCpjgBvp3Ldd|#4WH$%tK2cXGR#zWyK<<eW|7%5Ju2_h*||L
zg2wp|<^Qbr0(rt`iD%~4&vfIMiU-hB(&TS(L<Ua}Ae0?Iw}pCJ-m<j9H*WOItm42P
z+4mexCkJJkqGU65>wSRdwP8?5T?xGUKs=5N83XsR*)a4|ijz|c{4tIU+4j^A5C<#5
z*$c_d=5ml~%pGxw#?*q9N7aRwPux5EyqHVkdJO=5J>84!X6P>DS8PTTz>7C#F<Zu4
zp3F5$$3=BvvzoPSkFVMT=*}cwr4^?8L-w1olVUL5gHh{)p1vygqRx_|5M(|5i$<sf
zD*3bQ%l!Ml%>O?k#edkntG<Krzma04@|w*Y9|BKCf&FeXNg|upC}{zu^oHarA7zIf
zC8{uLE&-S@l`ZxV=v;r*B3!WS4z%0OHxj5&2`?c0;8f|2cq)E6RQk=VwECk+Q<E<b
z===nd>+fJk8ZMn?pmJSO@`x-QHq;7^h6GEXLXo1TC<!%G;g|1m1_bS}WUN;u(X1H_
zC*#P|&x2L7jt9)tK*_e)O{|{ck0S}rdz!bjq~RUIX}#ve9vhD}wsXP2-}YSVJ>NhH
z8ZDH{*NLAjo3WM`xeb=X{((uv3H(8&r8fJJg_uSs_%hOH%JDD?hu*2NvWGYD+j)&`
zz#_1%O1wF^o5ryt?O0n;`lHbzp0wQ?rcbW(F1+h7_<Pe?a2+{KTPMp$CgHfSHrYCA
zK{ERTzz`pSB$~vt3tii8P;~CRII8wO)%F!tVN6C6<1n2x%4zAuytITcED<o5IyW7o
zh-G7-*3%BqRFkVI(T5y^ar95CXup=KHGy2BZYuLh)vrm>EZZ<i<-|Mk=_v8nD5m5v
zdpML`Rs@XrmR1I|!5H>9{>rePvLAPVZ_R|n@;b$;UchU=0j<6k8G9QuQf@76oiE*4
zXOLQ&n3$NR#p4<5NJMVC*S);5x2)eRbaAM%VxWu9ohlT;pGEk7;002enCbQ>2r-us
z3#bpXP9g|mE`65VrN`+3mC)M(eMj~~eOf)do<@l+fMiTR)XO}422*1S<RWVx0`Uk8
z=5;*6NK#2D`zc^JM6i=$pyv-R_l)2#3c6jS0ZcmLz1#Dg>L{wyY(%oMpBgJagtiDf
zz>O6(m;};>Hi=t8o{DVC@YigqS(Qh+ix3Rwa9aliH}a}IlOCW1@?%h_bRbq-W{KHF
z%Vo?-j@{Xi@=~Lz5uZP27==UGE15|g^0gzD|3x)SCEXrx`*MP^FDLl%pOi~~Il;dc
z^hrwp9sYeT7iZ)-ajKy@{a`kr0-5*_!XfBpXw<un0R1t>EcFGJ;%kV$0Nx;apKrur
zJN2J~CAv{Zjj%FolyurtW8RaFmpn&zKJWL>(0;;+q(%(Hx!GMW4AcfP0YJ*Vz!F4g
z!ZhMyj$BdXL@MlF%KeInmPCt~9&A!;cRw)W!Hi@0DY(GD_f?jeV{=s=cJ6e}JktJw
zQORnxxj3mBxfrH=x{`_^Z1ddDh}L#V7i}$njUFRVwOX?qOTKjfPMBO4y(WiU<)epb
zvB9L=%jW#*SL|Nd_G?E*_h1^M-$PG6Pc_&QqF0O-FIOpa4)PAEPsyvB)GKasmBoEt
z?_Q2~QCYGH+hW31x-B=@5_AN870vY#KB~3a*&{I=f);3Kv7q4Q7s)0)gVYx2#Iz<e
zcH?D}+f3Q#s`S_o+I!i;AG^@C;`0g<<}J>9g(F<Nt8qTR6vu`Q_y)iK3d>2;=+Iy4
z6KI^8GJ6D@%tpS^8boU}zpi=+(5GfIR)35PzrbuXeL1Y1N%JK7PG|^2k3qIqHfX;G
zQ}~JZ-UWx|60P5?d1e;AHx!_;#PG%d=^X(AR%i`l0jSpYOpXoKFW~7ip7|xvN;2^?
zsYC9fanpO7rO=V7+KXqVc;Q5z%Bj})xHVrgoR04s<WC19*!aSDBN9bsQ!y_RQh!2^
zM?3OYfd1?Of*;~K;fPyA-Zs2YGEobYXZSuxP}4a~sqAr!U$f%5T_yC9m}8r(jTC#Z
zlS5i1zBtiGG~ok?`vdcED-M&WdW#GCV?b8L_D^$erV#MdoMmoYt9TZ|Ht9A`j0>A2
zl~DAwv=!(()DvH*=lyhIlU^hBkA0$e*7&fJpB0|oB7)rqGK#5##2T`@_I^|O2x4GO
z;xh6ROcV<9>?e0)MI(y++$-ksV;G;Xe`lh76T#Htuia+(UrIXrf9?<emJgERw<NIn
zQ3ku})$3b}us&H98W&5x<)bV~*h&=0ffNSk1dGwNXOQ%9)}<w_ggrrd<5YvvzW{lc
z%ra;Ag$A><p>L(tZ$0BqX1>24?V$S+&kLZ`AodQ4_)P#Q3*4xg8}lMV-FLwC*cN$<
zt65Rf%7z41u^i=P*qO8>JqXPrinQFapR7qHAtp~&RZ85$>ob|Js;GS^y;S{XnGiBc
zGa4IGvDl?x%gY`vNhv8wgZnP<sGTjZeSulPuO`MCGWcs$^L3#ATO-7+><iA~BUyg7
zK%Ww`C41~DlFVr(wLNj3&@sD(X1>#UYI-w*<g2t%j8f-#L_4CY4*BdT&|1*Oi_vum
zKr_(QQ>^4YCZnxkF85@ldepk$&$#3EAhrJY0U)lR{F6sM3SONV^+$;Zx8BD&Eku3K
zKNLZyBni3)pGzU0;n(X@1fX8wYGKYMpLm<N;CLpE$mA#FhwOAwFc3Gu*Y2ijqt2Mr
zEmgb5Rj4WSTt}-IA7KmFeJ5Mjqr(gVM>Cu{N5-}epPDxClPFK#A@02WM3!myN%bkF
z|GJ4GZ}3sL{3{qXemy+#Uk{4>Kf8v11;f8I&c76+B&AQ8udd<8gU7+BeWC`akUU~U
zgXoxie>MS@rBoyY8O8Tc&8id!w+_ooxcr!1<R^L(;4reEepdzdE}95d2?7a|m*bOO
zw-e)+?=QFS<bE97C&Ii^S^W*sEa3vQg$((7STwNpoGd886wr(*z1BNi)jL%HPZ&tN
zMU1+!wKw7>?#rc$-|SBBtH6S?)1e#P#S?jFZ8u-Bs&k`yLqW|{j+%c#A4AQ>+tj$Y
z^CZajspu$F%73E68Lw5q7IVREED9r1Ijsg#@DzH>wKseye>hjsk^{n0g?3+gs@7`i
zHx+-!<a?ReO?pTi@}bP2;<uA@WM0R7zz}csHRnM~D!mg`gD>sjLx^fS;fY!ERBU+Q
zVJ!e0hJH%P)z!y%1^ZyG0>PN@5W~SV%<y=x@j^(xiknw*C+Ur&ZKl@Fn|2w}`ly8(
zz_1QrAQphp;v3{c3l!jHVeo@tq)&pO(TmgH_gydMs#0|p0EwwF+U6X@z~IpBNd*kS
z6gu9R48Qg1ZmheUKP8?FTjqJfpHv+Qzur?E>f>}c?$H8r;Sy-ui>aruVTY=bHe}$e
zi&Q4&XK!qT7-XjCrDaufT@>ieQ&4G(SShUob0Q>Gznep9fR783jGuUynAqc6$pYX;
z7*O@@JW>O6lKIk0G00xsm|=*UVTQBB`u1f=6wGAj%nHK_;Aqmfa!eAykDmi-@u%6~
z;*c!pS1@V8r@IX9j&rW&d*}wpNs96O2Ute>%yt{yv<kbv8~>>k!6zfT6pru{F1M3P
z2WN1JDYqoTB#(`kE{H676QOoX`cnqHl1Yaru)>8Ky~VU{)r#{&s86Vz5X)v15ULHA
zAZDb{99+s~qI6;-dQ5DBjHJP@GYTwn;Dv&9kE<0R!<?&2c8~t|z-P*DUzhl0`)*&h
z|Nn!A|7U$aOKIxA^!*PLm$hJHXw+OP4ZezL1tUs=phN^Q<ajb=DGRYXwnS-lEtiqY
z<frQHk&G0bcD}r@nR4F*#?F;03be|bX?NbkjK|JLXOk{3&rif|A{D1QLy-_VbXfN<
z`&SwtIfw(ew@5F}*W~2($7(fcbFJ&i{R!6o{(JXA6Go7A?f0+7=m(n5mSsl@X02PS
z-WAkN+CBDC0Juwc><R~*^;Bg@=LH+}=1lFi@bNQ@$bvI%*KR054Mda5?OV~x-9V>d
z8tf1oq$kO`_sV(NHOSbMwr=To4r^X$`sBW4$gWUov|WY?xccQJN}1DOL|GEaD_!@&
z15p?Pj+>7d`@<hmz7-`Nlqgl%etYhVq(Lsv5EWt?S5qiu*a*btqng6H#LO-oz2SH0
z^xQ6+AKHkG1#oA+26Ir>LvNIu9*^hPN)pwcv|akvYYq)ks%`G>!+!pW{-iXPZsRp8
z35LR;DhseQKWYSD`%gO&k$Dj6_6q#vjWA}rZcWtQr=Xn*)kJ9kacA=esi*I<)1>w^
zO_+E>QvjP)qiSZg9M|GNeLtO2D7xT6vsj`88sd!94j^AqxFLi}@w9!Y*?nwWARE0P
znuI_7A-saQ+%?MFA$gttMV-NAR^#tjl_e{R$N8t2NbOlX373>e7Ox=l=;y#;M7asp
zRCz*CLnrm$esvSb5{<D+-TvHfiAKWjMv@f{O6HO_6qs!bUPBzAT_=n|ZXu1_p<5Uy
z3h~@8-S?LvkCJ{s{eD*A;Sn*288f6#+AhGxs`&<L9qn^;Z22jipcEpYF_>T<$6CjY
zmZ(i{Rs_<#pWW>(HPaaYj`%YqBra=Ey3R21O7vUbzO<NIYfKSkPH64b-_2c5+D94m
z%iNp4`dUo?NvQw#46nFlJ1h6~OcEsuw4>kJJO?V`4-D*u4$Me0Bx$K(lYo`JO}gnC
zx`V}a7m-hLU9Xvb@K2ymioF)vj12<*^oAqRuG_4u%(ah?+go%$kOpfb`T96P+L$4>
zQ#S+sA%VbH&mD1k5Ak7^^dZoC>`1L%i>ZXmooA!%GI)b+$D&ziKrb)a=-ds9xk#~&
z7)3iem6I|r5+ZrTRe_W861x8JpD`DDIYZNm{$baw+$)X^Jtjnl0xlBgdnNY}x%5za
zkQ8E6T<^$sKBPtL4(1zi_Rd(tVth*3Xs!ulflX+70?gb&jRTnI8l+*Aj9{|d%qLZ+
z>~V9Z;)`8-lds*Zgs~z1?Fg?Po7|FDl(Ce<*c^2=lFQ~ahwh6rqSjtM5+$GT>3WZW
zj;u~w9xwAhOc<<rq!H2nfR^7-SzR`1qG<@9=UVA!*EEe=aj$k=;J{9<>kF}~`CJ68
z?(S5vNJa;kriPlim33{N5`C{9?NWhzsna_~^|K2k4xz1`xcu<DiNXb8<8|Z|Cq-GN
zCj)9M_ZyLriw>i*LXL-1#Y}Hi9`Oo!zQ>x-kgAX4LrPz63uZ+?uG*84@<PwZBwue+
zS_(JptfpR*pv(`dE1<lRh0d;LEi#-yNm1~qOYx|4^9!+8XC372m2S)!zRs|&NM%#C
z+GAUzg{43ESA4LWP=nq0vMI~2O-KLrb1MH&d{DNr{9l?+9m-=0Uz-DYT;s)i8TcR&
zZh}K8#36!G;6ZC+XJ@IPDh1SQ+DH`botOlr$wuj)=;;c=MU$X;yOXeWp?}z{AJeP3
z$QB6%$q~}6J8i8sO`UWW+mc=Rc6o#AK{c`V$1Y3*YS}cR>PKq-KgQlMNRwz=6Yes)
zY}>YN+qP}nwr$(CZQFjUOI=-6J$2^XGvC~EZ+vrqWaOXB$k?%Suf5k=4>AveC1aJ!
ziaW4IS%F$_B<CZJ!UX;hU#7vjr-A^#gKV?ykV>abi)kA8Y&u4F7E%99OPtm=vzw$$
zEz#9rvn`Iot_z-r3MtV>k)YvErZ<^Oa${`2>MYYODSr6?QZu+<Xr5QDI3|}c*=v!t
z7aWklHMNmj(E4@B8u*Z;TyWOKVOpxR#jrE(G|coSCa0%my~OH?4?4W3oGfzXZ^Yl8
zoBlE^JMVJSf5Id9b3E|!Jy&$Nn|?alu2G4}CVoY>be-~MBjwPGdMvGd!b!elsdi4%
z`37W*8+OGulab8YM?`KjJ8e+jM(tqLKSS@=jimq3)Ea2EB%88L8CaM+aG7;27b?5`
z4zuUWBr)f)k2o&xg{iZ$IQkJ+SK>lpq4GEacu~eOW4yNFLU!Kgc{w4&D$4ecm0f}~
zTTzquRW@`f0}|IILl`!1P+;69g^upiPA6F{)U8)muWHzexRenBU$E^9X-uIY2%&1w
z_=#5*(nmxJ9zF%styBwivi)?#KMG96-H@hD-H_&EZiRNsfk7mjBq{<vAyj;V$oY$;
zeFf@1qm*3JDo_jY%mMvJK|}hElB4>L%!E;Sqn!mVX*}kXhwH6eh;b42eD!*~upVG@
z#smUqz$ICm!Y8wY53gJeS|Iuard0=;k5i5Z_<S6ivK6}$qoRMsg7V!3nguv@i1IcG
zTip=0gi~_71}Ye%-y+=r)peyFsi|a3!G{6XxhN#Qh|@7<<1d75@UG8;<MS%cR=T4O
zoC};`)PZx1F>hSIs6tr)R4n*r*rE`>38Pw&lkv{_r!jNN=;#?WbMj|l>cU(9trCq;
z%nN~r^y7!kH^GPOf3R}?dDhO=v^3BeP5hF|%4GNQYBSwz;x({21i4OQY->1G=KFyu
z&6d`f2tT9Yl_Z8YACZaJ#v#-(gcyeqXMhYGXb=t>)M@fFa8tHp2x;ODX=Ap@a5I=U
z0G80^$N0G4=U(>W%mrrThl0DjyQ-_I>+1Tdd_AuB3qpYAqY54upwa3}owa|x5iQ^1
zEf|iTZxKNGRpI>34EwkIQ2zHDEZ=(J@lRaOH>F|2Z%V_t56<AC&&@dFD$aTcihA@L
zsrWd?<myPVagWF6k#axl>Km$PUYu^xA5#5Uj4I4RGqHD56xT%H{+P8Ag>e_3p<L4#
zGGo`21LS^`#&pLj%z6&83bF#woRX8gnyg4E`RMx;A0GPTje`oZWY-mmMzZp&3~FVT
z%&JKi++U_$aax?RigODkBI8D0f>N$4m8n>i%OyJFPNWaEnJ4McUZPa1QmOh?t8~n&
z&RulPCors8wUaqMHECG=IhB(-tU2XvHP6#NrLVyKG%Ee*mQ5Ps%wW?<IHwX<9-vb-
zW|;MpO8qp-ZnW!-s%jOBntq(xp658aSEi+O=TlVuEDFeZ;Vf58T5E5oJgpsS$z*|w
z_>mcnriTVRc4J`2YVM>$ixSF2Xi+Wn(RUZnV?mJ?GRdw%lhZ+t&3s7g!~g{%m&i<6
z5{ib-<==DYG93I(yhyv4jp*y3#*WNuDUf6`vTM%c&hiayf(%=x@4$kJ!W4MtYcE#1
zHM?3xw63;L%x3drtd?jot!8u3qeqctceX3m;tWetK+>~q7Be$h>n6riK(5@ujLgRS
zvOym)k+VAtyV^mF)$29Y`nw&ijdg~jYpkx<Yqc8N6p%GnFnUNecXA;^tBlRNJF2~8
z83k&Izk?JNwKq$7B{7SaDzJleOD3(MTg8JS?=Wa}5<9yFzA)j$wyJG`eyNKZ->%*^
z8dz`C*g=I?;clyi5|!27e2AuSa$&%UyR(J3W!A=ZgHF9OuKA34I-1U~pyD!KuRkjA
zbkN!?MfQOeN>DUPBxoy5IX}@vw`EEB->q!)8fRl_mqUVuRu|C@KD-;yl=yKc=ZT0%
zB$fMwcC|HE*0f8<f|{q<VA<GPwt+_1vdY4dp0vY!lyK4+MMzS+wPs8%Y!YQ?CyA-f
z|5A#Ax91*K+5prTyd;RpVWXU<95EBu#@OP?@CFlP#ju<zpg)t6EZ7t+Phz{i%)wGY
z8Sly%qPUn+-#Zc6fnT8&C%dW&XQx|!Q}Y8ZE~UUjv&VIXbif`Up{+OPP#QE?I~5wN
zHg1NwMkYZhg(4h)DfG}WB{D2YgF!n(>+PVlW<RX4?O?hiF?W-4C-rmr<l4%Mf}qji
zkPzoVbI6zl!<d=O(O@8ySZ)?gs-s}EQaJeWY|cHwm*h+8s-uBy$q^5SBFqHNH!Nya
zV@RFH@>Hi>M`zfsA(NQFET?LrM^pPcw`cK+Mo0%8*x8@65=CS_^$cG{GZQ#xv($7J
z??R$P)nPLodI;P!IC3eEYEHh7TV@opr#*)6A-;EU2XuogHvC;;k1aI8asq7ovoP!*
z?x%UoPrZjj<&&aWpsbr>J$Er-7!E(BmOyEv!-mbGQGeJm-U2J>74>o5x`1l;)+P&~
z>}f^=Rx(ZQ2bm+YE0u=ZYrAV@apyt=v1wb?R@`i_g64YyAwcOUl=C!i>=Lzb$`tjv
zOO-P#A+)t-JbbotGMT}arNhJmmGl-lyUpMn=2UacVZxmiG!s!6<s%>H39@~&uVokS
zG=5qWhfW-WOI9g4!R$n7!|ViL!|v3G?GN6HR0Pt_L5*>D#FEj5wM1DScz4Jv@Sxnl
zB@MPPmdI{(2D?;*wd>3#tjAirmUnQoZrVv`xM3hARuJksF(Q)wd4P$88fGYOT1p6U
z`AHSN!`S<vf~_mGQCqX)ayUeL8g`S?LD*d~o*;e7Butl14T(z{eOwARI#k6Z+()QR
zRb-Fll&T}^(XzJMq%~^W5vm%)tln8#72}u>t}}UMBT9o7i|G`r<n?jT0vW2UItF>$
zrB=s$qV3d6$W9@?L!pl0l<c#ekbP<;Y&UotwnNp9`G`wO^=Aisw282N+FetlbD$(D
z7M*F%Rd<HPvo2^kToVnJhdjmlUST#jY=_jHJl3UwxoOwN6*yj#Q|53p9z(c~{M95w
z2|XIj8-<CPgenTQC)l6Cq+N$TfYAFyPq>f%)xs%1ko^=QY$ty-57=55PvP(^6E7cc
zGJ*>m2=;fOj?F~yBf@K@9qwX0hA803Xw+b0m}+#a(>RyR8}*Y<4b+kpp|OS+!whP(
zH`v{%s>jsQI9rd$*vm)EkwOm#W_-rLTHcZRek)>AtF+~<(did)*oR1|&~1|e36d-d
zgtm5cv1O0oqgWC%Et@P4Vhm}Ndl(Y#C^MD03g#PH-TFy+7!Osv<s)+{oZ?`ap%hJ=
z*bwh1?V<z`MwG&0U7SJ4*@zJBC@n5eBU+e74xsX-sjHT`s*lOwc6j~7QTT;glq}6g
z&*%49-SpK^iuY*QN`=#PT9cA+UIO{$3ZZc%>1z^UWS9@%JhswEq~6kSr2DITo59+;
ze=ZC}i2Q?CJ~Iyu?vn|=9iKV>4j8KbxhE4&!@SQ^dVa<p=`%D$z@S%=#yKBRv78Cx
zjasr<f+hkxQ?tW2jO~X7qqFZ|M=u+1v6N#}-O}J_%RE)_BxhmClZdOv0jO$0)%AEc
ze|Be+FNW#V0(^5Jes;NbH!9p(kf|KS=`TmjGtzk>-gK@YfS9xT(0kpW*EDjYUkoj!
zE49{7H&E}k%5(>sM4uGY)Q*&3>{aitqdNnRJkbOmD5Mp5rv-hxzOn80QsG=<y&iAv
zoygUqB(HTOw-D%a7G$=rjE8g{ZQXwB7#B8Wxwbz08Jsb0u509=?`<rrdnI^FIQeST
zajiSMO#8sNw9ue(d(mgN_gC&Vg<qYQ+k22&7!tdVX?_7@F@`@;me)sGM-^Ywu1rH7
zrh<OEbzwuL!xTCj@ogj=wajI}heZh^mL#4*plBwGap)3#yRP80rCsAW+D2zjCMM5q
zqlNo=Si)901Ml@}Ixwm^bC{eJIZ?9!vFEj>HJ_atI-EaP69cacR)Uvh{G5dTpYG7d
zbtmRMq@Sexey)||UpnZ?;g_KMZq4IDCy5}@u!5&B^-=6yyY{}e4Hh3ee!ZWtL*s?G
zxG(A<f#J^YQ1Cz#m-<*_U8HvcG@jc-yMVZp(Zo}py?|jD+4D`Fd+W<A%;vg-apbky
zCI&lkC9TywfFKW;HsiG-H-QDFbT8RZIi@8evyVwL`-aRfT@rSZ(^#qGvae0S2@BTa
z!i>!<FWySf`?H|6p^KKhe*MH{y8K^`R9uZ{0qEqFRq4ez&thQ*WY!<HUw}@VSbJ69
zLD1)><9o!CL+q?u_utltPMk+hn?N2@?}xU0KlYg?Jco{Yf@|mSGC<(Zj^yHCvhmyx
z?OxOYoxbptDK()tsJ42VzXdINAMWL$0Gcw?G(g8TMB)Khw_|v9`_ql#pRd2i*?CZl
z7k1b!jQB=9-V@h%;Cnl7EKi;Y^&NhU0mWEcj8B|3L30Ku#-9389Q+(Yet0r$F=+3p
z6AKOMAIi|OHyzlHZtOm73}|ntKtFaXF2Fy|M!gOh^L4^62kGUoWS1i{9gsds_GWBc
zLw|TaLP64z3z9?=R2|T6Xh2W4_F*$cq>MtXMOy&=IPIJ`;!Tw?PqvI2b*U1)25^<2
zU_ZPoxg_V0tngA0J+mm?3;OYw{i2Zb4x}NedZug!>EoN3DC{1i)Z{Z4m*(y{ov2%-
zk(w>+scOO}MN!exSc`TN)!B=NUX`zThWO~M*ohqq;J2hx9h9}|s#?@eR!=F{QTrq~
zTcY|>azkCe$|Q0XFUdpFT=lTcyW##i;-e{}ORB4D?t@<rUy??=TuYp_*>SfqGo_cS
z->?^rh$<&n9DL!CF+h?LMZRi)qju!meugvxX*&jfD!^1XB3?E?HnwHP8$;uX{Rvp#
zh|)hM>XDv$ZGg=$1{+_bA~u-vXqlw6NH=nkpyWE0u}LQjF-3NhATL@9rRxMnpO%f7
z)EhZf{PF|mKIMFxnC?*78(}{Y)}iztV12}_OXffJ;ta!fcFIVjdchyHxH=t%ci`Xd
zX2AUB?%?poD6Zv*&BA!6c5S#|xn~DK01#XvjT!w!;&`lDXSJT4_j$}!qSPrb37vc{
z9^NfC%QvPu@vlxaZ;mIbn<z7Vac;-rGaZpnh<SqY8Q9CG{=8AL&W;*Sy0lmLjV&JM
zXa)osQ>-VHA6miwi8qJ~V;pTZkKqqOii<1Cs}0i?uUIss;hM4dKq^1O35y?Yp=l4i
zf{M!@QHH~rJ&X~8uATV><23zZUbs-J^3}$IvV_ANLS08>k`Td7aU_S1sLsfi*C-m1
z-e#S%UGs4E!;CeBT@9}aaI)qR-6NU@kvS#0r`g&UWg?fC7|b^_HyCE!8}nyh^~o@<
zpm7PDFs9yxp+byMS(JWm$NeL?DNrMCNE!I^ko-*csB+dsf4GAq{=6sfyf4wb>?v1v
zmb`F*bN1KUx-`ra1+TJ37bXNP%`-Fd`vVQFTwWpX@;s(%nDQa#oWhgk#mYlY*!d>(
zE&!|ySF!mIyfING+#%RDY3IBH_fW$}6~1%!G`s<xV|$thPk-h^=fMv&Hnp;VPWb4H
zXg`{=`?M7=Dq8myqz|0%?*$bn?$egRMQTPls(~O?p^=8tlp~~ufW)FLrAIKI*rXSW
zW3!I>uHub1kP@&DoAd5~7J55;5_noPI6eLf{t;@9Kf<{aO0`1WNKd?<)C-|?C?)3s
z><QEhe||>wEq@8=I$Wc~Mt$o;g++5qR+(6wt9GI~pyrDJ%c?gPZe)owvy^J2S=+M^
z&WhIE`g;;J^xQLVeCtf7b%Dg<YLp9$rJl%g{x?f$ghgkcL$GZMdvMR@u|x}I{Qe9_
z&q1ULjNa6Q(nZR+2Nc7yG$v_t1HN@ezTla8$YpCXrW3pKiQm{R;n=1<rvBfU^9P{3
z@$nqa83WF+{OCA+1Zn*g;2x4@KoiX%brVdz6t^EGHy~>#Z2gq9hp_%g)-%_`y*zb;
zn9`f`mUPN-Ts&fFo(aNTsXPA|J!TJ{0hZp0^;<tHD4nK@wPbS|=fM$wSV$taTPGqt
zGB^u*%|y@PNxElDVJ;aR!0wT&iI7kZpng0zO52HM*WmK30Q~Yu);w=*5<AVVovc^R
z`k-Z;-8;PJFrU7VpM3N7QZ`+O#qh*wm2>MYHLOcD=r_~~^ymS8KLCSeU3;^QzJNqS
z5{5rEAv#l(X?bvwxpU;2%pQftF`YFgrD1jt2^~Mt^~G>T*}A$yZc@(k9orlCGv&|1
zWWvVgiJsCAtamuAYT~nzs?TQFt<1LSEx!@e0~@yd6$b5!Zm(FpBl;(<fB3D_;m2?l
z3de#U|K3raz4D?vBz^xW?Wg=mvwNg@|1i>Cn>2vF<?km-o@xWuhxn3bs$Pljx=>?k
zOm#TTjFwd2D-CyA!mqR^?#Uwm{NBemP>(pHmM}9;;8`c&+_o3#E5m)JzfwN?(f-a4
zyd%xZc^oQx3XT?vcCqCX&Qrk~nu;fxs@JUoyVoi5fqpi&bUhQ2y!Ok2pzsFR(M(|U
zw3E+kH_zmTRQ9dUMZWRE%Zakiwc+lgv7Z%|YO9YxAy`y28`Aw;WU6HXBgU7fl@dnt
z-fFBV)}H-gqP!1;V@Je$WcbYre|dRdp{xt!7sL3Eoa%IA`5CAA%;Wq8PktwPdULo!
z8!sB}Qt8#jH9Sh}QiUtEPZ6H0b*7qEKGJ%ITZ|vH)5Q^2m<7o3#Z>AKc%z7_u`rXA
zqrCy{-{8;9>dfll<T^QC7i-!Fb6U7Jr)|#XOupnl(tkS3y$lcK{_fXxPcyuknfQ~x
zf@~St3JeO(?cJD*9%zow(<yIgW%x$m#slX3pj{at{@6iEH?BdH^RYnm8&dJ7wK$@@
zVWq~nxej{11A23OWBxqf9N%DH_7R<7fAS~Y3ol-7Pi{v{|9EqM&L`?kzu+YCrvBtt
z_D%ic$wLdbBkX0psXy+e8ZxCG;Pms~Doa?=r+ky&_1GWZ)usQYvh=^J`X>Lu$^M5L
z-hXs))h*qz%~ActwkIA(qOVBZl2v4lwbM>9l70Y`+T*elINFqt#>OaVWoja8RMsep
z6Or3f=oBnA3vDbn*+HNZP?8LsH2MY)x%c13@(XfuGR}R?Nu<|07{$+Lc3$Uv^I!MQ
z>6qWgd-=aG2Y^24g4{Bw9ueOR)(9h`scImD=86dD+M<j=UE|C;@sK-I;*&dQ=%}gk
z)B!@EvJAu)BjncrBD%^q6<)oeX~UkPqgBXuU#=iDAF)wuM3*6$<L0BUP6j>nSN4$6
z^U*o_mE-6Rk~Dp!ANp#5RE9n*LG(Vg`1)g6!(XtDzsov$Dvz|Gv1WU68J$CkshQhS
zCrc|cdkW~UK}5NeaWj^F4MSg<F<s`^q0<TvPF|H0&oNb>FM+@fJd{|LLM)}_O<{rj
z+?*Lm?owq?IzC%U%9EBga~h-cJbIu=#C}XuWN>OLrc%M@Gu~kFEYUi4EC6l#PR2JS
zQUkGKrrS#6H7}2l0F@S11DP`@pih0WRkRJl#F;u{c&ZC{^$Z+_*lB)r)-bPgRFE;*
zl)@hK4`tEP=P=il02x7-C7p%l=B`vkYjw?YhdJU9!P!jcmY$OtC^12w?vy3<<=tlY
zUwHJ_0lgWN9vf>1%WACBD{UT)1qHQSE2%z|JHvP{#INr13jM}oYv_5#xsnv9`)UAO
zuwgyV4YZ;O)eSc3(mka6=aRohi!HH@I#xq7kng?Acdg7S4vDJb6cI5fw?2z%3yR+|
zU5v@Hm}vy;${cBp&@D=HQ9j<G=bG8X+ilNJ?RJXvDOEMBde)25_E~7I?MU+6ykbEe
zwlwWZTbqdW7A20%*{o<J`$q1@Ycld!(_(EqnYMdl&`5dkZIC_te`M|#=Iw~8P<CJb
zRB_sFh_lP4SX6pZnM=9HIz|6*yQoYN$ysd{HU9aoSvP2U?umOV9m0QY=>7NcFaOYL
zj-wV=eYF{|XTkFNM2uz&T8uH~;)^Zo!=KP)EVyH6s9l1~4m}N%XzPpduPg|h-&lL`
zAXspR0YMOKd2yO)eMFFJ4?sQ&!`dF&!|niH*!^*Ml##o0M(0*uK9&yzekFi$+mP9s
z>W9d%Jb)PtVi&-Ha!o~Iyh@KRuKpQ@)I~L*d`{O8!kRObjO7=n+Gp36fe!66neh+7
zW*l^0tTKjLLzr`x4`_8&on?mjW-PzheTNox8Hg7Nt@*SbE-%kP2hWYmH<as3s;3dB
zGF)lQb4*{W{s~m$kJ_;7j;cfOyu}B&y0s+jVVv$_H@egmCSN7X?3gk9bYo6swHDQ9
zg-L}N$+=uhC+gRRN)XP@3cO>u#Fn@Q^J(SsPUz*|EgOoZ6<W=Bo)J0Q;m559tyuE#
zLg%v9lH_9r;=_EOdj#0`D7^XXPL;8V>byg3ew88UGdZ>9B2Tq=jF7<EJ!TXj@;|w{
zdf7ZfHx+mvI`W&PIP#=oO`B12md1xam~79(oqs4UUMnyRq{81HXVL2E;h(%Ol(A~}
z^n4*)dGf~yP6-Dv!SSnD?Mdu}C3S%8f7rg+6A3U%FuEXLg<+Iwh%-7NKl@rQpvaJ}
zHwX`+=9DZH9MoIn^aYb`vA~19+Y@$$L7>2ZaR=4u%1A6Vm{O#?@dD!(#tmR;eP(Fu
z{$0O%=Vmua7=Gjr8nY%>ul?w=FJ76O2js&17W_iq2*tb!i{<q|g+F8+dEk=7I*b$k
zfHy1#iZ?<b)WRJw_Q;_?7Qr1x1fOwWj3fU+i95=;^viGx>pt#`qZB#im9Rl>?t?0c
zicIC}et_4d+CpV<WYvG+Qy=M4fqRlShrB0ABj<1vxR!nk?HzgR{1Zy7dT(ql^LGHk
zbtwjlkw%2Sz_=?Ev5<S4+oS_d`MXZIuh9f&=WusVxCg&4M6SulVC6tXa%y3~fy$$=
zgaqCG;I2JkQp{af=&tkR1)k?Mq*~2KarL#o{N9l8`n2Q*{dFn2Aqheuy5pK*5~@dn
zAUq?gaZTTGiAPWtrINms0FE~Rk&J-igF4wai(k+!<AvEH>Px)i4~$u6N-QX3H77ez
z?ZdvXifFk|*F8~L(W$OWM~r`pSk5}#F?j_5u$Obu9lDWIknO^AGu+Blk7!9Sb;NjS
zncZA?qtASdNtzQ>z7N871IsPAk^CC?iIL}+{K|F@BuG2>qQ;_RUYV#>hHO(HUPpk@
z(bn~4|F_jiZi}Sad;_7`#4}EmD<1EiIxa48QjUuR?rC}^HRocq`OQPM@aHVKP9E#q
zy%6bmHygCpIddPjE}q_DPC`VH_2m;Eey&ZH)E6xGeStOK7H)#+9y!%-Hm|QF6w#A(
zIC0Yw%9j$s-#odxG~C*^MZ?M<+&WJ+@?B_QPUyTg9DJGtQN#NIC&-XddRsf3n^AL6
zT@P|H;PvN;ZpL0iv$bRb7|J{0o!Hq+S>_NrH4@coZtBJu#g8#CbR7|#?6uxi8d+$g
z87apN>EciJZ`%Zv2**_uiET9Vk{pny&My;+WfGDw4EVL#B!Wiw&M|A8f1<o!4D>A@
z(yFQS6jfbH{b8Z-S7D2?Ixl`j0{+ZnpT=;KzVMLW{B$`N?Gw^Fl0H6lT61%T<G)JV
zFxXraywnpF6xC3GQdEFWGnwf8cSTaqeK41;?*^^tH^znLzqXnF%VFT3@UDLz31Yt~
zt1AL1yu0;x;(?~W6+jJ9LrfK`D&ByIA}l1-7&U_j+YQ~7z`JkDZjlblA8d}I;WH{g
zC0ES-Qvh<>2AU**!sX0u?|I(yoy&Xveg7XBL&+>n6jd1##6d>TxE*<Ar(sc(Bu^|z
z9hrl)GNg{$efJd|)cea$o#jV;Q4r8b+A}r|>Vj=8lWiG$4<VK5A=k4M5~-nvjP-{O
zV8pcf=E2RAG{W@WaSbt<oK%uC(9#~x&_$sDRj@|UZmCgRQbRy`>=u{1UbAa5QD>5_
z;Te^42v7K6Mmu4IWT6Rnm>oxrl~b<~^e3vbj-GCdHLIB_>59}Ya+~OF68NiH=?}2o
zP(X7EN=quQn&)fK>M&kqF|<_*H<cwCuNRp|+zL#!8ahs~;&EDeLAe8)G*^PjIAy0l
zK-!LhT}2?RS2cld8@7BXA8OL=0Ov9pNm3Zz3)LmJLDvDNjh52-LPTzuVhjZ)*F~32
z){Y^W2Jp7@2l};<g80X*y6xQ=?e?^N18tu9n%iDKPIA*?LsU4H8AEjezYO`=Z>`}c
zk=+x)GU>{Af#vx&s?`UKUsz})g^Pc&?<rGKpJnw3;kV`E!|r0J-GJ}YEK3ik6lvJ?
zLkm)B;+6)qz)}5@`>Ka@t5$n$bqf6{r1>#mWx6Ep>9|A}VmWRnowVo`OyCr^fHsf#
zQjQ3Ttp7y#iQY8l`zEUW)(@gGQdt(~rkxlkefskT(t%@i8=|p1Y9Dc5bc+z#n$s13
zGJk|V0+&Ekh(F};PJzQKKo+FG@KV8a<$gmNSD;7rd_nRdc%?9)p!|B-@P~kxQG}~B
zi|{0}@}zKC(rlFUYp*dO1RuvPC^DQOkX4<+EwvBAC{IZQdYxoq1Za!MW7%p7gGr=j
zzWnAq%)^O2$eItftC#TTSArUyL$U54-O7e|)4_7%Q^2tZ^0-d&3J1}qCzR4dWX!)4
zzIEKjgnYgMus^>6uw4Jm8ga6>GBtMjpNRJ6CP~W=37~||gMo_p@GA@#-3)+cVYnU>
zE5=Y4kzl+EbEh%dhQokB{gqNDqx%5*qBusWV%!iprn$S!;oN_6E3?0+umADVs4ako
z?P+t?m?};gev9J<xrvMj?JFjsZtWf-quiC#u!BU{j|Z+>XQ#Q&KBpzkHPde_CGu-y
z<{}RRAx=xlv#mVi+Ibrgx~ujW$h{?zPfhz)Kp7kmYS&_|97b&H<SL`_{AO<9v%D@8
z77}Y!`#c~v^P+jNiCZgjk$Eu}e?ht~^R`2pg1iPEhXjZVjl-b|*N?0??d5-7i{PRl
z3g-#j3NiART8({yLdUJE-H38|G`rTLl78)2#f9E)ErZoi-Fv`N>&1;J-mzrBWAvY}
zh8-I8hl_RK2+nnf&}!W0P+>5?<Hy2Ocrq-T%g(e-iJ80Q4bGbph6Yn^Ms~*iS%y{)
zR2+@$12xU46My)mb>#?7>npshe<1~&l_xqKd0_>dl_^RMRq@-Myz&|TKZBj1=Q())
zF{dBjv5)h=&Z)Aevx}+i|7=R9rG^Di!sa)sZCl&ctX4&LScQ-kMncgO(9o6W6)yd<
z@Rk!vkja*X_N3H<e&P>=BavGoR0@u0<}m-7|2v!0+2h~S2Q&a=lTH91OJsvms2MT~
zY=c@LO5i`mLpBd(vh|)I&^A3TQLtr>w<oiU80F37l%jO+9L*(6rNJUMQj^mVFrb+K
zbGro$m)k-Mjv2y`V6hi@N1PB7T=%YP1zSAYt&?4uC<+;v72DJZ+TM4vL%d*d?N7Xm
zm~6OL8)rh0XIoR7pN2ODrL%*K0lO((1E{nb4eXnWhR0-4)N_A|nFyFl!4Fa367d3@
z5ruJel)z&kDcd>=zoyzTd=^f@TPu&+*2M<c+GXcqi<cQ#^OejZI|Po8an{Oh-2ytX
zK$MlFe&+@V&gTQgY2e7YqN66POe*A5=RfoUd8+16QdDQgjc}%@)Xu?E)Qo-5tDtuz
z4rP5$Edgx(g_-m&v|zI|MckDZ-*>tqE$Avf>l>}V|3-8Fp2hzo3y<)hr_|NO(&oSD
z!vEjTWBxbKTiShVl-U{n*B3#)3a8$`{~Pk}J@elZ=>Pqp|MQ}jrGv7KrNcjW%TN_<
z<z)esuQW6ysSYp|l#vPogjN7FRRzUSYY_7@QvtoS=9E#^iV5{mHb2N$06kv?{KQ4Y
z{TIb}bD_}cTt+x=_xX$O`O??h@892&xEZqrh{KpSgAqXMBaR^COdOFm;FKQkZc`(c
zwDTDp)<-#gdF+f;!ecTz69+_etlx5gTTYuJs36}MFftQ@Rn)MRhY91bCzTEgj4fv-
z1m@JGpa{H2uzVIbIvR(+jPWIY>Zz8kG{#}XoeWf7qY?D)L)8?Q-b@Na&>i=)(@uNo
zr;cH98T3$Iau8Hn*@vXi{A@YehxDE2zX~o+RY`)6-X{8~hM<uAyYp&U>pc#C`|8y>
zU8Mnv5A<tzpBv6FvrIokz@rbXa#{jdGJP~6p^wT|HfyYaG;wVV>0dNCf{Ims*|l-^
z(MRp{qoGohB34|ggDI*p!Aw|MFyJ|v+<+E3brfrI)|+l3W~CQLPbnF@G0)P~L<BK0
zSRP{4S$9zWWM`Nd;Q6_XmCkEyF=0l#GeYa7+r&_CD~4h2$_LU;yCc{i*o}5aXnx3N
zHqrCmEq3l-{2sjER%{`iHdHZ!Iy}l{>y!1TJLp}xh8uW`Q+RB-v`MRYZ9Gam3cM%{
zb4Cb*f)0deR~wtNb*8w-LlIF>kc7DAv>T0D(a3@l`k4TFnrO+g9XH7;nYOHxjc4lq
zMmaW6qpgAgy)MckYMhl?>sq;-1E)-1llUneeA!ya9KM$)DaNGu57Z5aE>=VST$#vb
zFo=uRHr$0M{-ha>h(D_boS4zId;3B|Tpqo|?B?Z@I?G(?&Iei+-{9L_A9=h=Qfn-U
z1wIUnQe9!z%_j$F_{rf&`ZFSott09gY~qrf@g3O=Y>vzAnXCyL!@(BqWa)Zqt!#_k
zfZHuwS52|&&)aK;CHq9V-t9qt0au{$#6c*R#e5n3rje0hic7c7m{kW$p(_`wB=Gw7
z4k`1Hi;Mc@yA7dp@r~?@rfw)TkjAW++|pkfOG}0N|2guek}j8Zen(!+@7?qt_7ndX
zB=BG6WJ31#F3#Vk3=aQr8T)3`{=<slU+RdlO4Hx0LKNQR4%csKlqXTo6ajrnOY1?l
z2r$(|0XiBb*T4;#8^X*fOz~r=4-{-Rg2n@oH;R!)WGF~o7e;4%=egC+*SUH9@8hON
zRPT>p9nBHlKzE0I@v`{vJ}h8pd6vby&VgFhzH|q;=aonunAXL6G2y(X^CtAhWr*jI
zGjpY@raZD<b_G8JA5s~o@XVViP=?1H?fxk4Pq8R3l2eNln--&c-a(Has8}t#E^(Q*
z=etk{kVRr~2G*+i5b{q+oG(h}R?d-3m0XJJnzvrMZ{1Tcuc{eb>Qkg*aMq}Ni6cRF
z{oWv}5`nhSAv>usX}m^GHt`f(t8@zHc?K|y5Zi=4G*UG1Sza<E8z;l0@bYZ=%a=Vj
z;(n{V1K(1!(<%HdezN^efpP}6_GMFH7m;Wi+()}?4ujb&c~IZ9n3_46*IsTeu9}IF
zAHtU!f4FyUb=kmL3?2I)J-&6Gd2ry1tzU??1iAVB#U4q&;ymb8Acc3xb>{$Dpj%X8
zzEXaKT5N6F5j4J|w#qlZP!zS7BT)9b+!ZSJdToqJts1c!)fwih4d31vfb{}W)EgcA
zH<Fzt5KT4ycl;#zc0!>2pZ^8_k$9+WD<i98{Ka+NY@mr?q>2n`6q5XbOy8>3pcYH9
z07eUB+p<MBNmyg&c4=0;V0B;H%kvu8{sr|yy1~@CobFcUpM3np-7P6;)H5)%*}VV!
zs>}YD@AH!}p!iKv><2QF-Y^&xx^PAc1F13A{nUeCDg&{hnix#FiO!fe(^&%Qcux!h
znu*S!s$&nnkeotYsDthh1d<XHQ3s(h4m+vOMx>q(iQrE|#f_=xVgfiiL&-5eAcC->
z5L0l|DVEM$#ulf{bj+Y~7iD)j<~O8CYM8GW)dQGq)!mck)Fq<!^H$Md3d7YY>oL^X
zwNdZb3->hFrbHFm?hLvut-*uK?zXn3q1z|UX{RZ;-WiLoOjnle!xs+W0-8D)kjU#R
z+S|A^HkRg$Ij%N4v~k`jyHffKaC~=wg<B%ejScY(fj1p_Et27-otoLjL&tKK?8UFN
z%LmnQSnbvpU~;3CWrogVy$oe+4WUkv3SFe(IPiTs$quv+%sU!wurQ6_fZ24IJohEM
zcoKJZay#47ydH__P37To$-Zc()PCOL+72Tm7bmvHtaIu(yG&E4_6jcPE=`5js7(E{
zHf(+WB2w4d@46GMBedn8XLGQp(O+G%3$)&`I%c&|x#vNWkyh%{DGUV$KZ2p<j&Y}k
z)Hs|`mlvf!{5N2bF{_PGj>=9)V5h=|kLQ@;^<Ah@>W!o2^K+xG&2n`XCd>OY5Ydi=
zgHH=lgy++erK8&+YeTl7VNyVm9-GfONlSlVb3)V9NW5tT!cJ8d7X)!b-$fb!s76{t
z@d=Vg-5K_sqHA@Zx-L_}wVnc@L@GL9_K~Zl(h5@AR#FAiKad8~KeWCo@mgXIQ#~u{
zgYFwNz}2b6Vu@CP0XoqJ+dm8px(5W5-Jpis97F`+KM)TuP*X8H@zwiVKDKGVp59pI
zifNHZr|B+PG|7|Y<*tqap0CvG7tbR1R>jn70t1X`XJixiMVcHf%Ez*=xm1(CrTSDt
z0cle!+{8*Ja&EOZ4@$qhBuKQ$U95Q%rc7tg$VRhk?3=pE&n+T3upZg^ZJc9~c2es%
zh7>+|mrmA-p&v}|OtxqmHIBgUxL~^0+cpfkSK2mhh+4b=^F1Xgd2)}U*Yp+H?ls#z
zrL<PO4@qqmi4_%|jPx)N+G{$0%%C1sw{T2fligwqmFd}O+TemcgfxBHvt~23Bx!g6
zxl(O6;y4BH9zTxeA;{A3a_g71v+`o{0uNyu^e>xWg<ZgPjZmPtQ00F}!Yn5nf)<mA
zPThc#yhGf@^9{9a3jZx|NAA<vxc>_hm}AfK2XYWr!rzW4g;+^^&b<P<GfK{gLe<5#
zz<cH|<aY5Fl~>W%LmbtRai9f3PjU${r@n`JThy-cphbcwn)rq9{A$Ht`lmYKxOacy
z6v2R(?gHhD5@&kB-Eg?4!hAoD7~(h>(R!s1c1Hx#s9vGPePUR|of32bS`J5U5w{F)
z>0<^ktO2UHg<0{oxkdOQ;}coZDQph8p6ruj*_?uqURCMTac;>T#v+l1Tc~%^k-Vd@
zkc5y35jVNc49vZ<e37Ty%GD$DqTd&uKFEzb4j%X5FO|fqPqoGYc%Ro7*qb9?JK#sE
zI2o9q*t*5>pZx;gG$h{%yslDI%Lqga1&&;mN{Ush1c7p>7e-(zp}6E7f-XmJb4nhk
zb8zS+{IVbL$QVF8pf8}~kQ|dHJAEATmmnrb_wLG}-yHe><YsE2_~l#l9buQgFXI0`
z(u#b`J=xeBn*3{z^^KAJhXQfvz6EP5l^cD~&vo$LApQd(9gm=munnZ7Bo%LVbi4uK
zNXnx%%rjW{zE{2bapVCkVel~q0upm?=gb{+Eu=B+Z46t{KAKTo1TyYq%j=)TaZP<&
zIfR5WHOe}iiPn?Y<W*8!U(>W|A&Y|;muy-d^t^<&)g5SJfaTH@P1%euONny=mxo+C
z4N&w#biWY41r8k~468tvuYVh&XN&d#%QtIf<GZUR`2QH9h^d*OtBuRQhWwr4nLC*}
zJIh#pCwzAQa(pUP-B<pHxsDxMcBm<`k^}{cmcTX^FsUjvw57E+0Tz}NDT+w-9BC))
zHeGkeroi7YzPFY1zKi5#bbT&jA=fhB<;*YQFRw+++(kz*-d7|)7ibRL<jGF<*B$4+
z`|k6bU2=c_Psjo4w+RtodzK>9;iVXfWY)<X+W}7GbATCgQU`%LT~<fPB3X>#j=<c2
zHd&Dex04~>l`&B~lqDT@28+Y!0E+MkfC}}H*#(WKKdJJq=O$vNYCb(ZG@p{fJgu;h
z21oHQ(14?LeT>n5)s;uD@5&ohU!@wX8w*lB6i@GEH0pM>YTG+RAIWZD;4#F1&F%Jp
zXZUml2sH0!lYJT?&sA!qwez6cXzJEd(1ZC~kT5kZSp7(@=H2$Azb_*W&6aA|9iwCL
zdX7Q=42;@dspHDwYE?miGX#L^3xD&%BI&fN9^;`v4OjQXPBaBmOF1;#C)8XA(WFlH
zycro;DS2?(G&6wkr6rqC>rqDv3nfGw3hmN_9Al>TgvmGsL8_hXx09};l9Ow@)F5@y
z#VH5WigLDwZE4nh^7&@g<bkZm_Vh{ln0@+)lYuu~qeXc#?JCYylKGH|9+kWD0ocxF
z5$1kjN2>{1FV^UZ%_LJ-s<{HN*2R$OPg@R~Z`c-ET*2}XB@9xvAjrK&hS=f|R8Gr9
zr|0TGOsI7RD+4+2{ZiwdVD@2zmg~g@^D--YL;6UYGSM8i$NbQr4!c7T9rg!8;TM0E
zT#@?&S=t>GQm)*ua|?TLT2ktj#`|R<_*FAkOu2Pz$wEc%-=Y9V*$&dg+wIei3b*O8
z2|m$!jJG!J!ZGbbIa!(Af~oSyZV+~M1qGvelMzPNE_%5?c2>;MeeG2^N?JDKjFYCy
z7SbPWH-$cWF9~fX%9~v99L!G(wi!PFp<!s7j4q$86J>>rB!9xj7=Cv<q}(vRw+mcj
z#YR4HX>|F+7CsGNwY0Q_J%FID%C^CBZQfJ9K(HK%k31j~e#&?h<VT6q$5mgm6*^>Q
zNuD6gR<d7v<P!_&8<dm-?#ek*zL2)u8J2l%4_z-z?)QXK(1d9d>kVckU)v+53-fc}
z7ZCzYN-5RG4H7;>>Hg?LU9&5_aua?A0)0dpew1#MMlu)LHe(M;OHjHIUl7|%%)YPo
z0cBk;AOY00%Fe6heoN*$(b<)Cd#^8Iu;-2v@>cE-OB$icUF9EEoaC&q8z9}jMTT2I
z8`9;jT%z0;dy4!8U;GW{i`)3!c6&oWY`J3669C!tM<5nQFFrFRglU8f)5Op$GtR-3
zn!+SPCw|04sv?%YZ(a7#L?vsdr7ss@WKAw&A*}-1S|9~cL%uA+E~>N6QklFE>8W|%
zyX-qAUGTY1hQ-+um`2|&ji0cY*(qN!zp{YpDO-r>jPk*yuVSay<)cUt`t@&FPF_&$
zcHwu1<M$nsSpFX&={p8_cnZ3@SbW>(SQ`I-l8~vYyUxm@D1UEdFJ$f5Sw^HPH7b!9
zzYT3gKMF((N(v0#4f_jPfVZ=ApN^jQJe-X$`A?X+vWjLn_%31KXE*}5_}<jt4v>d8
zw_B1+a#6T1?>M{ronLbHIlEsMf93muJ7AH5h%;i99<~JX^;EAgEB1uHralD*!aJ@F
zV2ruuFe9i2Q1C?^^kmVy921eb=tLDD43@-AgL^rQ3IO9%+vi_&R2^dpr}x{bCVPej
z7G0-0o64uyWNtr*loIvslyo0%)KSDDKjfThe0hcqs)(C-MH1>bNGBDRTW~scy_{w}
zp^aq8Qb!h9Lwielq%C1b8=?Z=&U)ST&PHbS)8Xzjh2DF?d{iAv)Eh)wsUnf>UtXN(
zL7=$%YrZ#|^c{MYmhn!zV#t*(jdmYdCpwqpZ{v&L8KIuKn`@IIZfp!uo}c;7J57N`
zAxyZ-uA4=Gzl~Ovycz%MW9ZL7N+nRo&1cfNn9(1H5eM;V_4Z_qVann7F>5f>%{rf=
zPBZFaV@_Sobl?Fy&KXyzFDV*FIdhS5`Uc~S^Gjo)aiTHgn#<0C=9o-a-}@}xDor;D
zZyZ|fvf;+=3MZd>SR1F^F`RJEZo+|MdyJYQAEauKu%WDol~ayrGU3zzbHKsnHKZ*z
zFiwUkL@DZ>!*x05ql&EBq@_Vqv83&?@~q5?lVmff<cLHceB8mp&F*ZBX}B`|c^idP
zv6n-=r1Y%9B2=MA)BHjW-LyT@+x?-|)~^RdTE*Wmt4T{X?yOR<8KMVy`_8)0^!&oF
z0$q#{$B8*<%lm210;{(CF7N)1MYU#>QZ+V-=qL+!u4Xs2Z2zdCQ3U7B&QR9_Iggy}
z(om{Y9eU;IPe`+p1ifLx-XWh?wI)xU9ik+m#g&pGdB5Bi<`PR*?92lE0+TkRuXI)z
z5LP!N2+tTc%cB6B1F-!fj#}>S!vnpgVU~3!*U<jq0(*nRRh2NkSzq|ekHqi@I{QJ4
zs$%Xz%L?KbVmRwJFka>1ej^)vjUH4s-bd^%B=ItQqDCGbrEzNQi(dJ`J}-U=2{7-d
zK8k^Rlq2N#0G?9&1?HSle2vlkj^KWSBYTwx`2?9TU_DX#J+f+qLi<D9B#g}%V$md`
zk~Ild*}viiyy2C_=6_!CJ#a=26@mjLnII|qn1r<r{`_L^h_&EQU1CrT23vw`5=3<h
zG{v(Q@`P7B9h;CVcDSU+D|~oo@NN9}HbK0D{0!wcrl#V%CP?`IzvTa!#*S)2d1$Yu
z@{MclH9z5OOC5<wLIO8&=t)9CZ5Tx0LQn&eG~9xag*+PbY)P9)O3G<cNK?wZHK1E)
zN?i&=N*5N8I0pp^Xra6>ZCqY1TXHFxXZqYMuD@RU$TgcnCC{_(vwZ-*uX)~go#%PK
z@}2Km_5aQ~(<3cXeJN6|F8X_1@L%@xTzs}$_*E|a^_URF_qcF;Pfhoe?FTFwvjm1o
z8onf@OY@jC2tVcMaZS;|T!Ks(wOgPpRzRnFS-^RZ4E!9dsnj9sFt609a|jJbb1Dt@
z<=Gal2jDEupxUSwWu6zp<<&RnAA;d&4gKVG0iu6g(DsST(4)z6R)zDpfaQ}v{5ARt
zyhwvMtF%b-YazR5XLz+oh=mn;y-Mf2a8>7?2v8qX;19y?b>Z5laGHvzH;Nu9S`B8}
zI)qN$GbXIQ1VL3lnof^6TS~<qSuZSMrS`^DczIf6i8zZ|)TzXBEwW6N#TL3wy;JuH
z4sUyCR`^Gi%H4xvNHCSXsz>rvPVg4V?Dl2Bb*K2z4E{5vy<(@@K_cN@<xbtRT8JEV
z@9ePJQ{ePgXbdj2UeTj`YQ3sQ`t(|5O?8jf1qY=&T$N1)Psvl`6fu>U>R!>aUIRnb
zL*)=787*cs#zb31zBC49x$`=fkQbMAef)L2$dR{)6BAz!t5U_B#1zZG<T23Y;GnC8
z(`aO7qQGuUkmmk=Z)LZ+)_Z;JWly1@9NQ+>`^neKSS22oJ#5B=gl%U=WeqL9REF2g
zZnfCb0?quf?Ztj$VXvDSWoK`0L=Zxem2q}!XWLoT-kYMOx)!7fcgT35uC~0pySEme
z`{wGWTkGr7>+Kb^n;W?BZH6ZP(9tQX%-7zF>vc2}LuWDI(9kh1G#7B<aO|K2FCIJg
zDao72kQAHigp@^v;eK5Vo($1jE5?KxIjn^mY57t?Pj)^$12KtO8GI3M1Ri51g3-Iv
zq`DO&g5CWDnjs~ec$i^VmaK4aG_*NghV8~x3dXdPE^36>99r4x6;_-V+k&c{nPUrR
zAXJGRiMe~aup{0qzmLNjS_BC4cB#sXjckx{%_c&^xy{M61xEb>KW_AG5VFXUOjAG4
z^>Qlm9A#1N{4snY=(AmWzatb!ngqiqPbBZ7>Uhb3)dTkSGcL#&SH>iMO-IJBPua`u
zo)LWZ>=NZLr758j{%(|uQuZ)pXq_4c!!>s|aDM9#`~1bzK3J1^^D#<2<N(j(---cE
zEy;>bNCccH7~-X}Ggi!pIIF>uFx%aPARGQsnC8ZQc8lrQ5o~smqOg>Ti^GNme94*w
z)JZy<k{OAaG~Q|lT7oS<g9V8QNt(KeJIt6&F{U!{MuJ?Xr0XzPZhzp~?qy+NBB<0G
zi_x*hCyRQ*l&365<#;!&Mnh*3`6R@-BoAUC&g|)}Bg;mxBDA&uy<fjp??k5JfO-|6
zv6$F+?VY$#@OP{;d=nLk^Vq&omh*v*bW;ukc`ca|*$h2}@kU)FNYh|cX2FdglBA{Z
zn4gmuD1Tgw4$4s2Q01t5<PSfg@h2F?GtlH6XQC>{_{#$jxG<QXLBP1mLo=v6>Q&`M
z!OMvZMHR>8*^>eS%o*6hJwn!l8VOOjZQJvh)@tnHVW&*GYPuxqXw}%M!(f-SQf`=L
z5;=5w2;%82VMH6Xi&-K3W)o&K^+vJCepWZ-rW%+Dc6X3(){z$@4zjYxQ|}8UIojeC
zYZpQ1dU{fy=oTr<4VX?$q)L<oUsl**eR4|Y=<jHUj;EzXPg2#85xDsCL@vKUk4!ok
zWGU;a1c@)SVKp{%lz7wz>P}IUmpiez^O&N3E_qPpchGTi5ZM6-2ScWlQq%V&R2Euz
zO|Q0Hx>lY1Q1cW5xHv5!0OGU~PVEqSuy#fD72d#O`N!C;o=m+YioGu-wH2k6!t<~K
zSr`E=W9)!g==~x9VV~-8{4ZN9{~-A9zJpRe%NGg$+MDuI-dH|b@BD)~>pPCGUNNzY
zMDg||0@XGQgw`YCt5C&A{_+J}mvV9Wg{6V%2n#YSRN{AP#PY?1FF1#|vO<FCmSeem
zsV>_%e+#`|2*~wGAJaeRX6=IzFNeWhz6gJc8+(03Ph4y6ELAm=AkN7TOgMUEw*N{=
z_)EIDQx5q22oUR+_b*tazu<k7qtKxTlmUW2Omzs&7j%!q->9+pX|n1c*IB-}{DqIj
z-?E|ks{o3AGRNb;+iKcHkZvYJvFsW&83RAPs1Oh@IWy%l#5x2oUP6ZCtv+b|q>jsf
zZ_9XO;V!>n`UxH1LvH8)L4?8raIvasEhkpQoJ`%!5rBs!0Tu(s_D{`4opB;57)pkX
z4$A^8CsD3U5*!|bHIEqsn~{q+Ddj$ME@Gq4JXtgVz&7l{Ok!@?EA{B3P~NAqb9)4?
zkQo30A^EbHfQ@87G5&E<g>QTd`frrwL)&Yw?%-W@uy^Gn23%j?Y!Iea2xw<-f;esq
zf%w5WN@E1}zyXtYv}}`U^B>W`>XPmdLj%4{P298|SisrE;7HvXX;A}Ffi8B#3Lr;1
zHt6zVb`8{#+e$*k?w8|O{Uh|&AG}|DG1PFo1i<Zus%ucO{sZ+tJd!u@5m`tVt$ecP
zHv;DLyGh!O(o#SF9Ho`t`aW6*4AonGVD-cOd49F6=odL=f13sFyII;4g$7X;P=IH_
z!H8wMi5nS$y>?Y*cQm$ZwtGcVgMwtBUDa{~L1KT-{jET4w60>{KZ27vXrHJ;fW{6|
z=|Y4!&UX020wU1>1iRgB@Q#m~1^Z^9<xy6Z(6L!p4YY56>CG1LqDhYBrnx%IEdIty
z!46iOoKlKs)c}<e-V4k`cP%zlS~*r)Iq=(n$n3YjsGj;U{v)@9x+s&RgYVsv=bVhB
z6KS0(1+6KVC4PB64#XkwbuM4|1~xHvpBvYVlWb?(pv$N|&u>newDG)rWUikD%j`)p
z_w9Ph&e40=(2eBy;T!}*1p1f1SAUDP9iWy^u^Ubdj21Kn{46;GR+hwLO=4D11@c~V
zI8x&(D({K~Df2<H8Q0|`g9v?%+ew{*)n&&V=&(8)k^`IVYv)Ef^74^<ekxt26g{<n
z=l9l$ysk3V&@j|Qbd9p}8=X<l&m>E)Nx_yQvYfh4<e?mHvB!$Y?%_59%1<FYEFc$b
z5ztP29y#%z;_YI`kp!lqW2R%wIG*IA1m!F1Kln&)2?~$S$Og+8eH`pJh?)s{O@cqa
zWUZ4w-ZTe!Iykv!<9ko1OVzNOZnowKP{&R2l9=@35YPW+JdW)5@C2juHH<g|8v*@b
z{zCv-5uA{lGB2+F9H+)uLjkGDsT%f9VUvf8ezafoEizvcl$?$h;@OxEC#U#_TL4w5
zDU~DSJxQ)LRv;^Z&wI+)=va(!yOlq(L+s>;MbMJ@Z}=Dt3_>iim~QZ*hZIlEs0mEb
z_54+&*?wMD`2#vsQRN3KvoT>hWofI_Vf(^C1ff-Ike@h@saEf7g}<9T`W;HAne-Nd
z>RR+&SP35w)xKn8^U$7))PsM!jKwYZ*RzEcG-OlTrX3}9a{q%#Un5E5W{{hp>w~;`
zGky+3(vJvQyGwBo`tCpmo0mo((?nM8vf9aXrrY1Ve}~TuVkB(zeds^jEfI}xGBCM2
zL1|#tycSaWCurP+0MiActG3LCas@_@tao@(<l?T*QEH-ae+wh*%6?VE!5DP~@|=`w
zUm(1<BPl}p=AbS7FTVaUy3(jy*M(D2#kTF4RBYR}of+Gx*jB~1QL*jJpu&o6JE?s6
z_S);Tw%)V%`7zq_d$iG?Hu~uO?$>R1ANlwB$4K53egNE_;!&(%@Qo$>h`^1S_!hN6
z)vZtG$8fN!|BXBJ=SI>e(LAU(y(i*PHvgQ2llulxS8>qsimv7yL}0q_E5WiAz7)(f
zC(ahFvG8&HN9+6^jGyLHM~$)7auppeWh_^zKk&C_MQ~8;N??OlyH~azgz5fe^>~7F
zl3HnPN3z-kN)I$4@`CLCMQx3sG~V8hPS^}XDXZrQA>}mQPw%7&!sd(Pp^P=tgp-s^
zjl}1-KRPNWXgV_K^HkP__SR`S-|OF0bR-N5>I%ODj&1JUeAQ3$9i;B~$S6}*^tK?=
z**%aCiH7y?xdY?{LgVP}S0HOh%0%LI$wRx;$T|~Y8R)Vdwa}kGWv8?SJVm^>r6+%I
z#lj1aR94{@MP;t-scEYQWc#xFA30^}?|BeX*W#9OL;Q9#WqaaM546j5j29((^_8Nu
z4uq}ESLr~r*O7E7$D{!k9W>`!SLoyA53i9QwRB{!pHe8um|aD<W*x(R=P_5zAElfw
zT7CEEr(t|!*czBsy>E`Cg0O*{jmor)^t)3`>V>SWN-2VJcFmj^1?~tT=JrP`fVh*t
zXHarp=8HEcR#vFe+1a%XXuK+)oFs`GDD}#Z+TJ}Ri`FvKO@ek2ayn}yaOi%(8p%2$
zpEu)v0Jym@f}U|-;}CbR=9{#<^z28PzkkTNvyKvJDZe+^VS2bES3N@Jq!-*}{oQlz
z@8bgC_KnDnT4}d#<rI9~4w*W=E-{rm^_cQeTd?VLxZpL;UgBY=7Y@N&83iL$n&#~M
zbsQBYt~+>&Cpr!%Yb?E!brx0!eVOw~;lLwUoz#Np%d$o%9scc3&zPm`%G((Le|6o1
zM(VhOw)!f84zG^)tZ1?Egv)d8cdNi+T${=5kV+j;Wf%2{3g@FHp^Gf*qO0q!u$=m9
zCaY`4mRqJ;FTH5`a$affE5dJrk~k`HTP_7nGTY@B9o9vvnbytaID;^b=Tzp7Q#DmD
zC(<aCT_(W?1O|cV&C;hpRo`~BN54GF$vUW?-%&gVawwY-k2~=6)`83yVnUbThqXoO
z#pJ&{AeMt+E`B_K+d;6!WS}aMu|XPUG^g7a(llBSlq>XEN)Ktn39z5|G!wsVNnHi)
z%^q94!lL|hF`IijA^9NR0F$@h7k5R^ljOW(;Td9grRN0Mb)l_l7##{2nPQ@?;VjXv
zaLZG}yuf$r$<79rVPp<j5%445ugcCYz(;(NT0N0@n{$og@`Uam4%uUaCP9*@QWGX9
z{P@Ag+Bgh5@F#Eg5Y9s1Tb4W8at(wr+7n>Xg?6iiieX|r#&`p#Con2i%S8*8F}(E)
zI5E6c3tG*<;m~<e=g`4E<@6ZZ8Ot+&-pVKoq@=)RHy9<I(`p<?)r&YNlEA8CnAU#=
zLQO*=y%_uKi|5n%djKteWf@r}R-KMkn1WGKj9GE)TB7@l$)5};KH)qNoDq}(AbK{}
znBj7g3J8U8H}w+i?7tr%6@z$7g2f*NiOc*m{3%|}PM)?==&#x$-Jq&uhpzZ8rtUDZ
zNmR^a5g(7wY6XKEPtNK>6>!&H!GJ6zEu<u;zM7UrmSD`Ps)7>hH7mkAzovdhLy;)q
z{H2*8I^Pb}xC4s^6Y}6bJvMu=8>g&I)7!N!5QG$xseeU#CC?ZM-TbjsHwHgDGrsD=
z{%f;@Sod+Ch66Ko2WF~;Ty)v>&x^aovCbCbD7>qF*!?BXmOV3(s|nxsb*Lx_2lpB7
zokUnzrk;P<R;aXTpYj?03<w4%%%E_Lx%w}?h6KFkYmQz_=Q!;KI~@zvyE@sz0~S{=
zc7Zp1Pg<<C5w3_-RsBETlpJWaAlby+);^?em@HJt835O5jnvwJ!Ezt?UH{GKJ#_-;
zXWyIZeRlqoB-*o!rz0dsi&bmk<~!5}rFXX!TR>=T-&kUHO}td+Zdj!3n&NR?K~cRU
zAXU!DCp?51{J4w^`cV#ye}(`SQhGQkkMu}O3M*BWt4UsC^jCFUy;wTINYmhD$AT;4
z?Xd{HaJjP`raZ39qAm;%beDbrLpbRf(mkKbANan7XsL>_pE2oo^$TgdidjRP!5-`%
zv0d!|iKN$c0(T|L0C~XD0aS8t{*&#LnhE;1Kb<9&<JFZp&cEpRA~JX*2uhno)g+lW
z)A2j^Jp=5|9|_BqD3yNfz$3!^TP^t32VmQN>=c2B+9JeLvJr*AyyRh%@jHej<V&M}
z(_rfkTF8<3M0mfUD?DaD6=7VHc94p8)f%k_sKhOPc+3w*C;t63&?zS3e((b(P6Fva
zg1a!>=AetOMSlz^=!kxX<aUab1e69e5UxkmMM!xSN{9YUYGb=H*((f4#ZL$Ijz4ZG
z=M2TpNE4&~3j}eO`*MD}g}>>>B{2B1uIrQyfd8KjJ+DBy!h)~*(!|&L4^Q_07SQ~E
zcemVP`{9CwFvPFu7pyVGCLhH?LhEVb2{7U+Z_>o25#+3<|8%1T^5dh}*4(kfJGry}
zm%r#hU+__Z;;*4fMrX=Bkc@7|v^*B<Xvhu2*uH*LPz_h!qs>;HA<UqXI?t|tCaZDB
zM}=e!+VluyMT1_wK?{{}fh!prU@u#|#$3A*>l0((IBPPii%X9+u3DDF6%<Dxg01id
zvRMgy`}RNgOUmsF(*g|!7J~5qLXiIVe!ooTZQWeHyp<$?w&ud7re6&`d1HHH%m41@
zrE0Fb;A`T35^B${Rk`^BD>bI&6?Eu$8&aWVqHIM7mK6?Uvq$1|(-T|)IV<>e?!(rY
zqkmO1MRaLeTR=)io(0GVtQT@s6rN%C6;nS3@eu;P#ry4q;^O@1ZKCJyp_Jo)Ty^QW
z+vweTx_DLm{P-XSBj~Sl<%_b^$=}odJ!S2wAc<kP=%^q`Fk3#DzIfRc20!g-U?(r0
zttu-F5dSTOh@Hh;*8<POV|23UE<I?%YD*|RoGT_RNfg)N<d$-CVBslaSc2;hu2@iM
zijnTdup@(TT6QsX1DSS%iD>xenmzFGX1t&Qp8Vxz2VT`uQsQ<N&Na@Eg(*vW-Sx0Z
zwa1eC?gP9=v{v;-el(Byq7uXErY6a?>Ytdn&_0xVivIcxZ_hnrRtwq4cZSj1c-SG9
z7vHBCA=fd0O1<4*=lu$6pn~_pVKyL@ztw1swbZi0B?spLo56ZKu5;7ZeUml1Ws1?u
zqMf1p{5myAzeX$lAi{jIUqo1g4!zWLMm9cfWcnw`k6*BR^?$2(&yW?>w;G$EmTA@a
z6?y#K$C~ZT8+v{87n5Dm&H6Pb_EQ@V0IWmG9cG=O;(;5aMWWrIPzz4Q`mhK;qQp~a
z+BbQrEQ+w{SeiuG-~Po5f=^EvlouB@_|4xQXH@A~KgpFHrwu%dwuCR)=B&C(y6J4J
zvoGk9;lLs9%iA-IJGU#Rg<oAf^xeCDGN*>nZZR+@{5lYl8(e1h6&>Vc_mvg0d@);X
zji4T|n#lB!>pfL|8tQYkw?U2bD`W{na&;*|znjmalA&f;*U++_aBYerq;&C8Kw7mI
z7tsG*?7*5j&dU)Lje;^{D_h`%(dK|pB*A*1(Jj)w^mZ9HB|vGLkF1GEFhu&rH=r=8
zMxO42e{Si6$m+Zj`_mXb&w5Q(i|Yxyg?juUrY}78uo@~3v84|8dfgbPd0iQJRdMj<
zncCNGdMEcsxu#o#B5+XD{tsg*;j-eF8`mp~K8O1J!Z0+>0=7O=4M}E?)H)ENE;P*F
z$Ox?ril_^p0g7xhDUf(q652l|562VFlC8^r8?lQv;TMvn+*<c9jlj>8I}&+hIQYh2
z1}uQQaag&!-+DZ@|C+C$bN6W;S-Z@)d1|en+XGvjbOxCa-qAF*LA=6s(Jg+g;82f$
z(Vb)8I)AH@cdjGFAR5Rqd0wiNCu!xtqWbcTx&5kslzTb^7A78~Xzw1($UV6S^VWiP
zFd{Rimd<L>-0CZC_Bu(WxBFW7+k{cOW7DxBBkJdJ;VsJ4Z@lERQr%3eVv&$%)b%<~
zCl^Y4NgO}j<COChW_}a6vln)bF3$TpaLb);b~-PYxxR%}%O<}>s@u{|o~KTgH}>!*
z_iDNqX2(As7T0xivMH|3SC1ivm8Q}6Ffcd7owUKN5lHAtz<t12Aa&#mkpHAAP7vmV
z^!AJ*2~=PgYP(Wn4Vk66dQCX+{#B-Z%T|HyH;WjNt4~Za-}DB-){PA#h!r8;?(Vb^
zk44aj#5Wa>MM4<0v+ykUT!QiowO;`@%JGv+K$bBx@*S7C8GJVqQ_K>12}M`f_Ys=S
zKFh}HM9#6Izb$Y{wYzItTy+l5U2oL%boCJn?R3?jP@n$zSIwlmyGq30Cw4QBO|14`
zW5c);AN*J3&eMFAk$SR~2k|&+&Bc$e>s%c{`?d~85S-UWjA>DS5+;UKZ}5oVa5O(N
zqqc@>)nee)+4MUjH?FGv%hm2{IlIF-QX}ym-7ok4Z9{V+ZHVZQl$A*x!(q%<2~iVv
znUa+BX35&lCb#9VE-~Y^W_<SUna+(6v_v93h$)MSc{mD`=k6;#c%#QV`lbAtfE3~q
zAtA7|n`xq>f;Xhl%vgjwdjzMy$FsSIj&ok}L+X`4>J=9BkN&nu^E*gbhj3(+D>C4E
z@Fwq_=N)^bKFSHTzZk?-gNU$@l}r}dwGyh_fNi=9b|n}J>&;G!lzilbWF4B}BBq4f
zYIOl?b)PSh#XTPp4IS5ZR_2C!E)Z`zH0OW%4;&~z7UAyA-X|sh9@~>cQW^COA9hV4
zXcA6qUo9P{bW1_2`eo6%hgbN%(G-<qHJAT=v`nNhtT>F1xTvq!sc?4wN6Q4`e9Hku
zFwvlAcRY?6h^Fj$R8zCNEDq8`=uZB8D-xn)tA<^bFFy}4$vA}Xq0jAsv1&5!h!yRA
zU()KLJya5MQ`q&LKdH#fwq&(bNFS{sKlEh_{N%{XCGO+po#(+WCLmKW6&5iOHny>g
z3*VFN?mx!16V5{zyuMWDVP8U*|BGT$(%IO|)?EF|OI*sq&RovH!N%=>i_c?K*A>>k
zyg1+~++zY4Q)J;VWN0axhoIKx;l&G$gvj(#go^pZskEVj8^}is3Jw26LzYYVos0HX
zRPvmK$dVxM8(Tc?pHFe0Z3uq){{#OK3<aeeBkf6Ls@D&>i-ra#@+;*=ui8)y6hsRv
z4Fxx1c1+fr!VI{L3DFMwXKrfl#Q8hfP@ajgEau&QMCxd{g#!T^;ATXW)nUg&$-n25
zruy3V!!;{?OTobo|0GAxe`Ac<m7!f>n3GV@W=&n;<LWwg+BOz1x0PVh(8wy5x)H%n
z);^KLwS*zuK_mXLt=05$RqxmlzBGrOU$*+pD67{&9S4nenf`=wmSIir^E~5#<>~&9
zQM>NWW~R@OYORkJAo+eq1!4vzmf9K%plR4(tB@TR<A8<4IpzFAVt^jntH)?Lln%G`
z6tiucWhgUNI?A8Udv5fHlOm9!ctl16R`GIy7|o!{GngCtp;Tz@88GLNR}tm$OZ5f}
zPju@d{;|S(Rs51!tah!+6PbnnY<$fK^X^&7uddbpg77+M3+zt^`&Wl4kC?eRy{-46
z-3%mXj1#}r%@t|kQBj7QXfN_>&FSbDoRgJ8qVcH#;7lQub*nq&?Z>7WM=oeEVjkaG
zT#f)=o!M2DO5hLR+op>t0Cix<vSdXuLLoyLNj^8w51xiOY6tARpFGMs_UAVQl{h1q
z__M5D$myTJng;^A_J=JcCX@-~s%uSop76ggk-NNPh1K-Xw6Mwq#g=?x9pSWbMg&Eg
z!IW}nRKAGc2X+4y>JCIeXH*+z{-XS|%jx)y(j&}Wo|3!l7{o)HU3m7LYyhv*xF&tq
z%IN7N;D4raue&&hm0xM=`qv`+TK@;_xAcGKuK(2|75~ar2Yw)geNLSmVxV@x89bQu
zpViVKKnl<KY)q`sT$C@o*b;pi#>kwjS&&c|-X6`~xdnh}<zE$?k&-+|)}}1-k;;{3
zWgBv<7Mg|YWBAi9*yc#1&cuZnxkZaBTj=EQ-!oi23=b7<qC?N!TC&$6!<yQuq~YaC
z_0tVTi{LC-!3@TC@6(yDt1|8;{dkSfR3rrN7be_C({Ti}0{;9qU1;it_)pV>Ps)Hs
z4VbUL^{XNLf7_|Oi>tA%?SG5zax}esF*FH3d(JH^Gvr7Rp*n=t7frH!U;!y1gJB^i
zY_M$KL_}mW&XKaDEi9K-wZR|q*L32&m+2n_8lq$xRznJ7p8}V>w+d@?uB!eS3#u<}
zIaqi!b!w}a2;_BfUUhGMy#4dPx>)_>yZ`ai?Rk`}d0>~ce-PfY-b?Csd(28yX22L%
zI7XI>OjIHYTk_@Xk;Gu^F52^Gn6E1&+?4MxDS2G_#PQ&yXPXP^<-p|2nLTb@AAQEY
zI*UQ9Pmm{Kat}wuazpj<q$kAY7_UQRU$-YKdQWJ&LyZumLzNJQ!;vvr#GB_EA<Jf@
z$2g7!{jMh`@>SyXCdnrD&|C1c5DIb1TnzF}f4KIV6D)CJ!?&l&{T)e4U%3HTSYqsQ
zo@zWB1o}ceQSV)<4G<)jM|@@YpL+XHuWsr5AYh^Q{K=wSV99D~4RRU52FufmMBMmd
z_H}L#qe(}|I9ZyPRD6kT>Ivj&2Y?qVZq<4bG_co_DP`sE*_Xw8D;+7QR$Uq(rr+u>
z8bHUWbV19i#)@@G4bCco@Xb<8u~wVDz9S`#k@ciJtlu@uP1U0X?yov8v9U3VOig2t
zL9?n$P3=1U_Emi$#slR>N5w<w?qFuOF5w}cnum+dV`a<C*;Hv>H-=J&T=EdUHA}_Z
zZIl<E_JWAQn>3nvMP*AZS9{cDqFanrA~S5BqxtNm9tlu;^`)3X&V4tMAkJ4gEIPl=
zoV!Gyx0N{3DpD@)pv^iS*dl2FwANu;1;%EDl}JQ7MbxLMAp>)UwNwe{=V}O-5C*>F
zu?Ny+F64jZn<+fKjF01}8h5H_3pey|;%bI;SFg$w8;IC<8l|3#Lz2;mNNik6sVTG3
z+Su^rIE#40C4a-587$U~%KedEEw1%r6wdvoMwpmlXH$xPnNQN#f%Z7|p)nC>WsuO=
z4zyqapLS<8(UJ~Qi9d|dQijb_xhA2)v>la)<1md5s^R1N&PiuA$^k|A<+2C?OiHbj
z>Bn$~t)>Y(Zb`8hW7q9xQ=s>Rv81V+UiuZJc<23HplI88isqRCId89fb`Kt|CxVIg
znWcwprwXnotO>3s&Oypkte^9yJjlUVVxSe%_xlzmje|mYOVPH^vjA=?6xd0vaj0Oz
zwJ4OJNiFdnHJX3rw&inskjryukl`*fRQ#SMod5J|KroJRsVXa5_$q7whSQ{gOi*s0
z1LeCy|JBWRsDPn7jCb4s(p|JZiZ8+*ExC@Vj)MF|*Vp{B(ziccSn`G1Br9bV(v!C2
z6#?eqpJBc9o@lJ#^p-`-=`4i&wFe>2)nlPK1p9yPFzJCzBQbpkcR>={YtamIw)3nt
z(QEF;+)4`>8^_LU)_Q3<u}L<{1}Pc_TC@cmCN`COOSM8a;|jWsk~1fYJv#PDsm#->
zC5_7lgi_6y>U%m)m@}Ku4C}=l^J=<<7c;99ec3p{aR+v=diuJR7uZi%aQv$oP?<K2
z4>dn?@6Yu_+*^>T0ptf(oobdL;6)N-I!TO`zg^Xbv3#L0I~sn@WGk-^SmPh5>W+<X
znt3fVJDljH9Rg;|i5lPHsR(0ho%1Z#U$BQ5Z>LB<+1PU}AKa?FCWF|qMNELOgdxR{
zbqE7@jVe+FklzdcD$!(A$&}}H*HQFTJ+AO<jQkEo4(Zr!RbHw&%VW+jartXEY{IAo
z-<Q*FbO_;b95g_K9)_94ZpWY1;<Z!iW)9JK0`6zeVbpJRc{foQfe9X-j8eQ-=DlS%
zH`!Rua7Ws)lQGR`lKbWfbJ{-A+Qsq7w~i7ifv23@y@q;f=f9BC2>rJYnhh}Yvta(B
zQ_bW4Rr;R~&6PAKwgLWXS{Bnln(vUI+~g#kl{r+_zbngT`Y3`^Qf=!PxN4IYX#iW4
zucW7@LLJA9Zh3(rj~&SyN_pjO8H&)|(v%!BnMWySBJV=eSkB3YSTCyIeJ{i;<t5`Q
zo(L{QW?hBDuaI(wY%y)W1q$B>(oc%_hk{$_l;v>nWSB)oVeg+blh=HB5JSlG_r7@P
z3q;aFoZjD_qS@zygYqC<CA@uG3$h<l#w}3@ssm8WfebtlUXE~>n=;Zxjo!?NK!%J$
z52lOP`8G3feEj+HTp@Tnn9X~nG=;tS+z}u{mQX_J0kxtr)O30YD%oo)L@wy`jpQYM
z@M>Me=95k1p*FW~rHiV1CIfVc{K8r|#Kt(ApkXKsDG$_>76UGNhHExFCw#Ky9*B-z
zNq2ga*xax!HMf_|Vp-86r{;~YgQKqu7%szk8$hpvi_2I`OVbG1doP(`gn}=W<8%Gn
z%81#&WjkH4GV;4u43EtSW>K_Ta3Zj!XF?;SO3V#q=<=><y*Ez-K*8OuEH#K1Uw04)
zm-E?#$M4Pw!5Sa^O{sRRDY-gWXv@8A@bA;l<_ks)es^2Nu>Tc^@?A`i;&`-cYj|;^
zEo#Jl5zSr~_V-4}y8pnufXLa80vZY4z2ko7fj>DR)#z=wWuS1$$W!L?(y}YC+yQ|G
z@L&`2upy3f>~*IquAjkVNU>}c10(fq#HdbK$~Q3l6|=@-eBbo>B9(6xV<PW<=*tlY
z$*pN5hHZpwqlet{tLghEZT#%M$0U({lim^-U@zba{?NJMf<93*()%m>`*)sae58*f
zym~RRVx;xoC<uxJ0zCckgSOZ<jKZfGBozv^HDI7G(HjLM<voAwa4Kh#eq6#2U!qA0
zF$%FfiP7?q!+@Q%0CG7sP{g!i5R&?DRZkOxRnqe`((<r{70*Vq2Rb6*k>G3`JV`xo
z!lFw)=t2Hy)e!IFs?0~7osWk(d%^wxq&>_XD4+U#y&-VF%4z?XH^i4w`TxpF{`XhZ
z%G}iEzf!T(l>g;W9<~K+)$g!{UvhW{E0Lis(S^%I8OF&%kr!gJ&fMOpM=&=Aj@wuL
zBX?*6i51Qb$uhkwkFYkaD_UDE+)rh1c;(&Y=B$3)J&iJfQSx!1NGgPtK!$c9OtJuu
zX(pV$bfuJpRR|K(dp@<Et6W$J6*Z#&a&;93*Ie~(LKx3oM(w;zbe{$4=AvBd2M!)G
z)q&m$-4a#zj+ntOm6x3DXKBbGe#P@0*At9SemktTX0uh;t#}60aB^D2eE!a4eDuX;
z-as`;dd|o4vBfl1>^j}i&H<lE5B-BmW0%$me#yff@sBn;ohRKEdDubkmfk_9%F#R?
zx3ZTQV}CG~;tIM9J0dPMr);>eJ<ZUgb6%5p(oB8d(S&NYcE9Fn#eq_UTAuN0jA(?H
z^D)QqC|?HmZ<MfF#1KC`+1B#aVb^f*7XyN**6k{KcrsXkYIuNItVY|XpO_RwL+pB-
zi361AR7q3_a+z(hygW-dSQ4&gyU_L%*Ad1YXBX3#1@&17te>Oh@|7lWo8^$*o~Xqo
z5Sb+<gm~yF$-E%g5?e&PX|O%&U0#MK#8=Cb4moDVt9pc5&|d_Nok|m&#&P2i0(_CN
zM^tc5)Kw#?l>!EtJ&e@6F+h&+<iRY;$9#Wr1>_1ETbg7LfP5GZjvIUIN3ibCOldAv
z)>YdO|NH$x7AC8dr=<2ekiY1%fN*r~e5h6Yaw<{XIErujKV~tiyrvV_DV0AzEknC-
zR^xKM3i<1UkvqBj3C{wDvytOd+YtDSGu!<rPOfY>gEMg+!&|8BQrT*|p)(dwQLEy+
zMtMzij3zo40)CA!BKZF~yWg?#lWhqD3@qR)gh~D{uZaJO;{OWV8XZ_)J@r3=)T|kt
zUS1pXr6-`!Z<!o63*D|NQNYak6gGf7_QJ$%QWph8(@+Md9XOp*qP{X}q91Av868w+
zGbBw!<JX87&2|tz_-<JKu<xhK)|6RN*Zk7fvZ42tj|cY?!)H@h7T?|0cVg1Q(Dzye
z>}w2QR7nP%d?ecf90;<QTfw00Ol^jhE%$`<-%SzE37_m?Tsl?x9jtF58}$iamaJPx
z;*k`q<{nE<sbhO}9jI-7R-I>K_7C3d!U<RH+{w3GCUW?FU;!Us-m^hLIJe*q&7e}1
zpDB4cxkQ^$zB~cRxh7B3$~Q``Zt;ZNw-Uj>Z`N(TZoWNN^Q~RjVhQG{Y<%E1PpV^4
z-m-K+$A~-+VDABs^Q@U*)YvhY4Znn2^w>732H?NRK(5QSS$V@D7yz2BVX4<IQ|}VZ
zL_WDk%d5E2#>)f5A04~$WbxGOam22>t&uD)JB8-~yiQW6ik;FGblY_I>SvB_z2?PS
z*Qm&qbKI{H1V@YGWzpx`!v)WeLT02};JJo*#f$a*FH?IIad-^(;9XC#YTWN6;Z6+S
zm4O1KH=#V@FJw7Pha0!9Vb%ZIM$)a`VRMoiN&C|$YA3~ZC*8ayZRY^fyuP6$n%2IU
z$#XceYZeqLTXw(m$_z|33I$B4k~NZO>pP6)H_}R{E$i%USGy{l{-jOE;%CloYPEU+
zRFxOn4;7lIOh!7ab<V}OmeeQNY6TeYO&&E^lN#TB*^`;ju1*`#<QB4aBWp8jLsn56
ztlcT6a*61b7mBGG7Pe5gFr$a2kxI4g;qf)gjt)|Y7A|WcqUTy7lmzDN21ov~uefIa
zStpXF9OSKG--%FP-n6GoKAZkk;aTNW1ae$KBstPWjSIc_V%4U0$Ln1&jVG=$ZcXgh
z#CvGTp=S;-S8-$7HKAq6%SA!$URan_Wx!1Oc!O*_!j0Q;YpHo#pr5>b23YKD+_-?O
z0FP9otcAh+oSj;=f#$&*ExUHpd&e#bSF%#8*&ItcL2H$Sa)?pt0Xtf+t)z$_u^wZi
z44oE}r4kIZGy3!Mc8q$B&6JqtnHZ>Znn!Zh@6rgIu|yU+zG8q`q9%B18|T|oN3zMq
z`l&D;U!OL~%>vo&q0>Y==~zLiCZk4v%s_7!9DxQ~id1LLE93gf*gg&2$|hB#j8;?3
z<g)eCVNaZv3$^cu;yV<qgy7Ou{HZYOe(Yy~3PLV!ZId!<`3EN$I2e|Sb}<jdw%KMG
z$~P@70$N+m@}=Mj9$ZG59AQ=JQRvLB(RM9)t()h{Tno>5v4S;oM6rT{Y;I+#FdmNw
z){d%tNM<<#GN%n9ox7B=3#;u7unZ~tLB_vRZ52a&2=IM)2VkXm=L+Iqq~uk#Dug|x
z>S84e+A7EiOY5lj*!q?6HDk<t%xgyS2(ef%dZKEIaXh3~wff^|xcGFVc_e~Sr`&nX
zB{0<Bl5W%rH&l?6tsWk=E?WK+SiGZtPex%sjw{ofyMqE~@feSemEiHmis}sLGcPDm
zIzGRXgYb$F!6<>Nh~0g;0Jy(al!ZHHDtur9T$y-~)94HelX1NHjXWIM7UAe}$?jiz
z9?P4`I0JM=G5K{3_%2jPLC^_Mlw?-<a70XR;I>kYYgb7`qGa3@dn|^1fRMwiyM@Ch
z;CB&o7&&?c5e>h`IM;Wnha0QKnEp=$hA8TJgR-07N<gl50D&l8aCL6u?F9;bt}O?Y
zClsN^P?BSo;~X-U^>~U5(>9vJzeoFs<a)64ao)eXA>SRBkDq=x(YgEMpb=l4TDD`2
zwVJpWGTA_u7}?ecW7s6%rUs&NXD3+n;jB86`X?8(l3MBo6)PdakI6V6a}22{)8ilT
zM~T*<jE3E@DmR%ike^(4fN~b2CI%ZAFJHK0>mU}__xSy|6XSrJ^%l<L`JF;YY6b4`
z;6>DAR3Lft%+<T2S<6#r`P7WA*H7H@Tkj*;CZWvGK|Ka6#=q$9VereUjcyuYAT-kE
z-4)n_C1YG2*?76Lh&eh@n+#B;0G7^rIA<P1)+|@l^eA4%oi{dOUZb8u1-}Kweut@X
z=3>yxC<CMW8Guf-*pI#2K9_;@nA>|ZUvSO_nqMX!_ul3;R#*{~4DA=h$bP)%8Yv9X
zyp><|e8=_ttI}ZAwOd#dlnSjck#6%273{E$kJuCGu=I@O)&6ID{n<VEYI|KdxCeO+
z8>WF5@gLb16sj|&Sb~+du4e4O_%_o`Ix4NRrAsyr1_}MuP94s>de8cH-OUkVPk3+K
z&jW)It9QiU-ti~AuJkL`XMca8Oh4$SyJ=`-5WU<{cIh+XVH#e4d&zive_UHC!pN>W
z3TB;Mn5i)9Qn)#6@lo4QpI3jFYc0~+jS)4AFz8fVC;lD^+idw^S~Qhq>Tg(!3$yLD
zzktzoFrU@6s4wwCMz}edpF5i5Q1IMmEJQHzp(LAt)pgN3&O!&d?3W@6U4)I^2V{;-
z6A(?zd93hS*uQmnh4T)nHnE{wVhh(=MMD(h(P4+^p83Om6t<*cUW>l(qJzr%5vp@K
zN27ka(L{JX=1~e2^)F^i=TYj&;<7jyUUR2Bek^A8+3Up*&Xwc{)1nRR5CT8vG>ExV
zHnF3UqXJOAno_?bnhCX-&kwI~Ti8t4`n0%Up>!U`ZvK^w2+0Cs-b9%w%4`$+To|k=
zKtgc&l}P`*8IS>8DOe?EB84^kx4BQp3<7P{Pq}&p%xF_81pg!l2|u=&I{AuUgmF5n
zJQCTLv}%}xbFGYtKfbba{CBo)lWW%Z>i(_NvLhoQZ*5-@2l&x>e+I~0Nld3UI9tdL
zRzu8}i;X!h8LHVvN?C+|M81e>Jr38%&*9LYQec9Ax>?NN+9(_>XSRv&6hlCYB`>Qm
z1&ygi{Y()OU4@D_jd_-7vDILR{>o|7-k)Sjdxkjgvi{@S>6GqiF|o`*Otr;P)kLHN
zZkpts;0zw_6;?f(@4S1FN=m!4^mv~W+lJA`&7RH%2$)49z0A+8@0BCHtj|yH--AEL
z0tW6G%X-+J+5a{5*WKaM0QDznf;V?L5&uQw+yegDNDP`<QwM)iHN0Ixe+C<}Kj)cT
z;ugg=7>hA;0XPYc6e0;Xv6|i|^F2<spnC^BAY#K6!R1`y8;L|-ax$>WB)Z$LR|HR4
zTQsRAby9(^Z@yATyOgcfQw7cKyr^3Tz7lc7+JEwwzA7)|2x+PtEb>nD(tpxJQm)Kn
zW9K_*r!L%~N*vS8<5T=iv|o<TQh`NS2YOm^v@YF+FhtT<a+buCZu6h6oT_Y5b`Scg
zm=4c{5~CgG?9-H=F8v%THj;pBAIcNf1w(JQ+AUi+?6F2LasjZ5Oz$7m+jvgK`zeSh
z^(f$UuqGD?j)9ZxVlSw*kzGRC;oCN&mCo&6G7ql5S{99P97)o*h$5+(ch97JLRzc!
zYD=hMW71CXeuLub2z%t|7;RjK6Ogym_1#+sTC!<7k`+%+%pXjbEt&Ewk(hGUoqGvq
zuM0wx5$A~T4SRbOQgIit7jaB@N32&;KWs00gsh)b^;UUaulO8Td<B}%0x3tW7;G##
zTMaSe*B!q#S@Od*Vy(-qm;}PAJhEq0;6w!v@t~78{dMpN>!zTe9k_2jC_j*7ik^M_
zaf%k{WX{-;0*`t`G!&`eW;gChVXnJ-Rn)To8vW-?>>a%QU1v`ZC=U)f8iA@%JG0mZ
zDqH;~mgBnrCP~1II<=V9;EBL)J+xzCoiRBaeH&J6rL!{4zIY8tZka?_FBeQeNO3q6
zyG_alW54Ba&wQf{&F1v-r1R6ID)PTsqjIBc+5MHkcW5Fnvi~{-FjKe)t1bl}Y;z@<
z=!%zvpRua>>t_x}^}z0<7MI!H2v6|XAyR9!t50q-A)xk0nflgF4*OQlCGK==4S|wc
zRMsSscNhRzHMBU8TdcHN!q^I}x0iXJ%uehac|Zs_B$p@CnF)HeXPpB_Za}F{<@6-4
zl%kml@}kHQ(ypD8FsPJ2=14x<gRLSp5jQ3zP{(QVzPLZLVm053fUe=@OltSio705;
z(#z2z>XJE|b20<nbuvWeRu7_ckN!4)4>RUIgs!2|R3>LUMGF6X*B_I|$`Qg=;zm7C
z{mEDy9dTmPbued7mlO@phdmAmJ7p@GR1bjCkMw6*G7#4+`k>fk1czdJUB!e@Q(~6#
zwo%@p@V5RL<HuH8=u8a6RDT=ORPK%+xl*V0g}ZRt7wrV&wXuQ&Kq5z5VF5~$tzh+o
zGvLCh{4xbZi*rM$H53QbbG^}e_;5ZL^rKOCECf%A3k<ba715W9GFJ3%z+y)SixW7v
zFUks)dR&u51!CgipP_*=HsXEQV|A6)MESe^nXfdde|e*3lS%iSm1?2t=&g8iM5yO0
zqGo^30JQ})=Z}tg94XEO6_<mfkScn>0ABU2LH7Asq^quDUho@H>eTZH9f*no9fY0T
zD_-9px3e}A!>>kv5wk91%C9R1J_Nh!*&Kk$J3KNxC}c_@zlgpJZ+5L)Nw|^p=2<X2
zVEH%@dRNgUT+xOlus$Jl>ue}CJtm;uj*Iqr)K})kA$xtNUEvX;4!Px*^&9T_`IN{D
z{6~QY=Nau6EzpvufB^hflc#XIsSq0Y9(nf$d~6ZwK}fal92)fr%T3=q{0mP-EyP_G
z)UR5h@IX}3Qll2b0oCAcBF>b*@Etu*aTLPU<%C>KoOrk=x?pN!#f_Og-w+;xbFgjQ
zXp`et%lDBBh<!%rmD;`)_Iw7qs}PxJE2OWnk0598{1@{z2=&M97kZ^;iS=)VbtW2e
z9{Njc%X1q_Y=7a@dL*7`HknH57C8G{SaT${ATgN~45gpu4M3g9K3K^dkc|SdjG%I{
zqBnN$pX_Ur&xe`6C5rq%1Au6o>~OcFnMKMUoox0YwBNy`N0q~bSPh@+enQ=4RUw1)
zpovN`QoV>vZ#5LvC;cl|6jPr}O5tu!Ipoyib8iXqy}TeJ;4+_7r<1kV0v5?Kv>fYp
zg>9L`;XwXa&W7-jf|9~uP2iyF5`5AJ`Q~p4eBU$MCC00`rcSF>`&0fbd^_eqR+}mK
z4n*PMMa&F<X)^G}xeJ@Gp5hPUp4))DB`D07_#V$I)>Occ)<Z1&cEZXfHKl6!0r^K=
z4G}bu(5ge=G8fwnhNItAV-;CCRA~!*Ffjtk+W5Q4($~|Ogx!7zYTJ+md_mLOIHP$a
z=Xv|*^wnVA6u+^6*Pjw-xuU)%_b=1oT;Uy*3v`{`12FsGfVli|)UZ4c+9zix>vTUR
zlDUAn-mh`ahi_`f`=39JYTNVjsTa_Y3b1GOIi)6dY)D}xeshB0T<J4O9}2CRcgST4
zu^DE1lNC^&bdTFMX*m;=F+oV62|j1N%Y(`}stx4V@A-${Nsme7gPF1VFeZ(Es(Tv1
z2eMG<3ngPbvsdfMDb6jRfMuIQ>8Eov5%UhWd1)u}kjEQ|LDo{tqKKrYIfVz~@dp!!
zMOnah@vp)%_-jDTUG09l+;{CkDCH|Q{NqX*uHa1YxFShy*1+;J`gywKaz|2Q{lG8x
zP?KBur`}r`!WL<v4v3q-kbT^ZHHV*Ab_1=$Ds`sw{p4Q5%K<O{0b-Frgl!8<-ysCa
z@55EXX6zF(6|%WdJ}w;c9q_T(h^VZr*46HXJncAUKTLi*=>KXY_<N$yy+H{DR|LP9
zF#oxrkoE0^A&|7gpQkf#W)&V7g<8v42B_@CDi{phanFo;l(u@KJ-))-pR{b)<rcd3
zf}4BFpSv=>K;C8$EWG>jY3UIh{+BLv0=2)KH%P}6xE2kg)%(-uA6lC?u8}{K(#P*c
zE9C8t*u%j2r_{;Rpe1A{9nNXU;b_N0vNgyK!EZVut~}+R2rcbsHilqsOviYh-pYX=
zHw@53nlmwYI5W5KP>&`dBZe0Jn?nAdC^HY1wlR6$u^PbpB#AS&5L6zqrXN&7*N2Q`
z+Rae1EwS)H=aVSIkr8Ek^1jy2iS2o7mqm~Mr&g5=jjt7Vxwg<tf08u&@2*nrRdWEq
z9>lQ^`h#Mx+x2v|9ZAwE$i_9918Mj<x0*Wdpb36@OAXTH9HjzBO?DU3pPWJl<5`?4
zJx95+eAmsI^}aX!MTHZ2jvyPZ%UQNWgYc&Az}*vhoE;`M;w#yci|VFS(*uY8dTed$
zmI+a!^D3~nUd`%d3v~n803|x?hdA<CAGP8+Vz0wak|gS0b(v+b_#OSxq^j=~x{U#C
zxb5$H!k6E86jdT96;Z=hlwo5iYt(l!8a^<>JxTMr?n!bZ6n$}y11u8I9COTU`Z$Fi
z!AeAQLMw^gp_{+0QTEJrhL424pVDp%wpku~XRlD3iv{vQ!lAf!_jyqd_h}+Tr1XG|
z`*FT*NbPqvHCUsYAkFnM`@l4u_QH&bszpUK#M~XLJt{%?00GXY?u_{gj3Hvs!=N(I
z(=AuWPijyoU!r?aFTsa8pLB&cx}$*%;K$e*XqF{~*rA-qn)h^!(-;e}O#B$|S~c+U
zN4vyOK0vmtx$5K!?g*+J@G1NmlEI=pyZXZ69tAv=@`<PF>t%ag_Hk{LP~OH9iE)I=
zaJ69b4kuCk<W;+Nm{1iL;Sjg&ce)b6RfuYXG6i3lmo`Xoo=yc_#4MF;W?A{F|EAlX
z*<!ti?&E?FEc4)+uE<O&ONf`XLQ^cl<<tMSmTYl1l}%xg`DIk~4?@x6!4)Pmk>V0V
zo(M0#>phpQ_)@j;h%m{-a*LGi(72TP)ws2w*@4|C-3+;=5DmC4s7Lp<h>95%n%@Ko
zfdr3-a7m*dys9iIci$A=4NPJ`HfJ;hujLgU)ZRuJI`n;Pw|yksu!#LQnJ#dJysgNb
z@@qwR^wrk(jbq4H?d!lNyy72~Dnn87KxsgQ!)|*m(DRM+eC$wh7KnS-mho3|KE)7h
zK3k;qZ;K1Lj6uEX<KEj5@nV#iauGcIh@~0bCkde*VA4<NzidV>LYUYi)1FN}F@-xJ
z@@3Hb84sl|j{4$3J}aTY@cbX@pzB_qM~AP<KHC>ljrjju6P0tY{C@<op~*H5^F|n>
zpUCOz_NFmALMv1*blCcwUD3?U6tYs+N%cmJ9<vk4wN1^{7_o-KiUksuyYPZPi6=aB
zRdD0jWfvBXoM%2g7{9p9f&t&G@^K{*T20!5)|u6mVvE8$*gT5c>8D%3)%)Xu^uvzF
zS5O!sc#X6?EwsYkvPo6A%O8&y8sCCQH<%f2togVwW&{M;PR!a(ZT_A+jVAbf{@5kL
zB@Z(hb$3<w@Z7>U{T_}SKA_CoQVU-;j>2J=L#lZ~aQCFg-d<9rzs$_gO&d5N6eFSc
z1ml8)P*FSi+k@!^M9nDWR5e@ATD8oxtDu=36Iv2!;dZzidIS(PCtEuXAtlBb1;H%Z
zwnC^Ek*D)EX4#Q>R$$WA2sxC_t(!!6Tr?C#@{3}n{<^o;9id1RA&-Pig1e-2B1XpG
zliNjgmd3c&%A}s>qf{_j#!Z`fu0xIwm4L0)OF=u(OEmp;bLCIaZX$&J_^Z%4Sq4GZ
zPn6sV_#+6pJmDN_lx@1;Zw6Md_p0w9h6mHtzpuIEwNn>OnuRSC2=>fP^Hqgc)xu^4
z<3!s`cORHJh#?!nKI`Et7{3C27+EuH)Gw1f)aoP|B3y?fuVfvpYYmmukx0ya-)TQX
zR{ggy5cN<mnVz7y7+knzNVJkt;lpc;qc>f4X|g)nl#jC9p>7|09_S7>1D2GTRBUTW
zAkQ=<vO$_umo;W8C9!}&#xkaPRO=3x>JMRogZqG#v;^=11O6@rPPwvJ<B8_C^h!$7
z1FiG#I7Fs!hS~+X_xS9av4ic?s4}I)b~+~ynqpL?4J!M0!;Lh~^{jyZ5OklQ8U2d;
z1_pNZ6|Y?X=U7!TcC`|AaWS_uvHe0n$~l-C+lqY=nw)_qUxZZ$`~TgLQeOW;@1pQ$
z701@hEqV6RKPy$?plo3XV+hmG(FFC_t(R=zC3ndGnN?AOBz^}Il*!(}YM_f?Vs)`N
zoXTGH^9k^Rs*ihNP{En)>kr{bW-Qg8`q8GoD#K`&Y+S#%&B>SGRL>;ZunM@49!}Uy
zN|bBCJ%sO;@3wl0>0gbl3L@1^O60ONObz8ZI7nder>(udj-jt`;yj^nTQ$L9`OU9W
zX4alF#$|GiR47%x@s&LV>2Sz2R6?;2R~5k6V>)nz!o_*1Y!$p>BC5&?hJg_M<tYqR
z53_xZU*2l8Pm44`5q;8sH8AJC`OhY?Pv0f<SBDF<5zRa5Pcc`28WO=W(}@uM2`X|H
zRYQaB%r|t}sRL>iE6UBy>RkVZj`9UWbRkN-Hk!S`=BS3t3uyX6)7SF#)71*}`~Ogz
z1rap5H6~dhBJ83;q-Y<5V35C2&F^JI-it(=5D#v!fAi9p#UwV~2tZQI+W(Dv?1t9?
zfh*xpxxO{-(VGB>!Q&0%^YW_<rkziH`41#l{!R-o<QMyf9_jzZ$o+58{{J}R|9zqw
zCjt0>F!@aZ<db_)!_xH)=)<rL4C7eRuqj-{Vl9!F47?8#IbbtVc$3LetR`tgCkn7O
z@PIcJnWwbNQc9I5c;Bn7#oM!PR?~3~=RhWhOCOgl{-a!vqnWp-GGc#(Z7u=0Jsb@k
zRLR8fKR?v;kdoa(!_kn<QSq40_$nei`C>S#ucP|YaD#>wd1Fv&Z*SR&mc;asi}1G)
z_H>`!akh-Zxq9#io(7%;a$)w+{QH)Y$?UK1Dt^4)up!Szcxnu}kn$0afcfJL#IL+S
z5gF_Y30j;{lNrG6m~$Ay?)*V9fZuU@3=kd40=LhazjFrau>(Y>SJNtOz>8x_X-BlA
zIpl{i>OarVGj1v(4?^1`R}aQB&WCRQzS~;7R{tDZG=HhgrW@B`W|#cdyj%YBky)P=
zpxuOZkW>S6%q7U{VsB#G(^FMsH5QuGXhb(sY+!-R8B<wCq$Ud&dR&R~YEJ18TLm54
z;iNBgol;q`1pM~hbiKQEHVg~udGsD!{32V0-F%Jl2*cE1CKaP}vYl}vY{JE1&Y`9<
zWxp@Q9z&I}X^~yDRt<yP&7ehNHUY-`mMuclQn{f;_BVk|%a!qyv`BTi_<F*shwHHm
zYMk#OgVxOZ5)F7}7!ZzzBqdqiT*o3-6bkMv(=P1min)~A$7Z{$hPM{)lRIzv{ziFg
ztAbHzmqKOklFBd-`W?q14D4v{uKrc3r#AAZ&_oCPRi9dQd_BxsU(vj^hw4-4vST=O
z-I*C6luz(vAIZ~@rb(A8AiNMr62dJzV>mv6Sx3WzSW<1MPPN1!&PurYky(@`bP9tz
z52}LH9Q?+FF5jR6-;|+GVdRA!qtd;}*-h&iIw3Tq3qF9sDIb1FFxGbo&fbG5n8$3F
zy<kUPcTI-*+R})(Lx?7E(-Km*D*#LFloydFBeh2ei+vLj63z@TMnj%!?Pc!@$=lI~
zWpQ4Fa#xXFx30*?LGzyx=<Q>Y&PWL{ys^dTO}oZ#@sIX^BKW*bon=;te9j5k+T%wJ
zNJtoN1~YVj4~Y<zc}D-ou*39R71C?0FVs3%E61z~{QYZ=p=4}v(=uH7JqP$9+LudZ
zPLki+z++>RrlZl)b&kJqp+Z`DqT!la$x&&IxgOQw#yZd-nBP3!7FijBXD|IsU8Zl^
zc6?MKpJQ+7ka|tZQLfchD$PD|;K(9FiLE|eUZX#EZxhG!S-63C$jWX1Yd!6-Yxi-u
zjULIr|0-Q%D9jz}IF~S%>0(jOqZ(Ln<$9PxiySr&2Oic7vb<8q=46)Ln%Z|<*z5&>
z3f~Zw@m;vR(bESB<=Jqkxn(=#hQw42l(7)h`vMQQTttz9XW6^|^8EK7qhju4r_c*b
zJIi`)MB$w@9epwdIfnEBR+?~);yd6C(Le<rt!q$FLriBQXByC(@5W-fyMd+G`gpkw
zo=2x;j`HUicFOMzOr+Hi-h(acwf1R^4yH6<++^$)J=B4dE@KAoZaXF)kE=0uwm3nd
z&m40{?8{tmrxQ5%Wq~$48e6Z&q%RJty{nmI+wz=hvB#pKRac&c?EYSnrDYd1X>MC&
zn&&N*?-g&BBJcV;8&UoZi4Lmxcj16ojlxR~zMrf=O_^i1wGb9X-0@6_rpjPYemIin
zmJb+;lHe;Yp=8G)Q(L1bzH*}I>}uAqhj4;g)PlvD9_e_<a@g*lf#ro&Ve1Oe9Dd~M
zzE8GyZq;U{s*VsFviyO$Mu<MkXYCJUQhOu^nB+^MD~g42i6J&pJlqN$*=O9FeOy#D
zMH(Hs0#anHAVz%4@!PpgmX|z|oRKkJQ8-ANxDXdJsPW`~G`Uz*(^?DtT&VY313h$)
z%Z_iZ<k;!|>ScR{Ipq|$8NvAvLD8MYr}xl=bU~)f%B3E>r3Bu9_t|ThF3C5~BdOve
zEbk^r&r#PT&?^V1cb{72yEWH}TXEE}w>t!cY~rA+hNOTK8FAtIEoszp!qqptS&;r$
zaYV-NX96-h$6aR@1xz6_E0^N49mU)-v#bwtGJm)ibygzJ8!7|WIrcb`$XH~^!a#s&
z{Db-0IOTFq#9!^<xwp4XVUmX2>j!n_F}#<SlrwIgws078xQpgq<=PFmW_#a3Vf1lR
zSZtW_!4KrMla?XPZ^%!uYvas5(q&p4<B~4-u7ZKo%gG=AWYrPaK~Ksf`2-Ltd1AQk
z$_l6x1x`BMZqVJH81bkQU_K4!7|CM9*e*BRdOD=<*r=%KzmW8K`FLhkaj-7c$V5Vt
z97r)f!2oBGV~&1@x<{&a6SOQM=KG6k)^{##XUT*iOlT|QkpE~1=S*FV(g_CM^s;$&
zRL7Q)Be-0f7v6$Yv*CJnQ>Z_nX{YzBK8XLPVmc&X`fT7!@$U-@2KM9soGbmOSAmqV
z{nr$L^MBo_u^Joyf0E^=eo{Rt0{{e$IFA(#*kP@SQd6l<gO0qV6sCD7Vl>WT2-#>`
zP1)7_@IO!9lk>Zt?#CU?cuhiLF&)+XEM9B)cS(gvQT!X3`wL*{fArTS;Ak`J<84du
zALKPz4}3nlG8Fo^MH0L|oK2-4xIY!~Oux~1sw!+It)&D3p;+N8AgqKI<GHze0K;7v
zH(+WEQqQ~(T0<)QjJr`7lg^24K~?@;_<cT}hEd4HZB%o_OQsl^L70Ju&(6N2Jbrfe
z{_b&PJgA)_dyARwqVQ$xthjN!Eyh&j;D~!^U-07v?ZtU+{rtxuW4xJPKdBd+XtoJk
zHGuql=D%L$>`ld6v71wy8I!eP0o~=RVcFQR2Gr(eP_JbSytoQ$Yt}l*4r@A8Me94y
z8cTDWhqlq^qoAhbOzGBXv^Wa4vUz$(7B!mX`T=x_ueKRRDfg&Uc-e1+z4x$jyW_Pm
zp?U;-R#xt^Z8Ev~`m`iL4*c#65Nn)q#=Y0l1AuD&+{|8-Gsij3LUZXpM0Bx0u7WWm
zH|%yE@-#XEph2}-$-thl+S;__ciBxSSzHveP%~v}5I%u!z_l_KoW{KRx2=eB33umE
zIYFtu^5=wGU`Jab8#}cnYry@9p5UE#U|VVvx_4l49JQ;jQdp(uw=$^A$EA$LM%vmE
zvdEOaIcp5qX8wX{mYf0;#51~imYYPn4=k&#DsKTxo{_Mg*;S495?OBY?#gv=edYC*
z^O@-sd-qa+U24xvcbL0@C7_6o!$`)sVr-jSJE4XQUQ$?L7}2(}Eixqv;L8AdJAVqc
zq}RPgpnDb@E_;?6K58r3h4-!4rT4Ab#rLHLX?eMOfluJk=3i1@Gt1i#iA=O`M0@x!
z(HtJP9BMHXEzuD93m|B&woj0g6T?f#^)>J>|I4C5?Gam>n9!8CT%~aT;=oco5d6U8
zMXl(=W;$ND_8+DD<ykE9Jy7gkqr#{X4q*TB+m~s#gS@r(GY*77ySFy{9E;{vV}3na
z%pxHTT*dvMnlo4+oTy^p7miJ3ziqr(ZOJ)L+PUs&R@+OotCT;pPyt{0jl<-}(V7Gp
zX$>*?|5bJ!;8ebESXMUKBAf7YBwNVJibGaJ*(2G`F%wx)grqVPjudiaq^Kl&g$8A2
zWMxMr@_$c}d<p;ey3Tcu>+;_B`#kUX-t|4VKH&_f^^EP0&=DPLW)H)UzBG%%Tra*5
z%$kyZe3I&S#gfie^z5)!twG={3Cuh)Fde<XTsb9xO3ZH)#ow2vM~pRh=a%Jxr4}vf
zpeoa8O2Xww;R&D4PixE%^{woC{=Bqwy7h$AGh*xb_!Z$59PhU?bnh=6>A!Kj<-9**
zvT*5%Tb`|QbE!iW-XcOuy39>D3oe6x{>&<#E$o8Ac|j)wq#kQzz|ATd=Z0K!p2$QE
zPu?jL8Lb^y3_CQE{*}sTDe!2!dtlFjq&YLY@2#4>XS`}v#PLrpvc4*@q^O{mmnr5D
zmyJq~t?8>FWU5vZdE(%4cuZuao0GNjp3~Dt*SLaxI#g_u>hu@k&9Ho*#CZP~lFJHj
z(e!SYlLigyc?&5-YxlE{uuk$9b&l6d`uIlpg_z15dPo*iU&|Khx2*A5Fp;8iK_bdP
z?T6|^7@lcx2j0T@x>X7|kuuBSB7<^zeY~R~4McconTxA2flHC0_jFxmSTv-~?zVT|
zG_|<oYEZfi84t5$?vv+%b)zg;Tm0h&qX7^OaItn%bat|_vvqef-&inSz3!+*B~MXf
zn>yDqa9lkF*B6_{j=T>=M8r<0s;@z#h)3BQ4NLl@`Xr__o7;~M&dL3J8fP&zLfDfy
z);ckcTev{@OUlZ`<a~3lY1y7T*bPTeFJ6B%#~z9?lT!*(A@tJdla9v|(yEo_D!5l3
zgWpU~zc-S_OEaBH!tqx5iHR`(p_}%5+rGBpw+VO8i%xcu<ZEk%m%_6nMT>bCo(-3?
z1u1xD`PKgSg?RqeVVsF<1SLF;XYA@Bsa&cY!I48ZJn1V<3d!?s=St?T<RZHAo{>Lo
zC0cNr`qD<Wz+@C|#V>*M#s6f~X>SCNVkva^9A2ZP>CoJ9bvgXe_c}WdX-)pHM5m7O
zrHt#g$F0AO+nGA;7dSJ?)|Mo~cf{z2L)Rz!`fpi73Zv)H=a5K)*$5sf_IZypi($P5
zsPwUc4~P-J1@^3C6-r9{V-u0Z&Sl7vNfmuMY4yy*cL>_)BmQF!8Om9Dej%cHxbIzA
zhtV0d{=%cr?;bpBPjt@4w=#<>k5ee=TiWAXM2~tUG<V}0zLoj=i_-Df@ocJ$(doRp
ztKallYpOUL#3IL6u(+quF)vpQn3m46D_;nvUCNo3?ECVPP9X(bd00g%F#AlS@SJ#4
z%8N#aRo==*hh^$QLCs*-+4DRsO2)x^3cbV3Q3KH=HsOMoWaaL-P@E2B9AQu{uH>fm
z$s&!Dm0R^V$}fOR*B^kGaipi~rx~A2cS0;t&k<A0G-}=%(v(Q0cfU+X-TJJhn(DnP
z4JUVy2A}-oOBotf4Se48>hV1a<cf@1eDWd;R?38Krle_gtcZK}=dkLCqItP$?~n+g
zae42{<6B27z2%?Bsw0ffr{rV{k~Rp8I~N^Hl7A(kh?&)UkI(~LwR%>4u38*XRUP~f
za!rZMtay8bsLt6yFYl@>-y^31(*P!L^^s@mslZy(SMsv9bVoX`O#yBgEcjCmGpyc*
zeH$Dw6vB5P*;jor+JOX@;6K#+xc)Z9B8M=x2a@Wx-{snPGpRmOC$zpsqW*JCh@M2Y
z#K+M(>=#d^>Of9C`))h<=Bsy)6zaMJ&x-t%&+Ucp<HIt~W~b;(@$>LjV`jo4R2025
z<Y{{N1{{e3B{Jn+c77XlWtbx9OBU+M_(;<8;0~=8Ph2QMs3+Zw?bSQV;q%^JEaX$e
z;Vd8f)b9ET29wV$Q>XaG8EA!0lQa)|dx-@{O)qP6`$rhCkoQqZ`^SW8g-kOwrwsK8
z3ms*AIcyj}-1x&A&vSq{r=QMyp3CHdWH35!sad#!Sm>^|-|afB+Q;|Iq@LFgqIp#Z
zD1%H+3I?6RGnk&IFo|u+E0dCxXz4yI^1i!QTu7uvIEH>i3rR{srcST`LIRwdV1P;W
z+%AN1NIf@xxvVLiSX`8ILA8MzNqE&7>%jMzGt9wm78bo9<;h*W84i29^w!>V>{N+S
zd`5Zmz^G;f=icvoOZfK5#1ctx*~UwD=ab4DGQXehQ!XYnak*dee%YN$_ZPL%KZuz$
zD;$PpT;HM^$KwtQm@7uvT`i6>Hae1CoRVM2)NL<2-k2PiX=eAx+-6j#JI?M}(tuBW
zkF%jjLR)O`gI2fcPBxF^HeI|DWwQWHVR!;;{BXXHskxh8F@BMDn`oEi-NHt;CLymW
z=KSv5)3dyzec0T5B*`g-MQ<;gz=nIWKUi9ko<|4I(-<w4I#sX{Ql80P;8bcKjlGSK
zp~yQ(;^y0s9RFCvc2u(I^#Y^!@tjudAd*v;f|XiHBQNGS6_b-95puIO<;QO*=%?{0
z;mryS)gDuCe~tZ`DPIW5W_fNj_#jL{`6lJ5cJ6SG=+^EJr^`JeJsTD;MclG_sxisZ
z?uhn5F($|2nJ7pvty*2qAtsOJRY_NI77&m{ISD+{sJ_)^o**`w`N>E0k$QncH>E4l
z**1w&#={&zv4Tvhgz#c29`m|;<Ue5bFAZpjqANUFk~kBGuYK<_JK>lU-jmaXFMC11
z*dlXDMEOG>VoLMc>!rApwOu2prKSi*!w%`yzGmS+k(zm*CsLK*wv{S_0WX^8A-rKy
zbk^Gf_92^7iB_uUF)EE+ET4d|X|>d&mdN?x@vxKAQk`O+r4Qdu>XGy(a(19g;=jU}
zFX{O*_NG>!$@jh!U369Lnc+D~qch3uT+_Amyi}*k#LAAwh}k8IPK5a-WZ81ufD>l>
z$4cF}GSz>ce`3FAic}6W4Z7m9KGO?(eWqi@L|5Hq0@L|&2flN1PVl}XgQ2q*_n2s3
zt5KtowNkTYB5b;SVuoXA@i5irXO)A&%7?V`1@HGCB&)Wgk+l|^XXChq;u(nyPB}b3
zY>m5jkxpZgi)zfbgv&ec4Zqdvm+D<<?3uny=i;xwOlAC_Tc+b0;kY7-vx;A)KO<$b
z!mM&%JEI}t>?Im*mXweS9H+V>)zF#Zp3)bhl$PbISY{5=_z!8&*Jv~NYtI-g!>fDs
zmvL5O^U%!^VaKA9gvKw|5?-jk>~%CVGvctKmP$kpnpfN{D8@X*Aazi$txfa%vd-|E
z>kYmV66W!lNekJPom29LdZ%(I+ZLZYTXzTg*to~m?7vp%{V<~>H+2}PQ?PPAq`36R
z<%wR8v6UkS>Wt#hzGk#44W<%9S=nBfB);6clKwnxY}T*w21Qc3_?IJ@4gYzC7s;WP
zVQNI(M=S=JT#xsZy7G`cR(BP9*je0bfeN8JN5~zY(DDs0t{LpHOIbN);?T-69Pf3R
zSNe*&p2%AwXHL>__g+xd4Hlc_vu<25H?(`nafS%)3UPP7_4;gk-9ckt8SJRTv5v0M
z_Hww`qPudL?ajIR&X*;$y-`<)6dxx1U~5eGS13CB!lX;3w7n&lDDiArbAhSycd}+b
zya_3p@A`$kQy;|NJZ~s44Hqo7Hwt}X86NK=(ey>lgWTtGL6k@Gy;PbO!M%1~Wcn2k
zUFP|*5d>t-X*RU8g%>|(wwj*~#l4z^Aatf^DWd1Wj#Q*AY<o|l&}{LI>0D^V@sC`M
zjJc6qXu0I7<!pZblLF~RwT5!S6dVx}2`xj{-i;+(qkgJG1)noJqLA@@RN<oLUCRPP
zxfjHQUai*rkwqrT60~IzB@%WBX02*tw3*sCrM8W>Y*2;;gGu!plAFzG=J;1%eIOdn
zQA>J&e05UN*7I5@yRhK|lbBSfJ+5Uq;!&HV@xfPZrgD}kE*1DSq^=%{o%|LChhl#0
zlMb<^a6ixzpd{kNZr|3jTGeEzuo}-eLT-)Q$#b{!vKx8Tg}swCni>{#%vDY$Ww$84
zew3c9BBovqb}_&BRo#^!G(<gf6o^lp99LD#kx<MER=<@tCX1^BFTbwM^``7(LOQY@
zEqxVCkp#2PI<XB`ov%%Q&@SoBV=IvAgzt#VzvgC(Kk;TpN40`oC^`5s%Q9iB#w=Cj
zv1+$@qJ9DCi{ddRIdFp4*=KLoO^UY)$YpX=UdXvuhtp5Oj@vhVm%-sV85eDjNH{EX
z*kvKl&?&j<QGMeW7tPWM6{1)n`=ac?#8d9f@kIV3kA+gW*^Tqv$T~yoa2DpOjcxOS
z{G<-ajSf74;}+hudPnyuH|_19-h+%2{H$u`G5T5vjwblv={62_r17YY1X@Bcq7XM-
z)mu@onGHy+sUpJW64FX6=h6@DEhZ~&X>1Eg((BScRZ}C)Oz?y`T5wOrv);)b^4XR8
zhJo7+<^7)qB>I;46!GySzdneZ>n_E1oWZY;kf94#)s)kWjuJN1c+wbVoNQcmnv}{>
zN0pF+Sl3E}UQ$}slSZeLJrwT>Sr}#V(dVaezCQl2|4LN`7L7v&siYR|r7M(*JYfR$
zst3=YaDw$FSc{g}KHO&QiKxuhEzF{f%RJLKe3p*7=oo`WNP)M(9X1zIQPP0XHhY3c
znrP{$4#Ol$A0s|4S7Gx2L23<cPp>dv*Gv2o;h((XVn+9+$qvm}s%zi6nI-_s6?mG!
zj{DV;qesJb&owKeEK?=J>UcAlYckA7Sl+I&IN=yasrZOkejir*kE@SN`fk<8Fgx*$
zy&fE6?}G)d_N`){P~U@1jRVA|2*69)KSe_}!~?+`Yb{Y=O~_+@!j<&oVQQMnhoIRU
zA0CyF1OFfkK44n*JD~!2!SCPM;PRSk%1XL=0&rz00wxPs&-_eapJy#$h!eqY%nS0{
z<se?qfQ89XwwA;8XB>!aGg58JIJP<C?-Lq`lTNsm#AgHVz-Y0s_<jRmVW9#JfaAO^
zUgrN5kYa6CiV<`BwJ8O)sIywY6(a>F3_ci%n)QSVpa2H`vIe$RD43;#IRfDV&Ibit
z+?>HW4{2wOfC6Fw)}4x}i1maDxcE1qi@BS*qcxD2gE@h3#4cgU*D-&3z7D|tVZWt=
z-Cy2+*Cm@P4GN_TPUtaVyVesbVDazF@)j8VJ4>XZv!f%}&eO1SvIgr}4`A*3#vat<
z_MoByL(qW6L7SFZ#|Gc1fFN)L2PxY+{B8tJp+pxRyz*87)vXR}*=&ahXjBlQKguuf
zX6x<<6fQulE^C*KH8~W%ptpaC0l?b=_{~*U4?5Vt;dgM4t_{&UZ1C2j?b><dx`$8!
ze4sJ^8}?7VYiLoIC$69~0MIA!!7Rwu6Dq)kX*<lHqT0U&4WX!<G&bkefpSP0=xCcO
z()hqGP~~kv6H&HvLm+kCE!Nz>b+5}{IF_CUyvz-@QZPMlJ)r_tS$9kH%RPv#2_nMb
zRLj5;chJ72*U`Z@Dqt4$@_+k$%|8m(HqLG!qT4P^DdfvGf&){gKnGCX#H0!;W=AGP
zbA&Z`-__a)VTS}k<aEJ311DSHJIu)Ndl?O_C*N_MS1q7Laqq*zlG()h4UCODa;iH4
z(XC(Z`(-cCxkOrT?MTkb=V=+hyg5L(*^!(=yP$&GArQczUu2*gZo{O9t9~>KFjWGk
z%|>yE?t*EJ!qeQ%dPk$;xIQ+P0;()PCBDgjJm6Buj{f^awNoVx+9<|lg3%-$G(*f)
zll6oOkN|yamn1uyl2*N-lnqRI1cvs_JxLTeahEK=THV$Sz*gQhKNb*p0fNoda#-&F
zB-qJgW^g}!TtM|0bS2QZekW7_tKu%GcJ!4?lObt0z_$mZ4rbQ0o=^curCs3bJK6sq
z9fu-aW-l#>z~ca(B;4yv;2RZ?tGYAU)^)Kz{L|4oP<SkWyBU+f_%F<#?yy=LhA~g^
ztueiO@sJ(BDN3Mz`8So5#&T!OUtM8qWT<xiIyfpo(&lgE-7DEcM?<Kd`UVf_*}r(8
zCzgNsXNSi)1{V0~XToTF|4Nv-??<~$G(Uy7p@qc!_j+!O;`gtF$xU(Y@7%v-yrD2q
z{qJ=kRDjxcFq_oCp_our<PFSF$4y0BpPO%|kqiZgitTQIUv=I!_}1+UsxG+!y@1>j
zdOf_?de|#yS)p2v8-N||+XL=O*%3+y)oI(HbM)Ds?q8~HPzI<h)CPl@-?j`}I~*GQ
zcLT0AdRsV9-Yt|ap{0ce+ueYFd~HkkokH(I37}yNHwen&wj}s>P(vs*G`iddbWq}!
z(2!VjP&{Z1w+%eUq^<EbM|6YYL8Gs1;NfI!i}!ad7AQ0{B*q4GUFLSsTemUjW%3QQ
z?x$O#{du(<S~Tcw-wm+KV87yz$<g}Aw&`BzzwZ7*S)lh#H&`6YcV^kz4bZzc8<<74
zTVg_=YnyK3KuZig$=*P(YT6QgZ5w5ab8RRz^rUbD`bEoj(3{T<PpIR8sX1nHE{??k
LmiCMtn7{r93&V3<

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..442d9132ea
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000000..a69d9cb6c2
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,240 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000000..53a6b238d4
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,91 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/ion-java-cli/README.md b/ion-java-cli/README.md
index 6bc6d9b84e..1d7006d05a 100644
--- a/ion-java-cli/README.md
+++ b/ion-java-cli/README.md
@@ -4,15 +4,14 @@ A Java implementation of CLI where its design document is located in [here](http
 The package is stored under `ion-java/ion-java-cli`.
 
 ## Setup
-Build ion-java-cli. Note that using -f option for ion-java-cli's `pom.xml`.
+Build ion-java-cli.
 ```
-$ mvn -f ion-java-cli/pom.xml install
+./gradle ion-java-cli:build
 ```
 
 ## Getting Started
-Invoking `ion-java-cli-x.y.jar` under `ion-java-cli/target/` directory. <br/> 
+Running the test driver CLI.
 
-For example:
 ```
-java -jar ion-java-cli/target/ion-java-cli-1.0.jar process test_file.ion -f pretty -o output.ion
+./gradlew ion-java-cli:run -q --args="process test_file.ion -f pretty -o output.ion"
 ```
diff --git a/ion-java-cli/build.gradle.kts b/ion-java-cli/build.gradle.kts
new file mode 100644
index 0000000000..288e8b3697
--- /dev/null
+++ b/ion-java-cli/build.gradle.kts
@@ -0,0 +1,28 @@
+plugins {
+    java
+    application
+}
+
+description = "A CLI that implements the standard interface defined by ion-test-driver."
+version = 1.0
+java.sourceCompatibility = JavaVersion.VERSION_1_8
+java.targetCompatibility = JavaVersion.VERSION_1_8
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    implementation("args4j:args4j:2.33")
+    implementation(rootProject)
+}
+
+sourceSets {
+    main {
+        java.srcDir("src")
+    }
+}
+
+application {
+    mainClass.set("com.amazon.tools.cli.IonJavaCli")
+}
diff --git a/ion-java-cli/pom.xml b/ion-java-cli/pom.xml
deleted file mode 100644
index 17dd85d335..0000000000
--- a/ion-java-cli/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<!--
-  ~ Copyright 2007 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License").
-  ~ You may not use this file except in compliance with the License.
-  ~ A copy of the License is located at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ or in the "license" file accompanying this file. This file is distributed
-  ~ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-  ~ express or implied. See the License for the specific language governing
-  ~ permissions and limitations under the License.
-  -->
-
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.amazon.ion</groupId>
-  <artifactId>ion-java-cli</artifactId>
-  <version>1.0</version>
-  <packaging>jar</packaging>
-
-  <name>${project.groupId}:${project.artifactId}</name>
-  <description>
-    A CLI that implements the standard interface defined by ion-test-driver.
-  </description>
-  <url>https://github.com/amzn/ion-java/tree/master/ion-java-cli</url>
-
-  <licenses>
-    <license>
-      <name>The Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <name>Amazon Ion Team</name>
-      <email>ion-team@amazon.com</email>
-      <organization>Amazon</organization>
-      <organizationUrl>https://github.com/amzn</organizationUrl>
-    </developer>
-  </developers>
-
-  <scm>
-    <connection>scm:git:git@github.com:amzn/ion-java.git</connection>
-    <developerConnection>scm:git:git@github.com:amzn/ion-java.git</developerConnection>
-    <url>git@github.com:amzn/ion-java.git</url>
-  </scm>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
-    <build.year>${maven.build.timestamp}</build.year>
-    <jdkVersion>1.8</jdkVersion>
-  </properties>
-
-  <dependencies>
-    <!-- ion-java/tools/cli dependencies -->
-    <dependency>
-      <groupId>args4j</groupId>
-      <artifactId>args4j</artifactId>
-      <version>2.33</version>
-    </dependency>
-    <dependency>
-      <groupId>com.amazon.ion</groupId>
-      <artifactId>ion-java</artifactId>
-      <version>[1.7.0,)</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <sourceDirectory>src</sourceDirectory>
-    <plugins>
-    <!--  used for building ion-java CLI jar-->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.2.0</version>
-        <configuration>
-          <classesDirectory>${project.build.outputDirectory}</classesDirectory>
-          <archive>
-            <manifest>
-              <mainClass>com.amazon.tools.cli.IonJavaCli</mainClass>
-              <useUniqueVersions>false</useUniqueVersions>
-              <addClasspath>true</addClasspath>
-              <classpathPrefix>lib/</classpathPrefix>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <type>jar</type>
-              <includeTypes>jar</includeTypes>
-              <outputDirectory>${project.build.directory}/lib</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.0</version>
-        <configuration>
-          <source>${jdkVersion}</source>
-          <target>${jdkVersion}</target>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/ion-test-driver-run b/ion-test-driver-run
new file mode 100755
index 0000000000..7cf11bed30
--- /dev/null
+++ b/ion-test-driver-run
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+./gradlew ion-java-cli:run -q --args="$*"
\ No newline at end of file
diff --git a/ion-test-driver-setup b/ion-test-driver-setup
new file mode 100755
index 0000000000..efef295ca1
--- /dev/null
+++ b/ion-test-driver-setup
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+./gradlew ion-java-cli:build
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
deleted file mode 100644
index 1d8e61fb7f..0000000000
--- a/pom.xml
+++ /dev/null
@@ -1,357 +0,0 @@
-<!--
-  ~ Copyright 2007 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License").
-  ~ You may not use this file except in compliance with the License.
-  ~ A copy of the License is located at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ or in the "license" file accompanying this file. This file is distributed
-  ~ on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-  ~ express or implied. See the License for the specific language governing
-  ~ permissions and limitations under the License.
-  -->
-
-<project>
-
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.amazon.ion</groupId>
-  <artifactId>ion-java</artifactId>
-  <version>1.9.6-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-
-  <name>${project.groupId}:${project.artifactId}</name>
-  <description>
-    A Java implementation of the Amazon Ion data notation.
-  </description>
-  <url>https://github.com/amzn/ion-java/</url>
-
-  <licenses>
-    <license>
-      <name>The Apache License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <name>Amazon Ion Team</name>
-      <email>ion-team@amazon.com</email>
-      <organization>Amazon</organization>
-      <organizationUrl>https://github.com/amzn</organizationUrl>
-    </developer>
-  </developers>
-
-  <scm>
-    <connection>scm:git:git@github.com:amzn/ion-java.git</connection>
-    <developerConnection>scm:git:git@github.com:amzn/ion-java.git</developerConnection>
-    <url>git@github.com:amzn/ion-java.git</url>
-  </scm>
-
-  <!-- http://central.sonatype.org/pages/ossrh-guide.html -->
-  <distributionManagement>
-    <snapshotRepository>
-      <id>ossrh</id>
-      <url>https://aws.oss.sonatype.org/content/repositories/snapshots</url>
-    </snapshotRepository>
-    <repository>
-      <id>ossrh</id>
-      <url>https://aws.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
-    <build.year>${maven.build.timestamp}</build.year>
-    <!-- As of 2022 we still need to use a parallel property to actually get formatting
-      Don't be fooled if removing the .format line below looks to have no effect- try changing it.
-      See: https://issues.apache.org/jira/browse/MRESOURCES-99
-      -->
-    <maven.build.timestamp.format>yyyy-MM-dd'T'HH:mm:ssXXX</maven.build.timestamp.format>
-    <build.time>${maven.build.timestamp}</build.time>
-    <!-- Can't target 6 from 8
-      https://stackoverflow.com/questions/48146930/is-it-possible-to-compile-project-on-java-8-for-target-java-6
-    -->
-    <jdk.source.version>6</jdk.source.version>
-    <jdk.target.version>6</jdk.target.version>
-  </properties>
-
-  <dependencies>
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.13.1</version>
-      <scope>test</scope>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/org.hamcrest/hamcrest -->
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>pl.pragmatists</groupId>
-      <artifactId>JUnitParams</artifactId>
-      <version>1.1.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <!-- src/main/resources is the default resources directory but it looks like we need to list it explicitly in
-             order to set filtering=true, which does the interpolation in properties files
-             -->
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <sourceDirectory>src</sourceDirectory>
-    <testSourceDirectory>test</testSourceDirectory>
-    <plugins>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.8.1</version>
-        <configuration>
-          <source>${jdk.source.version}</source>
-          <target>${jdk.target.version}</target>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <!-- Run the unit tests. -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.19.1</version>
-        <configuration>
-          <excludes>
-            <exclude>**/*TestCase.java</exclude>
-          </excludes>
-          <argLine>-ea -Xmx3000M ${argLine}</argLine>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>4.1.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>
-              !com.amazon.ion.apps.*,
-              !com.amazon.ion.impl.*,
-              com.amazon.ion.*,
-            </Export-Package>
-            <!-- This can be used to retrieve the compiled JarInfo. -->
-            <Main-Class>com.amazon.ion.impl._Private_CommandLine</Main-Class>
-            <Automatic-Module-Name>com.amazon.ion</Automatic-Module-Name>
-          </instructions>
-        </configuration>
-      </plugin>
-
-      <!-- Code Coverage -->
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.2</version>
-        <executions>
-          <execution>
-            <id>default-prepare-agent</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>default-report</id>
-            <phase>test</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>default-check</id>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <configuration>
-              <rules>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <!-- Static Site generation with all reports -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.7.1</version>
-      </plugin>
-      <!-- TODO findbugs, checkstyle -->
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.2</version>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <!-- select non-aggregate reports -->
-              <report>report</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-
-      <plugin>
-        <!-- Generate the Javadocs. -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.3</version>
-        <configuration>
-          <source>8</source>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <configuration>
-              <excludePackageNames>com.amazon.ion.apps:com.amazon.ion.impl</excludePackageNames>
-              <sourceFileExcludes>
-                <exclude>**/*Private*</exclude>
-              </sourceFileExcludes>
-              <overview>${project.basedir}/src/com/amazon/ion/overview.html</overview>
-              <doctitle>Amazon Ion Java ${project.version} API Reference</doctitle>
-              <windowtitle>Ion Java ${project.version}</windowtitle>
-              <header>Amazon Ion Java ${project.version} API Reference</header>
-              <encoding>UTF-8</encoding>
-              <bottom><![CDATA[<center>Copyright &#169; 2007&ndash;${build.year} Amazon.com. All Rights Reserved.</center>]]></bottom>
-              <name>Ion Java Javadoc</name>
-              <additionalparam>-Xdoclint:none</additionalparam>
-            </configuration>
-            <reports>
-              <report>javadoc-no-fork</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <!-- Findbugs -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>3.0.5</version>
-      </plugin>
-      <!-- PMD -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <version>3.11.0</version>
-        <configuration>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <minimumTokens>100</minimumTokens>
-        </configuration>
-      </plugin>
-      <!-- XLR to add links in reports to code -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>3.0.0</version>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <profiles>
-    <profile>
-      <id>release</id>
-      <build>
-        <plugins>
-
-          <plugin>
-            <!-- Package the source jar. -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <!-- Package the javadoc jar. -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.10.3</version>
-            <configuration>
-              <excludePackageNames>com.amazon.ion.apps:com.amazon.ion.impl</excludePackageNames>
-              <sourceFileExcludes>
-                <exclude>**/*Private*</exclude>
-              </sourceFileExcludes>
-              <overview>${project.basedir}/src/com/amazon/ion/overview.html</overview>
-              <doctitle>Amazon Ion Java ${project.version} API Reference</doctitle>
-              <windowtitle>Ion Java ${project.version}</windowtitle>
-              <header>Amazon Ion Java ${project.version} API Reference</header>
-              <encoding>UTF-8</encoding>
-              <bottom><![CDATA[<center>Copyright &#169; 2007&ndash;${build.year} Amazon.com. All Rights Reserved.</center>]]></bottom>
-              <name>Ion Java Javadoc</name>
-              <additionalparam>-Xdoclint:none</additionalparam>
-            </configuration>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <!-- GPG signing. -->
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.5</version>
-            <executions>
-              <execution>
-                <id>sign-artifacts</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <plugin>
-            <!-- Publish the artifacts. -->
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.3</version>
-            <extensions>true</extensions>
-            <configuration>
-              <serverId>ossrh</serverId>
-              <nexusUrl>https://aws.oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>true</autoReleaseAfterClose>
-            </configuration>
-          </plugin>
-
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-
-</project>
diff --git a/project.version b/project.version
new file mode 100644
index 0000000000..47144dcbf3
--- /dev/null
+++ b/project.version
@@ -0,0 +1 @@
+1.9.6-SNAPSHOT
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 0000000000..06a2b7f50d
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,2 @@
+rootProject.name = "ion-java"
+include("ion-java-cli")
diff --git a/src/com/amazon/ion/util/JarInfo.java b/src/com/amazon/ion/util/JarInfo.java
index 061ee2340c..d7e0f3abea 100644
--- a/src/com/amazon/ion/util/JarInfo.java
+++ b/src/com/amazon/ion/util/JarInfo.java
@@ -86,7 +86,7 @@ private static String nonEmptyProperty(Properties props, String name)
     private void loadBuildProperties()
             throws IonException
     {
-        String file = "/build.properties";
+        String file = "/ion-java.properties";
         try
         {
             Properties props = new Properties();
diff --git a/src/main/resources/build.properties b/src/main/resources/build.properties
deleted file mode 100644
index 3894cedaa4..0000000000
--- a/src/main/resources/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# These values are defined in pom.xml
-build.version=${pom.version}
-build.time=${build.time}
-build.name=${pom.name}

From ff91d4c3fdd529c03b419b3813912bc5f1006716 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Fri, 11 Nov 2022 12:01:25 -0800
Subject: [PATCH 179/490] General improvements to CI workflows

---
 .github/actions/inspect-version/action.yml    | 99 +++++++++++++++++++
 ...ub-prerelease-after-fast-forward-check.yml | 74 --------------
 .github/workflows/main.yml                    | 45 +++++----
 .github/workflows/prepare-release.yml         | 75 ++++++++++++++
 .../workflows/publish-release-artifacts.yml   | 61 ++++++++++++
 .../workflows/test-inspect-version-action.yml | 90 +++++++++++++++++
 .../version-bump-and-fast-forward-check.yml   | 91 -----------------
 7 files changed, 350 insertions(+), 185 deletions(-)
 create mode 100644 .github/actions/inspect-version/action.yml
 delete mode 100644 .github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
 create mode 100644 .github/workflows/prepare-release.yml
 create mode 100644 .github/workflows/publish-release-artifacts.yml
 create mode 100644 .github/workflows/test-inspect-version-action.yml
 delete mode 100644 .github/workflows/version-bump-and-fast-forward-check.yml

diff --git a/.github/actions/inspect-version/action.yml b/.github/actions/inspect-version/action.yml
new file mode 100644
index 0000000000..dd34cd7d8b
--- /dev/null
+++ b/.github/actions/inspect-version/action.yml
@@ -0,0 +1,99 @@
+# With a bit of work, this reusable composite action could be used by ANY of our repos
+# that use semantic versioned releases. In order to make it reusable in other repos, we
+# need to move it to a separate repo so that it can be versioned independently of ion-java.
+#
+# See https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
+#
+# However, the more maintainable long-term solution is to rewrite this action as a
+# Javascript-based action.
+# See https://docs.github.com/en/actions/creating-actions/creating-a-javascript-action
+
+name: Inspect Version
+
+description: >
+  Inspects whether the version is a release version (i.e. has no "-SNAPSHOT" or "-beta"
+  suffixes) and whether the release version is greater than the most recent release on GitHub.
+  The action can optionally have an outcome of 'failure' if the version is a release version
+  that is not valid to release (i.e. not greater than latest existing release).
+  
+  When using this action, you should provide a github API auth token in the environment to 
+  prevent being throttled by the GitHub API and to ensure that the action can read the 
+  latest release of the repository, if the repository is private.
+  
+  Example usage:
+  ```yaml
+      - uses: ./.github/actions/inspect-version
+        env:
+          GITHUB_TOKEN: $\{{ secrets.GITHUB_TOKEN }}
+        with:
+          project_version: $\{{ env.PROJECT_VERSION }}
+          repo: amzn/ion-java
+          fail_if_invalid: true
+  ```
+
+inputs:
+  project_version:
+    description: The semantic version of the project.
+    required: true
+  repo:
+    description: The source repo in 'org/repo-name' form
+    required: true
+  fail_if_invalid:
+    description: Whether the action should fail if the conditions are not met.
+    required: false
+    default: 'false'
+
+outputs:
+  is_newest:
+    description: Whether or not the project version is greater than the most recent existing version
+    value: ${{ steps.inspection.outputs.is_newest }}
+  is_release:
+    description: Whether or not the version is a release version
+    value: ${{ steps.inspection.outputs.is_release }}
+  is_valid_to_release:
+    description: Whether or not the version is valid to release
+    value: ${{ steps.inspection.outputs.is_release == 'true' && steps.inspection.outputs.is_newest == 'true' }}
+
+runs:
+  using: composite
+  steps:
+    - name: Get latest release version
+      # TODO: Consider handling cases where most recent release is not the "latest"
+      # This step assumes that the most recent release will have the highest version number.
+      # That is usually true, but it is NOT guaranteed.
+      shell: bash
+      run: |
+        echo "LATEST_RELEASE_VERSION=$(gh release view -R "${{ inputs.repo }}" --json tagName --jq '.tagName')" >> $GITHUB_ENV
+    - name: Compare the library version with the latest release version
+      # TODO: Replace this with a stricter check that the library version is one of the three
+      # possible subsequent versions. E.g. if latest version is 1.2.3, then library version
+      # should be one of 1.2.4, 1.3.0, or 2.0.0
+      id: is-greater-version
+      uses: popematt/compare-semvers@v1
+      with:
+        first: ${{ inputs.project_version }}
+        second: ${{ env.LATEST_RELEASE_VERSION }}
+    - name: Inspect Version
+      id: inspection
+      shell: bash
+      run: |
+        if [[ "${{ steps.is-greater-version.outputs.result }}" == 1 ]]; then
+          IS_NEWEST=true;
+        else
+          IS_NEWEST=false;
+        fi
+        echo "Is Newest? $IS_NEWEST";
+        echo "is_newest=$IS_NEWEST" >> $GITHUB_OUTPUT;
+        
+        pattern='^v?[0-9]+\.[0-9]+\.[0-9]+$'
+        if [[ "${{ inputs.project_version }}" =~ $pattern ]]; then
+          IS_RELEASE=true;
+        else
+          IS_RELEASE=false;
+        fi
+        echo "Is Release? $IS_RELEASE";
+        echo "is_release=$IS_RELEASE" >> $GITHUB_OUTPUT;
+    - name: Exit with Error
+      if: ${{ inputs.fail_if_invalid == 'true' && steps.inspection.outputs.is_newest != 'true' && steps.inspection.outputs.is_release == 'true' }}
+      shell: bash
+      run: exit 1
diff --git a/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml b/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
deleted file mode 100644
index aa54308bd3..0000000000
--- a/.github/workflows/create-gitHub-prerelease-after-fast-forward-check.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-name: Create GitHub prerelease after fast-forward check
-on:
-  pull_request:
-    types:
-      - closed
-
-jobs:
-  check-version-change:
-    if: github.event.pull_request.merged == true
-    name: check-version-change
-    runs-on: ubuntu-latest
-    outputs:
-      output1: ${{ steps.check-version-change.outputs.result }}
-    steps:
-      - name: Checkout the current repository master branch
-        uses: actions/checkout@v3
-        with:
-          repository: amzn/ion-java
-          ref: master
-          fetch-depth: 2
-          path: ion-java-current
-
-      - name: Check whether the pull request contains version number bump
-        id: check-version-change
-        run: |
-          cd ion-java-current
-          versionNew="$(<project.version)"
-          git reset --hard HEAD^
-          versionPrevious="$(<project.version)"
-          if [[ $versionNew != $versionPrevious ]]; then echo "::set-output name=result::pass"; else echo "::set-output name=result::failed"; fi
-
-  prerelease:
-    name: prerelease
-    needs: check-version-change
-    if: ${{ needs.check-version-change.outputs.output1 == 'pass' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Access to the incoming release
-        uses: actions/checkout@v3
-        with:
-          repository: amzn/ion-java
-          path: current_release
-
-      - name: Build ion-java
-        run: |
-          cd current_release
-          ./gradlew build
-
-      - name: Get the parameters of executable jar
-        run: |
-          cd current_release/target
-          echo "path=$(readlink -f $(ls *.jar))" >> $GITHUB_ENV
-          echo "file_name=$(ls *.jar)" >> $GITHUB_ENV
-          cd .. && echo "version_number=$(<project.version)" >> $GITHUB_ENV
-
-      - name: Create new release
-        id: create_new_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          tag_name: v${{ env.version_number }}
-          release_name: v${{ env.version_number }}
-          prerelease: true
-
-      - name: Upload release asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_new_release.outputs.upload_url }}
-          asset_path: ${{ env.path }}
-          asset_name: ${{ env.file_name }}
-          asset_content_type: application/zip
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d5ed52e144..9a6613b2a1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,38 +12,43 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [8, 9, 10, 11]
+        include:
+          - java: 8
+            upload_reports: true
+          - java: 11
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
       - name: Use java ${{ matrix.java }}
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          distribution: 'zulu'
+          distribution: 'corretto'
           java-version: ${{ matrix.java }}
       - uses: gradle/gradle-build-action@v2
         with:
           arguments: build
       - run: ./ion-test-driver-run version
+      - if: ${{ matrix.upload_reports }}
+        uses: codecov/codecov-action@v3
+        with:
+          files: build/reports/jacoco/test/jacocoTestReport.xml
 
-  report-generation:
+  check-version:
+    # Ensures that the version is not a release (i.e. -SNAPSHOT) or if it is a release version,
+    # ensures that the version is a later version number than the existing releases.
+    # See limitations at:
+    # https://github.com/amzn/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Use java 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - uses: gradle/gradle-build-action@v2
+      - uses: actions/checkout@v3
+      - name: Get Project Version
+        run: |
+          echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
+      - uses: ./.github/actions/inspect-version
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          arguments: test
-      - uses: codecov/codecov-action@v1
-        with:
-          file: build/reports/jacoco/test/jacocoTestReport.xml
-
-
-
-
+          repo: amzn/ion-java
+          project_version: ${{ env.PROJECT_VERSION }}
+          fail_if_invalid: true
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
new file mode 100644
index 0000000000..a98b44604f
--- /dev/null
+++ b/.github/workflows/prepare-release.yml
@@ -0,0 +1,75 @@
+# This workflow runs when a commit is pushed to 'master' that has a change to the
+# 'project.version' file. Since we have a branch protection rule for 'master', a push
+# event is functionally the same as a merged PR event.
+#
+# If the project/library version is not a snapshot version, and it is greater than the
+# latest release in GitHub, then it creates a draft PR for the new library version.
+# This workflow always compares against the releases in amzn/ion-java, but will create
+# a draft release in a forked repository if the workflow is triggered in a fork.
+# See limitations at:
+# https://github.com/amzn/ion-java/blob/master/.github/actions/inspect-version/action.yml
+#
+# This workflow is almost a reusable workflow that can be used by any of our repos that
+# use semantic versioned releases. In order to make it reusable, we need to move it to
+# a separate repo, update the workflow trigger ('on') to be 'workflow_call', and define
+# inputs for any context that needs to be passed in. Any repo that uses this must either
+# pass in the library version as a workflow argument, or it will need to have the
+# `project.version` file. Also, there are some references to the 'master' branch that
+# will need to be factored out (since some of our repos use 'main' as the default branch).
+# Finally, there are references to "amzn/ion-java" should come from an input variable
+# or be retrieved from the GitHub Actions context.
+# See https://docs.github.com/en/actions/using-workflows/reusing-workflows
+#
+# This could also be bundled into a composite custom action instead of a workflow.
+# See https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
+
+name: Prepare Release
+on:
+  # We have a branch protection rule for master, so all commits to master require
+  # an approved PR. That means this workflow trigger is effectively equivalent to
+  # "on: PR that is merged into master"
+  push:
+    branches:
+      - 'master'
+    paths:
+      - 'project.version'
+  # Allow it to be manually triggered if necessary
+  workflow_dispatch:
+
+jobs:
+  check-version:
+    name: Check Project Version
+    runs-on: ubuntu-latest
+    outputs:
+      should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Get project version
+        run: |
+          echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
+      - uses: ./.github/actions/inspect-version
+        id: inspect
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          repo: amzn/ion-java
+          project_version: ${{ env.PROJECT_VERSION }}
+      - run: |
+          echo "Result: ${{ toJSON(steps.inspect.outputs) }}"
+  create-draft:
+    name: Create Draft
+    runs-on: ubuntu-latest
+    needs: check-version
+    if: ${{ needs.check-version.outputs.should_create_draft == 'true' }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Create a draft release
+        shell: bash
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          echo "valid to release: ${{ needs.check-version.steps.inspect.outputs.is_valid_to_release }}"
+          RELEASE_TAG="v$(<project.version)"
+          # This intentionally creates the draft release in the current repo, which
+          # could be a fork, if this workflow was triggered in a fork.
+          gh release create "$RELEASE_TAG" --draft --generate-notes
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
new file mode 100644
index 0000000000..d1dc91a0f3
--- /dev/null
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -0,0 +1,61 @@
+# This workflow runs when a GitHub release is published.
+#
+# It validates that the tag correctly matches the library version, and then publishes
+# artifacts for the release. Currently, this includes uploading the compiled Jar to
+# the GitHub release. However, it should be extended to also include PGP signing and
+# uploading to Maven Central.
+#
+# This workflow is almost a reusable workflow that can be used by any of our Gradle/JVM
+# libraries. In order to make it reusable, we need to move it to a separate repo, update
+# the workflow trigger ('on') to be 'workflow_call', and define inputs for any context
+# that needs to be passed in.
+#
+# See https://docs.github.com/en/actions/using-workflows/reusing-workflows
+#
+# TODO: Consider whether we should merge this with the "prepare-release" workflow rather
+# than having separate workflows.
+
+name: Publish Artifacts for Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  check-tag:
+    # First, a sanity check to ensure that the library version matches the release version
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Validate project version matches tag
+        shell: bash
+        run: |
+          RELEASE_TAG=${GITHUB_REF#refs/tags/}
+          # the tag should start with `v`, so prepend `v` to the contents of project.version
+          PROJECT_VERSION="v$(<project.version)"
+          echo "Project Version: $PROJECT_VERSION"
+          echo "Release Tag: $RELEASE_TAG"
+          [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
+  publish-to-github-release:
+    # only run if `check-tag` completes successfully
+    needs: check-tag
+    runs-on: ubuntu-latest
+    steps:
+        # TODO: replace with artifact upload/download -- make sure there's no race condition with other builds also
+        # uploaading an artifact.
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: gradle/gradle-build-action@v2
+        with:
+          arguments: build
+      - name: Upload Jar to GitHub release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # TODO - reusability
+        # the location of the library(s) should be configurable as an input
+        # parameter rather than being hard coded as `build/lib/ion-java...`
+        # It may also need to be able to upload more than one file.
+        run: |
+          gh release upload "v$(<project.version)" "build/libs/ion-java-$(<project.version).jar"
+  # TODO: Add `publish-to-maven-central` job
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
new file mode 100644
index 0000000000..0191fdc6b6
--- /dev/null
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -0,0 +1,90 @@
+# Test cases for the 'inspect-version' action
+
+name: Test 'inspect-version' Action
+
+on:
+  pull_request:
+    paths:
+      - .github/actions/inspect-version/action.yml
+      - .github/workflows/test-inspect-version-action.yml
+  push:
+    paths:
+      - .github/actions/inspect-version/action.yml
+      - .github/workflows/test-inspect-version-action.yml
+
+jobs:
+  run-tests:
+    runs-on: ubuntu-latest
+    strategy:
+      # Parameterized testing!
+      # The matrix has 3 parameters -- "version" and "fail_if_invalid" correspond
+      # to the action inputs. The "expected" parameter can either be a json object of the
+      # expected outputs or it can be the string 'action_failure' to indicate that we
+      # expect the action outcome to be 'failure'.
+      fail-fast: false
+      matrix:
+        include:
+          - version: '1.0.0'
+            expected: { is_newest: false, is_release: true, is_valid_to_release: false }
+
+          - version: '1.0.0'
+            fail_if_invalid: true
+            expected: action_failure
+
+          - version: 'v1.0.0'
+            expected: { is_newest: false, is_release: true, is_valid_to_release: false }
+
+          - version: '3.0.0'
+            fail_if_invalid: true
+            expected: { is_newest: true, is_release: true, is_valid_to_release: true }
+
+          - version: 'v3.0.0'
+            expected: { is_newest: true, is_release: true, is_valid_to_release: true }
+
+          - version: '1.0.0-SNAPSHOT'
+            fail_if_invalid: true
+            expected: { is_newest: false, is_release: false, is_valid_to_release: false }
+
+          - version: 'v1.0.0-SNAPSHOT'
+            expected: { is_newest: false, is_release: false, is_valid_to_release: false }
+
+          - version: 'nonsense_version'
+            expected: action_failure
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Invoke Action
+        id: inspect
+        continue-on-error: ${{ matrix.expected == 'action_failure' }}
+        uses: ./.github/actions/inspect-version
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          repo: amzn/ion-java
+          project_version: ${{ matrix.version }}
+          fail_if_invalid: ${{ matrix.fail_if_invalid }}
+
+      - name: Check For Expected Error
+        if: ${{ matrix.expected == 'action_failure' }}
+        shell: bash
+        run: |
+          PASS=${{ steps.test_fail.outcome != 'failure' }}
+          if [[ $PASS == 'false' ]]; then exit 1; fi
+
+      - name: Check For Expected Output
+        if: ${{ matrix.expected != 'action_failure' }}
+        shell: bash
+        # Comparing the whole objects directly doesn't work because GitHub Actions
+        # expressions will only compare objects by reference.
+        env:
+          PASS: >
+            ${{ 
+              matrix.expected.is_newest == steps.inspect.outputs.is_newest 
+                && matrix.expected.is_release == steps.inspect.outputs.is_release 
+                && matrix.expected.is_valid_to_release == steps.inspect.outputs.is_valid_to_release 
+            }}
+        run: |
+          echo "Pass? $PASS"
+          echo "expected: ${{ toJSON(matrix.expected) }}"
+          echo "was: ${{ toJSON(steps.inspect.outputs) }}"
+          if [[ $PASS == 'false' ]]; then exit 1; fi
diff --git a/.github/workflows/version-bump-and-fast-forward-check.yml b/.github/workflows/version-bump-and-fast-forward-check.yml
deleted file mode 100644
index 1d27f5acd5..0000000000
--- a/.github/workflows/version-bump-and-fast-forward-check.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-name: Version-bump-and-fast-forward-check
-on: [pull_request]
-
-jobs:
-  check-version-bump:
-    name: check-version-bump
-    runs-on: ubuntu-latest
-    outputs:
-      output1: ${{ steps.check-version-change.outputs.result }}
-    steps:
-      - name: Switch to the branch of the pull request
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          path: ion-java-new
-
-      - name: Checkout the current repository master branch
-        uses: actions/checkout@v3
-        with:
-          repository: amzn/ion-java
-          ref: master
-          path: ion-java-current
-
-      - name: Check whether the pull request contains version number bump
-        id: check-version-change
-        run: |
-          cd /home/runner/work/ion-java/ion-java/ion-java-new
-          versionNew="$(<project.version)"
-          commitID=$(git rev-parse HEAD)
-          cd /home/runner/work/ion-java/ion-java/ion-java-current
-          versionCurrent="$(<project.version)"
-          if [[ $versionNew != $versionCurrent ]]; then echo "::set-output name=result::pass"; else echo "::set-output name=result::failed"; fi
-
-  fast-forward-check:
-    needs: check-version-bump
-    name: fast-forward-check
-    if: ${{ needs.check-version-bump.outputs.output1 == 'pass' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Access to the last release
-        uses: oprypin/find-latest-tag@v1
-        id: check_last_release
-        with:
-          repository: amzn/ion-java
-          releases-only: true
-
-      - name: Checkout the last release
-        uses: actions/checkout@v3
-        with:
-          repository: amzn/ion-java
-          ref: ${{ steps.check_last_release.outputs.tag }}
-          path: last-release
-
-      - name: Get the commit id of the last release
-        run: |
-          cd last-release
-          echo "last_release_commit_id=$(git rev-parse HEAD)" >> $GITHUB_ENV
-
-      - name: Access to the incoming release
-        uses: actions/checkout@v3
-        with:
-          repository: amzn/ion-java
-          ref: ${{ github.event.pull_request.head.sha }}
-          path: ion-java-new
-
-      - name: Get the commit id of the incoming release
-        run: |
-          cd ion-java-new
-          echo "current_release_commit_id=$(git rev-parse HEAD)" >> $GITHUB_ENV
-          echo $(git rev-parse HEAD)
-
-      - name: Check whether the incoming release is fast-forward compared to the last release
-        run: |
-          cd ion-java-new 
-          if git merge-base --is-ancestor ${{env.last_release_commit_id}} ${{env.current_release_commit_id}}; then echo "Trigger github release"; else exit 1; fi
-
-      - name: comment
-        if: ${{ success() }}
-        uses: peter-evans/create-or-update-comment@v2
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            This PR passes version bump check and fast-forward check, please double check the version number and merge this PR. After merging this PR, "Create gitHub prerelease after fast-forward check" workflow will be automatically triggered to create prerelease.
-
-      - name: comment
-        if: ${{ failure() }}
-        uses: peter-evans/create-or-update-comment@v2
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            This PR is not fast-forward compared to the last release, please check.

From 9531842e5b93daf2daf33ebc2720bd77b9e304bd Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Fri, 18 Nov 2022 08:29:55 -0800
Subject: [PATCH 180/490] Adds Software BOM to releases

Signed-off-by: Matthew Pope <popematt@amazon.com>
---
 .github/workflows/publish-release-artifacts.yml | 3 ++-
 build.gradle.kts                                | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index d1dc91a0f3..a708b057fd 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -48,7 +48,7 @@ jobs:
           submodules: recursive
       - uses: gradle/gradle-build-action@v2
         with:
-          arguments: build
+          arguments: build cyclonedxBom
       - name: Upload Jar to GitHub release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -58,4 +58,5 @@ jobs:
         # It may also need to be able to upload more than one file.
         run: |
           gh release upload "v$(<project.version)" "build/libs/ion-java-$(<project.version).jar"
+          gh release upload "v$(<project.version)" "build/reports/bom.json"
   # TODO: Add `publish-to-maven-central` job
diff --git a/build.gradle.kts b/build.gradle.kts
index d877473aed..dbb6456154 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,6 +7,7 @@ plugins {
     `maven-publish`
     jacoco
     signing
+    id("org.cyclonedx.bom") version "1.7.2"
     // TODO: static analysis. E.g.:
     // id("com.diffplug.spotless") version "6.11.0"
     // id("com.github.spotbugs") version "4.8.0"
@@ -107,6 +108,11 @@ tasks {
     withType<Sign> {
         setOnlyIf { isReleaseVersion && gradle.taskGraph.hasTask("publish") }
     }
+
+    cyclonedxBom {
+        setIncludeConfigs(listOf("runtimeClasspath"))
+        setSkipConfigs(listOf("compileClasspath", "testCompileClasspath"))
+    }
 }
 
 publishing {

From f16ab292c70f620dc7d6399570b4cf631ad639da Mon Sep 17 00:00:00 2001
From: Dhiresh A Jain <dhireshajain94@gmail.com>
Date: Tue, 10 Jan 2023 02:38:02 +0530
Subject: [PATCH 181/490] Fixing Ion Cookbook url (#464)

Updated to working cookbook url https://amazon-ion.github.io/ion-docs/guides/cookbook.html
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c715520b82..8f19b1c470 100644
--- a/README.md
+++ b/README.md
@@ -79,6 +79,6 @@ source libraries. We still maintain the legacy group id but strongly encourage u
 to the official one.
 
 ## Using the Library
-A great way to get started is to use the [Ion cookbook](http://amzn.github.io/ion-docs/cookbook.html).
+A great way to get started is to use the [Ion cookbook](https://amazon-ion.github.io/ion-docs/guides/cookbook.html).
 The [API documentation](http://www.javadoc.io/doc/com.amazon.ion/ion-java) will give a lot
 of detailed information about how to use the library.

From 59e2a84bed64b519fa06024d241ad8250b1d4e8c Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Wed, 18 Jan 2023 16:32:11 -0800
Subject: [PATCH 182/490] Update all references to the GitHub organization:
 amzn -> amazon-ion

---
 .github/actions/inspect-version/action.yml     |  2 +-
 ...on-java-performance-regression-detector.yml |  4 ++--
 .github/workflows/ion-test-driver.yml          |  6 +++---
 .github/workflows/main.yml                     |  4 ++--
 .github/workflows/prepare-release.yml          |  8 ++++----
 .../workflows/test-inspect-version-action.yml  |  2 +-
 .gitmodules                                    |  2 +-
 CONTRIBUTING.md                                |  6 +++---
 README.md                                      |  6 +++---
 build.gradle.kts                               | 10 +++++-----
 ion-java-cli/README.md                         |  2 +-
 src/com/amazon/ion/IonCatalog.java             |  2 +-
 src/com/amazon/ion/IonDatagram.java            | 16 ++++++++--------
 src/com/amazon/ion/IonReader.java              |  4 ++--
 src/com/amazon/ion/IonSystem.java              |  2 +-
 src/com/amazon/ion/IonTimestamp.java           |  2 +-
 .../ion/SubstituteSymbolTableException.java    |  2 +-
 src/com/amazon/ion/SymbolTable.java            |  2 +-
 src/com/amazon/ion/Timestamp.java              |  2 +-
 src/com/amazon/ion/impl/ImportLocation.java    |  2 +-
 src/com/amazon/ion/impl/IonBinary.java         |  2 +-
 .../amazon/ion/impl/IonReaderBinaryRawX.java   | 10 +++++-----
 .../ion/impl/IonReaderBinarySystemX.java       |  2 +-
 .../amazon/ion/impl/IonReaderBinaryUserX.java  |  8 ++++----
 src/com/amazon/ion/impl/IonReaderTextRawX.java |  2 +-
 .../amazon/ion/impl/IonReaderTextSystemX.java  |  2 +-
 src/com/amazon/ion/impl/IonTypeID.java         |  2 +-
 src/com/amazon/ion/impl/IonWriterSystem.java   | 12 ++++++------
 .../amazon/ion/impl/IonWriterSystemText.java   |  2 +-
 .../amazon/ion/impl/IonWriterUserBinary.java   |  2 +-
 src/com/amazon/ion/impl/LocalSymbolTable.java  |  4 ++--
 .../ion/impl/LocalSymbolTableImports.java      |  2 +-
 src/com/amazon/ion/impl/SharedSymbolTable.java |  8 ++++----
 src/com/amazon/ion/impl/SymbolTokenImpl.java   |  2 +-
 .../impl/_Private_IonBinaryWriterBuilder.java  |  6 +++---
 .../amazon/ion/impl/_Private_IonConstants.java |  2 +-
 .../amazon/ion/impl/_Private_IonSystem.java    |  4 ++--
 src/com/amazon/ion/impl/_Private_Utils.java    |  8 ++++----
 .../ion/impl/bin/IonRawBinaryWriter.java       |  2 +-
 .../amazon/ion/impl/lite/IonContainerLite.java |  2 +-
 .../amazon/ion/impl/lite/IonDatagramLite.java  |  2 +-
 .../amazon/ion/impl/lite/IonStructLite.java    |  2 +-
 .../amazon/ion/impl/lite/IonSymbolLite.java    | 10 +++++-----
 .../amazon/ion/impl/lite/IonSystemLite.java    |  2 +-
 src/com/amazon/ion/impl/lite/IonValueLite.java | 10 +++++-----
 .../ion/impl/lite/ReverseBinaryEncoder.java    |  6 +++---
 .../amazon/ion/impl/lite/TopLevelContext.java  |  2 +-
 src/com/amazon/ion/overview.html               |  2 +-
 .../ion/system/IonTextWriterBuilder.java       |  2 +-
 src/com/amazon/ion/util/Equivalence.java       | 14 +++++++-------
 test/com/amazon/ion/CloneTest.java             |  6 +++---
 test/com/amazon/ion/ContainerTestCase.java     |  4 ++--
 test/com/amazon/ion/DatagramTest.java          | 12 ++++++------
 test/com/amazon/ion/FloatTest.java             |  2 +-
 test/com/amazon/ion/IonTestCase.java           |  2 +-
 test/com/amazon/ion/IonValueTest.java          |  4 ++--
 test/com/amazon/ion/NopPaddingTest.java        |  2 +-
 test/com/amazon/ion/RoundTripTest.java         |  4 ++--
 test/com/amazon/ion/SequenceTestCase.java      |  2 +-
 .../amazon/ion/SystemProcessingTestCase.java   |  4 ++--
 test/com/amazon/ion/TestUtils.java             | 18 +++++++++---------
 test/com/amazon/ion/TimestampTest.java         |  6 +++---
 test/com/amazon/ion/TrBwBrProcessingTest.java  |  2 +-
 test/com/amazon/ion/TrueSequenceTestCase.java  | 16 ++++++++--------
 test/com/amazon/ion/impl/BinaryWriterTest.java |  6 +++---
 .../amazon/ion/impl/IonMarkupWriterTest.java   |  2 +-
 .../com/amazon/ion/impl/IonWriterTestCase.java | 14 +++++++-------
 .../OptimizedBinaryWriterSymbolTableTest.java  |  4 ++--
 .../impl/OptimizedBinaryWriterTestCase.java    |  4 ++--
 .../ion/impl/OutputStreamWriterTestCase.java   |  4 ++--
 test/com/amazon/ion/impl/SymbolTableTest.java  |  4 ++--
 test/com/amazon/ion/impl/TextWriterTest.java   |  2 +-
 test/com/amazon/ion/impl/ValueWriterTest.java  |  6 +++---
 test/com/amazon/ion/junit/IonAssert.java       |  2 +-
 .../ion/streaming/BinaryStreamingTest.java     |  2 +-
 .../ion/streaming/ReaderFacetTestCase.java     |  2 +-
 test/com/amazon/ion/streaming/ReaderTest.java  |  4 ++--
 .../ion/streaming/RoundTripStreamingTest.java  |  2 +-
 test/com/amazon/ion/util/EquivalenceTest.java  |  4 ++--
 79 files changed, 184 insertions(+), 184 deletions(-)

diff --git a/.github/actions/inspect-version/action.yml b/.github/actions/inspect-version/action.yml
index dd34cd7d8b..77e3f53370 100644
--- a/.github/actions/inspect-version/action.yml
+++ b/.github/actions/inspect-version/action.yml
@@ -27,7 +27,7 @@ description: >
           GITHUB_TOKEN: $\{{ secrets.GITHUB_TOKEN }}
         with:
           project_version: $\{{ env.PROJECT_VERSION }}
-          repo: amzn/ion-java
+          repo: amazon-ion/ion-java
           fail_if_invalid: true
   ```
 
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 277ccff505..ae6e3b668b 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Checkout ion-java-benchmark-cli
         uses: actions/checkout@v2
         with:
-          repository: amzn/ion-java-benchmark-cli
+          repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
@@ -72,7 +72,7 @@ jobs:
       - name: Checkout the current commit
         uses: actions/checkout@v2
         with:
-          repository: amzn/ion-java
+          repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index e39846aed3..c7b166b8e0 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -9,14 +9,14 @@ jobs:
       - name: Checkout ion-java
         uses: actions/checkout@master
         with:
-          repository: amzn/ion-java
+          repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
         uses: actions/checkout@master
         with:
-          repository: amzn/ion-test-driver
+          repository: amazon-ion/ion-test-driver
           ref: master
           path: ion-test-driver
 
@@ -36,7 +36,7 @@ jobs:
       - name: Run ion-test-driver
         run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -o output
           -i ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }}
-          --replace ion-java,https://github.com/amzn/ion-java.git,$main
+          --replace ion-java,https://github.com/amazon-ion/ion-java.git,$main
 
       - name: Upload result
         uses: actions/upload-artifact@v2
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9a6613b2a1..e0bbcde442 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,7 +38,7 @@ jobs:
     # Ensures that the version is not a release (i.e. -SNAPSHOT) or if it is a release version,
     # ensures that the version is a later version number than the existing releases.
     # See limitations at:
-    # https://github.com/amzn/ion-java/blob/master/.github/actions/inspect-version/action.yml
+    # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -49,6 +49,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          repo: amzn/ion-java
+          repo: amazon-ion/ion-java
           project_version: ${{ env.PROJECT_VERSION }}
           fail_if_invalid: true
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index a98b44604f..beff803d54 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -4,10 +4,10 @@
 #
 # If the project/library version is not a snapshot version, and it is greater than the
 # latest release in GitHub, then it creates a draft PR for the new library version.
-# This workflow always compares against the releases in amzn/ion-java, but will create
+# This workflow always compares against the releases in amazon-ion/ion-java, but will create
 # a draft release in a forked repository if the workflow is triggered in a fork.
 # See limitations at:
-# https://github.com/amzn/ion-java/blob/master/.github/actions/inspect-version/action.yml
+# https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
 #
 # This workflow is almost a reusable workflow that can be used by any of our repos that
 # use semantic versioned releases. In order to make it reusable, we need to move it to
@@ -16,7 +16,7 @@
 # pass in the library version as a workflow argument, or it will need to have the
 # `project.version` file. Also, there are some references to the 'master' branch that
 # will need to be factored out (since some of our repos use 'main' as the default branch).
-# Finally, there are references to "amzn/ion-java" should come from an input variable
+# Finally, there are references to "amazon-ion/ion-java" should come from an input variable
 # or be retrieved from the GitHub Actions context.
 # See https://docs.github.com/en/actions/using-workflows/reusing-workflows
 #
@@ -52,7 +52,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          repo: amzn/ion-java
+          repo: amazon-ion/ion-java
           project_version: ${{ env.PROJECT_VERSION }}
       - run: |
           echo "Result: ${{ toJSON(steps.inspect.outputs) }}"
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index 0191fdc6b6..e7d5bf4bcf 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -60,7 +60,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          repo: amzn/ion-java
+          repo: amazon-ion/ion-java
           project_version: ${{ matrix.version }}
           fail_if_invalid: ${{ matrix.fail_if_invalid }}
 
diff --git a/.gitmodules b/.gitmodules
index 38171e6698..23a0a7946d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "ion-tests"]
 	path = ion-tests
-	url = https://github.com/amzn/ion-tests.git
+	url = https://github.com/amazon-ion/ion-tests.git
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f226f24d2d..b81cdc1215 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,7 +11,7 @@ information to effectively respond to your bug report or contribution.
 
 We welcome you to use the GitHub issue tracker to report bugs or suggest features.
 
-When filing an issue, please check [existing open](https://github.com/amzn/ion-java/issues), or [recently closed](https://github.com/amzn/ion-java/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
+When filing an issue, please check [existing open](https://github.com/amazon-ion/ion-java/issues), or [recently closed](https://github.com/amazon-ion/ion-java/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aclosed%20), issues to make sure somebody else hasn't already
 reported the issue. Please try to include as much information as you can. Details like these are incredibly useful:
 
 * A reproducible test case or series of steps
@@ -41,7 +41,7 @@ GitHub provides additional document on [forking a repository](https://help.githu
 
 
 ## Finding contributions to work on
-Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/amzn/ion-java/labels/help%20wanted) issues is a great place to start.
+Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels ((enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any ['help wanted'](https://github.com/amazon-ion/ion-java/labels/help%20wanted) issues is a great place to start.
 
 
 ## Code of Conduct
@@ -56,6 +56,6 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Licensing
 
-See the [LICENSE](https://github.com/amzn/ion-java/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](https://github.com/amazon-ion/ion-java/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
\ No newline at end of file
diff --git a/README.md b/README.md
index 8f19b1c470..23038b4814 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Amazon Ion Java
-A Java implementation of the [Ion data notation](http://amzn.github.io/ion-docs).
+A Java implementation of the [Ion data notation](https://amazon-ion.github.io/ion-docs).
 
-[![Build Status](https://travis-ci.org/amzn/ion-java.svg?branch=master)](https://travis-ci.org/amzn/ion-java)
+[![Build Status](https://travis-ci.org/amazon-ion/ion-java.svg?branch=master)](https://travis-ci.org/amazon-ion/ion-java)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.amazon.ion/ion-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.amazon.ion/ion-java)
 [![Javadoc](https://javadoc-badge.appspot.com/com.amazon.ion/ion-java.svg?label=javadoc)](http://www.javadoc.io/doc/com.amazon.ion/ion-java)
 
@@ -13,7 +13,7 @@ The easiest way to clone the `ion-java` repository and initialize its `ion-tests
 submodule is to run the following command.
 
 ```
-$ git clone --recursive https://github.com/amzn/ion-java.git ion-java
+$ git clone --recursive https://github.com/amazon-ion/ion-java.git ion-java
 ```
 
 Alternatively, the submodule may be initialized independently from the clone
diff --git a/build.gradle.kts b/build.gradle.kts
index dbb6456154..f0ae76c691 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -72,7 +72,7 @@ tasks {
 
     /**
      * This task creates a properties file that will be included in the compiled jar. It contains information about
-     * the build/version of the library used in [com.amazon.ion.util.JarInfo]. See https://github.com/amzn/ion-java/pull/433
+     * the build/version of the library used in [com.amazon.ion.util.JarInfo]. See https://github.com/amazon-ion/ion-java/pull/433
      * for why this is done with a properties file rather than the Jar manifest.
      */
     val generateJarInfo by creating<Task> {
@@ -124,7 +124,7 @@ publishing {
         pom {
             name.set("Ion Java")
             description.set(project.description)
-            url.set("https://github.com/amzn/ion-java/")
+            url.set("https://github.com/amazon-ion/ion-java/")
 
             licenses {
                 license {
@@ -141,9 +141,9 @@ publishing {
                 }
             }
             scm {
-                connection.set("scm:git:git@github.com:amzn/ion-java.git")
-                developerConnection.set("scm:git:git@github.com:amzn/ion-java.git")
-                url.set("git@github.com:amzn/ion-java.git")
+                connection.set("scm:git:git@github.com:amazon-ion/ion-java.git")
+                developerConnection.set("scm:git:git@github.com:amazon-ion/ion-java.git")
+                url.set("git@github.com:amazon-ion/ion-java.git")
             }
         }
     }
diff --git a/ion-java-cli/README.md b/ion-java-cli/README.md
index 1d7006d05a..6507f1ee1f 100644
--- a/ion-java-cli/README.md
+++ b/ion-java-cli/README.md
@@ -1,5 +1,5 @@
 # Amazon Ion Java CLI
-A Java implementation of CLI where its design document is located in [here](https://github.com/amzn/ion-test-driver#design).
+A Java implementation of CLI where its design document is located in [here](https://github.com/amazon-ion/ion-test-driver#design).
 
 The package is stored under `ion-java/ion-java-cli`.
 
diff --git a/src/com/amazon/ion/IonCatalog.java b/src/com/amazon/ion/IonCatalog.java
index cf79390d92..943a4c33ac 100644
--- a/src/com/amazon/ion/IonCatalog.java
+++ b/src/com/amazon/ion/IonCatalog.java
@@ -72,7 +72,7 @@
  * Binary <em>decoding</em> prefers an exact match, and in a couple edge cases,
  * requires it. Therefore a single "get latest version" method is insufficient.
  * See the
- * <a href="http://amzn.github.io/ion-docs/docs/symbols.html">Ion Symbols page</a>
+ * <a href="https://amazon-ion.github.io/ion-docs/docs/symbols.html">Ion Symbols page</a>
  * for more details on this topic.
  * <p>
  * It's expected that many if not most applications will implement a dynamic
diff --git a/src/com/amazon/ion/IonDatagram.java b/src/com/amazon/ion/IonDatagram.java
index 72394b35d3..bbb442124d 100644
--- a/src/com/amazon/ion/IonDatagram.java
+++ b/src/com/amazon/ion/IonDatagram.java
@@ -42,11 +42,11 @@ public interface IonDatagram
     /**
      * This inherited method is not yet supported by datagrams.
      * <p>
-     * Vote for issue amzn/ion-java/issues/48 if you need this.
+     * Vote for issue amazon-ion/ion-java/issues/48 if you need this.
      *
      * @throws UnsupportedOperationException at every call.
      *
-     * @see <a href="https://github.com/amzn/ion-java/issues/48">amzn/ion-java/issues/48</a>
+     * @see <a href="https://github.com/amazon-ion/ion-java/issues/48">amazon-ion/ion-java/issues/48</a>
      */
     public void add(int index, IonValue element)
         throws ContainedValueException, NullPointerException;
@@ -54,11 +54,11 @@ public void add(int index, IonValue element)
     /**
      * This inherited method is not yet supported by datagrams.
      * <p>
-     * Vote for issue amzn/ion-java/issues/48 if you need this.
+     * Vote for issue amazon-ion/ion-java/issues/48 if you need this.
      *
      * @throws UnsupportedOperationException at every call.
      *
-     * @see <a href="https://github.com/amzn/ion-java/issues/48">amzn/ion-java/issues/48</a>
+     * @see <a href="https://github.com/amazon-ion/ion-java/issues/48">amazon-ion/ion-java/issues/48</a>
      */
     public ValueFactory add(int index)
         throws ContainedValueException, NullPointerException;
@@ -66,22 +66,22 @@ public ValueFactory add(int index)
     /**
      * This inherited method is not yet supported by datagrams.
      * <p>
-     * Vote for issue amzn/ion-java/issues/47 if you need this.
+     * Vote for issue amazon-ion/ion-java/issues/47 if you need this.
      *
      * @throws UnsupportedOperationException at every call.
      *
-     * @see <a href="https://github.com/amzn/ion-java/issues/47">amzn/ion-java/issues/47</a>
+     * @see <a href="https://github.com/amazon-ion/ion-java/issues/47">amazon-ion/ion-java/issues/47</a>
      */
     public boolean addAll(int index, Collection<? extends IonValue> c);
 
     /**
      * This inherited method is not yet supported by datagrams.
      * <p>
-     * Vote for issue amzn/ion-java/issues/50 if you need this.
+     * Vote for issue amazon-ion/ion-java/issues/50 if you need this.
      *
      * @throws UnsupportedOperationException at every call.
      *
-     * @see <a href="https://github.com/amzn/ion-java/issues/50">amzn/ion-java/issues/50</a>
+     * @see <a href="https://github.com/amazon-ion/ion-java/issues/50">amazon-ion/ion-java/issues/50</a>
      */
     public IonValue set(int index, IonValue element);
 
diff --git a/src/com/amazon/ion/IonReader.java b/src/com/amazon/ion/IonReader.java
index 9066c47326..f8e678737a 100644
--- a/src/com/amazon/ion/IonReader.java
+++ b/src/com/amazon/ion/IonReader.java
@@ -41,7 +41,7 @@
  * <b>WARNING:</b> This interface should not be implemented or extended by
  * code outside of this library.
  * We still have some work to do before this interface is stable.
- * See <a href="https://github.com/amzn/ion-java/issues/11">issue amzn/ion-java/issues/11</a>
+ * See <a href="https://github.com/amazon-ion/ion-java/issues/11">issue amazon-ion/ion-java/issues/11</a>
  * <p>
  * An {@code IonReader} has a "cursor" tracking the <em>current value</em> on
  * which the reader is positioned. Generally, newly created readers are not
@@ -88,7 +88,7 @@
  * <h3>The {@link SeekableReader} Facet</h3>
  * This facet is available on all readers <em>except</em> those created from
  * an {@link java.io.InputStream InputStream}.
- * (See <a href="https://github.com/amzn/ion-java/issues/17">issue amzn/ion-java/issues/17</a>.)
+ * (See <a href="https://github.com/amazon-ion/ion-java/issues/17">issue amazon-ion/ion-java/issues/17</a>.)
  * It allows the user to reposition the reader to a {@link Span} over the
  * same reader instance or another reader with the same source.
  *
diff --git a/src/com/amazon/ion/IonSystem.java b/src/com/amazon/ion/IonSystem.java
index 8dd489562a..aa1b4b93f5 100644
--- a/src/com/amazon/ion/IonSystem.java
+++ b/src/com/amazon/ion/IonSystem.java
@@ -94,7 +94,7 @@ public SymbolTable getSystemSymbolTable(String ionVersionId)
      * or if any but the first is a system table.
      * @throws NullPointerException if any import is null.
      */
-    // TODO amzn/ion-java/issues/38 Should we allow substituted imports as valid args?
+    // TODO amazon-ion/ion-java/issues/38 Should we allow substituted imports as valid args?
     public SymbolTable newLocalSymbolTable(SymbolTable... imports);
 
 
diff --git a/src/com/amazon/ion/IonTimestamp.java b/src/com/amazon/ion/IonTimestamp.java
index 63bb78c5bc..04c2006f71 100644
--- a/src/com/amazon/ion/IonTimestamp.java
+++ b/src/com/amazon/ion/IonTimestamp.java
@@ -29,7 +29,7 @@
 public interface IonTimestamp
     extends IonValue
 {
-    // TODO amzn/ion-java/issues/223 Deprecate setters and getters
+    // TODO amazon-ion/ion-java/issues/223 Deprecate setters and getters
 
     /**
      * Gets the value of this <code>timestamp</code> in a form suitable for
diff --git a/src/com/amazon/ion/SubstituteSymbolTableException.java b/src/com/amazon/ion/SubstituteSymbolTableException.java
index 7472ec8657..9f291f3858 100644
--- a/src/com/amazon/ion/SubstituteSymbolTableException.java
+++ b/src/com/amazon/ion/SubstituteSymbolTableException.java
@@ -21,7 +21,7 @@
  *
  * @see SymbolTable#isSubstitute()
  */
-// TODO amzn/ion-java/issues/40 Provide some useful info to assist callers with handling this
+// TODO amazon-ion/ion-java/issues/40 Provide some useful info to assist callers with handling this
 //      exception. E.g. reference to the substitute import in violation.
 public class SubstituteSymbolTableException
     extends IonException
diff --git a/src/com/amazon/ion/SymbolTable.java b/src/com/amazon/ion/SymbolTable.java
index e73e1da738..2a7d2a0b55 100644
--- a/src/com/amazon/ion/SymbolTable.java
+++ b/src/com/amazon/ion/SymbolTable.java
@@ -43,7 +43,7 @@
  * <b>Implementations of this interface are safe for use by multiple
  * threads.</b>
  *
- * @see <a href="http://amzn.github.io/ion-docs/docs/symbols.html">Ion Symbols page</a>
+ * @see <a href="https://amazon-ion.github.io/ion-docs/docs/symbols.html">Ion Symbols page</a>
  */
 public interface SymbolTable
 {
diff --git a/src/com/amazon/ion/Timestamp.java b/src/com/amazon/ion/Timestamp.java
index 0480090eae..6c8955a8a5 100644
--- a/src/com/amazon/ion/Timestamp.java
+++ b/src/com/amazon/ion/Timestamp.java
@@ -932,7 +932,7 @@ private static IllegalArgumentException fail(CharSequence input)
      * @return
      *          {@code null} if the {@code CharSequence} is "null.timestamp"
      *
-     * @see <a href="http://amzn.github.io/ion-docs/docs/spec.html#timestamp">Ion Timestamp Page</a>
+     * @see <a href="https://amazon-ion.github.io/ion-docs/docs/spec.html#timestamp">Ion Timestamp Page</a>
      * @see <a href="http://www.w3.org/TR/NOTE-datetime">W3C Note on Date and Time Formats</a>
      */
     public static Timestamp valueOf(CharSequence ionFormattedTimestamp)
diff --git a/src/com/amazon/ion/impl/ImportLocation.java b/src/com/amazon/ion/impl/ImportLocation.java
index acd5873887..0fa859e9a9 100644
--- a/src/com/amazon/ion/impl/ImportLocation.java
+++ b/src/com/amazon/ion/impl/ImportLocation.java
@@ -5,7 +5,7 @@
  * in a shared symbol table.
  * NOTE: this is currently not publicly accessible, but it is an important step toward being able to correctly
  * round-trip symbols with unknown text from shared symbol tables in different symbol table contexts. See
- * https://github.com/amzn/ion-java/issues/126 . Support is added now to avoid risking the appearance of performance
+ * https://github.com/amazon-ion/ion-java/issues/126 . Support is added now to avoid risking the appearance of performance
  * degradation if ImportLocation support were added after initial release of the incremental IonReader.
  */
 class ImportLocation {
diff --git a/src/com/amazon/ion/impl/IonBinary.java b/src/com/amazon/ion/impl/IonBinary.java
index 956d49212c..a846239c51 100644
--- a/src/com/amazon/ion/impl/IonBinary.java
+++ b/src/com/amazon/ion/impl/IonBinary.java
@@ -800,7 +800,7 @@ public static int lenAnnotationListWithLen(String[] annotations,
             // add up the length of the encoded symbols
             for (int ii=0; ii<annotations.length; ii++) {
                 int symid = symbolTable.findSymbol(annotations[ii]);
-                assert symid > 0; // TODO amzn/ion-java/issues/12
+                assert symid > 0; // TODO amazon-ion/ion-java/issues/12
                 annotationLen += IonBinary.lenVarUInt(symid);
             }
 
diff --git a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
index a1585d6ed5..e1304035be 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
@@ -546,7 +546,7 @@ else if (tid == _Private_IonConstants.tidStruct) {
         // the value BEFORE a *Value() method is even called. Once that is fixed,
         // _value_start can be removed, and _input._pos can be used to find the
         // start of the value at the current valid position.
-        // amzn/ion-java/issues/88 tracks the fix for bringing IVM handling up to
+        // amazon-ion/ion-java/issues/88 tracks the fix for bringing IVM handling up to
         // spec.
         _value_start = start_of_value;
         _position_len = len + (start_of_value - start_of_tid);
@@ -968,7 +968,7 @@ private int readVarInt(int firstByte) throws IOException {
         // into a Java int.
         // To validate overflows we accumulate the VarInt in a long and then check if it can be represented by an int
         //
-        // see http://amzn.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields
+        // see https://amazon-ion.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields
 
         long retValue = 0;
         int b = firstByte;
@@ -1003,7 +1003,7 @@ private int readVarInt(int firstByte) throws IOException {
             retValue = (retValue << 7) | (b & 0x7F);
             if ((b & 0x80) != 0) break;
 
-            // Don't support anything above a 5-byte VarInt for now, see https://github.com/amzn/ion-java/issues/146
+            // Don't support anything above a 5-byte VarInt for now, see https://github.com/amazon-ion/ion-java/issues/146
             throwVarIntOverflowException(5);
         }
 
@@ -1036,7 +1036,7 @@ protected final long readVarUIntOrEOF(boolean longAllowed) throws IOException
         // into a Java int.
         // To validate overflows we accumulate the VarInt in a long and then check if it can be represented by an int
         //
-        // see http://amzn.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields
+        // see https://amazon-ion.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields
 
         long retvalue = 0;
         int  b;
@@ -1071,7 +1071,7 @@ protected final long readVarUIntOrEOF(boolean longAllowed) throws IOException
             retvalue = (retvalue << 7) | (b & 0x7F);
             if ((b & 0x80) != 0) break;
 
-            // Don't support anything above a 7-byte VarUInt for now, see https://github.com/amzn/ion-java/issues/146
+            // Don't support anything above a 7-byte VarUInt for now, see https://github.com/amazon-ion/ion-java/issues/146
             throwVarIntOverflowException(7);
         }
 
diff --git a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
index b18c819b2b..f0f73723af 100644
--- a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
@@ -50,7 +50,7 @@ class IonReaderBinarySystemX
     {
         super();
         init_raw(in);
-        // TODO check IVM to determine version: amzn/ion-java#19, amzn/ion-java#24
+        // TODO check IVM to determine version: amazon-ion/ion-java#19, amazon-ion/ion-java#24
         _symbols = SharedSymbolTable.getSystemSymbolTable(1);
     }
 
diff --git a/src/com/amazon/ion/impl/IonReaderBinaryUserX.java b/src/com/amazon/ion/impl/IonReaderBinaryUserX.java
index 31d3d775be..a9ea04080f 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryUserX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryUserX.java
@@ -97,7 +97,7 @@ public IonReaderBinaryUserX(IonCatalog catalog,
     //FIXME: PERF_TEST was :private
     final void init_user(IonCatalog catalog)
     {
-        // TODO check IVM to determine version: amzn/ion-java#19, amzn/ion-java#24
+        // TODO check IVM to determine version: amazon-ion/ion-java#19, amazon-ion/ion-java#24
         _symbols = SharedSymbolTable.getSystemSymbolTable(1);
         _catalog = catalog;
     }
@@ -343,7 +343,7 @@ public <T> T asFacet(Class<T> facetType)
             return facetType.cast(new SpanProviderFacet());
         }
 
-        // TODO amzn/ion-java/issues/17 support seeking over InputStream
+        // TODO amazon-ion/ion-java/issues/17 support seeking over InputStream
         if (_input instanceof FromByteArray)
         {
             if (facetType == SeekableReader.class)
@@ -362,7 +362,7 @@ public <T> T asFacet(Class<T> facetType)
             // of the facet depends upon the current state of this subject,
             // and that can change over time.
 
-            // TODO amzn/ion-java/issues/16 Our {@link #transferCurrentValue} doesn't handle
+            // TODO amazon-ion/ion-java/issues/16 Our {@link #transferCurrentValue} doesn't handle
             //  field names and annotations.
 
             // Ensure there's a contiguous buffer we can copy.
@@ -431,7 +431,7 @@ public void transferCurrentValue(_Private_ByteTransferSink sink)
                 throw new UnsupportedOperationException();
             }
 
-            // TODO amzn/ion-java/issues/16 wrong if current value has a field name or
+            // TODO amazon-ion/ion-java/issues/16 wrong if current value has a field name or
             //   annotations since the position is in the wrong place.
             // TODO when implementing that, be careful to handle the case where
             //   the writer already holds a pending field name or annotations!
diff --git a/src/com/amazon/ion/impl/IonReaderTextRawX.java b/src/com/amazon/ion/impl/IonReaderTextRawX.java
index 7729340369..4bfb34b31a 100644
--- a/src/com/amazon/ion/impl/IonReaderTextRawX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextRawX.java
@@ -50,7 +50,7 @@
  *
  * This reader scan skip values and in doing so it does not
  * materialize the contents and it does not validate the contents.
- * TODO amzn/ion-java/issues/7 We may want to make validation on skip optional.
+ * TODO amazon-ion/ion-java/issues/7 We may want to make validation on skip optional.
  *
  * This manages the value buffer (_v ValueVariant) and the lob
  * content (_lob_*) which is cached in some cases.  It's main
diff --git a/src/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
index 62b743a7b2..661fbd5c19 100644
--- a/src/com/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
@@ -64,7 +64,7 @@ class IonReaderTextSystemX
 
     protected IonReaderTextSystemX(UnifiedInputStreamX iis)
     {
-        _system_symtab = _Private_Utils.systemSymtab(1); // TODO check IVM to determine version: amzn/ion-java/issues/19
+        _system_symtab = _Private_Utils.systemSymtab(1); // TODO check IVM to determine version: amazon-ion/ion-java/issues/19
         init_once();
         init(iis, IonType.DATAGRAM);
     }
diff --git a/src/com/amazon/ion/impl/IonTypeID.java b/src/com/amazon/ion/impl/IonTypeID.java
index d94cce0d6a..95b5299750 100644
--- a/src/com/amazon/ion/impl/IonTypeID.java
+++ b/src/com/amazon/ion/impl/IonTypeID.java
@@ -23,7 +23,7 @@ final class IonTypeID {
     // does not have a type ID, so we will use it to mean 'annotation wrapper' instead.
     static final IonType ION_TYPE_ANNOTATION_WRAPPER = IonType.DATAGRAM;
 
-    // Lookup table from type ID to IonType. See https://amzn.github.io/ion-docs/docs/binary.html#typed-value-formats
+    // Lookup table from type ID to IonType. See https://amazon-ion.github.io/ion-docs/docs/binary.html#typed-value-formats
     static final IonType[] ION_TYPES = new IonType[] {
         IonType.NULL,
         IonType.BOOL,
diff --git a/src/com/amazon/ion/impl/IonWriterSystem.java b/src/com/amazon/ion/impl/IonWriterSystem.java
index 02890c0a85..be0c5d245e 100644
--- a/src/com/amazon/ion/impl/IonWriterSystem.java
+++ b/src/com/amazon/ion/impl/IonWriterSystem.java
@@ -139,20 +139,20 @@ boolean shouldWriteIvm()
         }
         if (_initial_ivm_handling == InitialIvmHandling.SUPPRESS)
         {
-            // TODO amzn/ion-java/issues/24 Must write IVM if given system != 1.0
+            // TODO amazon-ion/ion-java/issues/24 Must write IVM if given system != 1.0
             return false;
         }
-        // TODO amzn/ion-java/issues/24 Add SUPPRESS_ALL to suppress non 1.0 IVMs
+        // TODO amazon-ion/ion-java/issues/24 Add SUPPRESS_ALL to suppress non 1.0 IVMs
 
         if (_ivm_minimizing == IvmMinimizing.ADJACENT)
         {
-            // TODO amzn/ion-java/issues/24 Write IVM if current system version != given system
+            // TODO amazon-ion/ion-java/issues/24 Write IVM if current system version != given system
             // For now we assume that it's the same since we only support 1.0
             return ! _previous_value_was_ivm;
         }
         if (_ivm_minimizing == IvmMinimizing.DISTANT)
         {
-            // TODO amzn/ion-java/issues/24 Write IVM if current system version != given system
+            // TODO amazon-ion/ion-java/issues/24 Write IVM if current system version != given system
             // For now we assume that it's the same since we only support 1.0
             return ! _anything_written;
         }
@@ -291,7 +291,7 @@ final void writeSymbol(int symbolId) throws IOException
             && getDepth() == 0
             && _annotation_count == 0) {
             // $ion_1_0 is written as an IVM only if it is not annotated
-            // TODO amzn/ion-java/issues/24 Make sure to get the right symtab, default may differ.
+            // TODO amazon-ion/ion-java/issues/24 Make sure to get the right symtab, default may differ.
             writeIonVersionMarker();
         }
         else
@@ -306,7 +306,7 @@ public final void writeSymbol(String value) throws IOException
             && getDepth() == 0
             && _annotation_count == 0) {
             // $ion_1_0 is written as an IVM only if it is not annotated
-            // TODO amzn/ion-java/issues/24 Make sure to get the right symtab, default may differ.
+            // TODO amazon-ion/ion-java/issues/24 Make sure to get the right symtab, default may differ.
             writeIonVersionMarker();
         }
         else {
diff --git a/src/com/amazon/ion/impl/IonWriterSystemText.java b/src/com/amazon/ion/impl/IonWriterSystemText.java
index 4c7b2c2192..8e1ea9b4a9 100644
--- a/src/com/amazon/ion/impl/IonWriterSystemText.java
+++ b/src/com/amazon/ion/impl/IonWriterSystemText.java
@@ -660,7 +660,7 @@ public void writeString(String value)
             && ! _following_long_string
             && _long_string_threshold < value.length())
         {
-            // TODO amzn/ion-java/issues/57 This can lead to mixed newlines in the output.
+            // TODO amazon-ion/ion-java/issues/57 This can lead to mixed newlines in the output.
             // It assumes NL line separators, but _options could use CR+NL
             _output.printLongString(value);
 
diff --git a/src/com/amazon/ion/impl/IonWriterUserBinary.java b/src/com/amazon/ion/impl/IonWriterUserBinary.java
index ae1c072f3b..7db4c8fcc2 100644
--- a/src/com/amazon/ion/impl/IonWriterUserBinary.java
+++ b/src/com/amazon/ion/impl/IonWriterUserBinary.java
@@ -97,7 +97,7 @@ public void writeValue(IonReader reader)
                  mySymtabExtendsCache.symtabsCompat(getSymbolTable(),
                                                     reader.getSymbolTable())))
             {
-                // TODO amzn/ion-java/issues/16 Doesn't copy annotations or field names.
+                // TODO amazon-ion/ion-java/issues/16 Doesn't copy annotations or field names.
                 transfer.transferCurrentValue(myCopySink);
                 return;
             }
diff --git a/src/com/amazon/ion/impl/LocalSymbolTable.java b/src/com/amazon/ion/impl/LocalSymbolTable.java
index b5990d5cce..56198844c1 100644
--- a/src/com/amazon/ion/impl/LocalSymbolTable.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTable.java
@@ -257,7 +257,7 @@ protected static LocalSymbolTableImports readLocalSymbolTable(IonReader reader,
                 sid = getSidForSymbolTableField(fieldName);
             }
 
-            // TODO amzn/ion-java/issues/36 Switching over SIDs doesn't cover the case
+            // TODO amazon-ion/ion-java/issues/36 Switching over SIDs doesn't cover the case
             //      where the relevant field names are defined by a prev LST;
             //      the prev LST could have 'symbols' defined locally with a
             //      different SID!
@@ -839,7 +839,7 @@ boolean symtabExtends(SymbolTable other)
         // Superset must have same/more known symbols than subset.
         if (getMaxId() < subset.getMaxId()) return false;
 
-        // TODO amzn/ion-java/issues/18 Currently, we check imports by their refs. which
+        // TODO amazon-ion/ion-java/issues/18 Currently, we check imports by their refs. which
         //      might be overly strict; imports which are not the same ref.
         //      but have the same semantic states fails the extension check.
         if (! myImportsList.equalImports(subset.myImportsList))
diff --git a/src/com/amazon/ion/impl/LocalSymbolTableImports.java b/src/com/amazon/ion/impl/LocalSymbolTableImports.java
index b4b7b5e131..eb03bf0af9 100644
--- a/src/com/amazon/ion/impl/LocalSymbolTableImports.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTableImports.java
@@ -29,7 +29,7 @@
  * <p>
  * This class is <b>immutable</b>, and hence safe for use by multiple threads.
  */
-// TODO amzn/ion-java/issues/37 Create specialized class to handle the common case where
+// TODO amazon-ion/ion-java/issues/37 Create specialized class to handle the common case where
 //      there are zero or one imported non-system shared symtab(s).
 final class LocalSymbolTableImports
 {
diff --git a/src/com/amazon/ion/impl/SharedSymbolTable.java b/src/com/amazon/ion/impl/SharedSymbolTable.java
index dedb85985f..02051143a5 100644
--- a/src/com/amazon/ion/impl/SharedSymbolTable.java
+++ b/src/com/amazon/ion/impl/SharedSymbolTable.java
@@ -69,7 +69,7 @@ final class SharedSymbolTable
     /**
      * The <b>singleton</b> instance of Ion 1.0 system symbol table.
      * <p>
-     * TODO amzn/ion-java/issues/34 Optimize system symtabs by using our custom backing impl.
+     * TODO amazon-ion/ion-java/issues/34 Optimize system symtabs by using our custom backing impl.
      */
     private static final SymbolTable ION_1_0_SYSTEM_SYMTAB;
     static
@@ -238,9 +238,9 @@ static SymbolTable newSharedSymbolTable(IonReader reader,
                 sid = getSidForSymbolTableField(fieldName);
             }
 
-            // TODO amzn/ion-java/issues/35 If there's more than one 'symbols' or 'imports'
+            // TODO amazon-ion/ion-java/issues/35 If there's more than one 'symbols' or 'imports'
             //      field, they will be merged together.
-            // TODO amzn/ion-java/issues/36 Switching over SIDs doesn't cover the case
+            // TODO amazon-ion/ion-java/issues/36 Switching over SIDs doesn't cover the case
             //      where the relevant field names are defined by a prev LST;
             //      the prev LST could have 'symbols' defined locally with a
             //      different SID!
@@ -398,7 +398,7 @@ private static void putToMapIfNotThere(Map<String, Integer> symbolsMap,
         while (symbols.hasNext())
         {
             String text = symbols.next();
-            // TODO amzn/ion-java/issues/12 What about empty symbols?
+            // TODO amazon-ion/ion-java/issues/12 What about empty symbols?
             if (symbolsMap.get(text) == null)
             {
                 putToMapIfNotThere(symbolsMap, text, sid);
diff --git a/src/com/amazon/ion/impl/SymbolTokenImpl.java b/src/com/amazon/ion/impl/SymbolTokenImpl.java
index b464e1aef0..1df8a9c6d3 100644
--- a/src/com/amazon/ion/impl/SymbolTokenImpl.java
+++ b/src/com/amazon/ion/impl/SymbolTokenImpl.java
@@ -65,7 +65,7 @@ public String toString()
     }
 
     /*
-     * TODO amzn/ion-java#126
+     * TODO amazon-ion/ion-java#126
      *Equals and hashCode must be symmetric.
      *Two symboltokens are only equal when text1 equals text2 (including null == null)
      *This is an incomplete solution, needs to be updated as symboltokens are fleshed out.
diff --git a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
index 3465bd474d..85e4714fef 100644
--- a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
+++ b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
@@ -40,7 +40,7 @@
 public class _Private_IonBinaryWriterBuilder
     extends IonBinaryWriterBuilder
 {
-    // amzn/ion-java/issues/59 expose configuration points properly and figure out deprecation path for the old writer.
+    // amazon-ion/ion-java/issues/59 expose configuration points properly and figure out deprecation path for the old writer.
     private final _Private_IonManagedBinaryWriterBuilder myBinaryWriterBuilder;
     private ValueFactory mySymtabValueFactory;
 
@@ -298,7 +298,7 @@ private _Private_IonBinaryWriterBuilder fillDefaults()
      */
     private _Private_IonBinaryWriterBuilder fillLegacyDefaults()
     {
-        // amzn/ion-java/issues/59 Fix this to use the new writer or eliminate it
+        // amazon-ion/ion-java/issues/59 Fix this to use the new writer or eliminate it
 
         // Ensure that we don't modify the user's builder.
         _Private_IonBinaryWriterBuilder b = copy();
@@ -375,7 +375,7 @@ public final IonWriter build(OutputStream out)
     @Deprecated
     public final IonBinaryWriter buildLegacy()
     {
-        // amzn/ion-java/issues/59 Fix this to use the new writer or eliminate it
+        // amazon-ion/ion-java/issues/59 Fix this to use the new writer or eliminate it
         _Private_IonBinaryWriterBuilder b = fillLegacyDefaults();
 
         IonWriterSystemBinary systemWriter =
diff --git a/src/com/amazon/ion/impl/_Private_IonConstants.java b/src/com/amazon/ion/impl/_Private_IonConstants.java
index 38b9b1ee97..156e8600e6 100644
--- a/src/com/amazon/ion/impl/_Private_IonConstants.java
+++ b/src/com/amazon/ion/impl/_Private_IonConstants.java
@@ -291,7 +291,7 @@ public static final int getLowNibble(int td)
      * </pre>
      *
      * <p>
-     * TODO amzn/ion-java/issues/23 However, there is still a potential failure if one of the
+     * TODO amazon-ion/ion-java/issues/23 However, there is still a potential failure if one of the
      * IonStruct's nested value has a field name with text
      * {@code " -- UNKNOWN SYMBOL TEXT -- $123"}, and that another nested value
      * of an IonStruct has a field name with unknown text and sid 123, these
diff --git a/src/com/amazon/ion/impl/_Private_IonSystem.java b/src/com/amazon/ion/impl/_Private_IonSystem.java
index d9024761f8..38fd3d81d0 100644
--- a/src/com/amazon/ion/impl/_Private_IonSystem.java
+++ b/src/com/amazon/ion/impl/_Private_IonSystem.java
@@ -36,12 +36,12 @@ public interface _Private_IonSystem
     public SymbolTable newSharedSymbolTable(IonStruct ionRep);
 
     /**
-     * TODO Must correct amzn/ion-java/issues/63 before exposing this or using from public API.
+     * TODO Must correct amazon-ion/ion-java/issues/63 before exposing this or using from public API.
      */
     public Iterator<IonValue> systemIterate(String ionText);
 
     /**
-     * TODO Must correct amzn/ion-java/issues/63 before exposing this or using from public API.
+     * TODO Must correct amazon-ion/ion-java/issues/63 before exposing this or using from public API.
      */
     public Iterator<IonValue> systemIterate(Reader ionText);
 
diff --git a/src/com/amazon/ion/impl/_Private_Utils.java b/src/com/amazon/ion/impl/_Private_Utils.java
index 09fff660d7..be806aeb72 100644
--- a/src/com/amazon/ion/impl/_Private_Utils.java
+++ b/src/com/amazon/ion/impl/_Private_Utils.java
@@ -208,7 +208,7 @@ public static SymbolTokenImpl newSymbolToken(int sid)
     public static SymbolToken newSymbolToken(SymbolTable symtab,
                                              String text)
     {
-        // TODO amzn/ion-java/issues/21 symtab should not be null
+        // TODO amazon-ion/ion-java/issues/21 symtab should not be null
         text.getClass(); // quick null check
 
         SymbolToken tok = (symtab == null ? null : symtab.find(text));
@@ -227,7 +227,7 @@ public static SymbolToken newSymbolToken(SymbolTable symtab,
     {
         if (sid < 1) throw new IllegalArgumentException();
 
-        // TODO amzn/ion-java/issues/21 symtab should not be null
+        // TODO amazon-ion/ion-java/issues/21 symtab should not be null
         String text = (symtab == null ? null : symtab.findKnownSymbol(sid));
         return new SymbolTokenImpl(text, sid);
     }
@@ -288,7 +288,7 @@ public static SymbolToken localize(SymbolTable symtab,
         String text = sym.getText();
         int sid = sym.getSid();
 
-        if (symtab != null)  // TODO amzn/ion-java/issues/21 require symtab
+        if (symtab != null)  // TODO amazon-ion/ion-java/issues/21 require symtab
         {
             if (text == null)
             {
@@ -975,7 +975,7 @@ public static boolean symtabExtends(SymbolTable superset, SymbolTable subset)
         // If the subset's symtab is a system symtab, the superset's is always
         // an extension of the subset's as system symtab-ness is irrelevant to
         // the conditions for copy opt. to be safe.
-        // TODO amzn/ion-java/issues/24 System symtab-ness ARE relevant if there's multiple
+        // TODO amazon-ion/ion-java/issues/24 System symtab-ness ARE relevant if there's multiple
         //      versions.
         if (subset.isSystemTable()) return true;
 
diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 8bc415829a..2a1923afcf 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -1360,7 +1360,7 @@ boolean isIVM(int sid)
         // When SID 2 occurs at the top level with no annotations, it has the
         // special properties of an IVM. Otherwise, it's considered a normal
         // symbol value.
-        // TODO amzn/ion-java/issues/88 requires this behavior to be changed,
+        // TODO amazon-ion/ion-java/issues/88 requires this behavior to be changed,
         // such that top-level SID 2 is treated as a symbol value, not an IVM.
         return depth == 0 && sid == ION_1_0_SID && !hasAnnotations();
     }
diff --git a/src/com/amazon/ion/impl/lite/IonContainerLite.java b/src/com/amazon/ion/impl/lite/IonContainerLite.java
index e0276329a7..1cc365311c 100644
--- a/src/com/amazon/ion/impl/lite/IonContainerLite.java
+++ b/src/com/amazon/ion/impl/lite/IonContainerLite.java
@@ -78,7 +78,7 @@ protected IonContainerLite(ContainerlessContext context, boolean isNull)
                         // when name is null it could be a sid 0 so we need to perform the full symbol token lookup.
                         // this is expensive so only do it when necessary
                         // TODO profile `getKnownFieldNameSymbol` to see if we can improve its performance so branching
-                        // is not necessary. https://github.com/amzn/ion-java/issues/140
+                        // is not necessary. https://github.com/amazon-ion/ion-java/issues/140
                         copy.setFieldNameSymbol(child.getKnownFieldNameSymbol());
                     }
                     else {
diff --git a/src/com/amazon/ion/impl/lite/IonDatagramLite.java b/src/com/amazon/ion/impl/lite/IonDatagramLite.java
index 9bb1a3d037..a9eebcd082 100644
--- a/src/com/amazon/ion/impl/lite/IonDatagramLite.java
+++ b/src/com/amazon/ion/impl/lite/IonDatagramLite.java
@@ -417,7 +417,7 @@ public final void writeTo(IonWriter writer)
             // refer to slots in shared symbol table imports declared by the discarded table, an
             // error will be raised unnecessarily. To avoid that, only write an IVM when the writer's
             // symbol table is already the system symbol table.
-            // TODO evaluate whether an IVM should ever be written here. amzn/ion-java#200
+            // TODO evaluate whether an IVM should ever be written here. amazon-ion/ion-java#200
             try {
                 writer.writeSymbol(SystemSymbols.ION_1_0);
             } catch (IOException ioe) {
diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/com/amazon/ion/impl/lite/IonStructLite.java
index e8864163ba..e6884bd67d 100644
--- a/src/com/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStructLite.java
@@ -44,7 +44,7 @@ final class IonStructLite
 {
     private static final int HASH_SIGNATURE =
         IonType.STRUCT.toString().hashCode();
-    // TODO amzn/ion-java/issues/41: add support for _isOrdered
+    // TODO amazon-ion/ion-java/issues/41: add support for _isOrdered
 
     IonStructLite(ContainerlessContext context, boolean isNull)
     {
diff --git a/src/com/amazon/ion/impl/lite/IonSymbolLite.java b/src/com/amazon/ion/impl/lite/IonSymbolLite.java
index 01bf587afb..fe9b9351e8 100644
--- a/src/com/amazon/ion/impl/lite/IonSymbolLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSymbolLite.java
@@ -65,11 +65,11 @@ final class IonSymbolLite
             if (text != null)
             {
                 super.setValue(text);
-                // TODO [amzn/ion-java/issues/27] - needs consistent handling, when to retain SID's vs ignore
+                // TODO [amazon-ion/ion-java/issues/27] - needs consistent handling, when to retain SID's vs ignore
             }
             else
             {
-                // TODO [amzn/ion-java/issues/223] - needs consistent handling, resolution against context symbol table
+                // TODO [amazon-ion/ion-java/issues/223] - needs consistent handling, resolution against context symbol table
                 _sid = sid;
                 // there *is* an encoding present so we must update
                 _isSymbolIdPresent(true);
@@ -156,7 +156,7 @@ private int getSymbolId(SymbolTableProvider symbolTableProvider)
         assert(symtab != null);
 
         String name = _get_value();
-        // TODO [amzn/ion-java/issues/27] - needs consistent handling, when to retain SID's vs ignore (here memoizing SID on read)
+        // TODO [amazon-ion/ion-java/issues/27] - needs consistent handling, when to retain SID's vs ignore (here memoizing SID on read)
         if (!symtab.isLocalTable())
         {
             setSID(symtab.findSymbol(name));
@@ -262,7 +262,7 @@ else if (_stringValue() != null)
         }
         else
         {
-            // TODO [amzn/ion-java/issues/223] - needs consistent handling, resolution against context symbol table
+            // TODO [amazon-ion/ion-java/issues/223] - needs consistent handling, resolution against context symbol table
             // there is not text, so we can't clear the SID.
             allSymbolIDsCleared = false;
         }
@@ -286,7 +286,7 @@ protected void setIsIonVersionMarker(boolean isIVM)
     final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
         throws IOException
     {
-        // TODO amzn/ion-java/issues/27 Fix symbol handling
+        // TODO amazon-ion/ion-java/issues/27 Fix symbol handling
         // A million-dollar question is - if text is missing, do
         // we throw (cannot serialize) or do we pass the sid thru???
 
diff --git a/src/com/amazon/ion/impl/lite/IonSystemLite.java b/src/com/amazon/ion/impl/lite/IonSystemLite.java
index 415bb3933a..2bc8cec3bd 100644
--- a/src/com/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSystemLite.java
@@ -342,7 +342,7 @@ private IonValueLite load_value_helper(IonReader reader, boolean isTopLevel)
                 v = newBool(reader.booleanValue());
                 break;
             case INT:
-                // TODO amzn/ion-java/issues/9  Inefficient since we can't determine the size
+                // TODO amazon-ion/ion-java/issues/9  Inefficient since we can't determine the size
                 // of the integer in order to avoid making BigIntegers.
                 v = newInt(reader.bigIntegerValue());
                 break;
diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
index 598c4a0a6a..203ecdf43d 100644
--- a/src/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -310,7 +310,7 @@ public SymbolTable getSymbolTable()
                         this._annotations[i] =
                             _Private_Utils.newSymbolToken(text, UNKNOWN_SYMBOL_ID);
                     } else {
-                        // TODO - amzn/ion-java/issues/223 needs consistent handling, should attempt to resolve and if it cant; fail
+                        // TODO - amazon-ion/ion-java/issues/223 needs consistent handling, should attempt to resolve and if it cant; fail
                         this._annotations[i] = existing._annotations[i];
                         hasSIDsRetained |= this._annotations[i].getSid() > UNKNOWN_SYMBOL_ID;
                     }
@@ -325,7 +325,7 @@ public SymbolTable getSymbolTable()
         // existing 'read only' flag - we force the deep-copy back to being mutable
         clear_flag(IS_LOCKED);
         // whilst the clone *should* guarantee symbol context is purged, the annotation behavior existing above
-        // under the TO DO for amzn/ion-java/issues/223 does mean that SID context can be propogated through a clone, therefore
+        // under the TO DO for amazon-ion/ion-java/issues/223 does mean that SID context can be propogated through a clone, therefore
         // the encoding flag has to reflect this reality
         _isSymbolIdPresent(hasSIDsRetained);
     }
@@ -467,7 +467,7 @@ public final int getFieldId()
 
     public SymbolToken getFieldNameSymbol()
     {
-        // TODO amzn/ion-java/issues/27 We should memoize the results of symtab lookups.
+        // TODO amazon-ion/ion-java/issues/27 We should memoize the results of symtab lookups.
         // BUT: that could cause thread-safety problems for read-only values.
         // I think makeReadOnly should populate the tokens fully
         // so that we only need to lookup from mutable instances.
@@ -613,7 +613,7 @@ public final String getFieldName()
         if (_fieldName != null) return _fieldName;
         if (_fieldId <= 0) return null;
 
-        // TODO amzn/ion-java/issues/27 why no symtab lookup, like getFieldNameSymbol()?
+        // TODO amazon-ion/ion-java/issues/27 why no symtab lookup, like getFieldNameSymbol()?
         throw new UnknownSymbolException(_fieldId);
     }
 
@@ -683,7 +683,7 @@ public final SymbolToken[] getTypeAnnotationSymbols(SymbolTableProvider symbolTa
             String text = token.getText();
             if (text != null && token.getSid() == UNKNOWN_SYMBOL_ID)
             {
-                // TODO amzn/ion-java/issues/27 We should memoize the result of symtab lookups
+                // TODO amazon-ion/ion-java/issues/27 We should memoize the result of symtab lookups
                 // into _annotations.
                 // See getFieldNameSymbol() for challenges doing so.
 
diff --git a/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java b/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java
index 250ca1e0f9..8db8187856 100644
--- a/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java
+++ b/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java
@@ -1161,7 +1161,7 @@ private void writeIonStructContent(IonStruct val)
         {
             final int originalOffset = myBuffer.length - myOffset;
 
-            // TODO amzn/ion-java/issues/31 should not preserve the ordering of fields
+            // TODO amazon-ion/ion-java/issues/31 should not preserve the ordering of fields
             ArrayList<IonValue> values = new ArrayList<IonValue>();
 
             // Fill ArrayList with IonValues, the add() just copies the
@@ -1182,7 +1182,7 @@ private void writeIonStructContent(IonStruct val)
                 writeVarUInt(sid);
             }
 
-            // TODO amzn/ion-java/issues/41 Detect if the struct fields are sorted in ascending
+            // TODO amazon-ion/ion-java/issues/41 Detect if the struct fields are sorted in ascending
             // order of Sids. If so, 1 should be written into 'length' field.
             // Note that this 'length' field is not the same as the four-bit
             // length L in the type descriptor octet.
@@ -1273,7 +1273,7 @@ private int findSid(SymbolToken symToken)
      *    have different Ion versions.
      * </ul>
      *
-     * TODO amzn/ion-java/issues/25 Currently, {@link IonDatagram#systemIterator()} doesn't
+     * TODO amazon-ion/ion-java/issues/25 Currently, {@link IonDatagram#systemIterator()} doesn't
      * retain information about interspersed IVMs within the IonDatagram.
      * As such, we cannot obtain the location of interspersed IVMs, if any.
      *
diff --git a/src/com/amazon/ion/impl/lite/TopLevelContext.java b/src/com/amazon/ion/impl/lite/TopLevelContext.java
index 797ff6c9cc..a3b88b7776 100644
--- a/src/com/amazon/ion/impl/lite/TopLevelContext.java
+++ b/src/com/amazon/ion/impl/lite/TopLevelContext.java
@@ -40,7 +40,7 @@ final class TopLevelContext
      * symbol table and following the parent/owning_context
      * chain will lead to a system object.
      * <p>
-     * TODO amzn/ion-java/issues/19 we cannot assume that the IonSystem knows the proper IVM
+     * TODO amazon-ion/ion-java/issues/19 we cannot assume that the IonSystem knows the proper IVM
      * in this context
      */
     private final SymbolTable _symbols;
diff --git a/src/com/amazon/ion/overview.html b/src/com/amazon/ion/overview.html
index cf81a4bda3..7d993c1bdd 100644
--- a/src/com/amazon/ion/overview.html
+++ b/src/com/amazon/ion/overview.html
@@ -16,7 +16,7 @@
 <html>
 <body>
 ion-java is the reference implementation of the
-<a href="http://amzn.github.io/ion-docs/docs/spec.html">Ion data notation</a> for the
+<a href="https://amazon-ion.github.io/ion-docs/docs/spec.html">Ion data notation</a> for the
 Java<sup><font size="-4">TM</font></sup> 2 Platform Standard Edition 5.0
 and above.
 <p>
diff --git a/src/com/amazon/ion/system/IonTextWriterBuilder.java b/src/com/amazon/ion/system/IonTextWriterBuilder.java
index 3f201c6137..b88fb4bca0 100644
--- a/src/com/amazon/ion/system/IonTextWriterBuilder.java
+++ b/src/com/amazon/ion/system/IonTextWriterBuilder.java
@@ -66,7 +66,7 @@
  * <p>
  * Currently, there is no configuration point available to disable the
  * auto-flushing mechanism. Please vote on
- * <a href="https://github.com/amzn/ion-java/issues/32">issue amzn/ion-java/issues/32</a>
+ * <a href="https://github.com/amazon-ion/ion-java/issues/32">issue amazon-ion/ion-java/issues/32</a>
  * if you require it.
  *
  */
diff --git a/src/com/amazon/ion/util/Equivalence.java b/src/com/amazon/ion/util/Equivalence.java
index 70759b884f..371cb4c8b0 100644
--- a/src/com/amazon/ion/util/Equivalence.java
+++ b/src/com/amazon/ion/util/Equivalence.java
@@ -123,7 +123,7 @@
  * <h3>Terminology</h3>
  * Within this class, <i>strict</i> equivalence refers to Ion data model
  * equivalence as defined above and by the
- * <a href="http://amzn.github.io/ion-docs/docs/spec.html">Ion
+ * <a href="https://amazon-ion.github.io/ion-docs/docs/spec.html">Ion
  * Specification</a>. <i>Structural</i> or <i>non-strict</i> equivalence
  * follows the same rules as strict equivalence, except that
  * <ul>
@@ -135,7 +135,7 @@
 public final class Equivalence {
 
     /**
-     * TODO amzn/ion-java/issues/26 Marker for code that needs to be altered in order to
+     * TODO amazon-ion/ion-java/issues/26 Marker for code that needs to be altered in order to
      * support a public comparison API to determine ordering of values, not
      * just equality.
      */
@@ -434,7 +434,7 @@ static class Field {
             SymbolToken tok = value.getFieldNameSymbol();
             String name = tok.getText();
             if (name == null) {
-                // TODO amzn/ion-java/issues/23 Problematic with unknown field names.
+                // TODO amazon-ion/ion-java/issues/23 Problematic with unknown field names.
                 name = UNKNOWN_SYMBOL_TEXT_PREFIX + tok.getSid();
             }
             this.name = name;
@@ -448,7 +448,7 @@ static class Field {
         @Override
         public int hashCode() {
             return name.hashCode();
-            // TODO amzn/ion-java/issues/58 : implement hash code such that it respects
+            // TODO amazon-ion/ion-java/issues/58 : implement hash code such that it respects
             // 'strict'. The prevously attempted fix is commented out below but
             // is not sufficient because value.hasCode will always include
             // type annotations in the hash computation. Type annotations
@@ -538,14 +538,14 @@ private static int ionCompareToImpl(final IonValue v1,
                     }
                     break;
                 case DECIMAL:
-                    assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26
+                    assert !PUBLIC_COMPARISON_API; // TODO amazon-ion/ion-java/issues/26
                     result = Decimal.equals(((IonDecimal) v1).decimalValue(),
                                             ((IonDecimal) v2).decimalValue())
                                             ? 0 : 1;
                     break;
                 case TIMESTAMP:
                     if (configuration.isStrict) {
-                        assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26
+                        assert !PUBLIC_COMPARISON_API; // TODO amazon-ion/ion-java/issues/26
                         result = (((IonTimestamp) v1).timestampValue().equals(
                                   ((IonTimestamp) v2).timestampValue())
                                   ? 0 : 1);
@@ -573,7 +573,7 @@ private static int ionCompareToImpl(final IonValue v1,
                     result = compareLobContents((IonLob) v1, (IonLob) v2);
                     break;
                 case STRUCT:
-                    assert !PUBLIC_COMPARISON_API; // TODO amzn/ion-java/issues/26
+                    assert !PUBLIC_COMPARISON_API; // TODO amazon-ion/ion-java/issues/26
                     result = compareStructs((IonStruct) v1,
                                             (IonStruct) v2,
                                             configuration);
diff --git a/test/com/amazon/ion/CloneTest.java b/test/com/amazon/ion/CloneTest.java
index b9cb52d253..fbde87f6c4 100644
--- a/test/com/amazon/ion/CloneTest.java
+++ b/test/com/amazon/ion/CloneTest.java
@@ -60,7 +60,7 @@ public void testDifferentValueFactoryCloneWithUnknownSymbolText()
         SymbolToken tok = newSymbolToken(99);
         IonSymbol original = system().newSymbol(tok);
 
-        // TODO amzn/ion-java/issues/30 An UnknownSymbolException is expected here, but
+        // TODO amazon-ion/ion-java/issues/30 An UnknownSymbolException is expected here, but
         // it isn't thrown.
         IonSymbol copy = otherSystem.clone(original);
 
@@ -99,7 +99,7 @@ public void testDifferentValueFactoryCloneWithUnknownAnnotationText()
         IonInt original = system().newInt(5);
         original.setTypeAnnotationSymbols(tok);
 
-        // TODO amzn/ion-java/issues/30 An UnknownSymbolException is expected here, but
+        // TODO amazon-ion/ion-java/issues/30 An UnknownSymbolException is expected here, but
         // it isn't thrown.
         IonInt copy = otherSystem.clone(original);
 
@@ -153,7 +153,7 @@ public void testDifferentValueFactoryCloneWithUnknownFieldNameText()
         // This works since the cloned child doesn't retain its field name.
         otherSystem.clone(child);
 
-        // TODO amzn/ion-java/issues/30 An UnknownSymbolException is expected here, but
+        // TODO amazon-ion/ion-java/issues/30 An UnknownSymbolException is expected here, but
         // it isn't thrown.
         IonStruct copy = otherSystem.clone(original);
 
diff --git a/test/com/amazon/ion/ContainerTestCase.java b/test/com/amazon/ion/ContainerTestCase.java
index 6ca1b7626a..55a9e505cc 100644
--- a/test/com/amazon/ion/ContainerTestCase.java
+++ b/test/com/amazon/ion/ContainerTestCase.java
@@ -242,7 +242,7 @@ public void testRemoveFromContainer()
     }
 
 
-    /** TODO amzn/ion-java/issues/8 datagram is lazy creating local symtabs */
+    /** TODO amazon-ion/ion-java/issues/8 datagram is lazy creating local symtabs */
     @Test @Ignore
     public void testDetachHasDifferentSymtab()
     {
@@ -352,7 +352,7 @@ public void testRemovingReadOnlyChild()
         assertSame(n, c.iterator().next());
     }
 
-    /** TODO amzn/ion-java/issues/6 */
+    /** TODO amazon-ion/ion-java/issues/6 */
     @Test @Ignore
     public void testSelfContainment()
     {
diff --git a/test/com/amazon/ion/DatagramTest.java b/test/com/amazon/ion/DatagramTest.java
index 9193cfabac..493efb7eda 100644
--- a/test/com/amazon/ion/DatagramTest.java
+++ b/test/com/amazon/ion/DatagramTest.java
@@ -164,7 +164,7 @@ public void testManualIVM()
 
         assertSame(systemSymtab_1_0, sysId.getSymbolTable());
 
-        // TODO amzn/ion-java/issues/20
+        // TODO amazon-ion/ion-java/issues/20
 //        assertEquals(0, dg.size());
 
         // TODO adding $ion_1_1 should fail: unsupported version
@@ -415,7 +415,7 @@ public void testAddingDatagramToDatagram()
         }
         catch (IllegalArgumentException e) { }
 
-        // Cannot insert a datagram  // TODO amzn/ion-java/issues/48
+        // Cannot insert a datagram  // TODO amazon-ion/ion-java/issues/48
 //        try
 //        {
 //            dg1.add(1, dg2);
@@ -498,7 +498,7 @@ public void testNewDatagramWithImports()
     public void testEmptyDatagram()
     {
         IonDatagram dg = loader().load("");
-//        testEmptySequence(dg); // TODO amzn/ion-java/issues/48 implement add(int,v)
+//        testEmptySequence(dg); // TODO amazon-ion/ion-java/issues/48 implement add(int,v)
         dg.add().newInt(1);
         testClearContainer(dg);
     }
@@ -508,7 +508,7 @@ public void testEmptyDatagram()
     @Test
     public void testRemoveViaIteratorThenDirect()
     {
-        // TODO amzn/ion-java/issues/51 implement remove on datagram iterator
+        // TODO amazon-ion/ion-java/issues/51 implement remove on datagram iterator
     }
 
 
@@ -570,7 +570,7 @@ public void testClearAfterClone()
     @Test
     public void testToString()
     {
-        // TODO amzn/ion-java/issues/8 I think this is wrong, the datagram has injected IVM
+        // TODO amazon-ion/ion-java/issues/8 I think this is wrong, the datagram has injected IVM
         IonDatagram dg = loader().load("1");
         assertEquals("$ion_1_0 1", dg.toString());
 
@@ -671,7 +671,7 @@ public void testGetAssignedSymbolTable()
     }
 
     /**
-     * TODO amzn/ion-java/issues/50 Datagram.set() should work, but it's documented to throw
+     * TODO amazon-ion/ion-java/issues/50 Datagram.set() should work, but it's documented to throw
      */
     @Test(expected = UnsupportedOperationException.class)
     public void testSet()
diff --git a/test/com/amazon/ion/FloatTest.java b/test/com/amazon/ion/FloatTest.java
index da7c273918..7d9140fa9c 100644
--- a/test/com/amazon/ion/FloatTest.java
+++ b/test/com/amazon/ion/FloatTest.java
@@ -206,7 +206,7 @@ public void checkSpecial(float expectedFloat,
     }
 
     /**
-     * TODO amzn/ion-java#64 Un-ignore this when all dependent build pipelines
+     * TODO amazon-ion/ion-java#64 Un-ignore this when all dependent build pipelines
      * use a version of the JVM that doesn't have this defect.
      *
      * https://blogs.oracle.com/security/entry/security_alert_for_cve-2010-44
diff --git a/test/com/amazon/ion/IonTestCase.java b/test/com/amazon/ion/IonTestCase.java
index 92af228d3c..7158341d59 100644
--- a/test/com/amazon/ion/IonTestCase.java
+++ b/test/com/amazon/ion/IonTestCase.java
@@ -1104,7 +1104,7 @@ public void testValueFactoryClone(IonValue original,
         IonValue clone = newFactory.clone(original);
         IonAssert.assertIonEquals(original, clone);
 
-        // TODO amzn/ion-java/issues/30 IonSystemLite.clone() on a value that is in IonSystemImpl
+        // TODO amazon-ion/ion-java/issues/30 IonSystemLite.clone() on a value that is in IonSystemImpl
         // doesn't seem to copy over local symbol tables.
 //        assertEquals(original.toString(), clone.toString());
 
diff --git a/test/com/amazon/ion/IonValueTest.java b/test/com/amazon/ion/IonValueTest.java
index eb2a6bb111..27fd82faee 100644
--- a/test/com/amazon/ion/IonValueTest.java
+++ b/test/com/amazon/ion/IonValueTest.java
@@ -144,7 +144,7 @@ public void testSetTypeAnnotationInterning()
         IonValue v = system().newNull();
         v.setTypeAnnotations(nameCopy);
 
-        // TODO amzn/ion-java/issues/21 fails because v doesn't have any symbol table at all
+        // TODO amazon-ion/ion-java/issues/21 fails because v doesn't have any symbol table at all
 //        assertSame(nameOrig, v.getTypeAnnotations()[0]);
 //        assertSame(nameOrig, v.getTypeAnnotationSymbols()[0].getText());
     }
@@ -289,7 +289,7 @@ public void testCustomToString()
                      v.toString(IonTextWriterBuilder.standard()
                                     .withInitialIvmHandling(InitialIvmHandling.ENSURE)));
 
-        // TODO amzn/ion-java/issues/57 determine if these really should be platform independent newlines
+        // TODO amazon-ion/ion-java/issues/57 determine if these really should be platform independent newlines
         final String pretty = format("%n[%n  hello,%n  a::12%n]");
         assertEquals(pretty,
                      v.toString(IonTextWriterBuilder.pretty()));
diff --git a/test/com/amazon/ion/NopPaddingTest.java b/test/com/amazon/ion/NopPaddingTest.java
index 1ecf5eac65..51ac3a82c7 100644
--- a/test/com/amazon/ion/NopPaddingTest.java
+++ b/test/com/amazon/ion/NopPaddingTest.java
@@ -17,7 +17,7 @@
 import org.junit.Test;
 
 /**
- * Testing support for NOP padding for empty Ion, see <a href="https://amzn.github.io/ion-docs/binary.html#nop-pad">spec</a> for more details
+ * Testing support for NOP padding for empty Ion, see <a href="https://amazon-ion.github.io/ion-docs/binary.html#nop-pad">spec</a> for more details
  */
 public class NopPaddingTest
     extends IonTestCase
diff --git a/test/com/amazon/ion/RoundTripTest.java b/test/com/amazon/ion/RoundTripTest.java
index 3024a40fd5..4e1b00e9a1 100644
--- a/test/com/amazon/ion/RoundTripTest.java
+++ b/test/com/amazon/ion/RoundTripTest.java
@@ -42,13 +42,13 @@
  * Processes all text files in the "good" suite, transforming between text and
  * binary twice to ensure that the process is equivalent.
  *
- * TODO amzn/ion-java/issues/29 Refactor this test class, possible duplicate test coverage in
+ * TODO amazon-ion/ion-java/issues/29 Refactor this test class, possible duplicate test coverage in
  * {@link RoundTripStreamingTest}.
  */
 public class RoundTripTest
     extends IonTestCase
 {
-    // TODO amzn/ion-java/issues/27 Writing IonSymbol to bytes using IonSymbol.writeTo(IonWriter)
+    // TODO amazon-ion/ion-java/issues/27 Writing IonSymbol to bytes using IonSymbol.writeTo(IonWriter)
     // will throw UnknownSymbolException if symbol text is unknown
     public static final FilenameFilter ROUND_TRIP_TEST_SKIP_LIST =
         new FileIsNot("good/symbols.ion");
diff --git a/test/com/amazon/ion/SequenceTestCase.java b/test/com/amazon/ion/SequenceTestCase.java
index 41e8a2af6a..2b46024cf6 100644
--- a/test/com/amazon/ion/SequenceTestCase.java
+++ b/test/com/amazon/ion/SequenceTestCase.java
@@ -570,7 +570,7 @@ public void testRetainAll()
                                                     (Object)nullValue2);
 
         IonSequence seq = makeEmpty();
-        // TODO amzn/ion-java/issues/49 implement IonDatagram.retainAll
+        // TODO amazon-ion/ion-java/issues/49 implement IonDatagram.retainAll
         if (seq.getType() == IonType.DATAGRAM) return;
 
         assertFalse(seq.retainAll(empty));
diff --git a/test/com/amazon/ion/SystemProcessingTestCase.java b/test/com/amazon/ion/SystemProcessingTestCase.java
index 24b9334787..50c045e918 100644
--- a/test/com/amazon/ion/SystemProcessingTestCase.java
+++ b/test/com/amazon/ion/SystemProcessingTestCase.java
@@ -192,7 +192,7 @@ protected abstract void checkEof()
 
     //=========================================================================
 
-    /** TODO amzn/ion-java/issues/8 This is broken for loaders which are now more lazy */
+    /** TODO amazon-ion/ion-java/issues/8 This is broken for loaders which are now more lazy */
     @Test @Ignore
     public void testLocalTableResetting()
         throws Exception
@@ -1053,7 +1053,7 @@ public void testSystemIterationShowsIvm()
         checkEof();
     }
 
-    // TODO amzn/ion-java/issues/25 test for interspersed IVMs - testSystemIterationShowsInterspersedIvm
+    // TODO amazon-ion/ion-java/issues/25 test for interspersed IVMs - testSystemIterationShowsInterspersedIvm
 
     @Test
     public void testHighUnicodeDirectInBlob()
diff --git a/test/com/amazon/ion/TestUtils.java b/test/com/amazon/ion/TestUtils.java
index f278c46ede..c8177b0e42 100644
--- a/test/com/amazon/ion/TestUtils.java
+++ b/test/com/amazon/ion/TestUtils.java
@@ -139,17 +139,17 @@ public boolean accept(File dir, String name)
             // Skips documentation that accompanies some test vectors
             NOT_MARKDOWN_FILTER,   
             new FileIsNot(
-                      "bad/clobWithNullCharacter.ion"          // TODO amzn/ion-java/43
-                      ,"bad/emptyAnnotatedInt.10n"             // TODO amzn/ion-java/55
-                      ,"good/subfieldVarUInt32bit.ion"         // TODO amzn/ion-java/62
+                      "bad/clobWithNullCharacter.ion"          // TODO amazon-ion/ion-java/43
+                      ,"bad/emptyAnnotatedInt.10n"             // TODO amazon-ion/ion-java/55
+                      ,"good/subfieldVarUInt32bit.ion"         // TODO amazon-ion/ion-java/62
                       ,"good/subfieldVarUInt.ion"              // Note: this passes but takes too long. That's fine; it's not a realistic use case.
-                      ,"good/utf16.ion"                        // TODO amzn/ion-java/61
-                      ,"good/utf32.ion"                        // TODO amzn/ion-java/61
+                      ,"good/utf16.ion"                        // TODO amazon-ion/ion-java/61
+                      ,"good/utf32.ion"                        // TODO amazon-ion/ion-java/61
                       ,"good/whitespace.ion"
-                      ,"good/item1.10n"                        // TODO amzn/ion-java#126 (roundtrip symbols with unknown text)
-                      ,"bad/typecodes/type_6_length_0.10n"     // TODO amzn/ion-java#272
-                      ,"good/typecodes/T7-large.10n"           // TODO amzn/ion-java#273 
-                      ,"good/equivs/clobNewlines.ion"          // TODO amzn/ion-java#274
+                      ,"good/item1.10n"                        // TODO amazon-ion/ion-java#126 (roundtrip symbols with unknown text)
+                      ,"bad/typecodes/type_6_length_0.10n"     // TODO amazon-ion/ion-java#272
+                      ,"good/typecodes/T7-large.10n"           // TODO amazon-ion/ion-java#273 
+                      ,"good/equivs/clobNewlines.ion"          // TODO amazon-ion/ion-java#274
             )
         );
 
diff --git a/test/com/amazon/ion/TimestampTest.java b/test/com/amazon/ion/TimestampTest.java
index fb9129cf2d..85f8394c03 100644
--- a/test/com/amazon/ion/TimestampTest.java
+++ b/test/com/amazon/ion/TimestampTest.java
@@ -881,14 +881,14 @@ public void forEpochSecondTestNanosTooHigh() {
     }
 
     @Test
-    @Ignore("https://github.com/amzn/ion-java/issues/303")
+    @Ignore("https://github.com/amazon-ion/ion-java/issues/303")
     public void forEpochSecondTesOffsetTooLow() {
         thrown.expect(IllegalArgumentException.class);
         Timestamp.forEpochSecond(0, 0, -24 * 60);
     }
 
     @Test
-    @Ignore("https://github.com/amzn/ion-java/issues/303")
+    @Ignore("https://github.com/amazon-ion/ion-java/issues/303")
     public void forEpochSecondTestOffsetTooHigh() {
         thrown.expect(IllegalArgumentException.class);
         Timestamp.forEpochSecond(0, 0, 24 * 60);
@@ -3063,7 +3063,7 @@ public void testMillisIsIndepedentOfOffset() throws ParseException {
     @Test
     public void testInstantVsTimestampMillis() {
         /* If ion-java migrates to Java 8, which added Instant, this test becomes valid.
-        // addresses: https://github.com/amzn/ion-java/issues/165
+        // addresses: https://github.com/amazon-ion/ion-java/issues/165
         String tsText = "0001-01-01T00:00:00.000Z";
         // Instant extends the Gregorian calendar system all the way back to the beginning, whereas Timestamp uses
         // the default GregorianCalendar implementation, which transitions from Julian to Gregorian in 1582. As a
diff --git a/test/com/amazon/ion/TrBwBrProcessingTest.java b/test/com/amazon/ion/TrBwBrProcessingTest.java
index f49cfca0d5..76b3e9e8f9 100644
--- a/test/com/amazon/ion/TrBwBrProcessingTest.java
+++ b/test/com/amazon/ion/TrBwBrProcessingTest.java
@@ -40,7 +40,7 @@ protected void prepare(String text)
     @Ignore
     @Test
     public void testLocalSymtabWithMalformedSymbolEntries() throws Exception {
-        // TODO amzn/ion-java#151 this test exercises null slots in the local symbol table. The reader should collapse
+        // TODO amazon-ion/ion-java#151 this test exercises null slots in the local symbol table. The reader should collapse
         // all local symbol table null slots to $0. Currently, since this doesn't happen, the reader passes $10 to the
         // writer, which fails due to an out-of-range symbol ID.
         super.testLocalSymtabWithMalformedSymbolEntries();
diff --git a/test/com/amazon/ion/TrueSequenceTestCase.java b/test/com/amazon/ion/TrueSequenceTestCase.java
index 22ef0a8708..8b1ea49edd 100644
--- a/test/com/amazon/ion/TrueSequenceTestCase.java
+++ b/test/com/amazon/ion/TrueSequenceTestCase.java
@@ -82,7 +82,7 @@ public void testNullSequenceIndexedAddAll()
 
 
     /**
-     *  TODO amzn/ion-java/issues/47  Implement indexed addAll for datagram
+     *  TODO amazon-ion/ion-java/issues/47  Implement indexed addAll for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -155,7 +155,7 @@ public void testIndexedAddAll(IonSequence seq)
 
 
     /**
-     *  TODO amzn/ion-java/issues/50 Implement set for datagram
+     *  TODO amazon-ion/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -208,7 +208,7 @@ private void set(IonSequence s, int index)
 
 
     /**
-     *  TODO amzn/ion-java/issues/50 Implement set for datagram
+     *  TODO amazon-ion/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -220,7 +220,7 @@ public void testSetNullElement()
 
 
     /**
-     *  TODO amzn/ion-java/issues/50 Implement set for datagram
+     *  TODO amazon-ion/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -234,7 +234,7 @@ public void testSetContainedValue()
 
 
     /**
-     *  TODO amzn/ion-java/issues/50 Implement set for datagram
+     *  TODO amazon-ion/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -247,7 +247,7 @@ public void testSetDatagram()
 
 
     /**
-     *  TODO amzn/ion-java/issues/50 Implement set for datagram
+     *  TODO amazon-ion/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -261,7 +261,7 @@ public void testSetReadOnlyChild()
 
 
     /**
-     *  TODO amzn/ion-java/issues/50 Implement set for datagram
+     *  TODO amazon-ion/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
@@ -275,7 +275,7 @@ public void testSetReadOnlyContainer()
 
 
     /**
-     *  TODO amzn/ion-java/issues/50 Implement set for datagram
+     *  TODO amazon-ion/ion-java/issues/50 Implement set for datagram
      *  Hoist this up to SequencenceTestCase.
      */
     @Test
diff --git a/test/com/amazon/ion/impl/BinaryWriterTest.java b/test/com/amazon/ion/impl/BinaryWriterTest.java
index 8ab10fdcef..cf4b910bf1 100644
--- a/test/com/amazon/ion/impl/BinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/BinaryWriterTest.java
@@ -53,7 +53,7 @@ public void testWriteSymbolWithLockedSymtab()
         throws Exception
     {
         iw = makeWriter();
-        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java/issues/8
+        iw.writeSymbol("force a local symtab"); // TODO amazon-ion/ion-java/issues/8
         iw.getSymbolTable().makeReadOnly();
         thrown.expect(IonException.class);
         iw.writeSymbol("s");
@@ -64,7 +64,7 @@ public void testAddTypeAnnotationWithLockedSymtab()
         throws Exception
     {
         iw = makeWriter();
-        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java/issues/8
+        iw.writeSymbol("force a local symtab"); // TODO amazon-ion/ion-java/issues/8
         iw.getSymbolTable().makeReadOnly();
         thrown.expect(IonException.class);
         iw.addTypeAnnotation("a");
@@ -75,7 +75,7 @@ public void testSetFieldNameWithLockedSymtab()
         throws Exception
     {
         iw = makeWriter();
-        iw.writeSymbol("force a local symtab"); // TODO amzn/ion-java/issues/8
+        iw.writeSymbol("force a local symtab"); // TODO amazon-ion/ion-java/issues/8
         iw.getSymbolTable().makeReadOnly();
         iw.stepIn(IonType.STRUCT);
         thrown.expect(IonException.class);
diff --git a/test/com/amazon/ion/impl/IonMarkupWriterTest.java b/test/com/amazon/ion/impl/IonMarkupWriterTest.java
index b84d7a7da0..bfc78d4212 100644
--- a/test/com/amazon/ion/impl/IonMarkupWriterTest.java
+++ b/test/com/amazon/ion/impl/IonMarkupWriterTest.java
@@ -49,7 +49,7 @@ public class IonMarkupWriterTest extends IonTestCase {
             "<afterAnnotations BLOB><beforeData BLOB>" +
             "{{T25lIEJpZyBGYXQgVGVzdCBCbG9iIEZvciBZb3VyIFBsZWFzdXJl}}<afterData" +
             " BLOB><beforeStepOut STRUCT>}<afterData STRUCT>";
-    // TODO amzn/ion-java/issues/57 determine if platform specific newlines are appropriate for pretty printing
+    // TODO amazon-ion/ion-java/issues/57 determine if platform specific newlines are appropriate for pretty printing
     private String pExpected = String.format(
             "%n<beforeAnnotations STRUCT><beforeEachAnnotation STRUCT>abcd" +
             "<afterEachAnnotation STRUCT>::<afterAnnotations STRUCT><beforeData" +
diff --git a/test/com/amazon/ion/impl/IonWriterTestCase.java b/test/com/amazon/ion/impl/IonWriterTestCase.java
index 8fa77f299f..158e7b067b 100644
--- a/test/com/amazon/ion/impl/IonWriterTestCase.java
+++ b/test/com/amazon/ion/impl/IonWriterTestCase.java
@@ -852,11 +852,11 @@ public void testFinishDoesReset()
 
         Iterator<IonValue> it = systemIterateOutput();
 
-        if (myOutputForm != OutputForm.TEXT) { // TODO amzn/ion-java/issues/8
+        if (myOutputForm != OutputForm.TEXT) { // TODO amazon-ion/ion-java/issues/8
             checkSymbol(SystemSymbols.ION_1_0, it.next());
         }
         checkAnnotation(SystemSymbols.ION_SYMBOL_TABLE, it.next());
-        // TODO amzn/ion-java#14
+        // TODO amazon-ion/ion-java#14
         if (myOutputForm != OutputForm.TEXT)
         {
             checkSymbol(null, 12, it.next());
@@ -939,7 +939,7 @@ public void testWritingEmptySymtab()
     }
 
 
-    @Test @Ignore // TODO amzn/ion-java/issues/15
+    @Test @Ignore // TODO amazon-ion/ion-java/issues/15
     public void testWritingSymtabWithExtraAnnotations()
     throws Exception
     {
@@ -1028,7 +1028,7 @@ public void testWriteValuesWithSymtab()
     }
 
     /**
-     * TODO amzn/ion-java/issues/8 datagram is lazy creating local symtabs.
+     * TODO amazon-ion/ion-java/issues/8 datagram is lazy creating local symtabs.
      * Should use a reader to check the results.
      */
     @Test
@@ -1049,7 +1049,7 @@ public void testWriteIVMImplicitly()
         if (myOutputForm == OutputForm.BINARY) {
             checkAnnotation(ION_SYMBOL_TABLE, it.next());
         }
-        // TODO amzn/ion-java#14
+        // TODO amazon-ion/ion-java#14
         if (myOutputForm == OutputForm.BINARY)
         {
             checkSymbol(null, 10, it.next());
@@ -1077,7 +1077,7 @@ public void testWriteIVMExplicitly()
         assertEquals(2, dg.size());
     }
 
-    @Test // TODO amzn/ion-java/issues/8 Inconsistencies between writers
+    @Test // TODO amazon-ion/ion-java/issues/8 Inconsistencies between writers
     public void testWritingDatagram()
         throws Exception
     {
@@ -1093,7 +1093,7 @@ public void testWritingDatagram()
             checkAnnotation(SystemSymbols.ION_SYMBOL_TABLE, it.next());
         }
 
-        // TODO amzn/ion-java#14
+        // TODO amazon-ion/ion-java#14
         if (myOutputForm != OutputForm.TEXT)
         {
             checkSymbol(null, 10, it.next());
diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java b/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
index 850fa54ac4..ec2c379fe3 100644
--- a/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
+++ b/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
@@ -243,7 +243,7 @@ public void testOptimizedWriteValueDiffImports()
 
     /**
      * Writer's imports superset of Reader's: (could be) fully optimized.
-     * TODO amzn/ion-java/issues/18 at the moment the compatability code requires
+     * TODO amazon-ion/ion-java/issues/18 at the moment the compatability code requires
      *      exact-match on imports.
      */
     @Test
@@ -289,7 +289,7 @@ public void testOptimizedWriteValueSubsetWriterImport()
 
     /**
      * Reader's source contains interspersed LSTs.
-     * TODO amzn/ion-java/issues/39 Investigate allowing a config. option to copy reader's LST
+     * TODO amazon-ion/ion-java/issues/39 Investigate allowing a config. option to copy reader's LST
      *              over to the writer.
      */
     @Test
diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java b/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
index cb44b93335..c96fdbf25b 100644
--- a/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
+++ b/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
@@ -178,9 +178,9 @@ protected void checkWriteValue(boolean expectedTransferInvoked)
         // Reset flag before calling IonWriter.writeValue
         isTransferCurrentValueInvoked = false;
 
-        // TODO amzn/ion-java/issues/16 - Currently, doesn't copy annotations or field names,
+        // TODO amazon-ion/ion-java/issues/16 - Currently, doesn't copy annotations or field names,
         //      so we always expect no transfer of raw bytes
-        // TODO amzn/ion-java/issues/381 - IonReaderBinaryIncremental currently doesn't support the byte transfer
+        // TODO amazon-ion/ion-java/issues/381 - IonReaderBinaryIncremental currently doesn't support the byte transfer
         //      facet. Once this is fixed, remove the `asFacet` check below.
         if (ir.isInStruct() || ir.getTypeAnnotationSymbols().length > 0
             || ir.asFacet(_Private_ByteTransferReader.class) == null)
diff --git a/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java b/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
index 4093ae4b6d..6e33014b06 100644
--- a/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
+++ b/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
@@ -139,12 +139,12 @@ public void testFlushingLockedSymtab()
     {
         iw = makeWriter();
 
-        // Force a local symtab.  TODO amzn/ion-java/issues/8 Should have an API for this
+        // Force a local symtab.  TODO amazon-ion/ion-java/issues/8 Should have an API for this
         iw.addTypeAnnotation(SystemSymbols.ION_SYMBOL_TABLE);
         iw.stepIn(IonType.STRUCT);
         iw.stepOut();
 
-        SymbolTable symtab = iw.getSymbolTable();  // TODO amzn/ion-java/issues/22
+        SymbolTable symtab = iw.getSymbolTable();  // TODO amazon-ion/ion-java/issues/22
         symtab.intern("fred_1");
         symtab.intern("fred_2");
         testFlushing();
diff --git a/test/com/amazon/ion/impl/SymbolTableTest.java b/test/com/amazon/ion/impl/SymbolTableTest.java
index a1a49073c7..97fe16d153 100644
--- a/test/com/amazon/ion/impl/SymbolTableTest.java
+++ b/test/com/amazon/ion/impl/SymbolTableTest.java
@@ -755,7 +755,7 @@ public void testDupLocalSymbolOnDatagram() throws Exception {
         final IonMutableCatalog cat = new SimpleCatalog();
         cat.putTable(st);
 
-        // amzn/ion-java/issues/46 has the datagram producing something like:
+        // amazon-ion/ion-java/issues/46 has the datagram producing something like:
         // $ion_1_0 $ion_symbol_table::{imports:[{name: "foobar", version: 1, max_id: 1}], symbols: ["s1", "l1"]} $11 $12
         // local table should not have "s1", user values should be $10 $11
         IonDatagram dg = ion1.newDatagram(st);
@@ -1049,7 +1049,7 @@ public void testSharedSymtabCreationWithDuplicates()
     }
 
 
-    @Test @Ignore // TODO amzn/ion-java/issues/12
+    @Test @Ignore // TODO amazon-ion/ion-java/issues/12
     public void testSharedSymtabCreationWithEmptyName()
     {
         String[] syms = { "a", "b", "", "c" };
diff --git a/test/com/amazon/ion/impl/TextWriterTest.java b/test/com/amazon/ion/impl/TextWriterTest.java
index 1601c3e79e..60dd1ccf74 100644
--- a/test/com/amazon/ion/impl/TextWriterTest.java
+++ b/test/com/amazon/ion/impl/TextWriterTest.java
@@ -282,7 +282,7 @@ public void testWritingLongStrings()
 
         options.withPrettyPrinting();
         expectRendering(
-            // TODO amzn/ion-java/issues/57 determine if these really should be platform independent newlines
+            // TODO amazon-ion/ion-java/issues/57 determine if these really should be platform independent newlines
             format(
                 "%n" +
                 "'''looong'''%n" +
diff --git a/test/com/amazon/ion/impl/ValueWriterTest.java b/test/com/amazon/ion/impl/ValueWriterTest.java
index 730ce7158e..07f7b72a4f 100644
--- a/test/com/amazon/ion/impl/ValueWriterTest.java
+++ b/test/com/amazon/ion/impl/ValueWriterTest.java
@@ -138,13 +138,13 @@ public void testWriteValuesWithSymtabIntoContainer()
     }
 
 
-    @Override @Test @Ignore // TODO amzn/ion-java/issues/8
+    @Override @Test @Ignore // TODO amazon-ion/ion-java/issues/8
     public void testWriteIVMImplicitly()
         throws Exception
     {
         super.testWriteIVMImplicitly();
 
-        // TODO amzn/ion-java/issues/20
+        // TODO amazon-ion/ion-java/issues/20
         // assertEquals(2, myDatagram.size());
     }
 
@@ -154,7 +154,7 @@ public void testWriteIVMExplicitly()
         throws Exception
     {
         super.testWriteIVMExplicitly();
-        // TODO amzn/ion-java/issues/20
+        // TODO amazon-ion/ion-java/issues/20
         //assertEquals(2, myDatagram.size());
     }
 }
diff --git a/test/com/amazon/ion/junit/IonAssert.java b/test/com/amazon/ion/junit/IonAssert.java
index c50a2e6427..05a3e29d1d 100644
--- a/test/com/amazon/ion/junit/IonAssert.java
+++ b/test/com/amazon/ion/junit/IonAssert.java
@@ -86,7 +86,7 @@ public static void assertNoCurrentValue(IonReader in)
         assertTrue(in.getFieldId() < 0);
         assertNull(in.getFieldNameSymbol());
 
-        // TODO amzn/ion-java/issues/13 Text reader doesn't throw, but others do.
+        // TODO amazon-ion/ion-java/issues/13 Text reader doesn't throw, but others do.
         try {
             String[] ann = in.getTypeAnnotations();
             assertEquals(0, ann.length);
diff --git a/test/com/amazon/ion/streaming/BinaryStreamingTest.java b/test/com/amazon/ion/streaming/BinaryStreamingTest.java
index 46b843f646..692d1ef0d8 100644
--- a/test/com/amazon/ion/streaming/BinaryStreamingTest.java
+++ b/test/com/amazon/ion/streaming/BinaryStreamingTest.java
@@ -63,7 +63,7 @@ static class TestValue {
             value = tv_value;
         }
 
-        /** TODO amzn/ion-java/issues/5 why this context? I think it will round-off values */
+        /** TODO amazon-ion/ion-java/issues/5 why this context? I think it will round-off values */
         static MathContext context = MathContext.DECIMAL128;
         static Decimal makeBigDecimal(double d) {
             Decimal bd = Decimal.valueOf(d, context);
diff --git a/test/com/amazon/ion/streaming/ReaderFacetTestCase.java b/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
index 3627a839eb..83ba276449 100644
--- a/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
+++ b/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
@@ -63,7 +63,7 @@ public abstract class ReaderFacetTestCase
      *
      * @see NonSeekableReaderTest
      */
-    public static final ReaderMaker[] NON_SEEKABLE_READERS =  // TODO amzn/ion-java/issues/17
+    public static final ReaderMaker[] NON_SEEKABLE_READERS =  // TODO amazon-ion/ion-java/issues/17
     {
         ReaderMaker.FROM_INPUT_STREAM_BINARY,
         ReaderMaker.FROM_INPUT_STREAM_TEXT,
diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/test/com/amazon/ion/streaming/ReaderTest.java
index ea822acdd8..219f222050 100644
--- a/test/com/amazon/ion/streaming/ReaderTest.java
+++ b/test/com/amazon/ion/streaming/ReaderTest.java
@@ -306,7 +306,7 @@ public void testReadingFloatAsBigInteger()
      * it's not what one would expect.
      */
     @Test @Ignore
-    public void testReadingFloatAsBigDecimal() // TODO amzn/ion-java/issues/56
+    public void testReadingFloatAsBigDecimal() // TODO amazon-ion/ion-java/issues/56
     {
         BigDecimal actualBd = readBigDecimal("null.float");
         assertEquals(in.isNullValue(), actualBd  == null);
@@ -428,7 +428,7 @@ public void testSkippingLobInStruct()
     public void testReadLobUsingGetBytes() throws Exception
     {
         if (!myReaderMaker.sourceIsBinary()) {
-            // TODO text implements getBytes() differently: https://github.com/amzn/ion-java/issues/319
+            // TODO text implements getBytes() differently: https://github.com/amazon-ion/ion-java/issues/319
             return;
         }
         String data = "{{\"abcdefghijklmnopqrstuvwxyz\"}}";
diff --git a/test/com/amazon/ion/streaming/RoundTripStreamingTest.java b/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
index 98b27e1dcf..1ee28f8af3 100644
--- a/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
+++ b/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
@@ -44,7 +44,7 @@
 import org.junit.Test;
 
 /**
- * TODO amzn/ion-java/issues/29 Refactor this test class, possible duplicate test coverage in
+ * TODO amazon-ion/ion-java/issues/29 Refactor this test class, possible duplicate test coverage in
  * {@link RoundTripTest}.
  */
 public class RoundTripStreamingTest
diff --git a/test/com/amazon/ion/util/EquivalenceTest.java b/test/com/amazon/ion/util/EquivalenceTest.java
index 8a552ec1dc..ff559c66f0 100644
--- a/test/com/amazon/ion/util/EquivalenceTest.java
+++ b/test/com/amazon/ion/util/EquivalenceTest.java
@@ -368,7 +368,7 @@ public void testStringSymbol() {
         assertNotIonEq(ion("\"hi\""), ion("'hi'"));
     }
 
-    // TODO amzn/ion-java/issues/58 : Remove the ignore annotation from this test after
+    // TODO amazon-ion/ion-java/issues/58 : Remove the ignore annotation from this test after
     // making the required changes to Equivalence.Field.hashCode.
     @Ignore
     @Test
@@ -400,7 +400,7 @@ public void testFieldEquals1() {
         assertTrue(f1.hashCode() != f3.hashCode());
     }
 
-    // TODO amzn/ion-java/issues/58 : Remove the ignore annotation from this test after
+    // TODO amazon-ion/ion-java/issues/58 : Remove the ignore annotation from this test after
     // making the required changes to Equivalence.Field.hashCode.
     @Ignore
     @Test

From 2bac615fcf40d658978b43a12ca9feaf00d146d4 Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Thu, 19 Jan 2023 11:16:56 -0800
Subject: [PATCH 183/490] Add a concurrency stress test (#469)

Fixes #459
---
 build.gradle.kts                              |   2 +
 .../IonRoundtripConcurrencyStressTest.java    | 192 ++++++++++++++++++
 2 files changed, 194 insertions(+)
 create mode 100644 test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java

diff --git a/build.gradle.kts b/build.gradle.kts
index f0ae76c691..e4580b11cb 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -21,6 +21,8 @@ dependencies {
     testImplementation("junit:junit:4.13.1")
     testImplementation("org.hamcrest:hamcrest:2.2")
     testImplementation("pl.pragmatists:JUnitParams:1.1.1")
+    // https://mvnrepository.com/artifact/com.google.code.tempus-fugit/tempus-fugit
+    testImplementation("com.google.code.tempus-fugit:tempus-fugit:1.1")
 }
 
 group = "com.amazon.ion"
diff --git a/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java b/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java
new file mode 100644
index 0000000000..41042a0a0a
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java
@@ -0,0 +1,192 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.google.code.tempusfugit.concurrency.ConcurrentRule;
+import com.google.code.tempusfugit.concurrency.ConcurrentTestRunner;
+import com.google.code.tempusfugit.concurrency.RepeatingRule;
+import com.google.code.tempusfugit.concurrency.annotations.Concurrent;
+import com.google.code.tempusfugit.concurrency.annotations.Repeating;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.Random;
+import java.util.UUID;
+
+import static org.junit.Assert.assertEquals;
+
+@RunWith(ConcurrentTestRunner.class)
+public class IonRoundtripConcurrencyStressTest {
+
+    private static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
+    private static final IonReaderBuilder STANDARD_READER_BUILDER = IonReaderBuilder.standard()
+            .withIncrementalReadingEnabled(true);
+    private static final IonBinaryWriterBuilder STANDARD_WRITER_BUILDER = IonBinaryWriterBuilder.standard();
+    private static final Random RANDOM = new Random();
+
+    @Rule public ConcurrentRule concurrently = new ConcurrentRule();
+    @Rule public RepeatingRule repeatedly = new RepeatingRule();
+
+    // Why not use parameterized tests? Because junitparams.JUnitParamsRunner doesn't play nicely with
+    // com.google.code.tempusfugit.concurrency.ConcurrentTestRunner and I prefer the clarity that comes from @Concurrent
+    // and @Repeating over that which I get from @junitparams.Parameters .
+    // org.junit.runners.Parameterized includes some support for delegating to another runner factory in case you need
+    // other functionality, but org.junit.runners.Parameterized.Parameters is awkward enough that I'd rather avoid it.
+
+    // Some day we will move to JDK 8+ and JUnit 5, then perhaps we can use the JUnit 5 test parameterization.
+
+    // The default number of repetitions for @Repeating is 100, and the default concurrency for @Concurrent is 5
+    // These parameters seem sufficient to demonstrate the bug in https://github.com/amzn/ion-java/pull/436 every time
+    // for the impacted types. I've experimented with lower concurrent and repeat values and found that with low enough
+    // concurrency or repetitions (e.g. 2 on either) you don't necessarily fail all of these tests every time in the
+    // presence of that bug. Rather than fidget around the numbers further I'll call the default values on these
+    // annotations good enough, each test here costs <200ms and it's not worth trying to make them any lighter weight.
+    @Repeating @Concurrent @Test
+    public void round_trip_NULL() {
+        assertSuccessfulRoundTrip(generate(IonType.NULL));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_BOOL() {
+        assertSuccessfulRoundTrip(generate(IonType.BOOL));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_INT() {
+        assertSuccessfulRoundTrip(generate(IonType.INT));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_FLOAT() {
+        assertSuccessfulRoundTrip(generate(IonType.FLOAT));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_DECIMAL() {
+        assertSuccessfulRoundTrip(generate(IonType.DECIMAL));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_TIMESTAMP() {
+        assertSuccessfulRoundTrip(generate(IonType.TIMESTAMP));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_SYMBOL() {
+        assertSuccessfulRoundTrip(generate(IonType.SYMBOL));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_STRING() {
+        assertSuccessfulRoundTrip(generate(IonType.STRING));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_CLOB() {
+        assertSuccessfulRoundTrip(generate(IonType.CLOB));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_BLOB() {
+        assertSuccessfulRoundTrip(generate(IonType.BLOB));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_LIST() {
+        assertSuccessfulRoundTrip(generate(IonType.LIST));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_SEXP() {
+        assertSuccessfulRoundTrip(generate(IonType.SEXP));
+    }
+
+    @Repeating @Concurrent @Test
+    public void round_trip_STRUCT() {
+        assertSuccessfulRoundTrip(generate(IonType.STRUCT));
+    }
+
+    // ------------------------------------------------------------------------
+
+    private void assertSuccessfulRoundTrip(IonValue value) {
+        IonValue after = roundTrip(value);
+        assertEquals("Found round-trip problem for type " + value.getType(), value, after);
+
+        IonValue nullType = generateNull(value.getType());
+        IonValue nullAfter = roundTrip(nullType);
+        assertEquals("Found round-trip problem for null of type " + value.getType(), nullType, nullAfter);
+    }
+
+    private static IonValue generate(IonType type) {
+        switch (type) {
+            // scalars
+            case NULL: return SYSTEM.newNull();
+            case BOOL: return SYSTEM.newBool(RANDOM.nextBoolean());
+            case INT: return SYSTEM.newInt(RANDOM.nextInt());
+            case FLOAT: return  SYSTEM.newFloat(RANDOM.nextDouble());
+            case DECIMAL: return  SYSTEM.newDecimal(Math.abs(RANDOM.nextLong()));
+            // mod to keep long in bounds for newUtcTimestampFromMillis
+            // picked time_t epoch overflow of 2147483647 seconds as bound just for fun
+            case TIMESTAMP: return  SYSTEM.newUtcTimestampFromMillis(Math.abs(RANDOM.nextLong()) % 2147483647000L);
+            case SYMBOL: return  SYSTEM.newSymbol(UUID.randomUUID().toString());
+            case STRING: return  SYSTEM.newString(UUID.randomUUID().toString());
+            case CLOB: return  SYSTEM.newClob(UUID.randomUUID().toString().getBytes());
+            case BLOB: return  SYSTEM.newBlob(UUID.randomUUID().toString().getBytes());
+            // containers
+            case LIST: return SYSTEM.newList(generate(IonType.STRING));
+            case SEXP: return SYSTEM.newSexp(generate(IonType.SYMBOL));
+            case STRUCT: {
+                IonStruct struct = SYSTEM.newEmptyStruct();
+                struct.add("foo", generate(IonType.STRING));
+                struct.add("bar", generate(IonType.SYMBOL));
+                return struct;
+            }
+            default:
+                throw new IllegalArgumentException("Don't do this, unsupported generation for type " + type);
+        }
+    }
+
+    private static IonValue generateNull(IonType type) {
+        return SYSTEM.newNull(type);
+    }
+
+    private static IonValue roundTrip(IonValue value) {
+        try {
+            return toIon(toBytes(value));
+        } catch (Exception any) {
+            throw new RuntimeException(any);
+        }
+    }
+
+    private static byte[] toBytes(final IonValue ion) throws IOException {
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        final IonWriter out = STANDARD_WRITER_BUILDER.build(baos);
+        try {
+            ion.writeTo(out);
+        }
+        finally {
+            out.close();
+        }
+        return baos.toByteArray();
+    }
+
+    private static IonValue toIon(final byte[] bytes) throws Exception {
+        final IonReader ionReader = STANDARD_READER_BUILDER.build(bytes);
+        try {
+            ionReader.next();
+        } finally {
+             ionReader.close();
+        }
+        return SYSTEM.newValue(ionReader);
+    }
+}

From 1cac7fe8952ebbf9d62aeebd54ff9b5ddc9a5d9a Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Thu, 19 Jan 2023 12:43:09 -0800
Subject: [PATCH 184/490] Indentation fix (#470)

---
 test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java b/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java
index 41042a0a0a..0a2fb07d5f 100644
--- a/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java
+++ b/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java
@@ -185,7 +185,7 @@ private static IonValue toIon(final byte[] bytes) throws Exception {
         try {
             ionReader.next();
         } finally {
-             ionReader.close();
+            ionReader.close();
         }
         return SYSTEM.newValue(ionReader);
     }

From de540a2abd588de15f79ea706f526c1f21dece87 Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Mon, 23 Jan 2023 12:20:10 -0800
Subject: [PATCH 185/490] Add steps to check if there is any source code
 changed in the incoming pull request. (#467)

---
 .github/workflows/PR-content-check.yml        | 34 +++++++++++++++++++
 ...n-java-performance-regression-detector.yml | 12 ++++---
 .github/workflows/ion-test-driver.yml         |  5 +++
 3 files changed, 47 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/PR-content-check.yml

diff --git a/.github/workflows/PR-content-check.yml b/.github/workflows/PR-content-check.yml
new file mode 100644
index 0000000000..eb2c624155
--- /dev/null
+++ b/.github/workflows/PR-content-check.yml
@@ -0,0 +1,34 @@
+# This workflow will build a Java project with Maven
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: PR Content Check
+
+on:
+  workflow_call:
+    outputs:
+      result:
+        description: "The result of PR content check"
+        value: ${{ jobs.check-PR-content.outputs.output1 }}
+
+jobs:
+  check-PR-content:
+    name: Check PR Content
+
+    runs-on: ubuntu-latest
+
+    outputs:
+      output1: ${{ steps.check-content.outputs.result }}
+
+    steps:
+      - name: Checkout the incoming pull request
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+          path: ion-java-new
+
+      - name: Check the content of the last commit
+        id: check-content
+        run: |
+          cd ion-java-new
+          if [[ $(git log -1 --name-only) == *"src/"* ]]; then echo "result=pass" >> $GITHUB_OUTPUT; else echo "result=fail" >> $GITHUB_OUTPUT; fi
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index ae6e3b668b..fe19e59f9a 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -6,9 +6,13 @@ name: Ion Java performance regression detector
 on: [pull_request]
 
 jobs:
+  PR-Content-Check:
+    uses: amazon-ion/ion-java/.github/workflows/PR-content-check.yml@master
+
   detect-regression:
     name: Detect Regression
-
+    needs: PR-Content-Check
+    if: ${{ needs.PR-Content-Check.outputs.result == 'pass' }}
     runs-on: ubuntu-latest
 
     steps:
@@ -18,7 +22,7 @@ jobs:
           java-version: 1.8
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           path: ion-java-new
@@ -27,7 +31,7 @@ jobs:
         run: cd ion-java-new && git submodule init && git submodule update && ./gradlew clean publishToMavenLocal
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
@@ -70,7 +74,7 @@ jobs:
         run : rm -r /home/runner/.m2
 
       - name: Checkout the current commit
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: amazon-ion/ion-java
           ref: master
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index c7b166b8e0..8c899374f2 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -3,8 +3,13 @@ name: ion-test-driver
 on: [pull_request]
 
 jobs:
+  PR-Content-Check:
+    uses: amazon-ion/ion-java/.github/workflows/PR-content-check.yml@master
+
   ion-test-driver:
     runs-on: macos-10.15
+    needs: PR-Content-Check
+    if: ${{ needs.PR-Content-Check.outputs.result == 'pass' }}
     steps:
       - name: Checkout ion-java
         uses: actions/checkout@master

From b748aa357fbd7188632bb1cafc59934cc5035289 Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Fri, 3 Feb 2023 09:16:31 -0800
Subject: [PATCH 186/490] Add SpotBugs with baseline and baseline generation
 (#471)

* Upgrade to Gradle 7.6

* Enable SpotBugs with baseline

* Add SpotBugs baseline generation to build tasks

* Print SpotBugs to console when in CI workflow
---
 build.gradle.kts                         |   75 +-
 config/spotbugs/baseline.xml             | 2891 ++++++++++++++++++++++
 config/spotbugs/baseline.xslt            |   14 +
 gradle/wrapper/gradle-wrapper.jar        |  Bin 60756 -> 61574 bytes
 gradle/wrapper/gradle-wrapper.properties |    3 +-
 gradlew                                  |   12 +-
 gradlew.bat                              |    1 +
 7 files changed, 2979 insertions(+), 17 deletions(-)
 create mode 100644 config/spotbugs/baseline.xml
 create mode 100644 config/spotbugs/baseline.xslt

diff --git a/build.gradle.kts b/build.gradle.kts
index e4580b11cb..d21a3681a7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -2,15 +2,16 @@ import java.net.URI
 import java.time.Instant
 import java.util.Properties
 
+
 plugins {
     java
     `maven-publish`
     jacoco
     signing
     id("org.cyclonedx.bom") version "1.7.2"
-    // TODO: static analysis. E.g.:
+    id("com.github.spotbugs") version "5.0.13"
+    // TODO: more static analysis. E.g.:
     // id("com.diffplug.spotless") version "6.11.0"
-    // id("com.github.spotbugs") version "4.8.0"
 }
 
 repositories {
@@ -21,7 +22,6 @@ dependencies {
     testImplementation("junit:junit:4.13.1")
     testImplementation("org.hamcrest:hamcrest:2.2")
     testImplementation("pl.pragmatists:JUnitParams:1.1.1")
-    // https://mvnrepository.com/artifact/com.google.code.tempus-fugit/tempus-fugit
     testImplementation("com.google.code.tempus-fugit:tempus-fugit:1.1")
 }
 
@@ -54,19 +54,70 @@ tasks {
 
     javadoc {
         // Suppressing Javadoc warnings is clunky, but there doesn't seem to be any nicer way to do it.
-        // https://stackoverflow.com/questions/52205209/configure-gradle-build-to-suppress-javadoc-console-warnings
+        // https://stackoverflow.com/questions/62894307/option-xdoclintnone-does-not-work-in-gradle-to-ignore-javadoc-warnings
         options {
-            (this as CoreJavadocOptions).addStringOption("Xdoclint:none", "-quiet")
+            this as StandardJavadocDocletOptions
+            addBooleanOption("Xdoclint:none", true)
+            addStringOption("Xmaxwarns", "1") // best we can do is limit warnings to 1
+        }
+    }
+
+    // spotbugs-gradle-plugin creates a :spotbugsTest task by default, but we don't want it
+    // see: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/391
+    project.gradle.startParameter.excludedTaskNames.add(":spotbugsTest")
+
+    spotbugsMain {
+        val spotbugsBaselineFile = "$rootDir/config/spotbugs/baseline.xml"
+
+        // CI=true means we're in a CI workflow
+        // https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables
+        val ciWorkflow = System.getenv()["CI"].toBoolean()
+        val baselining = project.hasProperty("baseline") // e.g. `./gradlew :spotbugsMain -Pbaseline`
+
+        if (!baselining) {
+            baselineFile.set(file(spotbugsBaselineFile))
+        }
+
+        // The plugin only prints to console when no reports are configured
+        // See: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/172
+        if (!ciWorkflow && !baselining) {
+            reports.create("html").required.set(true)
+        } else if (baselining) {
+            // Note this path succeeds :spotbugsMain because *of course it does*
+            ignoreFailures = true
+            reports.create("xml") {
+                // Why bother? Otherwise we have kilobytes of workspace-specific absolute paths, statistics, etc.
+                // cluttering up the baseline XML and preserved in perpetuity. It would be far better if we could use
+                // the SpotBugs relative path support, but the way SpotBugs reporters are presently architected they
+                // drop the `destination` information long before Project.writeXML uses its presence/absence to
+                // determine whether to generate relative instead of absolute paths. So, contribute patch to SpotBugs or
+                // write own SpotBugs reporter in parallel or... do this.
+                // Improvements are definitely possible, but left as an exercise to the reader.
+                doLast {
+                    // It would be super neat if we had some way to handle this xml processing directly inline, without
+                    // generating a temp file or at least without shelling out.
+                    // Use ant's xslt capabilities? Xalan? Saxon gradle plugin (eerohele)? javax.xml.transform?
+                    // In the mean time... xsltproc!
+                    exec {
+                        commandLine(
+                            "xsltproc",
+                            "--output", spotbugsBaselineFile,
+                            "$rootDir/config/spotbugs/baseline.xslt",
+                            outputLocation.get().toString()
+                        )
+                    }
+                }
+            }
         }
     }
 
-    create<Jar>("sourcesJar") sourcesJar@ {
+    create<Jar>("sourcesJar") sourcesJar@{
         archiveClassifier.set("sources")
         from(sourceSets["main"].java.srcDirs)
         artifacts { sourcesArtifact = archives(this@sourcesJar) }
     }
 
-    create<Jar>("javadocJar") javadocJar@ {
+    create<Jar>("javadocJar") javadocJar@{
         archiveClassifier.set("javadoc")
         from(javadoc)
         artifacts { javadocArtifact = archives(this@javadocJar) }
@@ -79,7 +130,7 @@ tasks {
      */
     val generateJarInfo by creating<Task> {
         doLast {
-        val propertiesFile = File("$generatedJarInfoDir/${project.name}.properties")
+            val propertiesFile = File("$generatedJarInfoDir/${project.name}.properties")
             propertiesFile.parentFile.mkdirs()
             val properties = Properties()
             properties.setProperty("build.version", version.toString())
@@ -94,11 +145,11 @@ tasks {
     jacocoTestReport {
         dependsOn(test)
         reports {
-            xml.isEnabled = true
-            html.isEnabled = true
+            xml.required.set(true)
+            html.required.set(true)
         }
         doLast {
-            logger.quiet("Coverage report written to file://${reports.html.destination}/index.html")
+            logger.quiet("Coverage report written to file://${reports.html.outputLocation.get().toString()}/index.html")
         }
     }
 
@@ -131,7 +182,7 @@ publishing {
             licenses {
                 license {
                     name.set("The Apache License, Version 2.0")
-                    url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+                    url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
                 }
             }
             developers {
diff --git a/config/spotbugs/baseline.xml b/config/spotbugs/baseline.xml
new file mode 100644
index 0000000000..79b19a3ce6
--- /dev/null
+++ b/config/spotbugs/baseline.xml
@@ -0,0 +1,2891 @@
+<BugCollection version="4.7.3" sequence="0" timestamp="1675378162557" analysisTimestamp="1675378162587" release="1.9.6-SNAPSHOT">
+  <BugInstance type="NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE" priority="2" rank="13" abbrev="NP" category="STYLE" instanceHash="dfc0f20e980ed41b0fb16167cccef563" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
+    <ShortMessage>Possible null pointer dereference on branch that might be infeasible</ShortMessage>
+    <LongMessage>Possible null pointer dereference of Timestamp._fraction on branch that might be infeasible in com.amazon.ion.Timestamp.equals(Timestamp)</LongMessage>
+    <Class classname="com.amazon.ion.Timestamp" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.Timestamp</Message>
+    </Class>
+    <Method classname="com.amazon.ion.Timestamp" name="equals" signature="(Lcom/amazon/ion/Timestamp;)Z" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2752" end="2794" startBytecode="0" endBytecode="450" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <Message>In method com.amazon.ion.Timestamp.equals(Timestamp)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.Timestamp" name="_fraction" signature="Ljava/math/BigDecimal;" isStatic="false" primary="true" role="FIELD_CONTAINS_VALUE">
+      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>In Timestamp.java</Message>
+      </SourceLine>
+      <Message>Value contained in com.amazon.ion.Timestamp._fraction</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2794" end="2794" startBytecode="251" endBytecode="251" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_DEREF">
+      <Message>Dereferenced at Timestamp.java:[line 2794]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2790" end="2790" startBytecode="238" endBytecode="238" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_KNOWN_NULL">
+      <Message>Known null at Timestamp.java:[line 2790]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="RC_REF_COMPARISON" priority="1" rank="1" abbrev="RC" category="CORRECTNESS" instanceHash="37701f2731e243676fa1126c1a454fea" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Suspicious reference comparison</ShortMessage>
+    <LongMessage>Suspicious comparison of Integer references in com.amazon.ion.Timestamp.make_localtime()</LongMessage>
+    <Class classname="com.amazon.ion.Timestamp" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.Timestamp</Message>
+    </Class>
+    <Method classname="com.amazon.ion.Timestamp" name="make_localtime" signature="()Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="1213" end="1238" startBytecode="0" endBytecode="48" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <Message>In method com.amazon.ion.Timestamp.make_localtime()</Message>
+    </Method>
+    <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
+      <SourceLine classname="java.lang.Integer" start="59" end="1825" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
+        <Message>At Integer.java:[lines 59-1825]</Message>
+      </SourceLine>
+      <Message>Actual type Integer</Message>
+    </Type>
+    <Field classname="com.amazon.ion.Timestamp" name="_offset" signature="Ljava/lang/Integer;" isStatic="false" primary="true" role="FIELD_VALUE_OF">
+      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>In Timestamp.java</Message>
+      </SourceLine>
+      <Message>Value loaded from field com.amazon.ion.Timestamp._offset</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="1236" end="1236" startBytecode="84" endBytecode="84" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[line 1236]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="RC_REF_COMPARISON_BAD_PRACTICE" priority="2" rank="16" abbrev="RC" category="BAD_PRACTICE" instanceHash="ba9366bac044ba2194b3cae4093c18c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Suspicious reference comparison to constant</ShortMessage>
+    <LongMessage>Suspicious comparison of a Integer reference to constant in com.amazon.ion.Timestamp.print(Appendable, Timestamp)</LongMessage>
+    <Class classname="com.amazon.ion.Timestamp" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.Timestamp</Message>
+    </Class>
+    <Method classname="com.amazon.ion.Timestamp" name="print" signature="(Ljava/lang/Appendable;Lcom/amazon/ion/Timestamp;)V" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2148" end="2215" startBytecode="0" endBytecode="177" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <Message>In method com.amazon.ion.Timestamp.print(Appendable, Timestamp)</Message>
+    </Method>
+    <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
+      <SourceLine classname="java.lang.Integer" start="59" end="1825" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
+        <Message>At Integer.java:[lines 59-1825]</Message>
+      </SourceLine>
+      <Message>Actual type Integer</Message>
+    </Type>
+    <Field classname="com.amazon.ion.Timestamp" name="UNKNOWN_OFFSET" signature="Ljava/lang/Integer;" isStatic="true" primary="true" role="FIELD_VALUE_OF">
+      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>In Timestamp.java</Message>
+      </SourceLine>
+      <Message>Value loaded from field com.amazon.ion.Timestamp.UNKNOWN_OFFSET</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2157" end="2157" startBytecode="46" endBytecode="46" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[line 2157]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2165" end="2165" startBytecode="108" endBytecode="108" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[line 2165]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2173" end="2173" startBytecode="170" endBytecode="170" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[line 2173]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2191" end="2191" startBytecode="268" endBytecode="268" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[line 2191]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="RC_REF_COMPARISON_BAD_PRACTICE" priority="2" rank="16" abbrev="RC" category="BAD_PRACTICE" instanceHash="937b7d8f7325c30807c0d31b0d3bdba7" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Suspicious reference comparison to constant</ShortMessage>
+    <LongMessage>Suspicious comparison of a Integer reference to constant in com.amazon.ion.Timestamp.printZ(Appendable)</LongMessage>
+    <Class classname="com.amazon.ion.Timestamp" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.Timestamp</Message>
+    </Class>
+    <Method classname="com.amazon.ion.Timestamp" name="printZ" signature="(Ljava/lang/Appendable;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2111" end="2132" startBytecode="0" endBytecode="30" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <Message>In method com.amazon.ion.Timestamp.printZ(Appendable)</Message>
+    </Method>
+    <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
+      <SourceLine classname="java.lang.Integer" start="59" end="1825" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
+        <Message>At Integer.java:[lines 59-1825]</Message>
+      </SourceLine>
+      <Message>Actual type Integer</Message>
+    </Type>
+    <Field classname="com.amazon.ion.Timestamp" name="UNKNOWN_OFFSET" signature="Ljava/lang/Integer;" isStatic="true" primary="true" role="FIELD_VALUE_OF">
+      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>In Timestamp.java</Message>
+      </SourceLine>
+      <Message>Value loaded from field com.amazon.ion.Timestamp.UNKNOWN_OFFSET</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2117" end="2117" startBytecode="61" endBytecode="61" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[line 2117]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="RC_REF_COMPARISON_BAD_PRACTICE" priority="2" rank="16" abbrev="RC" category="BAD_PRACTICE" instanceHash="c185acf6bba0feadecfdd3085f6dc93b" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Suspicious reference comparison to constant</ShortMessage>
+    <LongMessage>Suspicious comparison of a Integer reference to constant in com.amazon.ion.Timestamp.set_fields_from_calendar(Calendar, Timestamp$Precision, boolean)</LongMessage>
+    <Class classname="com.amazon.ion.Timestamp" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.Timestamp</Message>
+    </Class>
+    <Method classname="com.amazon.ion.Timestamp" name="set_fields_from_calendar" signature="(Ljava/util/Calendar;Lcom/amazon/ion/Timestamp$Precision;Z)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="380" end="438" startBytecode="0" endBytecode="130" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <Message>In method com.amazon.ion.Timestamp.set_fields_from_calendar(Calendar, Timestamp$Precision, boolean)</Message>
+    </Method>
+    <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
+      <SourceLine classname="java.lang.Integer" start="59" end="1825" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
+        <Message>At Integer.java:[lines 59-1825]</Message>
+      </SourceLine>
+      <Message>Actual type Integer</Message>
+    </Type>
+    <Field classname="com.amazon.ion.Timestamp" name="UNKNOWN_OFFSET" signature="Ljava/lang/Integer;" isStatic="true" primary="true" role="FIELD_VALUE_OF">
+      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>In Timestamp.java</Message>
+      </SourceLine>
+      <Message>Value loaded from field com.amazon.ion.Timestamp.UNKNOWN_OFFSET</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="434" end="434" startBytecode="285" endBytecode="285" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[line 434]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="c2029a51b12e7834b0f8742d886d38c3" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer) where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.Timestamp" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.Timestamp</Message>
+    </Class>
+    <Method classname="com.amazon.ion.Timestamp" name="&lt;init&gt;" signature="(Ljava/math/BigDecimal;Lcom/amazon/ion/Timestamp$Precision;Ljava/lang/Integer;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="732" end="771" startBytecode="0" endBytecode="434" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <Message>In method new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="746" end="748" startBytecode="110" endBytecode="113" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 746-748]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="748" end="750" startBytecode="115" endBytecode="118" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 748-750]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="751" end="753" startBytecode="125" endBytecode="128" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 751-753]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="74f8353cfe942e522c8de66a81285331" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.Timestamp.clearUnusedPrecision() where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.Timestamp" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.Timestamp</Message>
+    </Class>
+    <Method classname="com.amazon.ion.Timestamp" name="clearUnusedPrecision" signature="()V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2351" end="2364" startBytecode="0" endBytecode="157" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <Message>In method com.amazon.ion.Timestamp.clearUnusedPrecision()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2353" end="2355" startBytecode="46" endBytecode="49" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 2353-2355]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2355" end="2357" startBytecode="51" endBytecode="54" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 2355-2357]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2358" end="2360" startBytecode="61" endBytecode="64" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 2358-2360]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="83ced4ac6513fc3047dd1da75d409bd2" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.Timestamp" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.Timestamp</Message>
+    </Class>
+    <Method classname="com.amazon.ion.Timestamp" name="&lt;init&gt;" signature="(Ljava/math/BigDecimal;Lcom/amazon/ion/Timestamp$Precision;Ljava/lang/Integer;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="732" end="771" startBytecode="0" endBytecode="434" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <Message>In method new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="743" end="753" startBytecode="70" endBytecode="132" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 743-753]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="96331491fb00e3addee611d915a03efe" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.Timestamp.calendarValue() where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.Timestamp" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.Timestamp</Message>
+    </Class>
+    <Method classname="com.amazon.ion.Timestamp" name="calendarValue" signature="()Ljava/util/Calendar;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="1564" end="1597" startBytecode="0" endBytecode="351" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <Message>In method com.amazon.ion.Timestamp.calendarValue()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="1580" end="1593" startBytecode="87" endBytecode="166" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 1580-1593]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="6da020549cddfb25863236aec8fd75ec" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.Timestamp.clearUnusedPrecision() where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.Timestamp" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.Timestamp</Message>
+    </Class>
+    <Method classname="com.amazon.ion.Timestamp" name="clearUnusedPrecision" signature="()V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2351" end="2364" startBytecode="0" endBytecode="157" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <Message>In method com.amazon.ion.Timestamp.clearUnusedPrecision()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2351" end="2361" startBytecode="11" endBytecode="73" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 2351-2361]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE" priority="1" rank="14" abbrev="CN" category="BAD_PRACTICE" instanceHash="48115647b6b96b3a00651b8a0648e649" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="580">
+    <ShortMessage>Class defines clone() but doesn't implement Cloneable</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.BlockedBuffer defines clone() but doesn't implement Cloneable</LongMessage>
+    <Class classname="com.amazon.ion.impl.BlockedBuffer" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="38" end="1041" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+        <Message>At BlockedBuffer.java:[lines 38-1041]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.BlockedBuffer</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.BlockedBuffer" name="clone" signature="()Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="173" end="196" startBytecode="0" endBytecode="443" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java"/>
+      <Message>In method com.amazon.ion.impl.BlockedBuffer.clone()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="173" end="196" startBytecode="0" endBytecode="443" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java" synthetic="true">
+      <Message>At BlockedBuffer.java:[lines 173-196]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="OS_OPEN_STREAM" priority="2" rank="16" abbrev="OS" category="BAD_PRACTICE" instanceHash="2beb630b98529c2ec849305b3b9385cd" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Method may fail to close stream</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.BlockedBuffer(InputStream) may fail to close stream</LongMessage>
+    <Class classname="com.amazon.ion.impl.BlockedBuffer" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="38" end="1041" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+        <Message>At BlockedBuffer.java:[lines 38-1041]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.BlockedBuffer</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.BlockedBuffer" name="&lt;init&gt;" signature="(Ljava/io/InputStream;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="155" end="163" startBytecode="0" endBytecode="30" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java"/>
+      <Message>In method new com.amazon.ion.impl.BlockedBuffer(InputStream)</Message>
+    </Method>
+    <Type descriptor="Ljava/io/OutputStream;" role="TYPE_CLOSEIT">
+      <SourceLine classname="java.io.OutputStream" start="48" end="193" sourcefile="OutputStream.java" sourcepath="java/io/OutputStream.java">
+        <Message>At OutputStream.java:[lines 48-193]</Message>
+      </SourceLine>
+      <Message>Need to close java.io.OutputStream </Message>
+    </Type>
+    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" primary="true" start="156" end="156" startBytecode="32" endBytecode="32" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <Message>At BlockedBuffer.java:[line 156]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="49ae3f2aff89fca77ece8f5b6b1d8e1d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer) may expose internal representation by storing an externally mutable object into BlockedBuffer$BlockedByteOutputStream._buf</LongMessage>
+    <Class classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1310" end="1656" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+        <Message>At BlockedBuffer.java:[lines 1310-1656]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/BlockedBuffer;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1333" end="1337" startBytecode="0" endBytecode="93" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java"/>
+      <Message>In method new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" name="_buf" signature="Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+        <Message>In BlockedBuffer.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream._buf</Message>
+    </Field>
+    <LocalVariable name="bb" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named bb</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true" start="1334" end="1334" startBytecode="6" endBytecode="6" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <Message>At BlockedBuffer.java:[line 1334]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="d862968857053de2e52f028d75db8af3" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer, int) may expose internal representation by storing an externally mutable object into BlockedBuffer$BlockedByteOutputStream._buf</LongMessage>
+    <Class classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1310" end="1656" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+        <Message>At BlockedBuffer.java:[lines 1310-1656]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/BlockedBuffer;I)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1345" end="1352" startBytecode="0" endBytecode="158" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java"/>
+      <Message>In method new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer, int)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" name="_buf" signature="Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+        <Message>In BlockedBuffer.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream._buf</Message>
+    </Field>
+    <LocalVariable name="bb" register="1" pc="30" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named bb</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true" start="1349" end="1349" startBytecode="30" endBytecode="30" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <Message>At BlockedBuffer.java:[line 1349]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="7df0b5cbb977df79b8ff3750bbd5a37d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream(BlockedBuffer) may expose internal representation by storing an externally mutable object into BlockedBuffer$BufferedOutputStream._buffer</LongMessage>
+    <Class classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" start="1674" end="1776" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+        <Message>At BlockedBuffer.java:[lines 1674-1776]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/BlockedBuffer;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" start="1676" end="1679" startBytecode="0" endBytecode="88" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java"/>
+      <Message>In method new com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream(BlockedBuffer)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" name="_buffer" signature="Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+        <Message>In BlockedBuffer.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream._buffer</Message>
+    </Field>
+    <LocalVariable name="buffer" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named buffer</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" primary="true" start="1677" end="1677" startBytecode="6" endBytecode="6" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <Message>At BlockedBuffer.java:[line 1677]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="4fe59f3d91369442a49b8c1c6b6bf82c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonBinary.lenInt(BigInteger, boolean) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 42-940]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary" name="lenInt" signature="(Ljava/math/BigInteger;Z)I" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="535" end="548" startBytecode="0" endBytecode="181" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary.lenInt(BigInteger, boolean)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="538" end="544" startBytecode="16" endBytecode="65" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[lines 538-544]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="1db30881b779eb29e7835a8b5bc990f2" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Condition has no effect</ShortMessage>
+    <LongMessage>Useless condition: it's known that longVal != Long.MIN_VALUE at this point</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 42-940]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary" name="lenInt" signature="(J)I" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="518" end="530" startBytecode="0" endBytecode="206" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary.lenInt(long)</Message>
+    </Method>
+    <String value="longVal != Long.MIN_VALUE">
+      <Message>Value longVal != Long.MIN_VALUE</Message>
+    </String>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" start="529" end="529" startBytecode="97" endBytecode="97" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonBinary.java:[line 529]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="529" end="529" startBytecode="94" endBytecode="94" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 529]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="bab41df8fb9f2891bb81ef7fe58700af" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Condition has no effect</ShortMessage>
+    <LongMessage>Useless condition: it's known that longVal &gt;= 0 at this point</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 42-940]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary" name="lenInt" signature="(J)I" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="518" end="530" startBytecode="0" endBytecode="206" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary.lenInt(long)</Message>
+    </Method>
+    <String value="longVal &gt;= 0">
+      <Message>Value longVal &gt;= 0</Message>
+    </String>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" start="521" end="521" startBytecode="14" endBytecode="14" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonBinary.java:[line 521]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="521" end="521" startBytecode="11" endBytecode="11" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 521]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="UC_USELESS_CONDITION_TYPE" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="ababe5a464d94cdd468e13995cd3282" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Condition has no effect due to the variable type</ShortMessage>
+    <LongMessage>Useless condition: it's always longVal &gt;= Long.MIN_VALUE because variable type is long</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 42-940]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary" name="lenVarUInt" signature="(J)I" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="445" end="455" startBytecode="0" endBytecode="216" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary.lenVarUInt(long)</Message>
+    </Method>
+    <String value="longVal &gt;= Long.MIN_VALUE">
+      <Message>Value longVal &gt;= Long.MIN_VALUE</Message>
+    </String>
+    <Type descriptor="J">
+      <Message>Type long</Message>
+    </Type>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" start="454" end="454" startBytecode="111" endBytecode="111" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonBinary.java:[line 454]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="454" end="454" startBytecode="108" endBytecode="108" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 454]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE" priority="1" rank="14" abbrev="CN" category="BAD_PRACTICE" instanceHash="5af66f7b2b6a5b7e0a724ce30c82ddc3" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="580">
+    <ShortMessage>Class defines clone() but doesn't implement Cloneable</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager defines clone() but doesn't implement Cloneable</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 322-437]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="clone" signature="()Lcom/amazon/ion/impl/IonBinary$BufferManager;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="396" end="398" startBytecode="0" endBytecode="88" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.clone()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="396" end="398" startBytecode="0" endBytecode="88" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java" synthetic="true">
+      <Message>At IonBinary.java:[lines 396-398]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="7a2dfc422120143b681c7f39bd32798c" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.buffer() may expose internal representation by returning IonBinary$BufferManager._buf</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 322-437]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="buffer" signature="()Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="414" end="414" startBytecode="0" endBytecode="46" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.buffer()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_buf" signature="Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>In IonBinary.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._buf</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="414" end="414" startBytecode="4" endBytecode="4" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 414]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="bb5993199b143728b278261ec17b72f2" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.openReader() may expose internal representation by returning IonBinary$BufferManager._reader</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 322-437]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="openReader" signature="()Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="402" end="405" startBytecode="0" endBytecode="85" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.openReader()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_reader" signature="Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>In IonBinary.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._reader</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="405" end="405" startBytecode="26" endBytecode="26" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 405]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="13a1cd7af738123e4c2e7d41e42da55f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.openWriter() may expose internal representation by returning IonBinary$BufferManager._writer</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 322-437]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="openWriter" signature="()Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="408" end="411" startBytecode="0" endBytecode="85" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.openWriter()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_writer" signature="Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>In IonBinary.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._writer</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="411" end="411" startBytecode="26" endBytecode="26" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 411]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="e23a2c4995e81e2f50e116d22b11817" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.reader() may expose internal representation by returning IonBinary$BufferManager._reader</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 322-437]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="reader" signature="()Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="415" end="415" startBytecode="0" endBytecode="46" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.reader()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_reader" signature="Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>In IonBinary.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._reader</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="415" end="415" startBytecode="4" endBytecode="4" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 415]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="33ce07038be68a0b32e72494c0b0779d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.reader(int) may expose internal representation by returning IonBinary$BufferManager._reader</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 322-437]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="reader" signature="(I)Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="420" end="421" startBytecode="0" endBytecode="69" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.reader(int)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_reader" signature="Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>In IonBinary.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._reader</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="421" end="421" startBytecode="13" endBytecode="13" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 421]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="ce9dc2b4001e503cbc79f5cd18a70d87" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.writer() may expose internal representation by returning IonBinary$BufferManager._writer</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 322-437]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="writer" signature="()Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="416" end="416" startBytecode="0" endBytecode="46" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.writer()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_writer" signature="Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>In IonBinary.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._writer</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="416" end="416" startBytecode="4" endBytecode="4" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 416]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="3f96230ef763752c8cd65017112683aa" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.writer(int) may expose internal representation by returning IonBinary$BufferManager._writer</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 322-437]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="writer" signature="(I)Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="425" end="426" startBytecode="0" endBytecode="69" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.writer(int)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_writer" signature="Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>In IonBinary.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._writer</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="426" end="426" startBytecode="13" endBytecode="13" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 426]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="cb558f16e9df13958572ae691116db56" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.IonBinary$BufferManager(BlockedBuffer) may expose internal representation by storing an externally mutable object into IonBinary$BufferManager._buf</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 322-437]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/BlockedBuffer;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="333" end="337" startBytecode="0" endBytecode="87" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method new com.amazon.ion.impl.IonBinary$BufferManager(BlockedBuffer)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_buf" signature="Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>In IonBinary.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._buf</Message>
+    </Field>
+    <LocalVariable name="buf" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named buf</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="334" end="334" startBytecode="6" endBytecode="6" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 334]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="DM_NUMBER_CTOR" priority="2" rank="18" abbrev="Bx" category="PERFORMANCE" instanceHash="388801c49e11ff5a202ec9542929bad" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Method invokes inefficient Number constructor; use static valueOf instead</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$Reader.readVarIntWithNegativeZero() invokes inefficient new Integer(int) constructor; use Integer.valueOf(int) instead</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$Reader" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 942-1815]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$Reader</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$Reader" name="readVarIntWithNegativeZero" signature="()Ljava/lang/Integer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1475" end="1525" startBytecode="0" endBytecode="468" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$Reader.readVarIntWithNegativeZero()</Message>
+    </Method>
+    <Method classname="java.lang.Integer" name="&lt;init&gt;" signature="(I)V" isStatic="false" role="METHOD_CALLED">
+      <SourceLine classname="java.lang.Integer" start="1082" end="1084" startBytecode="0" endBytecode="69" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
+      <Message>Called method new Integer(int)</Message>
+    </Method>
+    <Method classname="java.lang.Integer" name="valueOf" signature="(I)Ljava/lang/Integer;" isStatic="true" role="SHOULD_CALL">
+      <SourceLine classname="java.lang.Integer" start="1057" end="1059" startBytecode="0" endBytecode="90" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
+      <Message>Should call Integer.valueOf(int) instead</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" primary="true" start="1519" end="1519" startBytecode="227" endBytecode="227" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 1519]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1523" end="1523" startBytecode="240" endBytecode="240" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonBinary.java:[line 1523]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="9748c6aaf34a4d74620a1ec326f0f096" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonBinary$Reader.readIntAsInt(int) where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$Reader" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 942-1815]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$Reader</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$Reader" name="readIntAsInt" signature="(I)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1218" end="1250" startBytecode="0" endBytecode="345" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$Reader.readIntAsInt(int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" primary="true" start="1237" end="1239" startBytecode="115" endBytecode="116" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[lines 1237-1239]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="724d9b9397d47f179ac35262df1b7141" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonBinary$Reader.readIntAsInt(int) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$Reader" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 942-1815]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$Reader</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$Reader" name="readIntAsInt" signature="(I)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1218" end="1250" startBytecode="0" endBytecode="345" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$Reader.readIntAsInt(int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" primary="true" start="1229" end="1243" startBytecode="47" endBytecode="159" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[lines 1229-1243]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="81bfd89f439fde24c86f6c5cbb01b462" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonBinary$Reader.readIntAsLong(int) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$Reader" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 942-1815]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$Reader</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$Reader" name="readIntAsLong" signature="(I)J" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1167" end="1212" startBytecode="0" endBytecode="508" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$Reader.readIntAsLong(int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" primary="true" start="1177" end="1204" startBytecode="49" endBytecode="279" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[lines 1177-1204]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="BIT_AND" priority="1" rank="5" abbrev="BIT" category="CORRECTNESS" instanceHash="489579953b9cb45b99949c6c8254098f" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Incompatible bit masks</ShortMessage>
+    <LongMessage>Incompatible bit masks in (e &amp; 0x80 == 0x40) yields a constant result in com.amazon.ion.impl.IonBinary$Writer.writeIntValue(long)</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonBinary$Writer" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Writer" start="1819" end="2917" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+        <Message>At IonBinary.java:[lines 1819-2917]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonBinary$Writer</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonBinary$Writer" name="writeIntValue" signature="(J)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Writer" start="2422" end="2443" startBytecode="0" endBytecode="277" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonBinary$Writer.writeIntValue(long)</Message>
+    </Method>
+    <String value="0x80">
+      <Message>Value 0x80</Message>
+    </String>
+    <String value="0x40">
+      <Message>Value 0x40</Message>
+    </String>
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$Writer" primary="true" start="2433" end="2433" startBytecode="69" endBytecode="69" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <Message>At IonBinary.java:[line 2433]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="IT_NO_SUCH_ELEMENT" priority="2" rank="16" abbrev="It" category="BAD_PRACTICE" instanceHash="91c1d0791b8d7dac1944ff029e517a2f" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Iterator next() method cannot throw NoSuchElementException</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonReaderBinaryIncremental$2.next() cannot throw NoSuchElementException</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderBinaryIncremental$2" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryIncremental$2" start="1846" end="1860" sourcefile="IonReaderBinaryIncremental.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryIncremental.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryIncremental.java">
+        <Message>At IonReaderBinaryIncremental.java:[lines 1846-1860]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderBinaryIncremental$2</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderBinaryIncremental$2" name="next" signature="()Ljava/lang/String;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryIncremental$2" start="1855" end="1855" startBytecode="0" endBytecode="43" sourcefile="IonReaderBinaryIncremental.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryIncremental.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryIncremental.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderBinaryIncremental$2.next()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryIncremental$2" start="1855" end="1855" startBytecode="0" endBytecode="43" sourcefile="IonReaderBinaryIncremental.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryIncremental.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryIncremental.java" synthetic="true">
+      <Message>At IonReaderBinaryIncremental.java:[line 1855]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="39cabc5dbc8ca25a27f2639c1305ab0f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderBinaryRawX.has_next_helper_raw() where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderBinaryRawX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryRawX" start="55" end="1354" sourcefile="IonReaderBinaryRawX.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryRawX.java">
+        <Message>At IonReaderBinaryRawX.java:[lines 55-1354]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderBinaryRawX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderBinaryRawX" name="has_next_helper_raw" signature="()V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryRawX" start="258" end="345" startBytecode="0" endBytecode="710" sourcefile="IonReaderBinaryRawX.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryRawX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderBinaryRawX.has_next_helper_raw()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryRawX" primary="true" start="327" end="330" startBytecode="354" endBytecode="357" sourcefile="IonReaderBinaryRawX.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryRawX.java">
+      <Message>At IonReaderBinaryRawX.java:[lines 327-330]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="URF_UNREAD_FIELD" priority="2" rank="18" abbrev="UrF" category="PERFORMANCE" instanceHash="5dee2f4eb7ae9b82ef90087df5982dfa" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Unread field</ShortMessage>
+    <LongMessage>Unread field: com.amazon.ion.impl.IonReaderLookaheadBuffer.currentNumberOfAnnotations</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderLookaheadBuffer" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderLookaheadBuffer" start="22" end="956" sourcefile="IonReaderLookaheadBuffer.java" sourcepath="com/amazon/ion/impl/IonReaderLookaheadBuffer.java" relSourcepath="src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java">
+        <Message>At IonReaderLookaheadBuffer.java:[lines 22-956]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderLookaheadBuffer</Message>
+    </Class>
+    <Field classname="com.amazon.ion.impl.IonReaderLookaheadBuffer" name="currentNumberOfAnnotations" signature="J" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderLookaheadBuffer" sourcefile="IonReaderLookaheadBuffer.java" sourcepath="com/amazon/ion/impl/IonReaderLookaheadBuffer.java" relSourcepath="src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java">
+        <Message>In IonReaderLookaheadBuffer.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.IonReaderLookaheadBuffer.currentNumberOfAnnotations</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderLookaheadBuffer" primary="true" start="285" end="285" startBytecode="17" endBytecode="17" sourcefile="IonReaderLookaheadBuffer.java" sourcepath="com/amazon/ion/impl/IonReaderLookaheadBuffer.java" relSourcepath="src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java">
+      <Message>At IonReaderLookaheadBuffer.java:[line 285]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SBSC_USE_STRINGBUFFER_CONCATENATION" priority="2" rank="18" abbrev="SBSC" category="PERFORMANCE" instanceHash="1983f5982865e6bca7fcbab80f84c0eb" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Method concatenates strings using + in a loop</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonReaderTextRawTokensX.peekNullTypeSymbolUndo(int[], int) concatenates strings using + in a loop</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="peekNullTypeSymbolUndo" signature="([II)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="421" end="429" startBytecode="0" endBytecode="186" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.peekNullTypeSymbolUndo(int[], int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="424" end="424" startBytecode="12" endBytecode="12" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 424]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="7ac13daf00bed04a0dc687024ba3a5c3" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.load_double_quoted_string(StringBuilder, boolean) where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="load_double_quoted_string" signature="(Ljava/lang/StringBuilder;Z)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2020" end="2061" startBytecode="0" endBytecode="388" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.load_double_quoted_string(StringBuilder, boolean)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2039" end="2041" startBytecode="115" endBytecode="118" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2039-2041]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="e71ff3699310d9d02654e42aa19f1ea7" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.load_fixed_digits(StringBuilder, int) where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="load_fixed_digits" signature="(Ljava/lang/StringBuilder;I)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1695" end="1726" startBytecode="0" endBytecode="388" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.load_fixed_digits(StringBuilder, int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1707" end="1710" startBytecode="90" endBytecode="91" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1707-1710]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1712" end="1715" startBytecode="114" endBytecode="115" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 1712-1715]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1717" end="1720" startBytecode="138" endBytecode="139" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 1717-1720]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="aa3a0c04d8e812b2cc9b8e968316999c" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.load_single_quoted_string(StringBuilder, boolean) where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="load_single_quoted_string" signature="(Ljava/lang/StringBuilder;Z)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1936" end="1982" startBytecode="0" endBytecode="421" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.load_single_quoted_string(StringBuilder, boolean)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1955" end="1959" startBytecode="115" endBytecode="118" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1955-1959]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="52a2b4795d02a2af4518de7c8fc46346" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_byte_helper() where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_base64_byte_helper" signature="()I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2539" end="2571" startBytecode="0" endBytecode="439" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_byte_helper()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2561" end="2564" startBytecode="146" endBytecode="149" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2561-2564]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2565" end="2568" startBytecode="172" endBytecode="175" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 2565-2568]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="a8ea82c1e5d992dab6cd75d14f2a8a05" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper() where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_double_quoted_string_helper" signature="()V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1998" end="2011" startBytecode="0" endBytecode="178" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2001" end="2006" startBytecode="69" endBytecode="72" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2001-2006]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2006" end="2008" startBytecode="74" endBytecode="77" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 2006-2008]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="d1e587d656a8337e9067d0cf2b73a976" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_over_container(int) where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_over_container" signature="(I)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1208" end="1280" startBytecode="0" endBytecode="539" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_over_container(int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1215" end="1219" startBytecode="121" endBytecode="124" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1215-1219]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="a4a066a68adf31d418a174990aefe0b1" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint) where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_single_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1917" end="1927" startBytecode="0" endBytecode="176" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1919" end="1921" startBytecode="45" endBytecode="48" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1919-1921]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="ee5b2dc71707fd11c5c55336b3872f2a" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy) where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_triple_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;Lcom/amazon/ion/impl/IonReaderTextRawTokensX$CommentStrategy;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2134" end="2159" startBytecode="0" endBytecode="261" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2137" end="2139" startBytecode="41" endBytecode="44" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2137-2139]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="75b268bc0bf180f5e16e86d8d89d390d" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.read_escaped_char_content_helper(int, boolean) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_escaped_char_content_helper" signature="(IZ)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2455" end="2494" startBytecode="0" endBytecode="363" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_escaped_char_content_helper(int, boolean)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2472" end="2491" startBytecode="64" endBytecode="185" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2472-2491]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="fca794c841dd591a8aa91960632076fc" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_block_comment() where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_block_comment" signature="()V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="934" end="950" startBytecode="0" endBytecode="152" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_block_comment()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="935" end="948" startBytecode="6" endBytecode="57" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 935-948]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="567161b456e11f066d8b9bfff637442b" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper() where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_double_quoted_string_helper" signature="()V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1998" end="2011" startBytecode="0" endBytecode="178" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1999" end="2010" startBytecode="9" endBytecode="82" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1999-2010]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="4cf1c4e0aa4e006bf568be9fbda9762b" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_single_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1917" end="1927" startBytecode="0" endBytecode="176" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1918" end="1926" startBytecode="9" endBytecode="66" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1918-1926]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="d014b15325fcb8575d20785aba624041" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_triple_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;Lcom/amazon/ion/impl/IonReaderTextRawTokensX$CommentStrategy;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2134" end="2159" startBytecode="0" endBytecode="261" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2135" end="2158" startBytecode="6" endBytecode="108" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2135-2158]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="8e9d13a407c4f6bac4e762a72e9ba7b3" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Condition has no effect</ShortMessage>
+    <LongMessage>Useless condition: it's known that c != -1 at this point</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_base64_getchar_helper" signature="(I)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2574" end="2582" startBytecode="0" endBytecode="141" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_getchar_helper(int)</Message>
+    </Method>
+    <String value="c != -1">
+      <Message>Value c != -1</Message>
+    </String>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2577" end="2577" startBytecode="36" endBytecode="36" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2577]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2576" end="2576" startBytecode="27" endBytecode="27" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 2576]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="60de97d50a6ac53097856cdc7425614c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Condition has no effect</ShortMessage>
+    <LongMessage>Useless condition: it's known that c != 125 ('}') at this point</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_base64_getchar_helper" signature="(I)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2574" end="2582" startBytecode="0" endBytecode="141" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_getchar_helper(int)</Message>
+    </Method>
+    <String value="c != 125 ('}')">
+      <Message>Value c != 125 ('}')</Message>
+    </String>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2577" end="2577" startBytecode="36" endBytecode="36" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2577]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2576" end="2576" startBytecode="33" endBytecode="33" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 2576]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="ac257771a68961d6170b90e54af30e64" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Condition has no effect</ShortMessage>
+    <LongMessage>Useless condition: it's known that len &lt;= 0 at this point</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_hex_escape_sequence_value" signature="(I)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2498" end="2515" startBytecode="0" endBytecode="255" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_hex_escape_sequence_value(int)</Message>
+    </Method>
+    <String value="len &lt;= 0">
+      <Message>Value len &lt;= 0</Message>
+    </String>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2510" end="2510" startBytecode="49" endBytecode="49" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2510]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2509" end="2509" startBytecode="46" endBytecode="46" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 2509]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="63520ea30e12c2314c00f268931e030a" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawX.parseSymbolToken(String, StringBuilder, int) where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonReaderTextRawX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" start="72" end="1440" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawX.java">
+        <Message>At IonReaderTextRawX.java:[lines 72-1440]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonReaderTextRawX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonReaderTextRawX" name="parseSymbolToken" signature="(Ljava/lang/String;Ljava/lang/StringBuilder;I)Lcom/amazon/ion/SymbolToken;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" start="745" end="772" startBytecode="0" endBytecode="406" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawX.java"/>
+      <Message>In method com.amazon.ion.impl.IonReaderTextRawX.parseSymbolToken(String, StringBuilder, int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" primary="true" start="756" end="758" startBytecode="104" endBytecode="107" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawX.java">
+      <Message>At IonReaderTextRawX.java:[lines 756-758]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="bb3edb4b197b1040674fa502092b5335" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Condition has no effect</ShortMessage>
+    <LongMessage>Useless condition: it's known that c &gt;= 65535 (0xffff) at this point</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonTokenConstsX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="27" end="951" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java">
+        <Message>At IonTokenConstsX.java:[lines 27-951]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonTokenConstsX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonTokenConstsX" name="escapeSequence" signature="(I)Ljava/lang/String;" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="388" end="409" startBytecode="0" endBytecode="322" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java"/>
+      <Message>In method com.amazon.ion.impl.IonTokenConstsX.escapeSequence(int)</Message>
+    </Method>
+    <String value="c &gt;= 65535 (0xffff)">
+      <Message>Value c &gt;= 65535 (0xffff)</Message>
+    </String>
+    <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="401" end="401" startBytecode="77" endBytecode="77" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonTokenConstsX.java:[line 401]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" primary="true" start="400" end="400" startBytecode="74" endBytecode="74" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java">
+      <Message>At IonTokenConstsX.java:[line 400]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="UC_USELESS_CONDITION" priority="2" rank="16" abbrev="UC" category="STYLE" instanceHash="5349b5d532d4c6d1a85d3176dbad8c5e" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Condition has no effect</ShortMessage>
+    <LongMessage>Useless condition: it's known that c &lt;= 1114111 (0x10ffff) at this point</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonTokenConstsX" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="27" end="951" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java">
+        <Message>At IonTokenConstsX.java:[lines 27-951]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonTokenConstsX</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonTokenConstsX" name="escapeSequence" signature="(I)Ljava/lang/String;" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="388" end="409" startBytecode="0" endBytecode="322" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java"/>
+      <Message>In method com.amazon.ion.impl.IonTokenConstsX.escapeSequence(int)</Message>
+    </Method>
+    <String value="c &lt;= 1114111 (0x10ffff)">
+      <Message>Value c &lt;= 1114111 (0x10ffff)</Message>
+    </String>
+    <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" primary="true" start="388" end="388" startBytecode="7" endBytecode="7" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java">
+      <Message>At IonTokenConstsX.java:[line 388]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="2a3aa1c1ca170777e5487dcfe23af64b" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonTokenReader.readEscapedCharacter(PushbackReader, boolean) where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonTokenReader" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="41" end="1620" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+        <Message>At IonTokenReader.java:[lines 41-1620]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonTokenReader</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonTokenReader" name="readEscapedCharacter" signature="(Ljava/io/PushbackReader;Z)I" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="1134" end="1197" startBytecode="0" endBytecode="745" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java"/>
+      <Message>In method com.amazon.ion.impl.IonTokenReader.readEscapedCharacter(PushbackReader, boolean)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" primary="true" start="1167" end="1171" startBytecode="307" endBytecode="308" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+      <Message>At IonTokenReader.java:[lines 1167-1171]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="1179" end="1183" startBytecode="365" endBytecode="366" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonTokenReader.java:[lines 1179-1183]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="1bf17f6960a38cf0d3f759ae1b783014" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonTokenReader.matchKeyword(StringBuilder, int, int) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonTokenReader" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="41" end="1620" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+        <Message>At IonTokenReader.java:[lines 41-1620]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonTokenReader</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonTokenReader" name="matchKeyword" signature="(Ljava/lang/StringBuilder;II)Lcom/amazon/ion/impl/IonTokenReader$Type;" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="722" end="761" startBytecode="0" endBytecode="424" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java"/>
+      <Message>In method com.amazon.ion.impl.IonTokenReader.matchKeyword(StringBuilder, int, int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" primary="true" start="724" end="756" startBytecode="10" endBytecode="244" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+      <Message>At IonTokenReader.java:[lines 724-756]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="ES_COMPARING_STRINGS_WITH_EQ" priority="1" rank="9" abbrev="ES" category="BAD_PRACTICE" instanceHash="9d5144bbccad95f029d2e28c030ddfc9" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="597">
+    <ShortMessage>Comparison of String objects using == or !=</ShortMessage>
+    <LongMessage>Comparison of String objects using == or != in com.amazon.ion.impl.IonTokenReader$Type.setNumericValue(IonTokenReader, String)</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonTokenReader$Type" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type" start="54" end="209" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+        <Message>At IonTokenReader.java:[lines 54-209]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonTokenReader$Type</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonTokenReader$Type" name="setNumericValue" signature="(Lcom/amazon/ion/impl/IonTokenReader;Ljava/lang/String;)Lcom/amazon/ion/impl/IonTokenReader$Type;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type" start="150" end="194" startBytecode="0" endBytecode="117" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java"/>
+      <Message>In method com.amazon.ion.impl.IonTokenReader$Type.setNumericValue(IonTokenReader, String)</Message>
+    </Method>
+    <Type descriptor="Ljava/lang/String;" role="TYPE_FOUND">
+      <SourceLine classname="java.lang.String" start="125" end="3345" sourcefile="String.java" sourcepath="java/lang/String.java">
+        <Message>At String.java:[lines 125-3345]</Message>
+      </SourceLine>
+      <Message>Actual type String</Message>
+    </Type>
+    <LocalVariable name="s" register="2" pc="232" role="LOCAL_VARIABLE_VALUE_OF">
+      <Message>Value loaded from s</Message>
+    </LocalVariable>
+    <LocalVariable name="eFormat" register="3" pc="232" role="LOCAL_VARIABLE_VALUE_OF">
+      <Message>Value loaded from eFormat</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type" primary="true" start="184" end="184" startBytecode="233" endBytecode="233" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+      <Message>At IonTokenReader.java:[line 184]</Message>
+    </SourceLine>
+    <Property name="edu.umd.cs.findbugs.detect.RefComparisonWarningProperty.DYNAMIC_AND_UNKNOWN" value="true"/>
+  </BugInstance>
+  <BugInstance type="NM_CLASS_NAMING_CONVENTION" priority="2" rank="16" abbrev="Nm" category="BAD_PRACTICE" instanceHash="2f78ac987f6763ec5762edc7af0ba831" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Class names should start with an upper case letter</ShortMessage>
+    <LongMessage>The class name com.amazon.ion.impl.IonTokenReader$Type$timeinfo doesn't start with an upper case letter</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonTokenReader$Type$timeinfo" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type$timeinfo" start="132" end="143" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+        <Message>At IonTokenReader.java:[lines 132-143]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonTokenReader$Type$timeinfo</Message>
+    </Class>
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type$timeinfo" start="132" end="143" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java" synthetic="true">
+      <Message>At IonTokenReader.java:[lines 132-143]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="BIT_IOR_OF_SIGNED_BYTE" priority="2" rank="2" abbrev="BIT" category="CORRECTNESS" instanceHash="93df0fa44c6dfe9f55204cae04ba21c3" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Bitwise OR of signed byte value</ShortMessage>
+    <LongMessage>Bitwise OR of signed byte value computed in com.amazon.ion.impl.IonUTF8.getAs4BytesReversed(int)</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonUTF8" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="35" end="406" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+        <Message>At IonUTF8.java:[lines 35-406]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonUTF8</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonUTF8" name="getAs4BytesReversed" signature="(I)I" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="174" end="193" startBytecode="0" endBytecode="267" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java"/>
+      <Message>In method com.amazon.ion.impl.IonUTF8.getAs4BytesReversed(int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" primary="true" start="179" end="179" startBytecode="52" endBytecode="52" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+      <Message>At IonUTF8.java:[line 179]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="183" end="183" startBytecode="69" endBytecode="69" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonUTF8.java:[line 183]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="188" end="188" startBytecode="96" endBytecode="96" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonUTF8.java:[line 188]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="BIT_IOR_OF_SIGNED_BYTE" priority="2" rank="2" abbrev="BIT" category="CORRECTNESS" instanceHash="c7af8fe0a87cebec80f386f18d0bad53" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Bitwise OR of signed byte value</ShortMessage>
+    <LongMessage>Bitwise OR of signed byte value computed in com.amazon.ion.impl.IonUTF8.packBytesAfter1(int, int)</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonUTF8" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="35" end="406" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+        <Message>At IonUTF8.java:[lines 35-406]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonUTF8</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonUTF8" name="packBytesAfter1" signature="(II)I" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="254" end="270" startBytecode="0" endBytecode="228" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java"/>
+      <Message>In method com.amazon.ion.impl.IonUTF8.packBytesAfter1(int, int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" primary="true" start="262" end="262" startBytecode="60" endBytecode="60" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+      <Message>At IonUTF8.java:[line 262]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="266" end="266" startBytecode="78" endBytecode="78" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonUTF8.java:[line 266]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="e1c82ce34dd3414dfe4b51e88e2e4072" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonUTF8.convertToUTF8Bytes(int, byte[], int, int) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonUTF8" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="35" end="406" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+        <Message>At IonUTF8.java:[lines 35-406]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonUTF8</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonUTF8" name="convertToUTF8Bytes" signature="(I[BII)I" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="211" end="238" startBytecode="0" endBytecode="428" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java"/>
+      <Message>In method com.amazon.ion.impl.IonUTF8.convertToUTF8Bytes(int, byte[], int, int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" primary="true" start="214" end="235" startBytecode="12" endBytecode="230" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+      <Message>At IonUTF8.java:[lines 214-235]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" priority="2" rank="11" abbrev="RCN" category="CORRECTNESS" instanceHash="a947663772ecc40ffa3682e827dfdb04" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
+    <ShortMessage>Nullcheck of value previously dereferenced</ShortMessage>
+    <LongMessage>Nullcheck of IonWriterSystemBinary._patch at line 518 of value previously dereferenced in com.amazon.ion.impl.IonWriterSystemBinary.closeValue()</LongMessage>
+    <Class classname="com.amazon.ion.impl.IonWriterSystemBinary" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="40" end="1048" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/com/amazon/ion/impl/IonWriterSystemBinary.java">
+        <Message>At IonWriterSystemBinary.java:[lines 40-1048]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.IonWriterSystemBinary</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.IonWriterSystemBinary" name="closeValue" signature="()V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="510" end="520" startBytecode="0" endBytecode="156" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/com/amazon/ion/impl/IonWriterSystemBinary.java"/>
+      <Message>In method com.amazon.ion.impl.IonWriterSystemBinary.closeValue()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.IonWriterSystemBinary" name="_patch" signature="Lcom/amazon/ion/impl/IonWriterSystemBinary$PatchedValues;" isStatic="false" primary="true" role="FIELD_VALUE_OF">
+      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/com/amazon/ion/impl/IonWriterSystemBinary.java">
+        <Message>In IonWriterSystemBinary.java</Message>
+      </SourceLine>
+      <Message>Value loaded from field com.amazon.ion.impl.IonWriterSystemBinary._patch</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" primary="true" start="517" end="517" startBytecode="51" endBytecode="51" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/com/amazon/ion/impl/IonWriterSystemBinary.java">
+      <Message>At IonWriterSystemBinary.java:[line 517]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="518" end="518" startBytecode="64" endBytecode="64" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/com/amazon/ion/impl/IonWriterSystemBinary.java" role="SOURCE_REDUNDANT_NULL_CHECK">
+      <Message>Redundant null check at IonWriterSystemBinary.java:[line 518]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="IS2_INCONSISTENT_SYNC" priority="2" rank="17" abbrev="IS" category="MT_CORRECTNESS" instanceHash="6d5e152f4ead561f66657ad28715856a" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="366">
+    <ShortMessage>Inconsistent synchronization</ShortMessage>
+    <LongMessage>Inconsistent synchronization of com.amazon.ion.impl.LocalSymbolTable.mySymbolNames; locked 75% of time</LongMessage>
+    <Class classname="com.amazon.ion.impl.LocalSymbolTable" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="53" end="874" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java">
+        <Message>At LocalSymbolTable.java:[lines 53-874]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.LocalSymbolTable</Message>
+    </Class>
+    <Field classname="com.amazon.ion.impl.LocalSymbolTable" name="mySymbolNames" signature="[Ljava/lang/String;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java">
+        <Message>In LocalSymbolTable.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.LocalSymbolTable.mySymbolNames</Message>
+    </Field>
+    <Int value="75" role="INT_SYNC_PERCENT">
+      <Message>Synchronized 75% of the time</Message>
+    </Int>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" primary="true" start="856" end="856" startBytecode="56" endBytecode="56" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 856]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="860" end="860" startBytecode="62" endBytecode="62" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 860]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="870" end="870" startBytecode="95" endBytecode="95" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 870]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="424" end="424" startBytecode="51" endBytecode="51" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 424]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="555" end="555" startBytecode="22" endBytecode="22" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 555]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="575" end="575" startBytecode="119" endBytecode="119" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 575]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="563" end="563" startBytecode="51" endBytecode="51" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 563]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="564" end="564" startBytecode="66" endBytecode="66" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 564]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="144" end="144" startBytecode="9" endBytecode="9" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 144]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="146" end="146" startBytecode="17" endBytecode="17" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 146]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="494" end="494" startBytecode="38" endBytecode="38" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 494]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="401" end="401" startBytecode="5" endBytecode="5" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 401]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="IS2_INCONSISTENT_SYNC" priority="2" rank="17" abbrev="IS" category="MT_CORRECTNESS" instanceHash="51a58628ea63298078b87f36b7a3416e" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="366">
+    <ShortMessage>Inconsistent synchronization</ShortMessage>
+    <LongMessage>Inconsistent synchronization of com.amazon.ion.impl.LocalSymbolTable.mySymbolsCount; locked 81% of time</LongMessage>
+    <Class classname="com.amazon.ion.impl.LocalSymbolTable" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="53" end="874" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java">
+        <Message>At LocalSymbolTable.java:[lines 53-874]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.LocalSymbolTable</Message>
+    </Class>
+    <Field classname="com.amazon.ion.impl.LocalSymbolTable" name="mySymbolsCount" signature="I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java">
+        <Message>In LocalSymbolTable.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.LocalSymbolTable.mySymbolsCount</Message>
+    </Field>
+    <Int value="81" role="INT_SYNC_PERCENT">
+      <Message>Synchronized 81% of the time</Message>
+    </Int>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" primary="true" start="848" end="848" startBytecode="35" endBytecode="35" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 848]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="854" end="854" startBytecode="46" endBytecode="46" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 854]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="379" end="379" startBytecode="1" endBytecode="1" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 379]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="555" end="555" startBytecode="18" endBytecode="18" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 555]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="557" end="557" startBytecode="30" endBytecode="30" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 557]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="575" end="575" startBytecode="123" endBytecode="123" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 575]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="570" end="570" startBytecode="76" endBytecode="76" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 570]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="576" end="576" startBytecode="130" endBytecode="130" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 576]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="576" end="576" startBytecode="135" endBytecode="135" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 576]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="563" end="563" startBytecode="58" endBytecode="58" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 563]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="401" end="401" startBytecode="9" endBytecode="9" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+      <Message>Synchronized access at LocalSymbolTable.java:[line 401]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="DM_NUMBER_CTOR" priority="2" rank="18" abbrev="Bx" category="PERFORMANCE" instanceHash="c32777862ff0ea61cb0e842c3079810c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Method invokes inefficient Number constructor; use static valueOf instead</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readVarInteger() invokes inefficient new Integer(int) constructor; use Integer.valueOf(int) instead</LongMessage>
+    <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="135" end="660" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+        <Message>At SimpleByteBuffer.java:[lines 135-660]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" name="readVarInteger" signature="()Ljava/lang/Integer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="330" end="378" startBytecode="0" endBytecode="439" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readVarInteger()</Message>
+    </Method>
+    <Method classname="java.lang.Integer" name="&lt;init&gt;" signature="(I)V" isStatic="false" role="METHOD_CALLED">
+      <SourceLine classname="java.lang.Integer" start="1082" end="1084" startBytecode="0" endBytecode="69" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
+      <Message>Called method new Integer(int)</Message>
+    </Method>
+    <Method classname="java.lang.Integer" name="valueOf" signature="(I)Ljava/lang/Integer;" isStatic="true" role="SHOULD_CALL">
+      <SourceLine classname="java.lang.Integer" start="1057" end="1059" startBytecode="0" endBytecode="90" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
+      <Message>Should call Integer.valueOf(int) instead</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" primary="true" start="372" end="372" startBytecode="202" endBytecode="202" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <Message>At SimpleByteBuffer.java:[line 372]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="376" end="376" startBytecode="215" endBytecode="215" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at SimpleByteBuffer.java:[line 376]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="NP_NULL_PARAM_DEREF" priority="2" rank="8" abbrev="NP" category="CORRECTNESS" instanceHash="beb1e796c5e40b6af4fc4a6a96fabb76" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
+    <ShortMessage>Method call passes null for non-null parameter</ShortMessage>
+    <LongMessage>Null passed for non-null parameter of com.amazon.ion.Timestamp.createFromUtcFields(Timestamp$Precision, int, int, int, int, int, int, BigDecimal, Integer) in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readTimestamp(int)</LongMessage>
+    <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="135" end="660" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+        <Message>At SimpleByteBuffer.java:[lines 135-660]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" name="readTimestamp" signature="(I)Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="503" end="560" startBytecode="0" endBytecode="544" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readTimestamp(int)</Message>
+    </Method>
+    <Method classname="com.amazon.ion.Timestamp" name="createFromUtcFields" signature="(Lcom/amazon/ion/Timestamp$Precision;IIIIIILjava/math/BigDecimal;Ljava/lang/Integer;)Lcom/amazon/ion/Timestamp;" isStatic="true" role="METHOD_CALLED">
+      <SourceLine classname="com.amazon.ion.Timestamp" start="663" end="663" startBytecode="0" endBytecode="144" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <Message>Called method com.amazon.ion.Timestamp.createFromUtcFields(Timestamp$Precision, int, int, int, int, int, int, BigDecimal, Integer)</Message>
+    </Method>
+    <Int value="1" role="INT_MAYBE_NULL_ARG">
+      <Message>Argument 1 might be null but must not be null</Message>
+    </Int>
+    <LocalVariable name="p" register="3" pc="74" role="LOCAL_VARIABLE_VALUE_OF">
+      <Message>Value loaded from p</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" primary="true" start="559" end="559" startBytecode="210" endBytecode="210" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_INVOKED">
+      <Message>Method invoked at SimpleByteBuffer.java:[line 559]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="509" end="509" startBytecode="7" endBytecode="7" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_NULL_VALUE">
+      <Message>Null value at SimpleByteBuffer.java:[line 509]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="521" end="521" startBytecode="76" endBytecode="76" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_KNOWN_NULL">
+      <Message>Known null at SimpleByteBuffer.java:[line 521]</Message>
+    </SourceLine>
+    <Property name="edu.umd.cs.findbugs.detect.NullDerefProperty.LONG_RANGE_NULL_SOURCE" value="true"/>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="9a234b1a21f1d8ba763393929cce11e4" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(int, int, boolean) where one case falls through to the next case</LongMessage>
+    <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+        <Message>At SimpleByteBuffer.java:[lines 841-1383]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" name="writeVarInt" signature="(IIZ)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="967" end="1002" startBytecode="0" endBytecode="446" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(int, int, boolean)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="987" end="988" startBytecode="141" endBytecode="144" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <Message>At SimpleByteBuffer.java:[lines 987-988]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="988" end="989" startBytecode="153" endBytecode="156" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at SimpleByteBuffer.java:[lines 988-989]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="989" end="990" startBytecode="165" endBytecode="168" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at SimpleByteBuffer.java:[lines 989-990]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="f1cc04e854dd443cc8dbaea0f0f2865e" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeULong(long, int) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+        <Message>At SimpleByteBuffer.java:[lines 841-1383]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" name="writeULong" signature="(JI)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="1179" end="1189" startBytecode="0" endBytecode="275" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeULong(long, int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="1179" end="1187" startBytecode="1" endBytecode="158" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <Message>At SimpleByteBuffer.java:[lines 1179-1187]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="ab809d29b611156cab0f5a62b6e62c3f" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(int, int, boolean) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+        <Message>At SimpleByteBuffer.java:[lines 841-1383]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" name="writeVarInt" signature="(IIZ)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="967" end="1002" startBytecode="0" endBytecode="446" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(int, int, boolean)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="986" end="990" startBytecode="99" endBytecode="180" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <Message>At SimpleByteBuffer.java:[lines 986-990]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="541ee9762cee681fc7af57b45a57b39d" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(long, int, boolean) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+        <Message>At SimpleByteBuffer.java:[lines 841-1383]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" name="writeVarInt" signature="(JIZ)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="1090" end="1143" startBytecode="0" endBytecode="656" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(long, int, boolean)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="1123" end="1133" startBytecode="145" endBytecode="330" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <Message>At SimpleByteBuffer.java:[lines 1123-1133]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="eeb9e04e94b7e1ab6f8842eafc4d2dea" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarUInt(int, int, boolean) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+        <Message>At SimpleByteBuffer.java:[lines 841-1383]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" name="writeVarUInt" signature="(IIZ)I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="1014" end="1034" startBytecode="0" endBytecode="321" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarUInt(int, int, boolean)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="1020" end="1030" startBytecode="44" endBytecode="161" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <Message>At SimpleByteBuffer.java:[lines 1020-1030]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="d58e1592bc2a700caa5be665fe6fe77e" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.UnifiedDataPageX$Bytes(byte[], int, int) may expose internal representation by storing an externally mutable object into UnifiedDataPageX$Bytes._bytes</LongMessage>
+    <Class classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" start="168" end="204" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+        <Message>At UnifiedDataPageX.java:[lines 168-204]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.UnifiedDataPageX$Bytes</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" name="&lt;init&gt;" signature="([BII)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" start="173" end="178" startBytecode="0" endBytecode="121" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java"/>
+      <Message>In method new com.amazon.ion.impl.UnifiedDataPageX$Bytes(byte[], int, int)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" name="_bytes" signature="[B" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+        <Message>In UnifiedDataPageX.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.UnifiedDataPageX$Bytes._bytes</Message>
+    </Field>
+    <LocalVariable name="bytes" register="1" pc="14" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named bytes</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" primary="true" start="175" end="175" startBytecode="14" endBytecode="14" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+      <Message>At UnifiedDataPageX.java:[line 175]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="5631ddc5128a828436df68eb6b9359c6" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.UnifiedDataPageX$Chars(char[], int, int) may expose internal representation by storing an externally mutable object into UnifiedDataPageX$Chars._characters</LongMessage>
+    <Class classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" start="210" end="251" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+        <Message>At UnifiedDataPageX.java:[lines 210-251]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.UnifiedDataPageX$Chars</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" name="&lt;init&gt;" signature="([CII)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" start="215" end="220" startBytecode="0" endBytecode="121" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java"/>
+      <Message>In method new com.amazon.ion.impl.UnifiedDataPageX$Chars(char[], int, int)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" name="_characters" signature="[C" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+        <Message>In UnifiedDataPageX.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.UnifiedDataPageX$Chars._characters</Message>
+    </Field>
+    <LocalVariable name="chars" register="1" pc="14" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named chars</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" primary="true" start="217" end="217" startBytecode="14" endBytecode="14" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+      <Message>At UnifiedDataPageX.java:[line 217]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="b694ed23a3292b72fc9a15b1055e9e87" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl._Private_FastAppendableDecorator(_Private_FastAppendable) may expose internal representation by storing an externally mutable object into _Private_FastAppendableDecorator.myOutput</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_FastAppendableDecorator" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" start="31" end="100" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java">
+        <Message>At _Private_FastAppendableDecorator.java:[lines 31-100]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_FastAppendableDecorator</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_FastAppendableDecorator" name="&lt;init&gt;" signature="(Lcom/amazon/ion/util/_Private_FastAppendable;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" start="31" end="33" startBytecode="0" endBytecode="69" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java"/>
+      <Message>In method new com.amazon.ion.impl._Private_FastAppendableDecorator(_Private_FastAppendable)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_FastAppendableDecorator" name="myOutput" signature="Lcom/amazon/ion/util/_Private_FastAppendable;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java">
+        <Message>In _Private_FastAppendableDecorator.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_FastAppendableDecorator.myOutput</Message>
+    </Field>
+    <LocalVariable name="output" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named output</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" primary="true" start="32" end="32" startBytecode="6" endBytecode="6" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java">
+      <Message>At _Private_FastAppendableDecorator.java:[line 32]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="979e51d12a6742548549ed889fc05276" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonBinaryWriterBuilder.getInitialSymbolTable() may expose internal representation by returning _Private_IonBinaryWriterBuilder.myInitialSymbolTable</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="39" end="384" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+        <Message>At _Private_IonBinaryWriterBuilder.java:[lines 39-384]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_IonBinaryWriterBuilder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" name="getInitialSymbolTable" signature="()Lcom/amazon/ion/SymbolTable;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="135" end="135" startBytecode="0" endBytecode="46" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java"/>
+      <Message>In method com.amazon.ion.impl._Private_IonBinaryWriterBuilder.getInitialSymbolTable()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" name="myInitialSymbolTable" signature="Lcom/amazon/ion/SymbolTable;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+        <Message>In _Private_IonBinaryWriterBuilder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_IonBinaryWriterBuilder.myInitialSymbolTable</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true" start="135" end="135" startBytecode="4" endBytecode="4" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+      <Message>At _Private_IonBinaryWriterBuilder.java:[line 135]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="c0ea811377595a8421959f727e278998" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonBinaryWriterBuilder.setInitialSymbolTable(SymbolTable) may expose internal representation by storing an externally mutable object into _Private_IonBinaryWriterBuilder.myInitialSymbolTable</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="39" end="384" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+        <Message>At _Private_IonBinaryWriterBuilder.java:[lines 39-384]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_IonBinaryWriterBuilder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" name="setInitialSymbolTable" signature="(Lcom/amazon/ion/SymbolTable;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="153" end="181" startBytecode="0" endBytecode="343" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java"/>
+      <Message>In method com.amazon.ion.impl._Private_IonBinaryWriterBuilder.setInitialSymbolTable(SymbolTable)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" name="myInitialSymbolTable" signature="Lcom/amazon/ion/SymbolTable;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+        <Message>In _Private_IonBinaryWriterBuilder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_IonBinaryWriterBuilder.myInitialSymbolTable</Message>
+    </Field>
+    <LocalVariable name="symtab" register="1" pc="126" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named symtab</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true" start="179" end="179" startBytecode="126" endBytecode="126" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+      <Message>At _Private_IonBinaryWriterBuilder.java:[line 179]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="MS_MUTABLE_ARRAY" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="aca2d4624c416fb2d215e8f3628836ee" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
+    <ShortMessage>Field is a mutable array</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0 is a mutable array</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_IonConstants" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonConstants" start="23" end="275" sourcefile="_Private_IonConstants.java" sourcepath="com/amazon/ion/impl/_Private_IonConstants.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonConstants.java">
+        <Message>At _Private_IonConstants.java:[lines 23-275]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_IonConstants</Message>
+    </Class>
+    <Field classname="com.amazon.ion.impl._Private_IonConstants" name="BINARY_VERSION_MARKER_1_0" signature="[B" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonConstants" sourcefile="_Private_IonConstants.java" sourcepath="com/amazon/ion/impl/_Private_IonConstants.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonConstants.java">
+        <Message>In _Private_IonConstants.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl._Private_IonConstants" primary="true" start="103" end="103" startBytecode="61" endBytecode="61" sourcefile="_Private_IonConstants.java" sourcepath="com/amazon/ion/impl/_Private_IonConstants.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonConstants.java">
+      <Message>At _Private_IonConstants.java:[line 103]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="MS_MUTABLE_ARRAY" priority="1" rank="16" abbrev="MS" category="MALICIOUS_CODE" instanceHash="a4efef007b82cbeb6ba15e77ec77047f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
+    <ShortMessage>Field is a mutable array</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonTextAppender.ZERO_PADDING is a mutable array</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="43" end="1008" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+        <Message>At _Private_IonTextAppender.java:[lines 43-1008]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_IonTextAppender</Message>
+    </Class>
+    <Field classname="com.amazon.ion.impl._Private_IonTextAppender" name="ZERO_PADDING" signature="[Ljava/lang/String;" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+        <Message>In _Private_IonTextAppender.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_IonTextAppender.ZERO_PADDING</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true" start="111" end="111" startBytecode="327" endBytecode="327" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+      <Message>At _Private_IonTextAppender.java:[line 111]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="MS_PKGPROTECT" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="d0ab04bc1ad42d1fad533b0b48ddfb6d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
+    <ShortMessage>Field should be package protected</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonTextAppender.OPERATOR_CHAR_FLAGS should be package protected</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="43" end="1008" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+        <Message>At _Private_IonTextAppender.java:[lines 43-1008]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_IonTextAppender</Message>
+    </Class>
+    <Field classname="com.amazon.ion.impl._Private_IonTextAppender" name="OPERATOR_CHAR_FLAGS" signature="[Z" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+        <Message>In _Private_IonTextAppender.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_IonTextAppender.OPERATOR_CHAR_FLAGS</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true" start="98" end="98" startBytecode="253" endBytecode="253" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+      <Message>At _Private_IonTextAppender.java:[line 98]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="7b2f0abbd1f382bded3c746eaa957d19" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl._Private_IonTextAppender.isIdentifierKeyword(CharSequence) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="43" end="1008" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+        <Message>At _Private_IonTextAppender.java:[lines 43-1008]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_IonTextAppender</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_IonTextAppender" name="isIdentifierKeyword" signature="(Ljava/lang/CharSequence;)Z" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="410" end="465" startBytecode="0" endBytecode="562" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java"/>
+      <Message>In method com.amazon.ion.impl._Private_IonTextAppender.isIdentifierKeyword(CharSequence)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true" start="421" end="460" startBytecode="27" endBytecode="323" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+      <Message>At _Private_IonTextAppender.java:[lines 421-460]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="MS_SHOULD_BE_FINAL" priority="1" rank="16" abbrev="MS" category="MALICIOUS_CODE" instanceHash="5b00fde4435120c6dcd09015babd6015" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
+    <ShortMessage>Field isn't final but should be</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonTextWriterBuilder.STANDARD isn't final but should be</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" start="33" end="314" sourcefile="_Private_IonTextWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonTextWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java">
+        <Message>At _Private_IonTextWriterBuilder.java:[lines 33-314]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_IonTextWriterBuilder</Message>
+    </Class>
+    <Field classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" name="STANDARD" signature="Lcom/amazon/ion/impl/_Private_IonTextWriterBuilder;" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" sourcefile="_Private_IonTextWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonTextWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java">
+        <Message>In _Private_IonTextWriterBuilder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_IonTextWriterBuilder.STANDARD</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" primary="true" start="44" end="44" startBytecode="11" endBytecode="11" sourcefile="_Private_IonTextWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonTextWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java">
+      <Message>At _Private_IonTextWriterBuilder.java:[line 44]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="6da378526fc82201e6b54f920bd795" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_MarkupCallback.getAppendable() may expose internal representation by returning _Private_MarkupCallback.myAppendable</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="190" end="351" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+        <Message>At _Private_MarkupCallback.java:[lines 190-351]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_MarkupCallback</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_MarkupCallback" name="getAppendable" signature="()Lcom/amazon/ion/util/_Private_FastAppendable;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="200" end="200" startBytecode="0" endBytecode="46" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java"/>
+      <Message>In method com.amazon.ion.impl._Private_MarkupCallback.getAppendable()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_MarkupCallback" name="myAppendable" signature="Lcom/amazon/ion/util/_Private_FastAppendable;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+        <Message>In _Private_MarkupCallback.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_MarkupCallback.myAppendable</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true" start="200" end="200" startBytecode="4" endBytecode="4" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+      <Message>At _Private_MarkupCallback.java:[line 200]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="1bc20b2396d805db0503a8cfe3a4ac01" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl._Private_MarkupCallback(_Private_FastAppendable) may expose internal representation by storing an externally mutable object into _Private_MarkupCallback.myAppendable</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="190" end="351" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+        <Message>At _Private_MarkupCallback.java:[lines 190-351]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_MarkupCallback</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_MarkupCallback" name="&lt;init&gt;" signature="(Lcom/amazon/ion/util/_Private_FastAppendable;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="190" end="192" startBytecode="0" endBytecode="69" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java"/>
+      <Message>In method new com.amazon.ion.impl._Private_MarkupCallback(_Private_FastAppendable)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_MarkupCallback" name="myAppendable" signature="Lcom/amazon/ion/util/_Private_FastAppendable;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+        <Message>In _Private_MarkupCallback.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_MarkupCallback.myAppendable</Message>
+    </Field>
+    <LocalVariable name="appendable" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named appendable</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true" start="191" end="191" startBytecode="6" endBytecode="6" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+      <Message>At _Private_MarkupCallback.java:[line 191]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="MS_SHOULD_BE_FINAL" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="652384d5d2378bce4067c28205a4ab59" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
+    <ShortMessage>Field isn't final but should be</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions.FNID_identity isn't final but should be</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" start="30" end="333" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 30-333]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions</Message>
+    </Class>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions" name="FNID_identity" signature="I" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions.FNID_identity</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true" start="114" end="114" startBytecode="21" endBytecode="21" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 114]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="MS_SHOULD_BE_FINAL" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="7466384ad6d6901614632524bf856c4f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
+    <ShortMessage>Field isn't final but should be</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions.FNID_no_conversion isn't final but should be</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" start="30" end="333" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 30-333]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions</Message>
+    </Class>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions" name="FNID_no_conversion" signature="I" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions.FNID_no_conversion</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true" start="113" end="113" startBytecode="17" endBytecode="17" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 113]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="BC_UNCONFIRMED_CAST" priority="2" rank="17" abbrev="BC" category="STYLE" instanceHash="2dbcb25375fc771b3962e53d90af7ee8" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Unchecked/unconfirmed cast</ShortMessage>
+    <LongMessage>Unchecked/unconfirmed cast from java.math.BigDecimal to com.amazon.ion.Decimal in com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal)</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="addValue" signature="(Ljava/math/BigDecimal;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="505" end="507" startBytecode="0" endBytecode="7" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal)</Message>
+    </Method>
+    <Type descriptor="Ljava/math/BigDecimal;" role="TYPE_FOUND">
+      <SourceLine classname="java.math.BigDecimal" start="228" end="5723" sourcefile="BigDecimal.java" sourcepath="java/math/BigDecimal.java">
+        <Message>At BigDecimal.java:[lines 228-5723]</Message>
+      </SourceLine>
+      <Message>Actual type java.math.BigDecimal</Message>
+    </Type>
+    <Type descriptor="Lcom/amazon/ion/Decimal;" role="TYPE_EXPECTED">
+      <SourceLine classname="com.amazon.ion.Decimal" start="48" end="426" sourcefile="Decimal.java" sourcepath="com/amazon/ion/Decimal.java" relSourcepath="src/com/amazon/ion/Decimal.java">
+        <Message>At Decimal.java:[lines 48-426]</Message>
+      </SourceLine>
+      <Message>Expected com.amazon.ion.Decimal</Message>
+    </Type>
+    <LocalVariable name="value" register="1" pc="1" role="LOCAL_VARIABLE_VALUE_OF">
+      <Message>Value loaded from value</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="505" end="505" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 505]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="c2797b12d401329b15b33d898826132e" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDate() may expose internal representation by returning _Private_ScalarConversions$ValueVariant._date_value</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="getDate" signature="()Ljava/util/Date;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="565" end="566" startBytecode="0" endBytecode="78" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDate()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_date_value" signature="Ljava/util/Date;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="566" end="566" startBytecode="23" endBytecode="23" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 566]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="2f740c4ec56c82773af0108950b50244" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDecimal() may expose internal representation by returning _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="getDecimal" signature="()Lcom/amazon/ion/Decimal;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="561" end="562" startBytecode="0" endBytecode="78" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDecimal()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_decimal_value" signature="Lcom/amazon/ion/Decimal;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="562" end="562" startBytecode="23" endBytecode="23" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 562]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="3445b251f5b9b22a9b7c11eb0f8f9b18" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getTimestamp() may expose internal representation by returning _Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="getTimestamp" signature="()Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="569" end="570" startBytecode="0" endBytecode="78" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getTimestamp()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_timestamp_value" signature="Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="570" end="570" startBytecode="23" endBytecode="23" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 570]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="112e0051b0813f283c398373d0802d4d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Decimal) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="addValue" signature="(Lcom/amazon/ion/Decimal;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="509" end="511" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Decimal)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_decimal_value" signature="Lcom/amazon/ion/Decimal;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</Message>
+    </Field>
+    <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named value</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="509" end="509" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 509]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="6583b1eb19f73cdc461bc4116b37d243" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Timestamp) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="addValue" signature="(Lcom/amazon/ion/Timestamp;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="517" end="519" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Timestamp)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_timestamp_value" signature="Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</Message>
+    </Field>
+    <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named value</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="517" end="517" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 517]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="589da41cf438e747d7ed7167f383fec1" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="addValue" signature="(Ljava/math/BigDecimal;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="505" end="507" startBytecode="0" endBytecode="74" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_decimal_value" signature="Lcom/amazon/ion/Decimal;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</Message>
+    </Field>
+    <LocalVariable name="value" register="1" pc="5" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named value</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="505" end="505" startBytecode="5" endBytecode="5" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 505]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="ef493d618a888e73be4c0bf250e37110" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Date) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._date_value</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="addValue" signature="(Ljava/util/Date;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="513" end="515" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Date)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_date_value" signature="Ljava/util/Date;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</Message>
+    </Field>
+    <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named value</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="513" end="513" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 513]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="9aed0612674cf9959c8fc7c8704b6c3f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Decimal) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="setValue" signature="(Lcom/amazon/ion/Decimal;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="463" end="465" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Decimal)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_decimal_value" signature="Lcom/amazon/ion/Decimal;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</Message>
+    </Field>
+    <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named value</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="463" end="463" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 463]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="d0ff0229be9c1c1b891b6496d34e5ca1" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Timestamp) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="setValue" signature="(Lcom/amazon/ion/Timestamp;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="471" end="473" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Timestamp)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_timestamp_value" signature="Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</Message>
+    </Field>
+    <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named value</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="471" end="471" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 471]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="9b0573d22a4daf2279fcc1e811a682c2" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Date) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._date_value</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="setValue" signature="(Ljava/util/Date;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="467" end="469" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Date)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_date_value" signature="Ljava/util/Date;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+        <Message>In _Private_ScalarConversions.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</Message>
+    </Field>
+    <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named value</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="467" end="467" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <Message>At _Private_ScalarConversions.java:[line 467]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="3292330b87d18c82fcfd8345b0cc7d63" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable) may expose internal representation by storing an externally mutable object into _Private_SymtabExtendsCache.myReaderSymtab</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="27" end="64" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+        <Message>At _Private_SymtabExtendsCache.java:[lines 27-64]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_SymtabExtendsCache</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_SymtabExtendsCache" name="symtabsCompat" signature="(Lcom/amazon/ion/SymbolTable;Lcom/amazon/ion/SymbolTable;)Z" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="42" end="64" startBytecode="0" endBytecode="227" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java"/>
+      <Message>In method com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_SymtabExtendsCache" name="myReaderSymtab" signature="Lcom/amazon/ion/SymbolTable;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+        <Message>In _Private_SymtabExtendsCache.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_SymtabExtendsCache.myReaderSymtab</Message>
+    </Field>
+    <LocalVariable name="readerSymtab" register="2" pc="87" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named readerSymtab</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true" start="58" end="58" startBytecode="87" endBytecode="87" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+      <Message>At _Private_SymtabExtendsCache.java:[line 58]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="eecd0e4d8408e77ef05ad3b3b1c6f801" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable) may expose internal representation by storing an externally mutable object into _Private_SymtabExtendsCache.myWriterSymtab</LongMessage>
+    <Class classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="27" end="64" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+        <Message>At _Private_SymtabExtendsCache.java:[lines 27-64]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl._Private_SymtabExtendsCache</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl._Private_SymtabExtendsCache" name="symtabsCompat" signature="(Lcom/amazon/ion/SymbolTable;Lcom/amazon/ion/SymbolTable;)Z" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="42" end="64" startBytecode="0" endBytecode="227" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java"/>
+      <Message>In method com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl._Private_SymtabExtendsCache" name="myWriterSymtab" signature="Lcom/amazon/ion/SymbolTable;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+        <Message>In _Private_SymtabExtendsCache.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl._Private_SymtabExtendsCache.myWriterSymtab</Message>
+    </Field>
+    <LocalVariable name="writerSymtab" register="1" pc="82" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named writerSymtab</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true" start="57" end="57" startBytecode="82" endBytecode="82" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+      <Message>At _Private_SymtabExtendsCache.java:[line 57]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="caa61284f5795f341af142be4f630040" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2.beforeStepIn(IonManagedBinaryWriter, IonType) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" start="328" end="420" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+        <Message>At IonManagedBinaryWriter.java:[lines 328-420]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" name="beforeStepIn" signature="(Lcom/amazon/ion/impl/bin/IonManagedBinaryWriter;Lcom/amazon/ion/IonType;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" start="333" end="355" startBytecode="0" endBytecode="242" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java"/>
+      <Message>In method com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2.beforeStepIn(IonManagedBinaryWriter, IonType)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" primary="true" start="335" end="351" startBytecode="18" endBytecode="130" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+      <Message>At IonManagedBinaryWriter.java:[lines 335-351]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="4d5ab012fdcd7de1e2fc6655d9bfc5b2" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3.afterStepOut(IonManagedBinaryWriter) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="422" end="510" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+        <Message>At IonManagedBinaryWriter.java:[lines 422-510]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" name="afterStepOut" signature="(Lcom/amazon/ion/impl/bin/IonManagedBinaryWriter;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="437" end="476" startBytecode="0" endBytecode="384" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java"/>
+      <Message>In method com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3.afterStepOut(IonManagedBinaryWriter)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" primary="true" start="437" end="473" startBytecode="7" endBytecode="220" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+      <Message>At IonManagedBinaryWriter.java:[lines 437-473]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="95b64a0dc0e56077c5d1f2513e96e9ec" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Switch statement found where default case is missing</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3.writeInt(IonManagedBinaryWriter, long) where default case is missing</LongMessage>
+    <Class classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="422" end="510" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+        <Message>At IonManagedBinaryWriter.java:[lines 422-510]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" name="writeInt" signature="(Lcom/amazon/ion/impl/bin/IonManagedBinaryWriter;J)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="494" end="510" startBytecode="0" endBytecode="208" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java"/>
+      <Message>In method com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3.writeInt(IonManagedBinaryWriter, long)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" primary="true" start="500" end="506" startBytecode="59" endBytecode="104" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+      <Message>At IonManagedBinaryWriter.java:[lines 500-506]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="e531b8f0ec0bd6a1fdfe3969f045a568" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.getBuffer() may expose internal representation by returning PoolableByteBuffer.buffer</LongMessage>
+    <Class classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" start="12" end="31" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
+        <Message>At PoolableByteBuffer.java:[lines 12-31]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.bin.utf8.PoolableByteBuffer</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" name="getBuffer" signature="()Ljava/nio/ByteBuffer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" start="31" end="31" startBytecode="0" endBytecode="46" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java"/>
+      <Message>In method com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.getBuffer()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" name="buffer" signature="Ljava/nio/ByteBuffer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
+        <Message>In PoolableByteBuffer.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.buffer</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" primary="true" start="31" end="31" startBytecode="4" endBytecode="4" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
+      <Message>At PoolableByteBuffer.java:[line 31]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="dd12a2fa0c1d9ca7e991926a3dbcfc33" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.getBuffer() may expose internal representation by returning Utf8StringEncoder$Result.buffer</LongMessage>
+    <Class classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="128" end="148" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+        <Message>At Utf8StringEncoder.java:[lines 128-148]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" name="getBuffer" signature="()[B" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="141" end="141" startBytecode="0" endBytecode="46" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java"/>
+      <Message>In method com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.getBuffer()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" name="buffer" signature="[B" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+        <Message>In Utf8StringEncoder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.buffer</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true" start="141" end="141" startBytecode="4" endBytecode="4" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+      <Message>At Utf8StringEncoder.java:[line 141]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="37090090b85d969f582bf784a80bac99" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result(int, byte[]) may expose internal representation by storing an externally mutable object into Utf8StringEncoder$Result.buffer</LongMessage>
+    <Class classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="128" end="148" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+        <Message>At Utf8StringEncoder.java:[lines 128-148]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" name="&lt;init&gt;" signature="(I[B)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="128" end="131" startBytecode="0" endBytecode="88" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java"/>
+      <Message>In method new com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result(int, byte[])</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" name="buffer" signature="[B" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+        <Message>In Utf8StringEncoder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.buffer</Message>
+    </Field>
+    <LocalVariable name="buffer" register="2" pc="11" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named buffer</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true" start="130" end="130" startBytecode="11" endBytecode="11" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+      <Message>At Utf8StringEncoder.java:[line 130]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="INT_BAD_COMPARISON_WITH_NONNEGATIVE_VALUE" priority="2" rank="7" abbrev="INT" category="CORRECTNESS" instanceHash="65f16fbf150723a8dddc9c056bf8d372" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Bad comparison of nonnegative value with negative constant or zero</ShortMessage>
+    <LongMessage>Bad comparison of nonnegative value with 0 in com.amazon.ion.impl.lite.IonContainerLite.add(int, IonValueLite)</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonContainerLite" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite" start="35" end="751" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>At IonContainerLite.java:[lines 35-751]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonContainerLite</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonContainerLite" name="add" signature="(ILcom/amazon/ion/impl/lite/IonValueLite;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite" start="559" end="573" startBytecode="0" endBytecode="204" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java"/>
+      <Message>In method com.amazon.ion.impl.lite.IonContainerLite.add(int, IonValueLite)</Message>
+    </Method>
+    <Int value="0" role="INT_VALUE">
+      <Message>Value 0</Message>
+    </Int>
+    <LocalVariable name="index" register="1" pc="50" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named index</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite" primary="true" start="569" end="569" startBytecode="50" endBytecode="50" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <Message>At IonContainerLite.java:[line 569]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="b7e63818cc4fb7d7cacbaf6e3670ee33" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.next() may expose internal representation by returning IonContainerLite$SequenceContentIterator.__current</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="191" end="361" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>At IonContainerLite.java:[lines 191-361]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="next" signature="()Lcom/amazon/ion/IonValue;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="276" end="283" startBytecode="0" endBytecode="141" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java"/>
+      <Message>In method com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.next()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="__current" signature="Lcom/amazon/ion/impl/lite/IonValueLite;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>In IonContainerLite.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__current</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="283" end="283" startBytecode="53" endBytecode="53" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <Message>At IonContainerLite.java:[line 283]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="684c779584e3e2b9fcb83562f66693c5" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.previous() may expose internal representation by returning IonContainerLite$SequenceContentIterator.__current</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="191" end="361" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>At IonContainerLite.java:[lines 191-361]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="previous" signature="()Lcom/amazon/ion/IonValue;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="301" end="309" startBytecode="0" endBytecode="140" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java"/>
+      <Message>In method com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.previous()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="__current" signature="Lcom/amazon/ion/impl/lite/IonValueLite;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>In IonContainerLite.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__current</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="309" end="309" startBytecode="48" endBytecode="48" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <Message>At IonContainerLite.java:[line 309]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="75d6b0614d6a1619bd6e44699b8b9706" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator(IonContainerLite, int, boolean) may expose internal representation by storing an externally mutable object into IonContainerLite$SequenceContentIterator.this$0</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="191" end="361" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>At IonContainerLite.java:[lines 191-361]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/lite/IonContainerLite;IZ)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="200" end="209" startBytecode="0" endBytecode="189" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java"/>
+      <Message>In method new com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator(IonContainerLite, int, boolean)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="this$0" signature="Lcom/amazon/ion/impl/lite/IonContainerLite;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>In IonContainerLite.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.this$0</Message>
+    </Field>
+    <LocalVariable name="this$0" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named this$0</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="200" end="200" startBytecode="2" endBytecode="2" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <Message>At IonContainerLite.java:[line 200]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SA_FIELD_SELF_ASSIGNMENT" priority="1" rank="1" abbrev="SA" category="CORRECTNESS" instanceHash="e157432d9915932567d32bd045df9794" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Self assignment of field</ShortMessage>
+    <LongMessage>Self assignment of field IonContainerLite$SequenceContentIterator.__pos in com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.force_position_sync_helper()</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="191" end="361" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>At IonContainerLite.java:[lines 191-361]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="force_position_sync_helper" signature="()V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="225" end="254" startBytecode="0" endBytecode="296" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java"/>
+      <Message>In method com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.force_position_sync_helper()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="__pos" signature="I" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>In IonContainerLite.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__pos</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="234" end="234" startBytecode="51" endBytecode="51" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <Message>At IonContainerLite.java:[line 234]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="79891fc74efbc99a58252ed737deca1f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator(IonDatagramLite, boolean) may expose internal representation by storing an externally mutable object into IonDatagramLite$SystemContentIterator.this$0</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" start="604" end="853" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
+        <Message>At IonDatagramLite.java:[lines 604-853]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/lite/IonDatagramLite;Z)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" start="614" end="623" startBytecode="0" endBytecode="178" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
+      <Message>In method new com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator(IonDatagramLite, boolean)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" name="this$0" signature="Lcom/amazon/ion/impl/lite/IonDatagramLite;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
+        <Message>In IonDatagramLite.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator.this$0</Message>
+    </Field>
+    <LocalVariable name="this$0" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named this$0</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" primary="true" start="614" end="614" startBytecode="2" endBytecode="2" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
+      <Message>At IonDatagramLite.java:[line 614]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" priority="1" rank="9" abbrev="RCN" category="CORRECTNESS" instanceHash="db2225a597140cf69dffc0ffe5dcc0a0" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
+    <ShortMessage>Nullcheck of value previously dereferenced</ShortMessage>
+    <LongMessage>Nullcheck of IonDatagramLite$SystemIteratorPosition.__local_values at line 1094 of value previously dereferenced in com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.push_system_value(IonValueLite)</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="856" end="1157" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
+        <Message>At IonDatagramLite.java:[lines 856-1157]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" name="push_system_value" signature="(Lcom/amazon/ion/impl/lite/IonValueLite;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1093" end="1103" startBytecode="0" endBytecode="229" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
+      <Message>In method com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.push_system_value(IonValueLite)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" name="__local_values" signature="[Lcom/amazon/ion/impl/lite/IonValueLite;" isStatic="false" primary="true" role="FIELD_VALUE_OF">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
+        <Message>In IonDatagramLite.java</Message>
+      </SourceLine>
+      <Message>Value loaded from field com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.__local_values</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true" start="1093" end="1093" startBytecode="8" endBytecode="8" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
+      <Message>At IonDatagramLite.java:[line 1093]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1094" end="1094" startBytecode="16" endBytecode="16" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java" role="SOURCE_REDUNDANT_NULL_CHECK">
+      <Message>Redundant null check at IonDatagramLite.java:[line 1094]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" priority="2" rank="11" abbrev="RCN" category="CORRECTNESS" instanceHash="7b7d1cc56b68e53eb5a551bbf5bc7fe0" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
+    <ShortMessage>Nullcheck of value previously dereferenced</ShortMessage>
+    <LongMessage>Nullcheck of curr at line 1153 of value previously dereferenced in com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.count_system_values(IonSystem, SymbolTable, SymbolTable)</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="856" end="1157" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
+        <Message>At IonDatagramLite.java:[lines 856-1157]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" name="count_system_values" signature="(Lcom/amazon/ion/IonSystem;Lcom/amazon/ion/SymbolTable;Lcom/amazon/ion/SymbolTable;)I" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1147" end="1157" startBytecode="0" endBytecode="188" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
+      <Message>In method com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.count_system_values(IonSystem, SymbolTable, SymbolTable)</Message>
+    </Method>
+    <LocalVariable name="curr" register="2" pc="34" role="LOCAL_VARIABLE_VALUE_OF">
+      <Message>Value loaded from curr</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true" start="1148" end="1148" startBytecode="3" endBytecode="3" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
+      <Message>At IonDatagramLite.java:[line 1148]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1153" end="1153" startBytecode="35" endBytecode="35" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java" role="SOURCE_REDUNDANT_NULL_CHECK">
+      <Message>Redundant null check at IonDatagramLite.java:[line 1153]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="ES_COMPARING_STRINGS_WITH_EQ" priority="2" rank="11" abbrev="ES" category="BAD_PRACTICE" instanceHash="8c2c628526908e5f999348173832bbb7" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="597">
+    <ShortMessage>Comparison of String objects using == or !=</ShortMessage>
+    <LongMessage>Comparison of String objects using == or != in com.amazon.ion.impl.lite.IonStructLite.validate()</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonStructLite" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="41" end="818" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
+        <Message>At IonStructLite.java:[lines 41-818]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonStructLite</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonStructLite" name="validate" signature="()Ljava/lang/String;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="219" end="233" startBytecode="0" endBytecode="73" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java"/>
+      <Message>In method com.amazon.ion.impl.lite.IonStructLite.validate()</Message>
+    </Method>
+    <Type descriptor="Ljava/lang/String;" role="TYPE_FOUND">
+      <SourceLine classname="java.lang.String" start="125" end="3345" sourcefile="String.java" sourcepath="java/lang/String.java">
+        <Message>At String.java:[lines 125-3345]</Message>
+      </SourceLine>
+      <Message>Actual type String</Message>
+    </Type>
+    <String value="" role="STRING_CONSTANT">
+      <Message>String constant ""</Message>
+    </String>
+    <LocalVariable name="error" register="1" pc="164" role="LOCAL_VARIABLE_VALUE_OF">
+      <Message>Value loaded from error</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="233" end="233" startBytecode="166" endBytecode="166" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
+      <Message>At IonStructLite.java:[line 233]</Message>
+    </SourceLine>
+    <Property name="edu.umd.cs.findbugs.detect.RefComparisonWarningProperty.COMPARE_STATIC_STRINGS" value="true"/>
+  </BugInstance>
+  <BugInstance type="NP_LOAD_OF_KNOWN_NULL_VALUE" priority="2" rank="16" abbrev="NP" category="STYLE" instanceHash="398a2e584fed81324bd20bd97797f3b0" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
+    <ShortMessage>Load of known null value</ShortMessage>
+    <LongMessage>Load of known null value in com.amazon.ion.impl.lite.IonStructLite.add(SymbolToken, IonValue)</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonStructLite" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="41" end="818" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
+        <Message>At IonStructLite.java:[lines 41-818]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonStructLite</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonStructLite" name="add" signature="(Lcom/amazon/ion/SymbolToken;Lcom/amazon/ion/IonValue;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="509" end="529" startBytecode="0" endBytecode="33" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java"/>
+      <Message>In method com.amazon.ion.impl.lite.IonStructLite.add(SymbolToken, IonValue)</Message>
+    </Method>
+    <LocalVariable name="text" register="3" pc="58" role="LOCAL_VARIABLE_VALUE_OF">
+      <Message>Value loaded from text</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="528" end="528" startBytecode="59" endBytecode="59" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
+      <Message>At IonStructLite.java:[line 528]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SBSC_USE_STRINGBUFFER_CONCATENATION" priority="2" rank="18" abbrev="SBSC" category="PERFORMANCE" instanceHash="e29cf5bfde55497ab095a8a75b41d74" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Method concatenates strings using + in a loop</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.lite.IonStructLite.validate() concatenates strings using + in a loop</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonStructLite" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="41" end="818" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
+        <Message>At IonStructLite.java:[lines 41-818]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonStructLite</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonStructLite" name="validate" signature="()Ljava/lang/String;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="219" end="233" startBytecode="0" endBytecode="382" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java"/>
+      <Message>In method com.amazon.ion.impl.lite.IonStructLite.validate()</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="229" end="229" startBytecode="121" endBytecode="121" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
+      <Message>At IonStructLite.java:[line 229]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="DM_NUMBER_CTOR" priority="2" rank="18" abbrev="Bx" category="PERFORMANCE" instanceHash="891671454919512bbe81eb1400a49b93" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Method invokes inefficient Number constructor; use static valueOf instead</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.lite.IonTimestampLite.setLocalOffset(int) invokes inefficient new Integer(int) constructor; use Integer.valueOf(int) instead</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.IonTimestampLite" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonTimestampLite" start="29" end="246" sourcefile="IonTimestampLite.java" sourcepath="com/amazon/ion/impl/lite/IonTimestampLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonTimestampLite.java">
+        <Message>At IonTimestampLite.java:[lines 29-246]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.IonTimestampLite</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.IonTimestampLite" name="setLocalOffset" signature="(I)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonTimestampLite" start="215" end="216" startBytecode="0" endBytecode="68" sourcefile="IonTimestampLite.java" sourcepath="com/amazon/ion/impl/lite/IonTimestampLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonTimestampLite.java"/>
+      <Message>In method com.amazon.ion.impl.lite.IonTimestampLite.setLocalOffset(int)</Message>
+    </Method>
+    <Method classname="java.lang.Integer" name="&lt;init&gt;" signature="(I)V" isStatic="false" role="METHOD_CALLED">
+      <SourceLine classname="java.lang.Integer" start="1082" end="1084" startBytecode="0" endBytecode="69" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
+      <Message>Called method new Integer(int)</Message>
+    </Method>
+    <Method classname="java.lang.Integer" name="valueOf" signature="(I)Ljava/lang/Integer;" isStatic="true" role="SHOULD_CALL">
+      <SourceLine classname="java.lang.Integer" start="1057" end="1059" startBytecode="0" endBytecode="90" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
+      <Message>Should call Integer.valueOf(int) instead</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonTimestampLite" primary="true" start="215" end="215" startBytecode="6" endBytecode="6" sourcefile="IonTimestampLite.java" sourcepath="com/amazon/ion/impl/lite/IonTimestampLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonTimestampLite.java">
+      <Message>At IonTimestampLite.java:[line 215]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT" priority="2" rank="17" abbrev="BSHIFT" category="STYLE" instanceHash="2fcf6ca181f8ad96d590e312b49a642c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Unsigned right shift cast to short/byte</ShortMessage>
+    <LongMessage>Unsigned right shift cast to short/byte in com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarInt(int)</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="90" end="1464" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
+        <Message>At ReverseBinaryEncoder.java:[lines 90-1464]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.ReverseBinaryEncoder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" name="writeVarInt" signature="(I)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="538" end="619" startBytecode="0" endBytecode="700" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java"/>
+      <Message>In method com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarInt(int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true" start="571" end="571" startBytecode="118" endBytecode="118" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
+      <Message>At ReverseBinaryEncoder.java:[line 571]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="581" end="581" startBytecode="174" endBytecode="174" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at ReverseBinaryEncoder.java:[line 581]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="592" end="592" startBytecode="246" endBytecode="246" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at ReverseBinaryEncoder.java:[line 592]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT" priority="2" rank="17" abbrev="BSHIFT" category="STYLE" instanceHash="fd4898df5b4dfc93069b54d16ee4ef7c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Unsigned right shift cast to short/byte</ShortMessage>
+    <LongMessage>Unsigned right shift cast to short/byte in com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarUInt(int)</LongMessage>
+    <Class classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="90" end="1464" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
+        <Message>At ReverseBinaryEncoder.java:[lines 90-1464]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.impl.lite.ReverseBinaryEncoder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" name="writeVarUInt" signature="(I)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="472" end="521" startBytecode="0" endBytecode="530" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java"/>
+      <Message>In method com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarUInt(int)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true" start="486" end="486" startBytecode="69" endBytecode="69" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
+      <Message>At ReverseBinaryEncoder.java:[line 486]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="494" end="494" startBytecode="116" endBytecode="116" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at ReverseBinaryEncoder.java:[line 494]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="503" end="503" startBytecode="179" endBytecode="179" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at ReverseBinaryEncoder.java:[line 503]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="513" end="513" startBytecode="252" endBytecode="252" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at ReverseBinaryEncoder.java:[line 513]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="238ea94b9fbc4d991e904f39656925e4" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.system.IonSystemBuilder.getReaderBuilder() may expose internal representation by returning IonSystemBuilder.readerBuilder</LongMessage>
+    <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="84" end="358" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 84-358]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.system.IonSystemBuilder" name="getReaderBuilder" signature="()Lcom/amazon/ion/system/IonReaderBuilder;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="287" end="287" startBytecode="0" endBytecode="46" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <Message>In method com.amazon.ion.system.IonSystemBuilder.getReaderBuilder()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.system.IonSystemBuilder" name="readerBuilder" signature="Lcom/amazon/ion/system/IonReaderBuilder;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>In IonSystemBuilder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.system.IonSystemBuilder.readerBuilder</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="287" end="287" startBytecode="4" endBytecode="4" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 287]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="bb9e01cd9f71a1049efd92d5d3c49a41" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.system.IonSystemBuilder.setReaderBuilder(IonReaderBuilder) may expose internal representation by storing an externally mutable object into IonSystemBuilder.readerBuilder</LongMessage>
+    <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="84" end="358" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 84-358]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.system.IonSystemBuilder" name="setReaderBuilder" signature="(Lcom/amazon/ion/system/IonReaderBuilder;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="305" end="307" startBytecode="0" endBytecode="69" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <Message>In method com.amazon.ion.system.IonSystemBuilder.setReaderBuilder(IonReaderBuilder)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.system.IonSystemBuilder" name="readerBuilder" signature="Lcom/amazon/ion/system/IonReaderBuilder;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>In IonSystemBuilder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.system.IonSystemBuilder.readerBuilder</Message>
+    </Field>
+    <LocalVariable name="builder" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named builder</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="306" end="306" startBytecode="6" endBytecode="6" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 306]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="MS_EXPOSE_REP" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="309257473ba90ad1ae51e692ce2020b4" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
+    <ShortMessage>Public static method may expose internal representation by returning array</ShortMessage>
+    <LongMessage>Public static com.amazon.ion.system.IonSystemBuilder.standard() may expose internal representation by returning IonSystemBuilder.STANDARD</LongMessage>
+    <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="84" end="358" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 84-358]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.system.IonSystemBuilder" name="standard" signature="()Lcom/amazon/ion/system/IonSystemBuilder;" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="96" end="96" startBytecode="0" endBytecode="27" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <Message>In method com.amazon.ion.system.IonSystemBuilder.standard()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.system.IonSystemBuilder" name="STANDARD" signature="Lcom/amazon/ion/system/IonSystemBuilder;" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>In IonSystemBuilder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.system.IonSystemBuilder.STANDARD</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="96" end="96" startBytecode="3" endBytecode="3" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 96]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="BC_EQUALS_METHOD_SHOULD_WORK_FOR_ALL_OBJECTS" priority="2" rank="16" abbrev="BC" category="BAD_PRACTICE" instanceHash="b1501ead4d1f31655c61d7d81eb69329" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Equals method should not assume anything about the type of its argument</ShortMessage>
+    <LongMessage>Equals method for com.amazon.ion.util.Equivalence$Field assumes the argument is of type Equivalence$Field</LongMessage>
+    <Class classname="com.amazon.ion.util.Equivalence$Field" primary="true">
+      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="421" end="471" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java">
+        <Message>At Equivalence.java:[lines 421-471]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.util.Equivalence$Field</Message>
+    </Class>
+    <Method classname="com.amazon.ion.util.Equivalence$Field" name="equals" signature="(Ljava/lang/Object;)Z" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="468" end="470" startBytecode="0" endBytecode="135" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java"/>
+      <Message>In method com.amazon.ion.util.Equivalence$Field.equals(Object)</Message>
+    </Method>
+    <SourceLine classname="com.amazon.ion.util.Equivalence$Field" primary="true" start="468" end="468" startBytecode="1" endBytecode="1" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java">
+      <Message>At Equivalence.java:[line 468]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT" priority="2" rank="11" abbrev="NP" category="BAD_PRACTICE" instanceHash="6ac3d35c70d5495ccdd6381542086821" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
+    <ShortMessage>equals() method does not check for null argument</ShortMessage>
+    <LongMessage>com.amazon.ion.util.Equivalence$Field.equals(Object) does not check for null argument</LongMessage>
+    <Class classname="com.amazon.ion.util.Equivalence$Field" primary="true">
+      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="421" end="471" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java">
+        <Message>At Equivalence.java:[lines 421-471]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.util.Equivalence$Field</Message>
+    </Class>
+    <Method classname="com.amazon.ion.util.Equivalence$Field" name="equals" signature="(Ljava/lang/Object;)Z" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="468" end="470" startBytecode="0" endBytecode="135" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java"/>
+      <Message>In method com.amazon.ion.util.Equivalence$Field.equals(Object)</Message>
+    </Method>
+    <LocalVariable name="other" register="1" pc="0" role="LOCAL_VARIABLE_PARAMETER_NAMED">
+      <Message>Parameter other</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="468" end="470" startBytecode="0" endBytecode="135" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java" synthetic="true">
+      <Message>At Equivalence.java:[lines 468-470]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="e557838e54f12add1769c485479329bb" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.util.JarInfo.getBuildTime() may expose internal representation by returning JarInfo.ourBuildTime</LongMessage>
+    <Class classname="com.amazon.ion.util.JarInfo" primary="true">
+      <SourceLine classname="com.amazon.ion.util.JarInfo" start="48" end="125" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/com/amazon/ion/util/JarInfo.java">
+        <Message>At JarInfo.java:[lines 48-125]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.util.JarInfo</Message>
+    </Class>
+    <Method classname="com.amazon.ion.util.JarInfo" name="getBuildTime" signature="()Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.util.JarInfo" start="70" end="70" startBytecode="0" endBytecode="46" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/com/amazon/ion/util/JarInfo.java"/>
+      <Message>In method com.amazon.ion.util.JarInfo.getBuildTime()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.util.JarInfo" name="ourBuildTime" signature="Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.util.JarInfo" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/com/amazon/ion/util/JarInfo.java">
+        <Message>In JarInfo.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.util.JarInfo.ourBuildTime</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.util.JarInfo" primary="true" start="70" end="70" startBytecode="4" endBytecode="4" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/com/amazon/ion/util/JarInfo.java">
+      <Message>At JarInfo.java:[line 70]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="90d966275cb56b8eb2c12e2e886d9799" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.util.Printer$Options(Printer) may expose internal representation by storing an externally mutable object into Printer$Options.this$0</LongMessage>
+    <Class classname="com.amazon.ion.util.Printer$Options" primary="true">
+      <SourceLine classname="com.amazon.ion.util.Printer$Options" start="84" end="111" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java">
+        <Message>At Printer.java:[lines 84-111]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.util.Printer$Options</Message>
+    </Class>
+    <Method classname="com.amazon.ion.util.Printer$Options" name="&lt;init&gt;" signature="(Lcom/amazon/ion/util/Printer;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.util.Printer$Options" start="84" end="84" startBytecode="0" endBytecode="61" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java"/>
+      <Message>In method new com.amazon.ion.util.Printer$Options(Printer)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.util.Printer$Options" name="this$0" signature="Lcom/amazon/ion/util/Printer;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.util.Printer$Options" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java">
+        <Message>In Printer.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.util.Printer$Options.this$0</Message>
+    </Field>
+    <LocalVariable name="this$0" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
+      <Message>Local variable named this$0</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.util.Printer$Options" primary="true" start="84" end="84" startBytecode="2" endBytecode="2" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java">
+      <Message>At Printer.java:[line 84]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="SIC_INNER_SHOULD_BE_STATIC" priority="2" rank="18" abbrev="SIC" category="PERFORMANCE" instanceHash="f1c9859bc3808074f14801216c655fa8" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
+    <ShortMessage>Should be a static inner class</ShortMessage>
+    <LongMessage>Should com.amazon.ion.util.Printer$Options be a _static_ inner class?</LongMessage>
+    <Class classname="com.amazon.ion.util.Printer$Options" primary="true">
+      <SourceLine classname="com.amazon.ion.util.Printer$Options" start="84" end="111" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java">
+        <Message>At Printer.java:[lines 84-111]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.util.Printer$Options</Message>
+    </Class>
+    <SourceLine classname="com.amazon.ion.util.Printer$Options" start="84" end="111" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java" synthetic="true">
+      <Message>At Printer.java:[lines 84-111]</Message>
+    </SourceLine>
+  </BugInstance>
+</BugCollection>
diff --git a/config/spotbugs/baseline.xslt b/config/spotbugs/baseline.xslt
new file mode 100644
index 0000000000..fe3e36520b
--- /dev/null
+++ b/config/spotbugs/baseline.xslt
@@ -0,0 +1,14 @@
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ <xsl:output omit-xml-declaration="yes" indent="yes"/>
+ <xsl:strip-space elements="*"/>
+
+ <xsl:template match="node()|@*">
+  <xsl:copy>
+   <xsl:apply-templates select="node()|@*"/>
+  </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="/*/*[not(self::BugInstance)]"/>
+</xsl:stylesheet>
+
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e5832f090a2944b7473328c07c9755baa3196..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644
GIT binary patch
delta 36524
zcmZ6yQ*<R<6Rw+%ZQHh;j&0kvofX@*ZD+-{?T$OPlTNa~v&T6X|GAx`E}!{U)mv37
zTVUY_V2yOY5W>&aJ*i+pKn$=zKxk7ICNNX(G9gnUwow3iT2Ov?s|4Q$^q<F%qoQ*v
zm@>H|&1~>6K_f6Q@z)!W6o~05E1}7HS1}Bv=ef%?3Rc##Sb1)XzucCDxr#(Nfxotv
ze%V_W`66|_=BK{+dN$WOZ#V$@kI(=7e7*Y3BMEum`h#%BJi{7P9=hz5ij2k_KbUm(
zhz-iBt4RTzAPma)PhcHhjxYjxR6q^N4p+V6h&tZxbs!p4m8noJ?|i)9ATc@)IUzb~
zw2p)KDi7toTFgE%JA2d_9aWv7{xD{EzTGPb{V6+C=+O-u@I~*@9Q;(P9sE>h-v@&g
ztSnY;?gI0q;XWPTrOm!4!5|uwJYJVPNluyu5}^SCc1ns-U#GrGqZ1B#qCcJbqoMAc
zF$xB#F!(F?RcUqZtueR`*#i7DQ2CF?hhYV&goK!o`U?+H{F-15he}`xQ!)+H>0!QM
z`)D&7s@{0}iVkz$(t{mqBKP?~W4b@KcuDglktFy&<2_z)F8Q~73;QcP`+pO=<OS$B
zMqL6X57H~`N0W#7!2fpSOs3XRU5ong+e3%SOz`o3Zu^kt5%35;Yp2#AzPP=d7EZ$z
zQix&jnNDW*$`;b^xJeDHJ0L3S$djkDzf_=&Bh(lQ5ptC#|1BgGD%EA_oCo!Pk)o$)
zWHiwkW*ANvMCZ~OqxW}PY1HY;y*BpjP)q<&Sf?@#8U~3Ukd;yLExFrf{<{!}hghLM
zrE`-l+!~F{V(>L}4yjlzNuLzuvnVAO``skBd=rV%VWQTd0x6_%ddY*G(AJt06`GHq
zJVxl`G*RiYAeT=`Cf(SUN$kUEju!>SqwEd8RWUIk$|8A<eRN8)l*E=QDfzUehN27T
znrLIPA3tPRcCxORz9de&=0t04A$34Rk~Pop7AHBxPp+qgJLflrFSk#5v+cP<!ZMi@
zD-}{0313cUlt;D74yqL(N^AWlaiz!MdL{`<GcXe%*mTADGshMZe#r^3XO4O%Dmr>&
zAvW|Uo<=TWC~u}V?SNFv`Fq9OeF_VpfyXHPIIay@Pu5J6$$pg{;xE9D7CROVYV>5c
zv^IYXPo_Z4)bg5h?JSUX!K`q_u{>F%FzrG>*!Db_^7*7(F@f%<Xyoek!cME~{+b(U
zF@?inQ(h-LTvs7Z0nsZBYxc*xF*CX*JOF>i34Ps`JBAH6{s=ygSr^CVO)voP`v=SO
z7v;4cFM_D>iVl{&X*N7pe4_^YKV%`5J774`5!DC}g;D@50h?VA!;fU1?Hf%%`N8R1
zSg@hZ8%Dq^eYV1!g8;`6vCSJoK+V1<Za{*N6?fFB4R;(1f-}G3AQ8tu7{J;c*1t6U
zVRfU}YW>Q6N8ImtfE3iXs!<g{^M2wTIRUH7_2MqjA)&QQMIxBSOq%j1c^VBgj&Q<v
zgGQB;Ysq^?aJ>s~B>js)sLHB9w$r+6Q>Oh#Ig&awvm%OBLg!7alaf}9Cuf;M4%Ig9
zx4K}IQfPr&u?k8xWp!wI<a>4{CP#GTs#qR0b+G{&+=vL}I{b-Pha43^%8=K3997~*
z>A|oxYE%Vo4~DiOih`87u|{8!Ql5|9Y+(ZY2nRP+oLdGErjV&YeVKw>A$JyPPAL+C
zA36S<iejUeW3!`{nA$tuzy@hAPmeKO3OtF{DvC-w1QicuZ-QNKxt`Ix&emd>!dNVf
z;xJ)YR;^VPE1?`h-5>{~gwY2pY8R<ku;HDw#`3RQy~n5QvJ-NRBT_0-YG?JTE?dh3
ztr^LhhGtlMS6rRu2a37YUoD1>qhrsiIBmJ}n3G@Zs!!fD6y&KWPq&i8HEm*ZAx`G}
zjq2CD5U==ID^we8k?=geue4Y>_+%u3$-TzVS6QMlb4NoS%_V>;E2hQ)+1Q@v(reC5
zLeK*f%%{PNO-mtrBVl|-!WaiKAkZv-?wnOwmZ=Tv57k=4PX=C?=I4V*THRFRE8a_{
zb>5YwDf4o>>$o{XYlLN{PZ^Ff?0FJl4>A9C-q9A$$&44l122Qsc|6Fd6aTam{=JO3
zBFfFe9seUPSUeyXQc*RA>2{WoKIYVltA&@5spdIW;rzOOqoQo`CN;~UNgU{{m9^c1
zTrN|8w_7+Nws4}Z-4eS9WMpF3h<@81a)oK9njh;-TB74vR;u{vE?>6FDG7<%GVXFL
zUR9l{z*eEND6pp)+hpNT$VVM^Pw*S;#NrbCmH{dhBm?%6D|k)0C@Z9H>T|kby1^)#
zOPmJ8Hq`8waoEK(9}IfP_q4yr(s?ME+T%UV-ikxW!XFb^6w02t30j$n_VSwevg;{9
zx0OXK_uGBFej=gbG><WT7G&giXtK@zPEH4_+NqV<Z8%vd7fGvP{v}IsFGQCqvuFDx
zbZ1o$js{p7OV3vra>G^pEv^`I8&_a@t9>Nr;#r?XNKquD&Ho|`)qK6C^-7SCdo=S&
z)vUi;m5*qIePEIbL=wJ|WCBNY;zCm2F-+@N2i{I^uR9UVZm$o`I|@<&2}w)C`h)vV
zW{)yGJ3?GCZNtFe53Kb#uzrC7v-{JygKZ<lO#t^GY1xV!rfAeLwFQBWL>UiXDV5mR
z5la_vAFOvoh#yn)B`$^ZN*Dxp5Uo~_k8G9skn2)Tb>Kw#Vgxi`bti)^(z--X9F~oR
zZ6=^_x@m<XR-@#YDCW+PvaHaM-p#G6^JqU~F!U+gCv|Cfl#Rve2-P^Xc6HgI*w7k~
zi~#7+V0D~Y-0=$yhDuJw;-LLP&L|Era>DT~=h_@GGVcgBtLzssB1|Xy(xc(lUYJ#_
zgwc&ajE%^cCYW7d;xAxi{#LN*1}s>{K79MZrq!tYMpRA{T!#^tgXP=J5FvkbZ@gx~
ztq-E&c$<P2(ZTW!wt#+AMB$??A%(z%B;XHAs`4LlNEWf$8YeP}TqE}Q!69Y|Y#K0_
z5hnulsn~~d-&m4990ET~iivB?Da9ePQit&}>`|KX8GS2a_voZHf=y8C{6~f~`DpC-
zjQfrt2OGi-WGx}Y4>vM`8<4frU*!bq*NJ*Tyn0cqk=zpDdYth-PJIfz5>pLF@qnai
zzj2FEhuOa-7$JR=U!L{UWWJBA%~SW-6Nh&3;<}iQO)DvOI&VKi1L8rmICePWqoY^F
z-dC8X8~1T}=C9m&yb1kZzbKd2;29_Pm*Cs=y{Z06QZDlT7P<l!ka|EeP8+S;Ymo*8
z?e;wa{R(S&c!S!VuR8m^L9bs6MFIPI<TY!5oZa$Vxz~vUuYs}Bi(v{rvKQ^~#$eNR
z;bE9Yi>oci>1@hFa%t0<`1()UTxcQ}e`fAh6K`<5C_SG`dw$IqzwEYNKvIH3VWlhz
z_#^(T53W}jeWF#WIhj^U7AdI<mbE}4ac_du+9Cdz`W;6>B~3feC--5iUiiT4Qyu81
z;Xa^8#~M@p%6B`LCKWWTa7I+35BLP=EOa&Gp2<m%4MdfXHZ<`G*b?;J)ANiDq-wGL
zVYMK`X`_Oly;=9C*b^uLbh#TDl&XpUpwNjhr3OQ5Dg8Rpp@vT0?=RE86xpQM7WacF
z7}6XN3z0GTS8<;e>pbTWw5HOIjrx;2J(KI$$HT|w8}R-8fbp9sot&LiLs7ILlyZc8
zWbss7=*Ah|X$LEt1O|T?ABkIn-0NN`I8+ipfoBZcW>(WiaASG_khBtKM{hfkm5VBS
zy0Q`4*G6HRRa#9G)10Ik3$C3|nQbFzmU-dA`LjKQY8icnx?2OE4<k^*%nma+G`H4e
zQaf?UlMJ5hqcc}G6;AsCQ6#xw4&;7WQj3*doyeKyyM&N}+>0%z852{OJH=?mbvwr9
zhlx0RDo<cg1ZF<~q_A<_>^D;p*xKx?yT(`s7wj7BHA~rHF2yxnL<1PcU7FM57;?g^
z&CyPh9W4KvZ;T8w;AuNMn|nQ-xJ~CvVT7gAPAGi7w8udw_LOp+p4eZiI`JEC@Mq9F
z#dA2AM_<Y}U>};CnL=y0#tZALdB(P~Rz*KqGqjwec%Fy?K(PGoO0tfskWw-aGhd7$
zTi~x1G>4h5q>ek=tIoT(VBQxrq)&#`_0UHC(j*ZO%%}%C)|EzTWEpvYDqCYXLexR9
zlww1ESB+IiO}=oq)8WZj%cY_FTQcEJ`JdABa=_S;O|kLhX*|5|D>0c{12DoC?K95f
ztNxm(sTU6cWWd$tv`5X(=x?yAo)IYQ3G*2+o#|EfXko6erF;M4Pc;G0)pUDY)t`H9
z76Z8V9HqbWA@!`BelAT&ErrGTz7}%M*605PEY@3{gv+`yEhr{=EVp_tU%`b54Pn4a
zz8nN7`eNx=*`f1t#^7>7G07IEnbnn&`RWZ}4Cp8W_DFDs-5)GU`bw}uBmOQfKmi2@
z(cWWmvHFTUNInRH!0y_ZtuI9Eh@O3+64wy-_2DF~E@KF3abM`0gC%|kHi@&hP_#B$
zLN{Z?$V_;+h?%2zEC{2ITyWOup*w*K?~vpwB(DX1i6oY+F)??;nyHpzaPLIt6G$4;
z6>iAsB+&&NN0;ObWVOL+-^ZwD?nHgY>0k>0<sP{^?Mp2+@T46U{FccM>I3iA7o)f#
zN&aX$lM@r_Iu|n<SUAV}>SdPjoF{#QD9M6>|JSNPLxX^T2!jCKjS5mwNaO+SmBfOY
z;6ZdwfzhO6Vs|9u81f4e%7*mU%8K>A7QWO0;QcX7<jT_Q_h4^Du`TN@xvj?onUvjZ
zEiL_7n|a&c|DLa*0&#Yj3r$CU<Cg4_$DLE-N|_7|kkb>W@|NSUVl)_>7VEf#&N6E~
zn9Wv88@Suo9P+M_G2(f+JFf#Q^GV#7QQ`qH#$N1y{A*_t^`5H1=V^u?Ec|EF6W+6B
z(@Q8ChIUyq;+I5CmjEa1*v%d5{<?yGM|}B87s<%&dT!n&#wj+}arjX<<RlTrpEQ?#
zdHsehntqI5<w-@3txwtgC+XATvpV->WHyhcHSjQuwzQq?;^BmfV#okq3v8bp7dBdk
z54B+%D3=JWd-2w$)puXxZyZH>-$O-?tbSIlGc{em9xHN!44iaCr}6uZ^FpN7IvNh8
zbp!%4xR9np`>AOEd1e2_y}xW#v@@h3wYc?WiwL6Q>fxPQA81V^J)XtGs|Z&er6w~M
z!1Ph~85TMG>R&ixNUnevc(w>fgb%+X#Wds6Yl+wH29aE%;RuDeZz5dEt%#p&2VK1n
zKkqgl&*_YwnO%9`0<6MVP=O3<AJKCZB>{02EcR7PvvZPbL2KMuoRsU|Y%zw38<gt9
zD7Xp4!h8iKF};C<2Bebh-{pJ{+>qeOL#!YFp#_~+rtNJVl>lJSh_*B0A6n3XkE5po
z9RpE_h=pnmDJFX*n6wmsWJ9GLu2=L8y!_R;;Aa2Jl|)I}Qff&`Fy@iOhop8>Y2{F}
zbVk3rNMi$XX(q1JrgcIhC08@d5Zc>wLUL3wYm}hzS^!5d&Mec$Sp^$DUS1lD1>KAt
z|Efof3nJ4^k(WKL_t-u8ud4L(t>q#9ECj?v#W~W#2zTt>|MCh&*H8Wh1_I&^2Li&M
zq9j0`(zk~P7}dB`+15b*j%VPGr$;@4MBQ5AT>-y?0Fxfr2nC1kM2D(y7qMN+p-0yo
zOlND}ImY;a_K$HZCrD=P{byToyC7*@;Y$v6wL!c*DfeH#$QS6|3)pJe68d>R#{zNn
zB0r*Es<6^ZWeH`M)Cdoyz`@Z&Fu_^pu8*089j{gbbd!jV@s7`eI5_X5J3|poVGlq`
zDo9}G;CsjW!hgN2O9=1|GpE;RpQvrBc+&dF)L>V&>9kd6^YIL?+*WDmcQlvwnq`Lf
z&N$gF>3+E*NcJojXXI^}B(B-;@ebpVY}l#EcDWles7s;Ft+KZ@m+6FWaD^oYPBXVw
z3sq|aKIDh1x5Ff=tW$(LO|!e&G?Xvh^H!GfiA(emluL!LmD=EV@|u|8S7w6ibUePJ
z>{sOC6L27R+b&}e?VH;KvV3a;O3G=gwG}YzrkSTV6(&=;o)EV~2OD(Eh4mu@K0G)i
z3#44IZhqN6+Hb2h#3R8YwJW7LesDA9=n)75u#46_ZmSh@6Q-4oHvGxFPY8x;Q+)d@
z*-SDqhVeyPGkoD)iq;z0r*M)IhY5I>gMA@RS&EIYPq}Z{$Q4Jbfd76EVhSF-sR^TO
z!=o?>V(^bx!pG$26J~Z>Tvu&Uu+0;>m+pg(fmbu(97^(OHBH4;J8WIfv-f5}VP#VS
z$Y$}SHKdphDUHlbdIVW!k$L6T{LY)|H}MT=l$22kIl>|46FK9dt$?3Fjk2RA-~AX7
z1|Xe`n)%h~e-O_qLpoFXJ$%gmocq`v0%hRw1k_6nh|+3pvJDy}m)V|xjL&!Z6?%pU
z+m)r2*pWjEl!etAYxdzWb<DeR-tHX$b+<?(Wn%1Gh(S)MdmKB{*KLQ|o}i^=okrgi
z_9tFc+SAl*^)xH(tKi3jdpUyCn<7TfuzsN)Y1<z-uZ+*1n644&T2hhTW#l$JdUVv$
z9F2fCF$SpN?bdF2U!hqU`foD7CNC4D?_2BJVLtYJOiMdLf4g78>0{mGc;#$>rE%)b
z@Rnj78P;$lrzY!XCa0&x+8a^YF*G|Q|C}bGeczz(5m_gq08wJHIH`WqHH?A}!~_3{
zQEvMXmL<*nThl^pL58nbHgQ1n9cYmN{C8J^6AKS%?~>1DCt70Q2Vp0;E@`GF%Tzkc
zSUt&LJ=wHI6@#8<p`nK`!Ea3fOOSLhy@qP*1BsMS6*j7wD>_%=2s=j^4VBd1-h_)3
zeozYua!|{x(qk#z;tavf28rj_5Oen-cYG%;R6I}Hz$yMXeg^)_$OUUXx1r^qrl!DG
zYXkAXKBMrVM-rJwAo<5J{NW1XJhW;Nh*&`n<RXNn6IOA-+&<Z4#Jn~3w@C62#QzG#
zo&6oEY>F<mHlXE8t5UZLqPiHGRHomoh-s|VdWDiw{z6h^=(CmJV!wHN#vuwY`m=y#
z$b3KecI8NVmbWX9fLRxXl*i|Ky5oAwllK*He?k|CYlD-yF=r&qM8m%_O@_wDtIw{?
zsm!8mF2z+!7eXmoti@|4)!q|iq;(;s*+W?H6w13V0El3Hk6%BXBhgeTI5K1PqVf-q
z!+aIreh#~w{+%D~P*}=m=S@Xc@3l_@S##Yb(uRNY84PRS#?R3j5sidz{7PVr_7d6+
zw)@PW*{8JaN_`1$A;iCk%{My7B6QL|yjw&-a@mrll4H}OOf2AOc$xJ}uEDm{jyNG6
z8++BP8}RG4A22G}bSAs|=P6!XsB+#y#vUy}^iHqp)BU>V-Z;Vd({KSkMxV#cn|bXJ
z50GtvFE##sqGhV#lv2s6?^yeBShlhR%XaPIo)iXOue}jwZ;Zq#dgDn8H?74Y+$Z?C
z2Y5mCC66>dp%sVMecUzCir<?IS|{wvN9__C23%k`O7tg=(qtRE5(;!0FJVcjKh07Y
zTNRv{El!qCP?t{?82c5+1<}`8=b4=X6@2MHjbOZ^<#e&J=tQV!{?e_ok!N2LCFvBL
z`MZd0icO@hLwf|Ve+I=0+l8Yvr<Y7+s^4lTL-U<Dr+7fl8XaIdpv~*BFY?f*`zn0h
z>Wq99Ea(TDwClZxtEB~4N-2JmlH#>Z2jOcaNaw4tn?P->BBGNHxUHez7>C@TZNT5Z
zHerlG0a4~06L%>tn!~$s^L5`~{ueLZ5?`$46nHvwKxM0V9VQ(k{A40xDVw{+Qt)RV
zQ)T2Df)cp0nv!lUFt3D=i~k!V|7dUjpz?K2ZiynO)$d{2*YT$N^CQ{t=luZ>WcE!>
zg25p}If9RTho%G@PZp;5zBwv`n+e9iO=6dx1V^|4Ty%`oE=f7O&QC^s!4MJ+lMG>^
za!mgpz*^SHT+M_zm;{H#E~SaU^Kn*y)nTAF*2@t5mF+l)bte+a+goaA*zXJ4P)H|y
z{4OwbJnIPtMp4E~=64gM-Y{#o{x)+8YCg$C7Yy=;9hdyBgRFIY2_L9DL3*B@%$5#m
z8P}+)glf*}UPD$C;_yntx}9VPmSSnY9`Thd09nfoR;3`kar*FRfS)`+as*t2l*U<a
zc9nu(cBKz?7arM)zV;H_Ps3eFwrq3iA)aBYa4pp%PE9r90O+Q<Wlt_YE5AMBb)R~f
z_U$RdmLeat%P`|mW{m3)Gtjq%<5SmI0n2A$F}D5;9lBKuuI&j~;#T&_b^ap1RgNwU
zpyjOvre7@Dh4h0NO<c20sHfS=+fF>SWgmaZ!qFubr1DegTGZspy<V2nIl0@{`(9e$
zZbhb_XeLc77-5o(b$Hl-1-ZBIU}j%?oNw!?h#Og7$C}S6T-^LuM|G3}+ix`Hxr_0o
z&acW)nNFx(89Ed@)*;G@;k^!K{Qi~#6ct)SY7_5rLr*Dsi0>YMgic{inI0dSt+rJR
z((jjMrd<p)oCp*`z<7GLWwxEabV9&%vqF|9&I|WlYLCq$26pZ*9NO&d`7*c-dn@-%
z^ooh2B_QOrs*P~6G3dv|Ve5x=f;J{sC&>q^?VSZ8FCO;0NW@>O_b67gDHP%W*^O?J
z91NQ7ZFODMSvHj3cvT#6RJUF7x=-BJFQ^6<&mOd15Z&M!?b+3Tg!UcgldD9tOAt5K
z3X>MlE-a=sj;K&}sSng48jQ7sp|&u3;@e>V4Cuf(!s@9lZ0Cg^DKWmki%>$<85tOG
zU;e{%zHU~KREBUg?FbcseK{lmK-`*S1p9j_4hF=F$y)NB;HsHwuf_A0Zhy395e<C8
zA~ru0?GH;EyiSV`l6bsHzG)3nf!Y)uDm!6If-?%v=2I{5&)VdRu~Q+{8cWy<7Y0yr
zFenN1YKYr=^-OK)@2=@hmj@XF3n6UE7q|Y+2_s~zF^_f`mVEnK=Sw#OicD>U7o8^A
zi2t7Ch|KVp<w$qTr>rUn03N0T2XshT!g$HTErcQBBG=TWaHkYtaI2CJY7ajI%yr&9
zVC^zJ3WW03bjwGNx{l}#+D&Ml_uI4PQhV}qZPXOP7ffSv(<f8@E13K4YNv44sPM9$
z5}jkawJF1jsl0yFSJqAdeIPZ>O;hX{Ff1|HoA~v)V!4y{CdALyi2YPjrRVmRYilRv
z5PSkj*Z_8Fa*sCqGN?7YTnkr9=i9X`qcw7nqz#{bj?B7NiV9fWF+%~Rb1X@MuS^<Y
zhy-q4^}EzZ4_voD3N3Tn)`-CuQFG!zcw-%FKh$H`;HyF+A&ORjrsSwHx_Ckn@ReGG
zj5=ye0y%yy;deA=EHP@H;=mFaVFIQOmI&yGE;Wi{p<Yj%w+UDE2w^VOi%FChlqTvN
zYyn&S&}yKkiF}x+iGEBEnyv0tp4J}nZpT6P?`{F|u%@o!l0?JtU{mVLIwcW9Qw>Mw
zC)d#K{(-9!?xStM2K5x%x~ogWxgIK>s5r_RT1jU_lxdTtIEFWvi4eJSAiGec&HXQ(
z5t7!J1b#SL|8s4)u147PWQUq_e33<Oxbq&!>!5Z#f$Ja&az)(Htl`Z0<naj}?6F$Y
z$}4lG0(Y-w)Rs-Zdm7qNOQq3BDy@4Qh+s`$pa=!AfIcX|dbX8Kg*?%N8ZU==cr*hI
zTO3p(m<U#|cVVJ~B$&W*53$4|xVn#Qe(q8V6YG1ZCAL(<{ml&SOn@WWwP$#2p)VG0
zZWi3!_`5JRX?;;!NWvp!!`qG9aG#I<BAO%iFc|FT`=mviUxJ4t-qQoJp(_T1bS3-0
zN9pk;=L!I4$_etGN&Ool%e{d3Gt>@Ez)0d74BzNHHfH|<-8q*ZMf?%eJzoGS!0S6Y
zS<yq~kB3Tb%sqy8eGF^b<D=L9FeZP3J5X>U7y^1+;V$Je9F027>1eN#_tz+2t}Y^N
zYfi9}J!N^SU1CYoNBDbD39@84xLroY@0f%%c^(5CE+}!b5-Mt3oXe2nB<C1ScE5|!
zI`R@|JpR6pqCr<tY!>dyicgGIL+rzTTKv`}Pp%fG1f^s?sgNH8=Q}s4Z>0ZCZ8ZYF
z4og8nK%OA~zZMJX01uFtrmwhcgg*XbiMP9kfkPYFASbp7*Bk^5ZBzV)dL)JhPwDkM
zkgdHeKw)orJcj4^)a^wQC2|->G=OBzuc-SskRrrf+H-E%HQ==Ex}d*504#GbIUXIB
zcZs@Oo0i61MG}&0bu%@2N?MMJMRXyTVb8@3wF5eY3G6-1NdT~{{~YFs8f&SNebdaq
zKmP>XqCQ@iaamuvY2m%xJ~gdSLSj~DBhB`NCj_c}NbSjB{r(E`_-+6a#vx*|S>-GU
zHsw^dxxu`<ZZiBgWm(-)b;EY3EtQaf@}DPW1>e)q1HbH==rLFap?cebKumnTo=iJQ
zJD1#=o>0%Y@&jP?^)Q5bTV!pzrf=FoHq2c_59pq@my{D4AW8VU*7LVp;LF-qESV;L
zClRfyQ6CcD$sd84K@e@p_ALH%j(Pz@Em@QFyY`AG&(|!(cG8!oV#ejr`y(LolX}Iu
zL$)G)8^y4sUAY<?JUnp?V+X<+x497_8RXw4qkU3F93UWMksK4owU+_K_<{V3VkWmI
zD75M3nph6sl-syOHNB(%w-56*!?v0+?K_%d3}I{WCUcqMguAOm{GNezK*N1XY58Ds
zcxE<o0etgIY8&>CWprzVR?`#OJ%NU)9U^B!OGSj>Ly;<)<(nNh`?z*GvJ|ZBKfZ`0
z=q_yGHWPp~R+J+{{@APVwmp8`=%N!L7AT^l^oaM|JrCFu7J#@frf=z(vGq2>sQ^@u
zk=^d#gDf}ME!~9PaLfw44~rsG!)T7h8~dY^VcZQa+u<a0comw1=nN&=)$g(2zsse9
zNosK&#4<FTgb^-(s15odlHtgB_~kcWMDnIhO`~wH@saRRni~OEa5N?8JpVd;EXm+-
z)qqqblNN-i(q02>eWPGG$mWXB|H2$$0BT(QAIu|=DJXPQDNes3Q>-|Mh=I<BK=M>h
zy{WR)QmhL5rQbBYPBa+e7)8Vo;<S!ABPkUe41j@N>_aKrg`}izmN>#ATuSDu!QUFA
zsgM|Kv@W<Nnd-_)&UqvT?%DDV>(S}<tg)B`%JZub4IDFiZN?}0E(h6dt3sI+;gPRP
zF3azPXNY>Ag^6e8)9pQc@JLj_2ZIkO=8)#ARm#mU=NncWbmd-SbO;ad=y|k`shy3b
z*8o0@EJo3b$#zSgmnlT7KAp)U!qI2<ZO&1fknVbEVAufta&Oj|ev15eyGb%dk3anI
zg4jI<VAd7EVcnHNQOm>M`hiC@Gp0)pNGHYMe1$MBNE}Hd{Sv^`wI7>MzNwgVv1ZzL
zttmyv!=TKuPH$b>r7$lgP5?vho;#Ks4+zLzaz-1b{p-Fn6dWy1Agg7O2{&VQ5@s3A
zAqzC9QokRD59!@ex#k>xy61kq6h~O$lb;lB;Q|chv&wzR+N<xFV<Y81KH2%km!$hH
zoFo+vR@C3?To2+Y-myBi&h*P^bmmmc=HbrOs4u%OyLxwxW|{8D@-*rGoO}~@05~u8
zZKzIh5yoi9o;p{~MRA7;a~+AZQqdIinbC2Je=+Bh)JR1#*GZFg!&x*oK;x)(LjxY>
zgXdIo%?q1Y$TzsdCo+n$^NODN7yd}cAv+rkG|u-(wTp?zUSUxaA-<EMLrr_!i6MHE
z0wZP7ErGEp1(s0$_G*J~vCPWPfW@gkk_W^pfy$hvWRxlX55g#c5l(;A&y4`xsw!#7
zbjj3Nk26d}ceuVA^{pCcbHXaM9%PAaX~SV29RwLNh4~hlNE66<>W3dwqikdrokwz)
z68)Gn$Nwc1zB$F9`#(af|C3v;|2$bo7fU8f7h^NK6h&@xi2m`)g4mW$?l@5JEc*VV
z6d67@Fl2w6mO;MYUl2U>R996gQUX$d>$D>)TNGq*arz}f21yh^uvIM!3u$H{_CH5!
zrjt9L^&J8UqEV_lLn&}nc|Q=MDei6t=vL_>X-i8B%f5FDi)|qQ;2V-T!qOi*uqq{U
zElET<vy9xrZ6~nISR*357}=cUZ!(b1<dkD){VtGXEQD9o!#fA?H+{Ods|^zX5wB@z
zB=t5saW9~PNiZLkj$Qtc=bV>6#2cb>Z_6p_vw44&mN!;T&~ubi&p`XGepCNAfa0-T
zC84V@VN^R6%z({m=$%iXrbiggxvMiBpww~ktD&=9-JPK3kPCOGCJNQj8+l9k#!QeS
zv3h$Ej>@j<-zBW0Qr`5tNQVRfYK_$3>nWUzf&c*tCpl@aYwa%b;JNeTX10OevcxY7
zqnLgKU-X9G8~&?Dr)`*7GryqhN#;9v`D_c=_xBcD{j-cLop~pSnM?&<Ph{*jW{3zs
zXQD)SW`+zTX5$323+C&4{L$LgzyKOO4ls%ZQetqOx%_}e^jxF|hxG?=ugTSMZR0lO
zj?S^@8~(KRX!6eo`<@t9h<g!pSSe!`Q*bHebhi9@HPWFY5K*(+68GGTi4?n{z%V+X
z3pOsrLRv>7HggX6gb++ftBq$idM1|>5t+68sWf{ixREbMkZesmpjJsAFPQ#2+8Uek
z$BPbu3<xVFpK7dv7KRR3vc|h+Eou!Ce}r1G`v(%`i2Vs+e}pV;{E}3#=nV43Cy~JT
zp{ReQ5+LUy15IBpODF-?F?+=8&q1AX%kg1qa;V=5qvaMo0Q3eieFb)7s(gT}^n|6N
z<n7r|HK^#T6Xz_Cic<SpE|DzHYE0b!W|wP)Dn4k(k6duc6r<-)86l8!XD(5gXC0=o
zKtt6LHkbmHI0-=4c^1$MQs666q<sJXRT-f_%Fb#3VebX;{|Yk|pllkGRz$ruSgWXP
zLghC!4N2mEHcfTrO5&M4bxt$zDtVXT-Y_VIi>cQuNDQq+^M}&ZuSHjxUgxOjF<^%4
z*8lc$CgA<$n=DYg_DsrHB7zYM0Ro|gS8ZnUq$u3GQ+{owv9RdB$wG%d-;R+I>?i?b
z+r_mu{IL6WTYftdz?0#pbHkmQP31LvXcMK6;mAP+;q^L@q}v~TD}Ni>f7@QYcbM!T
zX5kShHv3X1U=>B!2*si9=AEJCBt~GIH7DL4^+gHj+q}tk0F_?Q-=z{JY%77nkw>$F
zG}6ROaL_)3t$jX=ZtFG{Q=LZfNjNb2LK=m9<r^Ty{qi6Q_`T^yhCZvQIHK&iB^%e_
ziBxN$_5Xz9Vv;%S8Bb%-@Bn%T5`VDRMXQZF^ibN%5HA5H%ZT>l|7iaB++N|S$vAr1
z_gf3JpIB|?dptfQ{sOZGlhyj~D;T#hjaNh0X5(o&7)87^t@@Hteh{0DOM{tCu$l#&
z&NhA&V4VR}nzZP{7i(5bGB17<7bu+RJ1}k}=ffSg%=+213Oy@Aj1vv2U>U>8tRhKM
z=*e<21)u<uh~xhWaMrQ3*#wsfNWF0?eaeFy5+Gc}+o;A3QrsU*-XBhVGxL)}N7<EX
zVSGiE+>6SSb{CC&We%#6X@duqLWGJ>O)Ls`uM98``34g11<O-!nvGOEuuT0(LVqtO
zX2s*MMM2(+2gFI*8De<gPSPFXc2J$ge*lW+%MhNqEp3<?8aH~avgxwV?cQ+LglbNd
zTgny`&Mw}<gXQ&GCCAg4nelHjG)ts=LYQm9Wyk%(`iBOLpxM%N5*j+aCvIK_DtP2R
z(9oi@i2Ml+wS=_FCY8bdLHu8tu7w}Nhxm_IAUFsJ>;D}*7>c3+^c|Os&;t}`(BWMD
zfbyr~$j%{6%DZ`kR-}s~p?0#&-5a}b?6tDqwtqY%ep0ypSRIB54G@|0J5E#LkxQk#
z_&xE=d(U}q?*Rh7L7f8A<JhY?St~8>M<fsw8LqS{(O8)T&cz#`t9*_^jXZ*jWVNn+
zmIQjRU-h4bpZw<lsa=D=->5{qdGpC<&t~9YI!%j2G@nUPoLPSiWHjCVP{JAe?cBjQ
zTqI=R{nv5c@|R)8Oi3cTL{&6%XdTgDP4CNYT}q2f5|Xf_hID#;83kd+v0RRyNKYn}
zyPahwd=4ncDORLvatBc~KzT+jiiD{tzd3d*T(f7ayS;J&I1X!xaL2~POrw2ST=Pr5
zu*c}fb@)0P6jv))kNl38C7gmnWGmlL@{PWOVYt9se*cS0w#@W=N+dY#V08ci=Zmg9
z+${f#Qfs5)hOPxC;q{(J{Kx4HF)2QMzlVtXz0-O&h2$VxtT;ROvZ13nN{IG>Asv{%
zHuDqgZ{R2(X*hkO+!HYHHWvRYrvN9fl-1?x6b)oseZY)@dQ6O>9Y#8*23~%bzN~Nf
zpHGMdS-G|%F^v3Gnlsc$s4Wl=ZEu+J6y~*Ih2tpmHfO56JXKjldm$BxDvW6ZH>JrU
zdRo<INz-S^E3^(+i+V(K#JMeB`Zmj{A(unf-ZV)15)_Wr4EXiGsBEYG1nvHZiY*if
zh|vE<rA1s5rVh^#j>}=^466lAq6!qY_@nQ}5ETUEoF;`>7b8W910_Z17!r`D?QNvC
z+WF%@IkPi43n4;0Ks`M{x*0-^GK7oCAp?pFK1`~RoMSe@jAlV8vQruCUNyQ_7wk?`
zSKe*|!4ar@VSA}!ThlIB*Qa5){pu&HS!a)-{lWL2@o1486ZK_!!}FSZ>vyUPIOX#+
z5d3~J24Op?!f!oNytub~egnkB`}h?eh!QyX6&^LbNuA#9vH#N_7IL|#6kIDhLL=be
zE<R8t7<OjI8h7Hy`g96L3Zg7FjWF}3&>g3Cwmw{A(cm{&T<O*na6u2NFOhZWHK|N8
zzF^Udi@lQ}G*3!0m|QnYjkkUa<eRpVhjl|g1Z#*jrZZhN&DA+jO#rB(hp1xg-CwW>
zPg>XIWX24$Mj_#^k2I91C@h;b$8WNVr&MLjEwgAUtSeJ2W0)6Fit}PF!K&1j=*+6g
zL{XOUrqhNyPLemIF4C&hThR8fie9^fYg$yl$m!1|YgcPlO>TB-(X{lkN~X}R=GA!Q
zou<9ZJV6*}SN_4WRsqzRGI&p$;9DxDFTlyPw6Q9rlo@E3tMN&Wo4eFs{1=RCUij$V
z`8)kmh0fhTTiEyvRl90B%q2<lV)d9-o)Ht9<Dd~o9~E}Q#6phQLR^v`8)kjHWYFm{
zdE#&UZ+7GaF%E5p%vN$_HrpW<Hhj3Tkc^zKC~)tWizjzmaKI5GVn+m-?(oa;)NghR
ziOZuPVAUkW&V6vo3<tCXFMI<A`U<2ei-Y~VhNNyC&4tP?Dp$#im0XH@@Z#D8&!82(
z!QQ4+Cnwa<tXboRU6j~tz)^OsB2J-?EwPQoRkv_r4vP~Fmt04>(Moh$jg7{NeQiy>
ze!H{zbG7<3BcK}XE&V_1kFfGA7D^ODxn*@nqlp!{LhYb47zIUlV^m+7kZh^a7L1^D
zvI?m^9PECMnnN$0hi^Ur0b-~QgEORanrv|`dd;ek$4rAgEEof3HyvuYoZ)H*;+TgO
z8CJY~4YDI^7RD7O)m&2h2<Q87rm~8bw|H%P$%uXd8^CHUHs52!jcrIg!ANi7222;r
zmZuQ%tiIgYv69fF5fT1=kWwXX<wZuQejO>K`-4e-I$1zcZ*K>Cd7~sSxEXc{d7-;f
z5Ykr56Nkie%=z4_LIA}H>c81e$%ey=2hjqzTxoO0MDe!J&PE@EmX49jQJJg?HNw;B
zHRHr)3do7CGDa3lPAZ4LAnpT)spnk8(ZiFz$|F$1m*A@!qCPug>Isp|MPI24i>jp~
z((9EQ9W#Rz)0AYT&ZWOWKBNtdNYYm2QytK$o-_|W5j7Abr&73(MG+Ar4K!Ij=nKu#
z;SNkveY?Oc!I<e!FB)q^%Sn>|Vta2{rb@c50#p_byn|_tu>Pv}6YDydl|}X#4oZW2
zvq)Y@8iG5@6c3?uu4vdLS<T0bz2Je0!Wb(B=@uU^mNRR`YI&thp(nXw*QA$-KPijm
z;LTiqJnO*K9f_I&C6c$ZVjq5_{M<L=0LMz=TFp_bA<lb5i%CFXHgq4jVRzt08RMEf
z3@F9PCt(kBjj%#%-^>Bq23P&qUSvtGcu_qgH*?KfaT)@QueLx6apA97FI7sXP=foe
zmrEu7;%Z=yTTGUsHsjR(wU54xNPI$hLFZUOwh=uhZ&rLammOQ?w*)}?Ah#%&K~OZc
zl#Owj1OCEeXt!ALV7LgJ=MVbCo}<%92WX$wCS~Ins}%5+sb*C{WoOT5*<IA)uz@eb
zLP-XZ5-w_QTRhd})@kJPq^5yQMU%(yM2C42W^7h;8W5ewayD_QMDkmJRJe?e57cd#
z?^EvB?N3*~s_#gIUTh!s{H~4Lwlcw8BCUhG8S@AIF>2%sgjya;<b-j7+AJl!1_VzD
zC*X}=DAXZZH*Y33iou^JGK7nXlgI#0aZoc9aJ&B7Oqn*XDYRQ4ScX$<LuoOjqto>~
z|A#;k?j~J9qB)Tku1BGX=MrZ}<%Z4}i$OvCHv<dr0isg_Mc;A)aZ}o>_3vtH_NZoK
zjJljjt(~Yh%aI@gFnM*e*@_*N190p^@w5?SjRMb66N_^3EZ#Yoh<8FM>Yx$+mTbp$
zjQQS7(rs2j^54CJXdkH|$1&$<b^jjZNHa;tGy#1rzLCo4m@7_zJ_d*Uhq}`k@^o?E
zWhm=)-i31piD622iVS5V+l~V#6=;GskJ#TYCYJE4bOD@dHOZ17#;_UqD1b_Tkl~@d
z=uJ`%IP>wPOGDvm^@1o1pl9~!5&B+I=U-f_M-M&r3zfp2%TH%Ib3lz-^t)+Z9E+<g
z6%ri>>W1Bt1`B}rZ$hZ3{<jzL+ML76MX46HOTpFRaR6AuBv`m#NkL(i>0n|nZKM9O
z$?_1+y}fB2$zEzE$zC#46=0E_4x7-VXY5}<+d!g2+Kg$gvU-Xm-A9DBZz+bZ*zDTx
z$Wfb93))oLQf;wKi5JBJ%$yq}m42lacy`bC9PjFg*}pCnqn@dv{k9WiwCC07;6n#e
zJ499v3YGQ^WyYY=x*s`q*;@R_ai1NKNA}<6=F8IvJArr{-YbdY#{l1K{(4l$7^7We
zo~>}l=+L8IJ`BhgR&b$J3hW!ljy5F`+4NA06g$&4oC-`oGb@e5aw-1dSDL}GOnUuy
z)z1W)8W9t(7w%OCn_~#0;^F)xic6It5)3h);vuLAKFS4b)G;Z$n-R&{b6h@yGxGo>
zT-cq0W7~n+qN10;1OS+*c>H$(G<aFTDJgrZDaGTX$mHZXfeKSU5_au$;>oKq4hGG%
zL&XJG$PDQ6K^BD#s_MsnlGPE+$W^B`&a+Z+4;`*nyKil99^E(wW?t>#V_xYWHLl2}
zIV`uiR-__g+<&m#Z*4E|wjKY1R2mCm%k2ayMSDw`Rz_<XkO4Jp9iw$j)U{W7#+T-9
z#!0H)xg9(UtCcr9i(U^Ono4I%UiIpRi0y6<+!vCGPv9^%kl1I2nubR_dn@JtGE3%K
z#cDCp*SImKht;?%sv6gX!vH72S8ovJUM6hjW|y*4u_QYipZ>KA!3P$uIbB`dl`3&A
zmT@gMT@ZpAxBys8zRtgoH+ebSaVA)maP?G1=G4x^Nw3mV0?qehWL35vMI~p$y0hGL
z6@vHf-50P~uoe6yY&*D)Ekmi06LF!Jqz9#7kMvWexYMbAn{}`{3ZBsd6$5jBCujDp
z<0N?b*1%T<-_Nxh`lKtla|FFqs7RZMtjHAwZ0Ck&s{x`#^S?36BNQN1JU^0f&TRoC
z$}c)LW7)-n$CmAg&n(96AycC4!4<n#&B)$fduH~(afa&-<1Aiv_BiNqnK}&Z0oQkp
zwvrKFy~VfD`8Nl`AUt0=V_p>_*D(~HvXyLW>HORuI0;ny$f9h{!Ud0=X0x%{l6NH$
z?lttWn}DQL521;-r~Kf$N_YPo)7H>3gI@Ivt}GnR=8W~Nn7_PE_3{sRNn`R~bs`g1
zoTh`7o4H*TRp7VBp=%>&t&Cd*Ny~@;{C)P;62d^dipuJYUV3-Dh<#a&AIxtrmX42(
zYEH-8F3|^nY-=yw(?^d!hTojNxr~A!n$Ao+2mq*kZ&>Zm+BDC*sul=~!LUtWiokIB
zxc(dNwyk&5o;>WRt)Q-Wj;fvuvJO&DLPe%mt@t!Oq^VsoIN0iTh%fh#`-{Ha?a8gf
zj^yA3`=_NEONO0Z?}YVP*dL{T<jsgAnob~Nzu;@GNAJQ9Rd@nX+$kaw$MHg^PkBR=
zf&se^(HAFh`NNg8o>}v|A&cE7$_0G=g;1s*WDQuRcq>cJ?z=8b5&i<)=3ELSW%Kff
zs=my9Q%8?aMxZeDq=RBHg*&HnIeQ_}X@oh=f#?C^HSg?1dwLn#wu(o^uANrRZD;H;
zYbOec$#wJB(u?w22{gV+zb~pv|Ag!q$N@^|6n+FV5-X=lR$jajjeRh$1tjht$URz1
zhw)(ksAr2;QBXH9T#A$6V4PsR7K)){JQb?79o6&*IwDPZknNqySIa6pwcs)~xN81I
zKc-GmzZ$i(8RaU==$Dx{tD@4nph-V*=W{Ln97*VEN^F+u0!F<%$l=K`ikIp#<^Yt}
z{rx1gk>;rVccPIo6hD=xPQ$PxVwl6Cl;YI6iLf3!aevhsyXXZovK#TOv0|*T+^ii5
z+YO`u(SO3@ybv-DG)w)E;@+ULoj_+<;mc#iW8{9<ye(3SZ;)G-=wF~DyKm6vASWTZ
zO{{K^a*@#@kx(YwebLyZSuRj8?E_%FG1ez;oAd<-5Z|HKrz?QM@kiyg^yTHzUy{tp
zF5XT;g!_*Qazk8=8NE;}L%7S-S;q4!m^lhZ4k`EYesEnQjft(kNupJ_b=pj?v(it|
zcc_G<c@j8RZ3Z?kBwajzh1>Y!99vE`HdAK=Utac&Eq1uy!TLgOS-C1E90Am)B{Tiw
z$>$Er{s{snLEaO5@u&zqxE@v;p6D&?u@40t{#VNA&7SZael};kGEwnHgD4V5RNM@g
z(EL~B=A8&?pPPW-fTja0Oi6SVtI_(3ME!qWLg-uK2afWhBn(C2PAmUyu^2h?Y402i
z9P03g5$1#etGdUUo?#skjQ|$*()ybRGMXM`-2?jjThnTcPV==7sg$k{GxYdF+S*zz
z%d<d0#}l#z%*B))^3X;zIHWqQ8SVAp<}TGArkj|P$tP4REGB!_Bp_FaJ%zs~iK!`q
ze{Xu9=0m>tBo(R9!7SW6Utq|wFpsKMSAH-x{WB|Cz62A8!p8!kHz1tM=9I=M&xqQG
zz17xBW7t?Q?C%@4YC`p*za(>hOrK&ELyDQu{5ACOg9noZS1SGh{-FcLy_W;nf$N`N
zGYxdIzy7mL3K@Kw65DmvPH0<Zl*R94v5zrUWwl03TdFkdFjL|nibA6)q$y=5&2UJB
zTRM;5Tu}8iY79WP-2q{O81+!ho2Txe6{6e`GhHlIj$KCkPf-zmfBv~59rE9ZpxB^q
zV<p<&{{dt8@k0dq@d$n)GfrqcvH8{i3;uWVLRTW1$Jr(Wps11*52rX6Ta}fn#sFeW
zsN;+2m*q4Sr`KWwOUc^I%9<xg^sE><z<Ju(e@NF`Djg>@&;T{y&jP^AsaYENi}q|A
z3}l}5V?z_VvpHf%CkpN@IK`czOuLPY=yBUf8Q3b9$X|kEiYROV$`T8T7ZjFPvKhbK
zDYxzz99JRNzsx0f1Y>IrIQq9o+W(TsB(ZtN@4*)DMGr3?4~Jt|37IBI|7oQknQI3X
zAWs`45xiCHga9;8+<O=u_fH>W{|!Yy>tic?%SNq=3EX@z2Mk!P0dKG0NCHNz0*F-a
z`7K?6d*D4ri*=>wyQyQt{_t=t95*gB1|tdTg45fR{KmKD|3ZuM$QlkX{-tUkq@3Qd
z-6X|jEyZa@tuxB}qrdlJdc0{8``%3M$xl8$9pUzkFa$Ww{Jocp9>;5~oNC8o`3GK&
zy7_X8YoQDCO1TU_a%#Q+rC?Rr`r)W8CdpEe=>uMYDx6^46V_1DthgX`6CnF*E+%bY
z=GYih(DizXEVFDuQ<JCx?PN>RPQY&dc2p;Pwo7L{I2r3;QV8IEPg1McP{PchEUDf}
zbtSAoBMPt?&Q@{fG_3a7gzHl58O7e(h_F6^rKgU=a&(^WpgH3U%`tpj3CMVRA-uol
z(hA)(VF{4@`k@PREUQJ_8w6CcMW4Pm06{fw^*>aMH%#ik6lD{{j~nT}Vw=wZ(;Ct&
zi1nt}RmOGrVHP++5;Z@eE*lkdw~?>AJL_Yg!~p*adS_s1`_o<Um5gSP?T~>T1B26S
zt&1-4twO45pMl<5B9T;SLH9Q?E>dBXcy@5k-{YQ5K!A`=YMYMlLOYc(+LdC<@@UIZ
zxq%vI<;6P)=W4nRb7nxQ9KGzXsOjWs_3V-2*V+r}?dAZA7{7f*>^PxEw|6+WS0wAs
zen2zj2cFKIr`~Ai<sHnmXQ=l#&EhF_$&1z$T*;zE9;?F~V#|Y69&3bZ#mvD7O-oFl
z+Iu>`YU|OR4%DQw8uM=|g2B{;1Ho`mx@??e)rX!p$MSlA70pKVcvZ@|fYLpEV~s7G
z>#?88yv{ekJpeJL<-?FY7wf10XpS{B4}jy{uc)7esm&J1)ZYt5LI_{)0BkN8Nc}ep
zg%SYD0Cub3?KXLY*-dYn<aCFGIZ3oQ_yW5YfHIm$s?p-IJ4C0SY9D*8*Y4b&XU9a<
zU1!(PbZz1rCOe*H*Kqi$)vnpn8-DHKLOAyVXV+lvn@0!7w{b)M^=#K~MRJnk1wNVb
zsMrFntB3^K(~V&j@ZY92He`yi4I@C-b6EoYo3fc~RKp8eWvHYImrxo#QHMB;oE<{M
z%39tlGnBG4CW?())O<2+tn|D*=R4{R$!)mU&Ddp2wd*$F;+$X;9BW26CaW`{bI+5g
z1n~WJL=pJ-Rv*Y83>trghE|}%?RY5i3yVcPFlheiJUMLIr=Xp=<jaCVZxQfts*~Ar
z7Zz5d(`Rwe73K}cMNg0Jgl34iPq(vF-oW5zT0F7<5SLJyWx+l|n}+Xv_Y!5kVw#kq
z=d`&b^&VIkUE(eS4h@^<OEGw+^0d*YhA*n*s)g7LafzU?r^18b&?JfR!)uuL;!l0h
z4+o_RVUjb7(QX<Xb94n*^Z=ehg-(PgN^F!gqGGFC&>U-^siywr8MF^JAEw<pKKeu~
z8)q?!JDMUq59ye58$^+fny3CrjH;~E`V>l2uQ$VIfuDFPisd}4W2ZxY$C`2`tBTA~
zG2P62@*~(9gYmO6#Ya<1TG#3rQd0BwVyNP@Ayt7B(h%z<@N>Iz;|2VkT8T3`anW@3
z03^F>TCLS9Y*sY)#=BX5!LYD9Z;z4QSOL2^Zw~0e;OutRfp)Xu83Yz~srLh8rR}fp
z=#yHH{&=!mHgDg!b;9K@Ux9<Ms)l6QTJ87$oxA$knnKiY5(eqb)@iCc?X6$@C_7+f
zmtQ&Ot^iFkZx+KP%K%)iR{{_Mx>9VmQ*K2Xn%gV6YWHHw(<_uA&($p}$2U2TIs7y+
zM7X5Yk#^wpDE4kQZmN3<X_YMKH6pw6hh0+aBHJXg{JzNS;Qq2Fy^B|@$OpyIviIpy
zf4#Rju6G3m9!AEWA|DqF3FYR|>&VC<TG{HJ4FUx!M2Q58+W<nUh{I*84tz?H%3DxQ
zs1>{!nno7wD2`bEeAwS;W6>$oUt#~E57Imre?b54{c$`tHdB6GMC`IZWLL(%j20Bh
zW@}9_@4EsYT$u1Q3ZPWkvYxUX{6AcsV{;{1w60^@wv!dJW7}rOw!LE8wrwXJr(>&Q
z+xFe(e7mP=RLy@dYSfEoS{pC8K<Uu1vz+scTso%QUQrRu;@TSRAVGOF0-?>XH4kGf
zd``z`=z(*mSdLiXj&Y{>&akI{IMzo@tD>a^<(r*Ssf6Nz;ZsaLra9mcD`MN8$2`!w
zj#+BZCrV}b_c=qEqt7{oF$>wI5*0B0kP{DNQ5_-V9dZ<9u;vm!(L2I_#p*nprX%tU
z!{;Gb7IuVBg7pdB2!{X!ZgHqp5+?drImJ(UE6~P2|C?+`E<DC-F0~Vdfh3v4NM%jF
za?=DNX3I;7iWJU)=~%<06lh>9th5QSv!}?=L}=tvcFMQuyE`=pek1zbRx<g`Q<pRK
zx&9}H$bFQtec60I6|uSVy`cHK!f_KOk9TstY`XN_be~*qS<C``!FB<@h2)VhI&)zx
zMx&wQXQngZPQqj2J;cIr>BAFdgqqB#0~EkA_CpTe0`e$i(eyMD!C!D0SjSaixQMIl
zQ>-Dj?K($9qMGwhRqIt28n$`*FH_6v*JjZRnI<rr9n;liv$!)vElvyi9=5ABdM}$*
zV;4_F>Mxz-qVe_KzSGY5Ph0$(^e$r-hLD4T4m@eV#69bG7_fQ>o`!yu97p=$)>fb;
z&!>)wS*Fj!ag#iKWRWiC735;`@XxXFT)nniSe~^1r0v?bQ6_Fokmx~(-O5D{7$d>R
z#Us$PxL8^}t1rpnJ@#E}+O?`@a4wB;n{#!lX6WlOwo}C3TgP%?N=BT*FrxR=JR(g$
zJn3EhTI~xj_mVxhFImqt22JE`CI;B~Pb~*cFE>{uL*2mnfeKb_aYO6sDC{Kh<R~k0
z*Uoct8q2)=I_<5>p%ba`v>+M4WqY2KK4@w{=P~Tzx42!1yHniJT#~*CHF5|TVC_n_
z&;r3b9d!f0;<hgU&xKMbnC#a^K(97JB*x7U9TyUu!Fk;5sWsZ}M`W<n!T{#QpJ^c%
zOgoCy{d0X>?+iQ8rT1N>MM-D(HQrU-WWU9=w|>nbeG#luD0;ayPj`4=&7Ik$Z{Z3~
z!oob~d$cMHx9;vjAfJ{<vRpDShy<?hDrBBOJ@YV5ZWXaOGtJSz<sGS2-mS=W4_G)T
zA1#J{1#aNe(0D1a?q}q2V*txd1Y6&-PU>XC6R<X1rZS3XQ!pRuP76hZ9}}94mDjuC
zxY-^T>@pzkLW4q1ak{?IimWUVBKithq`vKQD14&60gGKCCale{X}Ft0By269l*P6r
zuTm0E33lN!&zezRh=5l@mQP_RAR5sr^}&4j;(eFAj2@K*7>|(4IdGb4yB%g88|TKZ
z^M@nOtS|f?{!z}s#}S=w{R0`LbVP{k5xhlw?;F>N1tIByWsnp`Bg)hb4sZR>Y12=3
z!#Anh?EEZFm==f$1I@Zw1Y6-%6aE;!l&t#!4vB-%4AfB{X;!sT(jBKx*-5qZn|89Z
zK%Is6JLf#w>eauBET9VUE&>aD*^+~!ilaiM?p&mM&kqY3D1*5QUGBbUOI)=eY1dMv
zJ=ybPA_VaWPE1+MDhiYq4$DfAeVIv!IP-*#v<L<d)(}RtEbU2zUd&$$>53?V-c^a)
zG6p$+O#_1{V`nNcS`{^%iBn8Oi4fO$#Q7x-$tp2dRs-etYmui-mt@P{hh?ldJJP!?
z`!i88d>h`9rIRd6=^pZVuo5}3zUbAX>~uzA4C%servKlplCW0(Ta+B&Eey1CQ5DDV
zf2Mk*YRAVjE>){hi_9poOCsx=BU4gQV)kovP|^v!npW_>^LFUzY<xt1!zGkgHYX4~
zLjVTgLMx3Se}f9XM($nO{gYl$h{|<+$=N!|;XmQAcoFdaUYrF{C^p@tktk-*;hYQi
zNcE<Qdb#aO5@5b1ox#Hy>Hx;MKo!BEj7Xy9Xg-A6>kWs*$)aMAWh^<Z3nACxNbQ;&
zU7-_dy6Ksm-mlhLv(7Rrx%N8OT}CDWT=4TM)JoE`UAYK0FiV}l@|p=I1!tKv&LiZQ
zSVG|KrCA>_0Fnx;eR|2;L0ZjLl*+F1Moh4?D&8h6H6jJQ+OxgwJV51#)zSmqvRnQ5
zz~62JXPCCiwK9W;yo9-%7Xka%OtQeVDK5SGr51}$q@i)OE>BHgfOFiV%SZ5E(VC*q
zYujoHFnnF^qs^WhZG}uBRIs<YvwsNlAb+${F@Uz)*vHtaMQDdr2dZK4xo;O4dzM1=
z?o9Pz%3<ix1-LO@?ZD&A`>4{4xGP&Tbtr=RJ?=4<NBYXYETOoB%>?;IaVA9Yzp!}H
z9QDT#<IFZqPi<yDRi>L{7Y?)r=m^uc<Z};P%sitHIIo$9HxO}=EH*qLk6eT}xFJ^5
zTBydPDR7&9>WOjUuJh*FSmqL?!<1x{iOcP?l7BCorp91#(gUNGIQf@1)d1lXx(RAI
zhm*TFNYgXZn_A}FPfh;WMHE%oCs8d+1emobQCt@YTjxcWoK81LeXY~+9)^+UOmeCk
z)#LMg9G1`jWr;WZrrR$Gwve9&X+lKpB~*OkxAEnRpO&^BwsOm&TDeQBlvTv^nuju5
zyB8jH2{_Xtz=1n}8hD4nhhZvyxynbGz%2iKM-8|$N`wX8O-Toi=&@x087+joKHd4@
zsx+@?mPB(R?mMWCIeejm^dhs63ARzdm}jsA(O)QqT|m}QRWm-(Hzh#M1)wVV%1iJL
zg(a=;b~-ZkGDk#mk1~G*z!7zGrRGL-8}=VILi|%;0knSAjJX1jZXYa@^cU6K|NAIP
zkrpm_?r8?!`$D^>c>@hwX{b1l4f&cY;wwU&Q2vPM9oGB`Uj2&haf>bY84LFfn>4P}
zUwt~VVTwui2<Q<-BhPj!kx~g+!mBJh`+;dWVRn18{rLuu59TJYW@eU#A|25*w}iL-
zFL~9DDvDSxgI8wVAcQB(Ss}vMFm)hLb3<CSiL-8n!T2>oj$uGt#`OH>|MYjm8`R#n
z{<Dz-XhA?oL6Qqk$$`^4u)hCeA@@x=J5X_v;*u~&Fw@CC!;l$*DWjpmm=4H+L8<jn
zaE<qyQq61{In~13t5+|t)YdI8tdv@sfk})o7PZ#yFUaeDJol|WYwvu&8`!-Io@}ot
zu`Im2f3$v1b)NX1@Sbd>C%^u?$@fW&NV}iCuMF`&DU3gT0TNA(vM@&mV$M7yWD^p3
zN996Z8he29k4NFCg+9PbnZ$<&>5-W0fbtK7!ePTkfP37tvtUFQiW$|1%XoEZO`#0Q
z2^XjxY40!DruxCn-p%m|j1RfInIaROco}Cf&3zhkkBHj&Rt=WZ_VkNJdliOb-H{>p
z4n>c+XW~q#1M6<*boFS%=vdUE3ndU*iM+EFUvAM1=)%}A49e~^iF9Tr^(nqF(J^n~
z49*I<-WXCZ`1EG0hYOd%nsoM{LT8_q$a&QSBz;#S3YCwj?)0mjn_saa@O3c^sMqwF
z!ZcWHQHCT~S|SVe5eVTt=z64&T=<uU03rd5so+F-z+?MVAGPh8dn{0XMaz~|(XSr$
zBRisZ%KZ9!NVwlLLL2IRQfB&v=@{F4dji**>nI)wG<+4e2@}Gp9#uWEM+p-{L1PUC
zM9N-bN73qWRRpT*YCLuK_D+uRgFcwsV<oL&LlP~tC1b`CF;?F?CPMMyQ>}^odrD$A
zI~cJDK#5qb8UPL(A_=P(=)Z0U`Aq`WLGuPhE^-isi?g-0`OZ?4kK^MyAsY+mxqt5G
z-B14#h=^(sGv*CF8}cd}Xwl*_z1KEt!uP`_(wPBT8=FmK<+VOOk}fZ4Gj*{W-MSmu
zygps+?d@%?tx#Fn|0(KF86C^QEgcz^1&!sUz|u||p8_`<HX*ZNwU)|i7ky0^l7?O@
z{#QpBdbUo{!~x-fTWPz*Q^PAmwHsvIR-dBxzY(alcFEa>(gR(h#GELI8FrjSjfNCc
zYJ9BHx955<zBzf0E>5<@$3ttNMYtIMa?NQe?V&_luijx2?!gBJ8tg}l4R@z5x73q4
zfZVtX0lZOzVV%@yTg!w5oMcYuMfGrD!RFwqChHhY`G22|vNLn!6a7VRi4gD!@Ae2K
zT6A|%SwkYp{k$!ki4db&5nZ!Hg{8dj)h57Z<$r$9=s?;uzmx54DcKt)m0_ow(XjO@
z{}vbrW9)Fk2;8-9>tkzX!IEOW<s-*k1*RYO5mtqxllVeNq&YvwQedj(Uwq5ydR(tr
zJ!U>7lMb$gf~wwZgu2{whBB$YvW7BQSPQZQDy~)5Wh@8*<tTDsMqo8i+x#A9|MtUL
zOE-8O<*O>P!VrB-YNi~zFb27ia7U<dH3t2Sxu8Lpvi>toAd`4C|JS~iU%&Qw1UMjN
zC(CRqwMFj@{DT5Q%Z!g{R<sk5Indzeq5P~3;qtI8U?OI_@930dZnMT-WW*l=ewTr&
z&t|!n3g^^IF2GDuCA8fpfr2y^-i<I|8i>pCq?C<H#2(IS&-$KBvK_FL$v`Ea*g+D=
z0IMHRzn*E^UdSDWdSVDiz#5U41l&dvdw0hz%iU9*0-q&i^S6@epXuO1<0|wLB_4G*
zV9t@TTC+p6u%~13>pzVQqdKjxHQ1xa=u_EKr1ec5)TH;7hvWIn?hs@&K~48_$RK3+
zdu{2({Eh&7HD%B{)|+9CYaV^V1<$`JDFoj0UB!kwzCp*vlO(9kJe-Iv4aj7J^fJER
zTEQS`H@RGhfs9w?M)S`;LliZ`Qvu3g2?r)nr?wT^cRJy(wBCr0MDqtRFHm$E%-!6g
zMLRw$2+YPDN~0`{Vm}H&to@Nr&fF{~L0>m}Ghn>Vj81s`EIQnE@l@Jse`#}N0!!DL
zkzs?x4I;fLH-LS+=E9Vl88}Td=@l&5&xyb1KaYf^1>c=cC+$#bcr7(`-gQsjD7Tws
zxszZy^8Sv(2%nbY|4UVV<}>Y_l1lTjr<eN(R&0M>Ky;Y5${ej*V%OT0+D~Ec3-9;X
zs?8%af6+X@s}jQO+NREG?W&1rhl(x1!Yfpt@?JLkH~UV_9l*DG6qvuakx_O+bAq=s
z({A;t{jPMtJAA3|O@KE~J3M!)@g5`5KHrMBrNC_Vh4B|&pimlm=+i4!K-R<3m20bD
zzS$K<fWtJ4oP(U~1<u9V7kejmlcJ!J9p^nS>i+QfH%hnUo)1S~{GWomug`!{WD(v+
zuvqIy(f7nr<hvoMAK*B_5)E7Be12wS0vsEg>v3AgZ=8rf6?es-84@=OK6qbY0wJ-G
zL(2<H9N%cfbFY)1n6ZE8!p7cUWAhKo*}w6K)n2V)^Y`j)J{fkh*fXWVb1Mr>?kPhb
zZ{|(D3#69jUn8s@S7FY>F%&HMCc-%c24`6k2Tkw<XB}g(LxAolK#?kmLxq^EQBP(H
zlP(HrT%jK!cGk<)S8)NluymBrZ&1QtXY~)+E4kmSjSq;2^LtvIyI0wNMKf9I?%G36
z{B#kR;4ul%n>B}T>7a66k$Rk>2x3dp&D-EP;6vCr%iE>GKFx;(izH3Le$SQsp0A%5
zm-Se9<@jb?{00JSx_;^KuDtmei!?oLZDoJ59(**b_6Y`2ZP$kvK4#2^Lk;B5oCirY
zRlPg?{iEPr_J_ES2=O`sJ_qloEFsXBDQ+Z4sZubH45vc)72Y|~@)oVTzXL$U?w#*n
zclYx8f%j*|f#eOo&_;}Am3`vA@XpB}-9L>H4kiQkO%r&~{%W@YWSeD_%B5+F67d*j
z?Utu*W~cd#8x`Co76I~a0hZ}GzEOX;;hDT#z2m$G4zcHYIefxJIe3HizO!1pDziPE
z*|lfM&rHZW`dhSY#7rpieqo!w>m&7!e)<F*&tbU3kACh&oW+kwN|2E(-ay+D-`4?$
zj@?hUY=CBoc)ZbCXQk};9piPJgQdWtyKb^Nv$u+MJ8bl6gLQG^tX2XA(G;ng(JFnS
zsiyue25M?R%raxl+a%WL`4R94S2cF$AfJr)NXom`Mz!~JT=i&}@^nSX39cCqv_!F9
z*9hzao083$e<5kl#^MjfN{BsD)#Mh88C8oT6wupT!E(|$_qx#1H2#SoH?ukS?=$~f
zS6Bc{uw0o%y4lKhjYR_;@iHj*mxweLme7-SRT8%~b7{c>!(++5So5!vv0pL0Wxlkw
z;_!rN(U<NN%T}EO7ZTtCby<}Ss-VpqUSkobS(<6`0>5yR9=>CNO_J%S#)QEl@X^i<
z$-v~-byW{BRXav4GT1VHt3jrFK9-@DZunt&iHnR->YIe?0!h%8oHlN&$VawG{+?<<
zoY3lysffn`42Anr(od87p_%kBvtEl~1Jq51oU>0Cs?E%&n0t{t#)ExsgW$H{YuO*?
z(`4X_deFhMU*%36&*Y&?o78sAOZl$&98gl@b9zEa>Ul`Eht&~4&@b1AzPD7{!Ati$
zwXVr7)>u0Sv&p#{<w^OJuXE-Z2v0}GfMX-?!3^`DhfE@+{3h8!XD_X>4{|Qcx56H>
zF?_X1-NV9Zi{jD!EQY!op(nLS=XU(DmJtXhf;wDL&4dvd`O>zAaBzN(?%law3sn1p
z_#_Z!M+Gw0@Qk>REY&5+l&ECBG20Y4{6#618u0a_FxP38r-^@-!(PFvJl*UdjdBDn
z11S4BYW3AgDE#Gc`TX_x<1XiTCE<BmxCTKiU1eWAQd5ICIF~t*)bBm{&>R)+z?$_X
z7n&6Ev$hKOggBsrg&CpBUpqPE1~%I*WKQW)@&B^`ZW5)SBHYAX27S#;6vo)8c5BcH
z!iREPvmG%-xk%IahqAZVSke7KH%Rm!>V_tpH`>bSS4Y|tT-m!g!=Ni9VbK>Rx}WE8
z1ss1w(!|#dy?b|&w)Q0+&&lInD4O`WjJ{*tN3GHw8{8SD?rdB!ZRgxa1F<=81)1({
z2JvQ<rlLW*!>>m?i8VI<$}9MmtE)MyKN(H%%Ec)=3jmP)K#QS&7qL0o;%>!jhlVO3
z&jsJtdo5DnGgt&A^6{Y8a8ne9+lmC2B)oq7mWC?KoKbd`r)Uj|vMQx$o%)qPrk?b_
zW1Nh}Mw*Y_&L<adhzt~44<sD8E@N?iiA!40NF;fJIbv(oBqWXBb>N|blw(R<QP%bg
zfy+cw3mIoG)4c8D6Uu4@d4$2_wVVvR)1*V*S13R1RJ+$wq^m6oZOP(P0e72QPXY>7
zFqMcuihIjBcSQDyLEoxd@%w52JEp%6<HNtG?r(a&9^5`yvjLKwNFJ)6!iMG%lsh}q
zJ*Kp(NEP$(5E6|QULuCK2LAX*^G|~IQPn!lsUYY>+H?S#HPt_I1T@F@jW@935OmoG
zE^SH~5V5=!n&E+yvOEFgM<8j%Fift}(j53d3V%<U*1dI_o?@m~Yy#-_9gZ-I4{Iy<
z#1`qRkmqCI@_`R1(>1r9NT`}I%2p0$%QVx!#G2{NyO0x+|GF&XFcta601En$nx7I1
zQqAX}hG!*o<m}YsuUa5D(Nt>ND@sdrvXZQ=WU5MOE7QtKbgX45%?B?waqj`sNjDd-
zUTH|{!iKvo{j~L-X=^?Us9D+2O!SG>$w%in^7zGGy+BMpnFr)#L4Zc0>7HJeEGS(u
z(RiPD!>0L<(^-m_3%r!)MMdobk+T+6rOX^H>@PRjP^E3Fvx;U$0pz%a=(m-W6LZ}U
zX2QnW7lPQm!-pgsRh$Rxq+tS|LfE_T9hZ*a3%%5EE8!rlmCi9s<r^HpHRN8CGTqH>
zC%T&Q39zQ(krY&I&{y3pYWA%5nHIL{j;9dmcaU{*@}l1i1fbF-HD&(6I+spEHr?l5
z6XUR+=CRY)I%wupKQI4<MBgzZjq-HLr@}EN?ZsO&W?`bZ6q4=X<$@kg2L7nM;lCA|
z%aH>-`6@A*Z2p<?v5E`9rH2!?cc(Ngg_Nw=2FfoBEVHl)3Rfe=?1a~zZ7;)G-*(0&
zp1V+<UY?t@)cz7aAt<>1C5}Q+EOD4Yb@LB`10Ghl=YqM}RO`lWgijdXcY?-_PlpTe
z5*pPp$8~kOI0r-}EJwDCeZBX!`~Vja_Xl`%VEZe$l0N#Q`pQFV5Kk9_nkJD}iNtEl
z0C^Kr-ATPgZ(oeg!%ExcVXg|I_d=BoM=ZHAT`5PDZJr04Ur3RdN~zCSJui+P?cOm?
zZ_4uvSbO6q9^3ohA?X&NT{--uRs)j1^n_QP0Q$3&rxFIzTz7O`nX?jRXhg1DeB#5)
z(GfV1DF?0?JQ|Qk@MriD8NQBaWe&#2Kv2Q%Q{4hBkh-u_vne>zF%J~@`u;J25*=?$
zdhu8F1#*^Vel)g8@`n!4w}b9O5M<kYHz$6-_&#Jr%sUnD-0c8h6f=(k<N=9#g;J!5
z9UP(NseI_R%BfxGc4DSW#9E{ju_TRL=m^?H%YqYg{o$}EDN%TgcDAWQqlk?J5aWG-
z8%@oL5#obbi8)5}Z+vkgYJAnJUwy6vV|bo8QZ-R=o550_`{-O?zQU*N;B4pX8D44s
zKpV^X*^_-8K`B7etl(q5#?|5|uN$N@TOl-i(;>Z9mGr6l(IoOWq9%{A1u0kLk75}<
z&VTouJCQe<1WILdAsGA2MManwFz@+UBd8q0t~Z?>7i9wlMSc4rIngyRBL7^uYc7hA
zBHUFVhg$Uoyx@ss=>vt^E5y7o;$7KRvv{t|CpAnB&qk`W5$c_mfC9N(b79uh8{1b@
z`%f{Lmb-*Z{$${zz}Myib@*kI7yMEizc6;Irq>h1)$KEnLBTf!E}{B15VVoV)p+aT
z76}rh#zlkeIT-ez_6b@mR`!5_WT}T{kciOQ8yX_<@OT6_Pm<rl$)Vnwn}StcwD@;O
z@4expd<CM>xrmJyWnWqxT>-Aho3b*pIl1(z(06k|pbILiK8h1e<%dkjsXB~8Vf{m4
z;ClZn{kzSkl4$w-j^Qx`(3BIce`g>_bgmJy8*cgJ=8Ty6LZs*o(tJ?TUi$1Et5WlE
zPm1hE>IZ@-G>o3sf#8sEAr@8W4+aYgQTPkDDhUV$hNQpvpEmwC*qRWQY}4A92_0DZ
zmPs>)&dZ8l5)X-zicS159QB<YjKb!vN5as14tK${#7$Z4>4{Zwz=3=NVHv+vF*NB9
z1yz|ms<R!0O|!?@rnj7MiYMU-4<$FjBB<(%!DEMnc7}Y~MxQKRit6s<nzr$yJX_)C
zGKj=Uzj3o%)jB5WT773fE9<Lg1C1IP$$`-rq5A%O+|$r*NbfBH%>vE4PVio9vx4?D
z{ZQdbB!aR@<gzRfAbplWxT}MqKf$vny7D8I%-Du2D4JZCcGu9#Uv{Z)riH<Wgv}py
z>k>T3)149tjYac!k9CIDV$2WZDZLI0o-b<iYva`K=<f|qTR<NfS*e&+*d|&BbMds(
zyaVMP-#anSHxnHODJ0L{;A^<7>>X4G9HSuePIX}6fDMrw_{k4w^WTJKctikHje-7u
zn7gF^^f9vkrII_IBPZA9zyVn%O~I^a3h^!RY1?E;v_(46kl<lQEMeF|MGC~Jx`)h@
z)-&DQ(}egd+N^aQE>c%M2I=TV%+aGbx1n_|{GwNit$QzspH)ZRKc+9Ky0a-Mj~~W;
z9=1QW{@mQWZ0CL4h$4e)g#u@U;Tecj_<Ay+v%}eu<6<;SDF_l#2Z0SC#jK{Lo=!1;
z>=E}U`TnGM7>o{0dU4MT*|8>hhQ`?UB!zFB>>~9<{V@O>aC9U~Une<n8Q>3IWIR5R
z_5_;sDvxI0ns0l_QeF?}X5QNM`1(*9drDI7dr~8llWtCKyo`HdZv%?+Yo+%2`Fb=5
zKSVr%FvKu>!KA)Y5<ql;DQIFND{2Z~wNaf-rsQzq<Xb0LYD!;`g7*k(29BBx>&sPD
zuJbS|=5`k){vruC`iTofuv9tp)kTGFd-$o@dfQ&XgVVImF;1#Xx#`I3vul#F$qWYb
z%<w0%QH@LmL+x@i>LOU(SbQDVH4RnT>9}Wa7hO`?yKvd%M<7B)^-9gvI0d9NpIMkS
zRT00KAyowFDZ=SlDLo`s`r?978R0T>hJCU9`HXoWFBuyu7Ifhz-OU9hFUQuonGfWr
zokmWPK)otgYn@!v?`Dtcubl8K1%*k2<rS~ojmPG6Fqv?xBu`QKat<8>j$mrp>~SkW
z=^_So$+T1|P2fC#QyVCNlVUHq?y@pBngYPoosbeTuE5F>N&Y)$kL=WDpkyH~cO!1J
zMU8RHS*10ceS^H7l>?Ax-ySAEq;fFak>8M}foyYCs-;Rmzg$T;k1$Bi^ZQD=+=cv~
zbPGjC8@KD2%G>R7`kXxj(wO;v?YYy^+8h$cQIphb3NS<!jfljCT3%6>8{p_AkYO+3
z@r-QEvcg|3shClf+$g=3b_M|nrQ|lu+E$yX&=MQ;_k3cF{6!0wx6Dg;;-oBc9EN>k
zD#NH0R)&||qCZOZwIv9erOFWBUabK&8^iW^&#Oat0LxZ=F3cTrBau=&v<f4}D7}AB
zCBlCC6eywBj2Uwf6BO>4cK^>5k@gj#zWtyXj%YL_X!h>bYx@JNuVPpBwJE56w;HXl
zZ1;k@d>8+<EJPB+7e1cum6M9XS8~APjz3UHRi>2?a%T+rZv`KSlm|ckXJH62?JJAR
z7ldHyEgPiZ7!yX$7!&3vTs-Y7hkx;Id(DrB6cEMyABU(*M((X7YWt-L#i`S$!5}fl
zC#oXNEBbfMF4HSLYC0$tY1Q-u&Ykz7^Eumbt#?%(T*Y>yC7L`~p}oAkt~tH*7e4Q&
z$EWB(at2C8c9em~sOw`1CvA#}IOF9Z2~%FBmb4G8IYeC!Dm&P!zH#Jna-NO;Qd{(7
zATVoYNg}*h`Jn02H$^WRu1L+psWjwYMr~!BZZ{afjMr|Rh^JQYjck*m8ZE0?)~vqw
zSAykMDOKwNT}~IGR-3e435!bEmBPlvKn{**+>sru9y;ynv+RdQX`cNo_%uiQyM~gY
zkNXTcZ~J38fc(I+Tg@T>ta#K|CyTKv73iu?Y3>J!+07C?lcTyZWvw|?(w33jJN{5-
zynWxvFsqw231<32Aj^xVe<U#72G10sf0!xyZDrlme}19;P^N9e7&iRL`U^&y)&Mu;
z1o9|B1Quzuvrvf@J5^cG?YFeA=2fFxS1kDma)?=}LvfF8bv{SIk;|qPB^skvG_XIn
z+t3`$<F#mz20bh_gVhc(yUppj%<T}oX^+g$p3boF_3&hw5|thbiJDZbRq?5BqbS`>
zS{qBm^{P2re~|C%4rPHF|F>PqE#D4Gqy(PQqW(YSb36aV+<T}R6L35Wlm74ft8P7y
z$9L&HpNd^+E<%Hg^|Wlpfi#if-$0qkNqS2oNc`^`ix&DQf`7tIOAwe^M{3Dgb{KDQ
zw{<y;b{XwTiho>ngr7;Z^rsa`1CFOVGl|5m<s8U7$}AFj7rP_<$=^?bym^Y7gpaMn
zm<g7BZANc2Vnb2NYV7QBgR3ad@q;@kNHJt{C`fT+Ys^q*phY$P@RkT@f<UQ7c&nOH
z{-gi}SI}#0n<8jPLD<un$Ja0vLw-yS3)FKPPZUh;DIWMv2ZYpZnen13b4En%Dg0s&
zrmOd+4qJ$ebPHv+AoG7HJ!gbd#A8Ri8ZjmVFe2>BdB0*q*?%XBXPjPm^A~cwh}`D~
z?6gO&d^<6m>+l5?;>v6BSph|=1uthK(GEITC3RddQQ6I%I8e=$ZwLj#N5a1>8ivCg
zc9PxY9k%zK80_2>^XcdCV4!Dqbplas_v<ep_?bj&2hb={RnU-<vhz52#P@c&)1LA?
z&B>^F62wKZCbfyb7Wbkyg+t5R?jVp_p=87)rAsVG;p?@}0DhfjF2KY=ur_sDRN5Z@
zBoczZ8+*l`4CNsWF7`5M9V-hSSKJz^0xO62%BvUldB37t{XX4Ba8~4nB7(_iRUV7C
zZ;UVO848`?$wGFpL>#F1+QXS!<CQiPEoJ6rnB8}|_b%K;)}%K>7Eecu#h!577tuSg
z6^-(>A_N+VK1MVMP=Fhb(cBTDWU#U9m4gz0I*3`Ekeu#d_-kiPg!qv3`67kym=Gc@
z4AmeEJ6{D5GT9l)0Nt?D)UZ!J6$_sfK%VCX&4dy{lH3oNgOFQ2La|}=(_+;?BPZhJ
zb<ll&#_NG;wOj!{%5z6}q@<Jwtt%O%UGd>klwJ?_h@!#;1t8lY{2DbWMd63lRBe~A
zUI018<L`bjSQgm3@_A00!n2)@H$g2)wYi9C#ULb2he8y}9yGBffV2|7MdP>Hx{L;2
zP!4pmu_b}ynHxga0}8?m18nj=$kLnve9s^Ie^-H@{|7@7h%5N$^Is(t_dm!303><-
zFJ^N8IbO0tDI&&}NbSz6da0ByoGx4z$_S2h1eJKQLn#puSq70^es*d-_l4(XJ#*_n
zK*J}P(truL6NXuaq7uz`1IeN|p&1V&u2eyhN#=m1r|%dhlWusBQB&9Kj?1K#Hhvs^
z-dw2ubqArME!@rtqD~^LMn}(jgSFkP6{lq?QJpdKZ;mfckF6(uBjSn{+8(#`kG@;n
zm3xcjQ0qycjaDG+MetaBT!=+z$|gzdx#dMIAswr_Th_kYiKDKk!&_UmUaRf(O6SR6
zzMcwVclitdu{K&Gt?B%0$DH%Ka)m`JL6Z#Jpcu<41@jFbBz1!FpuJbOJ)Z8kHKT}Q
z_!}IRR?c>0&Nt<?lmT_>&Qj;h!jwPEdQD`+lYT-#aWIWB5Cq~_MoaCWl~Jf%0pW3b
z-Ku(nGC90fjj`rXh7Cc(Xf)$}yt?d+VM=r=6)FS@`OQ&6LV5%jY**8LDEo=q2-2;W
zXLFz5Yj$C0KPF35%Za62bizyq5V&Un=D1ejqYy`jNUkEZx`7gG{jZU)SoHqE-`bUo
zsxgy5URx|pOM9qlM|Bp2^+Otw#8?sx1ynFD)OACtwIT+Y1B}#snwfkd`ZNWUuZ1Dg
z3J5J&JYAt6fN_#GTqdGv#wb8&nj)t%)0R_2(EHvf6Pta)r*dD@@=u{net~%WnTTt@
zjak199mId#cZ9@4m$bZo{wloNngnd}jm87j!n|hi9Gq)eq)1}J<Cu&o1i^;+eFAgI
zh+=GX!OJVp-=Bnu55u&Sc^7ui1sS>2NY6a=#-LWMACKc?Fn0eJgkvFVwzHPJS<V2|
z{vUgIS&+K9XZ&^z3^Z(78P=5YauTAD6aqFZAfz;~tA~PV{4aykF(Spnzo?bo*4kFU
z%2u0eV{HY6VU=ZThpvrB?V65_?!}6_oqFF-r-M1GG!fXhfYi0$4Wq?ZzRPU4*JrTL
z4RsOEXI;Mgy_OYRDK7Q2rxn#<F)UDuP1%6@tuln#hHpgtGaCBy@T8K}BZ*yDFn_9C
z%B3p5+$k}??&NG?YOZ5V(WFysCEZ%@_`q3kYZ?=8_Hj|H?s1WyPgcTwa*@C*tNM;l
z5YnqD|KtHoaQRlmOP^xe*h*yRltlB*Gjg<i{82^FFDZR|cg$B0@Z~JHdJBXjUY(ed
zN&I%z?wC+K=$sj=E)^6#@D>Cda^P{jTCuDdIo7gYl<=sY)}+_Q3T%^*<8y46+?f*t
zH^<~z8%7i-y{g&sZx`Wx(?%_9eB=1?F3Q=~ZWpcXS2{)%Z9?Cz?VlQHnd}xq*zI2y
zC9dbVFHaskv)NGv?a~q}@_}vlro>|<@v`XmF4Xxq2O;^%wnr{e?a?y4zMGVO?J%x^
zqr6{Bq#9Sdib%!nZ>kG=6?f%d7)P_OZ)Dq)iWU>+(HwnZ2ea?AwD@Sgm6u&|?0uVx
zHxW#~O1#4B=U!!E>x~yKjHM?d#H@c!rP-Zxm{VDkNw8W`WrERLYXUVKYIYoFqPj*A
zFD}v?HkI1j_Hx{o@ika5m+~!ax#-9xYI>XIWkO7@)a8b3_C=V??O4fZ7soW&yvXmK
z-Ps1%D+Tf_>unWrYEhe=B?nJ0+0j#<tkHP=YVQaer8X_ivd&u??8UteI$ZHIBss)l
zI3+{wX%+BSj_L-=B7x?bvJ|NZ4qTdH<mPU&(V22}EXH9;wF{9VSIS%gIUds7SZ!&n
zx%!`^-hLfaV_4m$=*itw+t#eHHOOOAVQMYwa<<IOv_ui@IEnHSWDGZF!tKkbVJB3)
z&TW2(XI}u=#fB-&y^@iZHRa%GcjWN4&<$1CA-FLUb;`EIA>f@%V`N7WrAJ=nVTZJE
zu||VpNVe*I9}B7xo>6jqrpD3elbe=GMt4c$PzD=N*o1C^{TEqP{ol-`R~MW*V!kQ%
zn+%OSPE%}dn?Wye?nKP0-xm5TJ80J_9&2daEWBpADhIPefDBt{al>tbKt)<2snTIu
zZ=8K+!iMD>YoHCf*0G)b%;7n6H#1R~!v@As4^5D1lst)5TM3#`b+<F(9IRy>OnbI8
ze2bnPSnwdjYL}M91Q_*VgiH&E$IwTZ8S_za4*+yAgj5BfnG{is4=6U<z$;eWlRL0s
z{|=JyVgDvu?6@)~+g!=D8F;$mPH-C~sST&Qib!Wy0G1yeQ$;WfU?b2^naYxFT79f-
z;VB4hD0BKvNzz>mO(6JZKUR5SgyC~B8+P%s38NFVIE@Q6rfXPzmilun?o|)VM7f+`
zBdcF#M3FbOR$Q@j4_G#;NQenj3gRkK>d0ZD3{BN3G>@?AF2^t#o1j%e<=&-KcS+6#
zm6Eq30rjfpO$--s?Bj7Y=s=H~<AiM@I6zWLtd`wDebR6ob2B5tlBFX-hIb9EmDm*<
zxJh~KgC}hD9q?-1S><(V?^04ns*QVD^CIxlO0hb~rThyP*JH%;Os3o-J4%j@DjkQ*
zLeNu35%fvejsqOEvSa^M)%+~Sb>V1HspK+y1Fw_zI1{Y*=POV}KhLx<6ibQ~4s47T
z9GzXb!%Psmx}s#;glavT22gg7+Otqq7wiTH1hgtBRnI*GQ#>D9U4?Q(U=8Ef&r_)N
z0=gyY`$sC*AdM`2lT31sy!%Z?Ys5TOU?=+5bRrov=-JL8B#s+Yvyd!I7ej~T!?yqB
z0G*_hL^v2o@bg96In$!D)){V8(7HmoIrS38vkt=Hk`(G)a-;#YyjiDcdB0a)e+l(c
zZm;JipJkXo>r!!n|Drb)#WeSzW$q%|2m4c~$7Z)uqb+w8Cuw%9_w^&^?xo*ck_nj3
z@uxkG#F&A0mw=OGT>nKcYT1XP<Gdf@47_MSsD&IWbDOeFEo@b?RL_B_1$<>=j~}ze
zn><9CpZC;te(7Psr&pm%h}d%@$tGv<UxX}=*aM4ykuEf58E~nlojqdk*Dn4(Q_m$T
zfOdNa?=4v*^%g6iT`2vfFPDD0B>Umk74-*flv?d+qOAVh6;i))(ag1T^!K6{7w~ue
z!|EGUtV7CwfxW&=hxs>+K1hz!@B+U!ly3QxjW>KHQcY2c$WirWOqv|mZz>>sCYc8(
zb%Zcz*FDj9+sw}1&G{$)chro>?Mq@q&LmDOu;2mtO(FN?UjNt5^ovxp;t5fo@QHzU
z;@Re6YR|x?3ORQ%4G;Mm9#`^!7H|`;Xumbak->7ftC1n_fQOOC(Y%4vPXoHvvjLG>
zc<yqrk?0I*W~S~UFOshGcSq~=iILXHm#@%?Pp9Gu@twY$1)+Kb`wfNGaPWLQRp89a
z-4`D5(i^CMg4I(a2i7VsENRv<|7in!3UCVf%oTsD?qTQ?Jr{YPWV2Cv0$Ao4J+VLF
znZ3ATm<@W;mZyh7AH@N>8D~=@;n6U(W)GDu&xX|!V_A-YIzVVtZDOu0=ci9mBwRhz
zFqbia8@GeR7L*&w&8f2`d^!*4v5n9uA^pY1j~onD8Uz=Xti(&Y5<IDECOao3)Z$76
z(S_0d_-v?4MilB-BSuG?2W*J$%q-GkZWlr->Vt=jP7-gF6G4=5qf>o$TuBF<{bDQW
z0b?DoR%bxUoO?s<1AS5!>{}@}*5I}_zrca*l2lfIwAeWp8$3<JsCh7XESiabK>sC3
ztEe~-=&EHrxI++EdY}cv7fZKqiMa;iYSBl>2Oym1mZ4f5e0y;F2GSZMs^!hUS$x*a
z2x9lgyVN0Mf+2;s^Orv`y{3ztYA$?w2dJ!1D4*;^h;JGzMmFu3ry<sWxcMuj$$#CF
zDIJ`+eG~pEcrY5zJqSO}Xn~cn*{_tUjv`1Ij~I~4CAhp~N(r{R6QiMdI}wis);|yr
zv*_^gu!Th_AEdi}1Iho?+~vFahyK(&{C=&^*fv^C|Mh1AxcJ85Pe@s7f?K+%`x!Rl
z5JkST|Hp!Xuf%=fjX0_Mr}E*?t6A<3;5v_Q4c7)5BN*Lz(djznbx&|Vt=-K#{k!^s
z_fx;%?lc@^G3KBqT*=>}jIu)6VTR`}{ypX<b+XC8EbEb!7`V{sIS!zAp|Lxa8unPr
zPb7!Z;HY>CA07t@KT>O#Gs%@vd7>me@^RA7eN=#Q>CzXb-L%&MZzWdOV}12D8!Qm#
z!NxL)Cak9k8f)TR<e_%XeN4PIhl7f&?W=A&fBL=j+Q{f5?=mjQxCW(j)sgB_N6{<s
zE?fWaE?a&N3|P+4AAu}X-2^oV+X1DAvu*~CK>!7r3e|{Z$-S|MS9FN8DrR3$qkh}!
z<`ucgSNcmAQP!FnVJ+dIMQmR>##46@b&ruT(WY`9yt%YXg3x?K^J#|)6Kj>n_;2)0
zm3y_Qk*;Ud)nT%?iqrJm(>i>`eX-3+%cjK$o3rJfDbTKEad5T1T|O7#9NrqHu~rmt
zN#oz<o)2jKu!=J#{PD=+#q9%GaT`b$Wk`E!R$XI?9|MF0%y&XTY8RVPFx>S^(SDrA
zsv(RB8@C1~R?f8Zekms{TPVD5IM3Z5td7{^#dnE0>oo=gjzot0pc|W2-CS6Sq_xY2
zKMDYyz&m62bzH&UjDIx#Y3dY%4v<=hB-68UFkV`<fGL*~eSD)bNC;=(kz>UdO2n=$
z#L&BUcq-2)V8}*ybjF?kF<WrQF@k@BMgqso=E?N+RS3fK#OED&OA>jFJ<FHbNgJ<F
zENU~*j|A|LQXqF~C1Z3_xxi<tcJHaFMjCnk0-~C2LleP2Tc&RMnZZ##aro#3W_32f
z6FhZ^)EVwyf!j>jt1T<@KGe!$-^(q=N1LgKCHaX=4v=|7;o~<0rzSEhRMu+*`oOKW
z5<b)S61zte!<ilusc-=n!t&vXmSQ0pQY&<Lo2cp(80G_f2?_<=t5)Dl%M$K5;~aM(
zKy7@M;#(vw#OO?Yjd!<(>?SX<;N?sF@l6-Kc}=7kTvS>_d~#<qE;_50%uJE_?W0)x
zW`}>^UkwD#!5W!16`<H|l0$zipl7I(70PneM8t^T=E~35hFwv&?=7)0|BgWB!5?CY
zKBdneRs9L76BC58sV}OY_eXNb2ZiK%2U?Z(ru_aV`CS%dRD3pXu<$Z}yU^rUlA3ly
z?qD?{fY+$$^vd@y@=%-?pO@Z>VLA}O#fomaSk+2EKlne)J(XWzpHxYn7?p-1nR=c#
zTBjb)7n*)FYNEN|o3!YkmYQ&hI$^e|!bc*!!0>rekNz!DNYZ#$6A^<LWMt0|OQ5Z)
zRX_f1O1k=^iV<?GPr&F7kJOC#oD&O;rtk_Sd!$0Ks%2)9OX@U${zT=SRUbOi^h@)!
zx?n$C<9BeX-kPpV_ZgHWC#?6j6qnI5EqkW@XmYy!fIXM{b`<|>S^LvoH_P$Rlp7@a
zv#OyyvAiwaMX5Am9pv?V@u_5A0<e58*Mm*I4#v~l@*d2i@S}{}Ar+dhPK1WXY&J2S
z-rMq=XhGD#3&s;U?PX4y)Poo@+xzS=VXU=Z_Y|??=1;77Y#BMIN1?}c=*L+~0@j@O
zsoD#GonaT3qdL6I4$0HB!t#OAVB6);%82Vr0fq-{R2vF3UAgsKf5JAq0*G?uUeO9p
z-vycrzq_C7isqMOK386m!#Lch&wM<x)*5X+Ums+Gzx!|6(T0s+1Gd8r+z}hpTGQ|n
z?<v0mkqS_7_K5gS6@v~k?J!T2(S$y`6IRIa4-CZ*x_Q6rqN%Pkt`A<6yhiBA$2C0Z
zOXXeQ3xt(x?(9)i$tn0l1=yAR9JH;!#unc~PI9qqSuSzF(e)orU#r+J#G$T|p5y$^
zPpJ5=PB~$x_zZ8kM|KFhqX|2q1^fuc(p&6X#dB^^$tl2``Ifn@V9k#>mA!KU|3&r8
zpROC7?dY#2mr0fJZOR46^c1;}+FVaQ9q~Ysb}-iX@Fj05!hZBw3NZdz=k&|W(w7ht
zbW%mADXI^t)}f#^V80V&k3;4+rO}GH9b8#W9#VgsSAjF*maJdH`dPzgJo81_2Xj6B
z<izGz2Kq)U#i|d+(&_H-izQx-B-u;w8Mhxn%rHL(W_U$cOHcZ7$R;LQhD&|<djDz9
zG~@$EsfM;mGCnvw9x$5^GgiL8ssi`^aelBYpgbLma5GyxxAyER;WV2ap#ld!9*(MP
zDBoqCsi@nE=ZQu>J?M*!<ZO&C5V1J)5hah}Y{|5>zA#+fIE5N^f$!-N9dpW~a%ubr
zd_d2GxJYsVk4Ts)vAZiCi+n{SDW=MO5zSQ=ui$AD&S~!p9(aku@VF^KE&Dp%D0<Vf
zRgw<f0^Y(Nf0@9mC$LruE%alMflG@JmjS{x6?TWcDE!xzc<^kmM%H4{64D=${$#%R
z5eFl{R9js0KMKZ>f|I?$O6l|8FC5g+$-iz8m9mo|L&C8{W5`2ds*u}tmk?Njg-NH$
zuYOT^Z6+X4k3hP4;z6TETdvNR=lR#Nrl9yIl_xy=)8Zrf?T?DGarFi;1Ez}5*}eDF
z*k0GJ++IymAM%H#tFlzTmafY98Ox-XcLSY8SwvFPht`ItUu$z4q86N?zTuX>LiAb=
zlK=f#yCxc&orpOyjF0y`XPSLU#kcRfrbv8KNQJvbMg)Z051D(nq^I#O+N~k_rE3^b
z7d~@V=<*_xEmBf5X;pk)FMi%&)Db#b=!dc5kMQgRc5;-gb;nNfstPyH)^Ix8@L!5{
zlF1VP3$6U7zVU~d<_qiWn#c2qxq?4l>5EY05pwrj9OV5a;9Pd1I5*(JJPX!(wjzNZ
ztk+_oHW*koHw&sj%v}q8^&1R8`YYHU@|{TOdBLH70I};=UY@EUkS01XT#dOHO5)we
zAg~vu^3FrMVKr&i1H#u2m-wJuqWB1}w_x5H(JExSxDp4Qq{9U}k>OtiWp+5U@H6vL
zBilZ%XL1Ifs^Mk%ad$;&xX#5S+!T>@H@Oek$1*TUQ21Cg<@w+eVAbh%`sIUJ;&s28
z&b|j-P)*TP#fmBIGS^y9D=0=;SE@SUw34e=<)|rOh7_<WYtO?~PaS^|C#x6Hg5Bu5
zO&HuXQEm9h)!-8=F@FKm#-+s93rpQ2-hA5^uss8%3#;*+Xb|QFuT=Dx=Wwu3rQ$XU
ztrtjVb5Hl)%-WgZ!QHuC4i@`8sJacA$oE#Q(go#-a^ug?*%klm@DZ77mqAc5!6%??
z9MyP2HKfp84ej8y%o#Rn%|A-CH$l_jSE3>X)eQ7I@l7#=2=zL~?Q_zyY-NH*)p__8
zXl=T?l&$Mk;T~zeH{2`IHP5}e<7FBv*>4~b*qc<B{ccaJaRNP*m`r{=xIgy0e#Mfz
znai^GAwkiP(X-znT~3)4mUxaN{JQw$ntbbJq55Sp;If=^rEuOcs!*};W*@aBS#rMI
zi~ULj$n##^A(ZLO?`R+v>o{T4Fe{QmTwndm8vgt**DfC7CYj^x4(3e#4BnUZyCm>k
zsypku(lIZ7|KRtdLkDg0(`D|@fP#}ehZPFpUFrPB%_3QBQU4Pv^DH7{W{U;8ceoPy
zV~^<DPbr@|g=u_5tl<me7nh&dW&}&1)x0H_OlKJDn!EEN*vqPwm{%y>F5{ZZp<93x
z9h#!%4@<eV3L^!RV!=E?!8jl8(HIaTYgE+*>8_||RJ`FEIb~EFW}a)A)E--&5iii?
z%}-rwtJHPYM=>hb??##Q1)hIGlDOZ+-FDeHJ%>og3OCN~H?Z<jok1oQM%V`y$`+NK
z0JUwNql3t8n1;A}Etg6=(%_gc$uSr9{245pgwtp3qG8>~H=Cn>dYeGTf&^G!HJ;<K
z0XvqxJYsVJ_UkR62AuGPkXp(DXV;$Gm=J-{@oAvrmB8uBt;7^a@Ya;#TVT3ME1<Pn
zr|JtsEWL$Gy$vTo?rEAeD@1+F)BNU04VO(2a!WH@7R<7i`K%lx>=j{ObHef}gi_Ld
zJJ5hmjNqRtez^0*hgfd>{R0Zxyw&rJ0*4)#u8s9yzg-C?d25;-n4+(`D1;F<D`NEz
z?bPE90~O<6ftauoX!IObt%jpcKdwVY$|#yGI+e89=+0s2%$n0EJTO3T;?5SWV9Va3
zhsUD%q~}IpeerR2=l35_L&#?llrU;AKE(cJl9<6TkZjPkqRA6>Q>!(sUC3!(_REC?
zbP^_^zyPg9hK;2vAV8PR6|A__<*1qLq6$Eq8l4S6miweXq5?a-nHN^HdIY!f_-o@u
zp>Y<5g14Q{Vq)T-cj+<(iSIn49(9+qkL2C3?9iuc1&4aE89IqL*f&6a^^zfQ!1XvI
zfXQM>34_t9t82$vL;XRil9PbsK+TGPzDy#&S3cjbOdEm~NI6t9>84uAq4u_*#>l9q
z>VI>bQwUr-2dEYXydv#&S)X**ktfYGV57CIm05Omhc}Jl(!cnjYr1cFV7GftkGncB
z&Hn2ZS{d3RwD9IFW43<+gepDlSxb;sKMd4%92<=IMHrjqXOhMtmgBT~)AzY1_Q_Nj
zw@j(JDHekRvv=jqG7SP@l9|N~)7YfFU*pUw<#ReCAH21<$J61cB~wM-4wnZuf?!x8
z&@&FDqPxuKW1#{Qs|nwITE(P<^g=KYP1JZt=8t1#dyQx~P)ChKLSV$ir527yem+}C
z&!-)ct4_`<5j}3Z5e_5){UC0`%OIs5&V!TEOyxa5zGJiDegY_wdbk620d=Q*!#?^i
z2(l5VjooD9Z%&w*U%NHIDy}RGVS6`mlYp4y-LVW1;yhH5ADCa|jvjb^77b)wd5-wz
zEa)Y94>QRui~kZH!G|4I!~88=%0&5G0eO<-nmHrap#K1XR^grjSe|Z|icAjz75nrP
zA<ai%)#<>CVIcUvi7-|NNp!+-;Hwr2EQhS0&}q%-04`%he-ML<FonQ>Z%u)DE3(ue
zxb}WfOasY<Uc!fO0xFg%I7hahP!iE!a7L*B$Z==kv^Nq^EK_WbP5}~HWU=EQ2<-%Z
z#=oKhQVEb=u~}SxLZf^MlHC0U348Sje+4+PO)-gH0_5EMh8d-BIZ_2k9+88IdX6nu
ze*O>Lv|TI5YXcSpqy`fNgeG}+nlPF93JI91>1Bv<g!v=il)a9SY{*H00@G!jV&*{_
zrHq1d1Y^db*$m5Wn61E>Y--xvJTv2LSv#U(gM20pcy6m*!qT-REi98kj;igw`RKd(
zC~Lj(W4oNOhm!qSdy9MN+v(nUxk~==dUOJzzjMH4O1xV@F(@m5V@h|b4<bRLNdVr$
zZF`l*XolWe<JK!XVjEN!U_oO}4S?d-t1@FlTSq<!eD~xDhQIE9eR_eb?%)h&d-}57
z^n_YCAnw`m3H0Z;hu<O*?TjBnd%1Imc-+0B0JjMTeLVRF^TS0wnc{Cuwu||E#6~|v
zUqPx}W4Pk!wL)n%yt6E*J)Z|qh=69n<{5jUtV9P+VdKzde07G13aoEKaPE8L2=B^}
z#6z@@#A8;RudtB${nVnKDk77|rq%_5olgI+t22*>a{J?WriGBkzCCt>v1AD;OO~ud
zS+hiL*0B>p#vMeuS<-!EH+B=*GRP8IgoH@h#@K0WF;|rG%kOEr_vJO6f6jBx^PclP
zbLRXpXXg8SK7qpH#M2sM(~zwCG;wtNyn?vMWGJEWiqBj0IAtfzk9VBXz_y~AHU6~9
zecjKYtN>+acdRx@uVVO?`NcJ&LhT1VM{@&HtRG3?=|2^Z60B~K*p@boc23}r-TbaD
z!>XBP(u5m`S#SH_8J3gct?H5V^cvy_&#begx)Yl6h2xK*oRO@Z_Bk#4%g%EXE^a;b
zkdlQ0F~ST`@j9*Ukp#&{yF1LU&!?+q4-voEIiw6U1cY^&#p3_)YP{yLY(Agqbw4*}
z8(ZHtUQ70I_%0rD;mz}WmdC+0xKo3QFeYCmLt{d-lfmT;q-hFyBwF=F%k9>_`t<QK
z`(rgEvqs_r)DIC&$7k(~daIU==~Ex77AJ#MR+B2P)nwGx>!PruazqK8B3CmUW_dDa
zB)FO$wiBn55}<ybJqP;3Y*;pma37z`k3}l<6u28T3AgmIrhZu8dHzG3UOa%SG6ZRj
zxNB)GEI)7MR#fU!40{LED}@NVdKX9G>KS<LdxM;EWG8eCBni#2>%KJ)C|<nz_bK+*
z_nZ79KZudgc-c+1xuJbYl$%p{wCOl6>1^w#z0|)Q6S9)z{ffONO7hcJN5)R|W9vdu
zoyY?Fc{jh}d(4(E0)-LvT6x;Xw+t|wZ!NgmE6k&T#;PUpagBt@kH>C#&)1QC7t?o_
zAGL6{))=~`ebD+i!0lx%G|ZSqFsmA;M>fkEdtL1C89?>1IG+_kb(Cs5{gGC1!-(ON
zM}(4=p|PQTfWwU^_usPnyyi7ADZw^bJ=~J+bw8SzTDySd=E@>hxg8&3{L`~}(y3Z%
zTbEOv62Z1^`_1$_4C`-6(Z~G7_vh=SAG#x|65B2UCPq!?^i5{&D_Tm_eSWw1uIHig
zn@TUk&u!KYG7rm4?ApX8yR0$1&ey!0O9w)5rKNLOWZR)+LC!X^mE!XjZypOQMFo==
zmvnO_yf}T-26K4YI!MOfmLivK-8F<CXP0j82d1yNfEk(DgXCi<P6->#=<~6fxyZh<
zDenbKj-#aen^9$u0nf~#{nX><U34`Y>NLw5e4-uETs@zK<|UKD6Yl2Ed0Icys!G>*
z`dZe_AfCIqLx1P1+N6?X{7YMGtt7VEB{zz~#I=XoGkH}LvBRHap207-`iz$gn{&4{
zh&b+cohV1@otped*^G;Fg|p-3hRt5gX+$C`FV>nOxo6+yY`w>cwW2^NMP27@_Lw}y
zeaVVqMbe^?%#osXsOgU-hFW-hvZ9_)GLOA;>wpBC`+#W8jq)h_D@5#SkY(|uF!^Be
zvpDxpLH;k;0&3`IV|#nk1OM7EvmXh2`2Dis?iDd54f*u<N4&`{xc9#MU32Th7dgM4
zsg>w}jI5THWNIpIqj#NNJ0^2-^Wl*XFz;=xU8n9fv&FLCRIMSj7Q{ZWQ@hZc50(s;
z3m6Qr;uqSO66T^?IXs83+G)5t6Sk}PG{2s=Wk-sPcMR5+`7w%`ajV|Oy3(43TSu+C
zM<HwUy2fGGMEUf0>~-Zmxa(}^%;=3m237SDD%R~xy8}xO5~CNQrV)Ltrk<uZI$s1&
zPb_3AQ;2g;i0kVZAxVPo=4#uYPc)VvJc$qWYY)h_zujB38QHCd%>&z;N6jZt9)3}|
z@p0saOnkL#elg?UO_@Ig`wP$CW^}0K&8wf#eIy++_>C90jd2LruH+s%w`}ihw92os
zil}cNBDANCIN?G$uC+&?1()6!CWQzL*<HeJSn>!D=s5W4p6HKG=QYwh{gCf&{3AST
zrcNN5Ph~ju9%GXq_H!sthKqWX%||#6QQ)I!eFR95MgKL%q5H-4IkR`d3zHeeKHiFy
z(u>-81|;aIADIjbIk)%244uctVlG#1_LwwztihjJ%A5%KqOMyC2rvu|l#eN|91lN5
z=Nt%}c-$Ej=SrDJCxNO7n}28o!M0qw?<gggA(a!o!nICXVeJ%>(~+_vJ6vZYt6Tye
z6T%7!VXP5SO7V$#{fL1jMC{}K@z(d_t)^>op*uwbQ*~aco^uJ0YYm$`n&-3CT0M4^
zFXv+7eDBVP03x6O-dE>vRE;nbk$iI7r0?Z}g>Ni#E!lJJj2W&fiz6x=Nh+D04r|@#
zfX;@vAkD%`Z1>BilpnVOI0lkfdtaiv2ozv;#fqmZm`>4^9_7-NWrc7gB~{=VO0r|6
zi%rTpc9bR18A3{*7gMjq+3UOVpKWMM)QH+;&%Km}>K;^!mqB|X7T<GJYw*d(pOY0G
zF}`y}s`Co6H~`M4s%}?(RmU+-*}zzSMB>OYb9#>(mT>XWq4gBjFX0woPN(1n^o!XP
zq~rFHG`l8OKHGr&=M^G~PMXO+(x<C4tjT&}oJPp`Q#Wh^Pgf6#S<ODlmD$n~twSVw
z)_UC0sBKioWxhD~%_)+{<mA0K`sO~ym#r*5#i!L3*vrLN;oRboc{ylDBUhOif*@-l
z(dEom1hy;YT1kXLAmPjfGe9)uUXl|~WNKzXGX6F+-(B_gfpT4_h@`-%?Z}rq-G@a+
z53`vrOm3}z+7-^P(eMptp-)T*C}a-8JP^4R3w)0g`(KMn%p!%WH)&M}DSDPJOI*kk
zxnUMFHk&KG<joT?rfb4;bd8Iby-RSdl)zZtb`J}1Nu3kc3AuT`<yd7fK?RcXpp#xO
z;g`L{b^9)xUO0|iodoI9)yJn+2$aMLz4N~W_Y|Y7?J7TF%M5GEJi~ToYxLDzm1J!U
zU(a!04NE%ABl@Ol21nZ?)nYT;P0zkN&CsJcIrL3RbvPqFWNV{ll)W8bhU|D&Q@{zs
z(BS`A&8F9)+*$x-WDL*NWgI~CDSQ$ieF|p^<aS>sUFhg$FK8?}<)`m7;V2eyLo#pS
zkX&aXT3)!$R%e?x&V7=z5>efncx|Ql+l*CJ5z3#j#p$}#Gqc4tP0QJgNX<eYxs`V-
zE26WnV)t?TFi?9EAe@=trDMEJ9u1R(?8L8fgAPPAEQtw}WkP_<L}}O_6PU{+1Ci1&
zeP+;iQXLk;4Cb@&f^y7!;3U+$&jK|yp-VVuL*k>W1p`S}VFsL_g(d*5k<P-(xTu#O
z7XZ+CiVwC1Kus~Q2A~JOF2VW9U%fg|(DAJU`YNgp+2;ILN@7OA!KsVDPh;~UDC0^3
z65&7n-%Y44iHQ^eho+=JmuUfj#!Z?A@)xH@YoC?@s7|ubNE?vzg8>cnN{R|e&8PrW
zKTs&SOM>;#Ax#=6M1~6G&d35Z&T2GJkrEZ6pOpa)9IJjGsXzsSkdS{BB;hy<Kl0N!
z2rQiCf|aUK`~B45pxF!@_~{dbr#p107+M`QnkWtGR4_`N_2&Qp)jkM%V~t0DU!poq
z2vh-^=itDBPs{Jqsnmubc@U%hD=dvc22I#pJqQ#7o%Mc&rLjk#0V(=aaCrU{aA1!B
zttky8V+=u}kXeEP-2fQ4U<D((f{L!Ez)Mqb(9i=8`GWr{B{BP;;G!pN7!4xP>eOv!
zKFJJDEwaGMyunY48gwI|%#ti{pmX<oq?10NtT#Ux?R^5wS(1hg`BU@u+5<Si%_Sw+
zXyCt1KJYsU4jv7KGarQ3xdBOWKqsS6hM$`iplWqN+h+{gj5_~OP+bxu9!3S%KdJ&$
zB_8NA`xAncX`qHkD&$B;0<?M`2UJN+ITnJ<V6XnBvL}|cVGSU4hRgSbL49b3Y0G@D
zr`go5%}hRUdRZD4okwj7uLuD&4@(@33r*1*M}-0*h&GM!fGUZh$5WwaE7C`QWtwfQ
zaKie_|9vGrD7vZun{TH!S=yMv&{b*Jz2{)zsv9i$B~*!m$TbC6YcB*Sfyrxd;NaJp
qp9zx(r6lIfTX42t9we^90h*)e0Rzohb{K*H=wvE*%#8H&&i?^nK}2Ez

delta 35766
zcmZ6TQ*>rs)Mit$ZQHhO+qP}J;Tzko*tRRSU9oMal2ljs=<)aX`hJabHP3$5o@<>0
z+y`6!4c0*S13}rfE2|m?1cU(-1cWwa-VZZH@dqxz8+{Dp8!E4*e5J^>D2lW|f-j0x
zo<(~QnFNO1pI8`Gd=Dh1B^mL?ab$;(Lh-=8JXtcDpd5?J1y(UPr2%wU(aZOC<-9lL
zfcxF*)xE2UIN)87z5VfIhVHN5;|_d+;QhP>h}{S&#GHB~#GGp3!G^1MJbr%lo)4`o
zc_%nvPRltX1nccyRLGDVhDq}twP!iOEwD#^U`j(>W|X!^l(A2Bq}thVpju<vWuji?
zUbjavx>pbJb$tJs_GSbRy=NhT>;2vm1Jp_7P7}k!J11JV$6$a@ojwipW`qx8>vXJJ
zJ?zdA<96Wd;j-7&y8wUZb`0vX<7W{%()c?7O2Z!-sp^ecl~$6a?0}R|mAP(@jFxjh
zIhxOTBZ1C!Nb1X5dw}fW(aiP!kXA5QDScn<ttDhmdRD4bI$0=YZestDwl9dO>J7E8
zW{-~6^Pn2k&Fjj}2Ckjx{MvEXtEAXY>rYahfIyx>Hw5VZ;Rj7GOVwBeZnpy+Dv>P!
zGjqds6s?W0{q=I8gany>eP?xNX%WZKX==PuvH9xy+WvMz8S6wDjx)_Zewge9Gq_0k
zEAWR=HIJ|Z#=i8{dR{C6TMglt_Hv?R_Lr}FzoWzvzrxeTP*T{hrUn}X4n&;~;bm)n
zhjTJA;7Z3(7NN6M_mgz4;=Ac5MkX47SN*K1*q|LqUH{umM_55_r&15}m{Drjev2>)
zSD%5XQJ(QP3K<CvXtYJPr(ReO1zA@b^P5VBgB5^%aou**)Yo5_w|i{A@aJM6TVQm^
z5fI@WuWOFdo~(_km{v~sa+q^cc^ZXp@Xe>f{R!Uun#|9FREeI%^-Jz|lJy~g+~DJU
z@}jhnz%n*4U3{jH#O4aLo;oZ~;-*?!?e`q^m&_*lUsR@Vuugr{mlw7#;AMPBJq!28
zFJVD=aoQsXXU9xeE7pV7LVn#q{p!VZ3%Y7}jE47Oc_kZjN{$2I_Ih`Hid_gb!z77k
zLEPp?R;<|(jHShvV>3q;6{-VZbkCCwhse5}9x5_xyKM(xnjv^V-XBsASA(EHumh^r
zu4uRPY+C7=BU8QW{OGSZAfm^B!Ait0-jY>*sG>$R-+;7@n-8id2AU2mHkJf0=Ox7L
z3wA>N`?)k>o~;OBOg*l9-c&2Ax>sd#(g1YY--PWe-tT@R^ihOGFOUaF!s{7t|8@Ch
z_a_pXzZ3hE9!TK$1W#azp-gEOQ-WuU#0`utpn2;A8trA^l6q$YQF51^@s+gh=n(ox
zoxo50I#y^dUD+qqZWwdRChW+6_RmN-hX4{Bk=n^oC1Z8WWcqd|_FqA#1Txzjttspk
z$qnVX*9wL95<qo52^RnqUZ)omT~s6AG6Mx1pAdkRJ1(59{=+IDV2}24_<9=7E=pKu
zHXU$a<ht9B!C$v8<SjY?;NT@kXAwh_7%Y!8RY-M?hFIef5w~TfdZ9S<B)2rjq%nHq
zP@%28Ls;}ys3?**ma8UA$nkXk^)rP9$h^)pw+(#{i<qs+90!m|gb?Dk&T2Fk@>^mN
zFaghCQlK}=ONlTTi^uzFqhx1MtD@5q52vJ+NFxQ!u7FgleEERVM{9Q0KxyV+k(#!U
zjP{AHSQz$~(I<WkCAF>dp)Q>buZc_HZTh*;6r2LVj?1C+I;u46gWXMuJCdyY<=&+h
zm4(^0&>UeXB@WOkTUHnuLdRJ}V^~#YwH&^#l%E<;i*sXUO>N1{m4ma@FJx=_#Nw;<
z>DuvrnXPe9bTKX@WWBobWN|7oK=)Lm*uH{jQz)jjk}-j>shi7zn|@FwV<ML6me7n9
zrZxg+smSR<Sb`#q1bfe$X8^y1(>-hX@U0v25h!EE-T`2>;fbnoybY~s9BLR+`KF%Q
zDzbQ>Qv(mtg1L{<#PeylU~f84G=c~OVgw9kph^bB%mbG$j0Gi*<7%^`biLCi$6A<Y
za>3Ua2o<@&WZB%x_Qab`4f8RYu2zo&RGMRxDj1!RG($dfM3<slGp3K1Hf7amDJvC^
zJq*g1H~}%7)lxa<g76oVu}aJ(n!|#dnR840D&zGN`-5Z!EH?~MOg}*@Q>s(BZguTy
zLQ~Oa_37Ex6x&lHa@^$nGLNS@^H2-MXqXBgn+7g$+NPHtFwcLI4Xtep*>ku19Ga^p
zp#I$0_;mELs}quj#0<%t{k44%{7sS|V3?G1-3ZXqJ$R|-W>adjIc-=-Eg~5@2km53
z@Xnl(UkDbZjcc2EDxRKDmzlg3g;+`NXn<32Cs&Gr8M9>iNKNBkYED;3NV$c>%@2(7
zGuZSz;-4HW^C9IKoKie9{tDcJelMU3LgIin!vgno;{>zF^|F}Zn0+;$q2u1o;iwNQ
z*ah^oyIql#CiRE(k02Ch-UkgWPBjjbKsFW>pRn$M<WKLaKJ62CcIf1mt5}o>umX$j
zqFLTNU8r{i;*<MSs1^EfjbOjQIQkCcsITc@Q$1eaL3O=g+0>{D$hD+hOUa3_r7*l8
zv!m^zk9RI`jl^J^vt>t_yJad>q#1C=@BvNJ3MPiI931*tyGN(dfE8@a@$<p5#WXYR
z<&xD3gu{yKY8rxwJ?st=Wc-o1!-`9?M{3Lj(+Tc$)zv2SbS2+Dv>)+PFz%6ktHt<q
z%vf}d(A5ou)eFHK;7^pMjq$g62+YoGv&LvQ;%GO6mbqq`vu1RJlGUL*kuk`K`v6ZW
z|BQD-UU_jj7Zj;Cj!;~}l9D0nqWnLFhuEDj2jm|t!pjM+j>d^7EFEspL&_D^X<idU
z@W(vA-SMfYulXHfNJk@w2?RhX``@u;pm;@fBt8w~)kOp7z@Ce(v4>zo&X6_DQ78wf
zz1psXF}CZ($`6(2F%C09Pw5W0$pQWGyoi+#B$=AsBzZ;_@JF(*yWu_ba8?#NS)qv3
zq)8|X$tO8<*Cm-6pLzt=@HH~~Whyl@SnX7DTU)W*f~rdggk(W%Z<}b!YT6ltALyJV
z&W{eSCYIj#IUky_2kCU`3+UF0CXWJ{R8hft0T~UY^%aGF@Oo1BC3Im`#{kkc7=7sS
z8CyJwKM+!`5Ng(Bjw7C=YqBjR4pZ2q^G&dX1t1Bk9B9@gNUD)hE_4oC1LkMMj*Bml
z!1|Cs$=oA49A5dB(J*y(pS)A`;qu&G&y}CmAx;G$aS6rh0|Wz#;j$X<m<oJbr{-YF
zo5<91CV#dwkG1Kk_*BmlE%_1()dsawG2BCKp;!t;^23@}C&aaEP~K`(j>WiYE!A`t
z-nl(heIYdB4%$A?#G8lH%12=MhxWT30nM>+I;h~}7?yr1=LE_C8i57|Wo6{sNQ^>;
z76_DvAknlKbXXCYyWKW}OVJIAO$mR9f<dic;-RvppXK*iu`aWY!KQj`*r<PVr>1kA
z`gr)*`~ttfA25CqYm&2*ElP{2i^7qjnqohhLcekYd2ZllD!}7e;-T;lQF}5|iT6py
z$l_@r6W(PRz>DAk+cMkZ60X498M-8S!#MJ%S_YjdN(}{_^tcey;R#>;6?L~{leV>u
zPbWCJT!zM&*IJeiG+#{<Ym|`EyxJC1{*)!3<Q9tO*j%F&1dXd0(e|HH&Mp_FmDp@m
zD$H75ixSe1yFFzzlB7&nu&_FD+^+EIgN59^S!PqPT55y<7_pSP+UzEivNi>cHEvY+
z+Lzy+60#``hEJ4SM{BO+Om>~)RW=p6jE0QoZkC2X1^f$hGAhP8_=LV(#|^Z~<at$z
z4V&GaHk2R98Pg|4Jq`h|@ni5gr^yhrjiWX4F1=CFB$PlApfJNJc8Ny7*f=#?m2^Qo
zYt9cBEx{JReh5-vi!1-V31l<Ao8a^zjabIg3Ue$Es!yGR?MIy^2@!8~rGH1XUC25q
zMN@HTIPD$53i=lZWoDkRx^AhSh@A{P4R9Y&)u?OQB%pXb33O#GvyC2T#zHvmbHmKb
z25&<-&dQyj4i`0Mm(}4_7c+U<u;?<YdWY6Xt7rhAfzqDlnzBBndd8~zicMrjSjkD?
zPc64AhP||@*7HQT(mU|BV%~}>1k`J`5Y4{&kph&!7&$xsda&#_|163LJY#sev<mFE
z)@rE=m2+pBS4#49YpE~Zz=975qr-;1Exr-BHn1*l)Hz$Hzu3U<u_q)Tza%EuI7F=j
zS&asKAWmS{rEuXr6Z8^qu`7WK{d$JExwBgCzC*|_{l2y412IBMDkB+xS?KTrvH1eo
zc~;JB>-!dySjv~soVP|ZwnwS8hq<N?2hnS+0C%90Qm1r=+ZGq8aa@{|_z{8fi(v4a
z#0G4g37nfhFnB|cJcqRQ*S_Y{6}N9fkSUukMcrExUA!Qu)hey^2$Lp>E7eW=?jZIr
zi|q0V2R4CbUK!WWlN?7FFNm=IV8vl((EGk<62$xUXcUio))<rD*Mp!lGVM=L%5q@f
zupl7N&>$cnA|RzW;>9U(Bnp6*3SvPm@L)RUplH%j@jDW74248VZ<D4LE1uq)tn0!z
zluyRKL~)9RVWhnX)>*?j*TrNov+S$c>Dg~fOE1Sik8ABjAeJthLGdbJHnAQl>~+P~
z#8EO}Y7Or4mzgHx>OH=BF}4#ZoI}bJDIC?5J}a%Y(U;mvo%ZW1r2&8f2;ee-6!*6Q
zFsae|^`2GCb)p)TzZ{-!^I1Vp@Gyr_M=`Yr)@w?iR~9Kw1~6sAY<}DO<nVqJck3-$
zIVHO8I&mBaRH*V`b|tq=48xDVDX)3-_zqk$eC~Y8kpzA>F4BFc>oH<+*sWy5S1`mn
zF_U-HR381t#PQ`v5doZKTAbNU&Q!FVsUhGIj1!oSU@eSlp5BJPTk$s@L<y~!e@_}W
zsyW=>7bUstn`sLU5{#Kyg$T}jmaPaIaQUY)z>ik7Gtj+=Nj;AU=gg&6F~`6+*>>bh
zaKRIBVV{_t+a0vt?L;AJae1#NN3)b4T4J^{&oTSdK$>TA&jL2srV0Bw&K~20G=K|j
zcmh{_ur7h{M7$gy0P9R^qHnt{2bc55<CTk00;303ul8#(!ys1JC;hT>gi<NtXLK2Z
zdG&&%(ufwR5*v0a`8KE-`aluW40VKF_7_qSzJlVI+96}S@g#?z=kffCpur^#v4Q3D
zM53qGnufXuW`LM9QoQvTXfZn$_NH7!>`-njR>CF3==d!!^0k-~D{^(9K>;EN-H(QO
zcZVNtB+4?UGK<oEL2@L%EHxX-%LiH|(*ae5n(LU0(@`b1E#s0Yxmw{yh(50qQX@)P
zBLWTEU^sOWtn#hgH1H5(WhHdjh^)9Uo`$74pz>W*dGw=#54>WJ8zmpFY%WPBA)rS~
zPf*sTprcOz<ux`&0qrv-m|Pa%x~Y!*9bbFY(X_~0CWA-32U#xTALVA3vu-1oY#4=y
zwFQ~$nu4)X(O4Q!ztjhs@JlZhClj4@{yTJ^z#AR=McUDHP4S31Z-1`yYNPqjb-6(G
z*JFWEAQ*E*1goOiJvf3KE3jcaDTTyDM-nq*s3W8rpD20;cC1Rdn^Fug>Jg7evUSu!
zamXo{%o5}g-xEvC$qkF|h4Yc;6zl5`G@*CeNRuDYY_Il}tj5jasMb`Qx$ZH!@Y3k6
z+vHg^<dh%k9CUVDH2U&D(CXPP%E<X`p14}$khh<TY|n0MvE5gmUQHf#!k|#=Sk*@I
zqEJY_#|mG2fyAKKZ?X>XC|{@Ma$u!yS5RwTtFrB_OZi>IH14e>hHj(Hr+h7{XhjbX
zmagNjzDdLH2|so87G^T9=ht^OPok%n@-B7JZd+EBohHA~h|rvTnJWJ-cH5wU9a3e0
zvh1;5>}1vXA)efRhiI*5y=m#|(c|RZ5MCv^G^Vm~bPhcT-P#6llM1*B)Q=|}n#G%-
z`-^P3y#>dghcZ-yeS&?^yJeObqdBxnZ6z*>=yfI!cY~2T5*cEWyWcUED2Q2p@DKoz
z^OkzZ20>xZGW_|beg{&(M*r^H<#dy|iq<S=nJ;i9J-`zSqi)1Pj^x!~s)ft3?OrFe
z@?=SvYnL6%;YJQHpy<ua2x^SF{}^T$J0jMBJC^D?arUnjmeBED#%6p6wggHG4{alb
z8PH;4{nc|hgGfAeJ&v-yybeO-%jEmEE0;PcsFR|MFCT8$QIoiMR+*?OJAd}|cL5Tv
z`6J!>Og^qS$Jzp;gQ?*iK&xyqwoSNqVV9;-wY>Bspr8Ti;34;h$o4MC1^b+y{g<PY
zc+>*55ZzjeWc6f)u8Ng9YEkK>jNC-{Gs}VJgcq(_Z-0ggT3-5t0G)sPE93~qXib;-
z5LBi{NKsUJY%s)ymtC2A6uR|VkQQsmlZ8kUrOP}~K7(I=^oSkGxQw1GjA0^MV%;%L
z0MBEeSY!ch`*juR$+7!jxlX!YaQFf2)qaVx6X=@~yOIY|;Q7Tu&urcxOemAGWQ(_%
z&%;!GQtn8uG%}mcAx~*me%RC!O0xY2>NJ^*f>P#Kp-eBx45d;fTDndGZeXa&yJQ*0
za^P$+D(OSmdXmuwlJN$mZO$v<eS5*bBkD{+Q@{Z_HD%Tq!kK}pFeT$B)O93rHny^C
zj)}qjNr#EtqUB`7pjJ7Bn9^EBS>0QWU^gG(CY-0dir%z;;(1zsS?Q1AKQj86wg$o7
ztaYCK?g)FeF_ehxGfp3bBUXIuApba`PhLixgH}sI7BA?5T!650fhsDPJussQVzT~L
zP5z4y@!x}?g|=E(0Tcw}790dbGQ|XgAO(pKDn<8@0#K@EpoAuZF5va2QMp}pDk7RR
zQo~vV)0?F%tU^IPdpV&b?6r{KV$U;U+A#_+^7mH^Q|6no{|gb${o(8lWT=GQf!OKn
z7SHRJpQ4oz;O`yEFG^0h1{E6PX?mV5jwt~=Im%x9VoS4;QCgDzQhy8wG}fsV1JO1V
zcM6lDQh@)v|NL%>uhf-KE=_w#{GDgG=1DGP^8y_P>Ioics)A5zU<IiM`DT)4U_Htc
zQaGl{PZ-6e*HTAsQg{k1ejA9c)0dVr-^FY1Neg?UH-n|;()q&WG?Y}2knJcX{?SF(
zOJRJNHMGDvg~aE5`PK=J0h1C?z|a{EXs&@%6QHT?_bwIk8v16^Sx+D(qT0e~SMNGs
zVqS${ZY8I~R>A;TspE3o<7$qF=&{j!*nQi@J1H*qy&fRj5}9W1>v(;&Vb7tAwk0(9
zX1sh-ItRzL-7*><-FadFS0C!q8K!i%5?|hQ67tW-8Q|}R+f@|t;Ic$CbWHI!seIY3
zIe^Og<x^O0sen0PAcuv?{1aY58(U(|as4yg1q0xwqdiI`$m8$IgF2>vEl}gt)2MvJ
z;gtLYk>PVo4kG_^Iw>~XrqR+p-OR`089eK{vweJqASd7@vpFlX(jNH<!-rQQxNo44
zh{cYfQeJ1q5tq%SoVD&@_5cT8f5_t`%U*$!_xNDZ>;^z~{Ws{A6+fmmO=-OL;THV;
zus@QT@><py>O?g;0>5_oN7s6A7PvE~9pb-ae#N05e%sWJJtWYNI&ELSq4mldQ2=9#
z`vU(jc>Y(av-6N3Ae1N|AOimb-s~ZM${Za5pr%El7L$$<ej*XEgw4ZpF$C|XJ2F~Y
z#aYY+i(j>7&vy&yFYxq@%bWY6mo25l0o3OGDC2c!%j@--0`U3x+zz69A0F$wMN$02
zORhsol7=%CP5jV;jLF3iwdX9hOGcD6<Od8eR$`sL7*y{qHQKlVl#*T&H(4dd?|ms9
zus2yT>I_cCYPwEqhIezA^T%Q<77F`*0GiNr`~`L^B*Mo>e6ZO63)@J@Fqo>rU@%4g
zBQ>m?f}iZCwpg7>R&Sj{rVPv+iupA-bbx1enWI+;``7|Oa603ZVjH;wL(-z&0Znn~
z5H9}mw0MTe1(!`*@n#Iwq7e=93k5VifES@sNo*bC9=`!3ii(saI8k~MU(3w{W)7{j
zUX%$8JUix+_eX&S!K$iFTT_!=GiOa}i2>Qlq6IhOcG@ehjGEgLCyOEfv2W?$yv1pA
zIb$!pW<8rs;3lQ>&p@Cd-A&~|d{)*yLI7wXBAv);-Uzk8`9NG(Ky@37L}C>qfUd6e
zgMD-F76jWB3f@)Y8FvYnC7_nl=kLP-EIK8{+(i0@Bh^x9*Ey`dUcv1SFbl|8Wbv+X
z+>Dkf5qZzB{ae|1+de+rvRmLoGeaFkTUW>|t2w31FZASyo~G8RV~8!DIzpA#uX0+B
zXHtKPVE(#Qq>@_9kejW*=R5@qa7|1{-a~8>5rzd3_~-AbzRQ(`p<%kc!Q>RHp{|e4
z>=bO>kc~5O#H+3iU!9SYvvKvKb2bkFx_(qz&lP%RPW6rF=4zWu)Z>aAEaQj;Y>~C*
zd`Ky5dZEUEtA5d*WDQDWo^GBzYRzxlwa^Miq`Dkc_xcY5)mpuS<w_VifS3A`tA^HQ
zQFV5uWpaC#t{S7yn&Vc@m`roVJ#2Nm+(7j@LqpTH`ttyZmtML&!2-U=cpES-EMJ*R
zrwvyq{LB)jo@PB%1;XG=y#dP(y(gXnbqBelq@ukWVXRR9;W1nuQFovx#Cg?+$mP0m
zR$K+*&wW`~J9<x?7kW<&U>g>3PXOZ9jr@1l63yCA+^HtdWt8pJ@|jO!LFGFVy}u}e
z`9~i8`sn_Hh=0)wWZv|J88rD}5%(K@m0GQ%LFkt2%%nt~pa*fxR4_oZ&z6)y*p{zV
zRUn*J)hw+z%(U9$zKy`?{&d8xow>zdcD6xKtAXOU=+D5)B){w~17M;fWPpO18Wz$F
zPpfrhxkK^m<Sjo^^}|EgP@t++u$fw8sxL%ZE0xwHU8Vj^qQ#k|t=nBHOLHp!^<ne+
z&Suk#q03*#H+x_~m#&I*lX)&rb2d>ad29hK&^B(9#oyT-bQm*N)ngJ+l_Z0NGuDw{
zp-TM`@@k|JAodN{0HDOHmUqiSZjMZv*}sq(&f21cTnsw7^9vEr-tqJd5DV08SVD{1
zDi$GWtahLiXqnw(&tZ%5tDgmLru-2(yb4vjZ(qv5W3bNpeGw|#&y9OFCXZ9)J-kpE
zU7p*%^z+d(+ha%34Ov~uopAsIdP(*$g;)#4oa*b1rnr}r77$-V?h9Y~C56Hp(qw%F
zJ-9GRmRO`9g&Z|YW&CcEAca>8NAkmzX>yoQJ$j8rsV5k>5eX~uOPh3OcqOcP@HE!W
znPD$aTWvp2dkyt=_;<Q5)hd_xD?tb2{0&3$ptisQ%eY_T9yaYqb?Q7<=86&S7wY~_
zJ@X&x*$+leAYgL(Irr0!H)CW}MI*#x*!qU#K>I>RMQkU?8!MSxIJ-YV*9F<(K+HWl
zfgi3a;9LjJw*hu7#j*MvUvvTj?%W@Y7tDdn`!|@JbUr(<S&F5AA|b_%Ia+5-d3(-K
z@O0js!m|1Oz)d|yOnC$=-+06d9oq1EA2u!M$sMMo6|gufoh1C5YGXYNM=``Tmh=bN
z01`xjq4m)w@_=H4lavaVh{kTxDW*Gl3>@HCM^e?U%fAWYDIa&pXU9bBOn4OH)GDN@
z!C859;_}Q9pQ>Btil0}X`c44zc{qF2d0_zX_hEycusnBiKQCvX`r0HMy7gwSAF$ZS
zf4Z#M1i(MwK8bchM%z_W2mBH^kcy2gXpsAiRk?@jO%5D#x#tT+1?*|L3_fb5`ZvWq
zwB;P=M;{(_5>Bem&Y=Y(Z8m_}xu_*Vz#+%y9Z{{#P^mEPr}wM4p+<Xg_oJ#?w?pp#
z7MG{lAeJ(VQ+O1UB0*GwS*Obfbr96#JT~9L)I*Pp?fYqMUIP~`IeKlla92s>l^Ba!
z^ZK?EMLCCHGQ9UQ=|*cl&?WM3mGivfZtrv-tEkKkF~T?3@IW)kyU>5Lj(oVUsPtcx
z_4F_A`2Q#Cc#iM@d1($xOUmeDf4%UwS21vCBNODsH^7<@l1M6GW+SkvvW=Msw6IpE
zvu`k+_=@i1oSv56L{Y<su>wJaQt!9grhmvmP9@*uZn_1YHeMI>_XmPyjwHu}yYeQF
zQ_0X$d+18Ra;<E{CP%xZ9%fq1=Q7N>isQFq1C8Du<QNSAYIVL_Y&fyyqM1#$ZfhI{
zz|L$kyb<7$$0ohwZ_UOF_8k3XyL4u-{t2=~ifGq0)O4?c!sKhHL_M=ejXd6Cwi0+P
z-5CV6z5_hYyxcmToGrt{MO9yK?8hD5)SGd)DG!DP=)|ce6wTIozL>gvb=j^7A;-)T
z8Kw>?m8MpJmwyhH10(K;hEnpTs$(9>q=neA*AeB=PclT})o$W0;XjvwlPGlY>qu$5
z%)3zAuD1jy#z8G)yz+!myes)LwIeKJcV+cauP-!z^ibZFRWn$Jj$HJypESxTxMs%E
ze<v@Hak5q6KmrprGd3aJb6J@aSimsou{$E=Aa9HT{P7aN_wV#blMnJQi%bC@FdRzX
z_E3`x>>(K3yoRkWh{Z1(r;RdLwaI*MJ@<Z$+A<n`pgfb6`Pp?^$t$jaj4dv?O=Jbk
z!UVI8l61^GfOhT$c>*htv`fr3Y+B?*<zZ_O#1AP?CbzJ8;TOJ@Ob8PVeeo_&Z20^L
z@;}cE*Bu#P_sHIb)V4ja@EafD)MemwK0Peg3cY~!m+?1LQ8zZV{H^GpK<L+rF$>Tk
zPDkcp8W}1Y(Fcpzh&?}(5E+Ov{KJUC0zOyyw!#U|cpQBM6$~RJmDIz_zt>A?e1Af~
z|6Cl#{$l=BDx%hbDN2}Z!EU`yxISBGo=t!u;mK*g=+u*3cL+3ENWIM}%?^ecw&te5
zW_gC7GXcN&qcMoFNQF+E_xAt!FLiJ^!K!~m5C0?j|8;M>92CSQE(aatshs+g6eTnY
z+j75!X?mS$FeESvi6JCto$$s|$T=AR!@b<7<CXKwv|elKzOj|#X8PgrFc2xU=<;;b
z6_I9|A}RwOz_5MxoUOVv`c3okbbJ-2Wr%u?>5zp6Sfx(qnco*g)2L$0em0$*S%hbZ
z`hR{Vo>@$__3*(XJr3L%zu&`(nXgo;G|8N=TXR&Gd5=~jJiw>ohjP*CYcIY4@=&rE
z#Xct5tax4~5wZGoHx3C$T0J&7M{Gm8>ts5@f6=@3W}O+RDSWrtCR6kTzz-?+Jw^AQ
zghRGphBr~sclWV>=aNiI7*K9ul%#XN0L_Sy$>YiW`mqe0N2Qjo%HtZJGoAims7@)$
zVV`7E#JR7X+f-JNM5O|kGMDB732L~GrrHBNKs{~ch6)pyDR{TwteT!X`9@2aHM;hy
zz)X{d485vt%S>Lv)4<+}VBK;W9_yDArFAvn1fa4uq#NFBz%4(=Va{dR6{#y12G{=r
zw|<4N=N`QNPIBsV%3PzXvTM0=e~VduZDwX>o`Fzcv^N#4``PH`*2NCcyi@AwT4&G9
zm|QqlDoM1640-GiR+*aX{SbyyNP-J8gwrG&2ECNMNaZ=;{(?ag;EJ`c^sO_m6WvU&
z&KW{JWfJLc6TN_=I|p{1w+xMP3IYFTI>ua1UA^EfWIRHwk9uU_fq;KOET5Y30Cfb1
zk?ipC>Sui%?L`3!WtAX6cY{lOm!ucULQR)dG;3^!tTW=R%&CfK(}|8lW8zmCve^<r
z*NE75QN3T<3#@2y0y?cB^oHjm8Mjomq7C_(4<~9-W;`9r``-l?iAe5RHgeZugP8UI
zPkLoi>`iz7gS6@&q+I{Bt&^)2la;H9xqXTQ2Fm}r=k9Vqrd)7KLHr%9Fp6vD<cR}C
zII<MWEdK!lQVa$H!u>yI_5UvX;1dCZ4Zv>}<PZ6QP&E1~QT^}PZ4e+JZ2u_}K7ma6
z5<mtVPr9V)f{Ux5#I#6FsSFno<J!r`LQ_&h{?)6?aP{uByFn~YI6!-2A_tA46b!m8
zaq-kcwoegFnZ22w^?#h1zWMri{Gtlt;XjuUlFu7%iD!=%WhiAXKE$O*Xy#={52uD>
z$ryCl=d0hZ1Ny<k5Uyf3O>KUXwe#Ps)wBY*-M@Z=iYd)UZvQHuDZ1>wM;%h{+pgbM
z)wWWm6In6A*7gjrvMBF64|94eJB^eNp6T@<>=JdtS@E8V!;aO+YJd^DfZO#Nj2<f<
zFI2PRfwt3RIMSGFw4ZCG73rP*s*=9Xjz~f~Q5;qKah{DP<W>wE6RN-CJ?_k8a;F8f
z02oeQBD8u)&aFG<5~D*;8i7#oOmpg9UV#=Hc*jdM$QC3g*sfMlW@m?O*WxO5{6cd3
zX`ejZ3ysbJ4C^osr=4^_<}DyInJB!z@Tf3ms3<=>a}YcWQyM(IagxaqV5^+3PRm0S
zETO@Ck9QOso5yG%6F3H6>UM8A{s|Z|+TQZKdP_YYw=42PI<GsG`14GCVuIi6cE|uM
zL`-4mDW{vmLl~<^-Bv_&DASx-Uc7e{XI7kJQc%(=^i*ZC$-rPJ<DhW}{TU<s8`1_w
z7iwCJeEK|~!qSDvUI~ae!Hi-2<eM2{m@b@MiB0*(n+=|<1AaVDdgw@zToqugv}9cx
zRf0&Lz5CNL1?ucQq>*Tz6EO+ZmT3cr0cyVA^y%#9?eYNQ2o-rbVekn1#E|tto40;x
zKcvM&tt1g8<&8v4kVLh!d^QxbXF|0dDGpU)vO-C0#it~lciKZ0=teFhq38x5LHsW3
zmVFmKm-vu)H3_ccBrwtdF@;CkT(u*-lG9TC+)?U`%n}V%SHy4<RPxv#9ru|)KSYtO
z(1`LG>%WbPm557IYD&Mb8X(*P4x^A(SGZ<g)trVnEEQQAEtyh7-d6gFGgU!H-*e(7
z{jL7jL{5fbk8n}cLNy?TrEjB-8ngC(-bd&p=e6(E!?NGs?=Q+PQcd?KGsy@>ECio_
z*s4!Y947&NIu%xz8-5lJC+fEw@NF3@KZF}VwjNyT!HaQhw&u6R177I=cCNcov*|zL
z4sKxdF&uJN0--#AC2sH_I?UBZ^j&k(?JP9jNu0gIORjh@^dCeLH$b;*K7N*MJdO03
zWg(1l!uXMI1#Dbp-GNQb85mVg|Kuo&%$_~6i#QO^jCanlgwna0MXz!njj2i_|HJs}
z_=PkI8Q(iln)~HJ3Lw0pE`T1Vr8Mlqf1NhU=NF+#M(<?>tAP-M(s9~Q+LW5xZ)iOJ
z1(#je@5p6<(pG|a2{2uPbr}1k+3|h7!c&*6_haZcaoBWik=N?>@fi;aP7S7@xAUHE
z*hn#x0M}eWpyz53`!jsehk_=6+;mtHtYVJ6*#Bs${WS;Y4k*=@q6a2jE}Ldvd@0RS
zxX`!b5Q@(M9e<nGvuXeIDi1XYGOUDU3@^1#Bu$|w%gO8o0Z1W^A=k=e9l<Uh;Sqp1
z8i&!RJPbz&i52oUXz)iA^#zypg;&{6f8o|vY^a?TU*Mqj<O!tQ(4gA>0b9np0*xXq
zOmUzs5|0}@2Q>f4|3$1sI>jOXD0tKvk4p3lRY@W&oln6`bg?^p6J>&7izET9lOlGX
zab=n`!tbc^C|HpyPT>Uu^0LO)H)a$kVN8djN0gI8?-Sf1KJfI+?yp3OdW5L%Xo^b`
zM-xA0ssWRA8Cb_r!LI=Mg}x9d6v2pyq`XmuCbQIADUu&UM+(y3T?u70KO-A&|4XT{
zLZAkCO1+p6VAp9;8U0(41|7~VXmgnd1BDA4Z>1L}mJ(G#e%vx-V`ztQzJc+0b<0!o
zFO`x1!Z6fdkiXQ2oeVkK#3I=(r&9fodAGTn-`|gqSV3Sd4(2M&Nn#8MW1JV>rY2*e
zp^1L`GEBZQ<LudE;LUik`h&J}DL4D?=6h90rh9H>fJHdqpb+Nd(mlJ4WVxX<bq^M;
zyM_=d3RTQ)iMz%cmdV+}lqZw2nN`j3xL01`Ezh<wD~f9gAGyb~x=)01b|e#61{nrH
zKx~gN>MC9@+r12TU!qw#5sgwj-wc}Q4jdCPPT{ETF?@Uj>Nt8%IAvk(o0faQv<++d
z^?{2ephHKDBrzhm2l<ch4!_(jO(M-W9#2z)+`0|@iO=eSl!JeuY{g%sY~$BZHxBn*
z-;ZT3OJ)ZF1r*E&@alV7`<r$>OkIhqLVJ^fhW2TD{@?xA_z1IGCgR-Mf!ATb5BBTW
z<>EuEG9#_MtNM2?NFkdi`!x|invBmdf}BIi01*t0GdJHs_i+SZoI-BAG8E|ROq3vP
z)j<=o%JEUO_Grn7S~%HV8Wa8z@6Wh1y7J9Q!l>En-QgU_Xmy8*^8Q#kxl~)->TA(v
zef4ykvNXkEO(it9N^k|u9A#!R=ozZMO&PvT-a!#AIvk@yg9>dq<99g@HJO}R_J^FC
zBn${l$A3ZpONaA}Hp2G5WVV9>0TKG2WM-Dsf=R<Og5z@BI%8^1l&l0rKrR-5!bAlD
zv8VZGA^&e7B!JP(-o(u<Pshese<bN!Ham;U*SF1Lqe;Nnejn^Iou#eeSWOTFM~*YS
zF$rl}+c#N~a4s?nrHxy(V-O`CIo=ozG}t%-JfzbcE_g$sV-R)x26cU=$z&r`AP9lP
z9%O7R@M|Y$VfqXw>QmWE$xFjS!((M_MX8>^?*%zX2k@Xy$a~*t`>n;%zt)IZVEq<~
z$RxOMPxD>j_Q8hmw|rme{S85It?&?zz~@bM$b^9G{?s3TV8Q=tjAaFXEeu^N=8ZyX
z40~c_xY(@6`|CihpJU|>Ln1%kpy&^U(F}GKPNAjbhXuMv5@>(yYKiigyZ>OGMJ%P6
zN9rD0KLEWk!=(zRo}03Q@+Ww1$x(hyc9g7A%x$VaKU2#3UIk@}$Fg)IW%)%Wof>;q
z)dV}iqeWM|E{}rB?0kv%n5nObtjBU?8ZOOJiT;=?#hpXeQ3kB91nr7!no-pXBb$a>
z7i04gJV$ozM6Q2LI&Ob%<%B**Zh2eH^OS$-D*&{gUcDd7rb%0h4Ppuv|5*CM8+@|H
z5~qGbwVz(ilVPn<L$hK*Cy+<a=M>-I!lIP%bdt88T^TJug8iaNclGU<zqLa%g)&%$
zC@QnjV&9nGaTMZE(~ClML0XLzGrEN-=H?7`G$hJeKE)$sVk*R?SrC<r>|UAFJt|9q
z96;UBx%57ZCC@F?B!Ie&(}=YOZsx+anhH%RudwPi=BCupCc^yN;saDfMU0y8boIs7
zpk`aQh{3}FhRt$rl*0xyw$*YLcH|(c?8af)PKtR^_J`a|oAvZ`_L{lb<PQ(NP!=|`
zU4@X(*r=H;=54(Ymg=>dYNPFr*2X%M5x^>k$K`6R_9iuS%>}$6YR!#e*x(9F^Y)fT
zFJ<OW&7}7b6&1aWQUMv9;>8NQ5QCBlJJ?pKkf<AM2K}VYu3z6ch?2jn9ezA&Ntj))
zTsIoqt=BlhL{t%MYKD`R)n0u{r1J1$BT9L3hIwYy#&?5Hez2_ikNUV+OtWJUumCRC
z9+dez80;6L`XCCWsT-ve^;9R_p6FxRvSk4`%j>;nIXHUd&=BF(MGOOXAI9`0fqW_X
z;!=^x<^JJaZOxT6?Q(J8R_XS*_D(i!;4!rv3WyX(?eL!^JdCE1GIXA;nG^FHq?vlj
zk{WZ5s?kVJd_$`1_cg{ZiIR$V=z!DI12(eSSO-FRfl%V?SoULOtY-@HdHbTJ2|SON
zSp-@bvu$}3baxB7TUSy?$P3Kk6b}utoD7@wj_IJYb6LpnoG}AYeTX|~Si6l`^agE?
zPUQyM^{XM?;R!Gr(MV@dYC|j>=}a4nQ1H(1dPf-DnNK@BNBHh2obBYi34l?apkiBj
zQ3xy+A}Y!pcrGQI2#}4{3KJemmHleLygC|QH<eq6(Eij1a#5+It~%z20~N~tV5Ft+
z>AH2zN-TxjXuigz$H+A2C3G?ygw13v>_}Q)=jIGy(J;k;GZ)u$c9OXKm!Zk4L{=it
zOtz-}!cADTgcd@Ua}TknHh?>i=Ah>2U!GV}D;)Qje1rwu#P2Z<EZYlpNj|jDhbjtl
z?#{q-eR>_|vpx0h50+0zWP@{TNcP;s0<oRpWEa61Vt_-IF&H3@EZ3l_hDCk6*Y4nY
zy|pQ#=sP+w_sd!4w*zcZIhCqI?X}&t3IwxZB6tj~n#-OJ7a?;!fM6(aMryTuoh!#A
zUHmc?Bfe6#tV$?7-Dz+C-?>?A5KD4E$zWB(1)gq8MCVzJTr2npH)Wk9bQYzkJ0{|s
zfSgN(g&S=+JF@WcLr9q_Raf|}Xg&C?AUuSv8p+*(Yw?O;hFO?VzK%Fb24G9H&7NO}
zk}^N~6=L#03rmRt;CE-Jdj+sve<pD)&d#H}gO6jwQCiy*8#Sqd#K4sWh2qa0d=$(O
zb9vKZVwgJ|ZNwH!@0~iHf#`Z|&6fNAAj2{6Dz$^8yJRd;?wD1KF@p}8fFkCw6mev*
zidC$SM2oh_3D-4EU%|U&b)`vn#GxZxBbH68v$QJKr2tYNFmYioL5~@S;~J;x`?=Qw
z9j>P_3Vq$BS;uyy=h{ocMJ=^Ot%dEH;=h@gb8IW-IB*TzqHV`{AfTZAvjsWQMAAOx
zrK8>Xt0X!Oi*?q+V4B^hE@UY}2NQvxD%I{*c_t6IMd3vi=ib29v~BMJnxMlYzrT@y
zE!Ic%YM!YIz>0zJLuX|pr;SGF2?a2lx9c+nk@y`MiuEzQTDukma~(qgw+cq`LG8o{
zmG@7w2nz@&B6;zCAiNjq+mDAnAirig5-cQOOWYrrju?**(T<FEn&naYVSEW{g4<9a
zH`WMXTf%JghI*M+^;p=L<rwmt`T9$`P#faIk4+l`?37&SZhuE^=$5v;HM%~M0YAk{
zMX#HT$x#*1q4e}(ifwvC9wd|57&sO9QDP~gy@03$BW$!*>Nszhb!$iEKz`Z;n+LWu
zM3sRu6IuFr$w7e;h6QO->}chMx_INTlVMSY5e5SOMoge~?tSG;Q&%lpRUfPI_0Zap
zi`WZ*PJ%Ms-q8R3q;BeBFx79QY`MbqGQCMvEI*Oze3`^7isChyBns#+IESY?9A&sT
z6y^2m)n>f92FQbl3RAk1EMViOCwMX^aul=@+Je9^I`v`2Z<zCc$|%U(p?HRc3L5Y&
z(moX=EmkyVxzbFrOw>W<Vr_Q*H;M(ZW^n@q40QBz3KYw_MAt12jI_+r7EkaLmOP1j
zXzzh*{H(eh>lVuCYzn}(n4CvyE+on+*XzbWTn({Mq&|Lh!8xIr6BWqd4Y`+e(;ED!
z8}OY%YYdEKpz)y7h4TdWYpcv~rcd%u#YpQ&4aHmW`#!ia=FXQ$<cC3BMsl4ua_j?)
zZnl?-<(V1w_~~s$trR8uuAzE{!Je|Cadu_iW$^16^xMU{bE+w}^*K%BkMi+eqJ{hm
zwe0TY(BEPy7b`BS-8p4?duFAD#+923{@cBed7IRMb-tb-A(}u`E`5uFpU}nF0McyV
z&-9Ke!KQ8bhI|}lqjtN(hDzs2EY5$^-Y7&m`SYMp>k<}R8A9V=i7a-r@I|I}1Cc2k
z$Hr64_0FCw9RBM@Yp*q6;_q^1fy<Q)Pz)<JprS1mX|phy&!vu?pra-hA^@U^S->4P
z(bpznR@&%Kclg7aE87k#9EDJzM<vy_K2}P^Iry$;^O)#S5?Bm^$T56<G#8+2+bO`I
z!TNJ6u=fjLaIBDk;6*DeIKu4%2I<H6xe+d97sZV*z0c<0_I>=(NYXL?PS6m%!s!P8
zt=)MxPIKMf7}{!W6SJd~s_shuy$C;q9?PW)AF(x#TrcHdIgSkro4<K8*Sh?p0XY}>
zahz;Q+4qLXxHZRNVdh4*uK=JD{PrYdb?~euzuzcniLv0(g_gGwGYE^SvMQq(|5*~a
zM``!z@O|HDALpbIFaZACba;zWvX7U2?e%Vl;>vU2y79w%@?+mY5M-Ba+-LBhC$x5!
zFcS>v<UlbVK8Mh2-|<E3zB2%cCbcH~3d6xr=Uv3Q_wH5+=3Ymhjvnyi(4JH(2={uF
zux@v%G2-j>eT<7Aqj-Lc%i2_M#QP&@Z40Tl^UCJviNwemWb{X@_1W0?NfRtjkV@Qf
z0QDZ+AlluNNsDoNPn~3VNdI7_u9L;D&6vjS<Hn%&h6=1h&*Gm%hdCIRVWR=AMCD+;
z+%{Z_q!z#A4pRJB8dm{Wch3jtsQQW_GMFM7zw{a!uu|;&IW16VqA_YQ=RrS@JI4<M
z(&VjDY@$cpt0XS(c}vjo?mkrAQwoNc1*l1%*;Q{v0)@&RsTKW#>B*~}X_~?M1gFOf
zyGLns1g)gx_<D}V>sIJxX9|0&nusXS)pfO3V_YTlcVb{ylxhIaP@laOTXBOyLN<&V
z0}8fXRSSA4TB+swnqR~xi?rXWo)~KvS)?9PCHbg2E8Y(ISA5?Gg7jsK$#r$jeMn0Y
zi*hLEt4TBVTVD2-7EFru>rN7p(dASs126pY#;EcVXcrBLbS{FM&(Nk|ZHJ&wKXJ57
z$(D@K%pBMVM==5Xad7u*>(NGsq&;$zuMG$V#Smi)v}DGU-YpX}))}Vm(lors^7a{&
zVHRkf(o{u@;f$T2SW^m-6NbabD&K*Se8)Ub<5L~#JHuQ@V)`_IUmOoObtyuJzC1uY
zH`mN`+83e`>x<(dBxj+`Zf2Z+YoYi8u_~*%k~8prX<dMIcU-TW5U6`(_b4-#K=F8f
z+twM~XSZE`EA?nCnsX9Y|FgRfn~n1IDITJWBb}?m@#-d;tN{G$(S$4)v?DV9kOF3|
z^2tAMG#oP{W)tr16@jA*hq*dIA!gKTiRJsY2!9fc<AE$A%~r8OA*k{3MftTr1F4Dy
z6MEih>rVh``3XKSVW@?^J@^79zF=4l5r1YsRur~&`VroB>cy&XzE=IajU9avpDm28
zj?_Fcl8^d85er3&g)_fVA~K`RE_bu$?gYe=Bb7^&u<HJ3)jOs~A|EPiQesD^wJ+LS
zF+V9(aC&wCXxAJ2XIJCNB>rdPA|y#{y*qP-Bnd!Gf@yZk>oc?|SUZ1E4fJcD>O|q7
za>m?fsDnG<v?utqFUhLxDNkXBs&JlX=J9P!4*rQ+Kux;~2a19InGNmZj-Ej=zffRl
z4#xwiw$C%G{A6>se3uJ6-GJS`hbSXZY5s#`Mw*4V53xznIp@qb*zj3J<d!pqWK8JN
zo(}Nl@6WpH+ylYn)GQ0?M2b0!38XK(O<(q<W$;=?{lt&>_g=+I`L|{AQdrWAXd}y3
zXs4q$<%((|qq6JC8WPVXH5ta?+pl4KsQVHAN)6gY$o+7}48I;a3O+6xm>PS9{0z4u
z8s^ywr(LFNWFp&5?uF9bmsRuz_4(0@bP713{r52%w8v15Dkt5wKP@i(HDzT|ah~Rp
z#xKnPWCRYw(Fju;{OQFsQ=QtL`3Mfo?$-ASjPO&R{ITCB`mOWi))ynZxa{?$HgoUn
zrIFU1ea@i{sa&Bw8;8;@I0?Jc+&z0y>hOk><Em$=W8N^#OL90A%?(6$nFS&zR$+ki
z))X99F1Mq=(QT5^4JRC<zp<xxKk~=Ma(SkWd4L5m@kYpUMya4Z<jwa@^aFHF@b$8M
zfi!&g*;~N1V~QS<`U3@@Ja4b^v~@BXKb~ufNtZFH$i+EUC@<CSf<vs>9VBK1CRdIG
zzr2tP`Yw)=jVb&)7os6i>9}tF$P7SKXg2JsxuNruT+gWTYzo#rmv^2Ha$@;C-NUJA
z`c@2=Hm^^`{iAn^&S`6t<Z({zM7>(}Cj-mO&i*a8)zq2N#G9Y5n#CFdwhw-*qGxZZ
zNnM(8zlm<JcMs^t9s~l%>YGE%88jxU7}B9R>4}Pb%bmOYjSKHY&Il~N#SFlVf}YJQ
zEPU+9AOPD9{rANMT9aCS!066cpoLI24l5oWf6Sy&aJ}<!Rg<8-Y<&*%c4dxjZ~2vo
zA;gf)BM{aD%SokpOX5#_|Ik~fGssXCI`@2_(9S`=liGq8G*kaE!<W)<vsaW={}Ad<
zo7_E9%ik~be2oU&PpL(pG($j1z?x`dT5NR${j{!Z-zz;|dg5dH6W>G;prH5R4ct54
zv;}C%13Kdhn%DLscVV*2`d8L}HwNH#CotTsmd~xeqwHd>;uu#x?lu{^uA_34rE%FR
zynUIf6dY*pz}Pb`BjB_o0*+*i7sCp{#4z!^di6|YLhID}TojNXwggC0aI1~*8j1U=
zu+dz3_z{LnOTRAH&r7LMCOm9*eq1SSI_Ia!k!t7D50ntNBN;s)+o2?CR{kp>@Csx1
zQ)vMxbl_TN5GTYkC1@275IK5J_VMHPfHhk%*`_tDi*I<4-lmOEZJ#7L)$B~Os(fJZ
ziLf5qYiEontFR1G6a>Up8vXJ^m(XNqBQM8%yT5%yI<>5`tVdMr<bGYKX&=aK;oF$9
zKb<xIR{G3<b5nd78q9m|H}Fa~xtbpTQ?QI?6V(a|4$J4)n1>Z?Ma18!WMXUbM(oKC
z;dZB286@@4LBTktO`7{TPx=n60%s?MqGVF3J!YkkRp5-(oFLp-Fef-GIMA1Kz-ZE+
z^2PWfK$zE)*Ad%4*4&@_g>ls{GC{UsH1VBtRsV2w*TUz5a9(c#AUM}VqcOZc{t{}Q
z)l))30Q)YS{P-uKsQ!(IC{ylj@l$@CBLKqH_0*Px(ZAC%QDr+I)X|44h>=_GVQDL<
z4_ZUmo>_k~$>~g*W-pu59pngseFrfKRv?X^Ros44k2M#HuFPge2y~ym1e`8@zrDZX
z1+it${6rbTxf+Q4u{P`iM#ah<We-W?{oy$|Y{M{@$!&L#+n3M9QYAJjuRp#=$_U^v
z!$<q=x-pCa_Rq>uniH>J0GIE^&45qp9n{#r-B^*?(iTG^2_GN|*gYBPo&T~Vlmu#}
z*|gG|0m(X<X?;f`nLY-qsn7jbl}TYcZfB-kcQTG$fbp43FusaVw7NO_6tF^^xqACd
zou`jK&yF?7Ll54@`)LPZPyyZfwE&KK@BQ}x!#dZC^!wsHqZ)zdh7+7@i%)ULn0?#a
zmLT>lf9)vPgR<p~8rvT_1okFOFFM>I#p;iaZG3%9(OdnP7<3dU73W$IDw?eD<2KgJ
zgs$dS;DxRo#X3Co78@wp8O1S^s%D;SGmJHnA*{?c`?z&>9W-!U%;UfK;Q&jx83Jb3
z<CY9t!wkL#P0T;9C9$nM1i{)FwnX}ayD@J_to8*h$9q1yB~JmxAEEP}#ny7^gB8OV
zLnFKn{@H)JLq61M_&|U2h>b3lHt80xjzvpFLl&juOp9VuGlG$B>*4XVP8auhtDuO8
zkdxIMcVp72m|D}oJ`=-EkpdQN+6j_vQy9uRIr%4Vuhim#wc9F~vFf6&qsKVtbT8G)
zx$(=4bjY4EAeZb!t&n>8lVi<`|G-><8Q?Y)%$A97go3&2ZX%vZ5KUO(ivu{k5hYD8
zz1rs+;`5oLXEx5CwAg1$w>~km1qa@4`lu4rlUw7+t%=~_RqG0~uK-`%;1Ngr!x_&g
z@D45*CkRQ4ie@*I(+Iil*Cz_*oXmT_874~CT5A<r9DjLUb9U7fd%#^^GA}wMDfVs-
z2nl=q7)u&}abGBqCu$lV9-=<??2KJ;wh_H>w@rquZ|{(`3OhTiU%FWrJ(XI|Icw^M
z(FAMEe#t9+)LvXHG-_UOG=WC&Y0>+|{%_lO{hyx|`S-&Cq7>rGf7`|yyJ~nE=--Z<
zIpG#)s?yZxy26{dpcEQ(ur_vj#JIS!6zJmBvlN{On~dEZ8^V8qf^W+ieP=04SVp{L
zq8?=dOIhD!-@Xetc?&L*0<Wln?y%ehDHEMsuUl^ai>q^L4>Q`fa2m6*Z6}RwJ85h*
zww-*jZQE93+qTWdR&%;9&c)vUVLi`WbBr<H(S6-<@@I<@06w96X<tS~LG4%z&<EzD
zBoo=jvTS;}P)~qcQ`Cf3B6Wt0)}T3xD8o&`>0WJ$0(TxqLxS^PB(X3S47h2m_CvjB
zB7?Uy=zA>A7`#0R<u9Fo!X_(bQd5I-sj19T^7HBNl=l1$IDfAUGubV<@alD+d!g&A
zR6=y%K&uB6=sgWZTrO2?cm?UB*!K3`1p&*hm%F?JM~lEW@Eo`XyA)#H^W<<Vr#{!A
z<n{T08?%=H5n6hP+QDqitBpIrhY62vT{Yy2$suqh%b;fxUTwSBVR3J%BG1nW>X!R2
z;o7Nr!cluI)=i!ozV4x|SQ56Da&V@1u$d0BagE$bBP#08#J&lWbU)&!rc7e3I~{2p
zv><I5j5ENP5^J*hkoi{<l5`8jtD~;NPe+#)=|0+m(<4rpMdeHlo8pY?#FMp*v0XX$
zjfun3VY}2pM*}a0dh^mm`X#*c1hak>JsLOVU5L%K0_>gq*5Ae$T{uIB)?>`=$!3b6
zTBrT0a5kLQ{}wuon7oC4YIu}NA+T$WH1WB9m@J^_w9R9wH!9dFjqL{|-}QX`l~Cqh
zn3l`wDa!&IM_uY*vogsvuKP^?d#mjpm=4Dc@jtCVC0q1*SB`!Yjhs9C?}@n`Bt1Fp
zV*T}kFyfM_3%2|Uu2jB~*Q?mAgIp_l{N=_`YnkiB@F>4nE!Io3cK)#Tp1hpwR^E8&
zT?YWh!J(*VRBJrQ#MaIz|88r^64~8Sf%j9(dW31rMA=;Cqxnz1x874+v$66THzFs?
z!>mmj$Zc>4#u}6J=kL*yd?vE@kl`P%9rj6onBH0hFL0v6AGkHz0fhXAUYw?;=8zjO
z^d-4w1n#wK>L)1HeTl&vRN_xr_q^N)2}U5M@`63zK0QO~5NWEM<H9|cR9N4jsPy)#
zlr!ls%DUT+1wNZSms8{GZIL7l5&HOAgGs69mavKZ+$_X7B!A;#YPAuAxX)mQcYT-(
zj-Ssw#Gn4(KEe$@idT!nS@LZfar<N>sa;7=N$n)3-j=$*Wn9dn+^T7noK(ucN@W9%
z47Md5UMq809N9y}eC0a>Qbri^=ec`jhgpjp1}K*=;i2ZRh78$@XK2@j9-?26bFbfh
z@asnq(O!^{o6ec_1i{t-BvJ{?!ebL+_<HCNO)SllUs>4F<Jcsaq<7dT6{IrPzZcv!
z(J5N!8B0Z(*b)m^$t%9C&ys_wp`Ixe;1<+aWvGmuigs2#Zl84@kk5KwBqHFg3r=8e
z6vvKQPi~ejnw^`&be7D9wMBU2Ggfdg>he>?3E%7gxBrt9P`#0#IO-(?Y&j{5p?zJ-
zoyysAuntO>Ym}of{o_W6edLMd73CSc8TRBgfo^1GKkPqlyF2|l6F6ky&M27V<UfN)
zoaFT5=6_Lt*+m^#+h|HG%0}ZkyW;BTaeB(y;p%vvyU+E7w8tR_lVHLr-fQyb@2p&8
zQR)nRPJZzBM|4>3#Ts@2vRIH*{iygOb~`f|oexMToOL4dkot;ZCLlfShXg?hY3*`P
zTPqH5L{fWfRTDiz{0lCUolF#xtkXAcM2ktfHj6s;R%@uDQE#%2H2!*o^r=V~dxjJ1
z*vlm3mzr}qwm%(ZJYWoF$kB!uSiyQpxu?wIMjE1nUQT&lbxnl>89fa6JIuk?p70+P
z2a>f0k(R0`6gy|9hk8(GZh+=nqjC41XK@MNgbS8@$^1~qzE!+aQSJtzD1j0Bk(-$|
zIr8diKlRD6&y3?Zcm&d@o7{?N805=PMbXQz`|ck-X(-7=>iD_LI;WHRBk&Snp1-|3
z*rJ%TI6<ZiCOg=GnIv_(A!lnd+DhhKcZ3nHn0$RHu^8&f)3l=(cqhDjjoJFq`k)JL
zTYI_#3K4y;<5bHO-2{RWShcgdKep$1xwHe?cr6a0#M`!`_M98Tv{boZ6@A2YB?W9;
z@+4z%pTK9Yz4LQWbF_bqEOXG$h&N7`g{+SXib~_AI!z^@sQIk?xWtl+Y%QQ@pG+Te
z#NOQ1_IQ|ipgi?)1C3m%i&MR*__)kGSg}*n>{JcYq$S+T?WWqsw-Zc81u)EL(2|Qe
zE*ENq>O|eRvg$TDIrS~W6eq@WWJy@}de}C{sV=?BxxQjmts0_MjZPrh&%mFq+Db0j
z*{`b?#d`s44Rzg7b12!*45f?JVHY3XgBpKIG8)Eh@9}$9YVy|DB1;jQpZ`>%?2%u`
zo@dR7o}5LTW!8rFk;w@8hSLEJ#ygD5dMC(k4{A4ur<T2SbHiw1m|>O9-M_Op%TXtJ
zULnG0+8z1?5+54IVAqFLQOMJ0QAYYi`rYaUf=?M3=rOV;)aXQK=exsgN0BHYB&p}+
z{W(IbecGka*X=1FDGA{f(M{ERjkb^a=EqxXH_MVWM5r;8+Zxzouy3bwqYx(>0;(s*
zxJ^-slyA3(pMbR%MJkp+QnW0|Cif+g#}`^&X!ib0=#DqIrx@rj#SBf|%`BpA@P5zH
z8g0(csXG5dH4tJRx<Lrt(cgr?PS^uc>1cRVzR>=Rks$x(?T1hO*Z<rj#o8-OQvWk$
z|M`r403|S_3FEH4l*~V(wcYrDw;{bRDg_PNz^Nw%4YO(xh7U!1o1ozufGX@>pJPMb
zKvq;rmqeaa;-vxGL|5#bA5=U$i^A0>m`4xeb!P4Sbk>wj%`(~TYJTzextmh6Az11p
z^E%V}*5^6L>#FS}=RViz>bL&aloKP$9L--P>Lp+fa6c6|>)}29Y%%vOpZ#(l6(e*%
zb$Clo^_A<no&Uw^A0lP=l#nXJYg{Mtkfp~x&H#S~Hfq#jjy6{Yo9b!)-D|KHuCJ<G
zhoaT2T&Ko9I26ONIMj!CL!|Z=Z*CIZTD2hkB>#I(ZJque1c6pR9G~+y#=BW<@0c__
zx(vWc^}G8i0>8rE{m?V$93Ar1&pEpL+04$(fu&AiRyNp`3Z0YuC7o-M+uDG<e?!dk
z)TLYTD49TS2s2!)62jznKPGMGu!#CR6iw|=DkJh#F%3s}t%#(h+6#03*-?Q7@)UYO
z+fUXD(FK|e_TUxT&6+z%M4LU+{C8CvH+O)lUnrTQqEqTfUg#3V^zv!eWwY?k6!9~u
zrEIg(UNY`Y<x1V7QkW8b`*^R?L-6QQc=&s8t&)4`_)0~m%+ZC)vg$UyGagz;s4BY(
z!A}p3BjjXKnrkJGS`92!ca=S?M2x7RC}V9Eh2ki*g|>@mVm^Gfm67L>0tdcME^L5M
z9;aNzjLZbb!1&JJd3U$HiOXnkax~9&ScvZWdV6uJvD#~8`Dt6Rt`yfg+v~x{^Os62
z0!PTCF&X>jq{=czY_Tk#sqIpsg*k@VUGtOO>g;w0E!yVx^q>%w5*yRh`sRj{s+|{A
zQ)M++1AhOn*_!Ioj*hNsM4mtAaIV1b=ZELZb68hbNRi7lO~U^DBXrrn+fObRk<35Z
z3UBue9b$sBZx8Jc?0+IkL=S&T@x}j0h|YFI$)Le<yC{TAgzBmmXGRYn&_WNlcq(J0
zI2o9P8bdD+JdHJij4~C)>e_5jU5^sQ?RWrBlNO2JOS3IWRNUR~Uz;ewb>#+%A(%H)
z#f*>}gUf$=h7{&RH=%2%XW87=5vxQGMqNFe+LEr7UdQ0{&)o{~wW}(K53W*hPsKxj
zcb%4P_K&!SJgE1n6E@F~N>M+__H-=p7-Cg!0~t6J^4_Sv-V}}@Pk`rFAW`sEbvXNh
z(+Tkc7ZdOcU)DHwSx45lTiFwEy=H=(IzB_&OKONKN4y&1rk2|a>R+LS$8yQu@}F6M
z=a@Nt*nwy;Ydk=!h3@6O`zq_z)RHP|gGR!OfG3?VIcCGYiLvY}3bEOW3$PX#f^V$v
z;V_?w9>nDkEeJ^}JKd|BC6ua)Lmy+XE}E2_OyR4vrzcwXHJFtQlcED^Mz64=(#4re
zB<hK>nG-HT5O@I4>W&2w5fYf>KjuTj^$+H?#7Pes4$85vIQ523WC{t$(+TdR!d#gX
z>-!e<5Cs^`etP%!OIM=fG2glrVR4w*`Rp9I(FixK(tP5TNORc#=_E7$4h-Y=y*W+k
zl9@j`^J9(L$xtRBXiR~?`VT4cVnpoEu~W2nmxA3AG<I}(+D?VNPgufHCW$l*1&7Iq
z@?n8eKO}A}mParM?$Y2i8uwaN1u@7{5<@Yi5e1F}KR>e{9FXooD*^SyXgoG8In2vd
zwy_A~#_d(@k~Q>d9JC<_3tCBkm?z^obvlV+87<(&>a`2mpnQR;xJgaDAsh<0%7*M@
z15=@nR?4*+%0lEmHjY@@9pMBA8-haZ0@!R1586ZB0%iGLlhM&+$)dosGFzNaE}1O-
zP3_>3l$6LZnkot+XMi_+;RSYZ%-$eFSyv@MVzwElzOJ>%z1m-QoR+fGk=2dY1pRZ~
zohG-Hfs2#G78D2!gia-=W$cVA&o}p+SZY3VsW=2t^ANsucAQ1JjnRrbvPJ5|*%H%N
ze1VJ>80N5iF!7Wu^g5H$R+9M{nuFud%5>W_%yByfyHjvW+^u>LdvAjS1R(xf(0}H#
z{v{(^eo=nN8P3J%nz=D!d&Be5D<pN6EZjIlqS=6l(gN;~pM}c?a~Dp(w<{Nxo>~}~
z46>pkz{LOCYFPjB5(-TtFD{Z{yJlG|oT<yz&s@Up<lkm{rw;4ycCd9rNtD9lFPw%x
z#0)>*Va6{vwiT<IN|I*f`p50xvDp1hiu)p;+bq5P{O}X+Q2_Gh7*F|L<f(KRZ%b|i
zKTLFp&45|mgU}aR909tF+Pf9jzubVxfy7HDtU$%BlCSK+$ZK;|izv#Uv0xnAI!z}3
zPfr>o<TI{x`84rXq0^_Jeg(@9dSB^-($@`H_YC}n7i?eQgKOxG+;?OcoLg=-HLZpC
zvZ%xHKhs2zAqls0e#1LQW@1iw;Z#4028{Mf`~ZtFv~%M)`@2BR11A4Q)B-MQ`OmD=
z=*VLaR*hRwYYq`+ao5bnTFfCBuOqqXZ6X)wv|B-8g_0=0)kI%$fe~`WeVGHySG0va
zn+wm5z%6x%H|6~w_&z?FV9dXvV4b{(VtC92WBaD5e<5-B_Zq)pWExMHfkc9;OSwVy
z_X0l54LtPjIG~w@kSHA*DG|L9{?4`oieURX)|d+7wso}O8$X2$-OfgEdIlM-KKTCf
zN6~)YA_8s6S6zmQ26}5j+!NObky**-EWI;kR{f^+JIGp$Qj$O4_ftwQeeSIM`fDve
zaC*MKKR(-(^@tvDyi9?1|CwJCg9TF-R0I%N@vx%V|HKUTBV4#Bb2$96ZM1zxQG<d0
zLBFKs0EWWxnEk3qYqX+b01V=#_u0j(5MgkDl{=FlkFf87m_x-IfZ?{d_FeJQvf}=k
zZMu_FC3a}kRRizdnSZfCK5dX^{nJ<(VjBC$QqdMcf|6RAcgX;q8qpKNSa&%(SO!pz
zmQnWq2b(c{1;q5!4+!sgB-O>3rR;sK<~^omr5wp?OsMEhAS?(=bMc_|KrgcSOILA8
zal2i)CmrS5n){rG?08?f=u$><a#6YA@)kG}qOM!?l$|2CabfEz2}3!F`ib<<UYB0Q
zns?Dl$2kl~dx!EG{NRd?L6xNl*nk8UMb&R!%l7+f+y$lW(O@OsDApsoToh2j&oP_H
z;|RJO*uAZm$NlmUQ{62*DEpq?QjZVC3)Esqc5eb+I^h=;zce%qHIZE+Y<-6&)pOG+
zQmc}1<w-2Yuj6^C2b%0~!ZJH~jK1Y25%1+u3N;C8$3G4pdX4k7bKpsV(f|xB3`}VU
zWBk<M{3SiRABjx?p^<5s5NShqeLV&dlL5~Oh$m-kH3|o7W?&Dyhu7@<Z>bE)8nzRS
zR-At7_(`6UW1gH6x&I;!gFBtPfoR=zgHE7E-#}R2iNMPO<Fb=xB-9^c)R?NMpf$Nv
zL*A&YbMP_ucMAU9K^FxirUDp29`&i;<(1xf1krysBy$G6CCLAd7R-p__Zt6YbRbT=
z@mnCgRs3+DRmg(nD|8qh9x0ksTsLseU7ELQ$QZuhV&**DbSEdH^ac~Ap!|c4<ri@(
zb@6ZMy_VVCFk;K-0AC4S6RobPGQd><^9rraRAwDXbvg1Xq==uFW(SZ8Z|vW8mc9X6
zWX&%j|2~>q!a_GRuh~-5CidJIch{5EuLZaYx!fq2H4<k1NB{|=w>^_^XYBC*Vf|F^
zZ4%GMQ&K&a%6$3C_cd^A5G84?@6Gt(W`X?cPZ~B)8#o>Ovgd44&nTU%@a;sN*pdy)
zo_wCs9orQ_1f_(FQv{$U_WdhA%(mpdEC$}F-JkccRQnX^tp!C1#wQD7*5)C6^X12I
z?j$Y%d!TR<Ef9EX1~<%qt0J~TsaJXD)$utLsO)>|3i-8_@I^2`+mqTI_9T<{hlqpg
zmcF+9sQnF9#W4Wy*P*vK^G@h;Amf}EYoyx3=joEhp9c^=sxLrGg`vf44HY(NG)J+|
z|F?U2U_kV$f4xSVN0tuQufwaVu{g&Bm6DqFM3r%*Zb*E@1)0OknrZ<loP#~BkZHOS
z7WZL%@+llY&xCROrpwd8^z~nHXGs}q@h|U7T0hTFw4_t#DJ%<YEmO3h>fV29iR<Ur
z7C_OTT0OXUtDXaSc9QqJB;-k}Iy>O0Y;K6h1VcKwT!0*Za171EDtI+fsc@_|X>g|s
zNk=>k9Zi<K2I|X~%%mp2yRhf3)Wi?YXgGeNic0Llh>Z0E6-{Lz%bU&j#34iXzzv_W
z2D_9C?6=D=)@M#tf14cpSP_CZZ%J}Xf0&xQpY15NS`vU$89J3k;ZakLWw|a+-q1Sf
zNppMF#yOe1wDEPAbLJ@w6t{^&-U#_r;o65=9~Hwp-A@0E@<UTJ1(+51OhkrRxX-;p
zLJxRNWl|x8qjSdih{c{DLQY?#{47@@R604wRi0Q=d_}o3jg3ufzuKG9*;#^^o??&O
zi1qzrq6kn!S35Dg51-vpEsjO=1I9qc9`R2T_9s0TCtAP@_FD|X{`GvLhKG*ra1+$0
ztSie1fripYy$!mXQ)1;4cy?<3edgwYb6+nfJ$CP~%!s*W%T9Lwze$my)#DUZu~&yK
z7qJ7AN`nnr?dTyEa(-zSxRahgOrdVV##hT;ZUi{*;V7JG*`2L3_e|89njiIM%qN6e
zoWN)$=SN<ZHaKYU?RL0FEoW8SP1EyL)jp~vkJ)LeuHk9%XnD?v6d8^?z2rcd`xjwb
zP3#6$Xw6o1Ql9<fcv8oAl3`hNcHS3~Rej4~aZcZH$x!K`6-iymEy;O<|BY81Lm_6(
zDG#WVSg*Wlu`E(dw`{M(=!LMqBr~<2t0;Ro5Jw>GGYUMy)A2`cmpuC`d$*xH`Q(~S
z)I#_{A-VTwlQ$upw&Un*STJ3R3SNO8*A%K2k*2wUtpq|}{&)nn0b`9yM^+?Z1=mk+
zO0_MZYB0qslkYW?8q|d4XFKz1B7EPGyaoaeW=>7tV37Vg8P7eR5q*+wfymh&iaDd^
zN^smWa}TmP({jw(bfT=O865K){6a@r$6BUd<&vX>eueAMk(u!?Mavj8$KykMSd*Dq
zfD8K~Hh(7ZG~pb<<_<nQ9<;@rotTwCmK--i;=>I*)x@IPgFAbF0CN<CYF=q?%>nd;
z(AwglQw8@c1&g4g+(vo)r^eALl*>f&SI|6l^EuEwmGfJSL19sOkmpcAzGQXi+8D|*
z{O+Wc_>+=gvg!>I{!pu(M$`%0DG<S^qW!A-@`soL|Nd&|btslc<LhQ&mX>K?7GHTj
zQvM5soNUybecue#S5)q-U*Q?+5f8Y)E2RhP-d<;d%}&V27sTGyiL<eVI{IET%TpXE
z_9Q@9>YMIM_Ih#lyo*G8-5Tx!Q7JQc&3id{kCsLB(^v-K>GYyTAh6-=qBd9_d;JZ>
zf|;n9nCRSF-K@|Igh^RhKzyTmRfs!n(k~K%ND*t3YMS8BZm`-tNGyn;8y9eXYW!$3
zMqZPmvu~L%04^w9_lELDnm!!7{bRXy6mDjEY|V)+ZM&FI`{|I19X)vuda{{RWW{;u
z)z$P=YlmS3&RI9);fj05mWjaGh<EoUScHh3>jL{;JR~GT$G3DRSn5}=(gp7HEHqY#
zUco3+)h4Z)IGp-hwoX*X7&WlPM#D_;p-Qswh{4%|nePeLof2(nfGsRpS@+jFDH~EH
zKqfw?rT2RmbS5(RG(G2ewd8ug-byd%ec$cK17+N-U+=r}Lss6T1j>t(yFEC2vw2Iw
z_6Ni#xo4LoD-fL1I~t!=9V^+f9}+IJu5enLUsz{PpDb(O6&l0@dJ2@1Kt9QW@J-{v
zfJ+S}<Px7~NMa-_b2iGUjign@)QP6z4L1&4wJ$g`+?@*J3Y9t9pvz%PFKR<`Lw4!{
zbfLr--ye8?F2VIKL`s&I`bDMQ*Da**C}a+D1iG<(Mt8Q+izmEo;JGTA0dn-qM-YiU
zdC%69Dn_W^mO6?n#(=7dY{xVj-mr9@FuamR5furh?Nr>3LwCUT&l7%`BDvy^JvapD
zziav5dg)nrpE`uWB6jd`6s<(S(66{zrF~Ap@p)5d-_=;V0v58xzu-S^X$nr+&V?D)
zrR*dloi#@4=zqp6e!9&MM8<D^>1h=aa6S51#7|hzeg<};xhTy+7Tt*a=$F?L`3lPE
z5H1EvfO`Cmu-Y(5j{>RS&4gCgYomh#AQ?AxwrA{VM=5(SdRmGQ^{@XdSD81*w>!Ao
zE^Iu#f9$gk8367-I&tF11y18ZLNXl87dg<N_K)TklIWkq0+^bm%Mu|#v<q%58fALH
z&?f~AgajF}!mxf57M4l>^F33_)NFZ86ZA1}T`Sgeh4zuZK0>;FEvO*+*?-w{r=VKv
zy7I4~fa>CoovB-6hvrWs{@hNE>#m*8_rJc^mup|V4?p}|UPefo`uB<Z2H@Q5JS6XS
zN6kf~`wg*$q5v6A5)ttTOo`WvCnCMk`$+ebA>PiQ&|kcp#H2B)<EH}??yXM9SN#*O
z7q-~7y|n3vs?2)PUIFe1iQVjBEA>??6YgN!qdayMy<P4ssNKP-cGZI5c9nu?b|;1;
zVejtm_{`hkZev)cwEONHh}ZEq+eF)#gYSVaf=Gl(b3hd0ZC|M7x&sVheEqlQiNie!
za&Osw7#Kp#GVUrID|p%h91+ibimh3247b>d(4{)tV2>`Tya0;=&-t@O8~@_9<Z8rH
zye;PERq>dy#jKm0ZU&?FpfQpZ56ReK>*O==^LBb3jF>gc#o7LY<_t-5SNGmbo;#^<
z0hOu}01(w}@f87R7!)t5SyWgst|&oS#Nof0i7M1+($=*nr7*CZm4);<XSyi6HN$SI
z@(>ytB1u;_bn7)KJ5|?g(C%K>6`(zmZ?%^{mh2B?bZO%s^QyQxX+2dmPhU)y<aVJc
zw#z0C;#xA7&)r3M@M<my%fCyZn3PvE*KoE)09WxYQReYXFuC?7Ggmr97Mg3XMP#zB
z`{8&o-bx{nd9@~7#kxE#gyH7lvN1=kma!Ji5_%SvTC8gp(U~E|;^7Wqbtx){7TH4@
z%6PPM)%eTs{iIy_M^dFuq?>Y0WbPh@r!f=_dzI7$TRK=V)q~n=*Jbhb1Z;Z^k}pL;
zKq3kOk(E;kC3zM~D=V%nM<GwB#Bb;ey~WxQ*(Is9q8c9tp`33j`0+_LRwbxcc|;BE
zC{LrGYU45HdT|YH7N*RgQ?4vV8d3p2V~?XWlwfjy-VjlsTaU=Wvj2(<sOIH`;-E1f
zVTZu~2P6TrNJy@g?n85hsiF!wZBDZNXC-U*vC7lBLz_|6PA#VeDBOEO@fYqIPEx(l
zA?6-*%^bkNc84)izc6=`>{Y^chcv==$Jj}_i}rEcmIc@uiubpmdqeG@Q`yOvH5cxB
zz3^ivLx7ys7zPW(-H1R47}XFSP@?!&?3%r_1vtF~2k7rJLBt-Y!}?CW0fAVCK#4L7
zYv>vbfaWm4FCCE6Ye)Ve-*<fr1py4^qJ3Zk#QP|{WdB0A)TCO!wB+T+J9QNn6~8TU
zV#pO}60Me&OHEjlmIEfCUm-oT?kFsvv}T1Xsm%C%HAg{?RinY#c!x{(=(HA$!%@9Q
z_W|O&>ydPG*7GdYk?XF8T#5@o`qrr<tEEm#c65T3l3tRUo(6S3yOCAJ!E%kD)tJ0?
zgT(ZiLbsM}LNe3TT5-dQ9=>GLmFj_(1N!tfB;7_4`@D*F!R7SYcyAU~V9b#XjE=5$
z#U<wRH7ws+Iz)yQ!(+8y&ch!aVb^9vN_x^G^9~iWAkac_60HP=ir>zF>JWxE1bTbD
z-*lGJM!zNQiL&<S*tW693X|QLPRcR;v<X4Odn^Thbd6)K>BcMOAj91x@fRywj@hG2
zmB&N?8>X<41q^;r5qK?p|9!(x$$W6Af=xxL^h)Wn+^$-(?#icC?yce9!H7Za`z=b#
z)fc%;dBskfHbX`X8gRWpcALR5nA>SUKNV^SdM29<UuLt%UWtndSi>2pk1e}FpZV4O
zctIFCXlNo*(R!)pj?LUeLmAyYar<8S6oXODyF2uG+i*)K`xoy9Qn)ydQexLS^0|%g
zLUse>W-lZw{h(j|{AGuV+ryjGUoWa_DGp3M+_jWU#{LxVL48?ZVuHrp1S0eAwOJEw
z1l~EZrezdtl~J=4J!^!wguA+YE&H@~S-w8E4beMNS;c-SlHmRFq%0zdTM0)z&qCv9
z_Su$b53<ig57-R(6~h~jFg966ZMj`qP?=qpsHV>XnfD{{7um;S{+(3PN+@U|^rC{0
zryteC4KEJZAmTjm;Ej{IKp-W^;rZ=3l5H+9AQ#+O+|#=yKkG4R%nS*y3P3WkpyLMf
zu!lw8mX<1P@MJ=;pi3`sW4wHuZ#4$R#how95rngW-hTL=B7ZQSGi*VZDHvCBM5$m1
zF_l`3O!AftmNR?)PV^c(aJ?aH^~I|8Sd-Jc+DTD0ojwa3Bfhc}46-uJ#Hr~Efy-Iw
zNQqi3x`(RQzr=m9<{XKPUQ2a&5?S4{E;qH6&S03+A|~e!vw@<n_Uo^}dg?)LfQm_5
zN=Z=(+IlV<qXmO5l;Lvz-ARu+ykk9IFgNgdPza4q4`f!bS#ZF!re#FIr-;u9rt9>q
zZh0_Cp@#rq?^l=W#fom)@r25FtwLk>=LBI4Pd1aPoU4nkj}}^U?&^Jeb+dQ_5duG4
z*3fLz{E?tUb;wRfI(LQ^w^}2HT^CVowPAj51#S5D&+`jk{K%&g=Q%j-W9nbZ4yr<J
z#V(x<l?Xp)`cqPR4U*H(Uk@5+L>e;4{s(izp^_8u3ncj-&05|+T-Qp7?0}(k3(Z$P
zV<^h|O_w)Z=~f{s{QifoEMb7`x>|h5R?seL&;y@}u5ZGYU)KXVk<`1?4u3yeK6l`!
z)-5OGnTmnVrp)i(x$d#yUiNURMTiRFmYWe^WJh>7x?@MJ(XD6&&(q(3lBuj)_<Iw)
zlYx^14}8%>$s7r~F>yb<2`0!y$wYI-N6LbZfxQ%fR90m+Y)T>EyXtRccO$(u;y)?G
zWg!cz?hVF|Gz3D!fmv8M5;~svg;%_g1ALLnL7u0T8Bbb!pO1640*7DU{@b6PJ5oCL
z`WFqu{zoOC|9>h$B26h9U=6oy_W@EYO<k-Fn}IZhm5C%L$Y`0dyHy8oVrVgDTltsN
zu60(lU~W)`@k42trEx>S(tP1zGHc5t_dX|k?eqS5gb{?CmmNt$KBO2txD$SYnf{b&
z+~J?uOpad(FFtkPRpY+Ki2+|;E%G-<TYg~OS?4y0;g8dZjfaso@WNj^7vWsjfApB4
zYT+s0C0_Ypj~@71amCSgk%AcHQ#9XxGtThrv&Uj>JX49;f}=MDE2}}s>+49uOIu{@
zX`v!P%kfk;x|pJjS*tzL(eE|krh8Oj=+rXKCvm(d_StHq^{m}22Q%Q=+%w=%F_O#e
zQu-QY=nKMJR8Er)*bs24IAp<w9H<AM{NXW*CC<?G9*L`BZS!fGQs^&%ui+l6LW_id
z{WEGm7U50j`i&e$gAnY8JL`I$D$F_-?jjICv0+o*&7IC{p@Ks{gVA99?1xS^ILM~M
z5#LXaN|8VTFPqUC&BMKng(2>2ybozReiLTcesMW<m0y<$z_Wafl*v^X#cY>>cex`M
z6@z6I7vtlgCMELB!W3I0;7oxWQ10{4JtMrC6}QVWF<jTd*UWChtL;@7VKs~y2I1if
zk3J!Tav-l6NUrA7Ngtpk=Z?~63r!r&AbrmF6_tapqOhh&1kjTX!NPK3j{XSL_REms
zRAyPT4)T2f4hNVS&6A!J+G=NgMOOHQB6H@0&0|-R32MiXyi@-&iBjY?p21B1T=Fvu
z?!;P)$^Q4Z-xvtr%Q=jD;Xj@UADi3-!)2J>?L%^KX1yJlj&U2>L2i@GQrQolHhqp*
z6Wce)ZKPo^(z@jLX@C~SeMJ1Pmk9~dzU9ZdoVZ&~2WY`~>!>aXP_m?RczA5hmz>Q8
zf6HLETIh2A8DWtzpTtTphq*9*m(WQD);O5XVFOB|7_X~@9Pfi%O+o{a(F9Hv)&P4I
zLA4uz3%VbYH{|{0v@>a(&^f=nv!d^L?d8VxO!w8;naO*<14T$&5d2Xik9mV;5mB5@
zBNxuP0Km?I7jen!m0qY!v#{oz5&yj{<UZq-IgUxCD7%O8E?}iR<IR+DX^%gVWKln0
z&MvWUtE!!Cou5(V-kMp$nOQjFteHFemcvL2cW9B%OF!>kFE5mne~+S9q0GmaxRO|`
z$sku2_ua8NSKZt@Lbi7CjMTdV-nVzgWxjU44aiY{Zxb?IhJG#`>;KK2Y+snWA_cS$
z%W=~mJmPR%G~taH+6S`Y7ITT5S|?P~`)<>bYO`)v+_DP*voqDqb-Jahogx{CXAda3
z<+qwRx%9Cor_S7&+|>u{(Hk!7M2jm9p}F)PXGs)A4yp3mt=b25(<gTx^P<k{6r@Vo
zfa?vsz(`T74C;JasKB3-plPXQIL;v+u_9gHtK@D4EN=Y+IOlVWYS()S*faePB@6zN
z+hA_7SCVYT<E=aAkgC6}!>Q&UFxd$W#C@sbH4~!y6E2<-)^qezJl?^>>XzQ<iE~&o
z>!xHscWi#=mg@adE8sVxNK{Lpu4^}x1GZ91rp#(>t=Brs9hOq2qH!~3wl!Kj=#`Zg
z+K%NLDU62OEw%oLaxSY*u-5Q1JQzKxu_QEnc(WxkqFkRhpvW#{?uXZ8)C8>|*IT-h
zPv#KNDlHUI)GzEH@1RExPJJ)Yw1vY}FFiR*B3QVp0gIe#4pZcxvl$rPWLtI40+u!i
zq{s(&s@e9!R9Cib$rCT8(#qW{9SUddR}qL#w2@<iFaI5(BzMK?Tr-ZvuQBY5A6Cb@
zX~?2x^fOg*q1!Z~WXj1#K<r<d8ds)6Pk4FGTDgT9wqe&$@-#y}dwTUV+gQ19TCmW&
zB^zWe4CH0+)u{A04cuzjwEcRp2Rg-_NlMITvdw4&EPuw8fsIi1+faM#B!vBlb{id`
z>oA=t5vQY`)}5cXVbE!4B1bpLKtrBWKasWkkb>ukCNS0V7NwsdXoRD*a=bgYCz)8R
zn+)Oh_G*>b&X?I8Jdd}LiWY!qG-%*M_xE(d;;*+ROLpYAHmsY7?p4#S02-AI(p!F^
zCzfuU54mGCU#dVIi|vuI;Dbt4@+CuW_^@60%L_WWv`$E`=N+A)VWF8R*hD=RS!Wri
zE8R9X^K0xh$(4Y{xp5j~u!mHtMxZh|N7^*!wru}V;#_#ai594yBZw9lV09@?hIV^8
zvb0y`{cfDiFMVDw+_6s{4J@p+)x*#w9R?WwPPSGE^1{RQ;^~Kx<eAHleU+3`)+iTp
zldO%F$Zstt#V@I)JYelp!c~tl_A;p+&c(-Ix$KUpF2Zt?TGQx@q2lD#j^q{(M4oiz
zF%d^oflatoDcJh?UCI3MN#nA4Dc|%187dKp?KGxTXYL+?UW40k1Q;#G;fog0>eppj
zkSDi)`5>LeDMSDvw^&2y>dm2t-83gJ*fajg3&PKtfdf8;N+&-N!;{y*&8}%0iYlAv
z`cKn0yRC@PLsbx!+fak+L<Sd_J+lxYno&9)7S-v$t5D(GR}>a69{Ytk8pYO+&u-k+
z%x(qzE@TQJMJ*?w0{Gm<IH4pTZ_O8@`o7@lA}HteN^gHFT5z_}<B8w|R^>F@T_Vxu
zShGX8L*T0oCfH}%&mm%1jwMMm?xNWJeX<QptONNo#<RH}1ZBT+`uxLz#?==Kh4A{^
ztPNwd#mKdQ(F(lSz`9xp%_<H%*&mrJE6%hRYt5e6H!;737%<ZbC{jd#8<loEWgq;h
zM2maG7a>xMG!k;pqSR<iM|yVCKAXK5F+NbwaP`U+T?@9jalq%p6(3`<U1#b@n%5!t
zT_xW&7POF(gko0CBxCLVWX9~=Q7$>X^X&`!&z<LqOru~%@PG~-2E!(*YY5zma)XOn
z$SewR)BY;V5wL8CttAsHdl5EABVv_4TfvW^wGqmZOP4vr88J12Q-1G>iICf%BVW#E
zN_N=(%P?ax;B|zK!S#ZkMx@Axt;;rtj^&igb30F9&I*!GIu`rE>MdGGVKx!cCxC(N
z^uRe>2&`!*ukz)d^Chi9Z_T+&NPRXLQdd0H>H{Ls4%o#-=nl7Ae!=i)TiV@taSgoQ
z-B1ebMqI~)uIEAcOR@uj>_{#eXRfKO9^F5-%XpiLOzmjql!b*xM0>qgi}j(}y|G(+
zdxFp%+7sh<q&IB-fe_d;_Kee+dd>3U>noVy1NnSE1&KIID|?bv@`7-jg45SlJl571
z)0zxF4D7oiq1W1k{1ReW4mE)(I%ys3_2>(6uKB)xYe2~?G<z<l75e~zX}t0{C6dfM
zxf#;z#AJQr%WrTK$ZLKh;!U`a9%@43<BB3N7&!M84HigvEWyfeepC2?wa`u~^UoJS
z6=tRNnl-_s0wM`HPUYVU`gV@5u|B|6#<#SK0c+TnN-BaVw{{x@*Nh*wBQVAF^BT0h
zm+cgmPY@kb*=luD4Msv6QBRV{$eZZR9Vf}diz{LzI87aLxY6iY7jKt8I93zGeid$E
z2I2WQrhv_zvx=S+pXATxsVMf@qZm<&dj0SSwT8)nsY{6o6inr2=;B*V50l6z<cXJ#
z0LZh9Y;&M7Ch6k>%dUm{=8Y}rP!$7zW{)SaWc@brYM+LuuJn_wlShyIMFH=dU?=Xw
z8dWP-o`xTzwZ<);bw#a$J}}q95dY)f=Nk8ewae&+<)f-^C%N>*K+sduTi6b6WZst!
zJVyfEp%vB|yq!fK{q=Hdj#HXqrh!}r9{5Y(jiAzPcZ2v63i%}oBCyoOYz*5<W@k3N
zOL(skG^<ejx(1!!kX+cu7$)9Xpm5ueYnBpS1%lwKlrrV{MWT41kM$wrJGPrj?wS%6
z&18YDvN)m~|NV%IDse9`ottZwMTZKC=OA2Baesyu=WBddKhm(t-BAx7y>PgP33zGw
zs2J{Hd3pYT3j7)c`X3ldyIEh@{x<g2-s4hP=uS`tZtrs-{EfuAqyK9qKJd$uGVqI{
z{{0&AD^Q>9CD-T*yD+-mP?U+2o&)bhJ{*4=qw!-R&+TjnvS+{zEIL#HRMsiBfk5~*
zI~}7`ysPbIRp6YZS)F1+E7{`h9q^Vs*(YzQn#^x%<3Zjz@)nOF)LhD2{wJc4!lx*2
zG0Qp7N-d=ZC0(0DN6&XqPhPr06x*ko#3uO~X}+FbBwG|>9O-DtQag1OKodw^%bF2R
zxXgb!b11V$*gWbcquad{h>x`YVVffVa_VFMX(d6Q<wbtRvY_wjQnO<X3t)~mfROTo
zTxNLwpxniAFg#2`K&nFmrGYWJjI;NjU=w{st_klH)C}FV8mVw>^N@aYPHSE?z_KSw
z-6064WZJ)w^a^UJ(y1w?h>l7*$N4=QQ;Xj%N5f#{JQRnxqpIuL(%+m#-JYm$erEFc
zYsHK)ui`sn_J(5*{>)8&Fp!8aM}Vu}(=DHjy@<JpWyCXVxtjcGec3H&`K+w7#{G89
zYsc)(-*n+mK4MO1WyaB>j~=^W|E<xC54HhgLw423ALi#1TY5QGMBpGdDrw`Uom)s3
z8SPB}L(5UwkpyGp%-fH1lyC<VhV~>l<P(CyaCsM-F?TW(?fvV*X5jEGa_K_!1GMc!
z>p;gs4itPO3|YQrda-r3bnTmHw)5e;1RfLe<YH#MJ3O1^;GU^v`ovJ=T}Y9+*6I}7
z;thRb^91}xnLr$TlHIZBT|yQJ+a0@W#yfd%7KevBjgK}(q3`WFg$sG}ep(#wv5}nc
z;oBs=vHWF7RSD=oE8t8t-We+kH*H?M>0<&*@yO<-5|h!^0EhR~E?i@<uS;q*&abkh
zM0sZ;i+LyO6mveh4o^-gB4ZTKGel3nrf+&AyI5hqjJ6Y8XDj_Nkrm%D{0I*mlgg23
zO$WT$vdn=Z)+1FVbGVaMNK#D)c#vfaYSzq&>s82|vL{{~05FxrMq-Bec&b>9o|g|7
z<}4-$VUX2a90_e6I&<of|Ex1=1Z@&W6AmT|SFLp6xwWInoRiHas1QT0W5{X>btO`U
z^Y5WwAG)J*7}<iDid@J?%6<$*kzr>>okw%FGzpP#yqIJ3A?J*R6RH4&Zn!V=vYwcF
z;V0QP11JO|@V15yrlQCs>1n03N9Jki7v;lRQ{YHwfv);Ks;<-(JAAE5=?#17a46CN
z!eeC)OAn41X^uf(l4uU28<-9oO5u~iFH)2fM5(6GubShD(#?zYNv9i$yk{zKR+O)=
zxu$@+T$sM9a|;qZGEfx9v3prspxEu4D8e5V3-<yESV&um^<s|JR#Xw>?fYiDQ6+Ek
zM9d@-A2=%3K-AKjb7u=v&X-5b{GPVZ<X4|RIpww|yAV)V35@t&-VH+UQP&b+o0mzv
z<~-^Fw-upEIS=2Cpupdb-_f<|0rj+-xg8&RJ(5PqvVtzRq2T`*=&WOP1R`hmME5A4
zA&K}3h`bJMcW#)AyAbu{n$kUDc-i55R?@^>Q-{Q{Ji~WsZ7DQ9#UbB~iS)YFRpiDX
zdO%UHatl%h-SNrz40ZcG$MabHCBuPrkMxP;Z_bs6xA<0_D}T2wAMF1Te*bRq)GXKy
zpKRMPIN}wOlX`Hx2}eOG$W<E9r(7=oNKo7iRI5a>L)5z(i81CaK%wR;jDR^iosp`D
z5e{`n=1*>|x-hZj>BE6>476?-Y_q2|Lk(Yo9Wp?!*7UBj<<Zex2T4bofBzQ?3vdL@
zdo@`HQ+?WfrB!Sa-}qKgYosRYrn}6#GPkA3x(Tb&E&fck%~)K!z|rf(k}bXij?O3#
z=u17%>&<o`{;MNp2XEkyW|%D#EqrJ5^kZ9>csb7aEnevR1z4bLv%%gGXA~-ZcCgw8
zQA2@9jVOf(vgp6m`a#@hRwB;oKoXRoC3_H-+^H$3PWV==DkMJ}mB8Mfv&*W+=G@`s
zd3b<_!Dc)wPbF%w0*fT+8uqpOLe@+`DD12+hNC`QxPXKZNF(TMRWUB{qg>OsI9{lX
zHu14a&dKvC<-Vk)g>R?qh$_?hP!>qsJO~*8bfcap)_ur))g)g4*W4EP9bQ46I8-c;
zXk$JfN;jd*`xy(T<fO9xC-{=83c_rET#FW-(_C~D2$pVVwRw2SV1>2Cqmcn%A!Ft1
zB12n8V-#`+Wua+B1pK>=Y~_gLmYC=1o6}W+epmR$3|e=Nr{RqJme{vKgLRE_RL0+V
z@j#E>3u}SR7efid{iu0%akfG8V?2@5BFFPB#_{-F<@E5&&!DC)H;-}w<$FHnj4p@d
z#GVx~jQDSkSy*S<4C2QEOQt=5R0bcDZn`H?9_d;8v~`=BBTfl@_WSHOucOY@QN<j^
z7UCOJ-Z2#MDUn<t6GkuEgrT3RyB?fBGli~TBH9aEm5!{!+yW9vmI;JzDtjX#&rqv}
zW+FFftbr(a4cQEmaB7M}Xdn(>AYn*^DNHBd8VsGU8pPc7{+H83=K&a?n5R(xmos6g
zoFmTdnkczR4a3L4?|j+mo~YXLkx%xqI;UW%&Ql4@`ujqy1$N#-)@c{U9BzE+Eu<EU
z<b@X0*@K#g9ZudO*dm@V>kf#nUC?)*PiJwf(J%01@TLN}m{9N!`p?A%1SKVv&NdIk
zDf>~|A=0}6-!}t+-{ZZ2YrP^8wlHoHe%?!d0n7Utoj-BAFLy`o^ctK+1ab{SDSbr`
zM*e{Ro@++Lla%>8_31VC;e=WJK9}H)2khK)-rV)COT=9|fr9&gc!q9)p}(nuXAp-g
zxdSwe{_By@8a;kqe^FXJu?>776hD7Am?Q4CM<4soKPOKl2P`834q6;j;6su2$0Y0E
z?E>Glgq^v|zTlhNP^|PpTo_Mr+&z{2KX2(E3Dl>faImKD;2@rif`;`?`?dvrzmTRM
z&8(wxJ)_ku9umYaSc8zcMH_!m2;LkskZ3kR$TUa81^k&n8VV09J&^OZbc}DyUB4=P
z@;x`Nplf(5zt6D-AeWaC)cfwQlOB|_=`FeuMn7qfiahQ%Qd##Th%3Px)}@c6;O1Pa
zYdr(T`Do45h*z=|^X=8yoQVB61og%;IevDZ<jC;eG^y8l-|`g}jOW_VT5(>@u*U0!
zHg@^%pUGkEF|ra~%bZ<SH75T$vg@nE)U<3K7a{ml3G&_ps8_9+s_MxAiZqyyF{CqI
zDn)aI9>*O-36wpm(kmdbd%7bDl~Co{4L~b)+lP+O)i-X1pJC(*$RVprFj3^ys{3g5
zpJ<`(#JQahL^)v!-dLxAX&j1uwy{+&hu{-Pv9MNf1)(cs)3<f<?zxW8;oy&R>Ro|W
zvs2HkRZ0^;)Snj|7RkA**MoAXR~<eqsT*X>hvRKa^01?^-V)X5`&<u`7j*r35A>*r
zN<>(F)cvW-lOmXx1-;|BD?^?<Ly#!s&}`}K^BrfqALVQ?Z@g<^58kILuT;4ws=b~x
z{g2U$*%{^}Lc20<OP=#l4nqutQn6F|x61z4CCy?$Uk;EdZK^!GhCP8OqyG~63QA{I
znpt~gca5+(m-LFI=<Q*BTk&#k5Lep85stElNOv}6^$aCa_~KEyu^U$w6J{5)?sK>n
z#+Hw0h4=-!FfXN-<T#Z)dl|J{yq#(8t@@j0cY25A0kW49&cD=+bE-TesWdKD#vDbV
z5Stg!{kxuMdOw*(rkC*#Rr422!SvA?IwPL!3QdjxC${q=ho<OCx#0vq!N_cfnC959
zg!0X>CBMmz%^=knvAO`oVnaZO=6w+vJt8=-5ghD091i>ym2Tjgl7#F-V`!H}0^6wx
zgFa{tkI;bTF4Ew!_fwno6aJQI^yk@BzB4#*SDrEH(}HU6t*Pl9Lzk!A+m4HW%{L-h
zilpd<RF4dc+4`2R;~nGv)c(_vKjuSI+E>x>98I9<Vv*XnH74jP3i-O1>tIjVgF$@K
zN#OW1nrh^bD2TG3Q8%gYstK_We*Az$b0+cZ7wj2<H=T}OEQGEY@~a!^jJO)zi-027
zf06<QS2&3aUZ{zgSMZHQJ#9#^6@2B0b^nxm0jR`ld+dZ893VQ;=3hq+(ui69!}@`=
zOfI-LD7ppWUJ)!T35=wwEV>8;%1#`8){$geLPsTqFO3`-MfVNZOMVoK8(fk}W*P-c
zBg=j6=jGMo%#MD~w>;1Z?xNoLT|?001Oq{_KnWOk**)HL2xf&*Uh>AWz68h_EG(!P
zLU;K>R8E`JK0xs@3^-1)f?9rBhFoUZdStuWfNxMzi0qK7jA3h`e(pNyBMuaHtMDDA
zy@z|8W&*pcbV89UpgNCc<f%ce`f<vb?1nX{*MwM?Q^QsBS>v=>*M-<Q2m5S$eZTzu
z8BZ(Hn2yug8}dkN!%9momaxhCB637Q-g;&|`XjRW9T>B4<&~!k%d}nZdn-;flQwz%
zW1(-0!=QUbyqv{K!>#q#dh^I?{I%j(_{_4_(%D)4E{ckW<k404C2Xg$sPOz?&FR$l
znWRE=KunD8{4%D+uE+WGN<tNrSEiIH4|)YFik2YwxazIjCu-(oZ>eWpOSe|_x%pzL
zx@#rV4yc4QHc0DB6K>yo`)2nWt7w|}A^8>3*l^X4Hyt#cSQ0m`kXrfcRh4LDh}4=r
z=FcYx#Z7HO|Cc)6n>mTNPY}ji)eYC)eLtpfE~xm41W!Pv?j*|t$5d|br1jUo>I>@+
zw5A{OK@N9bRD@#MLEoA@!VHTJ;^0jqe}o7K<^lFdI-$6y*y1gN6d0Zr2x$U>U#|Rg
z4B(ji{!X_xSeX0hf36B`o!-zM;L!Lc<@1i^IrFhx!eP+nx@Lz_R~^vFC<0|^gs%Ge
z&?RLdsSAhyd=o|#!BwCUV#PKVhjG+LC>SGhDl2~g8H0_ZCLhg%XRZaOE*F9{i4$9-
zdsGA&gNbWEAtMgtRS!tBj0=Kqh{*U&K;-d_xf)z*oJf^?6pT&sC*+#oR3-rt#5ZPC
zOVj_gqa;4c5YhkjzvH2SfKdIX|2^RbD$#fW33vujPq4po=wA;HG?*c+;gN^^;;iAp
zp=pa&)ApA|ep`nTS98gjy$dc=m!j^XWz5Yx7tz{e#9cYhrl(<8<8b7ot~+0My_+2_
zJb7&M6eV&}eF|NB<~+auIpOQNyT;Uqtb_PUxDAVv5OJ3kLf@u2uz?NWEEVkEcs+E$
z2Ckv^vYEGwcj33I^Dq>s(n6h>w+ju3r<YJpygb|q5wA}o33vCTN_>9=A>MwV<$9;7
zD}>&_&zyL;vj@fAd?-->QR;+<d#JoXLa0LU4c<)d@g55^KW_hthCkfoUk?bk1GuVv
zOpix$Js+;1+Pb$HmH{~C5)a>;F@@1qpv-`$d;GALTJiuTP*3egpeBU+%_EXt(rjH1
z4;Sa`78C30)(!_V>nuwG)~SLs0{nLw=x4kYdCN;|dY<i^CVEnyZteaLd6vwU-&H=6
z6KKvb(Iz1H?+LmDL5@a7JG(-N4j$M{9`-w<DK;At2_ju6DfnmdQDji>Q0+9x0ACU;
zC%IWV*H!}pAERM;p=TdE^JVxxS9wp~piA#)++R36`2p(_K8MAk$v<gK42B}H7SS!S
z+FIO&Ex8R%cw1Hie<rg7N)0TU4NcE}ZlzhoXB~KsZ`*0GW-KQKRnIxzY!JI<FDpZ|
ziyQdMv&d!8|6ywI)HifgX@UH$^bbV2`KzR9l6Z>Q{hFX*t48OJ`fLxBf(AZ2x9Rs{
zxE}q<cIDbHV+60-phtAAw+`C@Vi*+N%4agMm9wNACqAS)N_a=_iR|=NR<kp%srhGI
z59z8o&_H<2kRY)+gc!dn+ZIFwXD7is(?02BVbuaEF^D_n<55wWm3h$le-+5g&cweg
z&w?oFg~d})G*>7hUE}7q)^z$@W85ZQLZVWQJ7up3S8QrMi*U1(AoPTJ-@c5)tKbmh
zs3i&|>=+mXifkF0WrtIj4Kvu!N{>9*nq?ZTw@@5l&6hbfwNFR`lYZby!pOCtQW=hw
zA^xQw?^j2MjT>;C%_7S@i3i^QVX1AZBDbqHAq9L?TZ~HISjE@&oUY~L=ik!QMmJA&
zc&?$(!WdOX=LzW)^GnOAVkDt+j3u$vscWg~<tDD!?mUd>*DA@xFnE5q78Q`NH$cNo
zeRa5w!rIkKhpFB0Y_Pj^)GuDC!0%`NUsqQi4rTX-^V+vDVaE0*W*TWi6Jabxk;qa+
ziI6QMvX+!4Av<x}Z24?WAyXmJGD%}E<V(MZu`gpU$ydtnHPzQO-}}#bp7Y%2Ip;dp
z`QyCr`&{?Ep_^8dv8XD4$@ZKaGq2w1!5PY5mn)Oap4uN5cW}zV5#}1DH%T0(YteV4
zYx!hpPRE_kEcU`*wG=F&T+zFlFgtiwWm;A<SFcnaL#vy#gP;4_!NyfW$)VdX77)vZ
zzHQhrz3DAVl~%IE<!qhSV1_a9F!O{3U)|h4j~`vyDlz%=<#4pg7V8J3JA)fh^*$Ji
zfv47IMf~+b<?)p0+^wI-JbCz+q%4*Q60CDIgfsU#RXpCjF#nK`qn?A0XMh)Za_<k&
zZ32`0zH4%?@X_t&^_;)U@3~`L)RO6a38S<=Hzopq_(O^rjjDZGKO%Ma@=nJ3`HdLL
zsD*TcwG732{?M{zJ=1QPd*#YKT3b>a#W*!veJZ|DFrqm=YzLK^wAE<eo}^ORChef8
zbk~?edBe6{T~=q8ZN@r5%Q-UHHG`V{rQ~JL>`r^z!=>U~OV3Vv_FfD>7J8*YHm%~!
z{i2$(ys;3Q^6zJ3svhgcPcu)kzU!`Qa=1Y|cNDv)#f3atToQJP{ONW=!LxkU$Mcld
ztLW?k?N7SYmd#;_m4=1Os%ApHx^Ba8;NHH+fy$_A^FXcpJylG%!WgOJf=U^g?f>xJ
zXqy#?(DU%4a$^l-_A&!L?_MkfS(|DMT}8TY-Hu{hU4LxZJBW~e)tV{BJt}ZZU8(2q
zut_g)!eT95b;k+g?hh01YAv;vLQUutuWJj<Juhmo%+v%Sqx+dZ6k7`@yDGh(JAc^o
z_+5LMP?k5nt=z@r8>;O*@3h|bZ*~>T+4tI=&sxe|5=m9Q4zZ8i6EnieuRfWb5(|$n
zPd$}$I}g)N;`a$d+11?-_^bj23!vKak6}MnT$rSGxE_h+NiGf+Jc(|vlvajPC`Q<d
zuK$VbYIFMsJ|0`Qx1Z1|SC&Gc8RjsSOH@=2suegi+8b)1@k!*&_R+MrtjsjYCpHq6
z3rBT#6@8o7b;0VEd%3;gb78@-4o{VoN@o)?mY!5Y_6e5XSMNwWYBnWqeazY*s>n^o
zxxQ26T3fy=U-IksLSv<7*>^);AEfAbolc9zY1mK0T6(d*Jno6X54&_6H@@z2F?7!j
zsN-u84LoJkqvCdGOZtzs`Y~SU&~@#RySMq{e7o9L7_aPitz^iJi+S?&DBtRd4-#WU
z@Xs_@S-45bGyH4l*U^jp`ZEk+$(85;*9(j0fda8H=G2LLlET3$Q?pXCQ86Xj{CYmi
zfXBwN7FZKH=?60lLYis%$;h3ERO0QgIL0{JSaA29&Pio2wLE`5zmNxML0){*o%1%P
zbvX5$=<4;$f*lqgB~py*gFXuls_9?QPIoS~6nInOeXVImyF<;8ihmhVdb^2xPz1*_
zFn3Gl#4{8D+qW%IHFhlE%RP#{e-7heb1RF0`MQ6P&=qyx%94v&hePEvgec?H>bXid
z#|J^Ep4cYtFAMdKUiYHT>uoWd7<y#MQ*q7Xt<*?a{@=s4cZ>F`D44mX+wBX+zp@-Y
z(uK!`I8GcR)5xTx3Z4SfGe)*;iU>uIX>i;^W`2$PLctdPDpXZ_YgY^<+xCOq;f4l%
zd4Wgrmq}c8Pnk1)VjsUZw+!8EsT~{{A`g5e8u9V!EZ$97=zR?N&GR)UZI?<kwKBB2
zoT_1O@u)S<F~^Z{L{!4h##9h5e89s(T1VgXG{&X}7t5P~iWAS-@$3lqV)c931V+&s
z%!wjVoqgC#3F1b|aca$`l#Nb>+|jnv3YA|K-``Z|OL|#yprTm(2Gyx`%v(yb(pbhK
zru@vIzZ3&RHAN#Qx_kv5TG8}VyX~{Z!ySl(Kn>SOlB9+8>99CNnN)?GI1+XvePV6C
z!RWlZx%KsH`D&_VYELq8Jd5u5J_|3dG!LO-m)-XD8AnwEb5z4Mb`pGAt1^x8kG03O
z9t^B`_aphC^T73n?ehLa)|+7#Zb0?o%D@T)w)Vm0KD{zrLi>YiGD?tplqwb^^?5^R
zVQ^cR0OXiN=z=hi7TJuLFi2sdpeA8(lc@(S34_Zb8UWQ#grZQ0DFe2NZ9rT!i0zk!
zwn=~iWf;)=cS6mQY*T(f2O?tGW*=4r$j+g`R~RjV6cDkW!pHy^3F1NffE2tc{%(%w
zm(Y>*=>0|@ZDFM2IyNYEkQZzoB*3dO*7?XAjS|Aeqrm}OQTPSK!EEhdBwMI3qF%)T
z`iN(P<_0(OvUNm(!Vm^BMgFiTn*z!Z8s^Y=<QVx6kv;PDkP0tb91E-<BR8nCJ9UOP
z!yNiT93%0Xpq9J|+!<Da|Eurv8&?>qOh!OD>@{%cx%@^TZDAx?4|M410{SqTm#yXk
zaz`+b=5}`aRS}nw5iBoT5F>pQ18p_@)vqMSmLEVitr{UQQs>C103t_s%W)9UbHqcy
zz^Dz(!8^|pFEd3p00#ocNRWUdU^yy-mN6oPaYsxXkQvwF(gFL&y&zF<fas>P&x%v8
z2tZGupne~qFrm+d22K+yavbDi921x!@l`4^Z79|cbezQi6w3rkKKaX(1QZqt`Vs=}
zvov82nkJ4U-Ju9x9${_LgxOpx$k8~DoS$tRAir=BIB5d^p>tTXMv((>^gNPf9hjRW
zL5-KeK)MDvjhubYDOspG4Ma}4K=d2zWm$0{aynBxpr|aiYcstb{<m@;;fcU;B=yT?
zgMQrM2Y05W;s2J}{l*qXau@vzG@wcVkr_1a&*CS=84T1!{S_1i4l_ik_X*q0n$d#d
z>1^|PEdhwm5+T3ZU#=){oFze(jcj+Sc^#n7qTxTE3w{>*{h6KdY89A1M}#@vzJ3Fc
VwlMN}`%er%aGR6olj~j${vQ;P=LY})

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132ea..81b8f923f3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb6c2..65dcd68d65 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradlew.bat b/gradlew.bat
index 53a6b238d4..6689b85bee 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

From 9fa1778b3d31879de738f515b217d9685f0ad6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camilo=20D=C3=ADaz=20Repka?=
 <128715591+camilo-amzn@users.noreply.github.com>
Date: Tue, 28 Mar 2023 19:59:25 +0200
Subject: [PATCH 187/490] make BigInteger serialization faster on long-sized
 numbers (#475)

---
 .../ion/impl/_Private_IonTextAppender.java    | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/com/amazon/ion/impl/_Private_IonTextAppender.java b/src/com/amazon/ion/impl/_Private_IonTextAppender.java
index 7a15216691..c5fd6e0564 100644
--- a/src/com/amazon/ion/impl/_Private_IonTextAppender.java
+++ b/src/com/amazon/ion/impl/_Private_IonTextAppender.java
@@ -712,7 +712,7 @@ public void printInt(BigInteger value)
             return;
         }
 
-        appendAscii(value.toString());
+        appendAscii(bigIntegerToString(value));
     }
 
 
@@ -743,7 +743,7 @@ else if (value instanceof Decimal
             appendAscii('-');
         }
 
-        final String unscaledText = unscaled.toString();
+        final String unscaledText = bigIntegerToString(unscaled);
         final int significantDigits = unscaledText.length();
 
         final int scale = value.scale();
@@ -1006,4 +1006,30 @@ else if (longString)
             appendAscii("}}");
         }
     }
+
+    /**
+     * Convert {@link BigInteger} to a {@link String}.
+     * <p>
+     * The current implementation of {@link BigInteger#toString()} is suboptimal
+     * speed-wise, as it uses non-native division for arbitrary-sized integers
+     * to convert the binary representation to a string.
+     * This is inefficient for integers that can fit into a {@link Long}, where
+     * native division can be used to convert the long to its string representation,
+     * which is currently implemented in {@link Long#toString()}.
+     * <p>
+     * This method delegates to {@link Long#toString()} if it's possible to
+     * do so, which results in a speedup from 2x to 5x.
+     *
+     * @param value the integer to convert
+     * @return the string representation in base 10
+     */
+    private String bigIntegerToString(final BigInteger value)
+    {
+        if (value.bitLength() >= 64) {
+            // if it's out of long range, the only way is through toString()
+            return value.toString();
+        } else {
+            return Long.toString(value.longValue());
+        }
+    }
 }

From 46f5c3a46acb76691c85c52f11161b6ba570620e Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Wed, 29 Mar 2023 08:42:36 -0700
Subject: [PATCH 188/490] Fix the error caused by separating ion-data-generator
 from ion-java-benchmark-cli. (#476)

---
 ...n-java-performance-regression-detector.yml | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index fe19e59f9a..87b640ea23 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -40,18 +40,28 @@ jobs:
       - name: Build ion-java-benchmark-cli
         run: cd ion-java-benchmark-cli && mvn clean install
 
+      - name: Checkout ion-data-generator
+        uses: actions/checkout@v3
+        with:
+          repository: amazon-ion/ion-data-generator
+          ref: main
+          path: ion-data-generator
+
+      - name: Build ion-data-generator
+        run: cd ion-data-generator && mvn clean install
+
       - name: Check the version of ion-java.
         run: java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar --version
 
       - name: Generate test Ion Data
         run: |
           mkdir -p testData
-          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/nestedStruct.isl testData/testStructs.10n
-          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/nestedList.isl testData/testLists.10n
-          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/sexp.isl testData/testSexps.10n
-          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/realWorldDataSchema01.isl testData/realWorldData01.10n
-          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/realWorldDataSchema02.isl testData/realWorldData02.10n
-          java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar  generate -S 50000 --input-ion-schema ion-java-benchmark-cli/tst/com/amazon/ion/workflow/realWorldDataSchema03.isl testData/realWorldData03.10n
+          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/nestedStruct.isl testData/testStructs.10n
+          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/nestedList.isl testData/testLists.10n
+          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/sexp.isl testData/testSexps.10n
+          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/realWorldDataSchema01.isl testData/realWorldData01.10n
+          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/realWorldDataSchema02.isl testData/realWorldData02.10n
+          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/realWorldDataSchema03.isl testData/realWorldData03.10n
 
       - name: Upload test Ion Data to artifacts
         uses: actions/upload-artifact@v2

From 84171ac18bdf16f5861ced487c2c1acae8b73aa6 Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Tue, 11 Apr 2023 15:06:23 -0700
Subject: [PATCH 189/490] Target Java 8 (#477)

Also upgrade to Gradle 8.0.2, as the taskinfo Gradle plugin now works
with Gradle versions > 7.5.1.
---
 build.gradle.kts                         | 12 +++++++-----
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index d21a3681a7..77509012c9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,9 +30,8 @@ group = "com.amazon.ion"
 // and so that any tool can access the version without having to do any special parsing.
 version = File(project.rootDir.path + "/project.version").readLines().single()
 description = "A Java implementation of the Amazon Ion data notation."
-// Can't target 6 from 8
-// https://stackoverflow.com/questions/48146930/is-it-possible-to-compile-project-on-java-8-for-target-java-6
-java.sourceCompatibility = JavaVersion.VERSION_1_6
+java.sourceCompatibility = JavaVersion.VERSION_1_8
+java.targetCompatibility = JavaVersion.VERSION_1_8
 
 val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
 val generatedJarInfoDir = "${buildDir}/generated/jar-info"
@@ -50,7 +49,10 @@ sourceSets {
 }
 
 tasks {
-    withType<JavaCompile> { options.encoding = "UTF-8" }
+    withType<JavaCompile> {
+        options.encoding = "UTF-8"
+        // In Java 9+ we can use `release` but for now we're still building with JDK 8, 11
+    }
 
     javadoc {
         // Suppressing Javadoc warnings is clunky, but there doesn't seem to be any nicer way to do it.
@@ -149,7 +151,7 @@ tasks {
             html.required.set(true)
         }
         doLast {
-            logger.quiet("Coverage report written to file://${reports.html.outputLocation.get().toString()}/index.html")
+            logger.quiet("Coverage report written to file://${reports.html.outputLocation.get()}/index.html")
         }
     }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 81b8f923f3..bdc9a83b1e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 102751cacea3bd5072ede9d1dc77dd99079ce753 Mon Sep 17 00:00:00 2001
From: jobarr-amzn <70981087+jobarr-amzn@users.noreply.github.com>
Date: Wed, 12 Apr 2023 11:08:20 -0700
Subject: [PATCH 190/490] Use JUnit 5 (#478)

* Use JUnit 5

* Update build.gradle.kts

Co-authored-by: Matthew Pope <81593196+popematt@users.noreply.github.com>

* Disambiguate Math.max from Iterable.max

---------

Co-authored-by: Matthew Pope <81593196+popematt@users.noreply.github.com>
---
 build.gradle.kts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 77509012c9..7ad530ffed 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -19,7 +19,9 @@ repositories {
 }
 
 dependencies {
-    testImplementation("junit:junit:4.13.1")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
+    testCompileOnly("junit:junit:4.13")
+    testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
     testImplementation("org.hamcrest:hamcrest:2.2")
     testImplementation("pl.pragmatists:JUnitParams:1.1.1")
     testImplementation("com.google.code.tempus-fugit:tempus-fugit:1.1")
@@ -156,6 +158,9 @@ tasks {
     }
 
     test {
+        maxHeapSize = "1g" // When this line was added Xmx 512m was the default, and we saw OOMs
+        maxParallelForks = Math.max(1, Runtime.getRuntime().availableProcessors() / 2)
+        useJUnitPlatform()
         // report is always generated after tests run
         finalizedBy(jacocoTestReport)
     }

From 16a4956697bfc2d46a05a72167f04d4c19a97d62 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Wed, 12 Apr 2023 12:05:21 -0700
Subject: [PATCH 191/490] Prepares version 1.9.6 for release. (#479)

---
 README.md       | 4 ++--
 project.version | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 23038b4814..fce4a80556 100644
--- a/README.md
+++ b/README.md
@@ -60,14 +60,14 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.5</version>
+  <version>1.9.6</version>
 </dependency>
 ```
 
 For Gradle (Kotlin DSL), use:
 ```kotlin
 dependencies {
-    implementation("com.amazon.ion:ion-java:1.9.5")
+    implementation("com.amazon.ion:ion-java:1.9.6")
 }
 ```
 
diff --git a/project.version b/project.version
index 47144dcbf3..b4cac6fa40 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.9.6-SNAPSHOT
\ No newline at end of file
+1.9.6
\ No newline at end of file

From a3d03cda6f4badaaf49c2809789eedf51e3931be Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Thu, 13 Apr 2023 08:47:28 -0700
Subject: [PATCH 192/490] Set the default preallocation mode to 1. (#481)

---
 src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
index 85e4714fef..80f9d8d1dd 100644
--- a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
+++ b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
@@ -53,7 +53,7 @@ private _Private_IonBinaryWriterBuilder()
         myBinaryWriterBuilder =
             _Private_IonManagedBinaryWriterBuilder
                 .create(AllocatorMode.POOLED)
-                .withPaddedLengthPreallocation(0)
+                .withPaddedLengthPreallocation(1)
                 ;
     }
 

From 97c051739797db7e1d2d428364116be5b95386ee Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Thu, 13 Apr 2023 11:47:19 -0700
Subject: [PATCH 193/490] Bumps version to 1.9.7-SNAPSHOT (#480)

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index b4cac6fa40..2a0494fd4e 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.9.6
\ No newline at end of file
+1.9.7-SNAPSHOT

From 7cae8e9a7ba3401a51e60132ed9f8dd59472630f Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Wed, 19 Apr 2023 21:27:02 -0700
Subject: [PATCH 194/490] Fix signing task `onlyIf` restriction (#483)

The argument to `hasTask` must be provided as either an instance of
`Task` or a `String` representing the absolute task path.

The absolute task path for the project root publish task is `:publish`.
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 7ad530ffed..6a637759a2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -166,7 +166,7 @@ tasks {
     }
 
     withType<Sign> {
-        setOnlyIf { isReleaseVersion && gradle.taskGraph.hasTask("publish") }
+        setOnlyIf { isReleaseVersion && gradle.taskGraph.hasTask(":publish") }
     }
 
     cyclonedxBom {

From b30a15c516425c3f19bc1eda9d6c8081cb7f0692 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Tue, 23 May 2023 14:27:18 -0700
Subject: [PATCH 195/490] Updates ion-test-driver workflow to run on
 ubuntu-latest (#489)

---
 .github/workflows/ion-test-driver.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 8c899374f2..d502f34f0a 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -7,7 +7,7 @@ jobs:
     uses: amazon-ion/ion-java/.github/workflows/PR-content-check.yml@master
 
   ion-test-driver:
-    runs-on: macos-10.15
+    runs-on: ubuntu-latest
     needs: PR-Content-Check
     if: ${{ needs.PR-Content-Check.outputs.result == 'pass' }}
     steps:

From 21cc9c0772428068a7917fc2f61be08fc4e71c4f Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Tue, 30 May 2023 20:51:17 -0700
Subject: [PATCH 196/490] Fix release artifact upload workflow

---
 .github/workflows/publish-release-artifacts.yml | 6 ++++--
 build.gradle.kts                                | 4 ++--
 ion-java-cli/README.md                          | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index a708b057fd..cf71e374b8 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -40,9 +40,11 @@ jobs:
     # only run if `check-tag` completes successfully
     needs: check-tag
     runs-on: ubuntu-latest
+    permissions:
+      content: write
     steps:
         # TODO: replace with artifact upload/download -- make sure there's no race condition with other builds also
-        # uploaading an artifact.
+        # uploading an artifact.
       - uses: actions/checkout@v3
         with:
           submodules: recursive
@@ -54,7 +56,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         # TODO - reusability
         # the location of the library(s) should be configurable as an input
-        # parameter rather than being hard coded as `build/lib/ion-java...`
+        # parameter rather than being hard coded as `build/libs/ion-java...`
         # It may also need to be able to upload more than one file.
         run: |
           gh release upload "v$(<project.version)" "build/libs/ion-java-$(<project.version).jar"
diff --git a/build.gradle.kts b/build.gradle.kts
index 6a637759a2..18034aa4c1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -170,8 +170,8 @@ tasks {
     }
 
     cyclonedxBom {
-        setIncludeConfigs(listOf("runtimeClasspath"))
-        setSkipConfigs(listOf("compileClasspath", "testCompileClasspath"))
+        dependsOn(jar)
+        includeConfigs.set(listOf("runtimeClasspath"))
     }
 }
 
diff --git a/ion-java-cli/README.md b/ion-java-cli/README.md
index 6507f1ee1f..bda227b0b1 100644
--- a/ion-java-cli/README.md
+++ b/ion-java-cli/README.md
@@ -6,7 +6,7 @@ The package is stored under `ion-java/ion-java-cli`.
 ## Setup
 Build ion-java-cli.
 ```
-./gradle ion-java-cli:build
+./gradlew ion-java-cli:build
 ```
 
 ## Getting Started

From a84b606d858203764a8ab3ca0aaed6359223d030 Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Thu, 22 Jun 2023 12:24:25 -0400
Subject: [PATCH 197/490] Upgrades gradle to v8.1.1, removes deprecated
 constructor calls (#498)

This PR adds support for building `ion-java` with Java 20, the most recent
release. It does this by upgrading Gradle from `8.0.2` to `8.1.1` and specifying
a more recent version of the `jacoco` plugin.

It also replaces several uses of (now deprecated) boxed primitive constructors.
For example:
* `new Integer(...)` to `Integer.valueOf(...)`
* `new Float(...)` to `Float.valueOf(...)`
* `new Double(...)` to `Double.valueOf(...)`
---
 build.gradle.kts                              |   4 +
 gradle/wrapper/gradle-wrapper.jar             | Bin 61574 -> 61608 bytes
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 gradlew                                       |   4 +-
 src/com/amazon/ion/impl/IonBinary.java        |   4 +-
 src/com/amazon/ion/impl/SimpleByteBuffer.java |   4 +-
 .../amazon/ion/impl/lite/IonFloatLite.java    |   4 +-
 .../ion/impl/lite/IonTimestampLite.java       |   2 +-
 test/com/amazon/ion/IntTest.java              |   2 +-
 test/com/amazon/ion/JavaNumericsTest.java     |  12 +--
 test/com/amazon/ion/SequenceTestCase.java     |  12 +--
 test/com/amazon/ion/TimestampTest.java        |  14 ++--
 test/com/amazon/ion/TrueSequenceTestCase.java |  12 +--
 .../ion/streaming/BinaryStreamingTest.java    |  78 +++++++++---------
 14 files changed, 79 insertions(+), 75 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 18034aa4c1..c39f435f45 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -14,6 +14,10 @@ plugins {
     // id("com.diffplug.spotless") version "6.11.0"
 }
 
+jacoco {
+    toolVersion = "0.8.10+"
+}
+
 repositories {
     mavenCentral()
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..ccebba7710deaf9f98673a68957ea02138b60d0a 100644
GIT binary patch
delta 5094
zcmZu#c|6qH|DG9RA4`noBZNWrC2N)tSqjO%%aX0^O4dPAB*iC6_9R<`apl^#h-_oY
z)(k_0v8Fxp{fyi9-uwN%e)GpU&v~BrS>~KG^PF=MNmQjIDr&QHR7f-kM{%U_u*1=5
zGC}ae5(^Rrg9QY8$x^}oiJ0d2O9YW{J~$dD1ovlvh&0B4L)!4S=z;<uF&veQfHEXY
zH4@@u<^kLgdlVdk1PFR?=tB@!!Fh%TVs?1fpp-}gaG&{-sUSX9@FS&eh_E$O7uPRV
zh2TQNV03iQkaS=gC5-17XkoDHM_@2b(3OJ^WZ|a;hZcFUgSM+-Xe-WxmZxJAWoXuT
z58)Iu3Bf{KTD4feM+#hIgx)vjq8^aEDI~sP`Ko*kne(b6x(Ap9kd}I90y~b3BdH8X
zITw2EG-GzOws{X|SPYt9mPef9Q6qsa#K^021mYI)=O+2rR~D~R)FX*Oz?*6leRNx9
zwUfShT`=~^`n=$fZai)7t=s`M0arPMZl??|>Hac>K{#9q9cKq;>>BtKo1!+gw`yqE
zSK8x^jC|B!qmSW#uyb@T^CkB9qRd{N3V-rEi}AEgoU_J27lw_0X`}c0&m9JhxM;RK
z54_gdZ(u?R5`B3}NeVal2NTHqlktM`2eTF28%6BZCWW$-shf0l-BOVSm)hU58MTPy
zDcY-5777j;ccU!Yba8wH=X6OdPJ8O5Kp^3gUNo>!b=xb6T2F&LiC2eBJj8KuLPW!4
zw3V^NnAKZm^D?tmliCvzi>UtoDH%V#%SM0d*NS+m%4}qO<)M1E{OpQ(v&ZNc`vdi|
zEGlVi$Dgxy1p6+<ch};IJ}c-|s+zxw%bF%V{7j#qR*B5@XU2Vcns{yH3t=Wz_(Hjx
zwd1)jKJ^`QaQXMlJV>k0qGLQt(JwxZxLCZ4>wJ=sb0v%Ki?*+!ic_2exumn{%Co||
z-axdK#RUC;P|vqbe?L`K!j;sUo=uuR_#ZkRvBf%Txo6{OL&I(?dz?47Z(DcX3KTw>
zGY%A=kX;fBkq$F^sX|-)1Qkg##+n-Ci{qJVPj@P?<z;N=v_I6^&ygG=tSw#Y%UjZ@
z`#93m#lUYJ%x9`g1t(rEUT=uW?ue_*>l_<cEx0Hh)6uny*sYx)xX#Wv%LEZ4bUN<Z
z7GVqE(hQkJR)ue{H{&xJbUH-4kvuXRrfT$Wx01*@mNv*)6QdcMeFyW(imPkm3B~H=
zK7W>1Y`nD^v>fZ3HMX%(4p-TlD(>yWwJij!6Jw}l7h>CIm@Ou5B@$Wy`Ky*8<F2zj
z@@x^O2|m-ldu-3LMR+X(>14%Mdi1GfG1zDG9NogaoVHHr4gannv4?w6g&10!j=lKM
zFW;@=Z0}vAPAxA=R4)|`J??*$|Fh`5=ks*V7TapX`+=4n*{aXxRhh-EGX_Xrzjb4r
zn0vO7Cc~wtyeM_8{**~9y7>+}1JV8Buhg%*hy|PUc#!vw#W(HFTL|BpM)U0>JxG6S
zLnqn1!0++RyyJ>5VU<4mDv8>Q#{EtgS3mj7Hx}Zkr<T_0m+h5XsFNofwF!#;ng`~E
zO^<ryUPTxdRfL<wiQ<%$|9o4zg<j#?WmFQg&Kn<uhmGJS&TI%A;I%!Z(;f-uD(m_^
zNp3VSIN@{GlZWoALto(A5FZ!i%DoT<?3LVWj1B1ySxvKzSN7>0tz1}h8Kn6q`MiwC
z{Y#;D!-ndlImS<Z-?liBM7)gjSIe*GpflUKrcylTQcfOqcrDNGk&QHR*-m(VwkYlA
z?dN^niqZ5--O6qr!7Xa%Rh_7wYV(Zq#-!gj8q5Bu!!mkH=e%(37W2&kqQ65KNg7L2
zviMG8qeYEzpdWMpb|s4)CM)@Qi{sSj_0KxRE;1K>T(C@(*i5f0U(jD29G7g#nkiPX
zki6M$QYX_fNH=E4_eg9*FFZ3wF9YAKC}CP89Kl(<Uvh*;*RIYLMe<(ce(F8OErh4m
zlhRsR{U&nvjsSdt<3Z9xGjV43*6SQtr3E_9JCkOT&b`vzxY5ZJ=1>GNS(Ag994)<L
zz3x}`(haLy*Tzhy+Dg68vAmX)s(UKorq>0$OL4-fj_1EdR}ARB#-vP_$bWF`Qk58+
z4Jq*-YkcmCuo9U%oxGeYe7Be=?n}pX+x>ob(8oPLDUPiIryT8v*N4@0{s_<v!N&8y
zOPuX{$yCQ&=&>VYALi;lzj19ivLJKaXt7~UfU|mu9zjbhPnIhG2`uI34urWWA9IO{
z_1zJ)lwSs{qt3*UnD}3qB^kcRZ?``>IDn>qp8L96bRaZH)Zl`!neewt(wjSk1i#zf
zb8_{x_{WRBm9+0CF4+nE)NRe6K8d|wOWN)&-3jCDiK5mj>77=s+TonlH5j`nb@rB5
z5NX?Z1dk`E#$BF{`(D>zI<HZ+<>SrMo4&}^wmUIyYL-$PWmEEfEn-U0tx_vy$H6|+
zi{ytv2@JXBsot|%I5s74>W1K{-cvj0BYdNiRJz*&jrV9>ZXYZhEMULcM=fCmxkN&l
zEoi=)b)Vazc5TQC&Q$oEZETy@!`Gnj`qoXl7mcwdY@3a-!SpS2Mau|uK#++@>H8QC
zr2ld8;<_8We%@E?S=E?=e9c$BL^9X?bj*4W;<+B&OOe+3{<`6~*fC(=`TO>o^A(Y!
zA`Qc1ky?*6xjVfR?ugE~oY`Gt<vaLJTCo1nnmu8oFGg@mi9K)$+WByQ5A&CS?<@ki
z_7m?RV+9@F1GrWtGR0%dRaqd%1tpgN(1U~L&`Rf&XmCH&n<-wMwglitH0LRSHQHO0
ztWejI(n8BJfMd}YpqRCs(Gxa^iTMEF)*W_fA!gnkLupfL1;FunHByXz%6pX39CXS6
z+kJU{qitUdgko0#ob=^Vs((3rTlHvJBOC?;s9-Qza3qowWM1P1`2(1-+7A6i3H2kw
z_wB2h+;psj?=#*hkYUYE(lmJ%+=IW4(0Y}~WGM9wc8VcrT@P`Z%W2?UZ%)Y7&6eHW
z$*;#?d2U+mC;TfHuEnZ1klkl{HIJFZWq8eae|0Q)>zhw^{Z@E6vZ`mMRAp>Odpa!m
zzWmtjT|Lj^qiZMfj%%un-o$Eu>*v12qF{$kCKai^?DF=$^tfyV%m9;W@pm-BZn_6b
z{jsX<lUo~kJ_0QO>Y3!U`%9hzk6n7YyHY%48NhjI6jjuUn?Xfxe0`ARD_Q+T_QBZ{
zUK@!63_Wr`%9q_rh`N4=J=m;v>T{Y=ZL<K`_RkA>KN^m?(KZQ2J%|3`hV0iogMHJ}
zY6&-nXirq$Yhh*CHY<oG^-!;2AGGr2lqIlFeQPSK6|{ds{YBRHp>&Qf*b@@>LPTMf
z(cMorwW?M11RN{H#~ApKT)F!;R#fBHahZGhmy>Sox`rk>>q&Y)RG$-QwH$_TWk^hS
zTq2TC+D-cB21|$g4D=@T`-ATtJ?C=aXS4Q}^`~XjiIRszCB^cvW0OHe5;e~9D%D10
zl4yP4O=s-~HbL7*4>#W52e<y<<I(igFc=El3{=KC*s$B6e=!?9l0!KQG3dnE76`K%
z;%BT2Eboeq6l97ikIpdn38t8Oj%LxH4*23PI~=`TsnyYnw71@HXtKsy*w}o{G7_fW
zL0rzwnvTqGY1`kxeeKga*#E`dF1{y>iG7*^Hi)?@-#*7C^X5@kGwK+paI>_a2qxtW
zU=xV7>QQROWQqVfPcJ$4GSx`Y23Z&qnS?N;%mjHL*EVg3pBT{V7bQUI60jtBTS?i~
zycZ4xqJ<*3FSC6_^*6f)N|sgB5Bep(^%)$=0cczl>j&n~KR!7WC|3;Zoh_^GuOzRP
zo2Hxf50w9?_4Qe368fZ0=J|fR*jO_EwFB1I^g~i)roB|KWKf49-)!N%Ggb<tslF%Q
zJ$9p;TF7vfYfNt}@-L-#Qu>%w=kB8)(+_%kE~G!(73aF=yCmM3Cfb9l<q95>V$G!b
zoDIxqY{dH>`SILGHEJwq%rwh46_i`wkZS-NY95qdNE)O*y^+k#JlTEij8NT(Y_J!W
zFd+YFoZB|a<b&OD((3Dvwwgf>uOz~A@A{V*c)o7E(a=wHvb@8g5PnVJ&7D+Fp8ABV
z5`&LD-<$jPy{-y*V^SqM)9!#_Pj2-x{m$z+9Z*o|JTBGgXYYVM;g|VbitDUfnVn$o
zO)6?CZcDklDoODzj+ti@i#WcqPoZ!|IPB98LW!$-p+a4xBVM@%GEGZKmNjQMhh)zv
z7D){Gpe-Dv=~>c9f|1vANF&boD=Nb1Dv>4~eD636Lldh?#zD5{6JlcR_b*C_Enw&~
z5l2(w(`{+01xb1FCRfD2ap$u(h1U1B6e&8tQrnC}Cy0GR=i^Uue26Rc6Dx}!4#K*0
zaxt`a+px7-Z!^(U1WN2#kdN#OeR|2z+C@b@w+L67VEi&ZpAdg+8`HJT=wIMJqibhT
ztb3PFzsq&7jzQuod3xp7uL?h-7rYao&0MiT_Bux;U*N#ebGv92o(jM2?`1!N2W_M*
zeo9$%hEtIy;=`8z1c|kL&ZPn0y`N)i$Y1R9>K!el{moiy)<VnmBl>014448YC#9=K
zwO3weN|8!`5bU_#f(+ZrVd*9`7Uw?!q?yo&7sk&DJ;#-^tcCtqt5*A(V;&LdHq7Hg
zI6sC@!ly9p$^@v&XDsgIuv;9#w^!C1n5+10-tEw~ZdO1kqMDYyDl!5__o}f3hYe2M
zCeO)~m&&=JZn%cVH3HzPlcE`9^@``2u+!Y}Remn)DLMHc-h5A9AT<F^D$MM~w$XEp
z&d>gs;7F7=u2=vBlDRbjeYvyNby=TvpI{5nb2@J_YTEEEj4q<@zaGSC_i&xxD!6)d
zG{1??({Ma<=Wd4JL%b<NaY`!IkN451t@(>nE<J_STA>XoBOU_0bbNy3p%mFrMW>#c
zzPEvryBevZVUvT^2P&Zobk#9j>vSIW_t?AHy>(^x-Bx<hLWbr;;>~(mvNYb_%$<TG
zLWL(;LPZ33IC~#ud(ba-8#0DVEO12ZrsW$Mj|>ZFg(s5~oka+Kp(GU68I$h(Vq|fZ
zC_u1FM|S)=ldt#5q>&p4r%%p)*7<!{co)ArAk&$ZW;U#xTB83(b%*uFr<Lg2M7-0d
zOZ9jceGmCxTxtvV_S>|Rf0}B#-FwHDTo*|P6HB_rz%R;{==hpl#xTt@VLdSrrf~g^
z`IA8ZV1b`UazYpnkn28h&U)$(gdZ*f{n`&kH%Oy54&Z;ebjlh4x?JmnjFAALu}EG}
zfGmQ$5vEMJMH`a=+*src#dWK&N1^LFxK9Sa#q_rja$JWra09we<2oL9Q9Sx)?kZFW
z$jhOFGE~VcihYlkaZv8?uA7v$*}?2h6i%Qmgc4n~3E(O_`YCRGy~}`N<L&({)KE4u
ze38<j{Fo5svQM#aAA%s|r2qh*62yK}3k2TZ2u-B8Iwj16C<&o(q79VdiDri^0IJVv
z{?=3Hjzg$^&KXKM=DndbW}box^VU#W!3lsSBsB=_@B&~VNdrPe5+y2D5CAVO7(l3W
z!3Rp&7DL$opXUMa(V{J+?kr*u(<eZZ7zRA~9vU}v_`x71mB0>Faj@(?Wz;<o@lF*Y
zPJ-A)%6o+55(crZ4&v3-z_#}kA`K!|H4m$3FVir|xL<J%2{AhdN1&<DV2w5aGA=V9
z7PWr|P}(fi1sI{%io?&-xG^wpSsh|qmN5u1{ll@y>GS_?T+RqU{S)eD1j$1Gr;C^m
z7zDK=xaJ^6``=#Y-2ssNfdRqh0ntJrutGV5Nv&WI%3k1wmD5n+0aRe{0k^!>LFReN
zx1g*E>nbyx03KU~UT6->+rG%(owLF=beJxK&a0F;ie1GZ^eKg-VEZb&=s&ajKS#6w
zjvC6J#?b|U_(%@uq$c#Q@V_me0S1%)pKz9--{EKwyM}_gOj*Og-NEWLDF_oFtPjG;
zXCZ7%#=s}RKr&_5RFN@=H(015AGl4XRN9Bc51`;WWt%vzQvzexDI2BZ@xP~^2$I&7
zA(ndsgLsmA*su8p<!2C(_wT7s$vc#OmC=G_8_bZ5D*3l8Uh=oBRl@%FLa=XQ5L;!x
zC8ob=SBR!=JEXHWDQi;&5j7o$M0<zG-*M<I3?ifJH_Ze(Y*D^ed;h;XCiEZ5>-~IS
q+ZJUZM}`4#Zi@l2F-#HCw*??ha2ta#9s8?H3%YId(*zJG6aF78h1yF1

delta 5107
zcmY*d1zc0@|J{HQlai7V5+f#EN-H%&UP4MFm6QgFfuJK4DG4u#ARsbQL4i>MB1q|w
zmWd#pqd~BR-yN@ieE-|$^W1aKIZtf&-p_fyw{(Uwc7_sWYDh^12cY!qX<V#Oc$!oI
z^ze*{3Ic)nU2~VFg#7Cem_(#a9RF7YsGz(cdN_%|t3oZ|AWS>vcPQ!qF;q@b0nYU7
zP&ht}K7j%}P%%|ffm;4F0^i3P0R`a!2wm89L5P3Kfu;tTZJre<{N5}AzsH+E3DS`Q
zJLIl`LRMf`JOTBLf(;IV(9(h{(}dXK!cPoSLm(o@fz8vRz}6fOw%3}3VYOsCczLF`
za2RTsCWa2sS-uw(6|HLJg)Xf@S8#|+(Z5Y)ER+v+8;btfB3&9sWH6<=U}0)o-jIts
zsi?Nko;No&JyZI%@1G&zsG5kKo^Zd7rk_9VIUao9;fC~nv(T0F&Af0&Rp`?x94EIS
zUBPyBe5R5#okNiB1Xe--q4|hPyGzhJ?Lurt#Ci09BQ+}rlHpBhm;EmfLw{EbCz)sg
zgseAE#f$met1jo;`Z6ihk?O1be3aa$IGV69{nzagziA!M*~E5lMc(Sp+NGm2IUjmn
zql((DU9QP~Tn1pt6L`}|$Na-v(P+Zg&?6bAN@2u%KiB*Gm<?92NU_sg*Zkqg)bp%(
z#`gEmKX~iapD-zWWyil}$ZQ=1H+vLY*)u!WswR{d*FmKvcq+iIcSKmt@O=w>f}Z)R
zMENRJgjKMqVbMpzPO{`!J~2Jyu7&xXnTDW?V?IJgy+-35q1)-J8T**?@_<p)gycKl
zqAOg!iLEVTi0c*D$`ZJ$n_Jh1J=$Ai<y4n2)VQFcpNga}Mq|Znnqn&D4fj_Dy<=Wc
zUVgJK|Hd-I%gF1^Zf*AbZ^L8asgKgtL~Y%k=Kk|_wOHIg*ymaJsvFl>-2H`%X+6f5
zIRv`uLp&*?g7L~6+3O*saXT~gWsmhF*FNKw4X$29ePKi02G*)ysenhHv{u9-y?_do
ztT(Cu04pk>51n}zu~=wgToY5Cx|MTlNw}GR>+`|6CAhQn=bh@S<7N)`w};;KTywDU
z=QWO@RBj$WKOXSgCWg{BD`xl&DS!G}`Mm3$)=%3jzO_C+s+mfTFH5JL><ai3bYVu;
zPc9>}*(JKs@MqX|o2b#ZBX5P;p7;c)$F1y4HwvJ?KA938$rd)gn_U^CcUtmdaBW57
zlPph>Fz&L`cSScFjcj+7Jif3vxb20Ag~FPstm?9#OrD$e?Y~#1osDB0CFZ9Mu&%iE
zSj~wZpFqu6!k%BT)}$F@Z%(d-Pqy07`N8ch2F7z^=S-!r-@j{#&{SM@a8O$P#SySx
zZLD_z=I300OCA1YmKV0^lo@>^)THfZvW}s<$^w^#^Ce=kO5ymAnk>H7pK!+NJ-+F7
z1Bb6Y=r)0nZ+hRXUyD+BKAyec&#6Zxb+$JTHK5k(nWv*5%2a+u*GDt|rpReYQ}vft
zXrIt#!kGO85o^~|9Oc-M5A!S@9Q)O$$&g8u>1=ew?T35h8B{-Z_S78oe=E<wxbRTx
zom$aDgZh48#8@4>(-YZhBPe@Y1sUt63A-Cdv><R1jOn<_?#-0X{!n+d`5prIeh~8L
zTrSbJxO1*?PQszi>D1nIT~=Rub6$?8g>meFb7Ic@w^%@RN2z72oPZ#Ta%b(P1|&6I
z61iO<8hT*)p19Bgd0JgXP{^c{P2~K@^DIXv=dF(u|DFfqD^dMIl8-x)xKIpJRZru@
zDxicyYJG}mh}=1Dfg%B$#H`CiAxPTj^;f4KRMZHUz-_x6)lEq!^mu<iIHd_oQBtwo
zO8*?fg$<fC#`leTFh;M$_n{l;uh@7*u*}1w*Yf$!3D;cI>%72*PI=t$6{Uql#dqm4
zClgaN63!&?v*enz4k1sbaM+yCqUf+i9rw$(YrY%ir1+%cWRB<;r}$8si!6QcNAk~J
zk3?dejBaC`>=T<=y=>QVt*4kL>SwYwn$(4ES793qaH)>n(axyV3R5jdXDh#e-N0K-
zuUgk|N^|3*D1!Wlz-!M*b}Zc5=;K6I+>1N$&Q<Pc_ApAPb3y@;3g_ZHx1ly20yT*#
zYRANGkS-l-tb~8K=lhhzqcs?IjMPlM9#zM!z8)nkWWv>%)&8LWUiTYi&aQIj(luA<
zN5R<8Y8L#*i0xBio$jWcaiZ4S2w3#R@CGemesy~akKP)2GojQF6!$}!_RdUJPBevX
zG#~uz%Yirb0@1wgQ;ayb=qD}6{=QXxjuZQ@@kxbN!QWhtEvuhS2yAZe8fZy6*4Inr
zdSyR9Dec4HrE|I=z-U;IlH;_h#7e^Hq}gaJ<-z^}{*s!m^66wu2=(*EM0UaV*&u1q
zJrq!K23TO8a(ecSQFdD$y+`xu)Xk36Z*;1i{hS=H2E<8<5yHuHG~22-S+Jq|3HMAw
z%qBz3auT=M!=5F|Wqke|I^E8pmJ-}>_DwX5w%d3MSdC>xW%$ocm8w8HRdZ|^#cEt1
zM*I7S6sLQq;;Mecet(Q()+?s+&MeVLOvx}(MkvytkvLHl7h*N0AT1#AqC&(<XN3@s
zmRqf*{&8ENHm9soX~|Fa8b{9AS7JOhLl{N8bc*RcRsEO)hJdXg{e7mxAjVJ1{RUGJ
zxG@jr<mpv%K+Y&Jk>he(^%przH`KqA$z_dAvJJb409@F)fYwD$JW_{_Oie8!@VdJE
zU>D$@B?LawAf5$;`AZ1E!krn=aAC%4+YQrzL!59yl1;|T2)u=RBYA8lk0Ek&gS!Rb
zt0&hV<WHgk#J%`H+0d(vlId?mX9y1$zW})X^s&3>uyhSa0}rpZGjTA>Gz}>Uv*4)F
zf7S%D2nfA7x?gPEXZWk8DZimQs#xi0?So_k`2zb!UVQEAcbvjPLK9v>J~!awnxGpq
zEh$EPOc4q&jyw<CL|~N7(;HILyh~*)4G1sXWYQgV*M1ji=i=i_@$dSIMqJg5uKVU6
zi^6VY$P!MvSEJb4y90cGUYH^%m=B7I>mglnC&D)1-P0DH!@)x;uJw<CP#PlfT*^@u
zRuKZ{2>MHdhPh>ZLWDw+p1pf52{X2dk{_|UOmakJa4MHu?CY`6Hhv!!d7=aNwiB5z
zb*Wlq1zf^3iDlPf)b_SzI*{JCx2jN;*s~ra8NeB!PghqP!<rQDRq;B}G*PUJD@vIj
z;C6jBwS;q8$EJ)j7zSA+D>0po-ZL?0Jk;2~*~sCQ<%wU`mRImd)~!23RS?XJu|{u(
ztFPy<vpe5jEQTua>3&#7*F=ZhJmBugTv48WX)4U*pNmm~4oD4}$*-92&<)n=R)5lT
z-VpbE<i30X?Pttyew{R-g}eT>Dk<Yhhi9i<yGq5K@zGX>>(C1hoo#-H_u0`#%L6L$
zln(}h2*Cl(5(J<Tz=It(XT8XIz#I6nQX)=PEIztQ%K*YEU29cobr&@NlZ5)zj7hx}
zDEAE^x#0#pH!EJMeT}N$r~4v2Dpxz48B&Y|=5|$^3=Eu_Ti<=ePwjoRS3EfT`?qW)
z?wf%wgjLR=9Y%LT`$4*lurt>tVM{YZ26@Fwmp;?Qt}9$_F%`?+-JHbC;bPZj8PLq9
zWo-KFw!i&r8WuA-!3F_m9!24Z(RhalA<bh~E{qZqar}%@R}8vtLiuA0Zn;vs5)@wK
z%GO-V%0xt$1es%u<-f7K6{p`%vYe(Lx15;AXAB9}FV&)BP*+9>UR~_H#Ln=$%b5GY
z)oB)zO%J5TY}&BXq^7#M>euVL%01Tzj4$6^ZOjT*7@zr~q@6GEjGi)nbwzSL`TiLN
z{DVG~I$w@%^#tD{>1Ap@%=XogG_^Hv<U9UwDbWg+D<oelx8<#d;cTPj&-Y1NmfZ}t
zwKWu?PVa|hUH}dc%(<<#Ug(tCv$Q8uPe~axaQs4SNZ7)#vDPt>y_xiRn4yy?LKsC+
zU!S79X8orh&D%>1S`x2iyi&(iG&r#YT{}~iy(FIOo8?MZU#eo*c*(RjA<J>Gj@uDi
zARJur)-*{n0PgW~&mFeg`MJ?(Kr;NUom)jh?ozZtyywN9bea6ikQlh}953Oul~N%4
z@Sx!@>?l1e7V*@HZMJx!gMo0TeXdU~#W6^n?YVQJ$)nuFRkvKbfwv_s*2g(!wPO|@
zvuXF=2MiPIX)A7x!|BthSa$GB%ECnuZe_Scx&AlnC<a0qE<aiozLDSzdCEd$i-<O1
z|I~hiAXSSYtQK4FdJ!m3u@p?pM;KR#*+iR-n_0rJj?;!P#~H7c!s|owv6hPkE%27M
z%e;0KTndR6^w4=**wjo^^yYSC@f!Ob@9DT`zAa??fVh~<?%C&9kDWSehJ`hcTwNO>
z!~6C_SF24#@^VMIw)a-7{00}}Cr5NImPbW8OTIHoo6@NcxLVTna8<<;uy~YaaeMnd
z;k_ynYc_8jQn9vW_W8QLkgaHtmwGC}wRcgZ^I^GPbz{lW)p#YYoinez1MjkY%6LBd
z+Vr>j&^!?b-*Vk>8I!28o`r3w&^Lal8@=50zV4&9V9oXI{^r8;JmVeos&wf?O!;_o
zk))^k*1fvYw9?WrS!sG2TcX`hH@Y3mF&@{i05;_AV{>Umi8{uZP_0W5_1V2yHU<)E
z+qviK*7SJtnL;76{WK!?Pv$-!w$08<%8Qy|sB|P%GiV1<+dHw*sj!<s4Cse}D^xfk
zG+~WO=m*V4%GuX-AGHtiF{~|iqnihmQ8|7JKWW<-^s&Bz=}0rZK1?b6MS`&t$}-3&
z9~=JefOZ_WFLu3Pe=Aw+wR6-}{$`*Msq7efu`Xf4x$SCd7>C~SjsB6+1L@so+Q~n#
z+Uc5+Uz+mGmkR@>H7D*c?mm8WQz;3VOpktU_DeB<SvcXP*5DM9;rOS*6B?3A0jfG7
z55f)SWMEvaV#x!&dUbt+Oa;#KM#2PcC1Y&!!}&R*ocvoaEe$ieRSlYD3v?>i>3#@z
z<juz3O1%}Q6Jq@00b;WFk<RXV*~qMW!T05`2-d1k{-K-HU&@e{yA{rnCx5RlbARmE
z|3p1&$@2j5o7*0j^81wr*B<YUHzym5*gfKobDApUT9lziJX1AF=)TBOh-oDQpZFUC
zB&gj_sa;#5hTr2WhA^>mLe;3gP<7KPy><E2qGUp%beY}6nBPA5Q#e0c0TUR*1LTHO
zfPs0i0#>~k47nEeT?G?7e2g6316Xdb_y+ja5C9Ayg6QTNr~&Kbs(1>7zp|f@le;9B
z1e(+Ga%jPWR7oc}=XcB4$z?YD)l;%#U;}~gZzGViI=fwu9OAPCCK!0w>Ay^#$b49k
zT&|M?JaIyRT<;@*t_jp1ifWPvL;{maf6o0T#X<CN@*>!#9YX;0Q;LTQ0<fP_|Kq8g
z5(Uxdlmpl*PG1Gv{An^in6?7jryK~tZ$<?~+dK%MeMXI3;FC>}0tg^_Ru4pkSr4#P
zm<we6yK^`y?t#WRYfzn(LjV%<aEbysU<QQ*Z0EtHgF7H3G#_|8uM6TCB?LYATHx?g
z7*(WnXp>nW|D0`A#Ie6pEfBDv39=jN2;kiUoT6I&kChsbI!jMuY6zuZql5!&i%5!c
zjsHlXtjT;NV?jAb`%vy)JOK_j1rponLqc>(2qgYlLPEs>|0QV<=Pw~C`fLFKJJitt
zyC6003{rxCsmtGKjhB%W2W~*%vKH8l$pZoOFT*K@uL9%C<TZm=jfwgHehP#cvaVSS
zXp#{BDu6$U5lRHlSpiiqx}%8<y%0bX2@Yifup}Pfh8F{{Nun0{`%fS4(V!3rf)WCe
zJ{lVWDU2HQ1q5EP12QXu|FQqw3_u`~|Ihxx|In@xz;!hDvlS$TX2>D^3rh=ZtuTU1
zJpf4|%n^yjh#dKSSCJI8;YU*CD!8Wv20*e5`-fya^75@ADLU^RdHDg3Bk3k6)dGi7
z!<q;<#1u$0XCD$w5C1MtWgSTonR`eFt%J`Hke2t~o5(ZoP~v|=1N5wuS1wiZUzw)l
zNao%kUxU*dNQ&OFKP1D^YGOcot_7q8j;H~UN@)YC+695lHcmi#ll+*U*+fzVwu9u~
zn<N3Gnh1v@GWPHubzcVQp8i7`J4^$d+9J=cy@jNZ82&@DbC?>!z;|O1h$8q!vO*w6
I6Xdi10eY*&F8}}l

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index bdc9a83b1e..37aef8d3f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d65..79a61d421c 100755
--- a/gradlew
+++ b/gradlew
@@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/src/com/amazon/ion/impl/IonBinary.java b/src/com/amazon/ion/impl/IonBinary.java
index a846239c51..8016154410 100644
--- a/src/com/amazon/ion/impl/IonBinary.java
+++ b/src/com/amazon/ion/impl/IonBinary.java
@@ -1516,11 +1516,11 @@ public Integer readVarIntWithNegativeZero() throws IOException
                 if (retvalue != 0) {
                     // this is correct even when retvalue == Long.MIN_VALUE
                     retvalue = -retvalue;
-                    retInteger = new Integer(retvalue);
+                    retInteger = Integer.valueOf(retvalue);
                 }
             }
             else {
-                retInteger = new Integer(retvalue);
+                retInteger = Integer.valueOf(retvalue);
             }
             return retInteger;
         }
diff --git a/src/com/amazon/ion/impl/SimpleByteBuffer.java b/src/com/amazon/ion/impl/SimpleByteBuffer.java
index 0eb06a97a4..a958d90529 100644
--- a/src/com/amazon/ion/impl/SimpleByteBuffer.java
+++ b/src/com/amazon/ion/impl/SimpleByteBuffer.java
@@ -369,11 +369,11 @@ public Integer readVarInteger() throws IOException
             Integer retInteger = null;
             if (is_negative) {
                 if (retvalue != 0) {
-                    retInteger = new Integer(-retvalue);
+                    retInteger = Integer.valueOf(-retvalue);
                 }
             }
             else {
-                retInteger = new Integer(retvalue);
+                retInteger = Integer.valueOf(retvalue);
             }
             return retInteger;
         }
diff --git a/src/com/amazon/ion/impl/lite/IonFloatLite.java b/src/com/amazon/ion/impl/lite/IonFloatLite.java
index 551ceb6d84..4b142899fe 100644
--- a/src/com/amazon/ion/impl/lite/IonFloatLite.java
+++ b/src/com/amazon/ion/impl/lite/IonFloatLite.java
@@ -108,13 +108,13 @@ public BigDecimal bigDecimalValue()
     public void setValue(float value)
     {
         // base set value will check for the lock
-        setValue(new Double(value));
+        setValue(Double.valueOf(value));
     }
 
     public void setValue(double value)
     {
         // base setValue will check for the lock
-        setValue(new Double(value));
+        setValue(Double.valueOf(value));
     }
 
     public void setValue(BigDecimal value)
diff --git a/src/com/amazon/ion/impl/lite/IonTimestampLite.java b/src/com/amazon/ion/impl/lite/IonTimestampLite.java
index 7696d10f4b..4ba260f441 100644
--- a/src/com/amazon/ion/impl/lite/IonTimestampLite.java
+++ b/src/com/amazon/ion/impl/lite/IonTimestampLite.java
@@ -212,7 +212,7 @@ public void setLocalOffset(int minutes)
         throws NullValueException
     {
         // setLocalOffset(Integer) will check for the lock
-        setLocalOffset(new Integer(minutes));
+        setLocalOffset(Integer.valueOf(minutes));
     }
 
 
diff --git a/test/com/amazon/ion/IntTest.java b/test/com/amazon/ion/IntTest.java
index 969098362d..7401a3eaa6 100644
--- a/test/com/amazon/ion/IntTest.java
+++ b/test/com/amazon/ion/IntTest.java
@@ -291,7 +291,7 @@ public void testReadOnlyInt()
         assertEquals(1, v.intValue());
 
         try {
-            v.setValue(new Long(2));
+            v.setValue(Long.valueOf(2));
             fail("Expected exception for modifying read-only value");
         }
         catch (ReadOnlyValueException e) { }
diff --git a/test/com/amazon/ion/JavaNumericsTest.java b/test/com/amazon/ion/JavaNumericsTest.java
index 381174f1be..15d9a63454 100644
--- a/test/com/amazon/ion/JavaNumericsTest.java
+++ b/test/com/amazon/ion/JavaNumericsTest.java
@@ -28,8 +28,8 @@ public class JavaNumericsTest
     @Test
     public void testDoubleEquality()
     {
-        Double posZeroDotZero = new Double( 0.0d);
-        Double negZeroDotZero = new Double(-0.0d);
+        Double posZeroDotZero = Double.valueOf( 0.0d);
+        Double negZeroDotZero = Double.valueOf(-0.0d);
 
         // Object Double can distinguish +/- zero
         assertFalse(negZeroDotZero.equals(posZeroDotZero));
@@ -42,7 +42,7 @@ public void testDoubleEquality()
         assertTrue(Double.compare(-0.0d, 0.0d) < 0);
 
         // Neither type can distinguish by precision
-        assertTrue(new Double(0.0d).equals(new Double(0.00000d)));
+        assertTrue(Double.valueOf(0.0d).equals(Double.valueOf(0.00000d)));
         assertTrue(0.0d == 0.00000d);
     }
 
@@ -64,9 +64,9 @@ public void testDoublePrinting()
         assertEquals("-0.0", "" + -0.0d);
         assertEquals("-0.0", "" + -0.00d);
 
-        assertEquals("-0.0", "" + new Double(-0.d));
-        assertEquals("-0.0", "" + new Double(-0.0d));
-        assertEquals("-0.0", "" + new Double(-0.00d));
+        assertEquals("-0.0", "" + Double.valueOf(-0.d));
+        assertEquals("-0.0", "" + Double.valueOf(-0.0d));
+        assertEquals("-0.0", "" + Double.valueOf(-0.00d));
     }
 
     /**
diff --git a/test/com/amazon/ion/SequenceTestCase.java b/test/com/amazon/ion/SequenceTestCase.java
index 2b46024cf6..2e3e51efc3 100644
--- a/test/com/amazon/ion/SequenceTestCase.java
+++ b/test/com/amazon/ion/SequenceTestCase.java
@@ -257,7 +257,7 @@ protected void testBadRemoves(IonSequence value)
         assertFalse(value.remove(nullBool1));
 
         try {
-            value.remove(new Integer(1));
+            value.remove(Integer.valueOf(1));
         }
         catch (ClassCastException e) { }
     }
@@ -375,7 +375,7 @@ public void testContainsAll()
 
         List<Object> empty = new ArrayList<Object>();
         List<Object> hasJavaNull = Arrays.asList((Object)null);
-        List<Integer> hasJavaInt = Arrays.asList(new Integer(0));
+        List<Integer> hasJavaInt = Arrays.asList(Integer.valueOf(0));
         List<Object> hasNull1 = Arrays.asList((Object)nullValue1);
         List<Object> hasNull2AndInt = Arrays.asList((Object)intValue1,
                                                     (Object)nullValue2);
@@ -486,7 +486,7 @@ public void testRemoveAll()
 
         List<Object> empty = new ArrayList<Object>();
         List<Object> hasJavaNull = Arrays.asList((Object)null);
-        List<Integer> hasJavaInt = Arrays.asList(new Integer(0));
+        List<Integer> hasJavaInt = Arrays.asList(Integer.valueOf(0));
         List<Object> hasNull1 = Arrays.asList((Object)nullValue1);
         List<Object> hasNull2AndInt = Arrays.asList((Object)intValue1,
                                                     (Object)nullValue2);
@@ -564,7 +564,7 @@ public void testRetainAll()
 
         List<Object> empty = new ArrayList<Object>();
         List<Object> hasJavaNull = Arrays.asList((Object)null);
-        List<Integer> hasJavaInt = Arrays.asList(new Integer(0));
+        List<Integer> hasJavaInt = Arrays.asList(Integer.valueOf(0));
         List<Object> hasNull1 = Arrays.asList((Object)nullValue1);
         List<Object> hasNull2AndInt = Arrays.asList((Object)intValue1,
                                                     (Object)nullValue2);
@@ -777,7 +777,7 @@ public void testIndexOf()
         }
         catch (NullPointerException e) { }
         try {
-            s.indexOf(new Integer(0));
+            s.indexOf(Integer.valueOf(0));
             fail("expected exception");
         }
         catch (ClassCastException e) { }
@@ -793,7 +793,7 @@ public void testIndexOf()
         }
         catch (NullPointerException e) { }
         try {
-            s.indexOf(new Integer(0));
+            s.indexOf(Integer.valueOf(0));
             fail("expected exception");
         }
         catch (ClassCastException e) { }
diff --git a/test/com/amazon/ion/TimestampTest.java b/test/com/amazon/ion/TimestampTest.java
index 85f8394c03..ede7f1d847 100644
--- a/test/com/amazon/ion/TimestampTest.java
+++ b/test/com/amazon/ion/TimestampTest.java
@@ -322,7 +322,7 @@ public void modifyTimestamp(IonTimestamp value)
         checkTimestamp(now, value);
         assertEquals(13, value.getLocalOffset().intValue());
 
-        value.setLocalOffset(new Integer(-60));
+        value.setLocalOffset(Integer.valueOf(-60));
         checkTimestamp(now, value);
         assertEquals(-60, value.getLocalOffset().intValue());
 
@@ -523,14 +523,14 @@ public void testPrecision()
     @Test
     public void testDateWithNormalTzd()
     {
-        checkTime(1969, 02, 22, 16, 0, 0, null, new Integer(-480),
+        checkTime(1969, 02, 22, 16, 0, 0, null, Integer.valueOf(-480),
                   "1969-02-22T16:00-08:00");
     }
 
     @Test
     public void testDateWithOddTzd()
     {
-        checkTime(1969, 02, 23, 1, 15, 0, new BigDecimal("0.00"), new Integer(75),
+        checkTime(1969, 02, 23, 1, 15, 0, new BigDecimal("0.00"), Integer.valueOf(75),
                   "1969-02-23T01:15:00.00+01:15");
     }
 
@@ -540,19 +540,19 @@ public void testLocalOffset()
         IonTimestamp value = (IonTimestamp) oneValue("1969-02-23T00:00+01:23");
         assertEquals(83, value.getLocalOffset().intValue());
 
-        checkTime(1969, 02, 23, 0, 0, 0, null, new Integer(83),
+        checkTime(1969, 02, 23, 0, 0, 0, null, Integer.valueOf(83),
                   "1969-02-23T00:00+01:23");
 
         value = (IonTimestamp) oneValue("2007-05-08T05:17-12:07");
         assertEquals(-727, value.getLocalOffset().intValue());
 
-        checkTime(2007, 5, 8, 5, 17, 0, null, new Integer(-727),
+        checkTime(2007, 5, 8, 5, 17, 0, null, Integer.valueOf(-727),
                   "2007-05-08T05:17-12:07");
 
         value = (IonTimestamp) oneValue("2007-05-08T05:17Z");
         assertEquals(0, value.getLocalOffset().intValue());
 
-        checkTime(2007, 5, 8, 5, 17, 0, null, new Integer(0),
+        checkTime(2007, 5, 8, 5, 17, 0, null, Integer.valueOf(0),
                   "2007-05-08T05:17Z");
 
     }
@@ -653,7 +653,7 @@ public void testBadSetLocalOffset()
         catch (NullValueException e) { }
 
         try {
-            value.setLocalOffset(new Integer(60));
+            value.setLocalOffset(Integer.valueOf(60));
             fail("Expected NullValueException");
         }
         catch (NullValueException e) { }
diff --git a/test/com/amazon/ion/TrueSequenceTestCase.java b/test/com/amazon/ion/TrueSequenceTestCase.java
index 8b1ea49edd..76341810c2 100644
--- a/test/com/amazon/ion/TrueSequenceTestCase.java
+++ b/test/com/amazon/ion/TrueSequenceTestCase.java
@@ -344,7 +344,7 @@ public void testNullSequenceContains()
         catch (NullPointerException e) { }
         try
         {
-            seq.contains(new Integer(0));
+            seq.contains(Integer.valueOf(0));
             fail("expected exception");
         }
         catch (ClassCastException e) { }
@@ -359,7 +359,7 @@ public void testNullSequenceContainsAll()
 
         List<Object> empty = new ArrayList<Object>();
         List<Object> hasJavaNull = Arrays.asList((Object)null);
-        List<Integer> hasJavaInt = Arrays.asList(new Integer(0));
+        List<Integer> hasJavaInt = Arrays.asList(Integer.valueOf(0));
         List<Object> hasNull = Arrays.asList((Object)nullValue);
         List<Object> hasNullAndInt = Arrays.asList((Object)intValue,
                                                    (Object)nullValue);
@@ -398,7 +398,7 @@ public void testNullSequenceRemoveAll()
 
         List<Object> empty = new ArrayList<Object>();
         List<Object> hasJavaNull = Arrays.asList((Object)null);
-        List<Integer> hasJavaInt = Arrays.asList(new Integer(0));
+        List<Integer> hasJavaInt = Arrays.asList(Integer.valueOf(0));
         List<Object> hasNull1 = Arrays.asList((Object)nullValue1);
         List<Object> hasNull2AndInt = Arrays.asList((Object)intValue1,
                                                     (Object)nullValue2);
@@ -437,7 +437,7 @@ public void testNullSequenceRetainAll()
 
         List<Object> empty = new ArrayList<Object>();
 //        List<Object> hasJavaNull = Arrays.asList((Object)null);
-//        List<Integer> hasJavaInt = Arrays.asList(new Integer(0));
+//        List<Integer> hasJavaInt = Arrays.asList(Integer.valueOf(0));
         List<Object> hasNull1 = Arrays.asList((Object)nullValue1);
         List<Object> hasNull2AndInt = Arrays.asList((Object)intValue1,
                                                     (Object)nullValue2);
@@ -489,7 +489,7 @@ public void testNullSequenceToArray()
         catch (NullPointerException e) { }
 
         // This may be required by spec, it's ambiguous.
-//        Integer[] intArray = new Integer[0];
+//        Integer[] intArray = Integer.valueOf[0];
 //        try
 //        {
 //            seq.toArray(intArray);
@@ -509,7 +509,7 @@ public void testNullSequenceIndexOf()
         }
         catch (NullPointerException e) { }
         try {
-            s.indexOf(new Integer(0));
+            s.indexOf(Integer.valueOf(0));
             fail("expected exception");
         }
         catch (ClassCastException e) { }
diff --git a/test/com/amazon/ion/streaming/BinaryStreamingTest.java b/test/com/amazon/ion/streaming/BinaryStreamingTest.java
index 692d1ef0d8..d51c163e09 100644
--- a/test/com/amazon/ion/streaming/BinaryStreamingTest.java
+++ b/test/com/amazon/ion/streaming/BinaryStreamingTest.java
@@ -398,61 +398,61 @@ public void testAllValues()
                new TestValue("bool_true",     IonType.BOOL, Boolean.TRUE),
                new TestValue("bool_false",    IonType.BOOL, Boolean.FALSE),
 
-               new TestValue("int0",          IonType.INT, new Integer(0) ),
-               new TestValue("intneg1",       IonType.INT, new Integer(-1) ),
-               new TestValue("int1",          IonType.INT, new Integer(1) ),
-               new TestValue("intneg32766",   IonType.INT, new Integer(-32766) ),
-               new TestValue("int32767",      IonType.INT, new Integer(32767) ),
-               new TestValue("int-2g",        IonType.INT, new Integer(-2000000000) ),
-               new TestValue("int2g",         IonType.INT, new Integer(2000000000) ),
+               new TestValue("int0",          IonType.INT, Integer.valueOf(0) ),
+               new TestValue("intneg1",       IonType.INT, Integer.valueOf(-1) ),
+               new TestValue("int1",          IonType.INT, Integer.valueOf(1) ),
+               new TestValue("intneg32766",   IonType.INT, Integer.valueOf(-32766) ),
+               new TestValue("int32767",      IonType.INT, Integer.valueOf(32767) ),
+               new TestValue("int-2g",        IonType.INT, Integer.valueOf(-2000000000) ),
+               new TestValue("int2g",         IonType.INT, Integer.valueOf(2000000000) ),
                new TestValue("intmin",        IonType.INT, Integer.MIN_VALUE ),
                new TestValue("intmax",        IonType.INT, Integer.MAX_VALUE ),
 
-               new TestValue("long0",         IonType.INT, new Long(0L) ),
-               new TestValue("long-1",        IonType.INT, new Long(-1L) ),
-               new TestValue("long1",         IonType.INT, new Long(1L) ),
-               new TestValue("long-4g",       IonType.INT, new Long(-4000000000L) ),
-               new TestValue("long4g",        IonType.INT, new Long(4000000000L) ),
-               new TestValue("longmin",       IonType.INT, new Long(Long.MIN_VALUE + 1) ),  // we don't reach all the way to MIN_VALUE since we have to negate it for writing (to get the positive value)
-               new TestValue("longmin2",      IonType.INT, new Long(-Long.MAX_VALUE) ),
+               new TestValue("long0",         IonType.INT, Long.valueOf(0L) ),
+               new TestValue("long-1",        IonType.INT, Long.valueOf(-1L) ),
+               new TestValue("long1",         IonType.INT, Long.valueOf(1L) ),
+               new TestValue("long-4g",       IonType.INT, Long.valueOf(-4000000000L) ),
+               new TestValue("long4g",        IonType.INT, Long.valueOf(4000000000L) ),
+               new TestValue("longmin",       IonType.INT, Long.valueOf(Long.MIN_VALUE + 1) ),  // we don't reach all the way to MIN_VALUE since we have to negate it for writing (to get the positive value)
+               new TestValue("longmin2",      IonType.INT, Long.valueOf(-Long.MAX_VALUE) ),
                new TestValue("longmax",       IonType.INT, Long.MAX_VALUE ),
 
-               new TestValue("float_0",       IonType.FLOAT, new Float(0.0) ),
-               new TestValue("float_n0",      IonType.FLOAT, new Float(-0.0) ),
-               new TestValue("float_a",       IonType.FLOAT, new Float(-1.0) ),
-               new TestValue("float_b",       IonType.FLOAT, new Float(1.0) ),
-               new TestValue("float_c",       IonType.FLOAT, new Float(-1e10) ),
-               new TestValue("float_d",       IonType.FLOAT, new Float(1e-10) ),
-               new TestValue("float_e",       IonType.FLOAT, new Float(0.1) ),
-               new TestValue("float_f",       IonType.FLOAT, new Float(-0.1) ),
+               new TestValue("float_0",       IonType.FLOAT, Float.valueOf(0.0f) ),
+               new TestValue("float_n0",      IonType.FLOAT, Float.valueOf(-0.0f) ),
+               new TestValue("float_a",       IonType.FLOAT, Float.valueOf(-1.0f) ),
+               new TestValue("float_b",       IonType.FLOAT, Float.valueOf(1.0f) ),
+               new TestValue("float_c",       IonType.FLOAT, Float.valueOf(-1e10f) ),
+               new TestValue("float_d",       IonType.FLOAT, Float.valueOf(1e-10f) ),
+               new TestValue("float_e",       IonType.FLOAT, Float.valueOf(0.1f) ),
+               new TestValue("float_f",       IonType.FLOAT, Float.valueOf(-0.1f) ),
                new TestValue("float_g",       IonType.FLOAT, Float.MIN_VALUE ),
                new TestValue("float_h",       IonType.FLOAT, Float.MAX_VALUE ),
                new TestValue("float_i",       IonType.FLOAT, Float.NaN ),
                new TestValue("float_j",       IonType.FLOAT, Float.NEGATIVE_INFINITY ),
                new TestValue("float_k",       IonType.FLOAT, Float.POSITIVE_INFINITY ),
 
-               new TestValue("double_0",      IonType.FLOAT, new Double(0.0) ),
-               new TestValue("double_n0",     IonType.FLOAT, new Double(-0.0) ),
-               new TestValue("double_a",      IonType.FLOAT, new Double(-1.0) ),
-               new TestValue("double_b",      IonType.FLOAT, new Double(1.0) ),
-               new TestValue("double_c",      IonType.FLOAT, new Double(-1e10) ),
-               new TestValue("double_d",      IonType.FLOAT, new Double(1e-10) ),
-               new TestValue("double_e",      IonType.FLOAT, new Double(0.1) ),
-               new TestValue("double_f",      IonType.FLOAT, new Double(-0.1) ),
+               new TestValue("double_0",      IonType.FLOAT, Double.valueOf(0.0) ),
+               new TestValue("double_n0",     IonType.FLOAT, Double.valueOf(-0.0) ),
+               new TestValue("double_a",      IonType.FLOAT, Double.valueOf(-1.0) ),
+               new TestValue("double_b",      IonType.FLOAT, Double.valueOf(1.0) ),
+               new TestValue("double_c",      IonType.FLOAT, Double.valueOf(-1e10) ),
+               new TestValue("double_d",      IonType.FLOAT, Double.valueOf(1e-10) ),
+               new TestValue("double_e",      IonType.FLOAT, Double.valueOf(0.1) ),
+               new TestValue("double_f",      IonType.FLOAT, Double.valueOf(-0.1) ),
                new TestValue("double_g",      IonType.FLOAT, Double.MIN_VALUE ),
                new TestValue("double_h",      IonType.FLOAT, Double.MAX_VALUE ),
                new TestValue("double_i",      IonType.FLOAT, Double.NaN ),
                new TestValue("double_j",      IonType.FLOAT, Double.NEGATIVE_INFINITY ),
                new TestValue("double_k",      IonType.FLOAT, Double.POSITIVE_INFINITY ),
 
-               new TestValue("bdd_0",         IonType.DECIMAL, new Double(0.0) ),
-               new TestValue("bdd_n0",        IonType.DECIMAL, new Double(-0.0) ),
-               new TestValue("bdd_a",         IonType.DECIMAL, new Double(-1.0) ),
-               new TestValue("bdd_b",         IonType.DECIMAL, new Double(1.0) ),
-               new TestValue("bdd_c",         IonType.DECIMAL, new Double(-1e10) ),
-               new TestValue("bdd_d",         IonType.DECIMAL, new Double(1e-10) ),
-               new TestValue("bdd_e",         IonType.DECIMAL, new Double(0.1) ),
-               new TestValue("bdd_f",         IonType.DECIMAL, new Double(-0.1) ),
+               new TestValue("bdd_0",         IonType.DECIMAL, Double.valueOf(0.0) ),
+               new TestValue("bdd_n0",        IonType.DECIMAL, Double.valueOf(-0.0) ),
+               new TestValue("bdd_a",         IonType.DECIMAL, Double.valueOf(-1.0) ),
+               new TestValue("bdd_b",         IonType.DECIMAL, Double.valueOf(1.0) ),
+               new TestValue("bdd_c",         IonType.DECIMAL, Double.valueOf(-1e10) ),
+               new TestValue("bdd_d",         IonType.DECIMAL, Double.valueOf(1e-10) ),
+               new TestValue("bdd_e",         IonType.DECIMAL, Double.valueOf(0.1) ),
+               new TestValue("bdd_f",         IonType.DECIMAL, Double.valueOf(-0.1) ),
                new TestValue("bdd_g",         IonType.DECIMAL, Double.MIN_VALUE ),
                new TestValue("bdd_h",         IonType.DECIMAL, Double.MAX_VALUE ),
 //                   new TestValue("bdd_i",         IonType.DECIMAL, Double.NaN ),
@@ -503,7 +503,7 @@ public void testAllValues()
                new TestValue("symbol_7",       IonType.SYMBOL, "123456789012345"),
                new TestValue("symbol_8",       IonType.SYMBOL, "\0\u001f\uffff"),
 
-               new TestValue("symbol_9",       IonType.SYMBOL, new Integer(1) ),
+               new TestValue("symbol_9",       IonType.SYMBOL, Integer.valueOf(1) ),
 
                new TestValue("clob_1",       IonType.CLOB, _testbytes1),
                new TestValue("clob_2",       IonType.CLOB, _testbytes2),

From c84cbc1a3aaec1ad01ecc1594b35381081f132b2 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 28 Jun 2023 11:42:02 -0700
Subject: [PATCH 198/490] Removes redundant AllTests suite.

---
 test/AllTests.java | 243 ---------------------------------------------
 1 file changed, 243 deletions(-)
 delete mode 100644 test/AllTests.java

diff --git a/test/AllTests.java b/test/AllTests.java
deleted file mode 100644
index 8ed4056d4b..0000000000
--- a/test/AllTests.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-import com.amazon.ion.AnnotationEscapesTest;
-import com.amazon.ion.AssertionsEnabledTest;
-import com.amazon.ion.BadIonTest;
-import com.amazon.ion.BinaryReaderWrappedValueLengthTest;
-import com.amazon.ion.BinaryTest;
-import com.amazon.ion.BlobTest;
-import com.amazon.ion.BoolTest;
-import com.amazon.ion.ClobTest;
-import com.amazon.ion.CloneTest;
-import com.amazon.ion.DatagramTest;
-import com.amazon.ion.DecimalTest;
-import com.amazon.ion.EquivTimelineTest;
-import com.amazon.ion.EquivsTest;
-import com.amazon.ion.ExtendedDecimalTest;
-import com.amazon.ion.FieldNameEscapesTest;
-import com.amazon.ion.FloatTest;
-import com.amazon.ion.GoodIonTest;
-import com.amazon.ion.HashCodeCorrectnessTest;
-import com.amazon.ion.HashCodeDeltaCollisionTest;
-import com.amazon.ion.HashCodeDistributionTest;
-import com.amazon.ion.IntTest;
-import com.amazon.ion.IonExceptionTest;
-import com.amazon.ion.IonRawWriterBasicTest;
-import com.amazon.ion.IonRawWriterSymbolsTest;
-import com.amazon.ion.IonReaderToIonValueTest;
-import com.amazon.ion.IonSystemTest;
-import com.amazon.ion.IonValueTest;
-import com.amazon.ion.JavaNumericsTest;
-import com.amazon.ion.ListTest;
-import com.amazon.ion.LoaderTest;
-import com.amazon.ion.LongStringTest;
-import com.amazon.ion.NonEquivsTest;
-import com.amazon.ion.NopPaddingTest;
-import com.amazon.ion.NullTest;
-import com.amazon.ion.RawValueSpanReaderBasicTest;
-import com.amazon.ion.impl.IonReaderBinaryRawLargeStreamTest;
-import com.amazon.ion.impl.IonReaderLookaheadBufferTest;
-import com.amazon.ion.impl.ResizingPipedInputStreamTest;
-import com.amazon.ion.impl.IonReaderBinaryIncrementalTest;
-import com.amazon.ion.impl.RawValueSpanReaderTest;
-import com.amazon.ion.RoundTripTest;
-import com.amazon.ion.SexpTest;
-import com.amazon.ion.StringFieldNameEscapesTest;
-import com.amazon.ion.StringTest;
-import com.amazon.ion.StructTest;
-import com.amazon.ion.SurrogateEscapeTest;
-import com.amazon.ion.SymbolTest;
-import com.amazon.ion.SystemProcessingTests;
-import com.amazon.ion.TimestampBadTest;
-import com.amazon.ion.TimestampGoodTest;
-import com.amazon.ion.TimestampTest;
-import com.amazon.ion.ValueFactorySequenceTest;
-import com.amazon.ion.facet.FacetsTest;
-import com.amazon.ion.impl.ByteBufferTest;
-import com.amazon.ion.impl.CharacterReaderTest;
-import com.amazon.ion.impl.IonImplUtilsTest;
-import com.amazon.ion.impl.IonMarkupWriterFilesTest;
-import com.amazon.ion.impl.IonMarkupWriterTest;
-import com.amazon.ion.impl.IonWriterTests;
-import com.amazon.ion.impl.IterationTest;
-import com.amazon.ion.impl.LocalSymbolTableTest;
-import com.amazon.ion.impl.SharedSymbolTableTest;
-import com.amazon.ion.impl.SymbolTableTest;
-import com.amazon.ion.impl.TreeReaderTest;
-import com.amazon.ion.impl.bin.IonManagedBinaryWriterGoodTest;
-import com.amazon.ion.impl.bin.IonManagedBinaryWriterTest;
-import com.amazon.ion.impl.bin.IonRawBinaryWriterTest;
-import com.amazon.ion.impl.bin.PooledBlockAllocatorProviderTest;
-import com.amazon.ion.impl.bin.WriteBufferTest;
-import com.amazon.ion.impl.lite.IonContextTest;
-import com.amazon.ion.impl.lite.SIDPresentLifecycleTest;
-import com.amazon.ion.streaming.BadIonStreamingTest;
-import com.amazon.ion.streaming.BinaryStreamingTest;
-import com.amazon.ion.streaming.GoodIonStreamingTest;
-import com.amazon.ion.streaming.InputStreamReaderTest;
-import com.amazon.ion.streaming.MiscStreamingTest;
-import com.amazon.ion.streaming.ReaderDomCopyTest;
-import com.amazon.ion.streaming.ReaderIntegerSizeTest;
-import com.amazon.ion.streaming.ReaderSkippingTest;
-import com.amazon.ion.streaming.ReaderTest;
-import com.amazon.ion.streaming.RoundTripStreamingTest;
-import com.amazon.ion.streaming.SpanTests;
-import com.amazon.ion.system.IonBinaryWriterBuilderTest;
-import com.amazon.ion.system.IonReaderBuilderTest;
-import com.amazon.ion.system.IonSystemBuilderTest;
-import com.amazon.ion.system.IonTextWriterBuilderTest;
-import com.amazon.ion.system.SimpleCatalogTest;
-import com.amazon.ion.util.EquivalenceTest;
-import com.amazon.ion.util.IonStreamUtilsTest;
-import com.amazon.ion.util.JarInfoTest;
-import com.amazon.ion.util.PrinterTest;
-import com.amazon.ion.util.TextTest;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-
-/**
- * Runs all tests for the Ion project.
- */
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-    // Low-level facilities.
-    AssertionsEnabledTest.class,
-    IonExceptionTest.class,
-    FacetsTest.class,
-    ByteBufferTest.class,
-    TextTest.class,
-    CharacterReaderTest.class,
-    JavaNumericsTest.class,
-    ExtendedDecimalTest.class,
-    IonImplUtilsTest.class,
-
-    // General framework tests
-    SimpleCatalogTest.class,
-
-    // Type-based DOM tests
-    IonValueTest.class,
-    BlobTest.class,
-    BoolTest.class,
-    ClobTest.class,
-    CloneTest.class,
-    DatagramTest.class,
-    DecimalTest.class,
-    FloatTest.class,
-    IntTest.class,
-    ListTest.class,
-    NullTest.class,
-    SexpTest.class,
-    StringTest.class,
-    LongStringTest.class,
-    StructTest.class,
-    SymbolTest.class,
-    TimestampTest.class,
-    TimestampGoodTest.class,
-    TimestampBadTest.class,
-
-    AnnotationEscapesTest.class,
-    FieldNameEscapesTest.class,
-    StringFieldNameEscapesTest.class,
-    SurrogateEscapeTest.class,
-
-    // Markup tests
-    IonMarkupWriterTest.class,
-    IonMarkupWriterFilesTest.class,
-
-    NopPaddingTest.class,
-
-    // Binary format tests
-    BinaryTest.class,
-
-    // Utility tests
-    JarInfoTest.class,
-    LoaderTest.class,
-    IterationTest.class,
-    PrinterTest.class,
-    SymbolTableTest.class,
-    SharedSymbolTableTest.class,
-    LocalSymbolTableTest.class,
-    IonContextTest.class,
-
-    // Equality tests
-    EquivalenceTest.class,
-    EquivsTest.class,
-    NonEquivsTest.class,
-    EquivTimelineTest.class,
-
-    // General processing test suite
-    GoodIonTest.class,
-    BadIonTest.class,
-    RoundTripTest.class,
-
-    // Some tests are collected to make it easier to run interesting subsets.
-    SystemProcessingTests.class,
-    IonWriterTests.class,
-    SpanTests.class,
-
-    IonStreamUtilsTest.class,
-    TreeReaderTest.class,
-    MiscStreamingTest.class,
-    BinaryStreamingTest.class,
-    ReaderTest.class,
-    InputStreamReaderTest.class,
-
-    BadIonStreamingTest.class,
-    GoodIonStreamingTest.class,
-    RoundTripStreamingTest.class,
-    ReaderDomCopyTest.class,
-    ReaderSkippingTest.class,
-    ReaderIntegerSizeTest.class,
-
-    IonSystemTest.class,
-    ValueFactorySequenceTest.class,
-    IonSystemBuilderTest.class,
-    IonTextWriterBuilderTest.class,
-    IonBinaryWriterBuilderTest.class,
-    IonReaderToIonValueTest.class,
-    BinaryReaderWrappedValueLengthTest.class,
-    IonReaderBuilderTest.class,
-    IonReaderBinaryRawLargeStreamTest.class,
-
-    // non-blocking binary reader tests
-    IonReaderBinaryIncrementalTest.class,
-    ResizingPipedInputStreamTest.class,
-    IonReaderLookaheadBufferTest.class,
-
-    // binary writer tests
-    PooledBlockAllocatorProviderTest.class,
-    WriteBufferTest.class,
-    IonRawBinaryWriterTest.class,
-    IonManagedBinaryWriterTest.class,
-    IonManagedBinaryWriterGoodTest.class,
-
-    // Hash code tests
-    HashCodeCorrectnessTest.class,
-    HashCodeDistributionTest.class,
-    HashCodeDeltaCollisionTest.class,
-
-    IonRawWriterBasicTest.class,
-    IonRawWriterSymbolsTest.class,
-    RawValueSpanReaderBasicTest.class,
-    RawValueSpanReaderTest.class,
-
-    // DOM Lifecycle / mode tests
-    SIDPresentLifecycleTest.class
-})
-public class AllTests
-{
-}

From 5391230b196cae20ed62191ef9c45ea28259272b Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 28 Jun 2023 16:45:22 -0700
Subject: [PATCH 199/490] Fixes concurrency stress test to avoid spurious
 failures.

---
 .../impl/IonRoundtripConcurrencyStressTest.java | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java b/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java
index 0a2fb07d5f..0fe6a857cb 100644
--- a/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java
+++ b/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java
@@ -30,8 +30,8 @@ public class IonRoundtripConcurrencyStressTest {
 
     private static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
     private static final IonReaderBuilder STANDARD_READER_BUILDER = IonReaderBuilder.standard()
-            .withIncrementalReadingEnabled(true);
-    private static final IonBinaryWriterBuilder STANDARD_WRITER_BUILDER = IonBinaryWriterBuilder.standard();
+            .withIncrementalReadingEnabled(true).immutable();
+    private static final IonBinaryWriterBuilder STANDARD_WRITER_BUILDER = IonBinaryWriterBuilder.standard().immutable();
     private static final Random RANDOM = new Random();
 
     @Rule public ConcurrentRule concurrently = new ConcurrentRule();
@@ -170,23 +170,16 @@ private static IonValue roundTrip(IonValue value) {
 
     private static byte[] toBytes(final IonValue ion) throws IOException {
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        final IonWriter out = STANDARD_WRITER_BUILDER.build(baos);
-        try {
+        try (IonWriter out = STANDARD_WRITER_BUILDER.build(baos)) {
             ion.writeTo(out);
         }
-        finally {
-            out.close();
-        }
         return baos.toByteArray();
     }
 
     private static IonValue toIon(final byte[] bytes) throws Exception {
-        final IonReader ionReader = STANDARD_READER_BUILDER.build(bytes);
-        try {
+        try (IonReader ionReader = STANDARD_READER_BUILDER.build(bytes)) {
             ionReader.next();
-        } finally {
-            ionReader.close();
+            return SYSTEM.newValue(ionReader);
         }
-        return SYSTEM.newValue(ionReader);
     }
 }

From fe230c61ec39bc610acf3f90622800ca2d52f2ac Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Tue, 11 Jul 2023 17:25:23 -0400
Subject: [PATCH 200/490] Makes IonSystemLite load values iteratively, not
 recursively (#499)

* Makes IonSystemLite load values iteratively, not recursively

`IonSystemLite` uses recursion to materialize an `IonReader`'s
current value into an `IonValueLite`. If the data is especially
deeply nested, this can lead to stack exhaustion.

This patch introduces a private helper class called `ValueLoader`
that performs the same logic iteratively, avoiding stack exhaustion
and mitigating the overhead of function call instructions.
---
 .../amazon/ion/impl/lite/IonSystemLite.java   | 337 ++++++++++--------
 .../ion/impl/lite/IonSystemLiteTest.java      |  33 ++
 2 files changed, 226 insertions(+), 144 deletions(-)
 create mode 100644 test/com/amazon/ion/impl/lite/IonSystemLiteTest.java

diff --git a/src/com/amazon/ion/impl/lite/IonSystemLite.java b/src/com/amazon/ion/impl/lite/IonSystemLite.java
index 2bc8cec3bd..4444632832 100644
--- a/src/com/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSystemLite.java
@@ -24,6 +24,7 @@
 import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
 import static com.amazon.ion.util.IonTextUtils.printString;
 
+import com.amazon.ion.IntegerSize;
 import com.amazon.ion.IonBinaryWriter;
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonContainer;
@@ -45,7 +46,6 @@
 import com.amazon.ion.impl._Private_IonReaderBuilder;
 import com.amazon.ion.impl._Private_IonSystem;
 import com.amazon.ion.impl._Private_IonWriterFactory;
-import com.amazon.ion.impl._Private_ScalarConversions.CantConvertException;
 import com.amazon.ion.impl._Private_Utils;
 import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.system.IonTextWriterBuilder;
@@ -317,156 +317,19 @@ public SymbolTable newSharedSymbolTable(String name,
 
     public IonValueLite newValue(IonReader reader)
     {
-        IonValueLite value = load_value_helper(reader, /*isTopLevel*/ true);
+        IonValueLite value = load_value_helper(reader);
         if (value == null) {
             throw new IonException("No value available");
         }
         return value;
     }
 
-    private IonValueLite load_value_helper(IonReader reader, boolean isTopLevel)
+    private IonValueLite load_value_helper(IonReader reader)
     {
-        boolean symbol_is_present = false;
-
-        IonType t = reader.getType();
-        if (t == null) {
-            return null;
-        }
-        IonValueLite v;
-        if (reader.isNullValue()) {
-            v = newNull(t);
-        }
-        else {
-            switch (t) {
-            case BOOL:
-                v = newBool(reader.booleanValue());
-                break;
-            case INT:
-                // TODO amazon-ion/ion-java/issues/9  Inefficient since we can't determine the size
-                // of the integer in order to avoid making BigIntegers.
-                v = newInt(reader.bigIntegerValue());
-                break;
-            case FLOAT:
-                v = newFloat(reader.doubleValue());
-                break;
-            case DECIMAL:
-                v = newDecimal(reader.decimalValue());
-                break;
-            case TIMESTAMP:
-                v = newTimestamp(reader.timestampValue());
-                break;
-            case SYMBOL:
-                v = newSymbol(reader.symbolValue());
-                symbol_is_present = true;
-                break;
-            case STRING:
-                v = newString(reader.stringValue());
-                break;
-            case CLOB:
-                v = newClob(reader.newBytes());
-                break;
-            case BLOB:
-                v = newBlob(reader.newBytes());
-                break;
-            case LIST:
-                v = newEmptyList();
-                break;
-            case SEXP:
-                v = newEmptySexp();
-                break;
-            case STRUCT:
-                v = newEmptyStruct();
-                break;
-            default: throw new IonException("unexpected type encountered reading value: "+t.toString());
-            }
-        }
-
-        // Forget any incoming SIDs on field names.
-        if (!isTopLevel && reader.isInStruct()) {
-            SymbolToken token = reader.getFieldNameSymbol();
-            String text = token.getText();
-            if (text != null && token.getSid() != UNKNOWN_SYMBOL_ID)
-            {
-                token = newSymbolToken(text, UNKNOWN_SYMBOL_ID);
-            }
-            v.setFieldNameSymbol(token);
-            symbol_is_present = true;
-        }
-
-        // Forget any incoming SIDs on annotations.
-        // This is a fresh array so we can modify it:
-        SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
-        if (annotations.length != 0)
-        {
-            for (int i = 0; i < annotations.length; i++)
-            {
-                SymbolToken token = annotations[i];
-                String text = token.getText();
-                if (text != null && token.getSid() != UNKNOWN_SYMBOL_ID )
-                {
-                    annotations[i] = newSymbolToken(text, UNKNOWN_SYMBOL_ID);
-                }
-            }
-            v.setTypeAnnotationSymbols(annotations);
-            symbol_is_present = true;
-        }
-
-        if (!reader.isNullValue()) {
-            switch (t) {
-            case BOOL:
-            case INT:
-            case FLOAT:
-            case DECIMAL:
-            case TIMESTAMP:
-            case SYMBOL:
-            case STRING:
-            case CLOB:
-            case BLOB:
-                break;
-            case LIST:
-            case SEXP:
-            case STRUCT:
-                // we have to load the children after we grabbed the
-                // fieldname and annotations off of the parent container
-                if (load_children((IonContainerLite)v, reader)) {
-                    symbol_is_present = true;
-                }
-                break;
-            default:
-                throw new IonException("unexpected type encountered reading value: "+t.toString());
-            }
-        }
-        if (symbol_is_present) {
-            v._isSymbolPresent(true);
-        }
-        return v;
-    }
-
-    /**
-     * @return true iff any child contains a symbol
-     * (including field names and annotations)
-     */
-    private boolean load_children(IonContainerLite container, IonReader reader)
-    {
-        boolean symbol_is_present = false;
-
-        reader.stepIn();
-        for (;;) {
-            IonType t = reader.next();
-            if (t == null) {
-                break;
-            }
-            IonValueLite child = load_value_helper(reader, /*isTopLevel*/ false);
-
-            container.add(child);
-
-            if (child._isSymbolPresent()) {
-                symbol_is_present = true;
-            }
-        }
-        reader.stepOut();
-
-        return symbol_is_present;
+        // Note: this method constructs a new `ValueLoader` on each call to preserve thread safety.
+        // If this causes excessive GC pressure, we should consider making a thread-local ValueLoader member field
+        // on the IonSystemLite class.
+        return new ValueLoader().load(reader);
     }
 
     IonValueLite newValue(IonType valueType)
@@ -822,4 +685,190 @@ public boolean valueIsSharedSymbolTable(IonValue value)
         return false;
     }
 
+    private class ValueLoader {
+        // This value was chosen somewhat arbitrarily; it can/should be changed if it is found to be insufficient.
+        private static final int CONTAINER_STACK_INITIAL_CAPACITY = 16;
+        private final ArrayList<IonContainerLite> containerStack;
+
+        private IonReader reader;
+
+        public ValueLoader() {
+            this.containerStack = new ArrayList<>(CONTAINER_STACK_INITIAL_CAPACITY);
+            // The reader is specified in each call to `load(IonReader)`.
+            this.reader = null;
+        }
+
+        // Does a shallow materialization of the value over which the reader is currently positioned.
+        // If the reader is positioned over a non-null container, the returned value will be an empty version
+        // of that container. Subsequent processing is required to populate it.
+        private IonValueLite shallowLoadCurrentValue() {
+            IonType ionType = reader.getType();
+            if (reader.isNullValue()) {
+                return newNull(ionType);
+            }
+
+            switch (ionType) {
+                case BOOL:
+                    return newBool(reader.booleanValue());
+                case INT:
+                    // Only construct a BigInteger if it's necessary.
+                    if (reader.getIntegerSize().equals(IntegerSize.BIG_INTEGER)) {
+                        return newInt(reader.bigIntegerValue());
+                    }
+                    return newInt(reader.longValue());
+                case FLOAT:
+                    return newFloat(reader.doubleValue());
+                case DECIMAL:
+                    return newDecimal(reader.decimalValue());
+                case TIMESTAMP:
+                    return newTimestamp(reader.timestampValue());
+                case SYMBOL:
+                    return newSymbol(reader.symbolValue());
+                case STRING:
+                    return newString(reader.stringValue());
+                case CLOB:
+                    return newClob(reader.newBytes());
+                case BLOB:
+                    return newBlob(reader.newBytes());
+                case LIST:
+                    return newEmptyList();
+                case SEXP:
+                    return newEmptySexp();
+                case STRUCT:
+                    return newEmptyStruct();
+                default:
+                    // Includes the variants `NULL` (handled prior to the switch) and `DATAGRAM`.
+                    throw new IonException("unexpected type encountered reading value: " + ionType);
+            }
+        }
+
+        // If the reader is positioned inside a struct, copies the field name to `value`.
+        // Note that this will NOT copy the field name over if the reader was inside a struct when `load(reader)` was
+        // called. For example, if a reader is consuming the following data:
+        //
+        //   {
+        //     foo: [1, 2, 3]
+        //   }
+        //
+        // And the reader is positioned on the field value `[1, 2, 3]` when the `load(reader)` was called, this
+        // method will NOT copy the field name `foo` over. ValueLoader treats the reader's initial state as the
+        // "top level" for the purposes of materializing the current value.
+        // For a test that enforces this behavior, see: IonReaderToIonValueTest.
+        // Returns `true` if the reader's current value has a field name; otherwise, returns false.
+        private boolean cloneFieldNameIfAny(IonValueLite value) {
+            if (containerStack.isEmpty() || !reader.isInStruct()) {
+                // This value is in a context that doesn't have a field name.
+                return false;
+            }
+            SymbolToken token = reader.getFieldNameSymbol();
+            String text = token.getText();
+            if (text != null && token.getSid() != UNKNOWN_SYMBOL_ID)
+            {
+                token = newSymbolToken(text, UNKNOWN_SYMBOL_ID);
+            }
+            value.setFieldNameSymbol(token);
+            return true;
+        }
+
+        // Copies any annotations found on the reader's current position over to the provided `value`.
+        // Returns `true` if more than any annotations were found/copied. If no annotations were found/copied,
+        // returns `false`.
+        private boolean cloneAnnotationsIfAny(IonValueLite value) {
+            // `getTypeAnnotationSymbols` returns a freshly allocated array, so we can safely modify it.
+            SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
+            if (annotations.length == 0) {
+                return false;
+            }
+
+            for (int i = 0; i < annotations.length; i++)
+            {
+                SymbolToken token = annotations[i];
+                String text = token.getText();
+                if (text != null && token.getSid() != UNKNOWN_SYMBOL_ID )
+                {
+                    annotations[i] = newSymbolToken(text, UNKNOWN_SYMBOL_ID);
+                }
+            }
+            value.setTypeAnnotationSymbols(annotations);
+            return true;
+        }
+
+        // Appends the provided value to the container at the top of the container stack.
+        // Callers must guarantee that the container stack is not empty before invoking this.
+        private void attachToParent(IonValueLite value) {
+            // Get a reference to the container at the top of the container stack.
+            IonContainerLite parent = this.containerStack.get(this.containerStack.size() - 1);
+            // If this is the first child value with its symbol-is-present flag set to `true`,
+            // then we also need to set the parent's symbol-is-present flag to true as well.
+            boolean childSymbolIsPresent = value._isSymbolPresent();
+            boolean parentSymbolIsPresent = parent._isSymbolPresent();
+            parent._isSymbolPresent(parentSymbolIsPresent | childSymbolIsPresent);
+            // Append the child value to the end of the container.
+            parent.add(value);
+        }
+
+        // Materializes the Ion value over which the provided `reader` is currently positioned.
+        // If the reader is not positioned over a value, returns `null`.
+        public IonValueLite load(IonReader reader) {
+            // Set `this.reader` for the duration of the load() process.
+            this.reader = reader;
+
+            // If a previous attempt to read Ion data failed (because of invalid syntax, for example), the ValueLoader's
+            // `containerStack` member field can be left with residual data. Clearing it at the outset of this method
+            // call allows the ValueLoader to be reused after such failures.
+            containerStack.clear();
+
+            // This method does not advance the reader to the next value at the current level.
+            // If the reader is not already positioned on a value, there is nothing to do.
+            if (null == reader.getType()) {
+                return null;
+            }
+
+            // This logic is done iteratively rather than recursively to avoid exhausting the stack when processing
+            // deeply nested Ion data. Unfortunately, this does make it somewhat tougher for readers to digest.
+            while(true) {
+                // Create an IonValueLite from the reader's current value. If it's a container, it will not be populated yet.
+                IonValueLite value = shallowLoadCurrentValue();
+                // Copy any over any metadata from the reader, keeping track of whether this value or its metadata contain
+                // a symbol.
+                boolean isSymbolPresent = value.getType().equals(IonType.SYMBOL);
+                isSymbolPresent |= cloneFieldNameIfAny(value);
+                isSymbolPresent |= cloneAnnotationsIfAny(value);
+                value._isSymbolPresent(isSymbolPresent);
+
+                // If this value is a non-null container, add it to our container stack.
+                if (!reader.isNullValue() && IonType.isContainer(reader.getType())) {
+                    this.containerStack.add((IonContainerLite) value);
+                    reader.stepIn();
+                } else {
+                    // If it was a scalar (including null containers)...
+                    if (this.containerStack.isEmpty()) {
+                        // ...and we're at the top level, we're done. Return it.
+                        return value;
+                    } else {
+                        // ...and we're nested inside another container, attach it to the parent.
+                        attachToParent(value);
+                    }
+                }
+
+                // If we're inside a container and there are no more values, that container is now complete. We need
+                // to finalize it. That completed container may itself have been the last value in its parent, so
+                // we perform this container completion logic in a loop until we've either found another value at the
+                // current level or the container stack is empty (i.e. all containers are complete).
+                while (!containerStack.isEmpty() && null == reader.next()) {
+                    // Pop the now-complete container value off of the stack.
+                    IonContainerLite completedContainer = containerStack.remove(containerStack.size() - 1);
+                    reader.stepOut();
+                    // If stepping out put us back at the top level, we're done. Return the container we just popped.
+                    if (this.containerStack.isEmpty()) {
+                        return completedContainer;
+                    } else {
+                        // Otherwise, we just finished populating a container, but we're not at the top level yet. We need
+                        // to append our newly populated container to the end of its parent.
+                        attachToParent(completedContainer);
+                    }
+                }
+            }
+        }
+    }
 }
diff --git a/test/com/amazon/ion/impl/lite/IonSystemLiteTest.java b/test/com/amazon/ion/impl/lite/IonSystemLiteTest.java
new file mode 100644
index 0000000000..952528867b
--- /dev/null
+++ b/test/com/amazon/ion/impl/lite/IonSystemLiteTest.java
@@ -0,0 +1,33 @@
+package com.amazon.ion.impl.lite;
+
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.system.IonSystemBuilder;
+import org.junit.jupiter.api.Test;
+
+import java.util.Iterator;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class IonSystemLiteTest {
+    // Confirms that the standard IonSystem can materialize Ion data that is deeply nested without
+    // exhausting the stack.
+    @Test
+    void materializeDeeplyNested() {
+        final int levelsOfNesting = 1_000_000;
+        final StringBuilder ionText = new StringBuilder(levelsOfNesting * 2);
+        for (int m = 0; m < levelsOfNesting; m++) {
+            ionText.append('[');
+        }
+        for (int m = 0; m < levelsOfNesting; m++) {
+            ionText.append(']');
+        }
+        IonSystem ionSystem = IonSystemBuilder.standard().build();
+        Iterator<IonValue> iterator = ionSystem.iterate(ionText.toString());
+        try {
+            iterator.next();
+        } catch (Exception e) {
+            fail("Encountered an exception: " + e);
+        }
+    }
+}
\ No newline at end of file

From bda2ec8f4da325579f42cd46231b07d2577af60c Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Mon, 17 Jul 2023 21:04:08 -0700
Subject: [PATCH 201/490] Removes support for reading decimal values as
 BigInteger

---
 src/com/amazon/ion/IonReader.java                    |  5 ++---
 .../amazon/ion/impl/IonReaderBinaryIncremental.java  | 12 +-----------
 src/com/amazon/ion/impl/IonReaderBinarySystemX.java  | 11 ++++++++++-
 src/com/amazon/ion/impl/IonReaderTextSystemX.java    | 11 ++++++++++-
 src/com/amazon/ion/impl/IonReaderTreeSystem.java     |  6 +-----
 test/com/amazon/ion/streaming/ReaderTest.java        | 12 ++++++++----
 6 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/com/amazon/ion/IonReader.java b/src/com/amazon/ion/IonReader.java
index f8e678737a..ae22818048 100644
--- a/src/com/amazon/ion/IonReader.java
+++ b/src/com/amazon/ion/IonReader.java
@@ -320,9 +320,8 @@ public interface IonReader
     public long longValue();
 
     /**
-     * Returns the current value as a {@link BigInteger}.  This is only valid if there
-     * is an underlying value and the value is of a numeric type (int, float, or
-     * decimal).
+     * Returns the current value as a {@link BigInteger}. This is only valid if there
+     * is an underlying value and the value is of type int or float.
      */
     public BigInteger bigIntegerValue();
 
diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
index f5487b7dbc..dc22c0ac3d 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
@@ -1520,18 +1520,8 @@ public BigInteger bigIntegerValue() {
                 value = scalarConverter.getBigInteger();
                 scalarConverter.clear();
             }
-        } else if (valueType == IonType.DECIMAL) {
-            if (isNullValue()) {
-                value = null;
-            } else {
-                scalarConverter.addValue(decimalValue());
-                scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.decimal_value);
-                scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.bigInteger_value));
-                value = scalarConverter.getBigInteger();
-                scalarConverter.clear();
-            }
         } else {
-            throw new IllegalStateException("longValue() may only be called on values of type int, float, or decimal.");
+            throw new IllegalStateException("bigIntegerValue() may only be called on values of type int or float.");
         }
         return value;
     }
diff --git a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
index f0f73723af..78bc9f16e1 100644
--- a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
+++ b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
@@ -321,9 +321,18 @@ public long longValue()
         return _v.getLong();
     }
 
+    private void checkIsBigIntegerApplicableType()
+    {
+        if (_value_type != IonType.INT &&
+                _value_type != IonType.FLOAT)
+        {
+            throw new IllegalStateException("Unexpected value type: " + _value_type);
+        }
+    }
+
     public BigInteger bigIntegerValue()
     {
-        checkIsIntApplicableType();
+        checkIsBigIntegerApplicableType();
 
         if (_value_is_null) {
             return null;
diff --git a/src/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
index 661fbd5c19..b04423034a 100644
--- a/src/com/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
@@ -551,10 +551,19 @@ public long longValue()
         return _v.getLong();
     }
 
+    private void checkIsBigIntegerApplicableType()
+    {
+        if (_value_type != IonType.INT &&
+                _value_type != IonType.FLOAT)
+        {
+            throw new IllegalStateException("Unexpected value type: " + _value_type);
+        }
+    }
+
     @Override
     public BigInteger bigIntegerValue()
     {
-        checkIsIntApplicableType();
+        checkIsBigIntegerApplicableType();
 
         load_or_cast_cached_value(AS_TYPE.bigInteger_value);
         if (_v.isNull()) return null;
diff --git a/src/com/amazon/ion/impl/IonReaderTreeSystem.java b/src/com/amazon/ion/impl/IonReaderTreeSystem.java
index 868e65104b..afbee306e3 100644
--- a/src/com/amazon/ion/impl/IonReaderTreeSystem.java
+++ b/src/com/amazon/ion/impl/IonReaderTreeSystem.java
@@ -323,11 +323,7 @@ public BigInteger bigIntegerValue()
             BigDecimal bd = ((IonFloat)_curr).bigDecimalValue();
             return (bd == null ? null : bd.toBigInteger());
         }
-        if (_curr instanceof IonDecimal)  {
-            BigDecimal bd = ((IonDecimal)_curr).bigDecimalValue();
-            return (bd == null ? null : bd.toBigInteger());
-        }
-        throw new IllegalStateException("current value is not an ion int, float, or decimal");
+        throw new IllegalStateException("current value is not an ion int or float");
     }
 
     public double doubleValue()
diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/test/com/amazon/ion/streaming/ReaderTest.java
index 219f222050..ba05b23835 100644
--- a/test/com/amazon/ion/streaming/ReaderTest.java
+++ b/test/com/amazon/ion/streaming/ReaderTest.java
@@ -31,6 +31,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Arrays;
+
+import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -246,10 +248,12 @@ public void testReadingDecimalAsLong()
     @Test
     public void testReadingDecimalAsBigInteger()
     {
-        assertEquals(readBigInteger("0."), readBigInteger("0"));
-        assertEquals(readBigInteger("null.decimal"), readBigInteger("null.int"));
-        assertEquals(readBigInteger("9223372036854775807."), readBigInteger("9223372036854775807")); // Max long
-        assertEquals(readBigInteger("2d24"), readBigInteger("2000000000000000000000000"));
+        try {
+            readBigInteger("0.");
+            Assert.fail();
+        } catch (Exception e) {
+            // Pass
+        }
     }
 
     @Test

From 3cd3c625e24d0de13d985870a694de4cbfbe9a86 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Tue, 18 Jul 2023 08:29:56 -0700
Subject: [PATCH 202/490] Prepare v1.10.0 release

---
 README.md       | 4 ++--
 project.version | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index fce4a80556..26ec33209d 100644
--- a/README.md
+++ b/README.md
@@ -60,14 +60,14 @@ dependency into your project's `pom.xml`:
 <dependency>
   <groupId>com.amazon.ion</groupId>
   <artifactId>ion-java</artifactId>
-  <version>1.9.6</version>
+  <version>1.10.0</version>
 </dependency>
 ```
 
 For Gradle (Kotlin DSL), use:
 ```kotlin
 dependencies {
-    implementation("com.amazon.ion:ion-java:1.9.6")
+    implementation("com.amazon.ion:ion-java:1.10.0")
 }
 ```
 
diff --git a/project.version b/project.version
index 2a0494fd4e..81c871de46 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.9.7-SNAPSHOT
+1.10.0

From ba74798efef4f3498ec53e3c9c8063b41de7d53f Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Tue, 18 Jul 2023 09:37:30 -0700
Subject: [PATCH 203/490] Bumps version to 1.10.1-SNAPSHOT

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 81c871de46..b73edae427 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.0
+1.10.1-SNAPSHOT

From 0c0e3a010cf4ac897c91b70b058dac7d9943d0b2 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Tue, 18 Jul 2023 09:36:14 -0700
Subject: [PATCH 204/490] Fix typo in publish-release-artifacts workflow

---
 .github/workflows/publish-release-artifacts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index cf71e374b8..1d5a52fad9 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -41,7 +41,7 @@ jobs:
     needs: check-tag
     runs-on: ubuntu-latest
     permissions:
-      content: write
+      contents: write
     steps:
         # TODO: replace with artifact upload/download -- make sure there's no race condition with other builds also
         # uploading an artifact.

From c4a545ee914ec1c262f48588cfad2d03bc40b229 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Tue, 18 Jul 2023 09:40:21 -0700
Subject: [PATCH 205/490] Updates version of CodeQL GH Action

---
 .github/workflows/codeql-analysis.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 6364966701..2bbcd37d60 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -38,7 +38,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -49,7 +49,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -63,4 +63,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

From 1a2085dce674f6da2996e023eef2cf37d800b5b3 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Tue, 18 Jul 2023 14:18:55 -0700
Subject: [PATCH 206/490] Fix JDK 8 compatibility (#530)

---
 .../workflows/ion-java-performance-regression-detector.yml  | 6 +++---
 .github/workflows/main.yml                                  | 4 ++--
 build.gradle.kts                                            | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 87b640ea23..7920439aee 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          java-version: 1.8
+          java-version: 11
 
       - name: Checkout ion-java from the new commit.
         uses: actions/checkout@v3
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e0bbcde442..ae5c45ffe7 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -13,9 +13,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - java: 8
-            upload_reports: true
           - java: 11
+            upload_reports: true
+          - java: 17
     steps:
       - uses: actions/checkout@v2
         with:
diff --git a/build.gradle.kts b/build.gradle.kts
index c39f435f45..c32450ae48 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -36,8 +36,6 @@ group = "com.amazon.ion"
 // and so that any tool can access the version without having to do any special parsing.
 version = File(project.rootDir.path + "/project.version").readLines().single()
 description = "A Java implementation of the Amazon Ion data notation."
-java.sourceCompatibility = JavaVersion.VERSION_1_8
-java.targetCompatibility = JavaVersion.VERSION_1_8
 
 val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
 val generatedJarInfoDir = "${buildDir}/generated/jar-info"
@@ -57,7 +55,9 @@ sourceSets {
 tasks {
     withType<JavaCompile> {
         options.encoding = "UTF-8"
-        // In Java 9+ we can use `release` but for now we're still building with JDK 8, 11
+        // Because we set the `release` option, you can no longer build ion-java using JDK 8. However, we continue to
+        // emit JDK 8 compatible classes due to widespread use of this library with JDK 8.
+        options.release.set(8)
     }
 
     javadoc {

From b254b0a8d3d36ee506fcdb6a8472f004139400f1 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Tue, 18 Jul 2023 14:33:59 -0700
Subject: [PATCH 207/490] Set NoIndex for Javadoc jar to avoid bundling jquery
 (#531)

---
 build.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index c32450ae48..b3eb7209a2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -67,6 +67,8 @@ tasks {
             this as StandardJavadocDocletOptions
             addBooleanOption("Xdoclint:none", true)
             addStringOption("Xmaxwarns", "1") // best we can do is limit warnings to 1
+            // Stops jquery from being included as a bundled dependency
+            this.noIndex(true)
         }
     }
 

From 381eb552f7c721895a9f355219f510d6602e2c4a Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Tue, 18 Jul 2023 15:08:37 -0700
Subject: [PATCH 208/490] Prepare v1.10.1 release (#532)

---
 README.md       | 19 ++-----------------
 project.version |  2 +-
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 26ec33209d..d6322fa5cc 100644
--- a/README.md
+++ b/README.md
@@ -53,23 +53,8 @@ For detailed walkthroughs of git submodule usage, see the
 
 ### Depending on the Library
 
-To start using `ion-java` in your code with Maven, insert the following
-dependency into your project's `pom.xml`:
-
-```xml
-<dependency>
-  <groupId>com.amazon.ion</groupId>
-  <artifactId>ion-java</artifactId>
-  <version>1.10.0</version>
-</dependency>
-```
-
-For Gradle (Kotlin DSL), use:
-```kotlin
-dependencies {
-    implementation("com.amazon.ion:ion-java:1.10.0")
-}
-```
+To start using `ion-java` in your code, refer to [`ion-java` on Maven Central](https://central.sonatype.com/artifact/com.amazon.ion/ion-java)
+to find snippets for adding a dependency on the latest version of the library using your favorite build tool. 
 
 #### Legacy group id
 
diff --git a/project.version b/project.version
index b73edae427..4dae2985b5 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.1-SNAPSHOT
+1.10.1

From 68365e0473ac3de983d45fd1f7ae11cdd3ccd725 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Wed, 19 Jul 2023 13:18:17 -0700
Subject: [PATCH 209/490] Bumps version to 1.10.2-SNAPSHOT

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 4dae2985b5..adce90b854 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.1
+1.10.2-SNAPSHOT

From 3fb88a1043cbeb8c0ac08630a2d5327f7aefff1b Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Thu, 20 Jul 2023 11:58:04 -0700
Subject: [PATCH 210/490] Iteratively skip containers in Ion Text reader (#535)

* Iteratively skip containers in Ion Text reader

* Reduce allocations by moving arraylist into class, and fix preformance testing workflow
---
 ...n-java-performance-regression-detector.yml |  1 +
 .../ion/impl/IonReaderTextRawTokensX.java     | 26 ++++++++++++++++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 7920439aee..453f739c27 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -19,6 +19,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
+          distribution: 'corretto'
           java-version: 11
 
       - name: Checkout ion-java from the new commit.
diff --git a/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java b/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java
index c74bb36406..94876a285f 100644
--- a/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java
@@ -30,6 +30,7 @@
 import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
 import com.amazon.ion.util.IonTextUtils;
 import java.io.IOException;
+import java.util.ArrayList;
 
 /**
  * Tokenizer for the Ion text parser in IonTextIterator. This
@@ -107,6 +108,10 @@ public Appendable append(char c) throws IOException
      */
     private int                 _base64_prefetch_stack;
 
+    // This value was chosen somewhat arbitrarily; it can/should be changed if it is found to be insufficient.
+    private static final int CONTAINER_STACK_INITIAL_CAPACITY = 16;
+    // Used for tracking terminator characters when skipping a container
+    private final ArrayList<Integer> containerSkipTerminatorStack = new ArrayList<>(CONTAINER_STACK_INITIAL_CAPACITY);
 
     /**
      * IonTokenReader constructor requires a UnifiedInputStream
@@ -1206,6 +1211,11 @@ protected void skip_over_sexp() throws IOException
     private void skip_over_container(int terminator) throws IOException
     {
         assert( terminator == '}' || terminator == ']' || terminator == ')' );
+
+        // In theory, this should be empty at the start and end of every call to this
+        // method, but we'll clear it here anyway just in case.
+        containerSkipTerminatorStack.clear();
+
         int c;
 
         for (;;) {
@@ -1217,7 +1227,12 @@ private void skip_over_container(int terminator) throws IOException
             case ']':
             case ')':
                 if (c == terminator) { // no point is checking this on every char
-                    return;
+                    if (containerSkipTerminatorStack.isEmpty()) {
+                        return;
+                    } else {
+                        // Pop one off the stack to continue
+                        terminator = containerSkipTerminatorStack.remove(containerSkipTerminatorStack.size() - 1);
+                    }
                 }
                 break;
             case '"':
@@ -1233,10 +1248,12 @@ private void skip_over_container(int terminator) throws IOException
                 }
                 break;
             case '(':
-                skip_over_container(')');
+                containerSkipTerminatorStack.add(terminator);
+                terminator = ')';
                 break;
             case '[':
-                skip_over_container(']');
+                containerSkipTerminatorStack.add(terminator);
+                terminator = ']';
                 break;
             case '{':
                 // this consumes lobs as well since the double
@@ -1273,7 +1290,8 @@ else if (c == '}') {
                 }
                 else {
                     unread_char(c);
-                    skip_over_container('}');
+                    containerSkipTerminatorStack.add(terminator);
+                    terminator = '}';
                 }
                 break;
             default:

From 8a6b56b9571379992ab8cb2d10da58ef53340aa3 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Thu, 20 Jul 2023 12:06:19 -0700
Subject: [PATCH 211/490] Fixes missing permissions for release workflow

---
 .github/workflows/prepare-release.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index beff803d54..ae915348b8 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -61,6 +61,8 @@ jobs:
     runs-on: ubuntu-latest
     needs: check-version
     if: ${{ needs.check-version.outputs.should_create_draft == 'true' }}
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v3
       - name: Create a draft release

From 14ee3e825a6311e0284a264f2723694c96a55c48 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Thu, 20 Jul 2023 12:13:09 -0700
Subject: [PATCH 212/490] Prepare v1.10.2 release

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index adce90b854..5ad2491cf8 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.2-SNAPSHOT
+1.10.2

From 6f64aeccb8897eaafc454f6904c5f50500493393 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Thu, 20 Jul 2023 20:49:35 -0700
Subject: [PATCH 213/490] Bumps version to 1.10.3-SNAPSHOT

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 5ad2491cf8..f6622a7fd0 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.2
+1.10.3-SNAPSHOT

From 3804441f7b2c17fa96bcf1e53fbca6352cb1b6d8 Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Mon, 24 Jul 2023 09:27:44 -0700
Subject: [PATCH 214/490] Removes patch buffer and writes the patch length to
 the outputStream directly. (#518)

---
 .../ion/impl/bin/IonRawBinaryWriter.java      |  33 +--
 src/com/amazon/ion/impl/bin/WriteBuffer.java  |  76 +++++++
 .../amazon/ion/impl/bin/WriteBufferTest.java  | 207 ++++++++++++++++++
 3 files changed, 293 insertions(+), 23 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 2a1923afcf..2ec21cc886 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -308,23 +308,20 @@ private static class PatchPoint
         public final long oldPosition;
         /** length of the data being patched out.*/
         public final int oldLength;
-        /** position of the patch buffer where the length data is stored. */
-        public final long patchPosition;
-        /** length of the data to be patched in.*/
-        public final int patchLength;
+        /** size of the container data or annotations.*/
+        public final long length;
 
-        public PatchPoint(final long oldPosition, final int oldLength, final long patchPosition, final int patchLength)
+        public PatchPoint(final long oldPosition, final int oldLength, final long patchLength)
         {
             this.oldPosition = oldPosition;
             this.oldLength = oldLength;
-            this.patchPosition = patchPosition;
-            this.patchLength = patchLength;
+            this.length = patchLength;
         }
 
         @Override
         public String toString()
         {
-            return "(PP old::(" + oldPosition + " " + oldLength + ") patch::(" + patchPosition + " " + patchLength + ")";
+            return "(PP old::(" + oldPosition + " " + oldLength + ") patch::(" + length + ")";
         }
     }
 
@@ -490,7 +487,6 @@ public String toString()
     private final PreallocationMode             preallocationMode;
     private final boolean                       isFloatBinary32Enabled;
     private final WriteBuffer                   buffer;
-    private final WriteBuffer                   patchBuffer;
     private final PatchList                     patchPoints;
     private final _Private_RecyclingStack<ContainerInfo> containers;
     private int                                 depth;
@@ -525,7 +521,6 @@ public String toString()
         this.preallocationMode = preallocationMode;
         this.isFloatBinary32Enabled = isFloatBinary32Enabled;
         this.buffer            = new WriteBuffer(allocator);
-        this.patchBuffer       = new WriteBuffer(allocator);
         this.patchPoints       = new PatchList();
         this.containers        = new _Private_RecyclingStack<ContainerInfo>(
             10,
@@ -699,10 +694,9 @@ private void pushContainer(final ContainerType type)
 
     private void addPatchPoint(final long position, final int oldLength, final long value)
     {
-        // record the size in a patch buffer
-        final long patchPosition = patchBuffer.position();
-        final int patchLength = patchBuffer.writeVarUInt(value);
-        final PatchPoint patch = new PatchPoint(position, oldLength, patchPosition, patchLength);
+        // record the length of the patch
+        final int patchLength = WriteBuffer.varUIntLength(value);
+        final PatchPoint patch = new PatchPoint(position, oldLength, value);
         if (containers.isEmpty())
         {
             // not nested, just append to the root list
@@ -1489,12 +1483,7 @@ public void writeBytes(byte[] data, int offset, int length) throws IOException
     /*package*/ void truncate(long position)
     {
         buffer.truncate(position);
-        // TODO decide if it is worth making this faster than O(N)
-        final PatchPoint patch = patchPoints.truncate(position);
-        if (patch != null)
-        {
-            patchBuffer.truncate(patch.patchPosition);
-        }
+        patchPoints.truncate(position);
     }
 
     public void flush() throws IOException {}
@@ -1525,7 +1514,7 @@ public void finish() throws IOException
                 buffer.writeTo(out, bufferPosition, bufferLength);
 
                 // write out the patch
-                patchBuffer.writeTo(out, patch.patchPosition, patch.patchLength);
+                WriteBuffer.writeVarUIntTo(out, patch.length);
 
                 // skip over the preallocated varuint field
                 bufferPosition = patch.oldPosition;
@@ -1534,7 +1523,6 @@ public void finish() throws IOException
             buffer.writeTo(out, bufferPosition, buffer.position() - bufferPosition);
         }
         patchPoints.clear();
-        patchBuffer.reset();
         buffer.reset();
 
         if (streamFlushMode == StreamFlushMode.FLUSH)
@@ -1564,7 +1552,6 @@ public void close() throws IOException
 
             // release all of our blocks -- these should never throw
             buffer.close();
-            patchBuffer.close();
             allocator.close();
             utf8StringEncoder.close();
         }
diff --git a/src/com/amazon/ion/impl/bin/WriteBuffer.java b/src/com/amazon/ion/impl/bin/WriteBuffer.java
index 88e5db1749..868fcb5171 100644
--- a/src/com/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/com/amazon/ion/impl/bin/WriteBuffer.java
@@ -1035,6 +1035,82 @@ public int writeVarUInt(final long value)
         return writeVarUIntSlow(value);
     }
 
+    /** Get the length of varUint for the provided value. */
+    public static int varUIntLength(final long value)
+    {
+        if (value < VAR_UINT_2_OCTET_MIN_VALUE)
+        {
+            return 1;
+        }
+        if (value < VAR_UINT_3_OCTET_MIN_VALUE)
+        {
+            return 2;
+        }
+        if (value < VAR_UINT_4_OCTET_MIN_VALUE)
+        {
+            return 3;
+        }
+        if (value < VAR_UINT_5_OCTET_MIN_VALUE)
+        {
+            return 4;
+        }
+        if (value < VAR_UINT_6_OCTET_MIN_VALUE)
+        {
+            return 5;
+        }
+        if (value < VAR_UINT_7_OCTET_MIN_VALUE)
+        {
+            return 6;
+        }
+        if (value < VAR_UINT_8_OCTET_MIN_VALUE)
+        {
+            return 7;
+        }
+        if (value < VAR_UINT_9_OCTET_MIN_VALUE)
+        {
+            return 8;
+        }
+        return 9;
+    }
+
+    /** Write the varUint value to the outputStream. */
+    public static void writeVarUIntTo(final OutputStream out, final long value) throws IOException
+    {
+        if (value >= VAR_UINT_9_OCTET_MIN_VALUE)
+        {
+            out.write((int) (((value >> VAR_UINT_9_OCTET_SHIFT) & VAR_INT_MASK) & 0xFF));
+        }
+        if (value >= VAR_UINT_8_OCTET_MIN_VALUE)
+        {
+            out.write((int) (((value >> VAR_UINT_8_OCTET_SHIFT) & VAR_INT_MASK) & 0xFF));
+        }
+        if (value >= VAR_UINT_7_OCTET_MIN_VALUE)
+        {
+            out.write((int) (((value >> VAR_UINT_7_OCTET_SHIFT) & VAR_INT_MASK) & 0xFF));
+        }
+        if (value >= VAR_UINT_6_OCTET_MIN_VALUE)
+        {
+            out.write((int) (((value >> VAR_UINT_6_OCTET_SHIFT) & VAR_INT_MASK) & 0xFF));
+        }
+        if (value >= VAR_UINT_5_OCTET_MIN_VALUE)
+        {
+            out.write((int) (((value >> VAR_UINT_5_OCTET_SHIFT) & VAR_INT_MASK) & 0xFF));
+        }
+        if (value >= VAR_UINT_4_OCTET_MIN_VALUE)
+        {
+            out.write((int) (((value >> VAR_UINT_4_OCTET_SHIFT) & VAR_INT_MASK) & 0xFF));
+        }
+        if (value >= VAR_UINT_3_OCTET_MIN_VALUE)
+        {
+            out.write((int) (((value >> VAR_UINT_3_OCTET_SHIFT) & VAR_INT_MASK) & 0xFF));
+        }
+        if (value >= VAR_UINT_2_OCTET_MIN_VALUE)
+        {
+            out.write((int) (((value >> VAR_UINT_2_OCTET_SHIFT) & VAR_INT_MASK) & 0xFF));
+        }
+        out.write((int) (((value & VAR_INT_MASK) | VAR_INT_FINAL_OCTET_SIGNAL_MASK) & 0xFF));
+    }
+
     private static final long VAR_INT_SIGNED_OCTET_MASK = 0x3F;
     private static final long VAR_INT_SIGNBIT_ON_MASK   = 0x40L;
     private static final long VAR_INT_SIGNBIT_OFF_MASK  = 0x00L;
diff --git a/test/com/amazon/ion/impl/bin/WriteBufferTest.java b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
index 27b566d162..43f054f85e 100644
--- a/test/com/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
@@ -16,6 +16,8 @@
 package com.amazon.ion.impl.bin;
 
 import static com.amazon.ion.TestUtils.hexDump;
+import static com.amazon.ion.impl.bin.WriteBuffer.varUIntLength;
+import static com.amazon.ion.impl.bin.WriteBuffer.writeVarUIntTo;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -34,16 +36,20 @@ public class WriteBufferTest
 
     private WriteBuffer buf;
 
+    private ByteArrayOutputStream out;
+
     @Before
     public void setup()
     {
         buf = new WriteBuffer(ALLOCATOR);
+        out = new ByteArrayOutputStream();
     }
 
     @After
     public void teardown()
     {
         buf = null;
+        out.reset();
     }
 
     private byte[] bytes()
@@ -1093,4 +1099,205 @@ public void shiftBytesLeftWithLengthZeroAcrossBlocks() {
         buf.shiftBytesLeft(0, 2);
         assertBuffer("0123456789".getBytes());
     }
+
+    /**
+     * Test if the method 'writeVarUIntTo' writes the expected bytes to the output stream.
+     * @throws Exception if there is an error occurred while writing data to the output stream.
+     */
+    @Test
+    public void writeVarUInt1() throws Exception {
+        final byte[] bytes = new byte[20];
+        for (int i = 0; i < bytes.length; i++)
+        {
+            writeVarUIntTo(out, 0x7F);
+            bytes[i] = (byte) 0xFF;
+        }
+        assertArrayEquals(bytes, out.toByteArray());
+    }
+
+    @Test
+    public void writeVarUInt2() throws IOException {
+        final byte[] bytes = new byte[20];
+        for (int i = 0; i < bytes.length; i += 2)
+        {
+            writeVarUIntTo(out, 0x3FFF);
+            bytes[i    ] = (byte) 0x7F;
+            bytes[i + 1] = (byte) 0xFF;
+        }
+        assertArrayEquals(bytes, out.toByteArray());
+    }
+
+    @Test
+    public void writeVarUInt3() throws IOException {
+        final byte[] bytes = new byte[21];
+        for (int i = 0; i < bytes.length; i += 3)
+        {
+            writeVarUIntTo(out, 0x1FFFFF);
+            bytes[i    ] = (byte) 0x7F;
+            bytes[i + 1] = (byte) 0x7F;
+            bytes[i + 2] = (byte) 0xFF;
+
+        }
+        assertArrayEquals(bytes, out.toByteArray());
+    }
+
+    @Test
+    public void writeVarUInt4() throws IOException {
+        final byte[] bytes = new byte[24];
+        for (int i = 0; i < bytes.length; i += 4)
+        {
+            writeVarUIntTo(out, 0xFFFFFF0);
+            bytes[i    ] = (byte) 0x7F;
+            bytes[i + 1] = (byte) 0x7F;
+            bytes[i + 2] = (byte) 0x7F;
+            bytes[i + 3] = (byte) 0xF0;
+        }
+        assertArrayEquals(bytes, out.toByteArray());
+    }
+
+    @Test
+    public void writeVarUInt5() throws IOException {
+        final byte[] bytes = new byte[25];
+        for (int i = 0; i < bytes.length; i += 5)
+        {
+            writeVarUIntTo(out, 0x7FFFFFFF0L);
+            bytes[i    ] = (byte) 0x7F;
+            bytes[i + 1] = (byte) 0x7F;
+            bytes[i + 2] = (byte) 0x7F;
+            bytes[i + 3] = (byte) 0x7F;
+            bytes[i + 4] = (byte) 0xF0;
+
+        }
+        assertArrayEquals(bytes, out.toByteArray());
+    }
+
+    @Test
+    public void writeVarUInt6() throws IOException {
+        final byte[] bytes = new byte[30];
+        for (int i = 0; i < bytes.length; i += 6)
+        {
+            writeVarUIntTo(out, 0x3FFFFFFFFF3L);
+            bytes[i    ] = (byte) 0x7F;
+            bytes[i + 1] = (byte) 0x7F;
+            bytes[i + 2] = (byte) 0x7F;
+            bytes[i + 3] = (byte) 0x7F;
+            bytes[i + 4] = (byte) 0x7F;
+            bytes[i + 5] = (byte) 0xF3;
+
+        }
+        assertArrayEquals(bytes, out.toByteArray());
+    }
+
+    @Test
+    public void writeVarUInt7() throws IOException {
+        final byte[] bytes = new byte[35];
+        for (int i = 0; i < bytes.length; i += 7)
+        {
+            writeVarUIntTo(out, 0x1FFFFFFFFFFF2L);
+            bytes[i    ] = (byte) 0x7F;
+            bytes[i + 1] = (byte) 0x7F;
+            bytes[i + 2] = (byte) 0x7F;
+            bytes[i + 3] = (byte) 0x7F;
+            bytes[i + 4] = (byte) 0x7F;
+            bytes[i + 5] = (byte) 0x7F;
+            bytes[i + 6] = (byte) 0xF2;
+
+        }
+        assertArrayEquals(bytes, out.toByteArray());
+    }
+
+    @Test
+    public void writeVarUInt8() throws IOException {
+        final byte[] bytes = new byte[40];
+        for (int i = 0; i < bytes.length; i += 8)
+        {
+            writeVarUIntTo(out, 0xFFFFFFFFFFFFFAL);
+            bytes[i    ] = (byte) 0x7F;
+            bytes[i + 1] = (byte) 0x7F;
+            bytes[i + 2] = (byte) 0x7F;
+            bytes[i + 3] = (byte) 0x7F;
+            bytes[i + 4] = (byte) 0x7F;
+            bytes[i + 5] = (byte) 0x7F;
+            bytes[i + 6] = (byte) 0x7F;
+            bytes[i + 7] = (byte) 0xFA;
+
+        }
+        assertArrayEquals(bytes, out.toByteArray());
+    }
+
+    @Test
+    public void writeVarUInt9() throws IOException {
+        final byte[] bytes = new byte[45];
+        for (int i = 0; i < bytes.length; i += 9)
+        {
+            writeVarUIntTo(out, 0x7FFFFFFFFFFFFFFCL);
+            bytes[i    ] = (byte) 0x7F;
+            bytes[i + 1] = (byte) 0x7F;
+            bytes[i + 2] = (byte) 0x7F;
+            bytes[i + 3] = (byte) 0x7F;
+            bytes[i + 4] = (byte) 0x7F;
+            bytes[i + 5] = (byte) 0x7F;
+            bytes[i + 6] = (byte) 0x7F;
+            bytes[i + 7] = (byte) 0x7F;
+            bytes[i + 8] = (byte) 0xFC;
+        }
+        assertArrayEquals(bytes, out.toByteArray());
+    }
+
+    /**
+     * Test if the method 'varUIntLength' generates the expected length of the provided long value.
+     */
+    @Test
+    public void testVarUIntLength1() {
+        int length = varUIntLength(0x7F);
+        assertEquals(1, length);
+    }
+
+    @Test
+    public void testVarUIntLength2() {
+        int length = varUIntLength(0x3FFF);
+        assertEquals(2, length);
+    }
+
+    @Test
+    public void testVarUIntLength3() {
+        int length = varUIntLength(0x1FFFFF);
+        assertEquals(3, length);
+    }
+
+    @Test
+    public void testVarUIntLength4() {
+        int length = varUIntLength(0xFFFFFF0);
+        assertEquals(4, length);
+    }
+
+    @Test
+    public void testVarUIntLength5() {
+        int length = varUIntLength(0x7FFFFFFF0L);
+        assertEquals(5, length);
+    }
+
+    @Test
+    public void testVarUIntLength6() {
+        int length = varUIntLength(0x3FFFFFFFFF3L);
+        assertEquals(6, length);
+    }
+
+    @Test
+    public void testVarUIntLength7() {
+        int length = varUIntLength(0x1FFFFFFFFFFF2L);
+        assertEquals(7, length);
+    }
+
+    @Test
+    public void testVarUIntLength8() {
+        int length = varUIntLength(0xFFFFFFFFFFFFFAL);
+        assertEquals(8, length);
+    }
+
+    @Test
+    public void testVarUIntLength9() {
+        int length = varUIntLength(0x7FFFFFFFFFFFFFFCL);
+        assertEquals(9, length);
+    }
 }

From a87fb20820f44b8bc6575926710b86a48f3149ce Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Wed, 26 Jul 2023 12:26:26 -0700
Subject: [PATCH 215/490] Remove unnecessary PR-content-check workflow

---
 .github/workflows/PR-content-check.yml        | 34 -------------------
 ...n-java-performance-regression-detector.yml | 10 +++---
 .github/workflows/ion-test-driver.yml         | 10 +++---
 3 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 .github/workflows/PR-content-check.yml

diff --git a/.github/workflows/PR-content-check.yml b/.github/workflows/PR-content-check.yml
deleted file mode 100644
index eb2c624155..0000000000
--- a/.github/workflows/PR-content-check.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: PR Content Check
-
-on:
-  workflow_call:
-    outputs:
-      result:
-        description: "The result of PR content check"
-        value: ${{ jobs.check-PR-content.outputs.output1 }}
-
-jobs:
-  check-PR-content:
-    name: Check PR Content
-
-    runs-on: ubuntu-latest
-
-    outputs:
-      output1: ${{ steps.check-content.outputs.result }}
-
-    steps:
-      - name: Checkout the incoming pull request
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          fetch-depth: 0
-          path: ion-java-new
-
-      - name: Check the content of the last commit
-        id: check-content
-        run: |
-          cd ion-java-new
-          if [[ $(git log -1 --name-only) == *"src/"* ]]; then echo "result=pass" >> $GITHUB_OUTPUT; else echo "result=fail" >> $GITHUB_OUTPUT; fi
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 453f739c27..f90e2f4701 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -3,16 +3,14 @@
 
 name: Ion Java performance regression detector
 
-on: [pull_request]
+on:
+  pull_request:
+    paths:
+      - 'src/*'
 
 jobs:
-  PR-Content-Check:
-    uses: amazon-ion/ion-java/.github/workflows/PR-content-check.yml@master
-
   detect-regression:
     name: Detect Regression
-    needs: PR-Content-Check
-    if: ${{ needs.PR-Content-Check.outputs.result == 'pass' }}
     runs-on: ubuntu-latest
 
     steps:
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index d502f34f0a..ef3e7d8ff5 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -1,15 +1,13 @@
 name: ion-test-driver
 
-on: [pull_request]
+on:
+  pull_request:
+    paths:
+      - 'src/*'
 
 jobs:
-  PR-Content-Check:
-    uses: amazon-ion/ion-java/.github/workflows/PR-content-check.yml@master
-
   ion-test-driver:
     runs-on: ubuntu-latest
-    needs: PR-Content-Check
-    if: ${{ needs.PR-Content-Check.outputs.result == 'pass' }}
     steps:
       - name: Checkout ion-java
         uses: actions/checkout@master

From 3e8f8e21c9c9fe43ea94d79219cf7495cae0ba86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= <gliptak@gmail.com>
Date: Fri, 28 Jul 2023 16:16:19 -0400
Subject: [PATCH 216/490] Save SpotBugs reports with GHA runs (#544)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Gábor Lipták <gliptak@gmail.com>
---
 .github/workflows/main.yml | 4 ++++
 build.gradle.kts           | 7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ae5c45ffe7..d50a023de5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -33,6 +33,10 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
+      - uses: actions/upload-artifact@v3
+        with:
+          name: spotbugs-report
+          path: build/reports/spotbugs/
 
   check-version:
     # Ensures that the version is not a release (i.e. -SNAPSHOT) or if it is a release version,
diff --git a/build.gradle.kts b/build.gradle.kts
index b3eb7209a2..ec8459fdbf 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -79,9 +79,6 @@ tasks {
     spotbugsMain {
         val spotbugsBaselineFile = "$rootDir/config/spotbugs/baseline.xml"
 
-        // CI=true means we're in a CI workflow
-        // https://docs.github.com/en/actions/learn-github-actions/variables#default-environment-variables
-        val ciWorkflow = System.getenv()["CI"].toBoolean()
         val baselining = project.hasProperty("baseline") // e.g. `./gradlew :spotbugsMain -Pbaseline`
 
         if (!baselining) {
@@ -90,9 +87,9 @@ tasks {
 
         // The plugin only prints to console when no reports are configured
         // See: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/172
-        if (!ciWorkflow && !baselining) {
+        if (!baselining) {
             reports.create("html").required.set(true)
-        } else if (baselining) {
+        } else {
             // Note this path succeeds :spotbugsMain because *of course it does*
             ignoreFailures = true
             reports.create("xml") {

From b9e5fe6fc4246fe9beacf9e33e1011a2bb049b69 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Wed, 23 Aug 2023 11:41:47 -0700
Subject: [PATCH 217/490] Use https links in CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b81cdc1215..50244ee89b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -51,11 +51,11 @@ opensource-codeofconduct@amazon.com with any additional questions or comments.
 
 
 ## Security issue notifications
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
+If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](https://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
 
 
 ## Licensing
 
 See the [LICENSE](https://github.com/amazon-ion/ion-java/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
-We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.
\ No newline at end of file
+We may ask you to sign a [Contributor License Agreement (CLA)](https://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.

From 0b2c363a13c94d78897eb1cf516f6395daae36c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= <gliptak@gmail.com>
Date: Fri, 25 Aug 2023 13:15:50 -0400
Subject: [PATCH 218/490] Refactor ion-java-cli to standard layout (#545)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Gábor Lipták <gliptak@gmail.com>
---
 ion-java-cli/build.gradle.kts                               | 6 ------
 .../{ => main/java}/com/amazon/tools/cli/CommandType.java   | 0
 .../java}/com/amazon/tools/cli/CompareContext.java          | 0
 .../java}/com/amazon/tools/cli/ComparisonType.java          | 0
 .../{ => main/java}/com/amazon/tools/cli/IonJavaCli.java    | 0
 .../java}/com/amazon/tools/cli/NoCloseOutputStream.java     | 0
 .../java}/com/amazon/tools/cli/NoOpOutputStream.java        | 0
 .../{ => main/java}/com/amazon/tools/cli/OutputFormat.java  | 0
 .../java}/com/amazon/tools/cli/ProcessContext.java          | 0
 .../amazon/tools/comparisonReport/ComparisonContext.java    | 0
 .../com/amazon/tools/comparisonReport/ComparisonResult.java | 0
 .../amazon/tools/comparisonReport/ComparisonResultType.java | 0
 .../com/amazon/tools/errorReport/ErrorDescription.java      | 0
 .../java}/com/amazon/tools/errorReport/ErrorType.java       | 0
 .../src/{ => main/java}/com/amazon/tools/events/Event.java  | 0
 .../{ => main/java}/com/amazon/tools/events/EventType.java  | 0
 .../java}/com/amazon/tools/events/ImportDescriptor.java     | 0
 17 files changed, 6 deletions(-)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/cli/CommandType.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/cli/CompareContext.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/cli/ComparisonType.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/cli/IonJavaCli.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/cli/NoCloseOutputStream.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/cli/NoOpOutputStream.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/cli/OutputFormat.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/cli/ProcessContext.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/comparisonReport/ComparisonContext.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/comparisonReport/ComparisonResult.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/comparisonReport/ComparisonResultType.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/errorReport/ErrorDescription.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/errorReport/ErrorType.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/events/Event.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/events/EventType.java (100%)
 rename ion-java-cli/src/{ => main/java}/com/amazon/tools/events/ImportDescriptor.java (100%)

diff --git a/ion-java-cli/build.gradle.kts b/ion-java-cli/build.gradle.kts
index 288e8b3697..8ddd311a4e 100644
--- a/ion-java-cli/build.gradle.kts
+++ b/ion-java-cli/build.gradle.kts
@@ -17,12 +17,6 @@ dependencies {
     implementation(rootProject)
 }
 
-sourceSets {
-    main {
-        java.srcDir("src")
-    }
-}
-
 application {
     mainClass.set("com.amazon.tools.cli.IonJavaCli")
 }
diff --git a/ion-java-cli/src/com/amazon/tools/cli/CommandType.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/CommandType.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/CommandType.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/CommandType.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/CompareContext.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/CompareContext.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/CompareContext.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/CompareContext.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/ComparisonType.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/ComparisonType.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/ComparisonType.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/ComparisonType.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/IonJavaCli.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/IonJavaCli.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/IonJavaCli.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/NoCloseOutputStream.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/NoCloseOutputStream.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/NoCloseOutputStream.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/NoCloseOutputStream.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/NoOpOutputStream.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/NoOpOutputStream.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/NoOpOutputStream.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/NoOpOutputStream.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/OutputFormat.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/OutputFormat.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/OutputFormat.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/OutputFormat.java
diff --git a/ion-java-cli/src/com/amazon/tools/cli/ProcessContext.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/ProcessContext.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/cli/ProcessContext.java
rename to ion-java-cli/src/main/java/com/amazon/tools/cli/ProcessContext.java
diff --git a/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonContext.java b/ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonContext.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonContext.java
rename to ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonContext.java
diff --git a/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResult.java b/ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonResult.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResult.java
rename to ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonResult.java
diff --git a/ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResultType.java b/ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonResultType.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/comparisonReport/ComparisonResultType.java
rename to ion-java-cli/src/main/java/com/amazon/tools/comparisonReport/ComparisonResultType.java
diff --git a/ion-java-cli/src/com/amazon/tools/errorReport/ErrorDescription.java b/ion-java-cli/src/main/java/com/amazon/tools/errorReport/ErrorDescription.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/errorReport/ErrorDescription.java
rename to ion-java-cli/src/main/java/com/amazon/tools/errorReport/ErrorDescription.java
diff --git a/ion-java-cli/src/com/amazon/tools/errorReport/ErrorType.java b/ion-java-cli/src/main/java/com/amazon/tools/errorReport/ErrorType.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/errorReport/ErrorType.java
rename to ion-java-cli/src/main/java/com/amazon/tools/errorReport/ErrorType.java
diff --git a/ion-java-cli/src/com/amazon/tools/events/Event.java b/ion-java-cli/src/main/java/com/amazon/tools/events/Event.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/events/Event.java
rename to ion-java-cli/src/main/java/com/amazon/tools/events/Event.java
diff --git a/ion-java-cli/src/com/amazon/tools/events/EventType.java b/ion-java-cli/src/main/java/com/amazon/tools/events/EventType.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/events/EventType.java
rename to ion-java-cli/src/main/java/com/amazon/tools/events/EventType.java
diff --git a/ion-java-cli/src/com/amazon/tools/events/ImportDescriptor.java b/ion-java-cli/src/main/java/com/amazon/tools/events/ImportDescriptor.java
similarity index 100%
rename from ion-java-cli/src/com/amazon/tools/events/ImportDescriptor.java
rename to ion-java-cli/src/main/java/com/amazon/tools/events/ImportDescriptor.java

From 758aca2f79cbf1a596a98d1f33947ab705eb1239 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Mon, 11 Sep 2023 16:54:37 -0700
Subject: [PATCH 219/490] Iteratively writes values in IonValue.writeTo. (#542)

---
 .../amazon/ion/impl/lite/IonSequenceLite.java | 12 +--
 .../amazon/ion/impl/lite/IonStructLite.java   | 11 +--
 .../amazon/ion/impl/lite/IonValueLite.java    | 89 ++++++++++++-------
 3 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/src/com/amazon/ion/impl/lite/IonSequenceLite.java b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
index d8ae7ac361..2f04497870 100644
--- a/src/com/amazon/ion/impl/lite/IonSequenceLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
@@ -409,17 +409,7 @@ public <T extends IonValue> T[] extract(Class<T> type)
     void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
         throws IOException
     {
-        IonType type = getType();
-        if (isNullValue())
-        {
-            writer.writeNull(type);
-        }
-        else
-        {
-            writer.stepIn(type);
-            writeChildren(writer, this, symbolTableProvider);
-            writer.stepOut();
-        }
+        throw new IllegalStateException("writeBodyTo is only applicable for scalar values.");
     }
 
     /**
diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/com/amazon/ion/impl/lite/IonStructLite.java
index e6884bd67d..bc07221ffb 100644
--- a/src/com/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStructLite.java
@@ -799,16 +799,7 @@ private static void validateFieldName(String fieldName)
     final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
         throws IOException
     {
-        if (isNullValue())
-        {
-            writer.writeNull(IonType.STRUCT);
-        }
-        else
-        {
-            writer.stepIn(IonType.STRUCT);
-            writeChildren(writer, this, symbolTableProvider);
-            writer.stepOut();
-        }
+        throw new IllegalStateException("writeBodyTo is only applicable for scalar values.");
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
index 203ecdf43d..47b7487823 100644
--- a/src/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -20,6 +20,7 @@
 import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
 import static com.amazon.ion.util.Equivalence.ionEquals;
 
+import com.amazon.ion.IonContainer;
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonType;
@@ -38,6 +39,9 @@
 import com.amazon.ion.util.Printer;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.Iterator;
 
 /**
  *  Base class of the light weight implementation of
@@ -76,6 +80,9 @@ abstract class IonValueLite
     private   static final int ELEMENT_MASK       = 0xff;
     protected static final int ELEMENT_SHIFT      = 8; // low 8 bits is flag, upper 24 (or 48 is element id)
 
+    // This value was chosen somewhat arbitrarily; it can/should be changed if it is found to be insufficient.
+    private static final int CONTAINER_STACK_INITIAL_CAPACITY = 16;
+
     /**
      * Used by subclasses to retrieve metadata set by
      * {@link #_setMetadata(int, int, int)}.
@@ -965,35 +972,11 @@ public void writeTo(IonWriter writer)
         writeTo(writer, new LazySymbolTableProvider(this));
     }
 
-    final void writeChildren(IonWriter writer, Iterable<IonValue> container,
-                             SymbolTableProvider symbolTableProvider)
-    {
-        boolean isDatagram = this instanceof IonDatagram;
-        // unfortunately JDK5 does not allow for generic co-variant returns; i.e. specifying
-        // IonContainerLite#iterator() return type as Iterator<IonValueLite> causes a compile-time
-        // error under JDK5 as it doesn't understand this is an acceptable co-variant for
-        // Iterator<IonValue> IonContainer#iterator(). This said we know the underlying data
-        // structure is IonValueLite[] - so we can conduct the cast within the loop. When ion-java is
-        // moved to allow JDK6+ compile time dependency we can remove these crufty casts.
-        for (IonValue iv : container) {
-            IonValueLite vlite = (IonValueLite) iv;
-            if(isDatagram)
-            {
-                vlite.writeTo(writer);
-            }
-            else
-            {
-                vlite.writeTo(writer, symbolTableProvider);
-            }
-        }
-    }
-
-    final void writeTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
-    {
+    private static void writeFieldNameAndAnnotations(IonWriter writer, IonValueLite value, SymbolTableProvider symbolTableProvider) {
         if (writer.isInStruct()
             && ! ((_Private_IonWriter) writer).isFieldNameSet())
         {
-            SymbolToken tok = getFieldNameSymbol(symbolTableProvider);
+            SymbolToken tok = value.getFieldNameSymbol(symbolTableProvider);
             if (tok == null)
             {
                 throw new IllegalStateException("Field name not set");
@@ -1002,19 +985,59 @@ final void writeTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
             writer.setFieldNameSymbol(tok);
         }
 
-        SymbolToken[] annotations = getTypeAnnotationSymbols(symbolTableProvider);
+        SymbolToken[] annotations = value.getTypeAnnotationSymbols(symbolTableProvider);
         writer.setTypeAnnotationSymbols(annotations);
+    }
 
-        try
-        {
-            writeBodyTo(writer, symbolTableProvider);
-        }
-        catch (IOException e)
-        {
+    private void writeToIterative(IonWriter writer, SymbolTableProvider symbolTableProvider) throws IOException {
+        Deque<Iterator<IonValue>> iteratorStack = null;
+        Iterator<IonValue> currentIterator = null;
+        IonValueLite value = this;
+        do {
+            writeFieldNameAndAnnotations(writer, value, symbolTableProvider);
+            IonType type = value.getType();
+            if (value.isNullValue()) {
+                writer.writeNull(type);
+            } else if (IonType.isContainer(type)) {
+                if (currentIterator != null) {
+                    if (iteratorStack == null) {
+                        iteratorStack = new ArrayDeque<>(CONTAINER_STACK_INITIAL_CAPACITY);
+                    }
+                    iteratorStack.add(currentIterator);
+                }
+                currentIterator = ((IonContainer) value).iterator();
+                writer.stepIn(type);
+            } else {
+                value.writeBodyTo(writer, symbolTableProvider);
+            }
+            do {
+                if (currentIterator == null) {
+                    return;
+                }
+                value = currentIterator.hasNext() ? (IonValueLite) currentIterator.next() : null;
+                if (value == null) {
+                    writer.stepOut();
+                    currentIterator = iteratorStack == null ? null : iteratorStack.pollLast();
+                }
+            } while (value == null);
+        } while (true);
+    }
+
+    final void writeTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
+    {
+        try {
+            writeToIterative(writer, symbolTableProvider);
+        } catch (IOException e) {
             throw new IonException(e);
         }
     }
 
+    /**
+     * Writes a *scalar* value to the given writer. It is incorrect to call this method on a container value.
+     * @param writer an IonWriter.
+     * @param symbolTableProvider a SymbolTableProvider.
+     * @throws IOException if thrown when writing the value.
+     */
     abstract void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
         throws IOException;
 

From 590105973fb67830e10bc91df9b2d5a7dba1a907 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Mon, 11 Sep 2023 17:06:17 -0700
Subject: [PATCH 220/490] Iteratively writes values in IonValue.toString.
 (#543)

---
 src/com/amazon/ion/impl/lite/IonValueLite.java | 18 ++++++------------
 src/com/amazon/ion/overview.html               |  2 --
 src/com/amazon/ion/util/Printer.java           |  7 +++++++
 test/com/amazon/ion/DecimalTest.java           | 14 ++++++++------
 test/com/amazon/ion/RoundTripTest.java         | 10 ++--------
 .../ion/streaming/RoundTripStreamingTest.java  |  7 +------
 6 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
index 47b7487823..9a24458ee3 100644
--- a/src/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -36,7 +36,6 @@
 import com.amazon.ion.impl._Private_IonWriter;
 import com.amazon.ion.impl._Private_Utils;
 import com.amazon.ion.system.IonTextWriterBuilder;
-import com.amazon.ion.util.Printer;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.ArrayDeque;
@@ -83,6 +82,11 @@ abstract class IonValueLite
     // This value was chosen somewhat arbitrarily; it can/should be changed if it is found to be insufficient.
     private static final int CONTAINER_STACK_INITIAL_CAPACITY = 16;
 
+    // 'withCharsetAscii' is only specified for consistency with the behavior of the previous implementation of
+    // toString. Technically users are not allowed to rely on a canonical encoding, but in practice they often do.
+    private static final IonTextWriterBuilder DEFAULT_TO_STRING_WRITER_BUILDER = IonTextWriterBuilder.standard().withCharsetAscii().immutable();
+
+
     /**
      * Used by subclasses to retrieve metadata set by
      * {@link #_setMetadata(int, int, int)}.
@@ -930,17 +934,7 @@ public void removeTypeAnnotation(String annotation)
     @Override
     public String toString()
     {
-        StringBuilder buf = new StringBuilder(1024);
-        try
-        {
-            Printer p = new Printer();
-            p.print(this, buf);
-        }
-        catch (IOException e)
-        {
-            throw new IonException(e);
-        }
-        return buf.toString();
+        return toString(DEFAULT_TO_STRING_WRITER_BUILDER);
     }
 
     public String toString(IonTextWriterBuilder writerBuilder)
diff --git a/src/com/amazon/ion/overview.html b/src/com/amazon/ion/overview.html
index 7d993c1bdd..c5f60c409a 100644
--- a/src/com/amazon/ion/overview.html
+++ b/src/com/amazon/ion/overview.html
@@ -183,8 +183,6 @@ <h1>JSON Integration</h1>
 format using an
 {@link com.amazon.ion.system.IonTextWriterBuilder IonTextWriterBuilder}.
 This replaces Ion-only datatypes with more-or-less equivalent JSON values.
-(The {@link com.amazon.ion.util.Printer Printer} can also be used, but it is
-no longer recommended and will be deprecated.)
 
 <h1>Thread Safety</h1>
 
diff --git a/src/com/amazon/ion/util/Printer.java b/src/com/amazon/ion/util/Printer.java
index cc717b1d7e..24379ee6f7 100644
--- a/src/com/amazon/ion/util/Printer.java
+++ b/src/com/amazon/ion/util/Printer.java
@@ -59,6 +59,8 @@
 
 
 /**
+ * <b>DEPRECATED: use {@link IonValue#writeTo(IonWriter)} instead.</b>
+ * <p>
  * Renders {@link IonValue}s to text.
  * <p>
  * By default, output is in a compact format with minimal whitespace.
@@ -78,7 +80,9 @@
  *
  * @see IonWriter
  * @see IonTextWriterBuilder
+ * @deprecated Use {@link IonValue#writeTo(IonWriter)} instead.
  */
+@Deprecated
 public class Printer
 {
     public class Options
@@ -537,6 +541,9 @@ public SymbolTable getSymbolTable()
     //=========================================================================
     // Print methods
 
+    /**
+     * @deprecated Use {@link IonValue#writeTo(IonWriter)} instead.
+     */
     public static class PrinterVisitor
         extends AbstractValueVisitor
     {
diff --git a/test/com/amazon/ion/DecimalTest.java b/test/com/amazon/ion/DecimalTest.java
index eb009d0a85..aeed1fa4e1 100644
--- a/test/com/amazon/ion/DecimalTest.java
+++ b/test/com/amazon/ion/DecimalTest.java
@@ -198,24 +198,26 @@ public void testPrinting()
         testPrinting("123d0",  "123.");
         testPrinting("123d-1", "12.3");
         testPrinting("123d-2", "1.23");
-        testPrinting("123d-3", "1.23d-1");
-        testPrinting("123d-4", "1.23d-2");
+        testPrinting("123d-3", "0.123");
+        testPrinting("123d-4", "0.0123");
+        testPrinting("123d-10", "123d-10");
 
         testPrinting("-123d3",  "-123d3");
         testPrinting("-123d1",  "-123d1");
         testPrinting("-123d0",  "-123.");
         testPrinting("-123d-1", "-12.3");
         testPrinting("-123d-2", "-1.23");
-        testPrinting("-123d-3", "-1.23d-1");
-        testPrinting("-123d-4", "-1.23d-2");
+        testPrinting("-123d-3", "-0.123");
+        testPrinting("-123d-4", "-0.0123");
+        testPrinting("-123d-10", "-123d-10");
 
         // Zeros are a bit trickier
 //        testPrinting("0.0", "0.0");
 //        testPrinting("0.00", "0.00");
         testPrinting("0d1",   "0d1");
-        testPrinting("0d-1",  "0d-1");
+        testPrinting("0d-1",  "0.0");
         testPrinting("0d2",   "0d2");
-        testPrinting("0d-2",  "0d-2"); // should be 0.00 or 0.0d-1 ?
+        testPrinting("0d-2",  "0.00");
     }
 
     public void testPrinting(String input, String output)
diff --git a/test/com/amazon/ion/RoundTripTest.java b/test/com/amazon/ion/RoundTripTest.java
index 4e1b00e9a1..fe4077d3fe 100644
--- a/test/com/amazon/ion/RoundTripTest.java
+++ b/test/com/amazon/ion/RoundTripTest.java
@@ -27,7 +27,6 @@
 import com.amazon.ion.streaming.ReaderCompare;
 import com.amazon.ion.streaming.RoundTripStreamingTest;
 import com.amazon.ion.system.IonTextWriterBuilder;
-import com.amazon.ion.util.Printer;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -79,7 +78,6 @@ private enum BinaryEncoderType
     public static final BinaryEncoderType[] BINARY_ENCODER_TYPES =
         BinaryEncoderType.values();
 
-    private Printer             myPrinter;
     private StringBuilder       myBuilder;
     private File                myTestFile;
     private BinaryEncoderType   myBinaryEncoderType;
@@ -100,7 +98,6 @@ public void setUp()
     throws Exception
     {
         super.setUp();
-        myPrinter = new Printer();
         myBuilder = new StringBuilder();
     }
 
@@ -109,7 +106,6 @@ public void setUp()
     public void tearDown()
     throws Exception
     {
-        myPrinter = null;
         myBuilder = null;
         super.tearDown();
     }
@@ -118,11 +114,10 @@ public void tearDown()
     private String renderSystemView(IonDatagram datagram)
     throws IOException
     {
-        // TODO use Printer in raw mode.
         for (Iterator i = datagram.systemIterator(); i.hasNext();)
         {
             IonValue value = (IonValue) i.next();
-            myPrinter.print(value, myBuilder);
+            myBuilder.append(value.toString());
             myBuilder.append('\n');
         }
 
@@ -134,11 +129,10 @@ private String renderSystemView(IonDatagram datagram)
     private String renderUserView(IonDatagram datagram)
     throws IOException
     {
-        // TODO use Printer in raw mode.
         for (Iterator i = datagram.iterator(); i.hasNext();)
         {
             IonValue value = (IonValue) i.next();
-            myPrinter.print(value, myBuilder);
+            myBuilder.append(value.toString());
             myBuilder.append('\n');
         }
 
diff --git a/test/com/amazon/ion/streaming/RoundTripStreamingTest.java b/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
index 1ee28f8af3..b012d34dfa 100644
--- a/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
+++ b/test/com/amazon/ion/streaming/RoundTripStreamingTest.java
@@ -34,7 +34,6 @@
 import com.amazon.ion.junit.IonAssert;
 import com.amazon.ion.system.IonTextWriterBuilder;
 import com.amazon.ion.util.Equivalence;
-import com.amazon.ion.util.Printer;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
@@ -60,7 +59,6 @@ public class RoundTripStreamingTest
     public static final StreamCopySpeed[] STREAM_COPY_SPEEDS =
         StreamCopySpeed.values();
 
-    private Printer       myPrinter;
     private StringBuilder myBuilder;
     private byte[]        myBuffer;
     private File          myTestFile;
@@ -76,7 +74,6 @@ public void setUp()
     throws Exception
     {
         super.setUp();
-        myPrinter = new Printer();
         myBuilder = new StringBuilder();
         myBuffer = _Private_Utils.loadFileBytes(myTestFile);
     }
@@ -86,7 +83,6 @@ public void setUp()
     public void tearDown()
     throws Exception
     {
-        myPrinter = null;
         myBuilder = null;
         myBuffer  = null;
         super.tearDown();
@@ -106,8 +102,7 @@ private String makeString(IonDatagram datagram)
             else {
                 myBuilder.append(' ');
             }
-            myPrinter.print(value, myBuilder);
-            // Why is this here?  myBuilder.append('\n');
+            myBuilder.append(value.toString());
         }
 
         String text = myBuilder.toString();

From 4c0e762d3d214f3ec152c30783704237db2e02eb Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 27 Jul 2023 12:09:30 -0700
Subject: [PATCH 221/490] Iteratively traverses the document during
 IonValue.hashCode; improves IonValue.writeTo performance.

---
 src/com/amazon/ion/impl/bin/Symbols.java      |  27 +-
 src/com/amazon/ion/impl/lite/IonBlobLite.java |   9 +-
 src/com/amazon/ion/impl/lite/IonBoolLite.java |  26 +-
 src/com/amazon/ion/impl/lite/IonClobLite.java |   9 +-
 .../ion/impl/lite/IonContainerLite.java       |  53 ++++
 .../amazon/ion/impl/lite/IonDatagramLite.java |  33 +--
 .../amazon/ion/impl/lite/IonDecimalLite.java  |  23 +-
 .../amazon/ion/impl/lite/IonFloatLite.java    |  26 +-
 src/com/amazon/ion/impl/lite/IonIntLite.java  |  43 ++-
 src/com/amazon/ion/impl/lite/IonListLite.java |   4 +-
 src/com/amazon/ion/impl/lite/IonLobLite.java  |  14 +-
 src/com/amazon/ion/impl/lite/IonNullLite.java |   9 +-
 .../amazon/ion/impl/lite/IonSequenceLite.java |  26 --
 src/com/amazon/ion/impl/lite/IonSexpLite.java |   4 +-
 .../amazon/ion/impl/lite/IonStringLite.java   |  16 +-
 .../amazon/ion/impl/lite/IonStructLite.java   |  97 +------
 .../amazon/ion/impl/lite/IonSymbolLite.java   |  36 +--
 src/com/amazon/ion/impl/lite/IonTextLite.java |   2 +-
 .../ion/impl/lite/IonTimestampLite.java       |  14 +-
 .../amazon/ion/impl/lite/IonValueLite.java    | 263 ++++++++++++++----
 20 files changed, 400 insertions(+), 334 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/Symbols.java b/src/com/amazon/ion/impl/bin/Symbols.java
index 77540c9ae7..8821a0d387 100644
--- a/src/com/amazon/ion/impl/bin/Symbols.java
+++ b/src/com/amazon/ion/impl/bin/Symbols.java
@@ -41,6 +41,8 @@
 import com.amazon.ion.IonException;
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SymbolToken;
+import com.amazon.ion.impl._Private_Utils;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -60,30 +62,7 @@ public static SymbolToken symbol(final String name, final int val)
     {
         if (name == null) { throw new NullPointerException(); }
         if (val <= 0) { throw new IllegalArgumentException("Symbol value must be positive: " + val); }
-
-        return new SymbolToken()
-        {
-            public String getText()
-            {
-                return name;
-            }
-
-            public String assumeText()
-            {
-                return name;
-            }
-
-            public int getSid()
-            {
-                return val;
-            }
-
-            @Override
-            public String toString()
-            {
-                return "(symbol '" + getText() + "' " + getSid() + ")";
-            }
-        };
+        return _Private_Utils.newSymbolToken(name, val);
     }
 
     /** Lazy iterator over the symbol names of an iterator of symbol tokens. */
diff --git a/src/com/amazon/ion/impl/lite/IonBlobLite.java b/src/com/amazon/ion/impl/lite/IonBlobLite.java
index 4373d6dcf2..11f4c47dd3 100644
--- a/src/com/amazon/ion/impl/lite/IonBlobLite.java
+++ b/src/com/amazon/ion/impl/lite/IonBlobLite.java
@@ -57,8 +57,13 @@ public IonBlobLite clone()
     }
 
     @Override
-    int hashCode(SymbolTableProvider symbolTableProvider) {
-        return lobHashCode(HASH_SIGNATURE, symbolTableProvider);
+    int hashSignature() {
+        return HASH_SIGNATURE;
+    }
+
+    @Override
+    int scalarHashCode() {
+        return lobHashCode(HASH_SIGNATURE);
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonBoolLite.java b/src/com/amazon/ion/impl/lite/IonBoolLite.java
index 7c62a943c1..0b4483d8e7 100644
--- a/src/com/amazon/ion/impl/lite/IonBoolLite.java
+++ b/src/com/amazon/ion/impl/lite/IonBoolLite.java
@@ -74,16 +74,15 @@ public IonType getType()
     }
 
     @Override
-    int hashCode(SymbolTableProvider symbolTableProvider)
-    {
-        int result = HASH_SIGNATURE;
-
-        if (!isNullValue())
-        {
-            result = booleanValue() ? TRUE_HASH : FALSE_HASH;
-        }
+    int hashSignature() {
+        return HASH_SIGNATURE;
+    }
 
-        return hashTypeAnnotations(result, symbolTableProvider);
+    @Override
+    int scalarHashCode()
+    {
+        int result = _isBoolTrue() ? TRUE_HASH : FALSE_HASH;
+        return hashTypeAnnotations(result);
     }
 
     public boolean booleanValue()
@@ -116,14 +115,7 @@ public void setValue(Boolean b)
     final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
         throws IOException
     {
-        if (isNullValue())
-        {
-            writer.writeNull(IonType.BOOL);
-        }
-        else
-        {
-            writer.writeBool(_isBoolTrue());
-        }
+        writer.writeBool(_isBoolTrue());
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonClobLite.java b/src/com/amazon/ion/impl/lite/IonClobLite.java
index 38d7ec1d16..acd2dd054b 100644
--- a/src/com/amazon/ion/impl/lite/IonClobLite.java
+++ b/src/com/amazon/ion/impl/lite/IonClobLite.java
@@ -60,8 +60,13 @@ public IonClobLite clone()
     }
 
     @Override
-    int hashCode(SymbolTableProvider symbolTableProvider) {
-        return lobHashCode(HASH_SIGNATURE, symbolTableProvider);
+    int hashSignature() {
+        return HASH_SIGNATURE;
+    }
+
+    @Override
+    int scalarHashCode() {
+        return lobHashCode(HASH_SIGNATURE);
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonContainerLite.java b/src/com/amazon/ion/impl/lite/IonContainerLite.java
index 1cc365311c..989346ab64 100644
--- a/src/com/amazon/ion/impl/lite/IonContainerLite.java
+++ b/src/com/amazon/ion/impl/lite/IonContainerLite.java
@@ -20,6 +20,7 @@
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
 import com.amazon.ion.NullValueException;
 import com.amazon.ion.ReadOnlyValueException;
 import com.amazon.ion.SymbolTable;
@@ -27,6 +28,8 @@
 import com.amazon.ion.impl._Private_IonConstants;
 import com.amazon.ion.impl._Private_IonContainer;
 import com.amazon.ion.impl._Private_Utils;
+
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.ListIterator;
@@ -283,6 +286,21 @@ public IonValue next()
             return __current;
         }
 
+        /**
+         * Returns the next element, or null if there are no more elements. This does not call force_position_sync(),
+         * so it must only be called from contexts where it is guaranteed that the container has not been mutated
+         * since the last position sync.
+         */
+        IonValueLite nextOrNull()
+        {
+            if (__pos >= _child_count) {
+                return null;
+            }
+            __current = _children[__pos++];
+            __lastMoveWasPrevious = false;
+            return __current;
+        }
+
         public final int nextIndex()
         {
             force_position_sync();
@@ -343,6 +361,8 @@ public void remove()
             int concrete_idx = concrete._elementid();
             assert(concrete_idx == idx);
 
+            beforeIteratorRemove(concrete, idx);
+
             // here we remove the member from the container's list of elements
             remove_child(idx);
             patch_elements_helper(concrete_idx);
@@ -354,6 +374,7 @@ public void remove()
                 __pos--;
             }
             __current = null;
+            afterIteratorRemove(concrete, idx);
         }
 
         public void set(IonValue element)
@@ -362,6 +383,38 @@ public void set(IonValue element)
         }
     }
 
+    /**
+     * Called before a value is removed from the SequenceContentIterator. May be overridden by subclasses that require
+     * custom behavior.
+     * @param value the value that will be removed.
+     * @param idx the container index of the value that will be removed.
+     */
+    void beforeIteratorRemove(IonValueLite value, int idx) {
+        // Do nothing.
+    }
+
+    /**
+     * Called after a value is removed from the SequenceContentIterator. May be overridden by subclasses that require
+     * custom behavior.
+     * @param value the value that was removed.
+     * @param idx the container index of the value that was removed.
+     */
+    void afterIteratorRemove(IonValueLite value, int idx) {
+        // Do nothing.
+    }
+
+    @Override
+    final int scalarHashCode() {
+        throw new IllegalStateException("Not applicable for container values.");
+    }
+
+    @Override
+    final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
+        throws IOException
+    {
+        throw new IllegalStateException("Not applicable for container values.");
+    }
+
     public void makeNull()
     {
         clear();            // this checks for the lock
diff --git a/src/com/amazon/ion/impl/lite/IonDatagramLite.java b/src/com/amazon/ion/impl/lite/IonDatagramLite.java
index a9eebcd082..611714298c 100644
--- a/src/com/amazon/ion/impl/lite/IonDatagramLite.java
+++ b/src/com/amazon/ion/impl/lite/IonDatagramLite.java
@@ -300,31 +300,24 @@ public boolean addAll(int index, Collection<? extends IonValue> c)
         return changed;
     }
 
+    @Override
+    int hashSignature() {
+        return HASH_SIGNATURE;
+    }
+
     @Override
     public int hashCode() {
         int prime  = 8191;
         int result = HASH_SIGNATURE;
 
-        if (!isNullValue()) {
-            // As we are a datagram then the children need to resolve their own symbol tables -
-            // so we use the 'top level' #hashCode() which will force each child to resolve it's
-            // own symbol table.
-            for (IonValue v : this) {
-                result = prime * result + v.hashCode();
-                // mixing at each step to make the hash code order-dependent
-                result ^= (result << 29) ^ (result >> 3);
-            }
+        for (IonValue v : this) {
+            result = prime * result + v.hashCode();
+            // mixing at each step to make the hash code order-dependent
+            result ^= (result << 29) ^ (result >> 3);
         }
         return result;
     }
 
-    @Override
-    int hashCode(SymbolTableProvider symbolTableProvider) {
-        String message = "IonDatagrams do not need a resolved Symbol table use #hashCode()";
-        throw new UnsupportedOperationException(message);
-    }
-
-
     @Override
     public <T extends IonValue> T[] extract(Class<T> type)
     {
@@ -429,14 +422,6 @@ public final void writeTo(IonWriter writer)
         }
     }
 
-    @Override
-    final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
-        throws IOException
-    {
-        throw new UnsupportedOperationException("IonDatagram does not operate with a Symbol Table");
-    }
-
-
     //////////////////////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/com/amazon/ion/impl/lite/IonDecimalLite.java b/src/com/amazon/ion/impl/lite/IonDecimalLite.java
index 63ecea4fdd..9870925273 100644
--- a/src/com/amazon/ion/impl/lite/IonDecimalLite.java
+++ b/src/com/amazon/ion/impl/lite/IonDecimalLite.java
@@ -82,23 +82,26 @@ public IonDecimalLite clone()
     }
 
     @Override
-    int hashCode(SymbolTableProvider symbolTableProvider)
+    int hashSignature() {
+        return HASH_SIGNATURE;
+    }
+
+    @Override
+    int scalarHashCode()
     {
         int result = HASH_SIGNATURE;
 
         // This is consistent with Decimal.equals(Object), and with Equivalence
         // strict equality checks between two IonDecimals.
-        if (!isNullValue())  {
-            Decimal dec = decimalValue();
-            result ^= dec.hashCode();
-
-            if (dec.isNegativeZero())
-            {
-                result ^= NEGATIVE_ZERO_HASH_SIGNATURE;
-            }
+        Decimal dec = decimalValue();
+        result ^= dec.hashCode();
+
+        if (dec.isNegativeZero())
+        {
+            result ^= NEGATIVE_ZERO_HASH_SIGNATURE;
         }
 
-        return hashTypeAnnotations(result, symbolTableProvider);
+        return hashTypeAnnotations(result);
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonFloatLite.java b/src/com/amazon/ion/impl/lite/IonFloatLite.java
index 4b142899fe..16fa618e0c 100644
--- a/src/com/amazon/ion/impl/lite/IonFloatLite.java
+++ b/src/com/amazon/ion/impl/lite/IonFloatLite.java
@@ -62,16 +62,17 @@ public IonFloatLite clone()
     }
 
     @Override
-    int hashCode(SymbolTableProvider symbolTableProvider)
+    int hashSignature() {
+        return HASH_SIGNATURE;
+    }
+
+    @Override
+    int scalarHashCode()
     {
         int result = HASH_SIGNATURE;
-
-        if (!isNullValue())  {
-            long bits = Double.doubleToLongBits(doubleValue());
-            result ^= (int) ((bits >>> 32) ^ bits);
-        }
-
-        return hashTypeAnnotations(result, symbolTableProvider);
+        long bits = Double.doubleToLongBits(_float_value);
+        result ^= (int) ((bits >>> 32) ^ bits);
+        return hashTypeAnnotations(result);
     }
 
     @Override
@@ -142,14 +143,7 @@ public void setValue(Double d)
     final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
         throws IOException
     {
-        if (isNullValue())
-        {
-            writer.writeNull(IonType.FLOAT);
-        }
-        else
-        {
-            writer.writeFloat(_float_value);
-        }
+        writer.writeFloat(_float_value);
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonIntLite.java b/src/com/amazon/ion/impl/lite/IonIntLite.java
index 89747dd600..784fbcf039 100644
--- a/src/com/amazon/ion/impl/lite/IonIntLite.java
+++ b/src/com/amazon/ion/impl/lite/IonIntLite.java
@@ -80,29 +80,30 @@ public IonIntLite clone()
     }
 
     @Override
-    int hashCode(SymbolTableProvider symbolTableProvider)
+    int hashSignature() {
+        return HASH_SIGNATURE;
+    }
+
+    @Override
+    int scalarHashCode()
     {
         int result = HASH_SIGNATURE;
-
-        if (!isNullValue())  {
-            if (_big_int_value == null)
-            {
-                long lv = longValue();
-                // Throw away top 32 bits if they're not interesting.
-                // Otherwise n and -(n+1) get the same hash code.
-                result ^= (int) lv;
-                int hi_word = (int) (lv >>> 32);
-                if (hi_word != 0 && hi_word != -1)  {
-                    result ^= hi_word;
-                }
-            }
-            else
-            {
-                result = _big_int_value.hashCode();
+        if (_big_int_value == null)
+        {
+            // Throw away top 32 bits if they're not interesting.
+            // Otherwise n and -(n+1) get the same hash code.
+            result ^= (int) _long_value;
+            int hi_word = (int) (_long_value >>> 32);
+            if (hi_word != 0 && hi_word != -1)  {
+                result ^= hi_word;
             }
         }
+        else
+        {
+            result = _big_int_value.hashCode();
+        }
 
-        return hashTypeAnnotations(result, symbolTableProvider);
+        return hashTypeAnnotations(result);
     }
 
     @Override
@@ -202,11 +203,7 @@ else if (value instanceof BigDecimal)
     final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
         throws IOException
     {
-        if (isNullValue())
-        {
-            writer.writeNull(IonType.INT);
-        }
-        else if (_big_int_value != null)
+        if (_big_int_value != null)
         {
             writer.writeInt(_big_int_value);
         }
diff --git a/src/com/amazon/ion/impl/lite/IonListLite.java b/src/com/amazon/ion/impl/lite/IonListLite.java
index 3d8ad0d0b0..64d31c986a 100644
--- a/src/com/amazon/ion/impl/lite/IonListLite.java
+++ b/src/com/amazon/ion/impl/lite/IonListLite.java
@@ -77,8 +77,8 @@ public IonListLite clone()
     }
 
     @Override
-    int hashCode(SymbolTableProvider symbolTableProvider) {
-        return sequenceHashCode(HASH_SIGNATURE, symbolTableProvider);
+    int hashSignature() {
+        return HASH_SIGNATURE;
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonLobLite.java b/src/com/amazon/ion/impl/lite/IonLobLite.java
index b74033c168..d0e3847664 100644
--- a/src/com/amazon/ion/impl/lite/IonLobLite.java
+++ b/src/com/amazon/ion/impl/lite/IonLobLite.java
@@ -52,17 +52,13 @@ protected IonLobLite(ContainerlessContext context, boolean isNull)
      * @param seed Seed value
      * @return hash code
      */
-    protected int lobHashCode(int seed, SymbolTableProvider symbolTableProvider)
+    protected int lobHashCode(int seed)
     {
         int result = seed;
-
-        if (!isNullValue())  {
-            CRC32 crc = new CRC32();
-            crc.update(getBytes());
-            result ^= (int) crc.getValue();
-        }
-
-        return hashTypeAnnotations(result, symbolTableProvider);
+        CRC32 crc = new CRC32();
+        crc.update(_lob_value);
+        result ^= (int) crc.getValue();
+        return hashTypeAnnotations(result);
     }
 
     /**
diff --git a/src/com/amazon/ion/impl/lite/IonNullLite.java b/src/com/amazon/ion/impl/lite/IonNullLite.java
index ce6abefabe..6a1a9857c1 100644
--- a/src/com/amazon/ion/impl/lite/IonNullLite.java
+++ b/src/com/amazon/ion/impl/lite/IonNullLite.java
@@ -71,8 +71,13 @@ final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider
     }
 
     @Override
-    public int hashCode(SymbolTableProvider symbolTableProvider) {
-        return hashTypeAnnotations(HASH_SIGNATURE, symbolTableProvider);
+    int hashSignature() {
+        return HASH_SIGNATURE;
+    }
+
+    @Override
+    public int scalarHashCode() {
+        return hashTypeAnnotations(HASH_SIGNATURE);
     }
 
 }
diff --git a/src/com/amazon/ion/impl/lite/IonSequenceLite.java b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
index 2f04497870..588e6ef1ad 100644
--- a/src/com/amazon/ion/impl/lite/IonSequenceLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
@@ -90,24 +90,6 @@ abstract class IonSequenceLite
     @Override
     public abstract IonSequenceLite clone();
 
-    protected int sequenceHashCode(int seed, SymbolTableProvider symbolTableProvider)
-    {
-        final int prime = 8191;
-        int result = seed;
-
-        if (!isNullValue()) {
-            for (IonValue v : this) {
-                IonValueLite vLite = (IonValueLite) v;
-                result = prime * result + vLite.hashCode(symbolTableProvider);
-                // mixing at each step to make the hash code order-dependent
-                result ^= (result << 29) ^ (result >> 3);
-            }
-        }
-
-        return hashTypeAnnotations(result, symbolTableProvider);
-    }
-
-
     @Override
     // Increasing visibility
     public boolean add(IonValue element)
@@ -404,14 +386,6 @@ public <T extends IonValue> T[] extract(Class<T> type)
         return array;
     }
 
-
-    @Override
-    void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
-        throws IOException
-    {
-        throw new IllegalStateException("writeBodyTo is only applicable for scalar values.");
-    }
-
     /**
      * SubListView throws a {@link ConcurrentModificationException} if the parent list has any
      * structural modifications, i.e. any operation that cause its size to change. To determine if
diff --git a/src/com/amazon/ion/impl/lite/IonSexpLite.java b/src/com/amazon/ion/impl/lite/IonSexpLite.java
index 42a5625865..f090e0ee9f 100644
--- a/src/com/amazon/ion/impl/lite/IonSexpLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSexpLite.java
@@ -70,8 +70,8 @@ public IonSexpLite clone()
     }
 
     @Override
-    public int hashCode(SymbolTableProvider symbolTableProvider) {
-        return sequenceHashCode(HASH_SIGNATURE, symbolTableProvider);
+    int hashSignature() {
+        return HASH_SIGNATURE;
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonStringLite.java b/src/com/amazon/ion/impl/lite/IonStringLite.java
index e7bd0e945b..b934804a66 100644
--- a/src/com/amazon/ion/impl/lite/IonStringLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStringLite.java
@@ -56,15 +56,17 @@ public IonStringLite clone()
     }
 
     @Override
-    int hashCode(SymbolTableProvider symbolTableProvider)
+    int hashSignature() {
+        return HASH_SIGNATURE;
+    }
+
+    @Override
+    int scalarHashCode()
     {
         int result = HASH_SIGNATURE;
+        result ^= _text_value.hashCode();
 
-        if (!isNullValue()) {
-            result ^= stringValue().hashCode();
-        }
-
-        return hashTypeAnnotations(result, symbolTableProvider);
+        return hashTypeAnnotations(result);
     }
 
     @Override
@@ -77,7 +79,7 @@ public IonType getType()
     final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
         throws IOException
     {
-        writer.writeString(_get_value());
+        writer.writeString(_text_value);
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/com/amazon/ion/impl/lite/IonStructLite.java
index bc07221ffb..ffa572e755 100644
--- a/src/com/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStructLite.java
@@ -282,54 +282,9 @@ private boolean there_is_only_one(String fieldName, int existing_idx)
 //        }
 //    }
 
-    /**
-     * Implements {@link Object#hashCode()} consistent with equals.
-     * This is insensitive to order of fields.
-     * <p>
-     * This method must follow the contract of {@link Object#equals(Object)},
-     * which is located at {@link Equivalence#ionEquals(IonValue, IonValue)}.
-     *
-     * @return  An int, consistent with the contracts for
-     *          {@link Object#hashCode()} and {@link Object#equals(Object)}.
-     */
     @Override
-    int hashCode(SymbolTableProvider symbolTableProvider)
-    {
-        final int nameHashSalt  = 16777619; // prime to salt name of each Field
-        final int valueHashSalt = 8191;     // prime to salt value of each Field
-        final int sidHashSalt   = 127;      // prime to salt sid of fieldname
-        final int textHashSalt  = 31;       // prime to salt text of fieldname
-
-        int result = HASH_SIGNATURE;
-
-        if (!isNullValue())  {
-            for (IonValue v : this)  {
-                IonValueLite vlite = (IonValueLite) v;
-                // If fieldname's text is unknown, use its sid instead
-                SymbolToken token = vlite.getFieldNameSymbol(symbolTableProvider);
-                String text = token.getText();
-
-                int nameHashCode = text == null
-                    ? token.getSid()  * sidHashSalt
-                    : text.hashCode() * textHashSalt;
-
-                // mixing to account for small text and sid deltas
-                nameHashCode ^= (nameHashCode << 17) ^ (nameHashCode >> 15);
-
-                int fieldHashCode = HASH_SIGNATURE;
-                fieldHashCode = valueHashSalt * fieldHashCode + vlite.hashCode(symbolTableProvider);
-                fieldHashCode = nameHashSalt  * fieldHashCode + nameHashCode;
-
-                // another mix step for each Field of the struct
-                fieldHashCode ^= (fieldHashCode << 19) ^ (fieldHashCode >> 13);
-
-                // Additive hash is used to ensure insensitivity to order of
-                // fields, and will not lose data on value hash codes
-                result += fieldHashCode;
-            }
-        }
-
-        return hashTypeAnnotations(result, symbolTableProvider);
+    int hashSignature() {
+        return HASH_SIGNATURE;
     }
 
     public IonStruct cloneAndRemove(String... fieldNames)
@@ -629,38 +584,17 @@ public void put(String fieldName, IonValue value)
     }
 
     @Override
-    public ListIterator<IonValue> listIterator(int index) {
-        return new SequenceContentIterator(index, isReadOnly()) {
-            @Override
-            public void remove() {
-                if (__readOnly) {
-                    throw new UnsupportedOperationException();
-                }
-                force_position_sync();
-
-                int idx = __pos;
-                if (!__lastMoveWasPrevious) {
-                    // position is 1 ahead of the array index
-                    idx--;
-                }
-                if (idx < 0) {
-                    throw new ArrayIndexOutOfBoundsException();
-                }
-
-                IonValueLite concrete = __current;
-                int concrete_idx = concrete._elementid();
-                assert(concrete_idx == idx);
-
-                if (_field_map != null) {
-                    remove_field_from_field_map(concrete.getFieldName(), idx);
-                }
-                super.remove();
+    void beforeIteratorRemove(IonValueLite value, int idx) {
+        if (_field_map != null) {
+            remove_field_from_field_map(value.getFieldName(), idx);
+        }
+    }
 
-                if (_field_map != null) {
-                    patch_map_elements_helper(idx);
-                }
-            }
-        };
+    @Override
+    void afterIteratorRemove(IonValueLite value, int idx) {
+        if (_field_map != null) {
+            patch_map_elements_helper(idx);
+        }
     }
 
     public IonValue remove(String fieldName)
@@ -795,13 +729,6 @@ private static void validateFieldName(String fieldName)
         }
     }
 
-    @Override
-    final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
-        throws IOException
-    {
-        throw new IllegalStateException("writeBodyTo is only applicable for scalar values.");
-    }
-
     @Override
     public void accept(ValueVisitor visitor) throws Exception
     {
diff --git a/src/com/amazon/ion/impl/lite/IonSymbolLite.java b/src/com/amazon/ion/impl/lite/IonSymbolLite.java
index fe9b9351e8..1492577ba2 100644
--- a/src/com/amazon/ion/impl/lite/IonSymbolLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSymbolLite.java
@@ -101,28 +101,26 @@ && _stringValue() == null) {
     }
 
     @Override
-    int hashCode(SymbolTableProvider symbolTableProvider)
+    int hashSignature() {
+        return HASH_SIGNATURE;
+    }
+
+    @Override
+    int scalarHashCode()
     {
         final int sidHashSalt   = 127;      // prime to salt sid
         final int textHashSalt  = 31;       // prime to salt text
         int result = HASH_SIGNATURE;
+        int tokenHashCode = _text_value == null
+            ? _sid  * sidHashSalt
+            : _text_value.hashCode() * textHashSalt;
 
-        if (!isNullValue())
-        {
-            SymbolToken token = symbolValue(symbolTableProvider);
-            String text = token.getText();
-
-            int tokenHashCode = text == null
-                ? token.getSid()  * sidHashSalt
-                : text.hashCode() * textHashSalt;
+        // mixing to account for small text and sid deltas
+        tokenHashCode ^= (tokenHashCode << 29) ^ (tokenHashCode >> 3);
 
-            // mixing to account for small text and sid deltas
-            tokenHashCode ^= (tokenHashCode << 29) ^ (tokenHashCode >> 3);
+        result ^= tokenHashCode;
 
-            result ^= tokenHashCode;
-        }
-
-        return hashTypeAnnotations(result, symbolTableProvider);
+        return hashTypeAnnotations(result);
     }
 
     @Override
@@ -291,7 +289,13 @@ final void writeBodyTo(IonWriter writer, SymbolTableProvider symbolTableProvider
         // we throw (cannot serialize) or do we pass the sid thru???
 
         // NB! This will throw if symbol is not set
-        writer.writeSymbolToken(symbolValue(symbolTableProvider));
+        String text = _stringValue(symbolTableProvider);
+        if (text != null) {
+            writer.writeSymbol(text);
+        } else {
+            writer.writeSymbolToken(_Private_Utils.newSymbolToken(getSymbolId(symbolTableProvider)));
+        }
+
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonTextLite.java b/src/com/amazon/ion/impl/lite/IonTextLite.java
index 8001300c9f..d5bc9cb3dd 100644
--- a/src/com/amazon/ion/impl/lite/IonTextLite.java
+++ b/src/com/amazon/ion/impl/lite/IonTextLite.java
@@ -22,7 +22,7 @@ abstract class IonTextLite
     extends IonValueLite
     implements IonText
 {
-    private String _text_value;
+    protected String _text_value;
 
     protected IonTextLite(ContainerlessContext context, boolean isNull)
     {
diff --git a/src/com/amazon/ion/impl/lite/IonTimestampLite.java b/src/com/amazon/ion/impl/lite/IonTimestampLite.java
index 4ba260f441..f0c102542e 100644
--- a/src/com/amazon/ion/impl/lite/IonTimestampLite.java
+++ b/src/com/amazon/ion/impl/lite/IonTimestampLite.java
@@ -72,14 +72,14 @@ public IonTimestampLite clone()
     }
 
     @Override
-    int hashCode(SymbolTableProvider symbolTableProvider) {
-        int result = HASH_SIGNATURE;
-
-        if (!isNullValue())  {
-            result ^= timestampValue().hashCode();
-        }
+    int hashSignature() {
+        return HASH_SIGNATURE;
+    }
 
-        return hashTypeAnnotations(result, symbolTableProvider);
+    @Override
+    int scalarHashCode() {
+        int result = HASH_SIGNATURE ^ _timestamp_value.hashCode();
+        return hashTypeAnnotations(result);
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
index 9a24458ee3..527a4ae114 100644
--- a/src/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -20,7 +20,6 @@
 import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
 import static com.amazon.ion.util.Equivalence.ionEquals;
 
-import com.amazon.ion.IonContainer;
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonType;
@@ -38,9 +37,6 @@
 import com.amazon.ion.system.IonTextWriterBuilder;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.Iterator;
 
 /**
  *  Base class of the light weight implementation of
@@ -407,34 +403,131 @@ public SymbolTable getSymbolTable()
 
     abstract IonValueLite clone(IonContext parentContext);
 
+    /**
+     * @return the constant hash signature unique to the value's type.
+     */
+    abstract int hashSignature();
+
+    private static final int sidHashSalt   = 127; // prime to salt symbol IDs
+    private static final int textHashSalt  = 31; // prime to salt text
+    private static final int nameHashSalt  = 16777619; // prime to salt field names
+    private static final int valueHashSalt = 8191; // prime to salt values
+
+    private static class HashHolder {
+        int valueHash = 0;
+        IonContainerLite parent = null;
+        IonContainerLite.SequenceContentIterator iterator = null;
+
+        private int hashStructField(int partial, IonValueLite value) {
+            // If the field name's text is unknown, use its sid instead
+            String text = value._fieldName;
+
+            int nameHashCode = text == null
+                ? value._fieldId * sidHashSalt
+                : text.hashCode() * textHashSalt;
+
+            // mixing to account for small text and sid deltas
+            nameHashCode ^= (nameHashCode << 17) ^ (nameHashCode >> 15);
+
+            int fieldHashCode = parent.hashSignature();
+            fieldHashCode = valueHashSalt * fieldHashCode + partial;
+            fieldHashCode = nameHashSalt  * fieldHashCode + nameHashCode;
+
+            // another mix step for each Field of the struct
+            fieldHashCode ^= (fieldHashCode << 19) ^ (fieldHashCode >> 13);
+            return fieldHashCode;
+        }
+
+        void update(int partial, IonValueLite value) {
+            if (parent == null) {
+                valueHash = partial;
+            } else {
+                if (parent instanceof IonStructLite) {
+                    // Additive hash is used to ensure insensitivity to order of
+                    // fields, and will not lose data on value hash codes
+                    valueHash += hashStructField(partial, value);
+                } else {
+                    valueHash = valueHashSalt * valueHash + partial;
+                    // mixing at each step to make the hash code order-dependent
+                    valueHash ^= (valueHash << 29) ^ (valueHash >> 3);
+                }
+            }
+        }
+    }
 
     /**
-     * Since {@link #equals(Object)} is overridden, each concrete class must provide
-     * an implementation of {@link Object#hashCode()}.
+     * Since {@link #equals(Object)} is overridden, each concrete class representing a scalar value must provide
+     * an implementation of {@link #scalarHashCode()}.
      * @return hash code for instance consistent with equals().
      */
-    /*
-     * internally ALL implementations will be delegated too with the SymbolTable
-     * which is to prevent the SymbolTable being continually re-located in complex structures.
-     *
-     * This is near universally true - however does not apply for IonDatagramLite - hence it
-     * explicitly overrides hashCode()
-     */
     @Override
     public int hashCode() {
-        // Supply a lazy symbol table provider, which will call getSymbolTable()
-        // only once it's actually necessary.
-        // This works for all child types with the exception of
-        // IonDatagramLite which has a different, explicit behavior for hashCode()
-        // (hence this method cannot be final).
-        return hashCode(new LazySymbolTableProvider(this));
+        // Branching early for scalars is a significant performance optimization because it avoids allocating an
+        // unnecessary hash stack for these values. Scalars *should* be the most commonly hashed kind of value.
+        if ((_flags & IS_NULL_VALUE) != 0) {
+            return hashTypeAnnotations(hashSignature());
+        } else if (this instanceof IonContainerLite) {
+            return containerHashCode();
+        }
+        return scalarHashCode();
     }
 
-    /*
-     * Internal HashCode implementation which utilizes a SymbolTableProvider
-     * to resolve the SymbolTable to use in encoding the sub-graph.
+    private int containerHashCode() {
+        HashHolder[] hashStack = new HashHolder[CONTAINER_STACK_INITIAL_CAPACITY];
+        int hashStackIndex = 0;
+        hashStack[hashStackIndex] = new HashHolder();
+        IonValueLite value = this;
+        do {
+            HashHolder hashHolder = hashStack[hashStackIndex];
+            if ((value._flags & IS_NULL_VALUE) != 0) {
+                // Null values are hashed using a constant signature unique to the type.
+                hashHolder.update(value.hashTypeAnnotations(value.hashSignature()), value);
+            } else if (!(value instanceof IonContainerLite)) {
+                hashHolder.update(value.scalarHashCode(), value);
+            } else {
+                // Step into the container by pushing a HashHolder for the container onto the stack.
+                if (++hashStackIndex >= hashStack.length) {
+                    hashStack = growHashStack(hashStack);
+                }
+                hashHolder = hashStack[hashStackIndex];
+                if (hashHolder == null) {
+                    hashHolder = new HashHolder();
+                    hashStack[hashStackIndex] = hashHolder;
+                }
+                hashHolder.parent = (IonContainerLite) value;
+                hashHolder.iterator = hashHolder.parent.new SequenceContentIterator(0, true);
+                hashHolder.valueHash = value.hashSignature();
+            }
+            do {
+                if (hashHolder.parent == null) {
+                    // Iteration has returned to the top level; return the top-level value's hash code.
+                    return hashHolder.valueHash;
+                }
+                value = hashHolder.iterator.nextOrNull();
+                if (value == null) {
+                    // The end of the container has been reached. Pop from the stack and update the parent's hash.
+                    hashHolder = hashStack[hashStackIndex--];
+                    IonValueLite container = hashHolder.parent;
+                    int containerHash = container.hashTypeAnnotations(hashHolder.valueHash);
+                    hashHolder.parent = null;
+                    hashHolder.iterator = null;
+                    hashHolder = hashStack[hashStackIndex];
+                    hashHolder.update(containerHash, container);
+                }
+            } while (value == null);
+        } while (true);
+    }
+
+    private static HashHolder[] growHashStack(HashHolder[] hashStack) {
+        HashHolder[] newHashStack = new HashHolder[hashStack.length * 2];
+        System.arraycopy(hashStack, 0, newHashStack, 0, hashStack.length);
+        return newHashStack;
+    }
+
+    /**
+     * Internal HashCode implementation to be overridden by scalar subclasses. Must only be called on non-null values.
      */
-    abstract int hashCode(SymbolTableProvider symbolTableProvider);
+    abstract int scalarHashCode();
 
     public IonContainerLite getContainer()
     {
@@ -797,20 +890,15 @@ public final int findTypeAnnotation(String annotation)
         return -1;
     }
 
-    protected int hashTypeAnnotations(final int original, SymbolTableProvider symbolTableProvider)
+    protected int hashTypeAnnotations(final int original)
     {
-        final SymbolToken[] tokens = getTypeAnnotationSymbols(symbolTableProvider);
+        final SymbolToken[] tokens = _annotations == null ? SymbolToken.EMPTY_ARRAY : _annotations;
         if (tokens.length == 0)
         {
             return original;
         }
 
-        final int sidHashSalt   = 127;      // prime to salt sid of annotation
-        final int textHashSalt  = 31;       // prime to salt text of annotation
-        final int prime = 8191;
-        int result = original ^ TYPE_ANNOTATION_HASH_SIGNATURE;
-
-        result = prime * original + tokens.length;
+        int result = valueHashSalt * original + tokens.length;
 
         for (final SymbolToken token : tokens)
         {
@@ -823,7 +911,7 @@ protected int hashTypeAnnotations(final int original, SymbolTableProvider symbol
             // mixing to account for small text and sid deltas
             tokenHashCode ^= (tokenHashCode << 19) ^ (tokenHashCode >> 13);
 
-            result = prime * result + tokenHashCode;
+            result = valueHashSalt * result + tokenHashCode;
 
             // mixing at each step to make the hash code order-dependent
             result ^= (result << 25) ^ (result >> 7);
@@ -970,64 +1058,121 @@ private static void writeFieldNameAndAnnotations(IonWriter writer, IonValueLite
         if (writer.isInStruct()
             && ! ((_Private_IonWriter) writer).isFieldNameSet())
         {
-            SymbolToken tok = value.getFieldNameSymbol(symbolTableProvider);
-            if (tok == null)
-            {
-                throw new IllegalStateException("Field name not set");
-            }
+            if (value._fieldName != null) {
+                writer.setFieldName(value._fieldName);
+            } else {
+                SymbolToken tok = value.getFieldNameSymbol(symbolTableProvider);
+                if (tok == null)
+                {
+                    throw new IllegalStateException("Field name not set");
+                }
 
-            writer.setFieldNameSymbol(tok);
+                writer.setFieldNameSymbol(tok);
+            }
         }
 
-        SymbolToken[] annotations = value.getTypeAnnotationSymbols(symbolTableProvider);
-        writer.setTypeAnnotationSymbols(annotations);
+        if (value._annotations != null) {
+            writer.setTypeAnnotationSymbols(value._annotations);
+        }
     }
 
+    /*  The following template may be used to iterate over the tree at the current value. Copying this structure
+        and filling in the blanks or customizing as necessary performed better (and consumed about the same number of
+        lines of code) than factoring it into a method and injecting logic into the blanks via lambdas as of 8/2023,
+        when writeTo and hashCode were made iterative instead of recursive. See those methods for examples of this
+        template being used.
+        --------------------------------------------------
+        IonContainerLite.SequenceContentIterator[] iteratorStack = new IonContainerLite.SequenceContentIterator[CONTAINER_STACK_INITIAL_CAPACITY];
+        int iteratorStackIndex = -1;
+        IonContainerLite.SequenceContentIterator currentIterator = null;
+        IonValueLite value = this;
+        do {
+            // BLANK: insert logic that needs to be performed before each value, such as handling field names.
+            if ((value._flags & IS_NULL_VALUE) != 0) {
+                // BLANK: insert logic for handling nulls of any type.
+            } else if (!(value instanceof IonContainerLite)) {
+                // BLANK: insert logic for handling non-null scalar values.
+            } else {
+                if (++iteratorStackIndex >= iteratorStack.length) {
+                    iteratorStack = growIteratorStack(iteratorStack);
+                }
+                currentIterator = ((IonContainerLite) value).new SequenceContentIterator(0, true);
+                iteratorStack[iteratorStackIndex] = currentIterator;
+                // BLANK: insert logic for handling the start of a container value.
+            }
+            do {
+                if (currentIterator == null) {
+                    // BLANK: insert logic for handling the end of iteration.
+                    return;
+                }
+                value = currentIterator.nextOrNull();
+                if (value == null) {
+                    // BLANK: insert logic for handling the end of a container value.
+                    iteratorStack[iteratorStackIndex] = null; // Allow this to be garbage collected
+                    currentIterator = (iteratorStackIndex == 0) ? null : iteratorStack[--iteratorStackIndex];
+                }
+            } while (value == null);
+        } while (true);
+     */
+
     private void writeToIterative(IonWriter writer, SymbolTableProvider symbolTableProvider) throws IOException {
-        Deque<Iterator<IonValue>> iteratorStack = null;
-        Iterator<IonValue> currentIterator = null;
+        IonContainerLite.SequenceContentIterator[] iteratorStack = new IonContainerLite.SequenceContentIterator[CONTAINER_STACK_INITIAL_CAPACITY];
+        int iteratorStackIndex = -1;
+        IonContainerLite.SequenceContentIterator currentIterator = null;
         IonValueLite value = this;
         do {
             writeFieldNameAndAnnotations(writer, value, symbolTableProvider);
-            IonType type = value.getType();
-            if (value.isNullValue()) {
-                writer.writeNull(type);
-            } else if (IonType.isContainer(type)) {
-                if (currentIterator != null) {
-                    if (iteratorStack == null) {
-                        iteratorStack = new ArrayDeque<>(CONTAINER_STACK_INITIAL_CAPACITY);
-                    }
-                    iteratorStack.add(currentIterator);
-                }
-                currentIterator = ((IonContainer) value).iterator();
-                writer.stepIn(type);
-            } else {
+            if ((value._flags & IS_NULL_VALUE) != 0) {
+                writer.writeNull(value.getType());
+            } else if (!(value instanceof IonContainerLite)) {
                 value.writeBodyTo(writer, symbolTableProvider);
+            } else {
+                if (++iteratorStackIndex >= iteratorStack.length) {
+                    iteratorStack = growIteratorStack(iteratorStack);
+                }
+                currentIterator = ((IonContainerLite) value).new SequenceContentIterator(0, true);
+                iteratorStack[iteratorStackIndex] = currentIterator;
+                writer.stepIn(value.getType());
             }
             do {
                 if (currentIterator == null) {
                     return;
                 }
-                value = currentIterator.hasNext() ? (IonValueLite) currentIterator.next() : null;
+                value = currentIterator.nextOrNull();
                 if (value == null) {
                     writer.stepOut();
-                    currentIterator = iteratorStack == null ? null : iteratorStack.pollLast();
+                    iteratorStack[iteratorStackIndex] = null; // Allow this to be garbage collected
+                    currentIterator = (iteratorStackIndex == 0) ? null : iteratorStack[--iteratorStackIndex];
                 }
             } while (value == null);
         } while (true);
     }
+    private static IonContainerLite.SequenceContentIterator[] growIteratorStack(IonContainerLite.SequenceContentIterator[] iteratorStack) {
+        IonContainerLite.SequenceContentIterator[] newIteratorStack = new IonContainerLite.SequenceContentIterator[iteratorStack.length * 2];
+        System.arraycopy(iteratorStack, 0, newIteratorStack, 0, iteratorStack.length);
+        return newIteratorStack;
+    }
+
 
     final void writeTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
     {
         try {
-            writeToIterative(writer, symbolTableProvider);
+            if ((_flags & IS_NULL_VALUE) != 0) {
+                writeFieldNameAndAnnotations(writer, this, symbolTableProvider);
+                writer.writeNull(getType());
+            } else if (this instanceof IonContainerLite) {
+                writeToIterative(writer, symbolTableProvider);
+            } else {
+                writeFieldNameAndAnnotations(writer, this, symbolTableProvider);
+                writeBodyTo(writer, symbolTableProvider);
+            }
         } catch (IOException e) {
             throw new IonException(e);
         }
     }
 
     /**
-     * Writes a *scalar* value to the given writer. It is incorrect to call this method on a container value.
+     * Writes a *non-null scalar* value to the given writer. It is incorrect to call this method on a container value.
      * @param writer an IonWriter.
      * @param symbolTableProvider a SymbolTableProvider.
      * @throws IOException if thrown when writing the value.

From f90d7dc5d37d526af5e8aca5faf9d6cabfda1b81 Mon Sep 17 00:00:00 2001
From: Khushboo Desai <desaikd@amazon.com>
Date: Wed, 16 Aug 2023 14:00:00 -0700
Subject: [PATCH 222/490] Iteratively traverses the document during
 IonValue.makeReadOnly

---
 .../ion/impl/lite/IonContainerLite.java       | 40 --------
 .../amazon/ion/impl/lite/IonValueLite.java    | 97 +++++++++++++++++--
 test/com/amazon/ion/ContainerTestCase.java    | 36 +++++++
 3 files changed, 127 insertions(+), 46 deletions(-)

diff --git a/src/com/amazon/ion/impl/lite/IonContainerLite.java b/src/com/amazon/ion/impl/lite/IonContainerLite.java
index 989346ab64..c7cea6cf8d 100644
--- a/src/com/amazon/ion/impl/lite/IonContainerLite.java
+++ b/src/com/amazon/ion/impl/lite/IonContainerLite.java
@@ -457,30 +457,6 @@ public int size()
         return get_child_count();
     }
 
-    @Override
-    void makeReadOnlyInternal()
-    {
-        if (_isLocked()) return;
-
-        if (_children != null) {
-            for (int ii=0; ii<_child_count; ii++) {
-                IonValueLite child = _children[ii];
-                child.makeReadOnlyInternal();
-            }
-        }
-        // we don't need to call our copy of clear symbol ID's
-        // which recurses since the calls to child.makeReadOnly
-        // will have clear out the child symbol ID's already
-        // as the children were marked read only.  But we do need
-        // to call the base clear which will clear out the symbol
-        // table reference if one exists.
-        super.clearSymbolIDValues();
-        _isLocked(true);
-    }
-
-
-
-
     /**
      * methods from IonValue
      *
@@ -525,22 +501,6 @@ public final SymbolTable getContextSymbolTable()
         return null;
     }
 
-    @Override
-    boolean attemptClearSymbolIDValues()
-    {
-        boolean symbolIDsAllCleared = super.attemptClearSymbolIDValues();
-
-        for (int ii = 0; ii < get_child_count(); ii++)
-        {
-            IonValueLite child = get_child(ii);
-            // NOTE: recursion is done to #clearSymbolIDValues rather than #attemptClearSymbolIDValues in order to
-            // set the SYMBOL ID PRESENT status flag correctly.
-            symbolIDsAllCleared &= child.clearSymbolIDValues();
-        }
-
-        return symbolIDsAllCleared;
-    }
-
     /**
      * @param child
      */
diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
index 527a4ae114..64603e641c 100644
--- a/src/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -615,7 +615,75 @@ public final SymbolToken getKnownFieldNameSymbol()
         return token;
     }
 
-    final boolean clearSymbolIDValues()
+    private static class ClearSymbolIDsHolder
+    {
+        boolean allSIDsClear = true;
+        IonContainerLite parent = null;
+        IonContainerLite.SequenceContentIterator iterator = null;
+    }
+
+    private static ClearSymbolIDsHolder[] growClearSymbolIDsHolderStack(
+            ClearSymbolIDsHolder[] clearSymbolIDsHolderStack)
+    {
+        ClearSymbolIDsHolder[] newClearSymbolIDsHolderStack = new ClearSymbolIDsHolder[clearSymbolIDsHolderStack.length * 2];
+        System.arraycopy(clearSymbolIDsHolderStack, 0, newClearSymbolIDsHolderStack, 0,
+                clearSymbolIDsHolderStack.length);
+        return newClearSymbolIDsHolderStack;
+    }
+
+    private boolean clearSymbolIDsIterative(boolean readOnlyMode) {
+        ClearSymbolIDsHolder[] stack = new ClearSymbolIDsHolder[CONTAINER_STACK_INITIAL_CAPACITY];
+        int stackIndex = 0;
+        stack[stackIndex] = new ClearSymbolIDsHolder();
+        IonValueLite value = this;
+        do {
+            ClearSymbolIDsHolder holder = stack[stackIndex];
+            if (!(value instanceof IonContainerLite)) {
+                holder.allSIDsClear = value.scalarClearSymbolIDValues() && holder.allSIDsClear;
+                if (readOnlyMode) {
+                    value._isLocked(true);
+                }
+            } else if (value._isSymbolIdPresent() || readOnlyMode) {
+                // The value is a container, and it is necessary to walk its children.
+                // Step into the container by pushing a ClearSymbolIDsHolder for the container onto the stack.
+                if (++stackIndex >= stack.length) {
+                    stack = growClearSymbolIDsHolderStack(stack);
+                }
+                holder = stack[stackIndex];
+                if (holder == null) {
+                    holder = new ClearSymbolIDsHolder();
+                    stack[stackIndex] = holder;
+                }
+                holder.parent = (IonContainerLite) value;
+                holder.iterator = holder.parent.new SequenceContentIterator(0, true);
+                holder.allSIDsClear = value.attemptClearSymbolIDValues();
+            }
+            do {
+                if (holder.parent == null) {
+                    // Iteration has returned to the top level. Return the top-level flag.
+                    return holder.allSIDsClear;
+                }
+                value = holder.iterator.nextOrNull();
+                if (value == null) {
+                    boolean allChildSidsClear = holder.allSIDsClear;
+                    if (allChildSidsClear) {
+                        // clear the symbolID status flag
+                        holder.parent._isSymbolIdPresent(false);
+                    }
+                    if (readOnlyMode) {
+                        holder.parent._isLocked(true);
+                    }
+                    // The end of the container has been reached. Pop from the stack and update the parent's flag.
+                    holder.parent = null;
+                    holder.iterator = null;
+                    holder = stack[--stackIndex];
+                    holder.allSIDsClear &= allChildSidsClear;
+                }
+            } while (value == null);
+        } while (true);
+    }
+
+    private boolean scalarClearSymbolIDValues()
     {
         // short circuit exit - no SID's present to remove - so can exit immediately
         if (!_isSymbolIdPresent())
@@ -633,6 +701,20 @@ final boolean clearSymbolIDValues()
         return allSIDsRemoved;
     }
 
+    final boolean clearSymbolIDValues()
+    {
+        // short circuit exit - no SID's present to remove - so can exit immediately
+        if (!_isSymbolIdPresent())
+        {
+            return true;
+        }
+        if (this instanceof IonContainerLite)
+        {
+            return clearSymbolIDsIterative(false);
+        }
+        return scalarClearSymbolIDValues();
+    }
+
     /**
      * Sets this value's symbol table to null, and erases any SIDs here and
      * recursively.
@@ -963,10 +1045,14 @@ public void makeReadOnly()
         }
     }
 
-    void makeReadOnlyInternal()
-    {
-        clearSymbolIDValues();
-        _isLocked(true);
+    void makeReadOnlyInternal() {
+        if (this instanceof IonContainerLite)
+        {
+            clearSymbolIDsIterative(true);
+        } else {
+            scalarClearSymbolIDValues();
+            this._isLocked(true);
+        }
     }
 
     /**
@@ -1153,7 +1239,6 @@ private static IonContainerLite.SequenceContentIterator[] growIteratorStack(IonC
         return newIteratorStack;
     }
 
-
     final void writeTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
     {
         try {
diff --git a/test/com/amazon/ion/ContainerTestCase.java b/test/com/amazon/ion/ContainerTestCase.java
index 55a9e505cc..b521b7fc91 100644
--- a/test/com/amazon/ion/ContainerTestCase.java
+++ b/test/com/amazon/ion/ContainerTestCase.java
@@ -153,6 +153,42 @@ public void testNonEmptyMakeReadOnly()
         assertTrue(c.isReadOnly());
     }
 
+    @Test
+    public void testNestedNonEmptyMakeReadOnly()
+    {
+        IonSystem s = system();
+        IonContainer c = wrap(s.newList(s.newString("s")), s.newInt(2), s.newDecimal(3));
+        c.makeReadOnly();
+        assertEquals(3, c.size());
+        assertTrue(c.isReadOnly());
+        IonValue first = c.iterator().next();
+        assertTrue(first.isReadOnly());
+
+        try
+        {
+            add(c, system().newNull());
+            fail("expected exception");
+        }
+        catch (ReadOnlyValueException e) { }
+
+        try
+        {
+            c.remove(first);
+            fail("expected exception");
+        }
+        catch (ReadOnlyValueException e) { }
+
+        try
+        {
+            ((IonString)((IonList)first).listIterator().next()).setValue("changed");
+            fail("expected exception");
+        }
+        catch (ReadOnlyValueException e) { }
+
+        assertEquals(3, c.size());
+        assertTrue(c.isReadOnly());
+    }
+
 
     /**
      * Clears a container and verifies that it is not a <code>null</code>

From 559ad54bc356b448c88d46e160c322d115397d20 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 24 Aug 2023 12:09:43 -0700
Subject: [PATCH 223/490] Makes IonValue.clone iterative and improves clone
 performance.

---
 src/com/amazon/ion/impl/lite/IonBlobLite.java |   4 +-
 src/com/amazon/ion/impl/lite/IonBoolLite.java |   4 +-
 src/com/amazon/ion/impl/lite/IonClobLite.java |   4 +-
 .../ion/impl/lite/IonContainerLite.java       | 166 +++++++++++++-----
 .../amazon/ion/impl/lite/IonDatagramLite.java |  10 +-
 .../amazon/ion/impl/lite/IonDecimalLite.java  |   4 +-
 .../amazon/ion/impl/lite/IonFloatLite.java    |   4 +-
 src/com/amazon/ion/impl/lite/IonIntLite.java  |   4 +-
 src/com/amazon/ion/impl/lite/IonListLite.java |   9 +-
 src/com/amazon/ion/impl/lite/IonNullLite.java |   4 +-
 .../amazon/ion/impl/lite/IonSequenceLite.java |   6 +-
 src/com/amazon/ion/impl/lite/IonSexpLite.java |   8 +-
 .../amazon/ion/impl/lite/IonStringLite.java   |   4 +-
 .../amazon/ion/impl/lite/IonStructLite.java   | 101 ++++++-----
 .../amazon/ion/impl/lite/IonSymbolLite.java   |   4 +-
 .../ion/impl/lite/IonTimestampLite.java       |   4 +-
 .../amazon/ion/impl/lite/IonValueLite.java    | 111 +++++++-----
 test/com/amazon/ion/CloneTest.java            | 166 +++++++++++++++---
 test/com/amazon/ion/IonValueTest.java         |  12 ++
 19 files changed, 433 insertions(+), 196 deletions(-)

diff --git a/src/com/amazon/ion/impl/lite/IonBlobLite.java b/src/com/amazon/ion/impl/lite/IonBlobLite.java
index 11f4c47dd3..baffccb7ef 100644
--- a/src/com/amazon/ion/impl/lite/IonBlobLite.java
+++ b/src/com/amazon/ion/impl/lite/IonBlobLite.java
@@ -45,7 +45,7 @@ final class IonBlobLite
     }
 
     @Override
-    IonBlobLite clone(IonContext context)
+    IonValueLite shallowClone(IonContext context)
     {
         return new IonBlobLite(this, context);
     }
@@ -53,7 +53,7 @@ IonBlobLite clone(IonContext context)
     @Override
     public IonBlobLite clone()
     {
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return (IonBlobLite) shallowClone(ContainerlessContext.wrap(getSystem()));
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonBoolLite.java b/src/com/amazon/ion/impl/lite/IonBoolLite.java
index 0b4483d8e7..2ceab4391e 100644
--- a/src/com/amazon/ion/impl/lite/IonBoolLite.java
+++ b/src/com/amazon/ion/impl/lite/IonBoolLite.java
@@ -56,7 +56,7 @@ final class IonBoolLite
     }
 
     @Override
-    IonBoolLite clone(IonContext context)
+    IonValueLite shallowClone(IonContext context)
     {
         return new IonBoolLite(this, context);
     }
@@ -64,7 +64,7 @@ IonBoolLite clone(IonContext context)
     @Override
     public IonBoolLite clone()
     {
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return (IonBoolLite) shallowClone(ContainerlessContext.wrap(getSystem()));
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonClobLite.java b/src/com/amazon/ion/impl/lite/IonClobLite.java
index acd2dd054b..aa55dd7735 100644
--- a/src/com/amazon/ion/impl/lite/IonClobLite.java
+++ b/src/com/amazon/ion/impl/lite/IonClobLite.java
@@ -48,7 +48,7 @@ final class IonClobLite
     }
 
     @Override
-    IonClobLite clone(IonContext context)
+    IonValueLite shallowClone(IonContext context)
     {
         return new IonClobLite(this, context);
     }
@@ -56,7 +56,7 @@ IonClobLite clone(IonContext context)
     @Override
     public IonClobLite clone()
     {
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return (IonClobLite) shallowClone(ContainerlessContext.wrap(getSystem()));
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonContainerLite.java b/src/com/amazon/ion/impl/lite/IonContainerLite.java
index c7cea6cf8d..934a1d58b6 100644
--- a/src/com/amazon/ion/impl/lite/IonContainerLite.java
+++ b/src/com/amazon/ion/impl/lite/IonContainerLite.java
@@ -30,6 +30,7 @@
 import com.amazon.ion.impl._Private_Utils;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.ListIterator;
@@ -59,45 +60,9 @@ protected IonContainerLite(ContainerlessContext context, boolean isNull)
         this.ionSystem = context.getSystem();
     }
 
-    IonContainerLite(IonContainerLite existing, IonContext context, boolean isStruct) {
+    IonContainerLite(IonContainerLite existing, IonContext context) {
         super(existing, context);
-        this.ionSystem = existing.getSystem();
-        boolean retainingSIDs = false;
-        int childCount = existing._child_count;
-        this._child_count = childCount;
-        // when cloning the children we establish 'this' the cloned outer container as the context
-        if (existing._children != null) {
-            boolean isDatagram = this instanceof IonDatagramLite;
-            this._children = new IonValueLite[childCount];
-            for (int i = 0; i < childCount; i++) {
-                IonValueLite child = existing._children[i];
-                IonContext childContext = isDatagram
-                     ? TopLevelContext.wrap(child.getAssignedSymbolTable(), (IonDatagramLite)this)
-                     : this;
-
-                IonValueLite copy = child.clone(childContext);
-                if (isStruct) {
-                    if(child.getFieldName() == null) {
-                        // when name is null it could be a sid 0 so we need to perform the full symbol token lookup.
-                        // this is expensive so only do it when necessary
-                        // TODO profile `getKnownFieldNameSymbol` to see if we can improve its performance so branching
-                        // is not necessary. https://github.com/amazon-ion/ion-java/issues/140
-                        copy.setFieldNameSymbol(child.getKnownFieldNameSymbol());
-                    }
-                    else {
-                        // if we have a non null name copying it is sufficient
-                        copy.setFieldName(child.getFieldName());
-                    }
-                }
-                this._children[i] = copy;
-                retainingSIDs |= copy._isSymbolIdPresent();
-            }
-            // unfortunately due to the existing behavior in IonValueLite copy-constructor where annotation SID's are
-            // preserved across the copy-constructor IF they have no resolved text it means that encodings could have
-            // been preserved on the child - therefore the cloned children each have to be re-interrogated and the
-            // setting updated IF such a change has occurred.
-            _isSymbolIdPresent(retainingSIDs);
-        }
+        this.ionSystem = existing.ionSystem;
     }
 
     // See the comment on the `ionSystem` member field for more information.
@@ -109,8 +74,124 @@ public IonSystemLite getSystem() {
     @Override
     public abstract void accept(ValueVisitor visitor) throws Exception;
 
+    // Context to be used when cloning a value tree by walking it iteratively.
+    private static class CloneContext {
+
+        // The parent of the value currently being cloned.
+        IonContainerLite parentOriginal = null;
+
+        // The copy of the parent value, into which values at the current depth are placed.
+        IonContainerLite parentCopy = null;
+
+        // True if the parent value is a struct. Storing this in a variable is a performance optimization.
+        boolean parentIsStruct = false;
+
+        // The copied context relevant to the values cloned at the current depth.
+        IonContext contextCopy = null;
+
+        // The index in the parent container of the value currently being cloned.
+        int childIndex = 0;
+    }
+
+    /**
+     * Prepares a CloneContext for the container that is about to be walked.
+     * @param cloneContext the context to fill in.
+     * @param containerOriginal the container being cloned.
+     * @param containerCopy the container clone.
+     * @param needsTopLevelContext true if the value being cloned is a child of a datagram.
+     */
+    private static void setCloneContext(CloneContext cloneContext, IonContainerLite containerOriginal, IonContainerLite containerCopy, boolean needsTopLevelContext) {
+        cloneContext.parentOriginal = containerOriginal;
+        cloneContext.parentCopy = containerCopy;
+        containerCopy._children = new IonValueLite[containerOriginal._children.length];
+        containerCopy._child_count = containerOriginal._child_count;
+        if (needsTopLevelContext) {
+            cloneContext.contextCopy = TopLevelContext.wrap(containerOriginal._context.getContextSymbolTable(), (IonDatagramLite) containerCopy);
+            cloneContext.parentIsStruct = false;
+        } else {
+            cloneContext.contextCopy = containerCopy;
+            cloneContext.parentIsStruct = containerCopy instanceof IonStructLite;
+        }
+        cloneContext.childIndex = 0;
+    }
+
+    /**
+     * Clones the container by walking it iteratively.
+     * @param isDatagramBeingCloned true if the value to be cloned is an IonDatagram; otherwise, false.
+     * @return the clone.
+     */
+    final IonContainerLite deepClone(boolean isDatagramBeingCloned) {
+        // Note: for reasons that are not clear, calculating the initial context within this method is consistently
+        // 1-5% faster than requiring callers to pass it in.
+        IonContext initialContext = isDatagramBeingCloned ? null : ContainerlessContext.wrap(_context.getSystem(), _context.getContextSymbolTable());
+        if (_children == null) {
+            // When the container has no children, shallowClone and deepClone have the same effect, but shallowClone
+            // is more streamlined.
+            return (IonContainerLite) shallowClone(initialContext);
+        }
+        boolean areSIDsRetained = false;
+        CloneContext[] stack = new CloneContext[CONTAINER_STACK_INITIAL_CAPACITY];
+        int stackIndex = 0;
+        CloneContext cloneContext = new CloneContext();
+        cloneContext.contextCopy = initialContext;
+        stack[stackIndex] = cloneContext;
+        IonValueLite original = this;
+        IonValueLite copy;
+        while (true) {
+            if (!(original instanceof IonContainerLite)) {
+                // Note: the following four lines are duplicated on both branches. For reasons that are not clear, doing
+                // this is consistently ~10% faster than using a common code path when cloning streams of scalars.
+                copy = original.shallowClone(cloneContext.contextCopy);
+                if (cloneContext.parentIsStruct) {
+                    copy.copyFieldName(original);
+                }
+                cloneContext.parentCopy._children[cloneContext.childIndex++] = copy;
+            } else {
+                copy = original.shallowClone(cloneContext.contextCopy);
+                if (cloneContext.parentIsStruct) {
+                    copy.copyFieldName(original);
+                }
+                if (cloneContext.parentCopy != null) {
+                    cloneContext.parentCopy._children[cloneContext.childIndex++] = copy;
+                }
+                IonContainerLite containerOriginal = (IonContainerLite) original;
+                if (containerOriginal._children != null) {
+                    if (++stackIndex >= stack.length) {
+                        stack = Arrays.copyOf(stack, stack.length * 2);
+                    }
+                    // Reuse the context for the next container depth, only allocating a new one if necessary.
+                    cloneContext = stack[stackIndex];
+                    if (cloneContext == null) {
+                        cloneContext = new CloneContext();
+                        stack[stackIndex] = cloneContext;
+                    }
+                    // Create and initialize the container clone, preparing it to have child values copied in.
+                    setCloneContext(cloneContext, containerOriginal, (IonContainerLite) copy, isDatagramBeingCloned && stackIndex == 1);
+                }
+            }
+            // Symbol IDs are preserved if a symbol token has unknown text. The 'isSymbolIdPresent' is used to track this.
+            areSIDsRetained |= copy._isSymbolIdPresent();
+            while (cloneContext.childIndex >= cloneContext.parentOriginal._child_count) {
+                // This is the end of the container. Step out by returning to the context at the previous depth.
+                copy = cloneContext.parentCopy;
+                cloneContext.contextCopy = null;
+                cloneContext = stack[--stackIndex];
+                if (stackIndex == 0) {
+                    // Top-level; done.
+                    copy._isSymbolIdPresent(areSIDsRetained);
+                    return (IonContainerLite) copy;
+                }
+            }
+            // Prepare the next value to be cloned. This is the next child value at the current container depth.
+            original = cloneContext.parentOriginal._children[cloneContext.childIndex];
+        }
+    }
+
+
     @Override
-    public abstract IonContainer clone();
+    public IonContainer clone() {
+        return deepClone(false);
+    }
 
 
     public void clear()
@@ -616,16 +697,21 @@ static int[] make_next_size_array() {
         sizes[_Private_IonConstants.tidDATAGRAM] = 10;
         return sizes;
     }
+
+
+    static final int STRUCT_INITIAL_SIZE = 5;
+
     final protected int initialSize()
     {
         switch (this.getType()) {
         case LIST:     return 1;
         case SEXP:     return 4;
-        case STRUCT:   return 5;
+        case STRUCT:   return STRUCT_INITIAL_SIZE;
         case DATAGRAM: return 3;
         default:       return 4;
         }
     }
+
     final protected int nextSize(int current_size, boolean call_transition)
     {
         if (current_size == 0) {
diff --git a/src/com/amazon/ion/impl/lite/IonDatagramLite.java b/src/com/amazon/ion/impl/lite/IonDatagramLite.java
index 611714298c..4f37ec801c 100644
--- a/src/com/amazon/ion/impl/lite/IonDatagramLite.java
+++ b/src/com/amazon/ion/impl/lite/IonDatagramLite.java
@@ -109,19 +109,15 @@ final class IonDatagramLite
     }
 
     @Override
-    IonDatagramLite clone(IonContext parentContext)
-    {
-        String message = "IonDatagram cannot have a parent context (be nested)";
-        throw new UnsupportedOperationException(message);
+    public IonDatagram clone() {
+        return (IonDatagram) deepClone(true);
     }
 
     @Override
-    public IonDatagramLite clone()
-    {
+    IonValueLite shallowClone(IonContext context) {
         return new IonDatagramLite(this);
     }
 
-
     //////////////////////////////////////////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/com/amazon/ion/impl/lite/IonDecimalLite.java b/src/com/amazon/ion/impl/lite/IonDecimalLite.java
index 9870925273..395c016a5a 100644
--- a/src/com/amazon/ion/impl/lite/IonDecimalLite.java
+++ b/src/com/amazon/ion/impl/lite/IonDecimalLite.java
@@ -70,7 +70,7 @@ public static boolean isNegativeZero(double value)
     }
 
     @Override
-    IonDecimalLite clone(IonContext parentContext)
+    IonValueLite shallowClone(IonContext parentContext)
     {
         return new IonDecimalLite(this, parentContext);
     }
@@ -78,7 +78,7 @@ IonDecimalLite clone(IonContext parentContext)
     @Override
     public IonDecimalLite clone()
     {
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return (IonDecimalLite) shallowClone(ContainerlessContext.wrap(getSystem()));
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonFloatLite.java b/src/com/amazon/ion/impl/lite/IonFloatLite.java
index 16fa618e0c..829a0c3a67 100644
--- a/src/com/amazon/ion/impl/lite/IonFloatLite.java
+++ b/src/com/amazon/ion/impl/lite/IonFloatLite.java
@@ -50,7 +50,7 @@ final class IonFloatLite
     }
 
     @Override
-    IonFloatLite clone(IonContext context)
+    IonValueLite shallowClone(IonContext context)
     {
         return new IonFloatLite(this, context);
     }
@@ -58,7 +58,7 @@ IonFloatLite clone(IonContext context)
     @Override
     public IonFloatLite clone()
     {
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return (IonFloatLite) shallowClone(ContainerlessContext.wrap(getSystem()));
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonIntLite.java b/src/com/amazon/ion/impl/lite/IonIntLite.java
index 784fbcf039..37b290074d 100644
--- a/src/com/amazon/ion/impl/lite/IonIntLite.java
+++ b/src/com/amazon/ion/impl/lite/IonIntLite.java
@@ -68,7 +68,7 @@ final class IonIntLite
     }
 
     @Override
-    IonIntLite clone(IonContext context)
+    IonValueLite shallowClone(IonContext context)
     {
         return new IonIntLite(this, context);
     }
@@ -76,7 +76,7 @@ IonIntLite clone(IonContext context)
     @Override
     public IonIntLite clone()
     {
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return (IonIntLite) shallowClone(ContainerlessContext.wrap(getSystem()));
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonListLite.java b/src/com/amazon/ion/impl/lite/IonListLite.java
index 64d31c986a..0a1dc088a7 100644
--- a/src/com/amazon/ion/impl/lite/IonListLite.java
+++ b/src/com/amazon/ion/impl/lite/IonListLite.java
@@ -65,15 +65,14 @@ final class IonListLite
     }
 
     @Override
-    IonListLite clone(IonContext parentContext)
-    {
-        return new IonListLite(this, parentContext);
+    public IonListLite clone() {
+        return (IonListLite) deepClone(false);
     }
 
     @Override
-    public IonListLite clone()
+    IonValueLite shallowClone(IonContext context)
     {
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return new IonListLite(this, context);
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonNullLite.java b/src/com/amazon/ion/impl/lite/IonNullLite.java
index 6a1a9857c1..bb959b4f78 100644
--- a/src/com/amazon/ion/impl/lite/IonNullLite.java
+++ b/src/com/amazon/ion/impl/lite/IonNullLite.java
@@ -46,7 +46,7 @@ public void accept(final ValueVisitor visitor) throws Exception
     }
 
     @Override
-    IonNullLite clone(IonContext context)
+    IonValueLite shallowClone(IonContext context)
     {
         return new IonNullLite(this, context);
     }
@@ -54,7 +54,7 @@ IonNullLite clone(IonContext context)
     @Override
     public IonNullLite clone()
     {
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return (IonNullLite) shallowClone(ContainerlessContext.wrap(getSystem()));
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonSequenceLite.java b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
index 588e6ef1ad..33070838ab 100644
--- a/src/com/amazon/ion/impl/lite/IonSequenceLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
@@ -51,7 +51,7 @@ abstract class IonSequenceLite
     }
 
     IonSequenceLite(IonSequenceLite existing, IonContext context) {
-        super(existing, context, false);
+        super(existing, context);
     }
 
     /**
@@ -88,7 +88,9 @@ abstract class IonSequenceLite
     //=========================================================================
 
     @Override
-    public abstract IonSequenceLite clone();
+    public IonSequence clone() {
+        return (IonSequence) deepClone(false);
+    }
 
     @Override
     // Increasing visibility
diff --git a/src/com/amazon/ion/impl/lite/IonSexpLite.java b/src/com/amazon/ion/impl/lite/IonSexpLite.java
index f090e0ee9f..e9d61233a5 100644
--- a/src/com/amazon/ion/impl/lite/IonSexpLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSexpLite.java
@@ -58,15 +58,15 @@ final class IonSexpLite
     }
 
     @Override
-    IonSexpLite clone(IonContext parentContext)
+    public IonSexpLite clone()
     {
-        return new IonSexpLite(this, parentContext);
+        return (IonSexpLite) deepClone(false);
     }
 
     @Override
-    public IonSexpLite clone()
+    IonValueLite shallowClone(IonContext context)
     {
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return new IonSexpLite(this, context);
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonStringLite.java b/src/com/amazon/ion/impl/lite/IonStringLite.java
index b934804a66..99d3d227a1 100644
--- a/src/com/amazon/ion/impl/lite/IonStringLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStringLite.java
@@ -44,7 +44,7 @@ final class IonStringLite
     }
 
     @Override
-    IonStringLite clone(IonContext parentContext)
+    IonValueLite shallowClone(IonContext parentContext)
     {
         return new IonStringLite(this, parentContext);
     }
@@ -52,7 +52,7 @@ IonStringLite clone(IonContext parentContext)
     @Override
     public IonStringLite clone()
     {
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return (IonStringLite) shallowClone(ContainerlessContext.wrap(getSystem()));
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/com/amazon/ion/impl/lite/IonStructLite.java
index ffa572e755..509460336f 100644
--- a/src/com/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStructLite.java
@@ -53,10 +53,11 @@ final class IonStructLite
 
     private IonStructLite(IonStructLite existing, IonContext context)
     {
-        super(existing, context, true);
-        // field map can be shallow cloned due to it dealing with String and Integer
-        // values - both of which are immutable constructs and so safe to retain as references
-        this._field_map = null == existing._field_map ? null : new HashMap<String, Integer>(existing._field_map);
+        super(existing, context);
+        // The field map provides optimized lookups when the struct is larger than a few fields. Rather than being
+        // eagerly copied during clone, it is created on-demand. This has been shown to improve performance when cloning
+        // structs, even in cases where the field map is eventually needed.
+        this._field_map = null;
         this._field_map_duplicate_count = existing._field_map_duplicate_count;
         this.hasNullFieldName = existing.hasNullFieldName;
     }
@@ -67,15 +68,14 @@ private IonStructLite(IonStructLite existing, IonContext context)
     public int                      _field_map_duplicate_count;
 
     @Override
-    IonStructLite clone(IonContext parentContext)
+    public IonStructLite clone()
     {
-        return new IonStructLite(this, parentContext);
+        return (IonStructLite) deepClone(false);
     }
 
     @Override
-    public IonStructLite clone()
-    {
-        return clone(ContainerlessContext.wrap(getSystem()));
+    IonValueLite shallowClone(IonContext context) {
+        return new IonStructLite(this, context);
     }
 
     @Override
@@ -84,34 +84,30 @@ protected void transitionToLargeSize(int size)
         if (_field_map != null) return;
 
         build_field_map();
-        return;
     }
-    protected void build_field_map()
+    private void build_field_map()
     {
         int size = (_children == null) ? 0 : _children.length;
 
-        _field_map = new HashMap<String, Integer>(size);
+        _field_map = new HashMap<>((int) Math.ceil(size / 0.75f), 0.75f); // avoids unconditional growth
         _field_map_duplicate_count = 0;
 
         int count = get_child_count();
         for (int ii=0; ii<count; ii++) {
             IonValueLite v = get_child(ii);
-            SymbolToken fieldNameSymbol = v.getFieldNameSymbol();
-            String name = fieldNameSymbol.getText();
-            if (_field_map.get(name) != null) {
+            if (_field_map.get(v._fieldName) != null) {
                 _field_map_duplicate_count++;
             }
-            _field_map.put(name, ii); // this causes the map to have the largest index value stored
+            _field_map.put(v._fieldName, ii); // this causes the map to have the largest index value stored
         }
-        return;
     }
     private void add_field(String fieldName, int newFieldIdx)
     {
         Integer idx = _field_map.get(fieldName);
         if (idx != null) {
             _field_map_duplicate_count++;
-            if (idx.intValue() > newFieldIdx) {
-                newFieldIdx = idx.intValue();
+            if (idx > newFieldIdx) {
+                newFieldIdx = idx;
             }
         }
         _field_map.put(fieldName, newFieldIdx);
@@ -122,8 +118,6 @@ private void remove_field(String fieldName, int lowest_idx, int copies)
             return;
         }
 
-        Integer field_idx = _field_map.get(fieldName);
-        assert(field_idx != null);
         _field_map.remove(fieldName);
         _field_map_duplicate_count -= (copies - 1);
     }
@@ -133,7 +127,7 @@ private void remove_field_from_field_map(String fieldName, int idx)
         Integer field_idx = _field_map.get(fieldName);
         assert(field_idx != null);
 
-        if (field_idx.intValue() != idx) {
+        if (field_idx != idx) {
             // if the map has a different index, this must
             // be a duplicate, and this copy isn't in the map
             assert(_field_map_duplicate_count > 0);
@@ -180,7 +174,7 @@ private void patch_map_elements_helper(int removed_idx)
             IonValueLite value = get_child(ii);
             String  field_name = value.getFieldName();
             Integer map_idx = _field_map.get(field_name);
-            if (map_idx.intValue() != ii) {
+            if (map_idx != ii) {
                 // if this is a field that to the right of
                 // the removed (in process of removing) value
                 // we need to patch the index value
@@ -223,7 +217,7 @@ public String validate()
         Iterator<Entry<String, Integer>> it = _field_map.entrySet().iterator();
         while (it.hasNext()) {
             Entry<String, Integer> e = it.next();
-            int idx = e.getValue().intValue();
+            int idx = e.getValue();
             IonValueLite v = (idx >= 0 && idx < get_child_count()) ? get_child(idx) : null;
             if (v == null || idx != v._elementid() || (e.getKey().equals(v.getFieldName()) == false)) {
                 error += "map entry ["+e+"] doesn't match list value ["+v+"]\n";
@@ -299,7 +293,7 @@ public IonStruct cloneAndRetain(String... fieldNames)
 
     private IonStruct doClone(boolean keep, String... fieldNames)
     {
-        IonStruct clone;
+        IonStructLite clone;
         if (isNullValue())
         {
             clone = getSystem().newNullStruct();
@@ -314,20 +308,30 @@ private IonStruct doClone(boolean keep, String... fieldNames)
             }
 
             clone = getSystem().newEmptyStruct();
-            for (IonValue value : this)
-            {
-                SymbolToken fieldNameSymbol = value.getFieldNameSymbol();
-                String fieldName = fieldNameSymbol.getText();
-                if (fields.contains(fieldName) == keep)
+            clone._children = new IonValueLite[_children.length];
+            clone._child_count = 0;
+            for (int i = 0; i < _child_count; i++) {
+                IonValueLite value = _children[i];
+                if (fields.contains(value._fieldName) == keep)
                 {
+                    IonValueLite clonedChild = (IonValueLite) value.clone();
                     // This ensures that we don't copy an unknown field name.
-                    fieldName = value.getFieldName();
-                    clone.add(fieldName, value.clone());
+                    clonedChild._fieldName = value.getFieldName();
+                    clonedChild._elementid(clone._child_count);
+                    if (!clone._isSymbolIdPresent() && clonedChild._isSymbolIdPresent())
+                    {
+                        clone.cascadeSIDPresentToContextRoot();
+                    }
+                    clone._children[clone._child_count++] = clonedChild;
                 }
             }
         }
 
-        clone.setTypeAnnotationSymbols(getTypeAnnotationSymbols());
+
+        if (_annotations != null && _annotations.length > 0) {
+            clone._annotations = _annotations.clone();
+            clone.checkAnnotationsForSids();
+        }
 
         return clone;
     }
@@ -366,6 +370,14 @@ public IonValue get(String fieldName)
 
         return field;
     }
+
+    private boolean fieldMapIsActive(int proposedSize) {
+        if (_field_map != null) return true;
+        if (proposedSize <= STRUCT_INITIAL_SIZE) return false;
+        build_field_map();
+        return true;
+    }
+
     private int find_field_helper(String fieldName)
     {
         validateFieldName(fieldName);
@@ -373,10 +385,10 @@ private int find_field_helper(String fieldName)
         if (isNullValue()) {
             // nothing to see here, move along
         }
-        else if (_field_map != null) {
+        else if (fieldMapIsActive(_child_count)) {
             Integer idx = _field_map.get(fieldName);
             if (idx != null) {
-                return idx.intValue();
+                return idx;
             }
         }
         else {
@@ -404,10 +416,8 @@ public boolean add(IonValue child)
         throws NullPointerException, IllegalArgumentException,
         ContainedValueException
     {
-        // TODO validate in struct.setFieldName
-        String text = child.getFieldNameSymbol().getText();
         IonValueLite concrete = (IonValueLite) child;
-        _add(text, concrete);
+        _add(concrete._fieldName, concrete);
 
         return true;
     }
@@ -435,13 +445,12 @@ protected void handle(IonValue newValue)
     private void _add(String fieldName, IonValueLite child)
     {
         hasNullFieldName |= fieldName == null;
-        int size = get_child_count();
 
         // add this to the Container child collection
-        add(size, child);
+        add(_child_count, child);
 
         // if we have a hash map we need to update it now
-        if (_field_map != null) {
+        if (fieldMapIsActive(_child_count)) {
             add_field(fieldName, child._elementid());
         }
     }
@@ -455,8 +464,8 @@ public void add(String fieldName, IonValue value)
 
         IonValueLite concrete = (IonValueLite) value;
 
+        concrete._fieldName = fieldName;
         _add(fieldName, concrete);
-        concrete.setFieldName(fieldName);
     }
 
     public void add(SymbolToken fieldName, IonValue child)
@@ -519,19 +528,19 @@ public void put(String fieldName, IonValue value)
         validateFieldName(fieldName);
         if (value != null) validateNewChild(value);
 
-        int lowestRemovedIndex = get_child_count();
+        int lowestRemovedIndex = _child_count;
         boolean any_removed = false;
 
         // first we remove the any existing fields
         // associated with fieldName (which may be none)
-        if (_field_map != null && _field_map_duplicate_count == 0)
+        if (_field_map_duplicate_count == 0 && fieldMapIsActive(_child_count))
         {
             // we have a map and no duplicates so the index
             // (aka map) is all we need to find the only
             // value associated with fieldName, if there is one
             Integer idx = _field_map.get(fieldName);
             if (idx != null) {
-                lowestRemovedIndex = idx.intValue();
+                lowestRemovedIndex = idx;
                 remove_field_from_field_map(fieldName, lowestRemovedIndex);
                 remove_child(lowestRemovedIndex);
                 any_removed = true;
@@ -548,7 +557,7 @@ public void put(String fieldName, IonValue value)
             {
                 ii--;
                 IonValueLite child = get_child(ii);
-                if (fieldName.equals(child.getFieldNameSymbol().getText()))
+                if (fieldName.equals(child._fieldName))
                 {
                     // done by remove_child: child.detachFromContainer();
                     remove_child(ii);
diff --git a/src/com/amazon/ion/impl/lite/IonSymbolLite.java b/src/com/amazon/ion/impl/lite/IonSymbolLite.java
index 1492577ba2..15bbd3e68b 100644
--- a/src/com/amazon/ion/impl/lite/IonSymbolLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSymbolLite.java
@@ -78,7 +78,7 @@ final class IonSymbolLite
     }
 
     @Override
-    IonSymbolLite clone(IonContext context)
+    IonValueLite shallowClone(IonContext context)
     {
         IonSymbolLite clone = new IonSymbolLite(this, context);
         if(this._sid == 0) {
@@ -97,7 +97,7 @@ public IonSymbolLite clone() throws UnknownSymbolException
             && _stringValue() == null) {
             throw new UnknownSymbolException(_sid);
         }
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return (IonSymbolLite) shallowClone(ContainerlessContext.wrap(getSystem()));
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonTimestampLite.java b/src/com/amazon/ion/impl/lite/IonTimestampLite.java
index f0c102542e..d7841c05fe 100644
--- a/src/com/amazon/ion/impl/lite/IonTimestampLite.java
+++ b/src/com/amazon/ion/impl/lite/IonTimestampLite.java
@@ -60,7 +60,7 @@ final class IonTimestampLite
     }
 
     @Override
-    IonTimestampLite clone(IonContext context)
+    IonValueLite shallowClone(IonContext context)
     {
         return new IonTimestampLite(this, context);
     }
@@ -68,7 +68,7 @@ IonTimestampLite clone(IonContext context)
     @Override
     public IonTimestampLite clone()
     {
-        return clone(ContainerlessContext.wrap(getSystem()));
+        return (IonTimestampLite) shallowClone(ContainerlessContext.wrap(getSystem()));
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
index 64603e641c..c882aa15e8 100644
--- a/src/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -76,7 +76,7 @@ abstract class IonValueLite
     protected static final int ELEMENT_SHIFT      = 8; // low 8 bits is flag, upper 24 (or 48 is element id)
 
     // This value was chosen somewhat arbitrarily; it can/should be changed if it is found to be insufficient.
-    private static final int CONTAINER_STACK_INITIAL_CAPACITY = 16;
+    static final int CONTAINER_STACK_INITIAL_CAPACITY = 16;
 
     // 'withCharsetAscii' is only specified for consistency with the behavior of the previous implementation of
     // toString. Technically users are not allowed to rely on a canonical encoding, but in practice they often do.
@@ -267,13 +267,13 @@ public SymbolTable getSymbolTable()
 
     /** Not null. */
     protected IonContext       _context;
-    private   String           _fieldName;
+    protected String           _fieldName;
 
     /**
      * The annotation sequence. This array is overallocated and may have
      * nulls at the end denoting unused slots.
      */
-    private   SymbolToken[] _annotations;
+    protected SymbolToken[] _annotations;
 
     // current size 32 bit: 3*4 + 4 +  8 = 24 (32 bytes allocated)
     //              64 bit: 3*8 + 4 + 16 = 52 (56 bytes allocated)
@@ -302,8 +302,9 @@ public SymbolTable getSymbolTable()
      * @param context the non-null parent context to use for the cloned entity.
      */
     IonValueLite(IonValueLite existing, IonContext context) {
-        // Symbols are *immutable* therefore a shallow copy is sufficient
-        boolean hasSIDsRetained = false;
+        // IonValue.clone() mandates that the returned value is mutable, regardless of the
+        // existing 'read only' flag.
+        this._flags = existing._flags & ~IS_LOCKED & ~IS_SYMBOL_ID_PRESENT;
         if (null == existing._annotations) {
             this._annotations = null;
         } else {
@@ -311,30 +312,25 @@ public SymbolTable getSymbolTable()
             this._annotations = new SymbolToken[size];
             for (int i = 0; i < size; i++) {
                 SymbolToken existingToken = existing._annotations[i];
-                if (existingToken != null) {
-                    String text = existingToken.getText();
-                    if (text != null) {
-                        this._annotations[i] =
-                            _Private_Utils.newSymbolToken(text, UNKNOWN_SYMBOL_ID);
-                    } else {
-                        // TODO - amazon-ion/ion-java/issues/223 needs consistent handling, should attempt to resolve and if it cant; fail
-                        this._annotations[i] = existing._annotations[i];
-                        hasSIDsRetained |= this._annotations[i].getSid() > UNKNOWN_SYMBOL_ID;
+                if (existingToken == null) {
+                    // The annotation array grows by doubling; null indicates the actual end.
+                    break;
+                }
+                String text = existingToken.getText();
+                int sid = existingToken.getSid();
+                if (text == null || sid == UNKNOWN_SYMBOL_ID) {
+                    // TODO - amazon-ion/ion-java/issues/223 needs consistent handling, should attempt to resolve and if it cant; fail
+                    _annotations[i] = existingToken;
+                    if (sid > UNKNOWN_SYMBOL_ID) {
+                        _flags |= IS_SYMBOL_ID_PRESENT;
                     }
+                } else {
+                    this._annotations[i] = _Private_Utils.newSymbolToken(text, UNKNOWN_SYMBOL_ID);
                 }
             }
         }
-        // We don't copy the field name, that happens in IonStruct's clone
-        this._flags       = existing._flags;
+        // Note: the field name is copied in IonStruct.clone.
         this._context     = context;
-
-        // as IonValue.clone() mandates that the returned value is mutable, regardless of the
-        // existing 'read only' flag - we force the deep-copy back to being mutable
-        clear_flag(IS_LOCKED);
-        // whilst the clone *should* guarantee symbol context is purged, the annotation behavior existing above
-        // under the TO DO for amazon-ion/ion-java/issues/223 does mean that SID context can be propogated through a clone, therefore
-        // the encoding flag has to reflect this reality
-        _isSymbolIdPresent(hasSIDsRetained);
     }
 
     public abstract void accept(ValueVisitor visitor) throws Exception;
@@ -390,18 +386,37 @@ public SymbolTable getSymbolTable()
         // and so we will opt to clear down encoding present in a lazy fashion (e.g. when something actually needs it)
     }
 
+    // Copies the field name from the given value into this one
+    final void copyFieldName(IonValueLite original) {
+        if(original._fieldName == null) {
+            // when name is null it could be a sid 0 so we need to perform the full symbol token lookup.
+            // this is expensive so only do it when necessary
+            // TODO profile `getKnownFieldNameSymbol` to see if we can improve its performance so branching
+            // is not necessary. https://github.com/amazon-ion/ion-java/issues/140
+            setFieldNameSymbol(original.getKnownFieldNameSymbol());
+        }
+        else {
+            // if we have a non null name copying it is sufficient
+            _fieldName = original._fieldName;
+        }
+    }
+
     /**
      * {@inheritDoc}
      * <p>
      * The user can only call this method on the concrete (not abstract)
-     * subclasses of IonValueLite (e.g. IonIntLite). The explicit clone logic
-     * is contained in {@link #clone(IonContext)} which should in turn be implemented by
-     * using a copy-constructor.
+     * subclasses of IonValueLite (e.g. IonIntLite).
      */
     @Override
     public abstract IonValue clone();
 
-    abstract IonValueLite clone(IonContext parentContext);
+    /**
+     * Clones the value's annotations and field name (if any). For scalars, also clones the value. For containers,
+     * leaves the cloned container empty rather than cloning the children.
+     * @param parentContext the context applicable to the value's parent.
+     * @return a shallow clone of this value.
+     */
+    abstract IonValueLite shallowClone(IonContext parentContext);
 
     /**
      * @return the constant hash signature unique to the value's type.
@@ -885,6 +900,20 @@ public final SymbolToken[] getTypeAnnotationSymbols(SymbolTableProvider symbolTa
         return users_copy;
     }
 
+    // Iterates through the value's annotations and determines whether any annotations have symbol IDs retained.
+    // Cascades a flag to the root if any symbol IDs are found.
+    protected void checkAnnotationsForSids() {
+        if (!_isSymbolIdPresent()) {
+            for (SymbolToken token : _annotations) {
+                // upon finding first match of a symbol token containing a SID - cascade upwards and exit
+                if (null != token && UNKNOWN_SYMBOL_ID != token.getSid()) {
+                    cascadeSIDPresentToContextRoot();
+                    break;
+                }
+            }
+        }
+    }
+
     public void setTypeAnnotationSymbols(SymbolToken... annotations)
     {
         checkForLock();
@@ -897,19 +926,7 @@ public void setTypeAnnotationSymbols(SymbolToken... annotations)
         else
         {
             _annotations = annotations.clone();
-
-            // new annotations could have SID's - so if this node is not currently marked as SID
-            // present then the new annotations have to be interrogated to see if they contain SID's and if they
-            // do - the SID Present flag must be cascaded.
-            if (!_isSymbolIdPresent()) {
-                for (SymbolToken token : _annotations) {
-                    // upon finding first match of a symbol token containing a SID - cascade upwards and exit
-                    if (null != token && UNKNOWN_SYMBOL_ID != token.getSid()) {
-                        cascadeSIDPresentToContextRoot();
-                        break;
-                    }
-                }
-            }
+            checkAnnotationsForSids();
         }
     }
 
@@ -980,10 +997,18 @@ protected int hashTypeAnnotations(final int original)
             return original;
         }
 
-        int result = valueHashSalt * original + tokens.length;
+        // Note: Because the tokens array doubles in size when it grows, tokens.length does not correctly convey
+        // the actual number of annotations on the value.
+        int count = 0;
+        while (count < tokens.length && tokens[count] != null) {
+            count++;
+        }
+
+        int result = valueHashSalt * original + count;
 
-        for (final SymbolToken token : tokens)
+        for (int i = 0; i < count; i++)
         {
+            SymbolToken token = tokens[i];
             String text = token.getText();
 
             int tokenHashCode = text == null
diff --git a/test/com/amazon/ion/CloneTest.java b/test/com/amazon/ion/CloneTest.java
index fbde87f6c4..7dfe5df275 100644
--- a/test/com/amazon/ion/CloneTest.java
+++ b/test/com/amazon/ion/CloneTest.java
@@ -15,20 +15,44 @@
 
 package com.amazon.ion;
 
-import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
-
-import com.amazon.ion.system.SimpleCatalog;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import com.amazon.ion.impl._Private_IonSystem;
+import com.amazon.ion.junit.IonAssert;
+import com.amazon.ion.system.IonSystemBuilder;
+import org.junit.jupiter.api.Test;
 
+import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.emptyIterable;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.sameInstance;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class CloneTest
-    extends IonTestCase
 {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
 
+    public static final _Private_IonSystem PRIVATE_ION_SYSTEM = (_Private_IonSystem) IonSystemBuilder.standard().build();
+
+    private static <V extends IonValue> V assertSelfCloneable(V original)
+    {
+        V clone = (V)original.clone();
+        return assertEqualsAndNotSame(original, clone);
+    }
+
+    private static <V extends IonValue> V assertSystemCloneable(V original)
+    {
+        V clone = (V)(system().clone(original));
+        return assertEqualsAndNotSame(original, clone);
+    }
+
+    private static <V extends IonValue> V assertEqualsAndNotSame(V expected, V actual)
+    {
+        IonAssert.assertIonEquals(expected, actual);
+        assertThat(actual, not(sameInstance(expected)));
+        return actual;
+    }
 
     @Test
     public void testIonValueCloneWithUnknownSymbolText()
@@ -36,9 +60,8 @@ public void testIonValueCloneWithUnknownSymbolText()
         SymbolToken tok = newSymbolToken(99);
         IonSymbol original = system().newSymbol(tok);
 
-        thrown.expect(UnknownSymbolException.class);
-        thrown.expectMessage("$99");
-        original.clone();
+        UnknownSymbolException use = assertThrows(UnknownSymbolException.class, original::clone);
+        assertThat(use.getMessage(), containsString("$99"));
     }
 
     @Test
@@ -47,15 +70,14 @@ public void testValueFactoryCloneWithUnknownSymbolText()
         SymbolToken tok = newSymbolToken(99);
         IonSymbol original = system().newSymbol(tok);
 
-        thrown.expect(UnknownSymbolException.class);
-        thrown.expectMessage("$99");
-        system().clone(original);
+        UnknownSymbolException use = assertThrows(UnknownSymbolException.class, () -> system().clone(original));
+        assertThat(use.getMessage(), containsString("$99"));
     }
 
     @Test
     public void testDifferentValueFactoryCloneWithUnknownSymbolText()
     {
-        IonSystem otherSystem = newSystem(new SimpleCatalog());
+        IonSystem otherSystem = IonSystemBuilder.standard().build();
 
         SymbolToken tok = newSymbolToken(99);
         IonSymbol original = system().newSymbol(tok);
@@ -75,8 +97,7 @@ public void testIonValueCloneWithUnknownAnnotationText()
         IonInt original = system().newInt(5);
         original.setTypeAnnotationSymbols(tok);
 
-        IonInt actual = original.clone();
-        assertEquals(original, actual);
+        assertSelfCloneable(original);
     }
 
     @Test
@@ -86,14 +107,13 @@ public void testValueFactoryCloneWithUnknownAnnotationText()
         IonInt original = system().newInt(5);
         original.setTypeAnnotationSymbols(tok);
 
-        IonInt actual = system().clone(original);
-        assertEquals(original, actual);
+        assertSystemCloneable(original);
     }
 
     @Test
     public void testDifferentValueFactoryCloneWithUnknownAnnotationText()
     {
-        IonSystem otherSystem = newSystem(new SimpleCatalog());
+        IonSystem otherSystem = IonSystemBuilder.standard().build();
 
         SymbolToken tok = newSymbolToken(99);
         IonInt original = system().newInt(5);
@@ -119,9 +139,8 @@ public void testIonValueCloneWithUnknownFieldNameText()
         // This works since the cloned child doesn't retain its field name.
         child.clone();
 
-        thrown.expect(UnknownSymbolException.class);
-        thrown.expectMessage("$99");
-        original.clone();
+        UnknownSymbolException use = assertThrows(UnknownSymbolException.class, original::clone);
+        assertThat(use.getMessage(), containsString("$99"));
     }
 
     @Test
@@ -133,17 +152,16 @@ public void testValueFactoryCloneWithUnknownFieldNameText()
         original.add(tok, child);
 
         // This works since the cloned child doesn't retain its field name.
-        system().clone(child);
+        assertSystemCloneable(child);
 
-        thrown.expect(UnknownSymbolException.class);
-        thrown.expectMessage("$99");
-        system().clone(original);
+        UnknownSymbolException use = assertThrows(UnknownSymbolException.class, () -> system().clone(original));
+        assertThat(use.getMessage(), containsString("$99"));
     }
 
     @Test
     public void testDifferentValueFactoryCloneWithUnknownFieldNameText()
     {
-        IonSystem otherSystem = newSystem(new SimpleCatalog());
+        IonSystem otherSystem = IonSystemBuilder.standard().build();
 
         SymbolToken tok = newSymbolToken(99);
         IonStruct original = system().newEmptyStruct();
@@ -160,4 +178,94 @@ public void testDifferentValueFactoryCloneWithUnknownFieldNameText()
         // If we don't fail we should at least retain the SID.
         assertEquals(99, copy.iterator().next().getFieldNameSymbol().getSid());
     }
+
+    @Test
+    public void cloneEmptyContainer()
+    {
+        IonStruct original = system().newEmptyStruct();
+
+        IonStruct clone = assertSelfCloneable(original);
+        assertThat(clone, emptyIterable());
+    }
+
+    @Test
+    public void cloneEmptyNestedContainer()
+    {
+        IonList original = system().newEmptyList();
+        original.add().newEmptyStruct();
+
+        assertSelfCloneable(original);
+    }
+
+    @Test
+    public void cloneBasicStruct()
+    {
+        IonStruct original = system().newEmptyStruct();
+        original.add("foo").newString("bar");
+
+        assertSelfCloneable(original);
+    }
+
+    @Test
+    public void cloneNestedContainer()
+    {
+        IonStruct original = system().newEmptyStruct();
+        original.add("foo").newEmptyList().add().newString("bar");
+
+        assertSelfCloneable(original);
+    }
+
+    @Test
+    public void cloneMultipleElements()
+    {
+        IonList original = system().newList(new int[] {1, 2, 3});
+
+        assertSelfCloneable(original);
+    }
+
+    @Test
+    public void cloneDatagram() {
+        IonDatagram original = system().newDatagram();
+        original.add().newList(new int[] {1, 2, 3});
+        original.add().newList(new int[] {4, 5, 6});
+
+        assertSelfCloneable(original);
+    }
+
+    @Test
+    public void cloneValueWithEmptySpaceInItsAnnotationsArray() {
+        IonInt original = system().newInt(123);
+        original.addTypeAnnotation("abc"); // The annotation array grows to length 1
+        original.addTypeAnnotation("def"); // The annotation array grows to length 2
+        original.addTypeAnnotation("ghi"); // The annotation array grows to length 4, leaving a null at index 3
+
+        assertSelfCloneable(original);
+    }
+
+    // TODO consider adding a general assertion for modify-after-clone. For now, the following test verifies that
+    //  modifying a cloned value does not modify the original in a specific case.
+    @Test
+    public void modifyAfterCloneDoesNotChangeOriginal() {
+        IonDatagram original = system().newDatagram();
+        original.add().newList(new int[] {1, 2, 3});
+        original.add().newList(new int[] {4, 5, 6});
+
+        IonDatagram clone = original.clone();
+        assertEqualsAndNotSame(original, clone);
+
+        IonList clonedList1 = (IonList) clone.get(0);
+        clonedList1.add().newInt(4);
+        IonList clonedList2 = (IonList) clone.get(1);
+        clonedList2.remove(0);
+
+        assertNotEquals(original, clone);
+    }
+
+    /**
+     * @return the singleton IonSystem
+     */
+    private static _Private_IonSystem system()
+    {
+        return PRIVATE_ION_SYSTEM;
+    }
 }
diff --git a/test/com/amazon/ion/IonValueTest.java b/test/com/amazon/ion/IonValueTest.java
index 27fd82faee..dca5bf1c59 100644
--- a/test/com/amazon/ion/IonValueTest.java
+++ b/test/com/amazon/ion/IonValueTest.java
@@ -313,4 +313,16 @@ public void testCloningSystemLookingValue()
         v2 = system2.clone(v);
         IonAssert.assertIonEquals(v, v2);
     }
+
+    @Test
+    public void hashValueWithEmptySpaceInItsAnnotationsArray() {
+        IonInt valueWithoutNullAnnotationSlots = system().newInt(123);
+        valueWithoutNullAnnotationSlots.setTypeAnnotations("abc", "def", "ghi");
+        IonInt valueWithNullAnnotationSlots = system().newInt(123);
+        valueWithNullAnnotationSlots.addTypeAnnotation("abc"); // The annotation array grows to length 1
+        valueWithNullAnnotationSlots.addTypeAnnotation("def"); // The annotation array grows to length 2
+        valueWithNullAnnotationSlots.addTypeAnnotation("ghi"); // The annotation array grows to length 4, leaving a null at index 3
+        assertEquals(valueWithoutNullAnnotationSlots, valueWithNullAnnotationSlots);
+        assertEquals(valueWithoutNullAnnotationSlots.hashCode(), valueWithNullAnnotationSlots.hashCode());
+    }
 }

From 05dab5bda099f94c01a19422d39e54fba8bb110e Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 7 Sep 2023 18:16:49 -0700
Subject: [PATCH 224/490] Adds a configurable maximum comparison depth to
 Equivalence.

---
 src/com/amazon/ion/util/Equivalence.java      | 75 ++++++++++++++-----
 test/com/amazon/ion/util/EquivalenceTest.java | 35 +++++++--
 2 files changed, 84 insertions(+), 26 deletions(-)

diff --git a/src/com/amazon/ion/util/Equivalence.java b/src/com/amazon/ion/util/Equivalence.java
index 371cb4c8b0..46f732fde4 100644
--- a/src/com/amazon/ion/util/Equivalence.java
+++ b/src/com/amazon/ion/util/Equivalence.java
@@ -159,20 +159,25 @@ public final class Equivalence {
     static final class Configuration {
         private final boolean isStrict;
         private final Double epsilon;
+        private final int maxComparisonDepth;
 
         Configuration(Builder builder) {
             this.isStrict = builder.isStrict;
             this.epsilon = builder.epsilon;
+            this.maxComparisonDepth = builder.maxComparisonDepth;
         }
     }
 
     /**
-     * Constructs {@link Equivalence} instances.
+     * Constructs {@link Equivalence} instances. To compare IonValues using an
+     * Equivalence instance's configuration, call {@link #ionValueEquals(IonValue, IonValue)}
+     * on that instance rather than calling {@link IonValue#equals(Object)}.
      */
     public static final class Builder {
 
         private boolean isStrict = true;
         private Double epsilon = null;
+        private int maxComparisonDepth = 1000;
 
         /**
          * When true, checks for strict data equivalence over two Ion Values.
@@ -201,6 +206,22 @@ public Builder withEpsilon(double epsilon) {
             return this;
         }
 
+        /**
+         * The maximum depth to which two values will be compared. If the two
+         * values to be compared are still potentially equivalent beyond this
+         * depth, {@link Equivalence#ionValueEquals(IonValue, IonValue)} will
+         * throw an {@link IonException}.
+         * @param maxComparisonDepth the value.
+         * @return this builder.
+         */
+        public Builder withMaxComparisonDepth(int maxComparisonDepth) {
+            if (maxComparisonDepth < 0) {
+                throw new IllegalArgumentException("Max comparison depth must not be negative.");
+            }
+            this.maxComparisonDepth = maxComparisonDepth;
+            return this;
+        }
+
         /**
          * @return a new Equivalence using this builder's configuration.
          */
@@ -263,13 +284,13 @@ private static int compareSymbolTokens(SymbolToken tok1,
      * and cannot contain duplicate elements, hence we cannot use it.
      */
     private static final Map<Field, Field>
-        convertToMultiSet(final IonStruct struct, final Configuration configuration) {
+        convertToMultiSet(final IonStruct struct, final Configuration configuration, final int depth) {
 
         final Map<Field, Field> structMultiSet =
             new HashMap<Field, Field>();
 
         for (final IonValue val : struct) {
-            final Field item = new Field(val, configuration);
+            final Field item = new Field(val, configuration, depth);
             Field curr = structMultiSet.put(item, item);
             // curr will be non-null if the multi-set already contains the
             // name/value pair
@@ -290,7 +311,8 @@ private static int compareSymbolTokens(SymbolToken tok1,
 
     private static int compareStructs(final IonStruct s1,
                                       final IonStruct s2,
-                                      final Configuration configuration)
+                                      final Configuration configuration,
+                                      final int depth)
     {
         int result = s1.size() - s2.size();
         if (result == 0) {
@@ -298,7 +320,7 @@ private static int compareStructs(final IonStruct s1,
             // Map<Field, Field>). Refer to convertToMultiSet()'s
             // documentation for more info
             final Map<Field, Field> s1MultiSet
-                    = convertToMultiSet(s1, configuration);
+                    = convertToMultiSet(s1, configuration, depth);
 
             // Iterates through each name/value pair in IonStruct s2 and
             // determine if it also occurs in s1MultiSet.
@@ -306,7 +328,7 @@ private static int compareStructs(final IonStruct s1,
             //          If it does, remove an occurrence from s1MultiSet
             //          If it doesn't, the two IonStructs aren't equal
             for (IonValue val : s2) {
-                Field field = new Field(val, configuration);
+                Field field = new Field(val, configuration, depth);
 
                 // Find an occurrence of the name/value pair in s1MultiSet
                 Field mappedValue = s1MultiSet.get(field);
@@ -328,7 +350,8 @@ private static int compareStructs(final IonStruct s1,
 
     private static int compareSequences(final IonSequence s1,
                                         final IonSequence s2,
-                                        final Configuration configuration)
+                                        final Configuration configuration,
+                                        final int depth)
     {
         int result = s1.size() - s2.size();
         if (result == 0) {
@@ -337,7 +360,8 @@ private static int compareSequences(final IonSequence s1,
             while (iter1.hasNext()) {
                 result = ionCompareToImpl(iter1.next(),
                                           iter2.next(),
-                                          configuration);
+                                          configuration,
+                                          depth);
                 if (result != 0) {
                     break;
                 }
@@ -388,7 +412,6 @@ private static int compareLobContents(final IonLob lob1, final IonLob lob2)
         return result;
     }
 
-
     /**
      * Class that denotes a name/value pair in Structs.
      * <p>
@@ -412,7 +435,7 @@ private static int compareLobContents(final IonLob lob1, final IonLob lob2)
      * a single {@code Field} -> {@code Field} with {@code occurrences} of 2.
      * <p>
      * Refer to
-     * {@link Equivalence#convertToMultiSet(IonStruct, Configuration)} and
+     * {@link Equivalence#convertToMultiSet(IonStruct, Configuration, int)} and
      * {@link Field#equals(Object)} for more info.
      * <p>
      * NOTE: This class should only be instantiated for the sole purpose of
@@ -422,6 +445,7 @@ static class Field {
         private final String    name; // aka field name
         private final IonValue  value;
         private final Configuration configuration;
+        private final int depth;
 
         /**
          * Number of times that this specific field (with the same name
@@ -429,7 +453,7 @@ static class Field {
          */
         private int occurrences;
 
-        Field(final IonValue value, final Configuration configuration)
+        Field(final IonValue value, final Configuration configuration, final int depth)
         {
             SymbolToken tok = value.getFieldNameSymbol();
             String name = tok.getText();
@@ -440,6 +464,7 @@ static class Field {
             this.name = name;
             this.value = value;
             this.configuration = configuration;
+            this.depth = depth;
 
             // Occurrences of this name/value pair is 0 initially
             this.occurrences = 0;
@@ -468,20 +493,22 @@ public boolean equals(final Object other) {
             final Field sOther = (Field) other;
 
             return name.equals(sOther.name)
-                && ionEqualsImpl(value, ((Field) other).value, configuration);
+                && ionEqualsImpl(value, ((Field) other).value, configuration, depth);
         }
     }
 
     private static boolean ionEqualsImpl(final IonValue v1,
                                          final IonValue v2,
-                                         final Configuration configuration)
+                                         final Configuration configuration,
+                                         final int depth)
     {
-        return (ionCompareToImpl(v1, v2, configuration) == 0);
+        return (ionCompareToImpl(v1, v2, configuration, depth) == 0);
     }
 
     private static int ionCompareToImpl(final IonValue v1,
                                         final IonValue v2,
-                                        final Configuration configuration)
+                                        final Configuration configuration,
+                                        final int depth)
     {
         int result = 0;
 
@@ -574,16 +601,24 @@ private static int ionCompareToImpl(final IonValue v1,
                     break;
                 case STRUCT:
                     assert !PUBLIC_COMPARISON_API; // TODO amazon-ion/ion-java/issues/26
+                    if (depth >= configuration.maxComparisonDepth) {
+                        throw new IonException("Cannot continue comparison: maximum comparison depth exceeded. This limit may be raised using Equivalence.Builder.");
+                    }
                     result = compareStructs((IonStruct) v1,
                                             (IonStruct) v2,
-                                            configuration);
+                                            configuration,
+                                            depth + 1);
                     break;
                 case LIST:
                 case SEXP:
                 case DATAGRAM:
+                    if (depth >= configuration.maxComparisonDepth) {
+                        throw new IonException("Cannot continue comparison: maximum comparison depth exceeded. This limit may be raised using Equivalence.Builder.");
+                    }
                     result = compareSequences((IonSequence) v1,
                                               (IonSequence) v2,
-                                              configuration);
+                                              configuration,
+                                              depth + 1);
                     break;
                 }
             }
@@ -614,7 +649,7 @@ private static int ionCompareToImpl(final IonValue v1,
     public static boolean ionEquals(final IonValue v1,
                                     final IonValue v2)
     {
-        return ionEqualsImpl(v1, v2, STRICT_CONFIGURATION);
+        return ionEqualsImpl(v1, v2, STRICT_CONFIGURATION, 0);
     }
 
     /**
@@ -632,7 +667,7 @@ public static boolean ionEquals(final IonValue v1,
     public static boolean ionEqualsByContent(final IonValue v1,
                                              final IonValue v2)
     {
-        return ionEqualsImpl(v1, v2, NON_STRICT_CONFIGURATION);
+        return ionEqualsImpl(v1, v2, NON_STRICT_CONFIGURATION, 0);
     }
 
     /**
@@ -649,7 +684,7 @@ public static boolean ionEqualsByContent(final IonValue v1,
      * @return true if two Ion Values represent the same data.
      */
     public boolean ionValueEquals(final IonValue v1, final IonValue v2) {
-        return ionEqualsImpl(v1, v2, configuration);
+        return ionEqualsImpl(v1, v2, configuration, 0);
     }
 
 }
diff --git a/test/com/amazon/ion/util/EquivalenceTest.java b/test/com/amazon/ion/util/EquivalenceTest.java
index ff559c66f0..e444f81607 100644
--- a/test/com/amazon/ion/util/EquivalenceTest.java
+++ b/test/com/amazon/ion/util/EquivalenceTest.java
@@ -15,6 +15,7 @@
 
 package com.amazon.ion.util;
 
+import com.amazon.ion.IonException;
 import com.amazon.ion.IonFloat;
 import com.amazon.ion.IonList;
 import com.amazon.ion.IonStruct;
@@ -386,9 +387,9 @@ public void testFieldEquals1() {
         assertEquals(3, struct.size());
 
         Equivalence.Configuration configuration = new Equivalence.Configuration(new Equivalence.Builder().withStrict(true));
-        Equivalence.Field f1 = new Equivalence.Field(v1, configuration);
-        Equivalence.Field f2 = new Equivalence.Field(v2, configuration);
-        Equivalence.Field f3 = new Equivalence.Field(v3, configuration);
+        Equivalence.Field f1 = new Equivalence.Field(v1, configuration, 0);
+        Equivalence.Field f2 = new Equivalence.Field(v2, configuration, 0);
+        Equivalence.Field f3 = new Equivalence.Field(v3, configuration, 0);
 
         assertFalse(f1.equals(f2));
         assertFalse(f1.equals(f3));
@@ -419,9 +420,9 @@ public void testFieldEquals2() {
         assertEquals(3, struct.size());
 
         Equivalence.Configuration configuration = new Equivalence.Configuration(new Equivalence.Builder().withStrict(true));
-        Equivalence.Field f1 = new Equivalence.Field(v1, configuration);
-        Equivalence.Field f2 = new Equivalence.Field(v2, configuration);
-        Equivalence.Field f3 = new Equivalence.Field(v3, configuration);
+        Equivalence.Field f1 = new Equivalence.Field(v1, configuration, 0);
+        Equivalence.Field f2 = new Equivalence.Field(v2, configuration, 0);
+        Equivalence.Field f3 = new Equivalence.Field(v3, configuration, 0);
 
         assertEquals(f1, f2);
         assertEquals(f2, f1); // symmetric
@@ -470,4 +471,26 @@ public void builderWithEpsilon() {
         assertTrue(equivalence.ionValueEquals(list1, list2));
         assertTrue(equivalence.ionValueEquals(list2, list1));
     }
+
+    @Test
+    public void maximumDepthCannotBeNegative() {
+        Equivalence.Builder builder = new Equivalence.Builder();
+        assertThrows(IllegalArgumentException.class, () -> builder.withMaxComparisonDepth(-1));
+    }
+
+    @Test
+    public void maximumDepthExceeded() {
+        Equivalence equivalence = new Equivalence.Builder().withMaxComparisonDepth(3).build();
+        IonStruct struct1 = (IonStruct) system().singleValue("{foo: {bar: {baz: {zar: 123}}}}");
+        IonStruct struct2 = struct1.clone();
+        assertThrows(IonException.class, () -> equivalence.ionValueEquals(struct1, struct2));
+    }
+
+    @Test
+    public void maximumDepthNotExceeded() {
+        Equivalence equivalence = new Equivalence.Builder().withMaxComparisonDepth(4).build();
+        IonStruct struct1 = (IonStruct) system().singleValue("{foo: {bar: {baz: {zar: 123}}}}");
+        IonStruct struct2 = struct1.clone();
+        assertTrue(equivalence.ionValueEquals(struct1, struct2));
+    }
 }

From ba34bb6ec99bd0033c6f1e520ab360fa793bf2e9 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 11 Sep 2023 14:33:25 -0700
Subject: [PATCH 225/490] Uses Arrays.copyOf for growing iteration stacks.

---
 .../amazon/ion/impl/lite/IonValueLite.java    | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
index c882aa15e8..f3ef633e56 100644
--- a/src/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -37,6 +37,7 @@
 import com.amazon.ion.system.IonTextWriterBuilder;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.util.Arrays;
 
 /**
  *  Base class of the light weight implementation of
@@ -502,7 +503,7 @@ private int containerHashCode() {
             } else {
                 // Step into the container by pushing a HashHolder for the container onto the stack.
                 if (++hashStackIndex >= hashStack.length) {
-                    hashStack = growHashStack(hashStack);
+                    hashStack = Arrays.copyOf(hashStack, hashStack.length * 2);
                 }
                 hashHolder = hashStack[hashStackIndex];
                 if (hashHolder == null) {
@@ -533,12 +534,6 @@ private int containerHashCode() {
         } while (true);
     }
 
-    private static HashHolder[] growHashStack(HashHolder[] hashStack) {
-        HashHolder[] newHashStack = new HashHolder[hashStack.length * 2];
-        System.arraycopy(hashStack, 0, newHashStack, 0, hashStack.length);
-        return newHashStack;
-    }
-
     /**
      * Internal HashCode implementation to be overridden by scalar subclasses. Must only be called on non-null values.
      */
@@ -637,15 +632,6 @@ private static class ClearSymbolIDsHolder
         IonContainerLite.SequenceContentIterator iterator = null;
     }
 
-    private static ClearSymbolIDsHolder[] growClearSymbolIDsHolderStack(
-            ClearSymbolIDsHolder[] clearSymbolIDsHolderStack)
-    {
-        ClearSymbolIDsHolder[] newClearSymbolIDsHolderStack = new ClearSymbolIDsHolder[clearSymbolIDsHolderStack.length * 2];
-        System.arraycopy(clearSymbolIDsHolderStack, 0, newClearSymbolIDsHolderStack, 0,
-                clearSymbolIDsHolderStack.length);
-        return newClearSymbolIDsHolderStack;
-    }
-
     private boolean clearSymbolIDsIterative(boolean readOnlyMode) {
         ClearSymbolIDsHolder[] stack = new ClearSymbolIDsHolder[CONTAINER_STACK_INITIAL_CAPACITY];
         int stackIndex = 0;
@@ -662,7 +648,7 @@ private boolean clearSymbolIDsIterative(boolean readOnlyMode) {
                 // The value is a container, and it is necessary to walk its children.
                 // Step into the container by pushing a ClearSymbolIDsHolder for the container onto the stack.
                 if (++stackIndex >= stack.length) {
-                    stack = growClearSymbolIDsHolderStack(stack);
+                    stack = Arrays.copyOf(stack, stack.length * 2);
                 }
                 holder = stack[stackIndex];
                 if (holder == null) {
@@ -1205,7 +1191,7 @@ and filling in the blanks or customizing as necessary performed better (and cons
                 // BLANK: insert logic for handling non-null scalar values.
             } else {
                 if (++iteratorStackIndex >= iteratorStack.length) {
-                    iteratorStack = growIteratorStack(iteratorStack);
+                    iteratorStack = Arrays.copyOf(iteratorStack, iteratorStack.length * 2);
                 }
                 currentIterator = ((IonContainerLite) value).new SequenceContentIterator(0, true);
                 iteratorStack[iteratorStackIndex] = currentIterator;
@@ -1239,7 +1225,7 @@ private void writeToIterative(IonWriter writer, SymbolTableProvider symbolTableP
                 value.writeBodyTo(writer, symbolTableProvider);
             } else {
                 if (++iteratorStackIndex >= iteratorStack.length) {
-                    iteratorStack = growIteratorStack(iteratorStack);
+                    iteratorStack = Arrays.copyOf(iteratorStack, iteratorStack.length * 2);
                 }
                 currentIterator = ((IonContainerLite) value).new SequenceContentIterator(0, true);
                 iteratorStack[iteratorStackIndex] = currentIterator;
@@ -1258,11 +1244,6 @@ private void writeToIterative(IonWriter writer, SymbolTableProvider symbolTableP
             } while (value == null);
         } while (true);
     }
-    private static IonContainerLite.SequenceContentIterator[] growIteratorStack(IonContainerLite.SequenceContentIterator[] iteratorStack) {
-        IonContainerLite.SequenceContentIterator[] newIteratorStack = new IonContainerLite.SequenceContentIterator[iteratorStack.length * 2];
-        System.arraycopy(iteratorStack, 0, newIteratorStack, 0, iteratorStack.length);
-        return newIteratorStack;
-    }
 
     final void writeTo(IonWriter writer, SymbolTableProvider symbolTableProvider)
     {

From 25d24b6617680bff9713c711344c3e690d552cea Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Tue, 12 Sep 2023 15:42:25 -0700
Subject: [PATCH 226/490] Prepare v1.10.3 release (#563)

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index f6622a7fd0..587c5f0c73 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.3-SNAPSHOT
+1.10.3

From d7d3ee3d01c6c12cafed2f07e2c96fc1f68f869c Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Thu, 14 Sep 2023 12:18:42 -0700
Subject: [PATCH 227/490] Bumps version to 1.10.4-SNAPSHOT (#564)

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 587c5f0c73..95ce24d19d 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.3
+1.10.4-SNAPSHOT

From 9a455c3e0900ec91ec7d27362fec7a5ae1f4ff79 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Thu, 14 Sep 2023 13:04:53 -0700
Subject: [PATCH 228/490] Fix NPE in IonWriterSystem (#566)

---
 src/com/amazon/ion/impl/IonWriterSystem.java | 16 ++++++++----
 test/com/amazon/ion/IonValueTest.java        | 27 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonWriterSystem.java b/src/com/amazon/ion/impl/IonWriterSystem.java
index be0c5d245e..bab5cef4db 100644
--- a/src/com/amazon/ion/impl/IonWriterSystem.java
+++ b/src/com/amazon/ion/impl/IonWriterSystem.java
@@ -539,20 +539,26 @@ public final void setTypeAnnotationSymbols(SymbolToken... annotations)
         }
         else
         {
-            int count = annotations.length;
+            int annotationsArrayLength = annotations.length;
             // TODO the following makes two copy passes
             // TODO validate the input
-            ensureAnnotationCapacity(count);
+            ensureAnnotationCapacity(annotationsArrayLength);
 
             SymbolTable symtab = getSymbolTable();
-            for (int i = 0; i < count; i++)
+            int count = 0;
+            while (count < annotationsArrayLength)
             {
-                SymbolToken sym = annotations[i];
+                SymbolToken sym = annotations[count];
+                if (sym == null) {
+                    break;
+                }
                 if (sym.getText() == null) {
                     validateSymbolId(sym.getSid());
                 }
                 sym = _Private_Utils.localize(symtab, sym);
-                _annotations[i] = sym;
+                _annotations[count] = sym;
+
+                count++;
             }
             _annotation_count = count;
         }
diff --git a/test/com/amazon/ion/IonValueTest.java b/test/com/amazon/ion/IonValueTest.java
index dca5bf1c59..9c205c3802 100644
--- a/test/com/amazon/ion/IonValueTest.java
+++ b/test/com/amazon/ion/IonValueTest.java
@@ -17,6 +17,7 @@
 
 import static com.amazon.ion.junit.IonAssert.assertAnnotations;
 import static java.lang.String.format;
+import static org.junit.Assert.assertEquals;
 
 import com.amazon.ion.junit.IonAssert;
 import com.amazon.ion.system.IonTextWriterBuilder;
@@ -184,6 +185,22 @@ public void testAddTypeAnnotationsOnReadOnlyValue()
         v.addTypeAnnotation(ann);
     }
 
+    @Test
+    public void testClearTypeAnnotations() {
+        IonValue v = system().singleValue("a::b::null");
+        v.clearTypeAnnotations();
+        assertAnnotations(v);
+    }
+
+    @Test
+    public void testClearTypeAnnotationsAndThenWriteValue() {
+        IonValue v = system().singleValue("a::b::null");
+        v.clearTypeAnnotations();
+        // This is potentially brittle if e.g. toString() was changed to have different whitespace.
+        // The important thing we're checking for in this test case is that no NPEs are thrown after clearing annotations.
+        assertEquals("null", v.toString());
+    }
+
     @Test @Ignore
     public void testAddAnnotationDuplicate()
     {
@@ -240,6 +257,16 @@ public void testRemoveTypeAnnotation()
         assertAnnotations(v);
     }
 
+    @Test
+    public void testRemoveTypeAnnotationAndThenWriteValueToString() {
+        IonValue v = system().singleValue("a::b::null");
+        v.removeTypeAnnotation("a");
+        // This is potentially brittle if e.g. toString() was changed to have different whitespace.
+        // The important thing we're checking for in this test case is that no NPEs are thrown after removing an annotation.
+        assertEquals("b::null", v.toString());
+        v.removeTypeAnnotation("b");
+        assertEquals("null", v.toString());
+    }
 
     @Test
     public void testRemoveTypeAnnotationNull()

From ba81e0c5b59cee4a0f9ada20a241328d923fdafe Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Thu, 14 Sep 2023 14:40:58 -0700
Subject: [PATCH 229/490] Release v1.10.4 (#567)

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 95ce24d19d..18b3114206 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.4-SNAPSHOT
+1.10.4

From 422360ceda6d517be4183f66bedd818b9fb710a8 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Fri, 15 Sep 2023 12:59:38 -0700
Subject: [PATCH 230/490] Bump version to 1.10.5-SNAPSHOT (#568)

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 18b3114206..f8e1fd93b4 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.4
+1.10.5-SNAPSHOT

From 5ac52839c9df5c7c5e3a065f05237696c0946d65 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 15 Sep 2023 13:30:46 -0700
Subject: [PATCH 231/490] Restores previous behavior when IonValue.writeTo is
 called with a writer that has annotations set.

---
 .../amazon/ion/impl/lite/IonValueLite.java    |  4 +---
 .../amazon/ion/impl/IonWriterTestCase.java    | 20 +++++++++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
index f3ef633e56..633fd70ff6 100644
--- a/src/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -1168,9 +1168,7 @@ private static void writeFieldNameAndAnnotations(IonWriter writer, IonValueLite
             }
         }
 
-        if (value._annotations != null) {
-            writer.setTypeAnnotationSymbols(value._annotations);
-        }
+        writer.setTypeAnnotationSymbols(value._annotations);
     }
 
     /*  The following template may be used to iterate over the tree at the current value. Copying this structure
diff --git a/test/com/amazon/ion/impl/IonWriterTestCase.java b/test/com/amazon/ion/impl/IonWriterTestCase.java
index 158e7b067b..fdfd52d15b 100644
--- a/test/com/amazon/ion/impl/IonWriterTestCase.java
+++ b/test/com/amazon/ion/impl/IonWriterTestCase.java
@@ -22,6 +22,7 @@
 import static com.amazon.ion.impl.Symtabs.FRED_MAX_IDS;
 import static com.amazon.ion.impl._Private_IonWriterBase.ERROR_MISSING_FIELD_NAME;
 import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
+import static com.amazon.ion.junit.IonAssert.assertAnnotations;
 import static com.amazon.ion.junit.IonAssert.assertIonEquals;
 import static com.amazon.ion.junit.IonAssert.expectNextField;
 
@@ -1288,4 +1289,23 @@ public void testWriteToWithFieldName()
 
         assertNull(reader.next());
     }
+
+    // Create a writer, set it using the provided annotations, then write the given value using IonValue.writeTo.
+    // Assert that the resulting value is annotated with only the annotations on the original IonValue, not the ones
+    // set on the writer.
+    private void writeToWithAnnotations(IonValue value, String... annotations) throws Exception {
+        iw = makeWriter();
+        iw.setTypeAnnotations(annotations);
+        value.writeTo(iw);
+        IonValue reread = system().singleValue(outputByteArray());
+        assertAnnotations(reread, value.getTypeAnnotations());
+    }
+
+    @Test
+    public void writeToOverwritesExistingAnnotations() throws Exception {
+        writeToWithAnnotations(system().singleValue("bar"));
+        writeToWithAnnotations(system().singleValue("foo::bar"));
+        writeToWithAnnotations(system().singleValue("foo"), "bar");
+        writeToWithAnnotations(system().singleValue("foo::bar"), "baz");
+    }
 }

From 1ef7cbb56f462003a2195fc850715082ff0cf4e6 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 15 Sep 2023 14:37:45 -0700
Subject: [PATCH 232/490] Fixes a bug in that prevented the correct IonContext
 from being copied via IonStruct.cloneAndRemove and IonStruct.cloneAndRetain.

---
 src/com/amazon/ion/impl/lite/IonStructLite.java | 1 +
 test/com/amazon/ion/StructTest.java             | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/com/amazon/ion/impl/lite/IonStructLite.java
index 509460336f..c05feef334 100644
--- a/src/com/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStructLite.java
@@ -318,6 +318,7 @@ private IonStruct doClone(boolean keep, String... fieldNames)
                     // This ensures that we don't copy an unknown field name.
                     clonedChild._fieldName = value.getFieldName();
                     clonedChild._elementid(clone._child_count);
+                    clonedChild._context = clone;
                     if (!clone._isSymbolIdPresent() && clonedChild._isSymbolIdPresent())
                     {
                         clone.cascadeSIDPresentToContextRoot();
diff --git a/test/com/amazon/ion/StructTest.java b/test/com/amazon/ion/StructTest.java
index 88861772ae..eab5bb1708 100644
--- a/test/com/amazon/ion/StructTest.java
+++ b/test/com/amazon/ion/StructTest.java
@@ -748,6 +748,15 @@ public void testRemoveAfterClone()
         assertNull(s2.get("b"));
     }
 
+    @Test
+    public void testRemoveAfterCloneAndRemove() {
+        IonStruct struct1 = (IonStruct) system().singleValue("{a:1,b:2}");
+        IonStruct struct2 = struct1.cloneAndRemove("a");
+
+        assertNotNull(struct2.remove("b"));
+        assertFalse(struct2.containsKey("b"));
+    }
+
     @Test
     public void testPutOfClone()
     {

From 3136d6ad082ed4003392e8535e39e4133ee4e86b Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Fri, 15 Sep 2023 16:34:35 -0700
Subject: [PATCH 233/490] Fix NPE in IonStructLite.doClone() (#570)

---
 .../amazon/ion/impl/lite/IonStructLite.java   |  3 ++
 test/com/amazon/ion/StructTest.java           | 49 +++++++++++++++----
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/com/amazon/ion/impl/lite/IonStructLite.java
index c05feef334..ed32ef6a45 100644
--- a/src/com/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStructLite.java
@@ -298,6 +298,9 @@ private IonStruct doClone(boolean keep, String... fieldNames)
         {
             clone = getSystem().newNullStruct();
         }
+        else if (_children == null) {
+            clone = getSystem().newEmptyStruct();
+        }
         else
         {
             Set<String> fields =
diff --git a/test/com/amazon/ion/StructTest.java b/test/com/amazon/ion/StructTest.java
index eab5bb1708..6fa84f7773 100644
--- a/test/com/amazon/ion/StructTest.java
+++ b/test/com/amazon/ion/StructTest.java
@@ -16,6 +16,8 @@
 package com.amazon.ion;
 
 import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotSame;
 
 import com.amazon.ion.impl._Private_IonValue;
 import com.amazon.ion.impl._Private_Utils;
@@ -25,6 +27,8 @@
 import java.util.Iterator;
 import java.util.ListIterator;
 import java.util.Random;
+
+import com.amazon.ion.system.IonSystemBuilder;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -1122,10 +1126,22 @@ public void testCloneAndRemove()
         assertEquals(expected, actual);
 
         assertEquals(struct("a::b::{}"), actual.cloneAndRemove("d"));
+    }
 
-        IonStruct n = struct("x::y::null.struct");
-        IonStruct n2 = n.cloneAndRemove("a");
-        assertEquals(struct("x::y::null.struct"), n2);
+    @Test
+    public void testCloneAndRemoveOnNullStruct() {
+        IonStruct struct = struct("foo::null.struct");
+        IonStruct clone = struct.cloneAndRemove("a");
+        assertEquals(struct, clone);
+        assertNotSame(struct, clone);
+    }
+
+    @Test
+    public void testCloneAndRemoveOnEmptyStruct() {
+        IonStruct struct = struct("foo::{}");
+        IonStruct clone = struct.cloneAndRemove("a");
+        assertEquals(struct, clone);
+        assertNotSame(struct, clone);
     }
 
     @Test
@@ -1224,24 +1240,39 @@ public void testCloneAndRemoveWithUnknownAnnotationTextOnField()
     //-------------------------------------------------------------------------
 
     @Test
-    public void testCloneAndRetain()
-    {
+    public void testCloneAndRetain() {
         IonStruct s1 = struct("a::{c:1,d:2,e:3,d:3}");
         IonStruct actual = s1.cloneAndRetain("c", "d");
         IonStruct expected = struct("a::{c:1,d:2,d:3}");
         assertEquals(expected, actual);
 
         assertEquals(struct("a::{}"), actual.cloneAndRetain("e"));
+    }
 
-        IonStruct n = struct("y::null.struct");
-        IonStruct n2 = n.cloneAndRetain("a");
-        assertEquals(struct("y::null.struct"), n2);
-
+    @Test
+    public void testCloneAndRetainUnknownFieldName() {
+        IonStruct s1 = struct("a::{c:1,d:2,e:3,d:3}");
         // Not cool to ask to retain an unknown field name.
         thrown.expect(NullPointerException.class);
         s1.cloneAndRetain("c", null);
     }
 
+    @Test
+    public void testCloneAndRetainOnNullStruct() {
+        IonStruct struct = struct("foo::null.struct");
+        IonStruct clone = struct.cloneAndRetain("a");
+        assertEquals(struct, clone);
+        assertNotSame(struct, clone);
+    }
+
+    @Test
+    public void testCloneAndRetainOnEmptyStruct() {
+        IonStruct struct = struct("foo::{}");
+        IonStruct clone = struct.cloneAndRetain("a");
+        assertEquals(struct, clone);
+        assertNotSame(struct, clone);
+    }
+
     @Test
     public void testCloneAndRetainWithSpecialFieldNames()
     {

From 250258a2cd3f1ba39f9f51bff411edebfa2a42d5 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Mon, 18 Sep 2023 09:01:02 -0700
Subject: [PATCH 234/490] Restores previous behavior that allowed
 IonValue.toString to print symbol tokens with unknown text. (#572)

---
 src/com/amazon/ion/impl/IonWriterSystem.java  |  4 +-
 .../ion/impl/IonWriterSystemBinary.java       |  3 +-
 .../amazon/ion/impl/IonWriterSystemText.java  |  3 +-
 .../amazon/ion/impl/IonWriterSystemTree.java  |  2 +-
 src/com/amazon/ion/impl/IonWriterUser.java    |  9 ++--
 .../amazon/ion/impl/IonWriterUserBinary.java  |  3 +-
 .../impl/_Private_IonTextWriterBuilder.java   | 17 ++++++-
 .../ion/impl/_Private_IonWriterBase.java      | 12 ++++-
 .../ion/impl/_Private_IonWriterFactory.java   |  2 +-
 .../amazon/ion/impl/lite/IonValueLite.java    |  7 ++-
 test/com/amazon/ion/IonValueTest.java         | 45 +++++++++++++++++++
 11 files changed, 95 insertions(+), 12 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonWriterSystem.java b/src/com/amazon/ion/impl/IonWriterSystem.java
index bab5cef4db..0f4a4819a7 100644
--- a/src/com/amazon/ion/impl/IonWriterSystem.java
+++ b/src/com/amazon/ion/impl/IonWriterSystem.java
@@ -89,8 +89,10 @@ abstract class IonWriterSystem
      */
     IonWriterSystem(SymbolTable defaultSystemSymbolTable,
                     InitialIvmHandling initialIvmHandling,
-                    IvmMinimizing ivmMinimizing)
+                    IvmMinimizing ivmMinimizing,
+                    boolean requireSymbolValidation)
     {
+        super(requireSymbolValidation);
         defaultSystemSymbolTable.getClass(); // Efficient null check
         _default_system_symbol_table = defaultSystemSymbolTable;
         _symbol_table = defaultSystemSymbolTable;
diff --git a/src/com/amazon/ion/impl/IonWriterSystemBinary.java b/src/com/amazon/ion/impl/IonWriterSystemBinary.java
index 51073cfb31..2b9dd26c73 100644
--- a/src/com/amazon/ion/impl/IonWriterSystemBinary.java
+++ b/src/com/amazon/ion/impl/IonWriterSystemBinary.java
@@ -325,7 +325,8 @@ static long[] growOne(long[] source, int newSize) {
     {
         super(defaultSystemSymtab,
               (ensureInitialIvm ? InitialIvmHandling.ENSURE : null),
-              IvmMinimizing.ADJACENT);
+              IvmMinimizing.ADJACENT,
+              true);
 
         out.getClass(); // Efficient null check
         _user_output_stream = out;
diff --git a/src/com/amazon/ion/impl/IonWriterSystemText.java b/src/com/amazon/ion/impl/IonWriterSystemText.java
index 8e1ea9b4a9..c0f7de3fc5 100644
--- a/src/com/amazon/ion/impl/IonWriterSystemText.java
+++ b/src/com/amazon/ion/impl/IonWriterSystemText.java
@@ -82,7 +82,8 @@ protected IonWriterSystemText(SymbolTable defaultSystemSymtab,
     {
         super(defaultSystemSymtab,
               options.getInitialIvmHandling(),
-              options.getIvmMinimizing());
+              options.getIvmMinimizing(),
+              !options._allow_invalid_sids);
 
         _output =
             _Private_IonTextAppender.forFastAppendable(out,
diff --git a/src/com/amazon/ion/impl/IonWriterSystemTree.java b/src/com/amazon/ion/impl/IonWriterSystemTree.java
index ff3bf30d14..460ead4e98 100644
--- a/src/com/amazon/ion/impl/IonWriterSystemTree.java
+++ b/src/com/amazon/ion/impl/IonWriterSystemTree.java
@@ -84,7 +84,7 @@ protected IonWriterSystemTree(SymbolTable defaultSystemSymbolTable,
                                   InitialIvmHandling initialIvmHandling)
     {
         super(defaultSystemSymbolTable, initialIvmHandling,
-              IvmMinimizing.ADJACENT);
+              IvmMinimizing.ADJACENT, true);
 
         _factory = rootContainer.getSystem();
         _lst_factory = (LocalSymbolTableAsStruct.Factory)((_Private_ValueFactory)_factory).getLstFactory();
diff --git a/src/com/amazon/ion/impl/IonWriterUser.java b/src/com/amazon/ion/impl/IonWriterUser.java
index 22acb7eac7..60270d510c 100644
--- a/src/com/amazon/ion/impl/IonWriterUser.java
+++ b/src/com/amazon/ion/impl/IonWriterUser.java
@@ -98,8 +98,10 @@ class IonWriterUser
      */
     IonWriterUser(IonCatalog catalog,
                   ValueFactory symtabValueFactory,
-                  IonWriterSystem systemWriter)
+                  IonWriterSystem systemWriter,
+                  boolean requireSymbolValidation)
     {
+        super(requireSymbolValidation);
         _symtab_value_factory = symtabValueFactory;
         _catalog = catalog;
 
@@ -127,9 +129,10 @@ class IonWriterUser
     IonWriterUser(IonCatalog catalog,
                   ValueFactory symtabValueFactory,
                   IonWriterSystem systemWriter,
-                  SymbolTable symtab)
+                  SymbolTable symtab,
+                  boolean requireSymbolValidation)
     {
-        this(catalog, symtabValueFactory, systemWriter);
+        this(catalog, symtabValueFactory, systemWriter, requireSymbolValidation);
 
         SymbolTable defaultSystemSymtab =
             systemWriter.getDefaultSystemSymtab();
diff --git a/src/com/amazon/ion/impl/IonWriterUserBinary.java b/src/com/amazon/ion/impl/IonWriterUserBinary.java
index 7db4c8fcc2..b460a1871f 100644
--- a/src/com/amazon/ion/impl/IonWriterUserBinary.java
+++ b/src/com/amazon/ion/impl/IonWriterUserBinary.java
@@ -48,7 +48,8 @@ class IonWriterUserBinary
         super(options.getCatalog(),
               options.getSymtabValueFactory(),
               systemWriter,
-              options.buildContextSymbolTable());
+              options.buildContextSymbolTable(),
+              true);
 
         if (options.isStreamCopyOptimized())
         {
diff --git a/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java b/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
index c1fbaed8de..ced626d845 100644
--- a/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
+++ b/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
@@ -60,6 +60,7 @@ public static _Private_IonTextWriterBuilder standard()
     public boolean _timestamp_as_millis;
     public boolean _timestamp_as_string;
     public boolean _untyped_nulls;
+    public boolean _allow_invalid_sids;
 
     private _Private_CallbackBuilder _callback_builder;
 
@@ -85,6 +86,7 @@ private _Private_IonTextWriterBuilder(_Private_IonTextWriterBuilder that)
         this._timestamp_as_millis = that._timestamp_as_millis;
         this._timestamp_as_string = that._timestamp_as_string;
         this._untyped_nulls       = that._untyped_nulls      ;
+        this._allow_invalid_sids  = that._allow_invalid_sids ;
     }
 
 
@@ -141,6 +143,19 @@ public final IonTextWriterBuilder withJsonDowngrade()
         return b;
     }
 
+    /**
+     * Determines whether this builder should allow invalid SIDs (i.e. SIDs out of range of the current symbol table or
+     * SIDs with unknown text). This is disabled by default, because enabling this option can result in writing invalid
+     * Ion data. This option should only be enabled when writing text Ion data primarily for debugging by humans.
+     * @param allowInvalidSids whether to allow invalid SIDs.
+     * @return the builder.
+     */
+    public final _Private_IonTextWriterBuilder withInvalidSidsAllowed(boolean allowInvalidSids) {
+        _Private_IonTextWriterBuilder b = mutable();
+        b._allow_invalid_sids = allowInvalidSids;
+        return b;
+    }
+
 
     final boolean isPrettyPrintOn()
     {
@@ -212,7 +227,7 @@ private IonWriter build(_Private_FastAppendable appender)
         SymbolTable initialSymtab =
             initialSymtab(((_Private_ValueFactory)system).getLstFactory(), defaultSystemSymtab, imports);
 
-        return new IonWriterUser(catalog, system, systemWriter, initialSymtab);
+        return new IonWriterUser(catalog, system, systemWriter, initialSymtab, !_allow_invalid_sids);
     }
 
 
diff --git a/src/com/amazon/ion/impl/_Private_IonWriterBase.java b/src/com/amazon/ion/impl/_Private_IonWriterBase.java
index 1aa806ec67..6905672534 100644
--- a/src/com/amazon/ion/impl/_Private_IonWriterBase.java
+++ b/src/com/amazon/ion/impl/_Private_IonWriterBase.java
@@ -44,6 +44,16 @@ public abstract class _Private_IonWriterBase
     static final String ERROR_FINISH_NOT_AT_TOP_LEVEL =
         "IonWriter.finish() can only be called at top-level.";
 
+    private final boolean requireSymbolValidation;
+
+    /**
+     * @param requireSymbolValidation true if SID validation should be performed; otherwise, false.
+     *                                See {@link _Private_IonTextWriterBuilder#withInvalidSidsAllowed(boolean)}
+     */
+    public _Private_IonWriterBase(boolean requireSymbolValidation) {
+        this.requireSymbolValidation = requireSymbolValidation;
+    }
+
     /**
      * Returns the current depth of containers the writer is at.  This is
      * 0 if the writer is at top-level.
@@ -216,7 +226,7 @@ public void writeNull() throws IOException
     }
 
     final void validateSymbolId(int sid) {
-        if (sid > getSymbolTable().getMaxId()) {
+        if (requireSymbolValidation && sid > getSymbolTable().getMaxId()) {
             // There is no slot for this symbol ID in the symbol table,
             // so an error would be raised on read. Fail early on write.
             throw new UnknownSymbolException(sid);
diff --git a/src/com/amazon/ion/impl/_Private_IonWriterFactory.java b/src/com/amazon/ion/impl/_Private_IonWriterFactory.java
index b02b8dfc94..c782f49e40 100644
--- a/src/com/amazon/ion/impl/_Private_IonWriterFactory.java
+++ b/src/com/amazon/ion/impl/_Private_IonWriterFactory.java
@@ -57,7 +57,7 @@ public static IonWriter makeWriter(IonCatalog catalog,
             new IonWriterSystemTree(defaultSystemSymtab, catalog, container,
                                     InitialIvmHandling.SUPPRESS);
 
-        return new IonWriterUser(catalog, sys, system_writer);
+        return new IonWriterUser(catalog, sys, system_writer, true);
     }
 
 
diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
index 633fd70ff6..6c0b28e325 100644
--- a/src/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -31,6 +31,7 @@
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.UnknownSymbolException;
 import com.amazon.ion.ValueVisitor;
+import com.amazon.ion.impl._Private_IonTextWriterBuilder;
 import com.amazon.ion.impl._Private_IonValue;
 import com.amazon.ion.impl._Private_IonWriter;
 import com.amazon.ion.impl._Private_Utils;
@@ -81,7 +82,11 @@ abstract class IonValueLite
 
     // 'withCharsetAscii' is only specified for consistency with the behavior of the previous implementation of
     // toString. Technically users are not allowed to rely on a canonical encoding, but in practice they often do.
-    private static final IonTextWriterBuilder DEFAULT_TO_STRING_WRITER_BUILDER = IonTextWriterBuilder.standard().withCharsetAscii().immutable();
+    private static final IonTextWriterBuilder DEFAULT_TO_STRING_WRITER_BUILDER =
+        ((_Private_IonTextWriterBuilder) IonTextWriterBuilder.standard())
+            .withInvalidSidsAllowed(true)
+            .withCharsetAscii()
+            .immutable();
 
 
     /**
diff --git a/test/com/amazon/ion/IonValueTest.java b/test/com/amazon/ion/IonValueTest.java
index 9c205c3802..303446bc4b 100644
--- a/test/com/amazon/ion/IonValueTest.java
+++ b/test/com/amazon/ion/IonValueTest.java
@@ -19,12 +19,19 @@
 import static java.lang.String.format;
 import static org.junit.Assert.assertEquals;
 
+import com.amazon.ion.impl._Private_Utils;
 import com.amazon.ion.junit.IonAssert;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
 import com.amazon.ion.system.IonTextWriterBuilder;
 import com.amazon.ion.system.IonWriterBuilder.InitialIvmHandling;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+
 
 public class IonValueTest
     extends IonTestCase
@@ -352,4 +359,42 @@ public void hashValueWithEmptySpaceInItsAnnotationsArray() {
         assertEquals(valueWithoutNullAnnotationSlots, valueWithNullAnnotationSlots);
         assertEquals(valueWithoutNullAnnotationSlots.hashCode(), valueWithNullAnnotationSlots.hashCode());
     }
+
+    /**
+     * Assert that toString can produce strings from values that contain symbols with unknown text.
+     * @param value a value containing a symbol token (field name, annotation, or symbol value) with text "foo".
+     */
+    private void toStringCanHandleSymbolTokenWithUnknownText(IonValue value) throws Exception {
+
+        SymbolTable shared = _Private_Utils.newSharedSymtab("table", 1, null, Collections.singletonList("foo").iterator());
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (IonWriter writer = IonBinaryWriterBuilder.standard().withImports(shared).build(out)) {
+            value.writeTo(writer);
+        }
+
+        // The value is encoded using a shared symbol table.
+        byte[] encoded = out.toByteArray();
+
+        // The shared symbol table is not provided to the loader, leaving the loaded IonValue with a symbol with
+        // unknown text.
+        String actual = system().singleValue(encoded).toString();
+        // The resulting string contains the symbol identifier for the symbol with unknown text.
+        assertTrue(actual.contains("$10"));
+    }
+
+    @Test
+    public void toStringCanHandleFieldNameWithUnknownText() throws Exception {
+        toStringCanHandleSymbolTokenWithUnknownText(system().singleValue("{foo: bar}"));
+    }
+
+    @Test
+    public void toStringCanHandleAnnotationWithUnknownText() throws Exception {
+        toStringCanHandleSymbolTokenWithUnknownText(system().singleValue("foo::bar"));
+    }
+
+    @Test
+    public void toStringCanHandleSymbolValueWithUnknownText() throws Exception {
+        toStringCanHandleSymbolTokenWithUnknownText(system().singleValue("foo"));
+    }
 }

From 0a4b60efc77d9913b1c1ec5d5ce8c7f3ae0355cc Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Mon, 18 Sep 2023 11:46:41 -0700
Subject: [PATCH 235/490] Fix inconsistent equals and hashcode when annotations
 are cleared (#573)

---
 src/com/amazon/ion/impl/lite/IonValueLite.java | 10 +++++-----
 test/com/amazon/ion/IonValueTest.java          |  6 ++++++
 test/com/amazon/ion/junit/IonAssert.java       |  7 ++++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/com/amazon/ion/impl/lite/IonValueLite.java
index 6c0b28e325..7f28414fe5 100644
--- a/src/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/com/amazon/ion/impl/lite/IonValueLite.java
@@ -983,11 +983,6 @@ public final int findTypeAnnotation(String annotation)
     protected int hashTypeAnnotations(final int original)
     {
         final SymbolToken[] tokens = _annotations == null ? SymbolToken.EMPTY_ARRAY : _annotations;
-        if (tokens.length == 0)
-        {
-            return original;
-        }
-
         // Note: Because the tokens array doubles in size when it grows, tokens.length does not correctly convey
         // the actual number of annotations on the value.
         int count = 0;
@@ -995,6 +990,11 @@ protected int hashTypeAnnotations(final int original)
             count++;
         }
 
+        if (count == 0)
+        {
+            return original;
+        }
+
         int result = valueHashSalt * original + count;
 
         for (int i = 0; i < count; i++)
diff --git a/test/com/amazon/ion/IonValueTest.java b/test/com/amazon/ion/IonValueTest.java
index 303446bc4b..38fdb7f0fe 100644
--- a/test/com/amazon/ion/IonValueTest.java
+++ b/test/com/amazon/ion/IonValueTest.java
@@ -197,6 +197,8 @@ public void testClearTypeAnnotations() {
         IonValue v = system().singleValue("a::b::null");
         v.clearTypeAnnotations();
         assertAnnotations(v);
+
+        IonAssert.assertIonEquals(system().newNull(), v);
     }
 
     @Test
@@ -252,16 +254,20 @@ public void testRemoveTypeAnnotation()
 
         v.removeTypeAnnotation(ann);
         assertAnnotations(v);
+        IonAssert.assertIonEquals(system().newNull(), v);
 
         v = system().singleValue("ann::ben::cam::null");
         v.removeTypeAnnotation(ben);
         assertAnnotations(v, ann, "cam");
+        IonAssert.assertIonEquals(system().singleValue("ann::cam::null"), v);
         v.removeTypeAnnotation(ben);
         assertAnnotations(v, ann, "cam");
         v.removeTypeAnnotation("cam");
         assertAnnotations(v, ann);
+        IonAssert.assertIonEquals(system().singleValue("ann::null"), v);
         v.removeTypeAnnotation(ann);
         assertAnnotations(v);
+        IonAssert.assertIonEquals(system().newNull(), v);
     }
 
     @Test
diff --git a/test/com/amazon/ion/junit/IonAssert.java b/test/com/amazon/ion/junit/IonAssert.java
index 05a3e29d1d..ca824ff8fa 100644
--- a/test/com/amazon/ion/junit/IonAssert.java
+++ b/test/com/amazon/ion/junit/IonAssert.java
@@ -330,7 +330,12 @@ private static void doAssertIonEquals(String path,
                                           IonValue expected,
                                           IonValue actual)
     {
-        if (expected == actual) return;
+        if (expected == actual) {
+            if (expected != null) {
+                assertEquals("IonValues were equal, but have unequal hash codes.", expected.hashCode(), actual.hashCode());
+            }
+            return;
+        }
 
         IonType expectedType = expected.getType();
         assertSame(path + " type", expectedType, actual.getType());

From 4781fdd874b09d131fc01d88af9825ebd4aed12a Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Mon, 18 Sep 2023 14:23:24 -0700
Subject: [PATCH 236/490] Fix NPE in IonRawBinaryWriter (#574)

---
 src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java      | 1 +
 test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 2ec21cc886..e5bda78333 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -586,6 +586,7 @@ public void setTypeAnnotationSymbols(final SymbolToken... annotations)
         {
             for (final SymbolToken annotation : annotations)
             {
+                if (annotation == null) break;
                 addTypeAnnotationSymbol(annotation.getSid());
             }
         }
diff --git a/test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java b/test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
index 7d23e59afc..ddf49e9969 100644
--- a/test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
@@ -425,6 +425,13 @@ public void testSetAnnotations() throws Exception
         assertValue("name::version::'''foobar'''");
     }
 
+    @Test
+    public void testSetTypeAnnotationSymbolsWithNullInArray() throws IOException {
+        writer.setTypeAnnotationSymbols(systemSymbol(NAME_SID), null);
+        writer.writeBool(true);
+        assertValue("name::true");
+    }
+
     @Test
     public void testList() throws Exception
     {

From 470b01975def6b9b9082c9ef62557f698324f94b Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Tue, 19 Sep 2023 11:35:20 -0700
Subject: [PATCH 237/490]  Add an OSSF Scorecard action (#576)

* Add an OSSF Scorecard action

This is the recommended setup for incorporating the OSSF Scorecard action so that we can evaluate what goes into our Sonatype Safety Rating on Maven Central.

See:
* https://github.com/marketplace/actions/ossf-scorecard-action#workflow-setup-required
* https://github.com/amazon-ion/ion-java/issues/575

* Update scorecard.yml

Let's not default to publishing.
---
 .github/workflows/scorecard.yml | 72 +++++++++++++++++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 .github/workflows/scorecard.yml

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
new file mode 100644
index 0000000000..6953405a0e
--- /dev/null
+++ b/.github/workflows/scorecard.yml
@@ -0,0 +1,72 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '43 1 * * 4'
+  push:
+    branches: [ "master" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      # Uncomment the permissions below if installing in a private repository.
+      # contents: read
+      # actions: read
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
+          # - you want to enable the Branch-Protection check on a *public* repository, or
+          # - you are installing Scorecard on a *private* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-pat.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          # For private repositories:
+          #   - `publish_results` will always be set to `false`, regardless
+          #     of the value entered here.
+          publish_results: false
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+        with:
+          sarif_file: results.sarif

From 61c8a6ce4e267f73527e17a69c6f6808423801e8 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Tue, 19 Sep 2023 12:40:54 -0700
Subject: [PATCH 238/490] Add gradle wrapper validation (#577)

* Add gradle wrapper validation

Gradle publishes this workflow to allow validation of gradle wrapper JARs to ensure that they actually are the jars published by Gradle. See: https://github.com/gradle/wrapper-validation-action#add-to-an-existing-workflow

* Update .github/workflows/main.yml

Co-authored-by: Matthew Pope <81593196+popematt@users.noreply.github.com>

---------

Co-authored-by: Matthew Pope <81593196+popematt@users.noreply.github.com>
---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d50a023de5..1ff898f74d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,6 +20,7 @@ jobs:
       - uses: actions/checkout@v2
         with:
           submodules: recursive
+      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
       - name: Use java ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:

From 4d791211c180b653213c6701540b34566beabe28 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Tue, 19 Sep 2023 13:42:47 -0700
Subject: [PATCH 239/490] Prepare 1.10.5 release (#578)

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index f8e1fd93b4..db77e0ee97 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.5-SNAPSHOT
+1.10.5

From 019a6117fb99131f74f92ecf462169613234abbf Mon Sep 17 00:00:00 2001
From: StepSecurity Bot <bot@stepsecurity.io>
Date: Tue, 19 Sep 2023 14:05:12 -0700
Subject: [PATCH 240/490] Apply best practices for workflows (#580)

Signed-off-by: StepSecurity Bot <bot@stepsecurity.io>
---
 .github/dependabot.yml                        |  6 +++++
 .github/workflows/codeql-analysis.yml         | 11 +++++---
 ...n-java-performance-regression-detector.yml | 25 +++++++++++--------
 .github/workflows/ion-test-driver.yml         | 18 ++++++++-----
 .github/workflows/main.yml                    | 12 ++++-----
 .github/workflows/prepare-release.yml         |  4 +--
 .../workflows/publish-release-artifacts.yml   |  9 ++++---
 .../workflows/test-inspect-version-action.yml |  2 +-
 8 files changed, 54 insertions(+), 33 deletions(-)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..253bcb76ba
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2bbcd37d60..0f4b2e1654 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -15,6 +15,9 @@ on:
   schedule:
     - cron: '0 22 * * 3'
 
+permissions:
+  contents: read
+
 jobs:
   analyze:
     name: Analyze
@@ -34,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -49,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -63,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index f90e2f4701..8671351bc2 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -8,6 +8,9 @@ on:
     paths:
       - 'src/*'
 
+permissions:
+  contents: read
+
 jobs:
   detect-regression:
     name: Detect Regression
@@ -15,13 +18,13 @@ jobs:
 
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
         with:
           distribution: 'corretto'
           java-version: 11
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@v3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           path: ion-java-new
@@ -30,7 +33,7 @@ jobs:
         run: cd ion-java-new && git submodule init && git submodule update && ./gradlew clean publishToMavenLocal
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@v3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
@@ -40,7 +43,7 @@ jobs:
         run: cd ion-java-benchmark-cli && mvn clean install
 
       - name: Checkout ion-data-generator
-        uses: actions/checkout@v3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -63,7 +66,7 @@ jobs:
           java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/realWorldDataSchema03.isl testData/realWorldData03.10n
 
       - name: Upload test Ion Data to artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
         with:
           name: test Ion Data
           path: testData
@@ -74,7 +77,7 @@ jobs:
           cd ion-java-benchmark-cli && java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar run-suite --test-ion-data /home/runner/work/ion-java/ion-java/testData --benchmark-options-combinations tst/com/amazon/ion/benchmark/optionsCombinations.ion /home/runner/work/ion-java/ion-java/benchmarkResults
 
       - name: Upload benchmark results to artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
         with:
           name: Benchmark result
           path: benchmarkResults
@@ -83,7 +86,7 @@ jobs:
         run : rm -r /home/runner/.m2
 
       - name: Checkout the current commit
-        uses: actions/checkout@v3
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           repository: amazon-ion/ion-java
           ref: master
@@ -104,13 +107,13 @@ jobs:
           mkdir -p testData
 
       - name: Download test Ion Data from artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@cbed621e49e4c01b044d60f6c80ea4ed6328b281 # v2.1.1
         with:
           name: test Ion Data
           path: testData
 
       - name: Download benchmark results of ion-java from the new commit from artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@cbed621e49e4c01b044d60f6c80ea4ed6328b281 # v2.1.1
         with:
           name: Benchmark result
           path: benchmarkResults
@@ -119,7 +122,7 @@ jobs:
         run: cd ion-java-benchmark-cli && java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar run-suite --test-ion-data /home/runner/work/ion-java/ion-java/testData --benchmark-options-combinations tst/com/amazon/ion/benchmark/optionsCombinations.ion /home/runner/work/ion-java/ion-java/benchmarkResults
 
       - name: Upload new benchmark results directory to artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
         with:
           name: Benchmark result
           path: benchmarkResults
@@ -133,7 +136,7 @@ jobs:
           if [ "$result" = "true" ]; then echo "No regression detected!" >> $GITHUB_STEP_SUMMARY; fi
 
       - name: Upload comparison reports to the benchmark results directory
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
         with:
           name: Benchmark result
           path: benchmarkResults
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index ef3e7d8ff5..2a69dd6cc3 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -5,19 +5,22 @@ on:
     paths:
       - 'src/*'
 
+permissions:
+  contents: read
+
 jobs:
   ion-test-driver:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@master
+        uses: actions/checkout@61b9e3751b92087fd0b06925ba6dd6314e06f089 # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@master
+        uses: actions/checkout@61b9e3751b92087fd0b06925ba6dd6314e06f089 # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -42,7 +45,7 @@ jobs:
           --replace ion-java,https://github.com/amazon-ion/ion-java.git,$main
 
       - name: Upload result
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
         with:
           name: ion-test-driver-result.ion
           path: output/results/ion-test-driver-results.ion
@@ -57,7 +60,7 @@ jobs:
           ion-java,$main ion-java,$cur output/results/ion-test-driver-results.ion
 
       - name: Upload analysis report
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
         with:
           name: analysis-report.ion
           path: result.ion
@@ -70,13 +73,16 @@ jobs:
         run: echo 'Implementation behavior changed, Refer to the analysis report in the previous step for the reason.' && exit 1
 
   open-issue:
+    permissions:
+      contents: read  # for JasonEtco/create-an-issue to read template files
+      issues: write  # for JasonEtco/create-an-issue to create new issues
     runs-on: ubuntu-latest
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@61b9e3751b92087fd0b06925ba6dd6314e06f089 # master
       - name: Open an issue
-        uses: JasonEtco/create-an-issue@v2
+        uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_WORKFLOW_URL: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1ff898f74d..95e5ce74d4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,24 +17,24 @@ jobs:
             upload_reports: true
           - java: 17
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
         with:
           submodules: recursive
       - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
       - name: Use java ${{ matrix.java }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
         with:
           arguments: build
       - run: ./ion-test-driver-run version
       - if: ${{ matrix.upload_reports }}
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: spotbugs-report
           path: build/reports/spotbugs/
@@ -46,7 +46,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index ae915348b8..71c5b93aa4 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -43,7 +43,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -64,7 +64,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 1d5a52fad9..b55e48c39a 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -21,12 +21,15 @@ on:
   release:
     types: [published]
 
+permissions:
+  contents: read
+
 jobs:
   check-tag:
     # First, a sanity check to ensure that the library version matches the release version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
       - name: Validate project version matches tag
         shell: bash
         run: |
@@ -45,10 +48,10 @@ jobs:
     steps:
         # TODO: replace with artifact upload/download -- make sure there's no race condition with other builds also
         # uploading an artifact.
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           submodules: recursive
-      - uses: gradle/gradle-build-action@v2
+      - uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
         with:
           arguments: build cyclonedxBom
       - name: Upload Jar to GitHub release
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index e7d5bf4bcf..ed223dfdb6 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -52,7 +52,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From 388e890e82a89b550c9e43fae9ca95f6544bfb14 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Wed, 20 Sep 2023 13:08:13 -0700
Subject: [PATCH 241/490] Bumps version to 1.10.6-SNAPSHOT (#579)

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index db77e0ee97..9615c5d05b 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.5
+1.10.6-SNAPSHOT

From 9d72f83fd9273eaa09a143666b79e417c7eaf117 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Thu, 21 Sep 2023 08:49:52 -0700
Subject: [PATCH 242/490] Add top-level permissions to more workflows (#589)

---
 .github/workflows/main.yml                        | 1 +
 .github/workflows/prepare-release.yml             | 1 +
 .github/workflows/test-inspect-version-action.yml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 95e5ce74d4..e658b3a9c0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,4 +1,5 @@
 name: build
+permissions: read-all
 
 on:
   push:
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 71c5b93aa4..b32d50a98f 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -24,6 +24,7 @@
 # See https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
 
 name: Prepare Release
+permissions: read-all
 on:
   # We have a branch protection rule for master, so all commits to master require
   # an approved PR. That means this workflow trigger is effectively equivalent to
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index ed223dfdb6..33e0ed428d 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -1,6 +1,7 @@
 # Test cases for the 'inspect-version' action
 
 name: Test 'inspect-version' Action
+permissions: read-all
 
 on:
   pull_request:

From fb50a6f7a0f39a541c12edd3bac4330fa5816cbe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 11:17:38 -0700
Subject: [PATCH 243/490] Bump ossf/scorecard-action from 2.1.2 to 2.2.0 (#581)

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.1.2 to 2.2.0.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/e38b1902ae4f44df626f11ba0734b14fb91f8f86...08b4669551908b1024bb425080c797723083c031)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6953405a0e..bc039a6a14 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -37,7 +37,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # v2.1.2
+        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
         with:
           results_file: results.sarif
           results_format: sarif

From 687e28255940c73966cd7c775be02e3825da0baf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 12:07:22 -0700
Subject: [PATCH 244/490] Bump github/codeql-action from 2.2.4 to 2.21.8 (#582)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.2.4 to 2.21.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2.2.4...6a28655e3dcb49cb0840ea372fd6d17733edd8a4)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index bc039a6a14..e8bd11630f 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+        uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
         with:
           sarif_file: results.sarif

From 48a966c14bcec6e73368e34ca80109dc60b24e86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 15:29:52 -0700
Subject: [PATCH 245/490] Bump actions/upload-artifact from 2.3.1 to 3.1.3
 (#583)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2.3.1 to 3.1.3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v2.3.1...a8a3f3ad30e3422c9c7b888a15615d19a852ae32)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
---
 .../ion-java-performance-regression-detector.yml          | 8 ++++----
 .github/workflows/ion-test-driver.yml                     | 4 ++--
 .github/workflows/scorecard.yml                           | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 8671351bc2..74d392ab07 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -66,7 +66,7 @@ jobs:
           java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/realWorldDataSchema03.isl testData/realWorldData03.10n
 
       - name: Upload test Ion Data to artifacts
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: test Ion Data
           path: testData
@@ -77,7 +77,7 @@ jobs:
           cd ion-java-benchmark-cli && java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar run-suite --test-ion-data /home/runner/work/ion-java/ion-java/testData --benchmark-options-combinations tst/com/amazon/ion/benchmark/optionsCombinations.ion /home/runner/work/ion-java/ion-java/benchmarkResults
 
       - name: Upload benchmark results to artifacts
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: Benchmark result
           path: benchmarkResults
@@ -122,7 +122,7 @@ jobs:
         run: cd ion-java-benchmark-cli && java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar run-suite --test-ion-data /home/runner/work/ion-java/ion-java/testData --benchmark-options-combinations tst/com/amazon/ion/benchmark/optionsCombinations.ion /home/runner/work/ion-java/ion-java/benchmarkResults
 
       - name: Upload new benchmark results directory to artifacts
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: Benchmark result
           path: benchmarkResults
@@ -136,7 +136,7 @@ jobs:
           if [ "$result" = "true" ]; then echo "No regression detected!" >> $GITHUB_STEP_SUMMARY; fi
 
       - name: Upload comparison reports to the benchmark results directory
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: Benchmark result
           path: benchmarkResults
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 2a69dd6cc3..b42a72e7c7 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -45,7 +45,7 @@ jobs:
           --replace ion-java,https://github.com/amazon-ion/ion-java.git,$main
 
       - name: Upload result
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: ion-test-driver-result.ion
           path: output/results/ion-test-driver-results.ion
@@ -60,7 +60,7 @@ jobs:
           ion-java,$main ion-java,$cur output/results/ion-test-driver-results.ion
 
       - name: Upload analysis report
-        uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2 # v2.3.1
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
         with:
           name: analysis-report.ion
           path: result.ion
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index e8bd11630f..4dbac013c0 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # v3.1.0
+        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.0
         with:
           name: SARIF file
           path: results.sarif

From c0728bc3a383d35fd8372632062e1bf1041a584c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 15:37:40 -0700
Subject: [PATCH 246/490] Bump actions/checkout from 2.7.0 to 4.0.0 (#584)

Bumps [actions/checkout](https://github.com/actions/checkout) from 2.7.0 to 4.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.7.0...3df4ab11eba7bda6032a0b82a6bb43b11571feac)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml                     | 2 +-
 .../ion-java-performance-regression-detector.yml          | 8 ++++----
 .github/workflows/ion-test-driver.yml                     | 6 +++---
 .github/workflows/main.yml                                | 4 ++--
 .github/workflows/prepare-release.yml                     | 4 ++--
 .github/workflows/publish-release-artifacts.yml           | 4 ++--
 .github/workflows/scorecard.yml                           | 2 +-
 .github/workflows/test-inspect-version-action.yml         | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 0f4b2e1654..97357bbfdc 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 74d392ab07..9041e3c635 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -24,7 +24,7 @@ jobs:
           java-version: 11
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           path: ion-java-new
@@ -33,7 +33,7 @@ jobs:
         run: cd ion-java-new && git submodule init && git submodule update && ./gradlew clean publishToMavenLocal
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
@@ -43,7 +43,7 @@ jobs:
         run: cd ion-java-benchmark-cli && mvn clean install
 
       - name: Checkout ion-data-generator
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -86,7 +86,7 @@ jobs:
         run : rm -r /home/runner/.m2
 
       - name: Checkout the current commit
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
         with:
           repository: amazon-ion/ion-java
           ref: master
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index b42a72e7c7..5ff4420ccc 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@61b9e3751b92087fd0b06925ba6dd6314e06f089 # master
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@61b9e3751b92087fd0b06925ba6dd6314e06f089 # master
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -80,7 +80,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@61b9e3751b92087fd0b06925ba6dd6314e06f089 # master
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e658b3a9c0..d07c23182f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
             upload_reports: true
           - java: 17
     steps:
-      - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
         with:
           submodules: recursive
       - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
@@ -47,7 +47,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index b32d50a98f..4e05439966 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index b55e48c39a..8832cd29b7 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -29,7 +29,7 @@ jobs:
     # First, a sanity check to ensure that the library version matches the release version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
       - name: Validate project version matches tag
         shell: bash
         run: |
@@ -48,7 +48,7 @@ jobs:
     steps:
         # TODO: replace with artifact upload/download -- make sure there's no race condition with other builds also
         # uploading an artifact.
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
         with:
           submodules: recursive
       - uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 4dbac013c0..08fda6963d 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.1.0
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index 33e0ed428d..378c088fb6 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From d8ff6a8883cce91d5fb5cf59ee091aa09c9e2195 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Sep 2023 15:54:18 -0700
Subject: [PATCH 247/490] Bump actions/download-artifact from 2.1.1 to 3.0.2
 (#585)

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2.1.1 to 3.0.2.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/cbed621e49e4c01b044d60f6c80ea4ed6328b281...9bc31d5ccc31df68ecc42ccf4149144866c47d8a)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../workflows/ion-java-performance-regression-detector.yml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 9041e3c635..25fd02d353 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -107,13 +107,13 @@ jobs:
           mkdir -p testData
 
       - name: Download test Ion Data from artifacts
-        uses: actions/download-artifact@cbed621e49e4c01b044d60f6c80ea4ed6328b281 # v2.1.1
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
         with:
           name: test Ion Data
           path: testData
 
       - name: Download benchmark results of ion-java from the new commit from artifacts
-        uses: actions/download-artifact@cbed621e49e4c01b044d60f6c80ea4ed6328b281 # v2.1.1
+        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
         with:
           name: Benchmark result
           path: benchmarkResults

From 11e5c7d326c5dac5078d10b41b5192b1af55fdbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Sep 2023 10:54:22 -0700
Subject: [PATCH 248/490] Bump actions/setup-java from 3.12.0 to 3.13.0 (#593)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.12.0 to 3.13.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/cd89f46ac9d01407894225f350157564c9c7cee2...0ab4596768b603586c0de567f2430c30f5b0d2b0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ion-java-performance-regression-detector.yml | 2 +-
 .github/workflows/main.yml                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 25fd02d353..4de76d1bd5 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
         with:
           distribution: 'corretto'
           java-version: 11
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d07c23182f..b4659fc631 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
           submodules: recursive
       - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
       - name: Use java ${{ matrix.java }}
-        uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}

From 13cdd9e93bd498a5f45c86c089c65ae6a351d50e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 09:52:48 -0700
Subject: [PATCH 249/490] Bump gradle/gradle-build-action from 2.8.0 to 2.8.1
 (#597)

Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.8.0 to 2.8.1.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc...b5126f31dbc19dd434c3269bf8c28c315e121da2)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/main.yml                      | 2 +-
 .github/workflows/publish-release-artifacts.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b4659fc631..4b31744299 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
-      - uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
+      - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2.8.1
         with:
           arguments: build
       - run: ./ion-test-driver-run version
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 8832cd29b7..d33f311f9a 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
         with:
           submodules: recursive
-      - uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc # v2.8.0
+      - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2.8.1
         with:
           arguments: build cyclonedxBom
       - name: Upload Jar to GitHub release

From 760014108a64a581cd2e6bac9bd7c4a0f3a54108 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 11:56:54 -0700
Subject: [PATCH 250/490] Bump github/codeql-action from 2.21.8 to 2.21.9
 (#598)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.21.8 to 2.21.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/6a28655e3dcb49cb0840ea372fd6d17733edd8a4...ddccb873888234080b77e9bc2d4764d5ccaaccf9)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 97357bbfdc..3d2b16f765 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
+        uses: github/codeql-action/init@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
+        uses: github/codeql-action/autobuild@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
+        uses: github/codeql-action/analyze@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 08fda6963d..a5406fbf5d 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
+        uses: github/codeql-action/upload-sarif@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
         with:
           sarif_file: results.sarif

From f0329768d8235a548a0affbefbd70d8711cf7c0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 10:35:35 -0700
Subject: [PATCH 251/490] Bump gradle/gradle-build-action from 2.8.1 to 2.9.0
 (#599)

Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.8.1 to 2.9.0.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/b5126f31dbc19dd434c3269bf8c28c315e121da2...842c587ad8aa4c68eeba24c396e15af4c2e9f30a)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/main.yml                      | 2 +-
 .github/workflows/publish-release-artifacts.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4b31744299..3d09b6240d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -27,7 +27,7 @@ jobs:
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
-      - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2.8.1
+      - uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
         with:
           arguments: build
       - run: ./ion-test-driver-run version
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index d33f311f9a..94af18b133 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
         with:
           submodules: recursive
-      - uses: gradle/gradle-build-action@b5126f31dbc19dd434c3269bf8c28c315e121da2 # v2.8.1
+      - uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
         with:
           arguments: build cyclonedxBom
       - name: Upload Jar to GitHub release

From 1839790e5a699adce4584b3b871be78f45462392 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 11:28:56 -0700
Subject: [PATCH 252/490] Bump github/codeql-action from 2.21.9 to 2.22.0
 (#600)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.21.9 to 2.22.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/ddccb873888234080b77e9bc2d4764d5ccaaccf9...2cb752a87e96af96708ab57187ab6372ee1973ab)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3d2b16f765..915ba6a602 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
+        uses: github/codeql-action/init@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
+        uses: github/codeql-action/autobuild@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
+        uses: github/codeql-action/analyze@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a5406fbf5d..a8cdf86539 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
+        uses: github/codeql-action/upload-sarif@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
         with:
           sarif_file: results.sarif

From 0e954be15fd1be9fd8aedbe45bcbf83d2cb99a52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 10:18:06 -0700
Subject: [PATCH 253/490] Bump ossf/scorecard-action from 2.2.0 to 2.3.0 (#601)

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.2.0 to 2.3.0.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/08b4669551908b1024bb425080c797723083c031...483ef80eb98fb506c348f7d62e28055e49fe2398)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a8cdf86539..c693d564b7 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -37,7 +37,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
+        uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0
         with:
           results_file: results.sarif
           results_format: sarif

From b10ab2f93ac3388987fa5c717391c985094a44ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 10:32:23 -0700
Subject: [PATCH 254/490] Bump github/codeql-action from 2.22.0 to 2.22.1
 (#602)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.0 to 2.22.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/2cb752a87e96af96708ab57187ab6372ee1973ab...fdcae64e1484d349b3366718cdfef3d404390e85)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 915ba6a602..950a8a4d67 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
+        uses: github/codeql-action/init@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
+        uses: github/codeql-action/autobuild@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
+        uses: github/codeql-action/analyze@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c693d564b7..9b75f932ca 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
+        uses: github/codeql-action/upload-sarif@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1
         with:
           sarif_file: results.sarif

From 0f9135a96cc547809c6dbfa78e1266c116867cee Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Thu, 12 Oct 2023 11:16:36 -0700
Subject: [PATCH 255/490] Optimize ion-java-regression-detection workflow to
 improve the accuracy. (#603)

---
 ...n-java-performance-regression-detector.yml | 174 ++++++++----------
 1 file changed, 72 insertions(+), 102 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 4de76d1bd5..be2b035c18 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -11,140 +11,110 @@ on:
 permissions:
   contents: read
 
+env:
+  data_size: '50000'
+  test_data_id: 'generated-test-data'
+
 jobs:
-  detect-regression:
-    name: Detect Regression
+  generate-test-data:
+    name: Generate Test Data
     runs-on: ubuntu-latest
-
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
-        with:
-          distribution: 'corretto'
-          java-version: 11
-
-      - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
-          path: ion-java-new
-
-      - name: Build ion-java from the new commit
-        run: cd ion-java-new && git submodule init && git submodule update && ./gradlew clean publishToMavenLocal
-
-      - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
-        with:
-          repository: amazon-ion/ion-java-benchmark-cli
-          ref: master
-          path: ion-java-benchmark-cli
-
-      - name: Build ion-java-benchmark-cli
-        run: cd ion-java-benchmark-cli && mvn clean install
-
       - name: Checkout ion-data-generator
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
-          path: ion-data-generator
 
       - name: Build ion-data-generator
-        run: cd ion-data-generator && mvn clean install
+        run: mvn clean install
 
-      - name: Check the version of ion-java.
-        run: java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar --version
-
-      - name: Generate test Ion Data
+      - name: Generate test data
+        env:
+          jar_file: target/ion-data-generator-1.0-SNAPSHOT.jar
+          schema_dir: tst/com/amazon/ion/workflow
         run: |
           mkdir -p testData
-          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/nestedStruct.isl testData/testStructs.10n
-          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/nestedList.isl testData/testLists.10n
-          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/sexp.isl testData/testSexps.10n
-          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/realWorldDataSchema01.isl testData/realWorldData01.10n
-          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/realWorldDataSchema02.isl testData/realWorldData02.10n
-          java -jar ion-data-generator/target/ion-data-generator-1.0-SNAPSHOT.jar  generate -S 50000 --input-ion-schema ion-data-generator/tst/com/amazon/ion/workflow/realWorldDataSchema03.isl testData/realWorldData03.10n
+          for test in nestedStruct nestedList sexp realWorldDataSchema01 realWorldDataSchema02 realWorldDataSchema03
+          do
+          java -jar $jar_file generate -S ${{env.data_size}} --input-ion-schema $schema_dir/${test}.isl testData/${test}.10n
+          done
 
       - name: Upload test Ion Data to artifacts
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@v3
         with:
-          name: test Ion Data
+          name: ${{env.test_data_id}}
           path: testData
 
-      - name: Benchmark ion-java from the new commit
-        run: |
-          mkdir -p benchmarkResults
-          cd ion-java-benchmark-cli && java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar run-suite --test-ion-data /home/runner/work/ion-java/ion-java/testData --benchmark-options-combinations tst/com/amazon/ion/benchmark/optionsCombinations.ion /home/runner/work/ion-java/ion-java/benchmarkResults
+  detect-regression:
+    name: Detect Regression
+    runs-on: ubuntu-latest
+    needs: generate-test-data
+    strategy:
+      matrix:
+        test-data: ['nestedStruct', 'nestedList', 'sexp', 'realWorldDataSchema01', 'realWorldDataSchema02', 'realWorldDataSchema03']
+        usage-patterns: [' read --mode AverageTime --forks 3 --warmups 2 --iterations 10 --api streaming ',' read --mode AverageTime --forks 3 --warmups 2 --iterations 10 --api dom ', ' write --mode AverageTime --forks 3 --warmups 2 --iterations 10 --api streaming --io-type buffer --ion-length-preallocation 1 ', ' write --mode AverageTime --forks 3 --warmups 2 --iterations 10 --api dom --io-type buffer --ion-length-preallocation 1 ']
+      fail-fast: false
 
-      - name: Upload benchmark results to artifacts
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+    steps:
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
         with:
-          name: Benchmark result
-          path: benchmarkResults
-
-      - name: Clean maven dependencies repository
-        run : rm -r /home/runner/.m2
+          distribution: 'corretto'
+          java-version: 11
 
-      - name: Checkout the current commit
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
+      - name: Checkout ion-java-benchmark-cli
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
         with:
-          repository: amazon-ion/ion-java
+          repository: amazon-ion/ion-java-benchmark-cli
           ref: master
-          path: ion-java
-
-      - name: Build ion-java from the previous commit
-        run: cd ion-java && git submodule init && git submodule update && ./gradlew clean publishToMavenLocal
-
-      - name: Build ion-java-benchmark-cli
-        run: cd ion-java-benchmark-cli && mvn clean install
+          path: ion-java-benchmark-cli
 
-      - name: Check the version of ion-java
-        run: java -jar ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar --version
+      - name: Checkout ion-java from the previous commit
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        with:
+          ref: ${{ github.base_ref }}
+          path: baseline
 
-      - name: Create directories for test data and benchmark results
-        run: |
-          mkdir -p benchmarkResults
-          mkdir -p testData
+      - name: Checkout ion-java from the new commit.
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        with:
+          ref: ${{ github.head_ref }}
+          path: new
 
       - name: Download test Ion Data from artifacts
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: actions/download-artifact@v3
         with:
-          name: test Ion Data
+          name: generated-test-data
           path: testData
 
-      - name: Download benchmark results of ion-java from the new commit from artifacts
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: Benchmark result
-          path: benchmarkResults
-
-      - name: Benchmark ion-java from the previous commit and add the generated benchmark results to the existing directories
-        run: cd ion-java-benchmark-cli && java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar run-suite --test-ion-data /home/runner/work/ion-java/ion-java/testData --benchmark-options-combinations tst/com/amazon/ion/benchmark/optionsCombinations.ion /home/runner/work/ion-java/ion-java/benchmarkResults
+      # Get the benchmark results from the base commit
+      - name: Build ion-java from the base commit
+        working-directory: baseline
+        run: |
+          git submodule init && git submodule update && ./gradlew clean publishToMavenLocal
 
-      - name: Upload new benchmark results directory to artifacts
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
-        with:
-          name: Benchmark result
-          path: benchmarkResults
+      - name: Benchmark ion-java from the base commit
+        working-directory: ion-java-benchmark-cli
+        run: |
+          mvn clean install
+          mkdir /home/runner/work/ion-java/ion-java/benchmarkresults
+          java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar ${{matrix.usage-patterns}} -r ion -o /home/runner/work/ion-java/ion-java/benchmarkresults/before.ion /home/runner/work/ion-java/ion-java/testData/${{matrix.test-data}}.10n 
 
-      - name: Detect performance regression
-        id: regression_result
+      - name: Build ion-java from the new commit
+        working-directory: new
         run: |
-          result=true
-          cd benchmarkResults && for FILE in *; do message=$(java -jar /home/runner/work/ion-java/ion-java/ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar compare --benchmark-result-previous $FILE/previous.ion --benchmark-result-new $FILE/new.ion $FILE/report.ion | tee /dev/stderr) && if [ "$message" != "no regression detected" ]; then result=false; fi; done
-          echo "::set-output name=regression-result::$result"
-          if [ "$result" = "true" ]; then echo "No regression detected!" >> $GITHUB_STEP_SUMMARY; fi
+          git submodule init && git submodule update && ./gradlew clean publishToMavenLocal
 
-      - name: Upload comparison reports to the benchmark results directory
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
-        with:
-          name: Benchmark result
-          path: benchmarkResults
+      - name: Benchmark ion-java from the new commit
+        working-directory: ion-java-benchmark-cli
+        run: |
+          mvn clean install
+          java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar ${{matrix.usage-patterns}} -r ion -o /home/runner/work/ion-java/ion-java/benchmarkresults/after.ion /home/runner/work/ion-java/ion-java/testData/${{matrix.test-data}}.10n
 
-      - name: Fail the workflow if regression happened
-        env:
-          regression_detect: ${{steps.regression_result.outputs.regression-result}}
-        if: ${{ env.regression_detect == 'false' }}
+      #Detect regression
+      - name: Detect regression
+        working-directory: ion-java-benchmark-cli
         run: |
-          cd benchmarkResults && echo "| Benchmark command | GC Allocation Rate | Heap Usage | Speed |" >> $GITHUB_STEP_SUMMARY && echo "| ----------- | ----------- |----------- | ----------- |" >> $GITHUB_STEP_SUMMARY && for FILE in *; do regressionDetection=$(java -jar /home/runner/work/ion-java/ion-java/ion-java-benchmark-cli/target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar compare --benchmark-result-previous $FILE/previous.ion --benchmark-result-new $FILE/new.ion $FILE/report.ion) && if [ "$regressionDetection" != "no regression detected" ]; then command=$(echo $FILE | sed "s/_/ /g") && read gc heapUsage speed <<< $( echo ${regressionDetection} | awk -F", " '{print $1" "$2" "$3}' ) && echo "|$command|$gc|$heapUsage|$speed|" >> $GITHUB_STEP_SUMMARY; fi; done
-          exit 1
\ No newline at end of file
+          a=$(java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar compare --benchmark-result-previous /home/runner/work/ion-java/ion-java/benchmarkresults/before.ion --benchmark-result-new /home/runner/work/ion-java/ion-java/benchmarkresults/after.ion)
+          if [ ! -z "$a" ]; then echo "${a}" >> $GITHUB_STEP_SUMMARY; exit 1; fi

From 3802e57b159a0569a80b45dd60e7f4b4e47eccec Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Mon, 16 Oct 2023 11:28:42 -0700
Subject: [PATCH 256/490] Adds support for FlexInt and FlexUInt in WriteBuffer
 (#609)

---
 src/com/amazon/ion/impl/bin/WriteBuffer.java  |  87 ++++++++++++
 .../amazon/ion/impl/bin/WriteBufferTest.java  | 125 ++++++++++++++++++
 2 files changed, 212 insertions(+)

diff --git a/src/com/amazon/ion/impl/bin/WriteBuffer.java b/src/com/amazon/ion/impl/bin/WriteBuffer.java
index 868fcb5171..f136b3e077 100644
--- a/src/com/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/com/amazon/ion/impl/bin/WriteBuffer.java
@@ -1272,6 +1272,93 @@ public void writeUInt8At(final long position, final long value)
         block.data[offset] = (byte) value;
     }
 
+    /** Get the length of FlexInt for the provided value. */
+    public static int flexIntLength(final long value) {
+        int numMagnitudeBitsRequired;
+        if (value < 0) {
+            int numLeadingOnes = Long.numberOfLeadingZeros(~value);
+            numMagnitudeBitsRequired = 64 - numLeadingOnes;
+        } else {
+            int numLeadingZeros = Long.numberOfLeadingZeros(value);
+            numMagnitudeBitsRequired = 64 - numLeadingZeros;
+        }
+        return numMagnitudeBitsRequired / 7 + 1;
+    }
+
+    /** Writes a FlexInt to this WriteBuffer, returning the number of bytes that were needed to encode the value */
+    public int writeFlexInt(final long value) {
+        int numBytes = flexIntLength(value);
+        return writeFlexIntOrUInt(value, numBytes);
+    }
+
+    /** Get the length of FlexUInt for the provided value. */
+    public static int flexUIntLength(final long value) {
+        int numLeadingZeros = Long.numberOfLeadingZeros(value);
+        int numMagnitudeBitsRequired = 64 - numLeadingZeros;
+        return (numMagnitudeBitsRequired - 1) / 7 + 1;
+    }
+
+    /** Writes a FlexUInt to this WriteBuffer, returning the number of bytes that were needed to encode the value */
+    public int writeFlexUInt(final long value) {
+        if (value < 0) {
+            throw new IllegalArgumentException("Attempted to write a FlexUInt for " + value);
+        }
+        int numBytes = flexUIntLength(value);
+        return writeFlexIntOrUInt(value, numBytes);
+    }
+
+    /**
+     * Because the flex int and flex uint encodings are so similar, we can use this method to write either one as long
+     * as we provide the correct number of bytes needed to encode the value.
+     */
+    private int writeFlexIntOrUInt(final long value, final int numBytes) {
+        if (numBytes == 1) {
+            writeByte((byte) (0x01 | (byte)(value << 1)));
+        } else if (numBytes == 2) {
+            writeByte((byte) (0x02 | (byte)(value << 2)));
+            writeByte((byte) (value >> 6));
+        } else if (numBytes == 3) {
+            writeByte((byte) (0x04 | (byte)(value << 3)));
+            writeByte((byte) (value >> 5));
+            writeByte((byte) (value >> 13));
+        } else if (numBytes == 4) {
+            writeByte((byte) (0x08 | (byte)(value << 4)));
+            writeByte((byte) (value >> 4));
+            writeByte((byte) (value >> 12));
+            writeByte((byte) (value >> 20));
+        } else {
+            // Finally, fall back to a loop based approach.
+
+            int i = 0; // `i` gets incremented for every byte written.
+
+            // Start with leading zero bytes.
+            // If there's 1-8 total bytes, we need no leading zero-bytes.
+            // If there's 9-16 total bytes, we need one zero-byte
+            // If there's 17-24 total bytes, we need two zero-bytes, etc.
+            for (; i < (numBytes - 1)/8; i++) {
+                writeByte((byte) 0);
+            }
+
+            // Write the last length bits, possibly also containing some value bits.
+            int remainingLengthBits = (numBytes - 1) % 8;
+            byte lengthPart = (byte) (0x01 << remainingLengthBits);
+
+            int valueBitOffset = remainingLengthBits + 1;
+            byte valuePart = (byte) (value << valueBitOffset);
+
+            writeByte((byte) (valuePart | lengthPart));
+            i++;
+
+            int valueByteOffset = 1;
+            for (; i < numBytes; i++) {
+                writeByte((byte) (value >> (8 * valueByteOffset - valueBitOffset)));
+                valueByteOffset++;
+            }
+
+        }
+        return numBytes;
+    }
+
     /** Write the entire buffer to output stream. */
     public void writeTo(final OutputStream out) throws IOException
     {
diff --git a/test/com/amazon/ion/impl/bin/WriteBufferTest.java b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
index 43f054f85e..bd0c203a42 100644
--- a/test/com/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
@@ -28,6 +28,10 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 
 public class WriteBufferTest
 {
@@ -39,6 +43,7 @@ public class WriteBufferTest
     private ByteArrayOutputStream out;
 
     @Before
+    @BeforeEach
     public void setup()
     {
         buf = new WriteBuffer(ALLOCATOR);
@@ -1300,4 +1305,124 @@ public void testVarUIntLength9() {
         int length = varUIntLength(0x7FFFFFFFFFFFFFFCL);
         assertEquals(9, length);
     }
+
+    @ParameterizedTest
+    @CsvSource({
+            "                   0, 00000001",
+            "                   1, 00000011",
+            "                   2, 00000101",
+            "                   3, 00000111",
+            "                   4, 00001001",
+            "                   5, 00001011",
+            "                  14, 00011101",
+            "                  63, 01111111",
+            "                  64, 00000010 00000001",
+            "                 729, 01100110 00001011",
+            "                8191, 11111110 01111111",
+            "                8192, 00000100 00000000 00000001",
+            "             1048575, 11111100 11111111 01111111",
+            "             1048576, 00001000 00000000 00000000 00000001",
+            "           134217727, 11111000 11111111 11111111 01111111",
+            "           134217728, 00010000 00000000 00000000 00000000 00000001",
+            "         17179869184, 00100000 00000000 00000000 00000000 00000000 00000001",
+            "       2199023255552, 01000000 00000000 00000000 00000000 00000000 00000000 00000001",
+            "     281474976710655, 11000000 11111111 11111111 11111111 11111111 11111111 01111111",
+            "     281474976710656, 10000000 00000000 00000000 00000000 00000000 00000000 00000000 00000001",
+            "   36028797018963967, 10000000 11111111 11111111 11111111 11111111 11111111 11111111 01111111",
+            "   36028797018963968, 00000000 00000001 00000000 00000000 00000000 00000000 00000000 00000000 00000001",
+            " 4611686018427387903, 00000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111 01111111",
+            " 4611686018427387904, 00000000 00000010 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000001",
+            // Long.MAX_VALUE
+            " 9223372036854775807, 00000000 11111110 11111111 11111111 11111111 11111111 11111111 11111111 11111111 00000001",
+            "                  -1, 11111111",
+            "                  -2, 11111101",
+            "                  -3, 11111011",
+            "                 -14, 11100101",
+            "                 -64, 10000001",
+            "                 -65, 11111110 11111110",
+            "                -729, 10011110 11110100",
+            "               -8192, 00000010 10000000",
+            "               -8193, 11111100 11111111 11111110",
+            "            -1048576, 00000100 00000000 10000000",
+            "            -1048577, 11111000 11111111 11111111 11111110",
+            "          -134217728, 00001000 00000000 00000000 10000000",
+            "          -134217729, 11110000 11111111 11111111 11111111 11111110",
+            "        -17179869184, 00010000 00000000 00000000 00000000 10000000",
+            "        -17179869185, 11100000 11111111 11111111 11111111 11111111 11111110",
+            "    -281474976710656, 01000000 00000000 00000000 00000000 00000000 00000000 10000000",
+            "    -281474976710657, 10000000 11111111 11111111 11111111 11111111 11111111 11111111 11111110",
+            "  -36028797018963968, 10000000 00000000 00000000 00000000 00000000 00000000 00000000 10000000",
+            "  -36028797018963969, 00000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111110",
+            "-4611686018427387904, 00000000 00000001 00000000 00000000 00000000 00000000 00000000 00000000 10000000",
+            "-4611686018427387905, 00000000 11111110 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111110",
+            // Long.MIN_VALUE
+            "-9223372036854775808, 00000000 00000010 00000000 00000000 00000000 00000000 00000000 00000000 00000000 11111110",
+
+    })
+    public void testWriteFlexInt(long value, String expectedBits) {
+        int numBytes = buf.writeFlexInt(value);
+        String actualBits = byteArrayToBitString(bytes());
+        Assertions.assertEquals(expectedBits, actualBits);
+        Assertions.assertEquals((expectedBits.length() + 1)/9, numBytes);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "                 0, 00000001",
+            "                 1, 00000011",
+            "                 2, 00000101",
+            "                 3, 00000111",
+            "                 4, 00001001",
+            "                 5, 00001011",
+            "                14, 00011101",
+            "                63, 01111111",
+            "                64, 10000001",
+            "               127, 11111111",
+            "               128, 00000010 00000010",
+            "               729, 01100110 00001011",
+            "             16383, 11111110 11111111",
+            "             16384, 00000100 00000000 00000010",
+            "           2097151, 11111100 11111111 11111111",
+            "           2097152, 00001000 00000000 00000000 00000010",
+            "         268435455, 11111000 11111111 11111111 11111111",
+            "         268435456, 00010000 00000000 00000000 00000000 00000010",
+            "       34359738368, 00100000 00000000 00000000 00000000 00000000 00000010",
+            "     4398046511104, 01000000 00000000 00000000 00000000 00000000 00000000 00000010",
+            "   562949953421311, 11000000 11111111 11111111 11111111 11111111 11111111 11111111",
+            "   562949953421312, 10000000 00000000 00000000 00000000 00000000 00000000 00000000 00000010",
+            " 72057594037927935, 10000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111",
+            " 72057594037927936, 00000000 00000001 00000000 00000000 00000000 00000000 00000000 00000000 00000010",
+            // Long.MAX_VALUE
+            "9223372036854775807, 00000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111",
+    })
+    public void testWriteFlexUInt(long value, String expectedBits) {
+        int numBytes = buf.writeFlexUInt(value);
+        String actualBits = byteArrayToBitString(bytes());
+        Assertions.assertEquals(expectedBits, actualBits);
+        Assertions.assertEquals((expectedBits.length() + 1)/9, numBytes);
+    }
+
+    @Test
+    public void testWriteFlexUIntForNegativeNumber() {
+        Assertions.assertThrows(IllegalArgumentException.class, () -> buf.writeFlexUInt(-1));
+    }
+
+    /**
+     * Converts a byte array to a string of bits, such as "00110110 10001001".
+     * The purpose of this method is to make it easier to read and write test assertions.
+     */
+    private static String byteArrayToBitString(byte[] bytes) {
+        StringBuilder s = new StringBuilder();
+        for (byte aByte : bytes) {
+            for (int bit = 7; bit >= 0; bit--) {
+                if (((0x01 << bit) & aByte) != 0) {
+                    s.append("1");
+                } else {
+                    s.append("0");
+                }
+            }
+            s.append(" ");
+        }
+        return s.toString().trim();
+    }
 }

From e1092577b6ad5bcba5d396e17ec5b9a7377cccb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Oct 2023 13:56:32 -0700
Subject: [PATCH 257/490] Bump actions/checkout from 4.0.0 to 4.1.0 (#596)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/3df4ab11eba7bda6032a0b82a6bb43b11571feac...8ade135a41bc03ea155e62e844d188df1ea18608)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml             | 2 +-
 .github/workflows/ion-test-driver.yml             | 6 +++---
 .github/workflows/main.yml                        | 4 ++--
 .github/workflows/prepare-release.yml             | 4 ++--
 .github/workflows/publish-release-artifacts.yml   | 4 ++--
 .github/workflows/scorecard.yml                   | 2 +-
 .github/workflows/test-inspect-version-action.yml | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 950a8a4d67..d9d6e7a1c8 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 5ff4420ccc..df720c4bfa 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # master
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # master
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -80,7 +80,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # master
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3d09b6240d..733a270afd 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
             upload_reports: true
           - java: 17
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
         with:
           submodules: recursive
       - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
@@ -47,7 +47,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 4e05439966..7fef0afc87 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 94af18b133..8c7ca63daa 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -29,7 +29,7 @@ jobs:
     # First, a sanity check to ensure that the library version matches the release version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
       - name: Validate project version matches tag
         shell: bash
         run: |
@@ -48,7 +48,7 @@ jobs:
     steps:
         # TODO: replace with artifact upload/download -- make sure there's no race condition with other builds also
         # uploading an artifact.
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
         with:
           submodules: recursive
       - uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 9b75f932ca..759b57a9d7 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.1.0
+        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.1.0
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index 378c088fb6..666238ed02 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.6.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From 378362077c5d9a6b9f88e72370faff5f2b6d9cd9 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Mon, 16 Oct 2023 15:41:52 -0700
Subject: [PATCH 258/490] Adds support for FixedInt and FixedUInt in
 WriteBuffer (#610)

---
 src/com/amazon/ion/impl/bin/WriteBuffer.java  |  71 +++++++++++
 .../amazon/ion/impl/bin/WriteBufferTest.java  | 111 +++++++++++++++++-
 2 files changed, 177 insertions(+), 5 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/WriteBuffer.java b/src/com/amazon/ion/impl/bin/WriteBuffer.java
index f136b3e077..fba4c60d48 100644
--- a/src/com/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/com/amazon/ion/impl/bin/WriteBuffer.java
@@ -1359,6 +1359,77 @@ private int writeFlexIntOrUInt(final long value, final int numBytes) {
         return numBytes;
     }
 
+    /** Get the length of FixedInt for the provided value. */
+    public static int fixedIntLength(final long value) {
+        int numMagnitudeBitsRequired;
+        if (value < 0) {
+            int numLeadingOnes = Long.numberOfLeadingZeros(~value);
+            numMagnitudeBitsRequired = 64 - numLeadingOnes;
+        } else {
+            int numLeadingZeros = Long.numberOfLeadingZeros(value);
+            numMagnitudeBitsRequired = 64 - numLeadingZeros;
+        }
+        return numMagnitudeBitsRequired / 8 + 1;
+    }
+
+    /**
+     * Writes a FixedInt to this WriteBuffer, using the minimum number of bytes needed to represent the number.
+     * Returns the number of bytes that were needed to encode the value.
+     */
+    public int writeFixedInt(final long value) {
+        int numBytes = fixedIntLength(value);
+        return writeFixedIntOrUInt(value, numBytes);
+    }
+
+    /** Get the length of FixedUInt for the provided value. */
+    public static int fixedUIntLength(final long value) {
+        int numLeadingZeros = Long.numberOfLeadingZeros(value);
+        int numMagnitudeBitsRequired = 64 - numLeadingZeros;
+        return (numMagnitudeBitsRequired - 1) / 8 + 1;
+    }
+
+    /**
+     * Writes a FixedUInt to this WriteBuffer, using the minimum number of bytes needed to represent the number.
+     * Returns the number of bytes that were needed to encode the value.
+     */
+    public int writeFixedUInt(final long value) {
+        if (value < 0) {
+            throw new IllegalArgumentException("Attempted to write a FlexUInt for " + value);
+        }
+        int numBytes = fixedUIntLength(value);
+        return writeFixedIntOrUInt(value, numBytes);
+    }
+
+    /**
+     * Because the fixed int and fixed uint encodings are so similar, we can use this method to write either one as long
+     * as we provide the correct number of bytes needed to encode the value.
+     */
+    private int writeFixedIntOrUInt(final long value, final int numBytes) {
+        writeByte((byte) value);
+        if (numBytes > 1) {
+            writeByte((byte) (value >> 8));
+            if (numBytes > 2) {
+                writeByte((byte) (value >> 8 * 2));
+                if (numBytes > 3) {
+                    writeByte((byte) (value >> 8 * 3));
+                    if (numBytes > 4) {
+                        writeByte((byte) (value >> 8 * 4));
+                        if (numBytes > 5) {
+                            writeByte((byte) (value >> 8 * 5));
+                            if (numBytes > 6) {
+                                writeByte((byte) (value >> 8 * 6));
+                                if (numBytes > 7) {
+                                    writeByte((byte) (value >> 8 * 7));
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return numBytes;
+    }
+
     /** Write the entire buffer to output stream. */
     public void writeTo(final OutputStream out) throws IOException
     {
diff --git a/test/com/amazon/ion/impl/bin/WriteBufferTest.java b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
index bd0c203a42..10d49f7b14 100644
--- a/test/com/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
@@ -25,11 +25,10 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -42,7 +41,6 @@ public class WriteBufferTest
 
     private ByteArrayOutputStream out;
 
-    @Before
     @BeforeEach
     public void setup()
     {
@@ -50,7 +48,7 @@ public void setup()
         out = new ByteArrayOutputStream();
     }
 
-    @After
+    @AfterEach
     public void teardown()
     {
         buf = null;
@@ -1330,6 +1328,8 @@ public void testVarUIntLength9() {
             "     281474976710656, 10000000 00000000 00000000 00000000 00000000 00000000 00000000 00000001",
             "   36028797018963967, 10000000 11111111 11111111 11111111 11111111 11111111 11111111 01111111",
             "   36028797018963968, 00000000 00000001 00000000 00000000 00000000 00000000 00000000 00000000 00000001",
+            // Different one-bits in every byte, making it easy to see if any bytes are out of order
+            "   72624976668147840, 00000000 00000001 10000001 01000000 00100000 00010000 00001000 00000100 00000010",
             " 4611686018427387903, 00000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111 01111111",
             " 4611686018427387904, 00000000 00000010 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000001",
             // Long.MAX_VALUE
@@ -1353,6 +1353,8 @@ public void testVarUIntLength9() {
             "    -281474976710657, 10000000 11111111 11111111 11111111 11111111 11111111 11111111 11111110",
             "  -36028797018963968, 10000000 00000000 00000000 00000000 00000000 00000000 00000000 10000000",
             "  -36028797018963969, 00000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111110",
+            // Different zero-bits in every byte, making it easy to see if any bytes are out of order
+            "  -72624976668147841, 00000000 11111111 01111110 10111111 11011111 11101111 11110111 11111011 11111101",
             "-4611686018427387904, 00000000 00000001 00000000 00000000 00000000 00000000 00000000 00000000 10000000",
             "-4611686018427387905, 00000000 11111110 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111110",
             // Long.MIN_VALUE
@@ -1392,6 +1394,8 @@ public void testWriteFlexInt(long value, String expectedBits) {
             "   562949953421312, 10000000 00000000 00000000 00000000 00000000 00000000 00000000 00000010",
             " 72057594037927935, 10000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111",
             " 72057594037927936, 00000000 00000001 00000000 00000000 00000000 00000000 00000000 00000000 00000010",
+            // Different one-bits in every byte, making it easy to see if any bytes are out of order
+            " 72624976668147840, 00000000 00000001 10000001 01000000 00100000 00010000 00001000 00000100 00000010",
             // Long.MAX_VALUE
             "9223372036854775807, 00000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111",
     })
@@ -1407,6 +1411,103 @@ public void testWriteFlexUIntForNegativeNumber() {
         Assertions.assertThrows(IllegalArgumentException.class, () -> buf.writeFlexUInt(-1));
     }
 
+    @ParameterizedTest
+    @CsvSource({
+            "                   0, 00000000",
+            "                   1, 00000001",
+            "                   2, 00000010",
+            "                  14, 00001110",
+            "                 127, 01111111",
+            "                 128, 10000000 00000000",
+            "               32767, 11111111 01111111",
+            "               32768, 00000000 10000000 00000000",
+            "             3954261, 01010101 01010110 00111100",
+            "             8388607, 11111111 11111111 01111111",
+            "             8388608, 00000000 00000000 10000000 00000000",
+            "          2147483647, 11111111 11111111 11111111 01111111",
+            "          2147483648, 00000000 00000000 00000000 10000000 00000000",
+            "        549755813887, 11111111 11111111 11111111 11111111 01111111",
+            "        549755813888, 00000000 00000000 00000000 00000000 10000000 00000000",
+            "     140737488355327, 11111111 11111111 11111111 11111111 11111111 01111111",
+            "     140737488355328, 00000000 00000000 00000000 00000000 00000000 10000000 00000000",
+            "   36028797018963967, 11111111 11111111 11111111 11111111 11111111 11111111 01111111",
+            "   36028797018963968, 00000000 00000000 00000000 00000000 00000000 00000000 10000000 00000000",
+            // Different one-bit in every byte, making it easy to see if any bytes are out of order
+            "   72624976668147840, 10000000 01000000 00100000 00010000 00001000 00000100 00000010 00000001",
+            // Long.MAX_VALUE
+            " 9223372036854775807, 11111111 11111111 11111111 11111111 11111111 11111111 11111111 01111111",
+            "                  -1, 11111111",
+            "                  -2, 11111110",
+            "                 -14, 11110010",
+            "                -128, 10000000",
+            "                -129, 01111111 11111111",
+            "              -32768, 00000000 10000000",
+            "              -32769, 11111111 01111111 11111111",
+            "            -3954261, 10101011 10101001 11000011",
+            "            -8388608, 00000000 00000000 10000000",
+            "            -8388609, 11111111 11111111 01111111 11111111",
+            "         -2147483648, 00000000 00000000 00000000 10000000",
+            "         -2147483649, 11111111 11111111 11111111 01111111 11111111",
+            "       -549755813888, 00000000 00000000 00000000 00000000 10000000",
+            "       -549755813889, 11111111 11111111 11111111 11111111 01111111 11111111",
+            "    -140737488355328, 00000000 00000000 00000000 00000000 00000000 10000000",
+            "    -140737488355329, 11111111 11111111 11111111 11111111 11111111 01111111 11111111",
+            "  -36028797018963968, 00000000 00000000 00000000 00000000 00000000 00000000 10000000",
+            "  -36028797018963969, 11111111 11111111 11111111 11111111 11111111 11111111 01111111 11111111",
+            // Different zero-bit in every byte, making it easy to see if any bytes are out of order
+            "  -72624976668147841, 01111111 10111111 11011111 11101111 11110111 11111011 11111101 11111110",
+            // Long.MIN_VALUE
+            "-9223372036854775808, 00000000 00000000 00000000 00000000 00000000 00000000 00000000 10000000",
+
+    })
+    public void testWriteFixedInt(long value, String expectedBits) {
+        int numBytes = buf.writeFixedInt(value);
+        String actualBits = byteArrayToBitString(bytes());
+        Assertions.assertEquals(expectedBits, actualBits);
+        Assertions.assertEquals((expectedBits.length() + 1)/9, numBytes);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "                   0, 00000000",
+            "                   1, 00000001",
+            "                   2, 00000010",
+            "                  14, 00001110",
+            "                 127, 01111111",
+            "                 128, 10000000",
+            "                 255, 11111111",
+            "                 256, 00000000 00000001",
+            "               65535, 11111111 11111111",
+            "               65536, 00000000 00000000 00000001",
+            "             3954261, 01010101 01010110 00111100",
+            "            16777215, 11111111 11111111 11111111",
+            "            16777216, 00000000 00000000 00000000 00000001",
+            "          4294967295, 11111111 11111111 11111111 11111111",
+            "          4294967296, 00000000 00000000 00000000 00000000 00000001",
+            "       1099511627775, 11111111 11111111 11111111 11111111 11111111",
+            "       1099511627776, 00000000 00000000 00000000 00000000 00000000 00000001",
+            "     281474976710655, 11111111 11111111 11111111 11111111 11111111 11111111",
+            "     281474976710656, 00000000 00000000 00000000 00000000 00000000 00000000 00000001",
+            "    5023487023698435, 00000011 11010010 10010100 10110111 11010101 11011000 00010001",
+            "   72057594037927935, 11111111 11111111 11111111 11111111 11111111 11111111 11111111",
+            "   72057594037927936, 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000001",
+            // Different one-bit in every byte, making it easy to see if any bytes are out of order
+            "   72624976668147840, 10000000 01000000 00100000 00010000 00001000 00000100 00000010 00000001",
+            // Long.MAX_VALUE 72057594037927936
+            " 9223372036854775807, 11111111 11111111 11111111 11111111 11111111 11111111 11111111 01111111",
+    })
+    public void testWriteFixedUInt(long value, String expectedBits) {
+        int numBytes = buf.writeFixedUInt(value);
+        String actualBits = byteArrayToBitString(bytes());
+        Assertions.assertEquals(expectedBits, actualBits);
+        Assertions.assertEquals((expectedBits.length() + 1)/9, numBytes);
+    }
+
+    @Test
+    public void testWriteFixedUIntForNegativeNumber() {
+        Assertions.assertThrows(IllegalArgumentException.class, () -> buf.writeFixedUInt(-1));
+    }
+
     /**
      * Converts a byte array to a string of bits, such as "00110110 10001001".
      * The purpose of this method is to make it easier to read and write test assertions.

From 737f301c0be6a10a8ef5ba607c4d353f59f2e430 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 9 Jun 2023 15:12:21 -0700
Subject: [PATCH 259/490] Adds IonCursor interface for continuable reading;
 adds adapter interfaces from IonCursor to IonReader.

---
 src/com/amazon/ion/IonCursor.java             | 122 +++++++++
 .../amazon/ion/IvmNotificationConsumer.java   |  16 ++
 .../impl/IonReaderContinuableApplication.java |  88 ++++++
 .../ion/impl/IonReaderContinuableCore.java    | 253 ++++++++++++++++++
 4 files changed, 479 insertions(+)
 create mode 100644 src/com/amazon/ion/IonCursor.java
 create mode 100644 src/com/amazon/ion/IvmNotificationConsumer.java
 create mode 100644 src/com/amazon/ion/impl/IonReaderContinuableApplication.java
 create mode 100644 src/com/amazon/ion/impl/IonReaderContinuableCore.java

diff --git a/src/com/amazon/ion/IonCursor.java b/src/com/amazon/ion/IonCursor.java
new file mode 100644
index 0000000000..ae3180ad4e
--- /dev/null
+++ b/src/com/amazon/ion/IonCursor.java
@@ -0,0 +1,122 @@
+package com.amazon.ion;
+
+import java.io.Closeable;
+
+/**
+ * A cursor over a stream of Ion data. NOTE: this interface is not considered part of the public API.
+ */
+public interface IonCursor extends Closeable {
+
+    /**
+     * Conveys the type of event that occurred as a result of operating on the cursor.
+     */
+    enum Event {
+
+        /**
+         * There is not enough data in the stream to complete the requested operation. The operation should be retried
+         * when more data is available.
+         */
+        NEEDS_DATA,
+
+        /**
+         * The cursor has completed an operation (e.g. `stepIntoContainer()`) and requires another instruction in order
+         * to position itself on the next value.
+         */
+        NEEDS_INSTRUCTION,
+
+        /**
+         * The cursor is positioned on a scalar value.
+         */
+        START_SCALAR,
+
+        /**
+         * The cursor has successfully buffered the entirety of the value on which it is currently positioned, as
+         * requested by an invocation of `fillValue()`.
+         */
+        VALUE_READY,
+
+        /**
+         * The cursor is positioned on a container value.
+         */
+        START_CONTAINER,
+
+        /**
+         * The cursor has reached the end of the current container, and requires an instruction to proceed.
+         */
+        END_CONTAINER
+    }
+
+    /**
+     * Advances the cursor to the next value, skipping the current value (if any). This method may return:
+     * <ul>
+     *     <li>NEEDS_DATA, if not enough data is available in the stream</li>
+     *     <li>START_SCALAR, if the reader is now positioned on a scalar value</li>
+     *     <li>START_CONTAINER, if the reader is now positioned on a container value</li>
+     *     <li>END_CONTAINER, if the reader is now positioned at the end of a container value, or</li>
+     *     <li>NEEDS_INSTRUCTION, if the reader skipped a value for exceeding the configured maximum buffer size</li>
+     * </ul>
+     * @return an Event conveying the result of the operation.
+     */
+    Event nextValue();
+
+    /**
+     * Steps the cursor into the container value on which the cursor is currently positioned. This method may return:
+     * <ul>
+     *     <li>NEEDS_DATA, if not enough data is available in the stream</li>
+     *     <li>NEEDS_INSTRUCTION, when successful, indicating that the caller must invoke another method on the cursor
+     *     in order to position it on a value
+     *     </li>
+     * </ul>
+     * @return an Event conveying the result of the operation.
+     */
+    Event stepIntoContainer();
+
+    /**
+     * Steps the cursor out of the current container, skipping any values in the container that may follow. This method
+     * may return:
+     * <ul>
+     *     <li>NEEDS_DATA, if not enough data is available in the stream</li>
+     *     <li>NEEDS_INSTRUCTION, when successful, indicating that the caller must invoke another method on the cursor
+     *     in order to position it on a value
+     *     </li>
+     * </ul>
+     * @return an Event conveying the result of the operation.
+     */
+    Event stepOutOfContainer();
+
+    /**
+     * Buffers the entirety of the value on which the cursor is currently positioned. This method may return:
+     * <ul>
+     *     <li>NEEDS_DATA, if not enough data is available in the stream</li>
+     *     <li>VALUE_READY, if the value was successfully filled</li>
+     *     <li>NEEDS_INSTRUCTION, if the value exceeded the configured maximum buffer size and could not be buffered</li>
+     * </ul>
+     * @return an Event conveying the result of the operation.
+     */
+    Event fillValue();
+
+    /**
+     * Conveys the result of the previous operation.
+     * @return an Event conveying the result of the previous operation.
+     */
+    Event getCurrentEvent();
+
+    /**
+     * Causes the cursor to force completion of the value on which it is currently positioned, if any. This method may
+     * return:
+     * <ul>
+     *     <li>NEEDS_DATA, if called when the reader is not positioned on a value, or</li>
+     *     <li>START_SCALAR, if ending the stream at the current position unambiguously results in a complete value</li>
+     * </ul>
+     * Note: in binary Ion, it is never ambiguous whether a value is complete. Therefore, binary IonCursor
+     * implementations will only return NEEDS_DATA or throw from this method. In text Ion, ambiguity is possible.
+     * For example, the stream <code>true</code> will initially return NEEDS_DATA from {@link #nextValue()} because
+     * it cannot yet be known whether the stream contains the boolean value <code>true</code> or, e.g., the symbol
+     * value <code>trueNorth</code>. In this example, calling this method will return START_SCALAR, with the cursor
+     * positioned on a boolean value.
+     * @return an Event conveying the result of the operation.
+     * @throws IonException if this method is called below the top level or when the cursor is positioned on an
+     * incomplete value.
+     */
+    Event endStream();
+}
diff --git a/src/com/amazon/ion/IvmNotificationConsumer.java b/src/com/amazon/ion/IvmNotificationConsumer.java
new file mode 100644
index 0000000000..3fe54ecbfa
--- /dev/null
+++ b/src/com/amazon/ion/IvmNotificationConsumer.java
@@ -0,0 +1,16 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion;
+
+@FunctionalInterface
+public interface IvmNotificationConsumer {
+
+    /**
+     * Invoked when the cursor encounters an Ion version marker (IVM).
+     *
+     * @param majorVersion the major version indicated by the new IVM.
+     * @param minorVersion the minor version indicated by the new IVM.
+     */
+    void ivmEncountered(int majorVersion, int minorVersion);
+}
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplication.java b/src/com/amazon/ion/impl/IonReaderContinuableApplication.java
new file mode 100644
index 0000000000..84b4c0d951
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplication.java
@@ -0,0 +1,88 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.UnknownSymbolException;
+
+import java.util.Iterator;
+
+/**
+ * IonCursor with the application-level IonReader interface methods. Useful for adapting an IonCursor implementation
+ * into a application-level IonReader.
+ */
+interface IonReaderContinuableApplication extends IonReaderContinuableCore {
+
+    /**
+     * Returns the symbol table that is applicable to the current value.
+     * This may be either a system or local symbol table.
+     */
+    SymbolTable getSymbolTable();
+
+    /**
+     * Return the annotations of the current value as an array of strings.
+     *
+     * @return the (ordered) annotations on the current value, or an empty
+     * array (not {@code null}) if there are none.
+     *
+     * @throws UnknownSymbolException if any annotation has unknown text.
+     */
+    String[] getTypeAnnotations();
+
+    /**
+     * Return the annotations on the curent value as an iterator.  The
+     * iterator is empty (hasNext() returns false on the first call) if
+     * there are no annotations on the current value.
+     *
+     * Implementations *may* throw {@link UnknownSymbolException} from
+     * this method if any annotation contains unknown text. Alternatively,
+     * implementations may provide an Iterator that throws
+     * {@link UnknownSymbolException} only when the user navigates the
+     * iterator to an annotation with unknown text.
+     *
+     * @return not null.
+     */
+    Iterator<String> iterateTypeAnnotations();
+
+    /**
+     * Return the field name of the current value. Or null if there is no valid
+     * current value or if the current value is not a field of a struct.
+     *
+     * @throws UnknownSymbolException if the field name has unknown text.
+     */
+    String getFieldName();
+
+    /**
+     * Gets the current value's annotations as symbol tokens (text + ID).
+     *
+     * @return the (ordered) annotations on the current value, or an empty
+     * array (not {@code null}) if there are none.
+     *
+     */
+    SymbolToken[] getTypeAnnotationSymbols();
+
+    /**
+     * Gets the current value's field name as a symbol token (text + ID).
+     * If the text of the token isn't known, the result's
+     * {@link SymbolToken#getText()} will be null.
+     * If the symbol ID of the token isn't known, the result's
+     * {@link SymbolToken#getSid()} will be
+     * {@link SymbolTable#UNKNOWN_SYMBOL_ID}.
+     * At least one of the two fields will be defined.
+     *
+     * @return null if there is no current value or if the current value is
+     *  not a field of a struct.
+     *
+     */
+    SymbolToken getFieldNameSymbol();
+
+    /**
+     * Returns the current value as a symbol token (text + ID).
+     * This is only valid when {@link #getType()} returns
+     * {@link IonType#SYMBOL}.
+     *
+     * @return null if {@link #isNullValue()}
+     *
+     */
+    SymbolToken symbolValue();
+}
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableCore.java b/src/com/amazon/ion/impl/IonReaderContinuableCore.java
new file mode 100644
index 0000000000..35a22108c4
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonReaderContinuableCore.java
@@ -0,0 +1,253 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonCursor;
+import com.amazon.ion.IonInt;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IvmNotificationConsumer;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.UnknownSymbolException;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * IonCursor with the core IonReader interface methods. Useful for adapting an IonCursor implementation into a
+ * system-level IonReader.
+ */
+interface IonReaderContinuableCore extends IonCursor {
+
+    /**
+     * Returns the depth into the Ion value that this reader has traversed.
+     * At top level the depth is 0.
+     */
+    int getDepth();
+
+    /**
+     * Returns the type of the current value, or null if there is no
+     * current value.
+     */
+    IonType getType();
+
+    /**
+     * Returns an {@link IntegerSize} representing the smallest-possible
+     * Java type of the Ion {@code int} at the current value.
+     *
+     * If the current value is {@code null.int} or is not an Ion
+     * {@code int}, or if there is no current value, {@code null} will
+     * be returned.
+     *
+     * @see IonInt#getIntegerSize()
+     */
+    IntegerSize getIntegerSize();
+
+    /**
+     * Determines whether the current value is a null Ion value of any type
+     * (for example, <code>null</code> or <code>null.int</code>).
+     * It should be called before
+     * calling getters that return value types (int, long, boolean,
+     * double).
+     */
+    boolean isNullValue();
+
+    /**
+     * Determines whether this reader is currently traversing the fields of an
+     * Ion struct. It returns false if the iteration
+     * is in a list, a sexp, or a datagram.
+     */
+    boolean isInStruct();
+
+    /**
+     * Gets the symbol ID of the field name attached to the current value.
+     * <p>
+     * <b>This is an "expert method": correct use requires deep understanding
+     * of the Ion binary format. You almost certainly don't want to use it.</b>
+     *
+     * @return the symbol ID of the field name, if the current value is a
+     * field within a struct.
+     * If the current value is not a field, or if the symbol ID cannot be
+     * determined, this method returns a value <em>less than one</em>.
+     *
+     */
+    @Deprecated
+    int getFieldId();
+
+    /**
+     * Gets the symbol IDs of the annotations attached to the current value.
+     * <p>
+     * <b>This is an "expert method": correct use requires deep understanding
+     * of the Ion binary format. You almost certainly don't want to use it.</b>
+     *
+     * @return the symbol IDs of the annotations on the current value.
+     * If the current value has no annotations, this method returns an empty array.
+     *
+     */
+    @Deprecated
+    int[] getAnnotationIds();
+
+    /**
+     * Returns the current value as an boolean.
+     * This is only valid when {@link #getType()} returns {@link IonType#BOOL}.
+     */
+    boolean booleanValue();
+
+    /**
+     * Returns the current value as an int.  This is only valid if there is
+     * an underlying value and the value is of a numeric type (int, float, or
+     * decimal).
+     */
+    int intValue();
+
+    /**
+     * Returns the current value as a long.  This is only valid if there is
+     * an underlying value and the value is of a numeric type (int, float, or
+     * decimal).
+     */
+    long longValue();
+
+    /**
+     * Returns the current value as a {@link BigInteger}.  This is only valid if there
+     * is an underlying value and the value is of a numeric type (int, float, or
+     * decimal).
+     */
+    BigInteger bigIntegerValue();
+
+    /**
+     * Returns the current value as a double.  This is only valid if there is
+     * an underlying value and the value is either float, or decimal.
+     */
+    double doubleValue();
+
+    /**
+     * Returns the current value as a {@link BigDecimal}.
+     * This method should not return a {@link Decimal}, so it lacks support for
+     * negative zeros.
+     * <p>
+     * This method is only valid when {@link #getType()} returns
+     * {@link IonType#DECIMAL}.
+     *
+     * @return the current value as a {@link BigDecimal},
+     * or {@code null} if the current value is {@code null.decimal}.
+     */
+    BigDecimal bigDecimalValue();
+
+    /**
+     * Returns the current value as a {@link Decimal}, which extends
+     * {@link BigDecimal} with support for negative zeros.
+     * This is only valid when {@link #getType()} returns
+     * {@link IonType#DECIMAL}.
+     *
+     * @return the current value as a {@link Decimal},
+     * or {@code null} if the current value is {@code null.decimal}.
+     */
+    Decimal decimalValue();
+
+
+    /**
+     * Returns the current value as a {@link java.util.Date}.
+     * This is only valid when {@link #getType()} returns
+     * {@link IonType#TIMESTAMP}.
+     *
+     * @return the current value as a {@link Date},
+     * or {@code null} if the current value is {@code null.timestamp}.
+     */
+    Date dateValue();
+
+    /**
+     * Returns the current value as a {@link Timestamp}.
+     * This is only valid when {@link #getType()} returns
+     * {@link IonType#TIMESTAMP}.
+     *
+     * @return the current value as a {@link Timestamp},
+     * or {@code null} if the current value is {@code null.timestamp}.
+     */
+    Timestamp timestampValue();
+
+    /**
+     * Returns the current value as a Java String.
+     * This is only valid when {@link #getType()} returns
+     * {@link IonType#STRING} or {@link IonType#SYMBOL}.
+     *
+     * @throws UnknownSymbolException if the current value is a symbol
+     * with unknown text.
+     *
+     * @see IonReaderContinuableApplication#symbolValue()
+     */
+    String stringValue();
+
+    /**
+     * Reads the symbol ID of the symbol value that begins at `valueMarker.startIndex` and ends at
+     * `valueMarker.endIndex`.
+     * @return -1 if the value is null
+     */
+    /**
+     * Gets the symbol ID of the current symbol value.
+     * <p>
+     * <b>This is an "expert method": correct use requires deep understanding
+     * of the Ion binary format. You almost certainly don't want to use it.</b>
+     *
+     * @return the symbol ID of the value.
+     * If the symbol ID cannot be determined, this method returns a value <em>less than one</em>.
+     */
+    @Deprecated
+    int symbolValueId();
+
+    /**
+     * Gets the size in bytes of the current lob value.
+     * This is only valid when {@link #getType()} returns {@link IonType#BLOB}
+     * or {@link IonType#CLOB}.
+     *
+     * @return the lob's size in bytes.
+     */
+    int byteSize();
+
+    /**
+     * Returns the current value as a newly-allocated byte array.
+     * This is only valid when {@link #getType()} returns {@link IonType#BLOB}
+     * or {@link IonType#CLOB}.
+     */
+    byte[] newBytes();
+
+    /**
+     * Copies the current value into the passed in a byte array.
+     * This is only valid when {@link #getType()} returns {@link IonType#BLOB}
+     * or {@link IonType#CLOB}.
+     *
+     * @param buffer destination to copy the value into, this must not be null.
+     * @param offset the first position to copy into, this must be non null and
+     *  less than the length of buffer.
+     * @param len the number of bytes available in the buffer to copy into,
+     *  this must be long enough to hold the whole value and not extend outside
+     *  of buffer.
+     */
+    int getBytes(byte[] buffer, int offset, int len);
+
+    /**
+     * Returns the major version of the Ion stream at the reader's current position.
+     * @return the major version.
+     */
+    int getIonMajorVersion();
+
+    /**
+     * Returns the minor version of the Ion stream at the reader's current position.
+     * @return the minor version.
+     */
+    int getIonMinorVersion();
+
+    /**
+     * Register an {@link IvmNotificationConsumer} to be notified whenever the reader
+     * encounters an Ion version marker.
+     * @param ivmConsumer the consumer to be notified.
+     */
+    void registerIvmNotificationConsumer(IvmNotificationConsumer ivmConsumer);
+
+    /**
+     * Conveys whether the value on which the reader is currently positioned has
+     * annotations.
+     * @return true if the value has at least one annotation; otherwise, false.
+     */
+    boolean hasAnnotations();
+
+}

From e10c82ab1fb234a8d1992b9b819f232a85af0189 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 28 Jun 2023 20:12:26 -0700
Subject: [PATCH 260/490] Adds IonCursorBinary with support for reading from
 fixed byte arrays.

---
 src/com/amazon/ion/BufferConfiguration.java   |  43 +-
 .../amazon/ion/IonBufferConfiguration.java    |  51 +-
 src/com/amazon/ion/impl/IonCursorBinary.java  | 721 ++++++++++++++++++
 .../ion/impl/IonReaderBinaryIncremental.java  |  10 +-
 .../ion/impl/IonReaderLookaheadBuffer.java    |   7 +-
 src/com/amazon/ion/impl/IonTypeID.java        |  78 +-
 src/com/amazon/ion/impl/Marker.java           |  34 +
 .../ion/impl/ReaderLookaheadBufferBase.java   |  11 +-
 src/com/amazon/ion/util/IonStreamUtils.java   |   8 +
 .../amazon/ion/impl/IonCursorBinaryTest.java  | 252 ++++++
 10 files changed, 1129 insertions(+), 86 deletions(-)
 create mode 100644 src/com/amazon/ion/impl/IonCursorBinary.java
 create mode 100644 src/com/amazon/ion/impl/Marker.java
 create mode 100644 test/com/amazon/ion/impl/IonCursorBinaryTest.java

diff --git a/src/com/amazon/ion/BufferConfiguration.java b/src/com/amazon/ion/BufferConfiguration.java
index 31a13fd41a..d86da2c7a5 100644
--- a/src/com/amazon/ion/BufferConfiguration.java
+++ b/src/com/amazon/ion/BufferConfiguration.java
@@ -1,42 +1,39 @@
-package com.amazon.ion;
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 
-import com.amazon.ion.impl.ReaderLookaheadBuffer;
+package com.amazon.ion;
 
 /**
  * Provides logic common to all BufferConfiguration implementations.
- * @param <Configuration> the type of the concrete subclass of this BufferConfiguration that is applicable to the
- *                        ReaderLookaheadBufferBase subclass.
+ * @param <Configuration> the type of the concrete subclass of this BufferConfiguration.
  */
 public abstract class BufferConfiguration<Configuration extends BufferConfiguration<Configuration>> {
 
     /**
      * Functional interface for handling oversized values.
      */
+    @FunctionalInterface
     public interface OversizedValueHandler {
         /**
-         * Invoked each time a value (and any symbol tables that immediately precede it) exceed the buffer size limit
-         * specified by the LookaheadReaderWrapper instance, but the symbol tables by themselves do not exceed the
-         * limit. This is recoverable. If the implementation wishes to recover, it should simply return normally from
-         * this method. The oversized value will be flushed from the input pipe; normal processing will resume with the
-         * next value. If the implementation wishes to abort processing immediately, it may throw an exception from this
-         * method. Such an exception will propagate upward and will be thrown from
-         * {@link ReaderLookaheadBuffer#fillInput()}.
-         * @throws Exception if handler logic fails.
+         * Invoked each time a user value exceeds the buffer size limit specified. This is recoverable. If the
+         * implementation wishes to recover, it should simply return normally from this method. The oversized value will
+         * be flushed from the buffer; normal processing will resume with the next value. If the implementation wishes
+         * to abort processing immediately, it may throw an exception from this method.
          */
-        void onOversizedValue() throws Exception;
+        void onOversizedValue();
     }
 
     /**
      * Functional interface for reporting processed data.
      */
+    @FunctionalInterface
     public interface DataHandler {
         /**
          * Invoked whenever the bytes from a value are processed, regardless of whether the bytes are buffered or
          * skipped due to the value being oversized.
          * @param numberOfBytes the number of bytes processed.
-         * @throws Exception if handler logic fails.
          */
-        void onData(int numberOfBytes) throws Exception;
+        void onData(int numberOfBytes);
     }
 
     /**
@@ -88,7 +85,7 @@ public final BuilderType withInitialBufferSize(final int initialBufferSizeInByte
         }
 
         /**
-         * @return the initial size of the lookahead buffer, in bytes.
+         * @return the initial size of the buffer, in bytes.
          */
         public final int getInitialBufferSize() {
             return initialBufferSize;
@@ -133,10 +130,10 @@ public final DataHandler getDataHandler() {
         }
 
         /**
-         * Set the maximum number of bytes between top-level values. This can be used to limit growth of the internal
-         * buffer. For binary Ion, the minimum value is 5 because all valid binary Ion data begins with a 4-byte Ion
-         * version marker and the smallest value is 1 byte. For delimited text Ion, the minimum value is 2 because the
-         * smallest text Ion value is 1 byte and the smallest delimiter is 1 byte. Default: Integer.MAX_VALUE.
+         * Set the maximum size of the buffer. For binary Ion, the minimum value is 5 because all valid binary Ion data
+         * begins with a 4-byte Ion version marker and the smallest value is 1 byte. For text Ion, the minimum value is
+         * 2 because the smallest text Ion value is 1 byte and the smallest delimiter is 1 byte.
+         * Default: Integer.MAX_VALUE.
          *
          * @param maximumBufferSizeInBytes the value.
          * @return this builder.
@@ -177,12 +174,12 @@ public int getMaximumBufferSize() {
     }
 
     /**
-     * The initial size of the lookahead buffer, in bytes.
+     * The initial size of the buffer, in bytes.
      */
     private final int initialBufferSize;
 
     /**
-     * The maximum number of bytes that will be buffered.
+     * The maximum number of bytes that may be buffered.
      */
     private final int maximumBufferSize;
 
@@ -236,7 +233,7 @@ protected void requireUnlimitedBufferSize() {
     }
 
     /**
-     * @return the initial size of the lookahead buffer, in bytes.
+     * @return the initial size of the buffer, in bytes.
      */
     public final int getInitialBufferSize() {
         return initialBufferSize;
diff --git a/src/com/amazon/ion/IonBufferConfiguration.java b/src/com/amazon/ion/IonBufferConfiguration.java
index 9845b9d501..c89c3f27b0 100644
--- a/src/com/amazon/ion/IonBufferConfiguration.java
+++ b/src/com/amazon/ion/IonBufferConfiguration.java
@@ -1,24 +1,24 @@
-package com.amazon.ion;
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 
-import com.amazon.ion.impl.IonReaderLookaheadBuffer;
+package com.amazon.ion;
 
 /**
- * Configures Ion lookahead buffers.
+ * Configures buffers that hold Ion data.
  */
 public final class IonBufferConfiguration extends BufferConfiguration<IonBufferConfiguration> {
 
     /**
      * Functional interface for handling oversized symbol tables.
      */
+    @FunctionalInterface
     public interface OversizedSymbolTableHandler {
         /**
          * Invoked when the user specifies a finite maximum buffer size and that size is exceeded by symbol table(s)
          * alone. Because symbol tables cannot be truncated without corrupting values that follow in the stream,
-         * this condition is not recoverable. After this method is called,
-         * {@link IonReaderLookaheadBuffer#fillInput()} has no effect.
-         * @throws Exception if handler logic fails.
+         * this condition is not recoverable.
          */
-        void onOversizedSymbolTable() throws Exception;
+        void onOversizedSymbolTable();
     }
 
     /**
@@ -34,41 +34,28 @@ public static final class Builder extends BufferConfiguration.Builder<IonBufferC
         /**
          * An OversizedValueHandler that does nothing.
          */
-        private static final OversizedValueHandler NO_OP_OVERSIZED_VALUE_HANDLER = new OversizedValueHandler() {
-
-            @Override
-            public void onOversizedValue() {
-                // If no maximum buffer size is configured, values cannot be considered oversized and this
-                // implementation will never be called.
-                // If a maximum buffer size is configured, a handler must also be configured. In that case,
-                // this implementation will only be called if the user provides it to the builder manually.
-            }
+        private static final OversizedValueHandler NO_OP_OVERSIZED_VALUE_HANDLER = () -> {
+            // If no maximum buffer size is configured, values cannot be considered oversized and this
+            // implementation will never be called.
+            // If a maximum buffer size is configured, a handler must also be configured. In that case,
+            // this implementation will only be called if the user provides it to the builder manually.
         };
 
         /**
          * A DataHandler that does nothing.
          */
-        private static final DataHandler NO_OP_DATA_HANDLER = new DataHandler() {
-
-            @Override
-            public void onData(int bytes) {
-                // Do nothing.
-            }
+        private static final DataHandler NO_OP_DATA_HANDLER = bytes -> {
+            // Do nothing.
         };
 
         /**
          * An OversizedSymbolTableHandler that does nothing.
          */
-        private static final OversizedSymbolTableHandler NO_OP_OVERSIZED_SYMBOL_TABLE_HANDLER
-            = new OversizedSymbolTableHandler() {
-
-            @Override
-            public void onOversizedSymbolTable() {
-                // If no maximum buffer size is configured, symbol tables cannot be considered oversized and this
-                // implementation will never be called.
-                // If a maximum buffer size is configured, a handler must also be configured. In that case,
-                // this implementation will only be called if the user provides it to the builder manually.
-            }
+        private static final OversizedSymbolTableHandler NO_OP_OVERSIZED_SYMBOL_TABLE_HANDLER = () -> {
+            // If no maximum buffer size is configured, symbol tables cannot be considered oversized and this
+            // implementation will never be called.
+            // If a maximum buffer size is configured, a handler must also be configured. In that case,
+            // this implementation will only be called if the user provides it to the builder manually.
         };
 
         /**
diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
new file mode 100644
index 0000000000..cfe323f15f
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -0,0 +1,721 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.BufferConfiguration;
+import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonCursor;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IvmNotificationConsumer;
+
+import java.nio.ByteBuffer;
+
+/**
+ * An IonCursor over binary Ion data, capable of buffering or skipping Ion values at any depth. Records byte
+ * indices of the value currently buffered, enabling parsers direct access to the bytes in the value's representation.
+ */
+class IonCursorBinary implements IonCursor {
+
+    private static final int LOWER_SEVEN_BITS_BITMASK = 0x7F;
+    private static final int VALUE_BITS_PER_VARUINT_BYTE = 7;
+    private static final int IVM_START_BYTE = 0xE0;
+    private static final int IVM_FINAL_BYTE = 0xEA;
+    private static final int SINGLE_BYTE_MASK = 0xFF;
+    private static final int LIST_TYPE_ORDINAL = IonType.LIST.ordinal();
+    private static final IvmNotificationConsumer NO_OP_IVM_NOTIFICATION_CONSUMER = (x, y) -> {};
+
+    // Initial capacity of the stack used to hold ContainerInfo. Each additional level of nesting in the data requires
+    // a new ContainerInfo. Depths greater than 8 will be rare.
+    private static final int CONTAINER_STACK_INITIAL_CAPACITY = 8;
+
+    /**
+     * Stack to hold container info. Stepping into a container results in a push; stepping out results in a pop.
+     */
+    protected Marker[] containerStack = new Marker[CONTAINER_STACK_INITIAL_CAPACITY];
+
+    /**
+     * The index of the current container in `containerStack`.
+     */
+    protected int containerIndex = -1;
+
+    /**
+     * The Marker representing the parent container of the current value.
+     */
+    protected Marker parent = null;
+
+    /**
+     * The start offset into the user-provided byte array, or 0 if the user provided an InputStream.
+     */
+    private final long startOffset;
+
+    /**
+     * The index of the next byte in the buffer that is available to be read. Always less than or equal to `limit`.
+     */
+    private long offset;
+
+    /**
+     * The index at which the next byte received will be written. Always greater than or equal to `offset`.
+     */
+    private long limit;
+
+    /**
+     * A slice of the current buffer.
+     */
+    protected ByteBuffer byteBuffer;
+
+    /**
+     * The handler that will be notified when data is processed.
+     */
+    private final BufferConfiguration.DataHandler dataHandler;
+
+    /**
+     * Marker for the sequence of annotation symbol IDs on the current value. If there are no annotations on
+     * the current value, the startIndex will be negative.
+     */
+    final Marker annotationSequenceMarker = new Marker(-1, 0);
+
+    /**
+     * Indicates whether the current value is annotated.
+     */
+    boolean hasAnnotations = false;
+
+    /**
+     * Marker representing the current value.
+     */
+    protected final Marker valueMarker = new Marker(-1, 0);
+
+    /**
+     * The index of the first byte in the header of the value at which the reader is currently positioned.
+     */
+    protected long valuePreHeaderIndex = 0;
+
+    /**
+     * Type ID for the current value.
+     */
+    protected IonTypeID valueTid = null;
+
+    /**
+     * The consumer to be notified when Ion version markers are encountered.
+     */
+    private IvmNotificationConsumer ivmConsumer = NO_OP_IVM_NOTIFICATION_CONSUMER;
+
+    /**
+     * The event that occurred as a result of the last call to any of the cursor's IonCursor methods.
+     */
+    protected IonCursor.Event event = IonCursor.Event.NEEDS_DATA;
+
+    /**
+     * The buffer in which the cursor stores slices of the Ion stream.
+     */
+    protected byte[] buffer;
+
+    /**
+     * The major version of the Ion encoding currently being read.
+     */
+    private int majorVersion = -1;
+
+    /**
+     * The minor version of the Ion encoding currently being read.
+     */
+    int minorVersion = 0;
+
+    /**
+     * The field SID of the current value, if any.
+     */
+    protected int fieldSid = -1;
+
+    /**
+     * The index of the first byte in the buffer that has not yet been successfully processed. The checkpoint is
+     * only advanced when sufficient progress has been made, e.g. when a complete value header has been processed, or
+     * a complete value has been skipped.
+     */
+    private long checkpoint;
+
+    /**
+     * The index of the next byte to be read from the buffer.
+     */
+    private long peekIndex;
+
+    /**
+     * The set of type IDs to use for Ion version currently active in the stream.
+     */
+    private IonTypeID[] typeIds = IonTypeID.TYPE_IDS_NO_IVM;
+
+    /**
+     * The total number of bytes that had been consumed from the stream as of the last time progress was reported to
+     * the data handler.
+     */
+    private long lastReportedByteTotal = 0;
+
+
+    /**
+     * Constructs a new fixed (non-refillable) cursor from the given byte array.
+     * @param configuration the configuration to use. The buffer size and oversized value configuration are unused, as
+     *                      the given buffer is used directly.
+     * @param buffer the byte array containing the bytes to read.
+     * @param offset the offset into the byte array at which the first byte of Ion data begins.
+     * @param length the number of bytes to be read from the byte array.
+     */
+    IonCursorBinary(
+        final IonBufferConfiguration configuration,
+        byte[] buffer,
+        int offset,
+        int length
+    ) {
+        this.dataHandler = (configuration == null) ? null : configuration.getDataHandler();
+        peekIndex = offset;
+        valuePreHeaderIndex = offset;
+        checkpoint = peekIndex;
+
+        for (int i = 0; i < CONTAINER_STACK_INITIAL_CAPACITY; i++) {
+            containerStack[i] = new Marker(-1, -1);
+        }
+
+        this.buffer = buffer;
+        this.startOffset = offset;
+        this.offset = offset;
+        this.limit = offset + length;
+        byteBuffer = ByteBuffer.wrap(buffer, offset, length);
+    }
+
+    /* ---- Begin: version-dependent parsing methods ---- */
+    /* ---- Ion 1.0 ---- */
+
+    /**
+     * Reads a 2+ byte VarUInt, given the first byte. NOTE: the VarUInt must fit in a `long`. This must only be
+     * called when it is known that the buffer already contains all the bytes in the VarUInt.
+     * @return the value.
+     */
+    private long readVarUInt_1_0(byte currentByte) {
+        long result = currentByte & LOWER_SEVEN_BITS_BITMASK;
+        do {
+            // Note: if the varUInt  is malformed such that it extends beyond the declared length of the value *and*
+            // beyond the end of the buffer, this will result in IndexOutOfBoundsException because only the declared
+            // value length has been filled. Preventing this is simple: if (peekIndex >= limit) throw
+            // new IonException(); However, we choose not to perform that check here because it is not worth sacrificing
+            // performance in this inner-loop code in order to throw one type of exception over another in case of
+            // malformed data.
+            currentByte = buffer[(int) (peekIndex++)];
+            result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
+        } while (currentByte >= 0);
+        return result;
+    }
+
+    /**
+     * Reads the header of an annotation wrapper. This must only be called when it is known that the buffer already
+     * contains all the bytes in the header. Sets `valueMarker` with the start and end indices of the wrapped value.
+     * Sets `annotationSequenceMarker` with the start and end indices of the sequence of annotation SIDs. After
+     * successful return, `peekIndex` will point at the type ID byte of the wrapped value.
+     * @param valueTid the type ID of the annotation wrapper.
+     * @return true if the length of the wrapped value extends beyond the bytes currently buffered; otherwise, false.
+     */
+    private boolean readAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
+        long endIndex;
+        if (valueTid.variableLength) {
+            byte b = buffer[(int) peekIndex++];
+            if (b < 0) {
+                endIndex = (b & LOWER_SEVEN_BITS_BITMASK);
+            } else {
+                endIndex = readVarUInt_1_0(b);
+            }
+        } else {
+            endIndex = valueTid.length;
+        }
+        endIndex += peekIndex;
+        setMarker(endIndex, valueMarker);
+        if (endIndex > limit) {
+            return true;
+        }
+        byte b = buffer[(int) peekIndex++];
+        int annotationsLength;
+        if (b < 0) {
+            annotationsLength = (b & LOWER_SEVEN_BITS_BITMASK);
+        } else {
+            annotationsLength = (int) readVarUInt_1_0(b);
+        }
+        annotationSequenceMarker.startIndex = peekIndex;
+        annotationSequenceMarker.endIndex = annotationSequenceMarker.startIndex + annotationsLength;
+        peekIndex = annotationSequenceMarker.endIndex;
+        if (peekIndex >= endIndex) {
+            throw new IonException("Annotation wrapper must wrap a value.");
+        }
+        return false;
+    }
+
+    /**
+     * Throws if the given marker represents an empty ordered struct, which is prohibited by the Ion 1.0 specification.
+     * @param marker the marker for the value to check.
+     */
+    private void prohibitEmptyOrderedStruct_1_0(Marker marker) {
+        if (marker.typeId.type == IonType.STRUCT &&
+            marker.typeId.lowerNibble == IonTypeID.ORDERED_STRUCT_NIBBLE &&
+            marker.endIndex == peekIndex
+        ) {
+            throw new IonException("Ordered struct must not be empty.");
+        }
+    }
+
+    /**
+     * Calculates the end index for the given type ID and sets `event` based on the type of value encountered, if any.
+     * At the time of invocation, `peekIndex` must point to the first byte after the value's type ID byte. After return,
+     * `peekIndex` will point to the first byte in the value's representation, or, in the case of a NOP pad, the first
+     * byte that follows the pad.
+     * @param valueTid the type ID of the value.
+     * @param isAnnotated true if the value is annotated.
+     * @return the end index of the value or NOP pad.
+     */
+    private long calculateEndIndex_1_0(IonTypeID valueTid, boolean isAnnotated) {
+        long endIndex;
+        if (valueTid.variableLength) {
+            byte b = buffer[(int) peekIndex++];
+            if (b < 0) {
+                endIndex = (b & LOWER_SEVEN_BITS_BITMASK);
+            } else {
+                endIndex = readVarUInt_1_0(b);
+            }
+        } else {
+            endIndex = valueTid.length;
+        }
+        endIndex += peekIndex;
+        if (valueTid.type != null && valueTid.type.ordinal() >= LIST_TYPE_ORDINAL) {
+            event = Event.START_CONTAINER;
+        } else if (valueTid.isNopPad) {
+            seekPastNopPad(endIndex, isAnnotated);
+        } else {
+            event = Event.START_SCALAR;
+        }
+        return endIndex;
+    }
+
+    /* ---- Ion 1.1 ---- */
+
+    private long readVarUInt_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private boolean readAnnotationWrapperHeader_1_1(IonTypeID valueTid) {
+        throw new UnsupportedOperationException();
+    }
+
+    private long calculateEndIndex_1_1(IonTypeID valueTid, boolean isAnnotated) {
+        throw new UnsupportedOperationException();
+    }
+
+    private void readFieldName_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private boolean isDelimitedEnd_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    boolean skipRemainingDelimitedContainerElements_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private void seekPastDelimitedContainer_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    /* ---- End: version-dependent parsing methods ---- */
+
+    /* ---- Begin: version-agnostic parsing, utility, and public API methods ---- */
+
+    /**
+     * Sets `checkpoint` to the current `peekIndex`, which must be before an unannotated type ID, and seeks the
+     * buffer to that point.
+     */
+    private void setCheckpointBeforeUnannotatedTypeId() {
+        reset();
+        offset = peekIndex;
+        checkpoint = peekIndex;
+    }
+
+    /**
+     * Validates and sets the given marker, which must fit within its parent container (if applicable). The resulting
+     * `startIndex` will be set to `peekIndex` (the next byte to be consumed from the cursor's buffer), and its
+     * `endIndex` will be set to the given value.
+     * @param endIndex the value's end index.
+     * @param markerToSet the marker to set.
+     */
+    private void setMarker(long endIndex, Marker markerToSet) {
+        if (parent != null && endIndex > parent.endIndex && parent.endIndex > -1) {
+            throw new IonException("Value exceeds the length of its parent container.");
+        }
+        markerToSet.startIndex = peekIndex;
+        markerToSet.endIndex = endIndex;
+    }
+
+    /**
+     * Determines whether the cursor has reached the end of the current container. If true, `event` will be set to
+     * END_CONTAINER and information about the current value will be reset.
+     * @return true if the end of the current container has been reached; otherwise, false.
+     */
+    private boolean checkContainerEnd() {
+        if (parent.endIndex > peekIndex) {
+            return false;
+        }
+        if (parent.endIndex == -1) {
+            return isDelimitedEnd_1_1();
+        }
+        if (parent.endIndex == peekIndex) {
+            event = Event.END_CONTAINER;
+            valueTid = null;
+            fieldSid = -1;
+            return true;
+        }
+        throw new IonException("Contained values overflowed the parent container length.");
+    }
+
+    /**
+     * Resets state specific to the current value.
+     */
+    private void reset() {
+        valueMarker.startIndex = -1;
+        valueMarker.endIndex = -1;
+        fieldSid = -1;
+        hasAnnotations = false;
+    }
+
+    /**
+     * Reads the final three bytes of an IVM. `peekIndex` must point to the first byte after the opening `0xE0` byte.
+     * After return, `majorVersion`, `minorVersion`, and `typeIds` will be updated accordingly, and `peekIndex` will
+     * point to the first byte after the IVM.
+     */
+    private void readIvm() {
+        majorVersion = buffer[(int) (peekIndex++)];
+        minorVersion = buffer[(int) (peekIndex++)];
+        if ((buffer[(int) (peekIndex++)] & SINGLE_BYTE_MASK) != IVM_FINAL_BYTE) {
+            throw new IonException("Invalid Ion version marker.");
+        }
+        if (majorVersion != 1) {
+            throw new IonException(String.format("Unsupported Ion version: %d.%d", majorVersion, minorVersion));
+        }
+        if (minorVersion == 0) {
+            typeIds = IonTypeID.TYPE_IDS_1_0;
+        } else {
+            throw new IonException(String.format("Unsupported Ion version: %d.%d", majorVersion, minorVersion));
+        }
+        ivmConsumer.ivmEncountered(majorVersion, minorVersion);
+    }
+
+    /**
+     * Validates and skips a NOP pad. After return, `peekIndex` will point to the first byte after the NOP pad.
+     * @param endIndex the endIndex of the NOP pad.
+     * @param isAnnotated true if the NOP pad occurs within an annotation wrapper (which is illegal); otherwise, false.
+     */
+    private void seekPastNopPad(long endIndex, boolean isAnnotated) {
+        if (isAnnotated) {
+            throw new IonException(
+                "Invalid annotation wrapper: NOP pad may not occur inside an annotation wrapper."
+            );
+        }
+        if (endIndex > limit) {
+            throw new IonException("Invalid NOP pad.");
+        }
+        peekIndex = endIndex;
+        if (parent != null) {
+            checkContainerEnd();
+        }
+    }
+
+    /**
+     * Validates that an annotated value's endIndex matches the annotation wrapper's endIndex (which is contained in
+     * `valueMarker.endIndex`).
+     * @param endIndex the annotated value's endIndex.
+     */
+    private void validateAnnotationWrapperEndIndex(long endIndex) {
+        if (valueMarker.endIndex >= 0 && endIndex != valueMarker.endIndex) {
+            // valueMarker.endIndex refers to the end of the annotation wrapper.
+            throw new IonException("Annotation wrapper length does not match the length of the wrapped value.");
+        }
+    }
+
+    /**
+     * Reads a value header, consuming the value's annotation wrapper header, if any. Upon invocation,
+     * `peekIndex` must be positioned on the first byte that follows the given type ID byte. After return, `peekIndex`
+     * will be positioned after the type ID byte of the value, and `markerToSet.typeId` will be set with the IonTypeID
+     * representing the value.
+     * @param  typeIdByte the type ID byte. This may be an annotation wrapper's type ID.
+     * @param isAnnotated true if this type ID is on a value within an annotation wrapper; false if it is not.
+     * @param markerToSet the Marker to set with information parsed from the type ID and/or annotation wrapper header.
+     * @return false if the header belonged to NOP pad; otherwise, true. When false, the caller should call the method
+     *  again to read the header for the value that follows.
+     */
+    private boolean readHeader(final int typeIdByte, final boolean isAnnotated, final Marker markerToSet) {
+        IonTypeID valueTid = typeIds[typeIdByte];
+        if (!valueTid.isValid) {
+            throw new IonException("Invalid type ID.");
+        } else if (valueTid.type == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
+            if (isAnnotated) {
+                throw new IonException("Nested annotation wrappers are invalid.");
+            }
+            if (minorVersion == 0 ? readAnnotationWrapperHeader_1_0(valueTid) : readAnnotationWrapperHeader_1_1(valueTid)) {
+                return true;
+            }
+            hasAnnotations = true;
+            return readHeader(buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK, true, valueMarker);
+        } else {
+            long endIndex = minorVersion == 0
+                ? calculateEndIndex_1_0(valueTid, isAnnotated)
+                : calculateEndIndex_1_1(valueTid, isAnnotated);
+            if (isAnnotated) {
+                validateAnnotationWrapperEndIndex(endIndex);
+            }
+            setMarker(endIndex, markerToSet);
+            if (endIndex > limit) {
+                event = Event.NEEDS_DATA;
+                return true;
+            }
+        }
+        markerToSet.typeId = valueTid;
+        if (event == Event.START_CONTAINER) {
+            if (minorVersion == 0) {
+                prohibitEmptyOrderedStruct_1_0(markerToSet);
+            }
+            return true;
+        }
+        return event == Event.START_SCALAR;
+    }
+
+    /**
+     * Doubles the size of the cursor's container stack.
+     */
+    private void growContainerStack() {
+        Marker[] newStack = new Marker[containerStack.length * 2];
+        System.arraycopy(containerStack, 0, newStack, 0, containerStack.length);
+        for (int i = containerStack.length; i < newStack.length; i++) {
+            newStack[i] = new Marker(-1 ,-1);
+        }
+        containerStack = newStack;
+    }
+
+    /**
+     * Push a Marker representing the current container onto the stack.
+     */
+    private void pushContainer() {
+        containerIndex++;
+        if (containerIndex >= containerStack.length) {
+            growContainerStack();
+        }
+        parent = containerStack[containerIndex];
+    }
+
+    @Override
+    public Event stepIntoContainer() {
+        if (valueTid == null || valueTid.type.ordinal() < LIST_TYPE_ORDINAL) {
+            throw new IonException("Must be positioned on a container to step in.");
+        }
+        // Push the remaining length onto the stack, seek past the container's header, and increase the depth.
+        pushContainer();
+        parent.typeId = valueTid;
+        parent.endIndex = valueTid.isDelimited ? -1 : valueMarker.endIndex;
+        valueTid = null;
+        event = Event.NEEDS_INSTRUCTION;
+        reset();
+        return event;
+    }
+
+    @Override
+    public Event stepOutOfContainer() {
+        if (parent == null) {
+            // Note: this is IllegalStateException for consistency with the other binary IonReader implementation.
+            throw new IllegalStateException("Cannot step out at top level.");
+        }
+        // Seek past the remaining bytes at this depth and pop from the stack.
+        if (parent.endIndex == -1) {
+            if (skipRemainingDelimitedContainerElements_1_1()) {
+                return event;
+            }
+        } else {
+            peekIndex = parent.endIndex;
+        }
+        setCheckpointBeforeUnannotatedTypeId();
+        containerIndex--;
+        if (containerIndex >= 0) {
+            parent = containerStack[containerIndex];
+        } else {
+            parent = null;
+            containerIndex = -1;
+        }
+
+        valueTid = null;
+        event = Event.NEEDS_INSTRUCTION;
+        return event;
+    }
+
+    /**
+     * Advances to the next value within a container, checking for container end and consuming the field name, if any.
+     * @return true if the end of the container has been reached; otherwise, false.
+     */
+    private boolean nextContainedToken() {
+        if (parent.endIndex == -1) {
+            return isDelimitedEnd_1_1();
+        } else if (parent.endIndex == peekIndex) {
+            event = Event.END_CONTAINER;
+            return true;
+        } else if (parent.endIndex < peekIndex) {
+            throw new IonException("Contained values overflowed the parent container length.");
+        } else if (parent.typeId.type == IonType.STRUCT) {
+            if (minorVersion == 0) {
+                byte b = buffer[(int) peekIndex++];
+                if (b < 0) {
+                    fieldSid = (b & LOWER_SEVEN_BITS_BITMASK);
+                } else {
+                    fieldSid = (int) readVarUInt_1_0(b);
+                }
+            } else {
+                readFieldName_1_1();
+            }
+        }
+        valuePreHeaderIndex = peekIndex;
+        return false;
+    }
+
+    /**
+     * Reports the total number of bytes consumed from the stream since the last report, up to the current `peekIndex`.
+     */
+    private void reportConsumedData() {
+        long totalNumberOfBytesRead = getTotalOffset() + (peekIndex - valuePreHeaderIndex);
+        dataHandler.onData((int) (totalNumberOfBytesRead - lastReportedByteTotal));
+        lastReportedByteTotal = totalNumberOfBytesRead;
+    }
+
+    /**
+     * Advances to the next token, seeking past the previous value if necessary. After return `event` will convey
+     * the result (e.g. START_SCALAR, END_CONTAINER)
+     * @return false if the next token was an Ion version marker or NOP pad; otherwise, true. If false, this method
+     *  should be called again to advance to the following value.
+     */
+    private boolean nextToken() {
+        if (peekIndex < valueMarker.endIndex) {
+            peekIndex = valueMarker.endIndex;
+        } else if (valueTid != null && valueTid.isDelimited) {
+            seekPastDelimitedContainer_1_1();
+        }
+        valueTid = null;
+        if (dataHandler != null) {
+            reportConsumedData();
+        }
+        if (peekIndex >= limit) {
+            setCheckpointBeforeUnannotatedTypeId();
+            if (parent != null && parent.endIndex == peekIndex) {
+                event = Event.END_CONTAINER;
+            }
+            return true;
+        }
+        reset();
+        int b;
+        if (parent == null) { // Depth 0
+            valuePreHeaderIndex = peekIndex;
+            b = buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK;
+            if (b == IVM_START_BYTE) {
+                readIvm();
+                return false;
+            }
+        } else {
+            if (nextContainedToken()) {
+                return true;
+            }
+            b = buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK;
+        }
+        if (readHeader(b, false, valueMarker)) {
+            valueTid = valueMarker.typeId;
+            return true;
+        }
+        valueTid = valueMarker.typeId;
+        return false;
+    }
+
+    @Override
+    public Event nextValue() {
+        event = Event.NEEDS_DATA;
+        while (true) {
+            if (nextToken()) {
+                break;
+            }
+        }
+        return event;
+    }
+
+    @Override
+    public Event fillValue() {
+        event = Event.VALUE_READY;
+        return event;
+    }
+
+    @Override
+    public Event getCurrentEvent() {
+        return event;
+    }
+
+    public int getIonMajorVersion() {
+        return majorVersion;
+    }
+
+    public int getIonMinorVersion() {
+        return minorVersion;
+    }
+
+    public boolean hasAnnotations() {
+        return hasAnnotations;
+    }
+
+    Marker getValueMarker() {
+        return valueMarker;
+    }
+
+    /**
+     * Slices the buffer using the given offset and limit. Slices are treated as if they were at the top level.
+     * @param offset the offset at which the slice will begin.
+     * @param limit the slice's limit.
+     */
+    protected void slice(long offset, long limit) {
+        peekIndex = offset;
+        this.limit = limit;
+        setCheckpointBeforeUnannotatedTypeId();
+        valueMarker.endIndex = -1;
+        event = Event.NEEDS_DATA;
+        valueTid = null;
+        containerIndex = -1; // Slices are treated as if they were at the top level.
+    }
+
+    /**
+     * @return the total number of bytes read since the stream began.
+     */
+    long getTotalOffset() {
+        return valuePreHeaderIndex - startOffset;
+    }
+
+    boolean isByteBacked() {
+        return true;
+    }
+
+    public void registerIvmNotificationConsumer(IvmNotificationConsumer ivmConsumer) {
+        this.ivmConsumer = ivmConsumer;
+    }
+
+    @Override
+    public Event endStream() {
+        if (isAwaitingMoreData()) {
+            throw new IonException("Unexpected EOF.");
+        }
+        return Event.NEEDS_DATA;
+    }
+
+    /**
+     * @return true if the cursor is expecting more data in order to complete a token; otherwise, false.
+     */
+    private boolean isAwaitingMoreData() {
+        return valueMarker.endIndex > limit;
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+    /* ---- End: version-agnostic parsing, utility, and public API methods ---- */
+}
diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
index dc22c0ac3d..8c166fc70c 100644
--- a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
+++ b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion.impl;
 
 import com.amazon.ion.Decimal;
@@ -1046,11 +1049,14 @@ private void nextAtTopLevel() {
             annotationStartPosition = annotationSidsMarker.startIndex;
             annotationEndPosition = annotationSidsMarker.endIndex;
             peekIndex = annotationEndPosition;
-            valueTypeID = IonTypeID.TYPE_IDS[buffer.peek(peekIndex++)];
+            valueTypeID = IonTypeID.TYPE_IDS_1_0[buffer.peek(peekIndex++)];
             int wrappedValueLength = valueTypeID.length;
             if (valueTypeID.variableLength) {
                 wrappedValueLength = readVarUInt();
             }
+            if (valueTypeID.isNopPad) {
+                throw new IonException("Annotated NOP padding is invalid.");
+            }
             valueType = valueTypeID.type;
             if (valueType == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
                 throw new IonException("Nested annotations are invalid.");
@@ -1072,7 +1078,7 @@ private void nextAtTopLevel() {
      * @return the TypeAndLength descriptor for the type ID byte.
      */
     private IonTypeID readTypeId() {
-        valueTypeID = IonTypeID.TYPE_IDS[buffer.peek(peekIndex++)];
+        valueTypeID = IonTypeID.TYPE_IDS_1_0[buffer.peek(peekIndex++)];
         if (!valueTypeID.isValid) {
             throw new IonException("Invalid type ID.");
         }
diff --git a/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java b/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
index 7012cdfab3..e9cffc1897 100644
--- a/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
+++ b/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonBufferConfiguration;
@@ -298,7 +301,7 @@ private void reset() {
      * @param inputStream an InputStream over binary Ion data.
      */
     public IonReaderLookaheadBuffer(final IonBufferConfiguration configuration, final InputStream inputStream) {
-        super(configuration, inputStream);
+        super(configuration, configuration.getOversizedValueHandler(), inputStream);
         pipe.registerNotificationConsumer(
             new ResizingPipedInputStream.NotificationConsumer() {
                 @Override
@@ -412,7 +415,7 @@ private ReadTypeIdResult readTypeID(final boolean isUnannotated) throws Exceptio
         if (header < 0) {
             return ReadTypeIdResult.NO_DATA;
         }
-        valueTid = IonTypeID.TYPE_IDS[header];
+        valueTid = IonTypeID.TYPE_IDS_1_0[header];
         dataHandler.onData(1);
         if (header == IVM_START_BYTE) {
             if (!isUnannotated) {
diff --git a/src/com/amazon/ion/impl/IonTypeID.java b/src/com/amazon/ion/impl/IonTypeID.java
index 95b5299750..1db102265a 100644
--- a/src/com/amazon/ion/impl/IonTypeID.java
+++ b/src/com/amazon/ion/impl/IonTypeID.java
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonType;
@@ -24,7 +27,7 @@ final class IonTypeID {
     static final IonType ION_TYPE_ANNOTATION_WRAPPER = IonType.DATAGRAM;
 
     // Lookup table from type ID to IonType. See https://amazon-ion.github.io/ion-docs/docs/binary.html#typed-value-formats
-    static final IonType[] ION_TYPES = new IonType[] {
+    static final IonType[] ION_TYPES_1_0 = new IonType[] {
         IonType.NULL,
         IonType.BOOL,
         IonType.INT,
@@ -43,28 +46,40 @@ final class IonTypeID {
         null // The 0xF type code is illegal in Ion 1.0.
     };
 
+    // Singleton invalid type ID.
+    private static final IonTypeID ALWAYS_INVALID_TYPE_ID = new IonTypeID((byte) 0xFF, 0);
+
     // Pre-compute all possible type ID bytes.
-    static final IonTypeID[] TYPE_IDS;
+    static final IonTypeID[] TYPE_IDS_NO_IVM;
+    static final IonTypeID[] TYPE_IDS_1_0;
     static {
-        TYPE_IDS = new IonTypeID[NUMBER_OF_BYTES];
+        TYPE_IDS_NO_IVM = new IonTypeID[NUMBER_OF_BYTES];
+        TYPE_IDS_1_0 = new IonTypeID[NUMBER_OF_BYTES];
         for (int b = 0x00; b < NUMBER_OF_BYTES; b++) {
-            TYPE_IDS[b] = new IonTypeID((byte) b);
+            TYPE_IDS_NO_IVM[b] = ALWAYS_INVALID_TYPE_ID;
+            TYPE_IDS_1_0[b] = new IonTypeID((byte) b, 0);
         }
     }
 
     final IonType type;
-    final byte length;
+    final int length;
     final boolean variableLength;
     final boolean isNull;
     final boolean isNopPad;
     final byte lowerNibble;
     final boolean isValid;
     final boolean isNegativeInt;
+    final boolean isTemplateInvocation; // Unused in Ion 1.0
+    final int templateId; // Unused in Ion 1.0
+    final boolean isDelimited; // Unused in Ion 1.0
+    // For structs, denotes whether field names are VarSyms. For symbols, denotes whether the text is inline.
+    // For annotation wrappers, denotes whether tokens are VarSyms.
+    final boolean isInlineable; // Unused in Ion 1.0
 
     /**
      * Determines whether the Ion spec allows this particular upperNibble/lowerNibble pair.
      */
-    private static boolean isValid(byte upperNibble, byte lowerNibble, IonType type) {
+    private static boolean isValid_1_0(byte upperNibble, byte lowerNibble, IonType type) {
         if (upperNibble == TYPE_CODE_INVALID) {
             // Type code F is unused in Ion 1.0.
             return false;
@@ -91,26 +106,39 @@ private static boolean isValid(byte upperNibble, byte lowerNibble, IonType type)
         return true;
     }
 
-    private IonTypeID(byte id) {
-        byte upperNibble = (byte) ((id >> BITS_PER_NIBBLE) & LOW_NIBBLE_BITMASK);
-        this.lowerNibble = (byte) (id & LOW_NIBBLE_BITMASK);
-        this.type = ION_TYPES[upperNibble];
-        this.isValid = isValid(upperNibble, lowerNibble, type);
-        this.isNull = lowerNibble == NULL_VALUE_NIBBLE;
-        this.isNopPad = type == IonType.NULL && !isNull;
-        byte length = lowerNibble;
-        if ((type == IonType.NULL && !isNopPad) || type == IonType.BOOL || !isValid) {
-            variableLength = false;
-            length = 0;
-        } else if (type == IonType.STRUCT && length == ORDERED_STRUCT_NIBBLE) {
-            variableLength = true;
+    private IonTypeID(byte id, int minorVersion) {
+        if (minorVersion == 0) {
+            byte upperNibble = (byte) ((id >> BITS_PER_NIBBLE) & LOW_NIBBLE_BITMASK);
+            this.lowerNibble = (byte) (id & LOW_NIBBLE_BITMASK);
+            if (upperNibble == 0 && lowerNibble != NULL_VALUE_NIBBLE) {
+                this.isNopPad = true;
+                this.type = null;
+            } else {
+                this.isNopPad = false;
+                this.type = ION_TYPES_1_0[upperNibble];
+            }
+            this.isValid = isValid_1_0(upperNibble, lowerNibble, type);
+            this.isNull = lowerNibble == NULL_VALUE_NIBBLE;
+            byte length = lowerNibble;
+            if (type == IonType.NULL || type == IonType.BOOL || !isValid) {
+                variableLength = false;
+                length = 0;
+            } else if (type == IonType.STRUCT && length == ORDERED_STRUCT_NIBBLE) {
+                variableLength = true;
+            } else {
+                variableLength = length == VARIABLE_LENGTH_NIBBLE;
+            }
+            if (isNull) {
+                length = 0;
+            }
+            this.isNegativeInt = type == IonType.INT && upperNibble == NEGATIVE_INT_TYPE_CODE;
+            this.length = length;
+            this.isTemplateInvocation = false;
+            this.templateId = -1;
+            this.isDelimited = false;
+            this.isInlineable = false;
         } else {
-            variableLength = length == VARIABLE_LENGTH_NIBBLE;
-        }
-        if (isNull) {
-            length = 0;
+            throw new IllegalStateException("Only Ion 1.0 is currently supported.");
         }
-        this.isNegativeInt = type == IonType.INT && upperNibble == NEGATIVE_INT_TYPE_CODE;
-        this.length = length;
     }
 }
diff --git a/src/com/amazon/ion/impl/Marker.java b/src/com/amazon/ion/impl/Marker.java
new file mode 100644
index 0000000000..72d179747e
--- /dev/null
+++ b/src/com/amazon/ion/impl/Marker.java
@@ -0,0 +1,34 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+/**
+ * Holds the start and end indices of a slice of the buffer.
+ */
+class Marker {
+
+    /**
+     * The type ID that governs the slice.
+     */
+    IonTypeID typeId = null;
+
+    /**
+     * Index of the first byte in the slice.
+     */
+    long startIndex;
+
+    /**
+     * Index of the first byte after the end of the slice.
+     */
+    long endIndex;
+
+    /**
+     * @param startIndex index of the first byte in the slice.
+     * @param length     the number of bytes in the slice.
+     */
+    Marker(final int startIndex, final int length) {
+        this.startIndex = startIndex;
+        this.endIndex = startIndex + length;
+    }
+}
diff --git a/src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java b/src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java
index 2535b51750..a5128a0893 100644
--- a/src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java
+++ b/src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion.impl;
 
 import com.amazon.ion.BufferConfiguration;
@@ -57,7 +60,11 @@ abstract class ReaderLookaheadBufferBase implements ReaderLookaheadBuffer {
      * @param configuration the buffer configuration.
      * @param inputStream an InputStream over Ion data.
      */
-    ReaderLookaheadBufferBase(final BufferConfiguration<?> configuration, final InputStream inputStream) {
+    ReaderLookaheadBufferBase(
+        final BufferConfiguration<?> configuration,
+        final BufferConfiguration.OversizedValueHandler oversizedValueHandler,
+        final InputStream inputStream
+    ) {
         input = inputStream;
         pipe = new ResizingPipedInputStream(
             configuration.getInitialBufferSize(),
@@ -65,7 +72,7 @@ abstract class ReaderLookaheadBufferBase implements ReaderLookaheadBuffer {
             true
         );
         maximumBufferSize = configuration.getMaximumBufferSize();
-        oversizedValueHandler = configuration.getOversizedValueHandler();
+        this.oversizedValueHandler = oversizedValueHandler;
         dataHandler = configuration.getDataHandler();
         clearMark();
     }
diff --git a/src/com/amazon/ion/util/IonStreamUtils.java b/src/com/amazon/ion/util/IonStreamUtils.java
index 798fcfc62a..f7ba3a9c84 100644
--- a/src/com/amazon/ion/util/IonStreamUtils.java
+++ b/src/com/amazon/ion/util/IonStreamUtils.java
@@ -18,6 +18,7 @@
 import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
 import static com.amazon.ion.util.GzipOrRawInputStream.GZIP_HEADER;
 
+import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonWriter;
@@ -123,6 +124,13 @@ public static InputStream unGzip(InputStream in)
         return new GzipOrRawInputStream(in);
     }
 
+    /**
+     * Wraps the given Exception with IonException and throws.
+     * @param e the exception to wrap.
+     */
+    public static void throwAsIonException(Exception e) {
+        throw new IonException(e);
+    }
 
     //=========================================================================
 
diff --git a/test/com/amazon/ion/impl/IonCursorBinaryTest.java b/test/com/amazon/ion/impl/IonCursorBinaryTest.java
new file mode 100644
index 0000000000..b6537d901a
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonCursorBinaryTest.java
@@ -0,0 +1,252 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonCursor;
+import com.amazon.ion.IvmNotificationConsumer;
+import org.junit.Before;
+import org.junit.Test;
+
+import static com.amazon.ion.BitUtils.bytes;
+import static com.amazon.ion.IonCursor.Event.END_CONTAINER;
+import static com.amazon.ion.IonCursor.Event.NEEDS_DATA;
+import static com.amazon.ion.IonCursor.Event.NEEDS_INSTRUCTION;
+import static com.amazon.ion.IonCursor.Event.VALUE_READY;
+import static com.amazon.ion.IonCursor.Event.START_CONTAINER;
+import static com.amazon.ion.IonCursor.Event.START_SCALAR;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+public class IonCursorBinaryTest {
+
+    private static final IonBufferConfiguration STANDARD_BUFFER_CONFIGURATION = IonBufferConfiguration.Builder.standard().build();
+
+    private static Marker loadScalar(IonCursorBinary cursor) {
+        IonCursor.Event event = cursor.fillValue();
+        assertEquals(VALUE_READY, event);
+        Marker marker = cursor.getValueMarker();
+        assertNotNull(marker);
+        return marker;
+    }
+
+    private IonCursorBinary cursor = null;
+    private int numberOfIvmsEncountered = 0;
+
+    private final IvmNotificationConsumer countingIvmConsumer = (majorVersion, minorVersion) -> numberOfIvmsEncountered++;
+
+    @Before
+    public void setup() {
+        cursor = null;
+        numberOfIvmsEncountered = 0;
+    }
+
+    private void initializeCursor(int... data) {
+        cursor = new IonCursorBinary(STANDARD_BUFFER_CONFIGURATION, bytes(data), 0, data.length);
+        cursor.registerIvmNotificationConsumer(countingIvmConsumer);
+    }
+
+    @Test
+    public void basicContainer() {
+        initializeCursor(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4
+            0x21, 0x01 // Int length 1, starting at byte index 7
+        );
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+        assertEquals(START_SCALAR, cursor.nextValue());
+        Marker marker = loadScalar(cursor);
+        assertEquals(7, marker.startIndex);
+        assertEquals(8, marker.endIndex);
+        assertEquals(END_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, cursor.nextValue());
+    }
+
+    @Test
+    public void basicStrings() {
+        initializeCursor(
+            0xE0, 0x01, 0x00, 0xEA,
+            0x83, 'f', 'o', 'o', // String length 3, starting at byte index 5
+            0x83, 'b', 'a', 'r' // String length 3, starting at byte index 9
+        );
+        assertEquals(START_SCALAR, cursor.nextValue());
+        Marker marker = loadScalar(cursor);
+        assertEquals(5, marker.startIndex);
+        assertEquals(8, marker.endIndex);
+        assertEquals(START_SCALAR, cursor.nextValue());
+        marker = loadScalar(cursor);
+        assertEquals(9, marker.startIndex);
+        assertEquals(12, marker.endIndex);
+        assertEquals(NEEDS_DATA, cursor.nextValue());
+    }
+
+    @Test
+    public void basicNoFill() {
+        initializeCursor(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4
+            0x21, 0x01 // Int length 1, starting at byte index 7
+        );
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+        assertEquals(START_SCALAR, cursor.nextValue());
+        assertEquals(END_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, cursor.nextValue());
+    }
+
+    @Test
+    public void basicStepOutEarly() {
+        initializeCursor(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4
+            0x21, 0x01 // Int length 1, starting at byte index 7
+        );
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+        assertEquals(START_SCALAR, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, cursor.nextValue());
+    }
+
+    @Test
+    public void basicTopLevelSkip() {
+        initializeCursor(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4
+            0x21, 0x01 // Int length 1, starting at byte index 7
+        );
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_DATA, cursor.nextValue());
+    }
+
+    @Test
+    public void basicTopLevelSkipThenConsume() {
+        initializeCursor(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4
+            0x21, 0x01, // Int length 1, starting at byte index 7
+            0x21, 0x03 // Int length 1, starting at byte index 9
+        );
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(START_SCALAR, cursor.nextValue());
+        Marker marker = loadScalar(cursor);
+        assertEquals(9, marker.startIndex);
+        assertEquals(10, marker.endIndex);
+        assertEquals(NEEDS_DATA, cursor.nextValue());
+    }
+
+    @Test
+    public void nestedContainers() {
+        initializeCursor(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD6, // Struct length 6
+            0x83, // Field SID 3
+            0xB1, // List length 1
+            0x40, // Float length 0
+            0x84, // Field SID 4
+            0x21, 0x01 // Int length 1, starting at byte index 10
+        );
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+        assertEquals(START_SCALAR, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+        assertEquals(START_SCALAR, cursor.nextValue());
+        Marker marker = loadScalar(cursor);
+        assertEquals(10, marker.startIndex);
+        assertEquals(11, marker.endIndex);
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, cursor.nextValue());
+    }
+
+    @Test
+    public void fillContainerAtDepth0() {
+        initializeCursor(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD6, // Struct length 6, contents start at index 5
+            0x83, // Field SID 3
+            0xB1, // List length 1
+            0x40, // Float length 0
+            0x84, // Field SID 4
+            0x21, 0x01 // Int length 1, starting at byte index 10
+        );
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(VALUE_READY, cursor.fillValue());
+        Marker marker = cursor.getValueMarker();
+        assertEquals(5, marker.startIndex);
+        assertEquals(11, marker.endIndex);
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+        assertEquals(START_SCALAR, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+        assertEquals(START_SCALAR, cursor.nextValue());
+        marker = loadScalar(cursor);
+        assertEquals(10, marker.startIndex);
+        assertEquals(11, marker.endIndex);
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, cursor.nextValue());
+    }
+
+    @Test
+    public void fillContainerAtDepth1() {
+        initializeCursor(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD6, // Struct length 6
+            0x83, // Field SID 3
+            0xB1, // List length 1, contents start at index 7
+            0x40, // Float length 0
+            0x84, // Field SID 4
+            0x21, 0x01 // Int length 1, starting at byte index 10
+        );
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(VALUE_READY, cursor.fillValue());
+        Marker marker = cursor.getValueMarker();
+        assertEquals(7, marker.startIndex);
+        assertEquals(8, marker.endIndex);
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+        assertEquals(START_SCALAR, cursor.nextValue());
+        assertEquals(END_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+    }
+
+    @Test
+    public void fillContainerThenSkip() {
+        initializeCursor(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD6, // Struct length 6
+            0x83, // Field SID 3
+            0xB1, // List length 1, contents start at index 7
+            0x40, // Float length 0
+            0x84, // Field SID 4
+            0x21, 0x01, // Int length 1, starting at byte index 10
+            0xD2, // Struct length 2
+            0x84, // Field SID 4
+            0x20 // Int length 0, at byte index 14
+        );
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(VALUE_READY, cursor.fillValue());
+        assertEquals(START_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+        assertEquals(START_SCALAR, cursor.nextValue());
+        assertEquals(VALUE_READY, cursor.fillValue());
+        Marker marker = cursor.getValueMarker();
+        assertEquals(14, marker.startIndex);
+        assertEquals(14, marker.endIndex);
+        assertEquals(END_CONTAINER, cursor.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, cursor.nextValue());
+    }
+}

From 5223afd4d3c5321c62db56a468fb4988805f4d36 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 29 Jun 2023 12:22:45 -0700
Subject: [PATCH 261/490] Adds refillable buffer management to IonCursorBinary.

---
 src/com/amazon/ion/impl/IonCursorBinary.java | 465 ++++++++++++++++++-
 1 file changed, 462 insertions(+), 3 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index cfe323f15f..c1b95ebc14 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -10,8 +10,14 @@
 import com.amazon.ion.IonType;
 import com.amazon.ion.IvmNotificationConsumer;
 
+import java.io.ByteArrayInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
 import java.nio.ByteBuffer;
 
+import static com.amazon.ion.util.IonStreamUtils.throwAsIonException;
+
 /**
  * An IonCursor over binary Ion data, capable of buffering or skipping Ion values at any depth. Records byte
  * indices of the value currently buffered, enabling parsers direct access to the bytes in the value's representation.
@@ -30,6 +36,79 @@ class IonCursorBinary implements IonCursor {
     // a new ContainerInfo. Depths greater than 8 will be rare.
     private static final int CONTAINER_STACK_INITIAL_CAPACITY = 8;
 
+    /**
+     * The state representing where the cursor left off after the previous operation.
+     */
+    private enum State {
+        FILL,
+        FILL_DELIMITED,
+        SEEK,
+        SEEK_DELIMITED,
+        READY,
+        TERMINATED
+    }
+
+    /**
+     * State only used when the cursor's data source is refillable and the cursor is in slow mode.
+     */
+    private static class RefillableState {
+
+        /**
+         * The current size of the internal buffer.
+         */
+        private long capacity;
+
+        /**
+         * The total number of bytes that have been discarded (shifted out of the buffer or skipped directly from
+         * the input stream).
+         */
+        protected long totalDiscardedBytes = 0;
+
+        /**
+         * The state of the reader when in slow mode (when slow mode is disabled, the reader is always implicitly in the
+         * READY state). This enables the reader to complete the previous IonCursor API invocation if it returned a
+         * NEEDS_DATA event.
+         */
+        State state = State.READY;
+
+        /**
+         * The number of bytes that still need to be consumed from the input during a fill or seek operation.
+         */
+        long bytesRequested = 0;
+
+        /**
+         * The maximum size of the buffer. If the user attempts to buffer more bytes than this, an exception will be raised.
+         */
+        final int maximumBufferSize;
+
+        /**
+         * The source of data, for refillable streams.
+         */
+        private final InputStream inputStream;
+
+        /**
+         * Handler invoked when a single value would exceed `maximumBufferSize`.
+         */
+        private BufferConfiguration.OversizedValueHandler oversizedValueHandler;
+
+        /**
+         * Indicates whether the current value is being skipped due to being oversized.
+         */
+        private boolean isSkippingCurrentValue = false;
+
+        /**
+         * The number of bytes of an oversized value skipped during single-byte read operations.
+         */
+        private int individualBytesSkippedWithoutBuffering = 0;
+
+        RefillableState(InputStream inputStream, int capacity, int maximumBufferSize) {
+            this.inputStream = inputStream;
+            this.capacity = capacity;
+            this.maximumBufferSize = maximumBufferSize;
+        }
+
+    }
+
     /**
      * Stack to hold container info. Stepping into a container results in a push; stepping out results in a pop.
      */
@@ -143,6 +222,11 @@ class IonCursorBinary implements IonCursor {
      */
     private IonTypeID[] typeIds = IonTypeID.TYPE_IDS_NO_IVM;
 
+    /**
+     * Holds information necessary for reading from refillable input. Null if the cursor is byte-backed.
+     */
+    private final RefillableState refillableState;
+
     /**
      * The total number of bytes that had been consumed from the stream as of the last time progress was reported to
      * the data handler.
@@ -178,8 +262,362 @@ class IonCursorBinary implements IonCursor {
         this.offset = offset;
         this.limit = offset + length;
         byteBuffer = ByteBuffer.wrap(buffer, offset, length);
+        refillableState = null;
+    }
+
+    /**
+     * The standard {@link IonBufferConfiguration}. This will be used unless the user chooses custom settings.
+     */
+    private static final IonBufferConfiguration STANDARD_BUFFER_CONFIGURATION =
+        IonBufferConfiguration.Builder.standard().build();
+
+    /**
+     * @param value a non-negative number.
+     * @return the exponent of the next power of two greater than or equal to the given number.
+     */
+    private static int logBase2(int value) {
+        return 32 - Integer.numberOfLeadingZeros(value == 0 ? 0 : value - 1);
+    }
+
+    /**
+     * @param value a non-negative number
+     * @return the next power of two greater than or equal to the given number.
+     */
+    static int nextPowerOfTwo(int value) {
+        return (int) Math.pow(2, logBase2(value));
+    }
+
+    /**
+     * Cache of configurations for fixed-sized streams. FIXED_SIZE_CONFIGURATIONS[i] returns a configuration with
+     * buffer size max(8, 2^i). Retrieve a configuration large enough for a given size using
+     * FIXED_SIZE_CONFIGURATIONS(logBase2(size)). Only supports sizes less than or equal to
+     * STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize().
+     */
+    private static final IonBufferConfiguration[] FIXED_SIZE_CONFIGURATIONS;
+
+    static {
+        int maxBufferSizeExponent = logBase2(STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize());
+        FIXED_SIZE_CONFIGURATIONS = new IonBufferConfiguration[maxBufferSizeExponent + 1];
+        for (int i = 0; i <= maxBufferSizeExponent; i++) {
+            // Create a buffer configuration for buffers of size 2^i. The minimum size is 8: the smallest power of two
+            // larger than the minimum buffer size allowed.
+            int size = Math.max(8, (int) Math.pow(2, i));
+            FIXED_SIZE_CONFIGURATIONS[i] = IonBufferConfiguration.Builder.from(STANDARD_BUFFER_CONFIGURATION)
+                .withInitialBufferSize(size)
+                .withMaximumBufferSize(size)
+                .build();
+        }
+    }
+
+    /**
+     * Validates the given configuration.
+     * @param configuration the configuration to validate.
+     * @return the validated configuration.
+     */
+    private static IonBufferConfiguration validate(IonBufferConfiguration configuration) {
+        if (configuration.getInitialBufferSize() < 1) {
+            throw new IllegalArgumentException("Initial buffer size must be at least 1.");
+        }
+        if (configuration.getMaximumBufferSize() < configuration.getInitialBufferSize()) {
+            throw new IllegalArgumentException("Maximum buffer size cannot be less than the initial buffer size.");
+        }
+        return configuration;
+    }
+
+    /**
+     * Constructs a refillable cursor from the given input stream.
+     * @param configuration the configuration to use.
+     * @param alreadyRead the byte array containing the bytes already read (often the IVM).
+     * @param alreadyReadOff the offset into `alreadyRead` at which the first byte that was already read exists.
+     * @param alreadyReadLen the number of bytes already read from `alreadyRead`.
+     */
+    IonCursorBinary(
+        IonBufferConfiguration configuration,
+        InputStream inputStream,
+        byte[] alreadyRead,
+        int alreadyReadOff,
+        int alreadyReadLen
+    ) {
+        this.dataHandler = (configuration == null) ? null : configuration.getDataHandler();
+        if (configuration == null) {
+            if (inputStream instanceof ByteArrayInputStream) {
+                // ByteArrayInputStreams are fixed-size streams. Clamp the reader's internal buffer size at the size of
+                // the stream to avoid wastefully allocating extra space that will never be needed. It is still
+                // preferable for the user to manually specify the buffer size if it's less than the default, as doing
+                // so allows this branch to be skipped.
+                int fixedBufferSize;
+                try {
+                    fixedBufferSize = inputStream.available();
+                } catch (IOException e) {
+                    // ByteArrayInputStream.available() does not throw.
+                    throw new IllegalStateException(e);
+                }
+                if (alreadyReadLen > 0) {
+                    fixedBufferSize += alreadyReadLen;
+                }
+                if (STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize() > fixedBufferSize) {
+                    configuration = FIXED_SIZE_CONFIGURATIONS[logBase2(fixedBufferSize)];
+                } else {
+                    configuration = STANDARD_BUFFER_CONFIGURATION;
+                }
+            } else {
+                configuration = STANDARD_BUFFER_CONFIGURATION;
+            }
+        }
+        validate(configuration);
+        peekIndex = 0;
+        checkpoint = 0;
+
+        for (int i = 0; i < CONTAINER_STACK_INITIAL_CAPACITY; i++) {
+            containerStack[i] = new Marker(-1, -1);
+        }
+
+        this.buffer = new byte[configuration.getInitialBufferSize()];
+        this.startOffset = 0;
+        this.offset = 0;
+        this.limit = 0;
+        if (alreadyReadLen > 0) {
+            System.arraycopy(alreadyRead, alreadyReadOff, buffer, 0, alreadyReadLen);
+            limit = alreadyReadLen;
+        }
+        byteBuffer = ByteBuffer.wrap(buffer, 0, configuration.getInitialBufferSize());
+        refillableState = new RefillableState(
+            inputStream,
+            configuration.getInitialBufferSize(),
+            configuration.getMaximumBufferSize()
+        );
+    }
+
+    /* ---- Begin: internal buffer manipulation methods ---- */
+
+    /**
+     * @param index a byte index in the buffer.
+     * @return the number of bytes available in the buffer after the given index.
+     */
+    private long availableAt(long index) {
+        return limit - index;
+    }
+
+    /**
+     * Ensures that there is space for at least 'minimumNumberOfBytesRequired' additional bytes in the buffer,
+     * growing the buffer if necessary. May consolidate buffered bytes to the beginning of the buffer, shifting indices
+     * accordingly.
+     * @param minimumNumberOfBytesRequired the minimum number of additional bytes to buffer.
+     * @return true if the buffer has sufficient capacity; otherwise, false.
+     */
+    private boolean ensureCapacity(long minimumNumberOfBytesRequired) {
+        if (freeSpaceAt(offset) >= minimumNumberOfBytesRequired) {
+            // No need to shift any bytes or grow the buffer.
+            return true;
+        }
+        int maximumFreeSpace = refillableState.maximumBufferSize;
+        int startOffset = (int) offset;
+        if (minimumNumberOfBytesRequired > maximumFreeSpace) {
+            refillableState.isSkippingCurrentValue = true;
+            return false;
+        }
+        long shortfall = minimumNumberOfBytesRequired - refillableState.capacity;
+        if (shortfall > 0) {
+            int newSize = (int) Math.min(Math.max(refillableState.capacity * 2, nextPowerOfTwo((int) (refillableState.capacity + shortfall))), maximumFreeSpace);
+            byte[] newBuffer = new byte[newSize];
+            moveBytesToStartOfBuffer(newBuffer, startOffset);
+            refillableState.capacity = newSize;
+            buffer = newBuffer;
+            byteBuffer = ByteBuffer.wrap(buffer, (int) offset, (int) refillableState.capacity);
+        } else {
+            // The current capacity can accommodate the requested size; move the existing bytes to the beginning
+            // to make room for the remaining requested bytes to be filled at the end.
+            moveBytesToStartOfBuffer(buffer, startOffset);
+        }
+        return true;
+    }
+
+    /**
+     * Attempts to fill the buffer so that it contains at least `numberOfBytes` after `index`.
+     * @param index the index after which to fill.
+     * @param numberOfBytes the number of bytes after `index` that need to be present.
+     * @return false if not enough bytes were available in the stream to satisfy the request; otherwise, true.
+     */
+    private boolean fillAt(long index, long numberOfBytes) {
+        long shortfall = numberOfBytes - availableAt(index);
+        if (shortfall > 0) {
+            refillableState.bytesRequested = numberOfBytes + (index - offset);
+            if (ensureCapacity(refillableState.bytesRequested)) {
+                // Fill all the free space, not just the shortfall; this reduces I/O.
+                refill(freeSpaceAt(limit));
+                shortfall = refillableState.bytesRequested - availableAt(offset);
+            } else {
+                // The request cannot be satisfied, but not because data was unavailable. Return normally; it is the
+                // caller's responsibility to recover.
+                shortfall = 0;
+            }
+        }
+        if (shortfall <= 0) {
+            refillableState.bytesRequested = 0;
+            refillableState.state = State.READY;
+            return true;
+        }
+        refillableState.state = State.FILL;
+        return false;
+    }
+
+    /**
+     * Moves all buffered (but not yet read) bytes from 'buffer' to the destination buffer.
+     * @param destinationBuffer the destination buffer, which may be 'buffer' itself or a new buffer.
+     */
+    private void moveBytesToStartOfBuffer(byte[] destinationBuffer, int fromIndex) {
+        long size = availableAt(fromIndex);
+        if (size > 0) {
+            System.arraycopy(buffer, fromIndex, destinationBuffer, 0, (int) size);
+        }
+        if (fromIndex > 0) {
+            shiftIndicesLeft(fromIndex);
+        }
+        offset = 0;
+        limit = size;
+    }
+
+    /**
+     * @return the number of bytes that can be written at the end of the buffer.
+     */
+    private long freeSpaceAt(long index) {
+        return refillableState.capacity - index;
+    }
+
+    /**
+     * Reads a single byte without adding it to the buffer. Used when skipping an oversized value, in cases where
+     * the byte values are important (e.g. within the header of the oversized value, in order to determine
+     * the number of bytes to skip).
+     * @return the next byte, or -1 if the stream is at its end.
+     */
+    private int readByteWithoutBuffering() {
+        int b = -1;
+        try {
+            b = refillableState.inputStream.read();
+        } catch (IOException e) {
+            throwAsIonException(e);
+        }
+        if (b >= 0) {
+            refillableState.individualBytesSkippedWithoutBuffering += 1;
+        }
+        return b;
+    }
+
+    /**
+     * Peek at the next byte from the stream, assuming it will be buffered unless the current value is being skipped.
+     * @return the byte, or -1 if the end of the stream has been reached.
+     */
+    private int slowPeekByte() {
+        if (refillableState.isSkippingCurrentValue) {
+            return readByteWithoutBuffering();
+        }
+        return buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK;
+    }
+
+    /**
+     * Read the next byte from the stream, ensuring the byte is buffered.
+     * @return the byte, or -1 if the end of the stream has been reached.
+     */
+    private int slowReadByte() {
+        if (refillableState.isSkippingCurrentValue) {
+            // If the value is being skipped, the byte will not have been buffered.
+            return readByteWithoutBuffering();
+        }
+        if (!fillAt(peekIndex, 1)) {
+            return -1;
+        }
+        return slowPeekByte();
+    }
+
+    /**
+     * Shift all active container end indices left by the given amount. This is used when bytes have been shifted
+     * to the start of the buffer in order to make room at the end.
+     * @param shiftAmount the amount to shift left.
+     */
+    private void shiftContainerEnds(long shiftAmount) {
+        for (int i = containerIndex; i >= 0; i--) {
+            if (containerStack[i].endIndex > 0) {
+                containerStack[i].endIndex -= shiftAmount;
+            }
+        }
+    }
+
+    /**
+     * Shift all indices left by the given amount. This is used when data is moved in the underlying
+     * buffer either due to buffer growth or NOP padding being reclaimed to make room for a value that would otherwise
+     * exceed the buffer's maximum size.
+     * @param shiftAmount the amount to shift left.
+     */
+    private void shiftIndicesLeft(int shiftAmount) {
+        peekIndex = Math.max(peekIndex - shiftAmount, 0);
+        valuePreHeaderIndex -= shiftAmount;
+        valueMarker.startIndex -= shiftAmount;
+        valueMarker.endIndex -= shiftAmount;
+        checkpoint -= shiftAmount;
+        if (annotationSequenceMarker.startIndex > -1) {
+            annotationSequenceMarker.startIndex -= shiftAmount;
+            annotationSequenceMarker.endIndex -= shiftAmount;
+        }
+        shiftContainerEnds(shiftAmount);
+        refillableState.totalDiscardedBytes += shiftAmount;
     }
 
+    /**
+     * Fills the buffer with up to the requested number of additional bytes. It is the caller's responsibility to
+     * ensure that there is space in the buffer.
+     * @param numberOfBytesToFill the number of additional bytes to attempt to add to the buffer.
+     */
+    private void refill(long numberOfBytesToFill) {
+        int numberOfBytesFilled = -1;
+        try {
+            numberOfBytesFilled = refillableState.inputStream.read(buffer, (int) limit, (int) numberOfBytesToFill);
+        } catch (IOException e) {
+            throwAsIonException(e);
+        }
+        if (numberOfBytesFilled < 0) {
+            return;
+        }
+        limit += numberOfBytesFilled;
+    }
+
+    /**
+     * Seeks forward in the stream up to the requested number of bytes, from `offset`.
+     * @param numberOfBytes the number of bytes to seek from `offset`.
+     * @return true if the seek is complete; otherwise, false.
+     */
+    private boolean slowSeek(long numberOfBytes) {
+        long size = availableAt(offset);
+        long unbufferedBytesToSkip = numberOfBytes - size;
+        if (unbufferedBytesToSkip <= 0) {
+            offset += numberOfBytes;
+            refillableState.bytesRequested = 0;
+            refillableState.state = State.READY;
+            return true;
+        }
+        offset = limit;
+        long skipped = 0;
+        try {
+            skipped = refillableState.inputStream.skip(unbufferedBytesToSkip);
+        } catch (EOFException e) {
+            // Certain InputStream implementations (e.g. GZIPInputStream) throw EOFException if more bytes are requested
+            // to skip than are currently available (e.g. if a header or trailer is incomplete).
+        } catch (IOException e) {
+            throwAsIonException(e);
+        }
+        refillableState.totalDiscardedBytes += skipped;
+        long shortfall = numberOfBytes - (skipped + size);
+        if (shortfall <= 0) {
+            refillableState.bytesRequested = 0;
+            refillableState.state = State.READY;
+            return true;
+        }
+        refillableState.bytesRequested = shortfall;
+        refillableState.state = State.SEEK;
+        return false;
+    }
+
+    /* ---- End: internal buffer manipulation methods ---- */
+
     /* ---- Begin: version-dependent parsing methods ---- */
     /* ---- Ion 1.0 ---- */
 
@@ -686,17 +1124,24 @@ protected void slice(long offset, long limit) {
      * @return the total number of bytes read since the stream began.
      */
     long getTotalOffset() {
-        return valuePreHeaderIndex - startOffset;
+        return valuePreHeaderIndex + (refillableState == null ? -startOffset : refillableState.totalDiscardedBytes);
     }
 
     boolean isByteBacked() {
-        return true;
+        return refillableState == null;
     }
 
     public void registerIvmNotificationConsumer(IvmNotificationConsumer ivmConsumer) {
         this.ivmConsumer = ivmConsumer;
     }
 
+    void registerOversizedValueHandler(BufferConfiguration.OversizedValueHandler oversizedValueHandler) {
+        // Non-refillable streams cannot overflow.
+        if (refillableState != null) {
+            refillableState.oversizedValueHandler = oversizedValueHandler;
+        }
+    }
+
     @Override
     public Event endStream() {
         if (isAwaitingMoreData()) {
@@ -712,9 +1157,23 @@ private boolean isAwaitingMoreData() {
         return valueMarker.endIndex > limit;
     }
 
+    /**
+     * Terminates the cursor. Called when a non-recoverable event occurs, like encountering a symbol table that
+     * exceeds the maximum buffer size.
+     */
+    void terminate() {
+        refillableState.state = State.TERMINATED;
+    }
+
     @Override
     public void close() {
-
+        if (refillableState != null) {
+            try {
+                refillableState.inputStream.close();
+            } catch (IOException e) {
+                throwAsIonException(e);
+            }
+        }
     }
 
     /* ---- End: version-agnostic parsing, utility, and public API methods ---- */

From b593bca4b5dc4e58a429a06c75cb5bba011c0d29 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 29 Jun 2023 12:50:24 -0700
Subject: [PATCH 262/490] Allows IonCursorBinary to read from growing input
 streams.

---
 src/com/amazon/ion/impl/IonCursorBinary.java  | 664 +++++++++++++++++-
 .../amazon/ion/impl/IonCursorBinaryTest.java  |  26 +-
 2 files changed, 685 insertions(+), 5 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index c1b95ebc14..bdb6df2cdc 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -25,9 +25,13 @@
 class IonCursorBinary implements IonCursor {
 
     private static final int LOWER_SEVEN_BITS_BITMASK = 0x7F;
+    private static final int HIGHEST_BIT_BITMASK = 0x80;
     private static final int VALUE_BITS_PER_VARUINT_BYTE = 7;
+    // Note: because long is a signed type, Long.MAX_VALUE is represented in Long.SIZE - 1 bits.
+    private static final int MAXIMUM_SUPPORTED_VAR_UINT_BYTES = (Long.SIZE - 1) / VALUE_BITS_PER_VARUINT_BYTE;
     private static final int IVM_START_BYTE = 0xE0;
     private static final int IVM_FINAL_BYTE = 0xEA;
+    private static final int IVM_REMAINING_LENGTH = 3; // Length of the IVM after the first byte.
     private static final int SINGLE_BYTE_MASK = 0xFF;
     private static final int LIST_TYPE_ORDINAL = IonType.LIST.ordinal();
     private static final IvmNotificationConsumer NO_OP_IVM_NOTIFICATION_CONSUMER = (x, y) -> {};
@@ -36,6 +40,16 @@ class IonCursorBinary implements IonCursor {
     // a new ContainerInfo. Depths greater than 8 will be rare.
     private static final int CONTAINER_STACK_INITIAL_CAPACITY = 8;
 
+    /**
+     * The kind of location at which `checkpoint` points.
+     */
+    private enum CheckpointLocation {
+        BEFORE_UNANNOTATED_TYPE_ID,
+        BEFORE_ANNOTATED_TYPE_ID,
+        AFTER_SCALAR_HEADER,
+        AFTER_CONTAINER_HEADER
+    }
+
     /**
      * The state representing where the cursor left off after the previous operation.
      */
@@ -53,6 +67,12 @@ private enum State {
      */
     private static class RefillableState {
 
+        /**
+         * At this and all greater depths, the buffer is known to hold all values in their entirety. This means slow mode
+         * can be disabled until stepping out of this depth.
+         */
+        int fillDepth = -1;
+
         /**
          * The current size of the internal buffer.
          */
@@ -227,6 +247,20 @@ private static class RefillableState {
      */
     private final RefillableState refillableState;
 
+    /**
+     * Describes the byte at the `checkpoint` index.
+     */
+    private CheckpointLocation checkpointLocation = CheckpointLocation.BEFORE_UNANNOTATED_TYPE_ID;
+
+    /**
+     * Indicates whether the cursor is in slow mode. Slow mode must be used when the input source is refillable (i.e.
+     * a stream) and the cursor has not buffered the current value's bytes. When slow mode is disabled, the cursor can
+     * consume bytes directly from its buffer without range checks or refilling. When a value has been buffered (see:
+     * `fillValue()`), its entire representation (including child values if applicable) can be read with slow mode
+     * disabled, resulting in better performance.
+     */
+    boolean isSlowMode;
+
     /**
      * The total number of bytes that had been consumed from the stream as of the last time progress was reported to
      * the data handler.
@@ -262,6 +296,7 @@ private static class RefillableState {
         this.offset = offset;
         this.limit = offset + length;
         byteBuffer = ByteBuffer.wrap(buffer, offset, length);
+        isSlowMode = false;
         refillableState = null;
     }
 
@@ -381,6 +416,7 @@ private static IonBufferConfiguration validate(IonBufferConfiguration configurat
             limit = alreadyReadLen;
         }
         byteBuffer = ByteBuffer.wrap(buffer, 0, configuration.getInitialBufferSize());
+        isSlowMode = true;
         refillableState = new RefillableState(
             inputStream,
             configuration.getInitialBufferSize(),
@@ -388,6 +424,22 @@ private static IonBufferConfiguration validate(IonBufferConfiguration configurat
         );
     }
 
+    /*
+     * This class contains methods with the prefix 'slow'. These methods often
+     * have prefix-free 'quick' variants that are faster because they are always
+     * called from contexts where the buffer is already known to hold all bytes
+     * that will be required or available to complete the call, and therefore no
+     * filling is required. Sometimes a 'slow' method does not have a 'quick'
+     * variant. This is typically because the 'quick' variant is simple enough
+     * to be written inline at the call site. Public API methods will delegate
+     * to either the 'slow' or 'quick' variant depending on whether 'isSlowMode'
+     * is true. In general, 'isSlowMode' may be disabled whenever the input source
+     * is a byte array (and therefore cannot grow and does not need to be filled),
+     * or whenever the current value's parent container has already been filled.
+     * Where a choice exists, 'slow' methods must call other 'slow' methods, and
+     * 'quick' methods must call other 'quick' methods.
+     */
+
     /* ---- Begin: internal buffer manipulation methods ---- */
 
     /**
@@ -641,6 +693,28 @@ private long readVarUInt_1_0(byte currentByte) {
         return result;
     }
 
+    /**
+     * Reads a VarUInt, ensuring enough data is available in the buffer. NOTE: the VarUInt must fit in a `long`.
+     * @return the value.
+     */
+    private long slowReadVarUInt_1_0() {
+        int currentByte;
+        int numberOfBytesRead = 0;
+        long value = 0;
+        while (numberOfBytesRead < MAXIMUM_SUPPORTED_VAR_UINT_BYTES) {
+            currentByte = slowReadByte();
+            if (currentByte < 0) {
+                return -1;
+            }
+            numberOfBytesRead++;
+            value = (value << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
+            if ((currentByte & HIGHEST_BIT_BITMASK) != 0) {
+                return value;
+            }
+        }
+        throw new IonException("Found a VarUInt that was too large to fit in a `long`");
+    }
+
     /**
      * Reads the header of an annotation wrapper. This must only be called when it is known that the buffer already
      * contains all the bytes in the header. Sets `valueMarker` with the start and end indices of the wrapped value.
@@ -682,6 +756,59 @@ private boolean readAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
         return false;
     }
 
+    /**
+     * Reads the header of an annotation wrapper, ensuring enough data is available in the buffer. Sets `valueMarker`
+     * with the start and end indices of the wrapped value. Sets `annotationSequenceMarker` with the start and end
+     * indices of the sequence of annotation SIDs. After successful return, `peekIndex` will point at the type ID byte
+     * of the wrapped value.
+     * @param valueTid the type ID of the annotation wrapper.
+     * @return true if there are not enough bytes in the stream to complete the value; otherwise, false.
+     */
+    private boolean slowReadAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
+        long valueLength;
+        if (valueTid.variableLength) {
+            // At this point the value must be at least 4 more bytes: 1 for the smallest-possible wrapper length, 1
+            // for the smallest-possible annotations length, one for the smallest-possible annotation, and 1 for the
+            // smallest-possible value representation.
+            if (!fillAt(peekIndex, 4)) {
+                return true;
+            }
+            valueLength = slowReadVarUInt_1_0();
+            if (valueLength < 0) {
+                return true;
+            }
+        } else {
+            // At this point the value must be at least 3 more bytes: 1 for the smallest-possible annotations
+            // length, 1 for the smallest-possible annotation, and 1 for the smallest-possible value representation.
+            if (!fillAt(peekIndex, 3)) {
+                return true;
+            }
+            valueLength = valueTid.length;
+        }
+        // Record the post-length index in a value that will be shifted in the event the buffer needs to refill.
+        setMarker(peekIndex + valueLength, valueMarker);
+        int annotationsLength = (int) slowReadVarUInt_1_0();
+        if (annotationsLength < 0) {
+            return true;
+        }
+        if (!fillAt(peekIndex, annotationsLength)) {
+            return true;
+        }
+        if (refillableState.isSkippingCurrentValue) {
+            // The value is already oversized, so the annotations sequence cannot be buffered.
+            return true;
+        }
+        annotationSequenceMarker.typeId = valueTid;
+        annotationSequenceMarker.startIndex = peekIndex;
+        annotationSequenceMarker.endIndex = annotationSequenceMarker.startIndex + annotationsLength;
+        peekIndex = annotationSequenceMarker.endIndex;
+        if (peekIndex >= valueMarker.endIndex) {
+            throw new IonException("Annotation wrapper must wrap a value.");
+        }
+        return false;
+    }
+
+
     /**
      * Throws if the given marker represents an empty ordered struct, which is prohibited by the Ion 1.0 specification.
      * @param marker the marker for the value to check.
@@ -727,16 +854,38 @@ private long calculateEndIndex_1_0(IonTypeID valueTid, boolean isAnnotated) {
         return endIndex;
     }
 
+    /**
+     * Reads the field SID from the VarUInt starting at `peekIndex`, ensuring enough data is available in the buffer.
+     * @return true if there are not enough bytes in the stream to complete the field SID; otherwise, false.
+     */
+    private boolean slowReadFieldName_1_0() {
+        // The value must have at least 2 more bytes: 1 for the smallest-possible field SID and 1 for
+        // the smallest-possible representation.
+        if (!fillAt(peekIndex, 2)) {
+            return true;
+        }
+        fieldSid = (int) slowReadVarUInt_1_0();
+        return fieldSid < 0;
+    }
+
     /* ---- Ion 1.1 ---- */
 
     private long readVarUInt_1_1() {
         throw new UnsupportedOperationException();
     }
 
+    private long slowReadVarUInt_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
     private boolean readAnnotationWrapperHeader_1_1(IonTypeID valueTid) {
         throw new UnsupportedOperationException();
     }
 
+    private boolean slowReadAnnotationWrapperHeader_1_1(IonTypeID valueTid) {
+        throw new UnsupportedOperationException();
+    }
+
     private long calculateEndIndex_1_1(IonTypeID valueTid, boolean isAnnotated) {
         throw new UnsupportedOperationException();
     }
@@ -745,10 +894,18 @@ private void readFieldName_1_1() {
         throw new UnsupportedOperationException();
     }
 
+    private boolean slowReadFieldName_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
     private boolean isDelimitedEnd_1_1() {
         throw new UnsupportedOperationException();
     }
 
+    private boolean slowIsDelimitedEnd_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
     boolean skipRemainingDelimitedContainerElements_1_1() {
         throw new UnsupportedOperationException();
     }
@@ -757,10 +914,68 @@ private void seekPastDelimitedContainer_1_1() {
         throw new UnsupportedOperationException();
     }
 
+    private boolean slowFindDelimitedEnd_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private boolean slowSeekToDelimitedEnd_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private boolean slowFillDelimitedContainer_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private boolean slowSkipRemainingDelimitedContainerElements_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
     /* ---- End: version-dependent parsing methods ---- */
 
     /* ---- Begin: version-agnostic parsing, utility, and public API methods ---- */
 
+    /**
+     * Attempts to make the cursor READY by finishing the operation that was in progress last time the end of the stream
+     * was reached. This should not be called when the cursor state is already READY.
+     * @return true if the cursor is ready; otherwise, false.
+     */
+    private boolean slowMakeBufferReady() {
+        boolean isReady;
+        switch (refillableState.state) {
+            case SEEK:
+                isReady = slowSeek(refillableState.bytesRequested);
+                break;
+            case FILL:
+                isReady = fillAt(offset, refillableState.bytesRequested);
+                break;
+            case FILL_DELIMITED:
+                refillableState.state = State.READY;
+                isReady = slowFindDelimitedEnd_1_1();
+                break;
+            case SEEK_DELIMITED:
+                isReady = slowSeekToDelimitedEnd_1_1();
+                break;
+            case TERMINATED:
+                isReady = false;
+                break;
+            default:
+                throw new IllegalStateException();
+        }
+        if (!isReady) {
+            event = Event.NEEDS_DATA;
+        }
+        return isReady;
+    }
+
+    /**
+     * Sets `checkpoint` to the current `peekIndex`, which is at the given type of location.
+     * @param location the type of checkpoint location. Must not be BEFORE_UNANNOTATED_TYPE_ID.
+     */
+    private void setCheckpoint(CheckpointLocation location) {
+        checkpointLocation = location;
+        checkpoint = peekIndex;
+    }
+
     /**
      * Sets `checkpoint` to the current `peekIndex`, which must be before an unannotated type ID, and seeks the
      * buffer to that point.
@@ -768,6 +983,7 @@ private void seekPastDelimitedContainer_1_1() {
     private void setCheckpointBeforeUnannotatedTypeId() {
         reset();
         offset = peekIndex;
+        checkpointLocation = CheckpointLocation.BEFORE_UNANNOTATED_TYPE_ID;
         checkpoint = peekIndex;
     }
 
@@ -796,7 +1012,7 @@ private boolean checkContainerEnd() {
             return false;
         }
         if (parent.endIndex == -1) {
-            return isDelimitedEnd_1_1();
+            return isSlowMode ? slowIsDelimitedEnd_1_1() : isDelimitedEnd_1_1();
         }
         if (parent.endIndex == peekIndex) {
             event = Event.END_CONTAINER;
@@ -859,6 +1075,36 @@ private void seekPastNopPad(long endIndex, boolean isAnnotated) {
         }
     }
 
+    /**
+     * Validates and skips a NOP pad. After return, `peekIndex` will point to the first byte after the NOP pad.
+     * @param valueLength the length of the NOP pad.
+     * @param isAnnotated true if the NOP pad occurs within an annotation wrapper (which is illegal); otherwise, false.
+     * @return true if not enough data was available to seek past the NOP pad; otherwise, false.
+     */
+    private boolean slowSeekPastNopPad(long valueLength, boolean isAnnotated) {
+        if (isAnnotated) {
+            throw new IonException(
+                "Invalid annotation wrapper: NOP pad may not occur inside an annotation wrapper."
+            );
+        }
+        if (!slowSeek(peekIndex + valueLength - offset)) {
+            event = Event.NEEDS_DATA;
+            return true;
+        }
+        if (offset < (peekIndex + valueLength)) {
+            // Some of the bytes of the NOP pad had to be skipped without buffering to keep the buffer within its
+            // maximum size. Therefore, any parent container end indices need to be shifted by the number of bytes
+            // that were never buffered.
+            shiftContainerEnds(peekIndex + valueLength - offset);
+        }
+        peekIndex = offset;
+        setCheckpointBeforeUnannotatedTypeId();
+        if (parent != null) {
+            checkContainerEnd();
+        }
+        return false;
+    }
+
     /**
      * Validates that an annotated value's endIndex matches the annotation wrapper's endIndex (which is contained in
      * `valueMarker.endIndex`).
@@ -918,6 +1164,111 @@ private boolean readHeader(final int typeIdByte, final boolean isAnnotated, fina
         return event == Event.START_SCALAR;
     }
 
+    /**
+     * Reads a value or annotation wrapper header, ensuring enough bytes are buffered. Upon invocation, `peekIndex` must
+     * be positioned on the first byte that follows the given type ID byte. After return, `peekIndex`
+     * will be positioned after the type ID byte of the value, and `markerToSet.typeId` will be set with the IonTypeID
+     * representing the value.
+     * @param  typeIdByte the type ID byte. This may be an annotation wrapper's type ID.
+     * @param isAnnotated true if this type ID is on a value within an annotation wrapper; false if it is not.
+     * @param markerToSet the Marker to set with information parsed from the type ID and/or annotation wrapper header.
+     * @return false if enough bytes were buffered and the header belonged to an annotation wrapper or NOP pad;
+     *  otherwise, true. When false, the caller should call the method again to read the header for the value that
+     *  follows.
+     */
+    private boolean slowReadHeader(final int typeIdByte, final boolean isAnnotated, final Marker markerToSet) {
+        IonTypeID valueTid = typeIds[typeIdByte];
+        if (!valueTid.isValid) {
+            throw new IonException("Invalid type ID.");
+        } else if (valueTid.type == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
+            if (isAnnotated) {
+                throw new IonException("Nested annotation wrappers are invalid.");
+            }
+            hasAnnotations = true;
+            if (minorVersion == 0 ? slowReadAnnotationWrapperHeader_1_0(valueTid) : slowReadAnnotationWrapperHeader_1_1(valueTid)) {
+                return true;
+            }
+            setCheckpoint(CheckpointLocation.BEFORE_ANNOTATED_TYPE_ID);
+        } else {
+            if (slowReadValueHeader(valueTid, isAnnotated, markerToSet)) {
+                if (refillableState.isSkippingCurrentValue) {
+                    // If the value will be skipped, its type ID must be set so that the core reader can determine
+                    // whether it represents a symbol table.
+                    markerToSet.typeId = valueTid;
+                }
+                return true;
+            }
+        }
+        markerToSet.typeId = valueTid;
+        if (checkpointLocation == CheckpointLocation.AFTER_SCALAR_HEADER) {
+            return true;
+        }
+        if (checkpointLocation == CheckpointLocation.AFTER_CONTAINER_HEADER) {
+            if (minorVersion == 0) {
+                prohibitEmptyOrderedStruct_1_0(markerToSet);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Reads a value header, ensuring enough bytes are buffered. Upon invocation, `peekIndex` must
+     * be positioned on the first byte that follows the given type ID byte. After return, `peekIndex`
+     * will be positioned after the type ID byte of the value, and `markerToSet.typeId` will be set with the IonTypeID
+     * representing the value.
+     * @param  valueTid the type ID of the value. Must not be an annotation wrapper.
+     * @param isAnnotated true if this type ID is on a value within an annotation wrapper; false if it is not.
+     * @param markerToSet the Marker to set with information parsed from the header.
+     * @return true if not enough data was available in the stream to complete the header; otherwise, false.
+     */
+    private boolean slowReadValueHeader(IonTypeID valueTid, boolean isAnnotated, Marker markerToSet) {
+        long valueLength = 0;
+        long endIndex = 0;
+        if (valueTid.isDelimited) {
+            endIndex = -1;
+        } else if (valueTid.variableLength) {
+            // At this point the value must be at least 2 more bytes: 1 for the smallest-possible value length
+            // and 1 for the smallest-possible value representation.
+            if (!fillAt(peekIndex, 2)) {
+                return true;
+            }
+            valueLength = minorVersion == 0 ? slowReadVarUInt_1_0() : slowReadVarUInt_1_1();
+            if (valueLength < 0) {
+                return true;
+            }
+        } else {
+            valueLength = valueTid.length;
+        }
+        if (valueTid.type != null && valueTid.type.ordinal() >= LIST_TYPE_ORDINAL) {
+            setCheckpoint(CheckpointLocation.AFTER_CONTAINER_HEADER);
+            event = Event.START_CONTAINER;
+        } else if (valueTid.isNopPad) {
+            if (slowSeekPastNopPad(valueLength, isAnnotated)) {
+                return true;
+            }
+            valueLength = 0;
+        } else {
+            setCheckpoint(CheckpointLocation.AFTER_SCALAR_HEADER);
+            event = Event.START_SCALAR;
+        }
+        if (refillableState.isSkippingCurrentValue) {
+            // Any bytes that were skipped directly from the input must still be included in the logical endIndex so
+            // that the rest of the oversized value's bytes may be skipped.
+            endIndex = endIndex == -1 ? -1 : (peekIndex + valueLength + refillableState.individualBytesSkippedWithoutBuffering);
+        } else {
+            endIndex = endIndex == -1 ? -1 : (peekIndex + valueLength);
+        }
+        if (isAnnotated) {
+            validateAnnotationWrapperEndIndex(endIndex);
+        }
+        setMarker(endIndex, markerToSet);
+        if (event == Event.START_CONTAINER && endIndex > -1 && availableAt(peekIndex) >= valueLength) {
+            refillableState.fillDepth = containerIndex + 1;
+        }
+        return false;
+    }
+
     /**
      * Doubles the size of the cursor's container stack.
      */
@@ -941,8 +1292,10 @@ private void pushContainer() {
         parent = containerStack[containerIndex];
     }
 
-    @Override
-    public Event stepIntoContainer() {
+    /**
+     * Step into the current container.
+     */
+    private void quickStepIntoContainer() {
         if (valueTid == null || valueTid.type.ordinal() < LIST_TYPE_ORDINAL) {
             throw new IonException("Must be positioned on a container to step in.");
         }
@@ -953,11 +1306,59 @@ public Event stepIntoContainer() {
         valueTid = null;
         event = Event.NEEDS_INSTRUCTION;
         reset();
+    }
+
+    /**
+     * Steps into the container on which the cursor is currently positioned, ensuring that the buffer is ready.
+     * @return `event`, which conveys the result.
+     */
+    private Event slowStepIntoContainer() {
+        if (refillableState.state != State.READY && !slowMakeBufferReady()) {
+            return event;
+        }
+        // Must be positioned on a container.
+        if (checkpointLocation != CheckpointLocation.AFTER_CONTAINER_HEADER) {
+            throw new IonException("Must be positioned on a container to step in.");
+        }
+        // Push the remaining length onto the stack, seek past the container's header, and increase the depth.
+        pushContainer();
+        if (containerIndex == refillableState.fillDepth) {
+            isSlowMode = false;
+        }
+        parent.typeId = valueMarker.typeId;
+        parent.endIndex = valueTid.isDelimited ? -1 : valueMarker.endIndex;
+        setCheckpointBeforeUnannotatedTypeId();
+        valueTid = null;
+        hasAnnotations = false;
+        event = Event.NEEDS_INSTRUCTION;
+        return event;
+    }
+
+    @Override
+    public Event stepIntoContainer() {
+        if (isSlowMode) {
+            if (containerIndex != refillableState.fillDepth - 1) {
+                return slowStepIntoContainer();
+            }
+            isSlowMode = false;
+        }
+        quickStepIntoContainer();
         return event;
     }
 
+    /**
+     * Puts the cursor back in slow mode. Must not be called when the cursor is byte-backed.
+     */
+    private void resumeSlowMode() {
+        refillableState.fillDepth = -1;
+        isSlowMode = true;
+    }
+
     @Override
     public Event stepOutOfContainer() {
+        if (isSlowMode) {
+            return slowStepOutOfContainer();
+        }
         if (parent == null) {
             // Note: this is IllegalStateException for consistency with the other binary IonReader implementation.
             throw new IllegalStateException("Cannot step out at top level.");
@@ -970,13 +1371,21 @@ public Event stepOutOfContainer() {
         } else {
             peekIndex = parent.endIndex;
         }
-        setCheckpointBeforeUnannotatedTypeId();
+        if (!isSlowMode) {
+            setCheckpointBeforeUnannotatedTypeId();
+        }
         containerIndex--;
         if (containerIndex >= 0) {
             parent = containerStack[containerIndex];
+            if (refillableState != null && containerIndex < refillableState.fillDepth) {
+                resumeSlowMode();
+            }
         } else {
             parent = null;
             containerIndex = -1;
+            if (refillableState != null) {
+                resumeSlowMode();
+            }
         }
 
         valueTid = null;
@@ -984,6 +1393,45 @@ public Event stepOutOfContainer() {
         return event;
     }
 
+    /**
+     * Steps out of the container on which the cursor is currently positioned, ensuring that the buffer is ready and
+     * that enough bytes are available in the stream.
+     * @return `event`, which conveys the result.
+     */
+    private Event slowStepOutOfContainer() {
+        if (parent == null) {
+            // Note: this is IllegalStateException for consistency with the legacy binary IonReader implementation.
+            throw new IllegalStateException("Cannot step out at top level.");
+        }
+        if (refillableState.state != State.READY && !slowMakeBufferReady()) {
+            return event;
+        }
+        event = Event.NEEDS_DATA;
+        // Seek past any remaining bytes from the previous value.
+        if (parent.endIndex == -1) {
+            if (slowSkipRemainingDelimitedContainerElements_1_1()) {
+                return event;
+            }
+        } else {
+            if (!slowSeek(parent.endIndex - offset)) {
+                return event;
+            }
+            peekIndex = parent.endIndex;
+        }
+        setCheckpointBeforeUnannotatedTypeId();
+        containerIndex--;
+        if (containerIndex >= 0) {
+            parent = containerStack[containerIndex];
+        } else {
+            parent = null;
+            containerIndex = -1;
+        }
+        event = Event.NEEDS_INSTRUCTION;
+        valueTid = null;
+        hasAnnotations = false;
+        return event;
+    }
+
     /**
      * Advances to the next value within a container, checking for container end and consuming the field name, if any.
      * @return true if the end of the container has been reached; otherwise, false.
@@ -1067,8 +1515,141 @@ private boolean nextToken() {
         return false;
     }
 
+    /**
+     * Advances to the next token from the current checkpoint, seeking past the previous value if necessary, and
+     * ensuring that enough bytes are available in the stream. After return `event` will convey the result (e.g.
+     * START_SCALAR, END_CONTAINER, NEEDS_DATA).
+     */
+    private void slowNextToken() {
+        peekIndex = checkpoint;
+        event = Event.NEEDS_DATA;
+        while (true) {
+            if ((refillableState.state != State.READY && !slowMakeBufferReady()) || (parent != null && checkContainerEnd())) {
+                return;
+            }
+            int b;
+            switch (checkpointLocation) {
+                case BEFORE_UNANNOTATED_TYPE_ID:
+                    if (dataHandler != null) {
+                        reportConsumedData();
+                    }
+                    valueTid = null;
+                    hasAnnotations = false;
+                    if (parent != null && parent.typeId.type == IonType.STRUCT && (minorVersion == 0 ? slowReadFieldName_1_0() : slowReadFieldName_1_1())) {
+                        return;
+                    }
+                    valuePreHeaderIndex = peekIndex;
+                    b = slowReadByte();
+                    if (b < 0) {
+                        return;
+                    }
+                    if (b == IVM_START_BYTE && parent == null) {
+                        if (!fillAt(peekIndex, IVM_REMAINING_LENGTH)) {
+                            return;
+                        }
+                        readIvm();
+                        setCheckpointBeforeUnannotatedTypeId();
+                        continue;
+                    }
+                    if (slowReadHeader(b, false, valueMarker)) {
+                        valueTid = valueMarker.typeId;
+                        return;
+                    }
+                    valueTid = valueMarker.typeId;
+                    // Either a NOP has been skipped, or an annotation wrapper has been consumed.
+                    continue;
+                case BEFORE_ANNOTATED_TYPE_ID:
+                    valueTid = null;
+                    b = slowReadByte();
+                    if (b < 0) {
+                        return;
+                    }
+                    slowReadHeader(b, true, valueMarker);
+                    valueTid = valueMarker.typeId;
+                    // If already within an annotation wrapper, neither an IVM nor a NOP is possible, so the cursor
+                    // must be positioned after the header for the wrapped value.
+                    return;
+                case AFTER_SCALAR_HEADER:
+                case AFTER_CONTAINER_HEADER:
+                    if (slowSkipRemainingValueBytes()) {
+                        return;
+                    }
+                    // The previous value's bytes have now been skipped; continue.
+            }
+        }
+    }
+
+    /**
+     * Skips past the remaining bytes in the current value, ensuring enough bytes are available in the stream. If the
+     * skip was successful, sets the checkpoint at the resulting index.
+     * @return true if not enough data was available in the stream; otherwise, false.
+     */
+    private boolean slowSkipRemainingValueBytes() {
+        if (valueMarker.endIndex == -1 && valueTid != null && valueTid.isDelimited) {
+            seekPastDelimitedContainer_1_1();
+            if (event == Event.NEEDS_DATA) {
+                return true;
+            }
+        } else if (limit >= valueMarker.endIndex) {
+            offset = valueMarker.endIndex;
+        } else if (!slowSeek(valueMarker.endIndex - offset)) {
+            return true;
+        }
+        peekIndex = offset;
+        valuePreHeaderIndex = peekIndex;
+        if (peekIndex < valueMarker.endIndex) {
+            shiftContainerEnds(valueMarker.endIndex - peekIndex);
+        }
+        if (refillableState.fillDepth > containerIndex) {
+            // This value was filled, but was skipped. Reset the fillDepth so that the reader does not think the
+            // next value was filled immediately upon encountering it.
+            refillableState.fillDepth = -1;
+        }
+        setCheckpointBeforeUnannotatedTypeId();
+        return false;
+    }
+
+    /**
+     * Advances to the next token, ensuring enough bytes are available in the stream and checking against size limits.
+     * If an oversized value is encountered, attempts to skip past it.
+     * @return the result of the operation (e.g. START_SCALAR, END_CONTAINER).
+     */
+    private Event slowOverflowableNextToken() {
+        while (true) {
+            slowNextToken();
+            if (refillableState.isSkippingCurrentValue) {
+                seekPastOversizedValue();
+                continue;
+            }
+            return event;
+        }
+    }
+
+    /**
+     * Seeks past an oversized value.
+     */
+    private void seekPastOversizedValue() {
+        refillableState.oversizedValueHandler.onOversizedValue();
+        if (refillableState.state != State.TERMINATED) {
+            slowSeek(valueMarker.endIndex - offset - refillableState.individualBytesSkippedWithoutBuffering);
+            refillableState.totalDiscardedBytes += refillableState.individualBytesSkippedWithoutBuffering;
+            peekIndex = offset;
+            // peekIndex now points at the first byte after the value. If any bytes were skipped directly from
+            // the input stream, peekIndex will be less than the value's pre-calculated endIndex. This requires
+            // the end indices for all parent containers to be shifted left by the number of bytes that were
+            // skipped without buffering.
+            shiftContainerEnds(valueMarker.endIndex - peekIndex);
+            setCheckpointBeforeUnannotatedTypeId();
+        }
+        refillableState.isSkippingCurrentValue = false;
+        refillableState.individualBytesSkippedWithoutBuffering = 0;
+    }
+
     @Override
     public Event nextValue() {
+        if (isSlowMode) {
+            return slowNextValue();
+        }
         event = Event.NEEDS_DATA;
         while (true) {
             if (nextToken()) {
@@ -1078,9 +1659,68 @@ public Event nextValue() {
         return event;
     }
 
+    /**
+     * Advances to the next value, seeking past the previous if necessary, and ensuring enough bytes are available in
+     * the stream.
+     * @return the result of the operation (e.g. START_SCALAR, END_CONTAINER).
+     */
+    private Event slowNextValue() {
+        if (refillableState.fillDepth > containerIndex) {
+            // This value was filled, but was skipped. Reset the fillDepth so that the reader does not think the
+            // next value was filled immediately upon encountering it.
+            refillableState.fillDepth = -1;
+            peekIndex = valueMarker.endIndex;
+            setCheckpointBeforeUnannotatedTypeId();
+            slowNextToken();
+            return event;
+        }
+        return slowOverflowableNextToken();
+    }
+
     @Override
     public Event fillValue() {
         event = Event.VALUE_READY;
+        if (isSlowMode && refillableState.fillDepth <= containerIndex) {
+            slowFillValue();
+            if (refillableState.isSkippingCurrentValue) {
+                seekPastOversizedValue();
+            }
+        }
+        return event;
+    }
+
+    /**
+     * Fills the buffer with the contents of the value on which the cursor is currently positioned, ensuring that
+     * enough bytes are available in the stream.
+     * @return `event`, which conveys the result.
+     */
+    private Event slowFillValue() {
+        if (refillableState.state != State.READY && !slowMakeBufferReady()) {
+            return event;
+        }
+        // Must be positioned after a header.
+        if (checkpointLocation != CheckpointLocation.AFTER_SCALAR_HEADER && checkpointLocation != CheckpointLocation.AFTER_CONTAINER_HEADER) {
+            throw new IllegalStateException();
+        }
+        event = Event.NEEDS_DATA;
+
+        if (valueMarker.endIndex == -1) {
+            if (slowFillDelimitedContainer_1_1()) {
+                return event;
+            }
+        }
+        if (limit >= valueMarker.endIndex || fillAt(peekIndex, valueMarker.endIndex - valueMarker.startIndex)) {
+            if (refillableState.isSkippingCurrentValue) {
+                event = Event.NEEDS_INSTRUCTION;
+            } else {
+                if (checkpointLocation == CheckpointLocation.AFTER_CONTAINER_HEADER) {
+                    // This container is buffered in its entirety. There is no need to fill the buffer again until stepping
+                    // out of the fill depth.
+                    refillableState.fillDepth = containerIndex + 1;
+                }
+                event = Event.VALUE_READY;
+            }
+        }
         return event;
     }
 
@@ -1154,9 +1794,25 @@ public Event endStream() {
      * @return true if the cursor is expecting more data in order to complete a token; otherwise, false.
      */
     private boolean isAwaitingMoreData() {
+        if (isSlowMode) {
+            return slowIsAwaitingMoreData();
+        }
         return valueMarker.endIndex > limit;
     }
 
+    /**
+     * @return true if the cursor is expecting more data in order to complete a token; otherwise, false.
+     */
+    private boolean slowIsAwaitingMoreData() {
+        // Note: this does not detect early end-of-stream in all cases, as doing so would require reading from
+        // the input stream, which is not worth the expense.
+        return refillableState.state != State.TERMINATED
+            && (refillableState.state == State.SEEK
+            || refillableState.state == State.SEEK_DELIMITED
+            || refillableState.bytesRequested > 1
+            || peekIndex > checkpoint);
+    }
+
     /**
      * Terminates the cursor. Called when a non-recoverable event occurs, like encountering a symbol table that
      * exceeds the maximum buffer size.
diff --git a/test/com/amazon/ion/impl/IonCursorBinaryTest.java b/test/com/amazon/ion/impl/IonCursorBinaryTest.java
index b6537d901a..ab0c1a410d 100644
--- a/test/com/amazon/ion/impl/IonCursorBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonCursorBinaryTest.java
@@ -8,6 +8,10 @@
 import com.amazon.ion.IvmNotificationConsumer;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.ByteArrayInputStream;
 
 import static com.amazon.ion.BitUtils.bytes;
 import static com.amazon.ion.IonCursor.Event.END_CONTAINER;
@@ -19,6 +23,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+@RunWith(Parameterized.class)
 public class IonCursorBinaryTest {
 
     private static final IonBufferConfiguration STANDARD_BUFFER_CONFIGURATION = IonBufferConfiguration.Builder.standard().build();
@@ -31,6 +36,14 @@ private static Marker loadScalar(IonCursorBinary cursor) {
         return marker;
     }
 
+    @Parameterized.Parameters(name = "constructWithBytes={0}")
+    public static Object[] parameters() {
+        return new Object[]{true, false};
+    }
+
+    @Parameterized.Parameter
+    public boolean constructFromBytes;
+
     private IonCursorBinary cursor = null;
     private int numberOfIvmsEncountered = 0;
 
@@ -43,8 +56,19 @@ public void setup() {
     }
 
     private void initializeCursor(int... data) {
-        cursor = new IonCursorBinary(STANDARD_BUFFER_CONFIGURATION, bytes(data), 0, data.length);
+        if (constructFromBytes) {
+            cursor = new IonCursorBinary(STANDARD_BUFFER_CONFIGURATION, bytes(data), 0, data.length);
+        } else {
+            cursor = new IonCursorBinary(
+                STANDARD_BUFFER_CONFIGURATION,
+                new ByteArrayInputStream(bytes(data)),
+                null,
+                0,
+                0
+            );
+        }
         cursor.registerIvmNotificationConsumer(countingIvmConsumer);
+        cursor.registerOversizedValueHandler(STANDARD_BUFFER_CONFIGURATION.getOversizedValueHandler());
     }
 
     @Test

From d5900893ad50de8077833a1ada6a16dfc36d32c7 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 29 Jun 2023 15:23:35 -0700
Subject: [PATCH 263/490] Adds IonReaderContinuableCoreBinary, which builds
 scalar value parsing on top of IonCursorBinary.

---
 .../impl/IonReaderContinuableCoreBinary.java  | 812 ++++++++++++++++++
 .../IonReaderContinuableCoreBinaryTest.java   | 256 ++++++
 2 files changed, 1068 insertions(+)
 create mode 100644 src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
 create mode 100644 test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
new file mode 100644
index 0000000000..c922f7c24e
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -0,0 +1,812 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonType;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl.bin.IntList;
+import com.amazon.ion.impl.bin.utf8.Utf8StringDecoder;
+import com.amazon.ion.impl.bin.utf8.Utf8StringDecoderPool;
+
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.util.Date;
+
+/**
+ * An IonCursor capable of raw parsing of binary Ion streams.
+ */
+class IonReaderContinuableCoreBinary extends IonCursorBinary implements IonReaderContinuableCore {
+
+    // Isolates the highest bit in a byte.
+    private static final int HIGHEST_BIT_BITMASK = 0x80;
+
+    // Isolates the lowest seven bits in a byte.
+    private static final int LOWER_SEVEN_BITS_BITMASK = 0x7F;
+
+    private static final int SINGLE_BYTE_MASK = 0xFF;
+
+    // Isolates the lowest six bits in a byte.
+    private static final int LOWER_SIX_BITS_BITMASK = 0x3F;
+
+    // The number of significant bits in each UInt byte.
+    private static final int VALUE_BITS_PER_UINT_BYTE = 8;
+
+    // The number of significant bits in each VarUInt byte.
+    private static final int VALUE_BITS_PER_VARUINT_BYTE = 7;
+
+    // Single byte negative zero, represented as a VarInt. Often used in timestamp encodings to indicate unknown local
+    // offset.
+    private static final int VAR_INT_NEGATIVE_ZERO = 0xC0;
+
+    // The number of bytes occupied by a Java int.
+    private static final int INT_SIZE_IN_BYTES = 4;
+
+    // The number of bytes occupied by a Java long.
+    private static final int LONG_SIZE_IN_BYTES = 8;
+
+    // The smallest negative 8-byte integer that can fit in a long is -0x80_00_00_00_00_00_00_00.
+    private static final int MOST_SIGNIFICANT_BYTE_OF_MIN_LONG = 0x80;
+
+    // The largest positive 8-byte integer that can fit in a long is 0x7F_FF_FF_FF_FF_FF_FF_FF.
+    private static final int MOST_SIGNIFICANT_BYTE_OF_MAX_LONG = 0x7F;
+
+    // The second-most significant bit in the most significant byte of a VarInt is the sign.
+    private static final int VAR_INT_SIGN_BITMASK = 0x40;
+
+    // 32-bit floats must declare length 4.
+    private static final int FLOAT_32_BYTE_LENGTH = 4;
+
+    // Initial capacity of the ArrayList used to hold the symbol IDs of the annotations on the current value.
+    private static final int ANNOTATIONS_LIST_INITIAL_CAPACITY = 8;
+
+    // Converter between scalar types, allowing, for example, for a value encoded as an Ion float to be returned as a
+    // Java `long` via `IonReader.longValue()`.
+    private final _Private_ScalarConversions.ValueVariant scalarConverter;
+
+    final Utf8StringDecoder utf8Decoder = Utf8StringDecoderPool.getInstance().getOrCreate();
+
+    long peekIndex = -1;
+
+    // The number of bytes of a lob value that the user has consumed, allowing for piecewise reads.
+    private int lobBytesRead = 0;
+
+    // The symbol IDs for the annotations on the current value.
+    private final IntList annotationSids;
+
+    /**
+     * Constructs a new reader from the given byte array.
+     * @param configuration the configuration to use. The buffer size and oversized value configuration are unused, as
+     *                      the given buffer is used directly.
+     * @param bytes the byte array containing the bytes to read.
+     * @param offset the offset into the byte array at which the first byte of Ion data begins.
+     * @param length the number of bytes to be read from the byte array.
+     */
+    IonReaderContinuableCoreBinary(IonBufferConfiguration configuration, byte[] bytes, int offset, int length) {
+        super(configuration, bytes, offset, length);
+        scalarConverter = new _Private_ScalarConversions.ValueVariant();
+        annotationSids = new IntList(ANNOTATIONS_LIST_INITIAL_CAPACITY);
+    }
+
+    /**
+     * Constructs a new reader from the given input stream.
+     * @param configuration the configuration to use.
+     * @param alreadyRead the byte array containing the bytes already read (often the IVM).
+     * @param alreadyReadOff the offset into `alreadyRead` at which the first byte that was already read exists.
+     * @param alreadyReadLen the number of bytes already read from `alreadyRead`.
+     */
+    IonReaderContinuableCoreBinary(IonBufferConfiguration configuration, InputStream inputStream, byte[] alreadyRead, int alreadyReadOff, int alreadyReadLen) {
+        super(configuration, inputStream, alreadyRead, alreadyReadOff, alreadyReadLen);
+        scalarConverter = new _Private_ScalarConversions.ValueVariant();
+        annotationSids = new IntList(ANNOTATIONS_LIST_INITIAL_CAPACITY);
+    }
+
+    // Scratch space for various byte sizes. Only for use while computing a single value.
+    private final byte[][] scratchForSize = new byte[][] {
+        new byte[0],
+        new byte[1],
+        new byte[2],
+        new byte[3],
+        new byte[4],
+        new byte[5],
+        new byte[6],
+        new byte[7],
+        new byte[8],
+        new byte[9],
+        new byte[10],
+        new byte[11],
+        new byte[12],
+    };
+
+    /**
+     * Copy the requested number of bytes from the buffer into a scratch buffer of exactly the requested length.
+     * @param startIndex the start index from which to copy.
+     * @param length the number of bytes to copy.
+     * @return the scratch byte array.
+     */
+    private byte[] copyBytesToScratch(long startIndex, int length) {
+        // Note: using reusable scratch buffers makes reading ints and decimals 1-5% faster and causes much less
+        // GC churn.
+        byte[] bytes = null;
+        if (length < scratchForSize.length) {
+            bytes = scratchForSize[length];
+        }
+        if (bytes == null) {
+            bytes = new byte[length];
+        }
+        // The correct number of bytes will be requested from the buffer, so the limit is set at the capacity to
+        // avoid having to calculate a limit.
+        System.arraycopy(buffer, (int) startIndex, bytes, 0, bytes.length);
+        return bytes;
+    }
+
+    /**
+     * Reads the VarUInt starting at `peekIndex`. When this method returns, `peekIndex` will point at the first byte
+     * that follows the VarUInt. NOTE: the VarUInt must fit in an `int`.
+     * @return the value.
+     */
+    int readVarUInt_1_0() {
+        int currentByte = 0;
+        int result = 0;
+        while ((currentByte & HIGHEST_BIT_BITMASK) == 0) {
+            currentByte = buffer[(int)(peekIndex++)];
+            result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
+        }
+        return result;
+    }
+
+    /**
+     * Reads a 2+ byte VarUInt, given the first byte. When called, `peekIndex` must point at the second byte in the
+     * VarUInt. When this method returns, `peekIndex` will point at the first byte that follows the VarUInt.
+     * NOTE: the VarUInt must fit in an `int`.
+     * @param currentByte the first byte in the VarUInt.
+     * @return the value.
+     */
+    int readVarUInt_1_0(byte currentByte) {
+        int result = currentByte & LOWER_SEVEN_BITS_BITMASK;
+        do {
+            // Note: if the varUInt  is malformed such that it extends beyond the declared length of the value *and*
+            // beyond the end of the buffer, this will result in IndexOutOfBoundsException because only the declared
+            // value length has been filled. Preventing this is simple: if (peekIndex >= valueMarker.endIndex) throw
+            // new IonException(); However, we choose not to perform that check here because it is not worth sacrificing
+            // performance in this inner-loop code in order to throw one type of exception over another in case of
+            // malformed data.
+            currentByte = buffer[(int) (peekIndex++)];
+            result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
+        } while (currentByte >= 0);
+        return result;
+    }
+
+    /**
+     * Reads a 2+ byte VarInt, given the first byte. When called, `peekIndex` must point at the second byte in the
+     * VarInt. at `peekIndex`.When this method returns, `peekIndex` will point at the first byte that follows the
+     * VarInt. NOTE: the VarInt must fit in an `int`.
+     * @param firstByte the first byte of the VarInt representation, which has already been retrieved from the buffer.
+     * @return the value.
+     */
+    private int readVarInt_1_0(int firstByte) {
+        int currentByte = firstByte;
+        int sign = (currentByte & VAR_INT_SIGN_BITMASK) == 0 ? 1 : -1;
+        int result = currentByte & LOWER_SIX_BITS_BITMASK;
+        while ((currentByte & HIGHEST_BIT_BITMASK) == 0) {
+            // Note: if the varInt is malformed such that it extends beyond the declared length of the value *and*
+            // beyond the end of the buffer, this will result in IndexOutOfBoundsException because only the declared
+            // value length has been filled. Preventing this is simple: if (peekIndex >= valueMarker.endIndex) throw
+            // new IonException(); However, we choose not to perform that check here because it is not worth sacrificing
+            // performance in this inner-loop code in order to throw one type of exception over another in case of
+            // malformed data.
+            currentByte = buffer[(int)(peekIndex++)];
+            result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
+        }
+        return result * sign;
+    }
+
+    /**
+     * Reads the VarInt starting at `peekIndex`. When this method returns, `peekIndex` will point at the first byte
+     * that follows the VarUInt. NOTE: the VarInt must fit in an `int`.
+     * @return the value.
+     */
+    private int readVarInt_1_0() {
+        return readVarInt_1_0(buffer[(int)(peekIndex++)]);
+    }
+
+    /**
+     * Reads into a BigInteger the UInt value that begins at `valueMarker.startIndex` and ends at
+     * `valueMarker.endIndex`.
+     * @param isNegative true if the resulting BigInteger value should be negative; false if it should be positive.
+     * @return the value.
+     */
+    private BigInteger readUIntAsBigInteger(boolean isNegative) {
+        int length = (int) (valueMarker.endIndex - valueMarker.startIndex);
+        // NOTE: unfortunately, there is no BigInteger(int signum, byte[] bits, int offset, int length) constructor
+        // until JDK 9, so copying to scratch space is always required. Migrating to the new constructor will
+        // lead to a significant performance improvement.
+        byte[] magnitude = copyBytesToScratch(valueMarker.startIndex, length);
+        int signum = isNegative ? -1 : 1;
+        return new BigInteger(signum, magnitude);
+    }
+
+    /**
+     * Get and clear the most significant bit in the given byte array.
+     * @param intBytes bytes representing a signed int.
+     * @return -1 if the most significant bit was set; otherwise, 1.
+     */
+    private int getAndClearSignBit_1_0(byte[] intBytes) {
+        boolean isNegative = (intBytes[0] & HIGHEST_BIT_BITMASK) != 0;
+        int signum = isNegative ? -1 : 1;
+        if (isNegative) {
+            intBytes[0] &= LOWER_SEVEN_BITS_BITMASK;
+        }
+        return signum;
+    }
+
+    /**
+     * Reads the Int value of the given length that begins at `peekIndex` into a BigInteger.
+     * @param length the length of the value.
+     * @return the value.
+     */
+    private BigInteger readIntAsBigInteger_1_0(int length) {
+        BigInteger value;
+        if (length > 0) {
+            // NOTE: unfortunately, there is no BigInteger(int signum, byte[] bits, int offset, int length) constructor
+            // until JDK 9, so copying to scratch space is always required. Migrating to the new constructor will
+            // lead to a significant performance improvement.
+            byte[] bytes = copyBytesToScratch(peekIndex, length);
+            value = new BigInteger(getAndClearSignBit_1_0(bytes), bytes);
+        }
+        else {
+            value = BigInteger.ZERO;
+        }
+        return value;
+    }
+
+    /**
+     * Reads into a BigDecimal the decimal value that begins at `peekIndex` and ends at `valueMarker.endIndex`.
+     * @return the value.
+     */
+    private BigDecimal readBigDecimal_1_0() {
+        int scale = -readVarInt_1_0();
+        BigDecimal value;
+        int length = (int) (valueMarker.endIndex - peekIndex);
+        if (length < LONG_SIZE_IN_BYTES) {
+            // No need to allocate a BigInteger to hold the coefficient.
+            long coefficient = 0;
+            int sign = 1;
+            if (peekIndex < valueMarker.endIndex) {
+                int firstByte = buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK;
+                sign = (firstByte & HIGHEST_BIT_BITMASK) == 0 ? 1 : -1;
+                coefficient = firstByte & LOWER_SEVEN_BITS_BITMASK;
+            }
+            while (peekIndex < valueMarker.endIndex) {
+                coefficient = (coefficient << VALUE_BITS_PER_UINT_BYTE) | buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK;
+            }
+            value = BigDecimal.valueOf(coefficient * sign, scale);
+        } else {
+            // The coefficient may overflow a long, so a BigInteger is required.
+            value = new BigDecimal(readIntAsBigInteger_1_0(length), scale);
+        }
+        return value;
+    }
+
+    /**
+     * Reads into a Decimal the decimal value that begins at `peekIndex` and ends at `valueMarker.endIndex`.
+     * @return the value.
+     */
+    private Decimal readDecimal_1_0() {
+        int scale = -readVarInt_1_0();
+        BigInteger coefficient;
+        int length = (int) (valueMarker.endIndex - peekIndex);
+        if (length > 0) {
+            // NOTE: unfortunately, there is no BigInteger(int signum, byte[] bits, int offset, int length) constructor,
+            // so copying to scratch space is always required.
+            byte[] bits = copyBytesToScratch(peekIndex, length);
+            int signum = getAndClearSignBit_1_0(bits);
+            // NOTE: there is a BigInteger.valueOf(long unscaledValue, int scale) factory method that avoids allocating
+            // a BigInteger for coefficients that fit in a long. See its use in readBigDecimal() above. Unfortunately,
+            // it is not possible to use this for Decimal because the necessary BigDecimal constructor is
+            // package-private. If a compatible BigDecimal constructor is added in a future JDK revision, a
+            // corresponding factory method should be added to Decimal to enable this optimization.
+            coefficient = new BigInteger(signum, bits);
+            if (coefficient.signum() == 0 && signum < 0) {
+                return Decimal.negativeZero(scale);
+            }
+        }
+        else {
+            coefficient = BigInteger.ZERO;
+        }
+        return Decimal.valueOf(coefficient, scale);
+    }
+
+    /**
+     * Reads into a long the integer value that begins at `valueMarker.startIndex` and ends at `valueMarker.endIndex`.
+     * @return the value.
+     */
+    private long readLong_1_0() {
+        long value = readUInt(valueMarker.startIndex, valueMarker.endIndex);
+        if (valueTid.isNegativeInt) {
+            if (value == 0) {
+                throw new IonException("Int zero may not be negative.");
+            }
+            value *= -1;
+        }
+        return value;
+    }
+
+    /**
+     * Reads into a BigInteger the integer value that begins at `valueMarker.startIndex` and ends at
+     * `valueMarker.endIndex`.
+     * @return the value.
+     */
+    private BigInteger readBigInteger_1_0() {
+        BigInteger value = readUIntAsBigInteger(valueTid.isNegativeInt);
+        if (valueTid.isNegativeInt && value.signum() == 0) {
+            throw new IonException("Int zero may not be negative.");
+        }
+        return value;
+    }
+
+    /**
+     * Reads the timestamp that begins at `peekIndex` and ends at `valueMarker.endIndex`.
+     * @return the value.
+     */
+    private Timestamp readTimestamp_1_0() {
+        int firstByte = buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK;
+        Integer offset = null;
+        if (firstByte != VAR_INT_NEGATIVE_ZERO) {
+            offset = readVarInt_1_0(firstByte);
+        }
+        int year = readVarUInt_1_0();
+        int month = 0;
+        int day = 0;
+        int hour = 0;
+        int minute = 0;
+        int second = 0;
+        BigDecimal fractionalSecond = null;
+        Timestamp.Precision precision = Timestamp.Precision.YEAR;
+        if (peekIndex < valueMarker.endIndex) {
+            month = readVarUInt_1_0();
+            precision = Timestamp.Precision.MONTH;
+            if (peekIndex < valueMarker.endIndex) {
+                day = readVarUInt_1_0();
+                precision = Timestamp.Precision.DAY;
+                if (peekIndex < valueMarker.endIndex) {
+                    hour = readVarUInt_1_0();
+                    if (peekIndex >= valueMarker.endIndex) {
+                        throw new IonException("Timestamps may not specify hour without specifying minute.");
+                    }
+                    minute = readVarUInt_1_0();
+                    precision = Timestamp.Precision.MINUTE;
+                    if (peekIndex < valueMarker.endIndex) {
+                        second = readVarUInt_1_0();
+                        precision = Timestamp.Precision.SECOND;
+                        if (peekIndex < valueMarker.endIndex) {
+                            fractionalSecond = readBigDecimal_1_0();
+                        }
+                    }
+                }
+            }
+        }
+        try {
+            return Timestamp.createFromUtcFields(
+                precision,
+                year,
+                month,
+                day,
+                hour,
+                minute,
+                second,
+                fractionalSecond,
+                offset
+            );
+        } catch (IllegalArgumentException e) {
+            throw new IonException("Illegal timestamp encoding. ", e);
+        }
+    }
+
+    /**
+     * Reads the boolean value using the type ID of the current value.
+     * @return the value.
+     */
+    private boolean readBoolean_1_0() {
+        return valueTid.lowerNibble == 1;
+    }
+
+    /**
+     * Determines whether the 8-byte integer starting at `valueMarker.startIndex` and ending at `valueMarker.endIndex`
+     * fits in a long, or requires a BigInteger.
+     * @return either `IntegerSize.LONG` or `IntegerSize.BIG_INTEGER`.
+     */
+    private IntegerSize classifyEightByteInt_1_0() {
+        if (valueTid.isNegativeInt) {
+            // The smallest negative 8-byte integer that can fit in a long is -0x80_00_00_00_00_00_00_00.
+            int firstByte = buffer[(int)(valueMarker.startIndex)] & SINGLE_BYTE_MASK;
+            if (firstByte < MOST_SIGNIFICANT_BYTE_OF_MIN_LONG) {
+                return IntegerSize.LONG;
+            } else if (firstByte > MOST_SIGNIFICANT_BYTE_OF_MIN_LONG) {
+                return IntegerSize.BIG_INTEGER;
+            }
+            for (long i = valueMarker.startIndex + 1; i < valueMarker.endIndex; i++) {
+                if (0x00 != buffer[(int)(i)]) {
+                    return IntegerSize.BIG_INTEGER;
+                }
+            }
+        } else {
+            // The largest positive 8-byte integer that can fit in a long is 0x7F_FF_FF_FF_FF_FF_FF_FF.
+            if ((buffer[(int)(valueMarker.startIndex)] & SINGLE_BYTE_MASK) > MOST_SIGNIFICANT_BYTE_OF_MAX_LONG) {
+                return IntegerSize.BIG_INTEGER;
+            }
+        }
+        return IntegerSize.LONG;
+    }
+
+
+    int readVarUInt_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private int readVarSym_1_1(Marker marker) {
+        throw new UnsupportedOperationException();
+    }
+
+    private BigDecimal readBigDecimal_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private Decimal readDecimal_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private long readLong_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private BigInteger readBigInteger_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private Timestamp readTimestamp_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    private boolean readBoolean_1_1() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Event nextValue() {
+        lobBytesRead = 0;
+        return super.nextValue();
+    }
+
+    /**
+     * Prepares the ByteBuffer to wrap a slice of the underlying buffer.
+     * @param startIndex the start of the slice.
+     * @param endIndex the end of the slice.
+     * @return the ByteBuffer.
+     */
+    ByteBuffer prepareByteBuffer(long startIndex, long endIndex) {
+        // Setting the limit to the capacity first is required because setting the position will fail if the new
+        // position is outside the limit.
+        byteBuffer.limit(buffer.length);
+        byteBuffer.position((int) startIndex);
+        byteBuffer.limit((int) endIndex);
+        return byteBuffer;
+    }
+
+
+    /**
+     * Reads a UInt.
+     * @param startIndex the index of the first byte in the UInt value.
+     * @param endIndex the index of the first byte after the end of the UInt value.
+     * @return the value.
+     */
+    private long readUInt(long startIndex, long endIndex) {
+        long result = 0;
+        for (long i = startIndex; i < endIndex; i++) {
+            result = (result << VALUE_BITS_PER_UINT_BYTE) | buffer[(int) i] & SINGLE_BYTE_MASK;
+        }
+        return result;
+    }
+
+    @Override
+    public boolean isNullValue() {
+        return valueTid != null && valueTid.isNull;
+    }
+
+    @Override
+    public IntegerSize getIntegerSize() {
+        if (valueTid.type != IonType.INT || valueTid.isNull) {
+            return null;
+        }
+        if (valueTid.length < 0) {
+            return IntegerSize.BIG_INTEGER;
+        } else if (valueTid.length < INT_SIZE_IN_BYTES) {
+            // Note: this is conservative. Most integers of size 4 also fit in an int, but since exactly the
+            // same parsing code is used for ints and longs, there is no point wasting the time to determine the
+            // smallest possible type.
+            return IntegerSize.INT;
+        } else if (valueTid.length < LONG_SIZE_IN_BYTES) {
+            return IntegerSize.LONG;
+        } else if (valueTid.length == LONG_SIZE_IN_BYTES) {
+            // Because creating BigIntegers is so expensive, it is worth it to look ahead and determine exactly
+            // which 8-byte integers can fit in a long.
+            return minorVersion == 0 ? classifyEightByteInt_1_0() : IntegerSize.LONG;
+        }
+        return IntegerSize.BIG_INTEGER;
+    }
+
+    private void throwDueToInvalidType(IonType type) {
+        throw new IllegalStateException(
+            String.format("Invalid type. Required %s but found %s.", type, valueTid == null ? null : valueTid.type)
+        );
+    }
+
+    @Override
+    public int byteSize() {
+        if (valueTid == null || (!IonType.isLob(valueTid.type) && !valueTid.isNull)) {
+            throw new IonException("Reader must be positioned on a blob or clob.");
+        }
+        return (int) (valueMarker.endIndex - valueMarker.startIndex);
+    }
+
+    @Override
+    public byte[] newBytes() {
+        byte[] bytes = new byte[byteSize()];
+        // The correct number of bytes will be requested from the buffer, so the limit is set at the capacity to
+        // avoid having to calculate a limit.
+        System.arraycopy(buffer, (int) valueMarker.startIndex, bytes, 0, bytes.length);
+        return bytes;
+    }
+
+    @Override
+    public int getBytes(byte[] bytes, int offset, int len) {
+        int length = Math.min(len, byteSize() - lobBytesRead);
+        // The correct number of bytes will be requested from the buffer, so the limit is set at the capacity to
+        // avoid having to calculate a limit.
+        System.arraycopy(buffer, (int) (valueMarker.startIndex + lobBytesRead), bytes, offset, length);
+        lobBytesRead += length;
+        return length;
+    }
+
+    @Override
+    public BigDecimal bigDecimalValue() {
+        if (valueTid == null || IonType.DECIMAL != valueTid.type) {
+            throwDueToInvalidType(IonType.DECIMAL);
+        }
+        if (valueTid.isNull) {
+            return null;
+        }
+        peekIndex = valueMarker.startIndex;
+        if (peekIndex >= valueMarker.endIndex) {
+            return BigDecimal.ZERO;
+        }
+        return minorVersion == 0 ? readBigDecimal_1_0() : readBigDecimal_1_1();
+    }
+
+    @Override
+    public Decimal decimalValue() {
+        if (valueTid == null || IonType.DECIMAL != valueTid.type) {
+            throwDueToInvalidType(IonType.DECIMAL);
+        }
+        if (valueTid.isNull) {
+            return null;
+        }
+        peekIndex = valueMarker.startIndex;
+        if (peekIndex >= valueMarker.endIndex) {
+            return Decimal.ZERO;
+        }
+        return minorVersion == 0 ? readDecimal_1_0() : readDecimal_1_1();
+    }
+
+    @Override
+    public long longValue() {
+        long value;
+        if (valueTid.type == IonType.INT) {
+            if (valueTid.length == 0) {
+                return 0;
+            }
+            value = minorVersion == 0 ? readLong_1_0() : readLong_1_1();
+        } else if (valueTid.type == IonType.FLOAT) {
+            scalarConverter.addValue(doubleValue());
+            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.double_value);
+            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.long_value));
+            value = scalarConverter.getLong();
+            scalarConverter.clear();
+        } else if (valueTid.type == IonType.DECIMAL) {
+            scalarConverter.addValue(decimalValue());
+            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.decimal_value);
+            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.long_value));
+            value = scalarConverter.getLong();
+            scalarConverter.clear();
+        } else {
+            throw new IllegalStateException("longValue() may only be called on values of type int, float, or decimal.");
+        }
+        return value;
+    }
+
+    @Override
+    public BigInteger bigIntegerValue() {
+        BigInteger value;
+        if (valueTid.type == IonType.INT) {
+            if (valueTid.isNull) {
+                // NOTE: this mimics existing behavior, but should probably be undefined (as, e.g., longValue() is in this
+                //  case).
+                return null;
+            }
+            if (valueTid.length == 0) {
+                return BigInteger.ZERO;
+            }
+            value = minorVersion == 0 ? readBigInteger_1_0() : readBigInteger_1_1();
+        } else if (valueTid.type == IonType.FLOAT) {
+            if (valueTid.isNull) {
+                value = null;
+            } else {
+                scalarConverter.addValue(doubleValue());
+                scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.double_value);
+                scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.bigInteger_value));
+                value = scalarConverter.getBigInteger();
+                scalarConverter.clear();
+            }
+        } else if (valueTid.type == IonType.DECIMAL) {
+            if (valueTid.isNull) {
+                value = null;
+            } else {
+                scalarConverter.addValue(decimalValue());
+                scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.decimal_value);
+                scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.bigInteger_value));
+                value = scalarConverter.getBigInteger();
+                scalarConverter.clear();
+            }
+        } else {
+            throw new IllegalStateException("longValue() may only be called on values of type int, float, or decimal.");
+        }
+        return value;
+    }
+
+    @Override
+    public int intValue() {
+        return (int) longValue();
+    }
+
+    @Override
+    public double doubleValue() {
+        double value;
+        if (valueTid.type == IonType.FLOAT) {
+            int length = (int) (valueMarker.endIndex - valueMarker.startIndex);
+            if (length == 0) {
+                return 0.0d;
+            }
+            ByteBuffer bytes = prepareByteBuffer(valueMarker.startIndex, valueMarker.endIndex);
+            if (length == FLOAT_32_BYTE_LENGTH) {
+                value = bytes.getFloat();
+            } else {
+                // Note: there is no need to check for other lengths here; the type ID byte is validated during next().
+                value = bytes.getDouble();
+            }
+        }  else if (valueTid.type == IonType.DECIMAL) {
+            scalarConverter.addValue(decimalValue());
+            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.decimal_value);
+            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.double_value));
+            value = scalarConverter.getDouble();
+            scalarConverter.clear();
+        } else {
+            throw new IllegalStateException("doubleValue() may only be called on values of type float or decimal.");
+        }
+        return value;
+    }
+
+    @Override
+    public Timestamp timestampValue() {
+        if (valueTid == null || IonType.TIMESTAMP != valueTid.type) {
+            throwDueToInvalidType(IonType.TIMESTAMP);
+        }
+        if (valueTid.isNull) {
+            return null;
+        }
+        peekIndex = valueMarker.startIndex;
+        return minorVersion == 0 ? readTimestamp_1_0() : readTimestamp_1_1();
+    }
+
+    @Override
+    public Date dateValue() {
+        Timestamp timestamp = timestampValue();
+        if (timestamp == null) {
+            return null;
+        }
+        return timestamp.dateValue();
+    }
+
+    @Override
+    public boolean booleanValue() {
+        if (valueTid == null || IonType.BOOL != valueTid.type) {
+            throwDueToInvalidType(IonType.BOOL);
+        }
+        return minorVersion == 0 ? readBoolean_1_0() : readBoolean_1_1();
+    }
+
+    @Override
+    public String stringValue() {
+        if (valueTid == null || IonType.STRING != valueTid.type) {
+            throwDueToInvalidType(IonType.STRING);
+        }
+        if (valueTid.isNull) {
+            return null;
+        }
+        ByteBuffer utf8InputBuffer = prepareByteBuffer(valueMarker.startIndex, valueMarker.endIndex);
+        return utf8Decoder.decode(utf8InputBuffer, (int) (valueMarker.endIndex - valueMarker.startIndex));
+    }
+
+    @Override
+    public int symbolValueId() {
+        if (valueTid == null || IonType.SYMBOL != valueTid.type) {
+            throwDueToInvalidType(IonType.SYMBOL);
+        }
+        if (valueTid.isNull) {
+            return -1;
+        }
+        return (int) readUInt(valueMarker.startIndex, valueMarker.endIndex);
+    }
+
+    /**
+     * Gets the annotation symbol IDs for the current value, reading them from the buffer first if necessary.
+     * @return the annotation symbol IDs, or an empty list if the current value is not annotated.
+     */
+    IntList getAnnotationSidList() {
+        annotationSids.clear();
+        long savedPeekIndex = peekIndex;
+        peekIndex = annotationSequenceMarker.startIndex;
+        if (minorVersion == 0) {
+            while (peekIndex < annotationSequenceMarker.endIndex) {
+                annotationSids.add(readVarUInt_1_0());
+            }
+        } else {
+            while (peekIndex < annotationSequenceMarker.endIndex) {
+                annotationSids.add(readVarUInt_1_1());
+            }
+        }
+        peekIndex = savedPeekIndex;
+        return annotationSids;
+    }
+
+    @Override
+    public int[] getAnnotationIds() {
+        getAnnotationSidList();
+        int[] annotationArray = new int[annotationSids.size()];
+        for (int i = 0; i < annotationArray.length; i++) {
+            annotationArray[i] = annotationSids.get(i);
+        }
+        return annotationArray;
+    }
+
+    @Override
+    public int getFieldId() {
+        return fieldSid;
+    }
+
+    @Override
+    public boolean isInStruct() {
+        return parent != null && parent.typeId.type == IonType.STRUCT;
+    }
+
+    @Override
+    public IonType getType() {
+        return valueTid == null ? null : valueTid.type;
+    }
+
+    @Override
+    public int getDepth() {
+        return containerIndex + 1;
+    }
+
+    @Override
+    public void close() {
+        utf8Decoder.close();
+        super.close();
+    }
+}
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
new file mode 100644
index 0000000000..78209422fe
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
@@ -0,0 +1,256 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IvmNotificationConsumer;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.ByteArrayInputStream;
+
+import static com.amazon.ion.BitUtils.bytes;
+import static com.amazon.ion.IonCursor.Event.END_CONTAINER;
+import static com.amazon.ion.IonCursor.Event.NEEDS_DATA;
+import static com.amazon.ion.IonCursor.Event.NEEDS_INSTRUCTION;
+import static com.amazon.ion.IonCursor.Event.START_CONTAINER;
+import static com.amazon.ion.IonCursor.Event.START_SCALAR;
+import static com.amazon.ion.IonCursor.Event.VALUE_READY;
+import static org.junit.Assert.assertEquals;
+
+@RunWith(Parameterized.class)
+public class IonReaderContinuableCoreBinaryTest {
+    private static final IonBufferConfiguration STANDARD_BUFFER_CONFIGURATION = IonBufferConfiguration.Builder.standard().build();
+
+    @Parameterized.Parameters(name = "constructWithBytes={0}")
+    public static Object[] parameters() {
+        return new Object[]{true, false};
+    }
+
+    @Parameterized.Parameter
+    public boolean constructFromBytes;
+
+    IonReaderContinuableCoreBinary reader = null;
+    int numberOfIvmsEncountered = 0;
+
+    private final IvmNotificationConsumer countingIvmConsumer = (majorVersion, minorVersion) -> numberOfIvmsEncountered++;
+
+    @Before
+    public void setup() {
+        reader = null;
+        numberOfIvmsEncountered = 0;
+    }
+
+    private void initializeReader(int... data) {
+        if (constructFromBytes) {
+            reader = new IonReaderContinuableCoreBinary(STANDARD_BUFFER_CONFIGURATION, bytes(data), 0, data.length);
+        } else {
+            reader = new IonReaderContinuableCoreBinary(
+                STANDARD_BUFFER_CONFIGURATION,
+                new ByteArrayInputStream(bytes(data)),
+                null,
+                0,
+                0
+            );
+        }
+        reader.registerIvmNotificationConsumer(countingIvmConsumer);
+        reader.registerOversizedValueHandler(
+            STANDARD_BUFFER_CONFIGURATION.getOversizedValueHandler()
+        );
+    }
+
+    @Test
+    public void basicContainer() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4
+            0x21, 0x01 // Int 1
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(4, reader.getFieldId());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals(1, reader.intValue());
+        assertEquals(END_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void basicStrings() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0x83, 'f', 'o', 'o', // String length 3
+            0x83, 'b', 'a', 'r' // String length 3
+        );
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals("foo", reader.stringValue());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals("bar", reader.stringValue());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void basicNoFill() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4
+            0x21, 0x01 // Int 1
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(4, reader.getFieldId());
+        assertEquals(END_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void basicStepOutEarly() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4
+            0x21, 0x01 // Int 1
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        assertEquals(-1, reader.getFieldId());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void basicTopLevelSkip() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4
+            0x21, 0x01 // Int 1
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void basicTopLevelSkipThenConsume() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4
+            0x21, 0x01, // Int 1
+            0x21, 0x03 // Int 3
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals(3, reader.intValue());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void nestedContainers() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD6, // Struct length 6
+            0x83, // Field SID 3
+            0xB1, // List length 1
+            0x40, // Float length 0
+            0x84, // Field SID 4
+            0x21, 0x01 // Int 1
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals(1, reader.intValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void fillContainerAtDepth0() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD6, // Struct length 6
+            0x83, // Field SID 3
+            0xB1, // List length 1
+            0x40, // Float 0
+            0x84, // Field SID 4
+            0x21, 0x01 // Int 1
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals(1, reader.intValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void fillContainerAtDepth1() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD6, // Struct length 6
+            0x83, // Field SID 3
+            0xB1, // List length 1
+            0x40, // Float 0
+            0x84, // Field SID 4
+            0x21, 0x01 // Int 1
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(END_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+    }
+
+    @Test
+    public void fillContainerThenSkip() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD6, // Struct length 6
+            0x83, // Field SID 3
+            0xB1, // List length 1
+            0x40, // Float 0
+            0x84, // Field SID 4
+            0x21, 0x01, // Int 1
+            0xD2, // Struct length 2
+            0x84, // Field SID 4
+            0x20 // Int 0
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals(0, reader.intValue());
+        assertEquals(END_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+}

From a0a1c5f86ca8f14c9655e43ba7518fe028763a7e Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 29 Jun 2023 16:03:17 -0700
Subject: [PATCH 264/490] Adds IonReaderContinuableApplicationBinary, which
 builds symbol processing on top of IonReaderContinuableCoreBinary.

---
 ...IonReaderContinuableApplicationBinary.java | 689 ++++++++++++++++++
 ...eaderContinuableApplicationBinaryTest.java | 162 ++++
 2 files changed, 851 insertions(+)
 create mode 100644 src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
 create mode 100644 test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
new file mode 100644
index 0000000000..9c8964f986
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -0,0 +1,689 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.impl.bin.IntList;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.SimpleCatalog;
+
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
+import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
+import static com.amazon.ion.SystemSymbols.MAX_ID_SID;
+import static com.amazon.ion.SystemSymbols.NAME_SID;
+import static com.amazon.ion.SystemSymbols.SYMBOLS_SID;
+import static com.amazon.ion.SystemSymbols.VERSION_SID;
+
+/**
+ * An IonCursor capable of application-level parsing of binary Ion streams.
+ */
+class IonReaderContinuableApplicationBinary extends IonReaderContinuableCoreBinary implements IonReaderContinuableApplication {
+
+    // The UTF-8 encoded bytes representing the text `$ion_symbol_table`.
+    private static final byte[] ION_SYMBOL_TABLE_UTF8;
+
+    static {
+        ION_SYMBOL_TABLE_UTF8 = SystemSymbols.ION_SYMBOL_TABLE.getBytes(StandardCharsets.UTF_8);
+    }
+
+    // An IonCatalog containing zero shared symbol tables.
+    private static final IonCatalog EMPTY_CATALOG = new SimpleCatalog();
+
+    // Initial capacity of the ArrayList used to hold the text in the current symbol table.
+    private static final int SYMBOLS_LIST_INITIAL_CAPACITY = 128;
+
+    // The imports for Ion 1.0 data with no shared user imports.
+    private static final LocalSymbolTableImports ION_1_0_IMPORTS
+        = new LocalSymbolTableImports(SharedSymbolTable.getSystemSymbolTable(1));
+
+    // The text representations of the symbol table that is currently in scope, indexed by symbol ID. If the element at
+    // a particular index is null, that symbol has unknown text.
+    private String[] symbols;
+
+    // The max ID of the local symbol table.
+    private int localSymbolMaxId = -1;
+
+    // The catalog used by the reader to resolve shared symbol table imports.
+    private final IonCatalog catalog;
+
+    // Uses the underlying raw reader to read the symbol tables from the stream.
+    private final SymbolTableReader symbolTableReader;
+
+    // The shared symbol tables imported by the local symbol table that is currently in scope.
+    private LocalSymbolTableImports imports = ION_1_0_IMPORTS;
+
+    // The first lowest local symbol ID in the symbol table.
+    private int firstLocalSymbolId = imports.getMaxId() + 1;
+
+    // ------
+
+    /**
+     * Constructs a new reader from the given byte array.
+     * @param builder the builder containing the configuration for the new reader.
+     * @param bytes the byte array containing the bytes to read.
+     * @param offset the offset into the byte array at which the first byte of Ion data begins.
+     * @param length the number of bytes to be read from the byte array.
+     */
+    IonReaderContinuableApplicationBinary(IonReaderBuilder builder, byte[] bytes, int offset, int length) {
+        super(builder.getBufferConfiguration(), bytes, offset, length);
+        this.catalog = builder.getCatalog() == null ? EMPTY_CATALOG : builder.getCatalog();
+        symbols = new String[SYMBOLS_LIST_INITIAL_CAPACITY];
+        symbolTableReader = new SymbolTableReader();
+        resetImports();
+        registerIvmNotificationConsumer((x, y) -> {
+            // Note: for Ion 1.1 support, use the versions to set the proper system symbol table and local symbol table
+            // processing logic.
+            resetSymbolTable();
+            resetImports();
+        });
+    }
+
+    /**
+     * Constructs a new reader from the given input stream.
+     * @param builder the builder containing the configuration for the new reader.
+     * @param alreadyRead the byte array containing the bytes already read (often the IVM).
+     * @param alreadyReadOff the offset into `alreadyRead` at which the first byte that was already read exists.
+     * @param alreadyReadLen the number of bytes already read from `alreadyRead`.
+     */
+    IonReaderContinuableApplicationBinary(final IonReaderBuilder builder, final InputStream inputStream, byte[] alreadyRead, int alreadyReadOff, int alreadyReadLen) {
+        super(builder.getBufferConfiguration(), inputStream, alreadyRead, alreadyReadOff, alreadyReadLen);
+        this.catalog = builder.getCatalog() == null ? EMPTY_CATALOG : builder.getCatalog();
+        symbols = new String[SYMBOLS_LIST_INITIAL_CAPACITY];
+        symbolTableReader = new SymbolTableReader();
+        resetImports();
+        registerIvmNotificationConsumer((x, y) -> {
+            // Note: for Ion 1.1 support, use the versions to set the proper system symbol table and local symbol table
+            // processing logic.
+            resetSymbolTable();
+            resetImports();
+        });
+        registerOversizedValueHandler(
+            () -> {
+                if (
+                    state != State.READING_VALUE || // The reader is currently processing a symbol table.
+                    (
+                        parent == null && hasAnnotations && ( // The reader is on an annotated top-level value.
+                            // The value's type is not yet known; it might be a symbol table.
+                            super.getType() == null ||
+                            // The value's type is known. It can be determined whether it is a symbol table.
+                            isPositionedOnSymbolTable()
+                        )
+                    )
+                ) {
+                    builder.getBufferConfiguration().getOversizedSymbolTableHandler().onOversizedSymbolTable();
+                    terminate();
+                } else {
+                    builder.getBufferConfiguration().getOversizedValueHandler().onOversizedValue();
+                }
+            }
+        );
+    }
+
+    /**
+     * Non-reusable iterator over the annotations on the current value. May be iterated even if the reader advances
+     * past the current value.
+     */
+    private class SingleUseAnnotationSequenceIterator implements Iterator<String> {
+
+        // All of the annotation SIDs on the current value.
+        private final IntList annotationSids;
+        // The index into `annotationSids` containing the next annotation to be returned.
+        private int index = 0;
+
+        SingleUseAnnotationSequenceIterator() {
+            annotationSids = new IntList(getAnnotationSidList());
+        }
+
+        @Override
+        public boolean hasNext() {
+            return index < annotationSids.size();
+        }
+
+        @Override
+        public String next() {
+            int sid = annotationSids.get(index);
+            String annotation = getSymbol(sid);
+            if (annotation == null) {
+                throw new UnknownSymbolException(sid);
+            }
+            index++;
+            return annotation;
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException("This iterator does not support element removal.");
+        }
+    }
+
+    /**
+     * Gets the system symbol table for the Ion version currently active.
+     * @return a system SymbolTable.
+     */
+    private SymbolTable getSystemSymbolTable() {
+        // Note: Ion 1.1 currently proposes changes to the system symbol table. If this is finalized, then
+        // 'majorVersion' cannot be used to look up the system symbol table; both 'majorVersion' and 'minorVersion'
+        // will need to be used.
+        return SharedSymbolTable.getSystemSymbolTable(getIonMajorVersion());
+    }
+
+    /**
+     * Reset the local symbol table to the system symbol table.
+     */
+    private void resetSymbolTable() {
+        // The following line is not required for correctness, but it frees the references to the old symbols,
+        // potentially allowing them to be garbage collected.
+        Arrays.fill(symbols, 0, localSymbolMaxId + 1, null);
+        localSymbolMaxId = -1;
+    }
+
+    /**
+     * Reset the list of imported shared symbol tables.
+     */
+    private void resetImports() {
+        // Note: when support for the next version of Ion is added, conditionals on 'majorVersion' and 'minorVersion'
+        // must be added here.
+        imports = ION_1_0_IMPORTS;
+        firstLocalSymbolId = imports.getMaxId() + 1;
+    }
+
+    /**
+     * Creates a shared symbol table import, resolving it from the catalog if possible.
+     * @param name the name of the shared symbol table.
+     * @param version the version of the shared symbol table.
+     * @param maxId the max_id of the shared symbol table. This value takes precedence over the actual max_id for the
+     *              shared symbol table at the requested version.
+     */
+    private SymbolTable createImport(String name, int version, int maxId) {
+        SymbolTable shared = catalog.getTable(name, version);
+        if (shared == null) {
+            // No match. All symbol IDs that fall within this shared symbol table's range will have unknown text.
+            return new SubstituteSymbolTable(name, version, maxId);
+        } else if (shared.getMaxId() != maxId || shared.getVersion() != version) {
+            // Partial match. If the requested max_id exceeds the actual max_id of the resolved shared symbol table,
+            // symbol IDs that exceed the max_id of the resolved shared symbol table will have unknown text.
+            return new SubstituteSymbolTable(shared, version, maxId);
+        } else {
+            // Exact match; the resolved shared symbol table may be used as-is.
+            return shared;
+        }
+    }
+
+    /**
+     * Retrieves the String text for the given symbol ID.
+     * @param sid a symbol ID.
+     * @return a String.
+     */
+    String getSymbol(int sid) {
+        if (sid < firstLocalSymbolId) {
+            return imports.findKnownSymbol(sid);
+        }
+        int localSid = sid - firstLocalSymbolId;
+        if (localSid > localSymbolMaxId) {
+            throw new IonException("Symbol ID exceeds the max ID of the symbol table.");
+        }
+        return symbols[localSid];
+    }
+
+    /**
+     * Uses the underlying raw reader to read the symbol tables from the stream. Capable of resuming if not enough
+     * data is currently available to complete the symbol table.
+     */
+    private class SymbolTableReader {
+
+        private boolean hasSeenImports;
+        private boolean hasSeenSymbols;
+        private boolean isAppend;
+        private String name = null;
+        private int version = -1;
+        private int maxId = -1;
+        private List<SymbolTable> newImports = null;
+        private List<String> newSymbols = null;
+
+        private void resetState() {
+            hasSeenImports = false;
+            hasSeenSymbols = false;
+            isAppend = false;
+            newImports = null;
+            newSymbols = null;
+            name = null;
+            version = -1;
+            maxId = -1;
+        }
+
+        private boolean valueUnavailable() {
+            Event event = fillValue();
+            return event == Event.NEEDS_DATA || event == Event.NEEDS_INSTRUCTION;
+        }
+
+        private void growSymbolsArray(int shortfall) {
+            int newSize = nextPowerOfTwo(symbols.length + shortfall);
+            String[] resized = new String[newSize];
+            System.arraycopy(symbols, 0, resized, 0, localSymbolMaxId + 1);
+            symbols = resized;
+        }
+
+        private void finishReadingSymbolTableStruct() {
+            stepOutOfContainer();
+            if (!hasSeenImports) {
+                resetSymbolTable();
+                resetImports();
+            }
+            if (newSymbols != null) {
+                int numberOfNewSymbols = newSymbols.size();
+                int numberOfAvailableSlots = symbols.length - (localSymbolMaxId + 1);
+                int shortfall = numberOfNewSymbols - numberOfAvailableSlots;
+                if (shortfall > 0) {
+                    growSymbolsArray(shortfall);
+                }
+                int i = localSymbolMaxId;
+                for (String newSymbol : newSymbols) {
+                    symbols[++i] = newSymbol;
+                }
+                localSymbolMaxId += newSymbols.size();
+            }
+            state = State.READING_VALUE;
+        }
+
+        private void readSymbolTableStructField() {
+            if (fieldSid == SYMBOLS_SID) {
+                state = State.ON_SYMBOL_TABLE_SYMBOLS;
+                if (hasSeenSymbols) {
+                    throw new IonException("Symbol table contained multiple symbols fields.");
+                }
+                hasSeenSymbols = true;
+            } else if (fieldSid == IMPORTS_SID) {
+                state = State.ON_SYMBOL_TABLE_IMPORTS;
+                if (hasSeenImports) {
+                    throw new IonException("Symbol table contained multiple imports fields.");
+                }
+                hasSeenImports = true;
+            }
+        }
+
+        private void startReadingImportsList() {
+            resetImports();
+            resetSymbolTable();
+            newImports = new ArrayList<>(3);
+            newImports.add(getSystemSymbolTable());
+            state = State.READING_SYMBOL_TABLE_IMPORTS_LIST;
+        }
+
+        private void preparePossibleAppend() {
+            if (symbolValueId() == ION_SYMBOL_TABLE_SID) {
+                isAppend = true;
+            } else {
+                resetSymbolTable();
+            }
+            state = State.ON_SYMBOL_TABLE_FIELD;
+        }
+
+        private void finishReadingImportsList() {
+            stepOutOfContainer();
+            imports = new LocalSymbolTableImports(newImports);
+            firstLocalSymbolId = imports.getMaxId() + 1;
+            state = State.ON_SYMBOL_TABLE_FIELD;
+        }
+
+        private void startReadingSymbolsList() {
+            newSymbols = new ArrayList<>(8);
+            state = State.READING_SYMBOL_TABLE_SYMBOLS_LIST;
+        }
+
+        private void startReadingSymbol() {
+            if (IonReaderContinuableApplicationBinary.super.getType() == IonType.STRING) {
+                state = State.READING_SYMBOL_TABLE_SYMBOL;
+            } else {
+                newSymbols.add(null);
+            }
+        }
+
+        private void finishReadingSymbol() {
+            newSymbols.add(stringValue());
+            state = State.READING_SYMBOL_TABLE_SYMBOLS_LIST;
+        }
+
+        private void finishReadingSymbolsList() {
+            stepOutOfContainer();
+            state = State.ON_SYMBOL_TABLE_FIELD;
+        }
+
+        private void startReadingImportStruct() {
+            name = null;
+            version = -1;
+            maxId = -1;
+            if (IonReaderContinuableApplicationBinary.super.getType() == IonType.STRUCT) {
+                stepIntoContainer();
+                state = State.READING_SYMBOL_TABLE_IMPORT_STRUCT;
+            }
+        }
+
+        private void finishReadingImportStruct() {
+            stepOutOfContainer();
+            newImports.add(createImport(name, version, maxId));
+            state = State.READING_SYMBOL_TABLE_IMPORTS_LIST;
+        }
+
+        private void startReadingImportStructField() {
+            int fieldId = getFieldId();
+            if (fieldId == NAME_SID) {
+                state = State.READING_SYMBOL_TABLE_IMPORT_NAME;
+            } else if (fieldId == VERSION_SID) {
+                state = State.READING_SYMBOL_TABLE_IMPORT_VERSION;
+            } else if (fieldId == MAX_ID_SID) {
+                state = State.READING_SYMBOL_TABLE_IMPORT_MAX_ID;
+            }
+        }
+
+        private void readImportName() {
+            if (IonReaderContinuableApplicationBinary.super.getType() == IonType.STRING) {
+                name = stringValue();
+            }
+            state = State.READING_SYMBOL_TABLE_IMPORT_STRUCT;
+        }
+
+        private void readImportVersion() {
+            if (IonReaderContinuableApplicationBinary.super.getType() == IonType.INT) {
+                version = intValue();
+            }
+            state = State.READING_SYMBOL_TABLE_IMPORT_STRUCT;
+        }
+
+        private void readImportMaxId() {
+            if (IonReaderContinuableApplicationBinary.super.getType() == IonType.INT) {
+                maxId = intValue();
+            }
+            state = State.READING_SYMBOL_TABLE_IMPORT_STRUCT;
+        }
+
+        void readSymbolTable() {
+            Event event;
+            while (true) {
+                switch (state) {
+                    case ON_SYMBOL_TABLE_STRUCT:
+                        if (Event.NEEDS_DATA == stepIntoContainer()) {
+                            return;
+                        }
+                        state = State.ON_SYMBOL_TABLE_FIELD;
+                        break;
+                    case ON_SYMBOL_TABLE_FIELD:
+                        event = IonReaderContinuableApplicationBinary.super.nextValue();
+                        if (Event.NEEDS_DATA == event) {
+                            return;
+                        }
+                        if (event == Event.END_CONTAINER) {
+                            finishReadingSymbolTableStruct();
+                            return;
+                        }
+                        readSymbolTableStructField();
+                        break;
+                    case ON_SYMBOL_TABLE_SYMBOLS:
+                        if (IonReaderContinuableApplicationBinary.super.getType() == IonType.LIST) {
+                            if (Event.NEEDS_DATA == stepIntoContainer()) {
+                                return;
+                            }
+                            startReadingSymbolsList();
+                        } else {
+                            state = State.ON_SYMBOL_TABLE_FIELD;
+                        }
+                        break;
+                    case ON_SYMBOL_TABLE_IMPORTS:
+                        if (IonReaderContinuableApplicationBinary.super.getType() == IonType.LIST) {
+                            if (Event.NEEDS_DATA == stepIntoContainer()) {
+                                return;
+                            }
+                            startReadingImportsList();
+                        } else if (IonReaderContinuableApplicationBinary.super.getType() == IonType.SYMBOL) {
+                            if (valueUnavailable()) {
+                                return;
+                            }
+                            preparePossibleAppend();
+                        } else {
+                            state = State.ON_SYMBOL_TABLE_FIELD;
+                        }
+                        break;
+                    case READING_SYMBOL_TABLE_SYMBOLS_LIST:
+                        event = IonReaderContinuableApplicationBinary.super.nextValue();
+                        if (event == Event.NEEDS_DATA) {
+                            return;
+                        }
+                        if (event == Event.END_CONTAINER) {
+                            finishReadingSymbolsList();
+                            break;
+                        }
+                        startReadingSymbol();
+                        break;
+                    case READING_SYMBOL_TABLE_SYMBOL:
+                        if (valueUnavailable()) {
+                            return;
+                        }
+                        finishReadingSymbol();
+                        break;
+                    case READING_SYMBOL_TABLE_IMPORTS_LIST:
+                        event = IonReaderContinuableApplicationBinary.super.nextValue();
+                        if (event == Event.NEEDS_DATA) {
+                            return;
+                        }
+                        if (event == Event.END_CONTAINER) {
+                            finishReadingImportsList();
+                            break;
+                        }
+                        startReadingImportStruct();
+                        break;
+                    case READING_SYMBOL_TABLE_IMPORT_STRUCT:
+                        event = IonReaderContinuableApplicationBinary.super.nextValue();
+                        if (event == Event.NEEDS_DATA) {
+                            return;
+                        }
+                        if (event == Event.END_CONTAINER) {
+                            finishReadingImportStruct();
+                            break;
+                        } else if (event != Event.START_SCALAR) {
+                            break;
+                        }
+                        startReadingImportStructField();
+                        break;
+                    case READING_SYMBOL_TABLE_IMPORT_NAME:
+                        if (valueUnavailable()) {
+                            return;
+                        }
+                        readImportName();
+                        break;
+                    case READING_SYMBOL_TABLE_IMPORT_VERSION:
+                        if (valueUnavailable()) {
+                            return;
+                        }
+                        readImportVersion();
+                        break;
+                    case READING_SYMBOL_TABLE_IMPORT_MAX_ID:
+                        if (valueUnavailable()) {
+                            return;
+                        }
+                        readImportMaxId();
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+     * The reader's state. `READING_VALUE` indicates that the reader is reading a user-level value; all other states
+     * indicate that the reader is in the middle of reading a symbol table.
+     */
+    private enum State {
+        ON_SYMBOL_TABLE_STRUCT,
+        ON_SYMBOL_TABLE_FIELD,
+        ON_SYMBOL_TABLE_SYMBOLS,
+        READING_SYMBOL_TABLE_SYMBOLS_LIST,
+        READING_SYMBOL_TABLE_SYMBOL,
+        ON_SYMBOL_TABLE_IMPORTS,
+        READING_SYMBOL_TABLE_IMPORTS_LIST,
+        READING_SYMBOL_TABLE_IMPORT_STRUCT,
+        READING_SYMBOL_TABLE_IMPORT_NAME,
+        READING_SYMBOL_TABLE_IMPORT_VERSION,
+        READING_SYMBOL_TABLE_IMPORT_MAX_ID,
+        READING_VALUE
+    }
+
+    // The current state.
+    private State state = State.READING_VALUE;
+
+    /**
+     * @return true if current value has a sequence of annotations that begins with `$ion_symbol_table`; otherwise,
+     *  false.
+     */
+    boolean startsWithIonSymbolTable() {
+        long savedPeekIndex = peekIndex;
+        peekIndex = annotationSequenceMarker.startIndex;
+        int sid = minorVersion == 0 ? readVarUInt_1_0() : readVarUInt_1_1();
+        peekIndex = savedPeekIndex;
+        return ION_SYMBOL_TABLE_SID == sid;
+    }
+
+    /**
+     * @return true if the reader is positioned on a symbol table; otherwise, false.
+     */
+    private boolean isPositionedOnSymbolTable() {
+        return hasAnnotations &&
+            super.getType() == IonType.STRUCT &&
+            startsWithIonSymbolTable();
+    }
+
+    @Override
+    public Event nextValue() {
+        Event event;
+        if (parent == null || state != State.READING_VALUE) {
+            while (true) {
+                if (state != State.READING_VALUE) {
+                    symbolTableReader.readSymbolTable();
+                    if (state != State.READING_VALUE) {
+                        event = Event.NEEDS_DATA;
+                        break;
+                    }
+                }
+                event = super.nextValue();
+                if (parent == null && isPositionedOnSymbolTable()) {
+                    symbolTableReader.resetState();
+                    state = State.ON_SYMBOL_TABLE_STRUCT;
+                    continue;
+                }
+                break;
+            }
+        } else {
+            event = super.nextValue();
+        }
+        return event;
+    }
+
+    @Override
+    public SymbolTable getSymbolTable() {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    @Override
+    public String stringValue() {
+        String value;
+        IonType type = super.getType();
+        if (type == IonType.STRING) {
+            value = super.stringValue();
+        } else if (type == IonType.SYMBOL) {
+            int sid = symbolValueId();
+            if (sid < 0) {
+                // The raw reader uses this to denote null.symbol.
+                return null;
+            }
+            value = getSymbol(sid);
+            if (value == null) {
+                throw new UnknownSymbolException(sid);
+            }
+        } else {
+            throw new IllegalStateException("Invalid type requested.");
+        }
+        return value;
+    }
+
+    @Override
+    public SymbolToken symbolValue() {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    @Override
+    public String[] getTypeAnnotations() {
+        if (!hasAnnotations) {
+            return _Private_Utils.EMPTY_STRING_ARRAY;
+        }
+        IntList annotationSids = getAnnotationSidList();
+        String[] annotationArray = new String[annotationSids.size()];
+        for (int i = 0; i < annotationArray.length; i++) {
+            String symbol = getSymbol(annotationSids.get(i));
+            if (symbol == null) {
+                throw new UnknownSymbolException(annotationSids.get(i));
+            }
+            annotationArray[i] = symbol;
+        }
+        return annotationArray;
+    }
+
+    @Override
+    public SymbolToken[] getTypeAnnotationSymbols() {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+    private static final Iterator<String> EMPTY_ITERATOR = new Iterator<String>() {
+
+        @Override
+        public boolean hasNext() {
+            return false;
+        }
+
+        @Override
+        public String next() {
+            return null;
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException("Cannot remove from an empty iterator.");
+        }
+    };
+
+    @Override
+    public Iterator<String> iterateTypeAnnotations() {
+        if (!hasAnnotations) {
+            return EMPTY_ITERATOR;
+        }
+        return new SingleUseAnnotationSequenceIterator();
+    }
+
+    @Override
+    public String getFieldName() {
+        if (fieldSid < 0) {
+            return null;
+        }
+        String fieldName = getSymbol(fieldSid);
+        if (fieldName == null) {
+            throw new UnknownSymbolException(fieldSid);
+        }
+        return fieldName;
+    }
+
+    @Override
+    public SymbolToken getFieldNameSymbol() {
+        throw new UnsupportedOperationException("Not yet implemented");
+    }
+
+}
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
new file mode 100644
index 0000000000..bb267ed605
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
@@ -0,0 +1,162 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IvmNotificationConsumer;
+import com.amazon.ion.system.IonReaderBuilder;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.ByteArrayInputStream;
+
+import static com.amazon.ion.BitUtils.bytes;
+import static com.amazon.ion.IonCursor.Event.END_CONTAINER;
+import static com.amazon.ion.IonCursor.Event.NEEDS_DATA;
+import static com.amazon.ion.IonCursor.Event.NEEDS_INSTRUCTION;
+import static com.amazon.ion.IonCursor.Event.START_CONTAINER;
+import static com.amazon.ion.IonCursor.Event.START_SCALAR;
+import static com.amazon.ion.IonCursor.Event.VALUE_READY;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+@RunWith(Parameterized.class)
+public class IonReaderContinuableApplicationBinaryTest {
+
+    private static final IonReaderBuilder STANDARD_READER_BUILDER = IonReaderBuilder.standard()
+        .withBufferConfiguration(IonBufferConfiguration.Builder.standard().build());
+
+    @Parameterized.Parameters(name = "constructWithBytes={0}")
+    public static Object[] parameters() {
+        return new Object[]{true, false};
+    }
+
+    @Parameterized.Parameter
+    public boolean constructFromBytes;
+
+    IonReaderContinuableApplicationBinary reader = null;
+    int numberOfIvmsEncountered = 0;
+
+    private final IvmNotificationConsumer countingIvmConsumer = (majorVersion, minorVersion) -> numberOfIvmsEncountered++;
+
+    @Before
+    public void setup() {
+        reader = null;
+        numberOfIvmsEncountered = 0;
+    }
+
+    private void initializeReader(int... data) {
+        if (constructFromBytes) {
+            reader = new IonReaderContinuableApplicationBinary(STANDARD_READER_BUILDER, bytes(data), 0, data.length);
+        } else {
+            reader = new IonReaderContinuableApplicationBinary(
+                STANDARD_READER_BUILDER,
+                new ByteArrayInputStream(bytes(data)),
+                null,
+                0,
+                0
+            );
+        }
+        reader.registerIvmNotificationConsumer(countingIvmConsumer);
+        reader.registerOversizedValueHandler(
+            STANDARD_READER_BUILDER.getBufferConfiguration().getOversizedValueHandler()
+        );
+    }
+
+    @Test
+    public void basicContainer() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4 ("name")
+            0x21, 0x01 // Int 1
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals("name", reader.getFieldName());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals(1, reader.intValue());
+        assertEquals(END_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void basicSystemSymbols() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0x71, 0x04, // Symbol value SID 4 ("name")
+            0x71, 0x05 // Symbol value SID 5 ("version")
+        );
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals("name", reader.stringValue());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals("version", reader.stringValue());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void basicLocalSymbols() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xE9, // Annotation wrapper length 9
+            0x81, // 1 byte of annotations
+            0x83, // Annotation SID 3 ($ion_symbol_table)
+            0xD6, // Struct length 6 (local symbol table)
+            0x87, // Field SID 7 ("symbols")
+            0xB4, // List length 4
+            0x81, 'A', // String "A"
+            0x81, 'B', // String "B"
+            0x71, 0x0A, // Symbol value SID 10 ("A")
+            0x71, 0x0B // Symbol value SID 11 ("B")
+        );
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals("A", reader.stringValue());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(VALUE_READY, reader.fillValue());
+        assertEquals("B", reader.stringValue());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void basicNoFill() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4 ("name")
+            0x21, 0x01 // Int 1
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals("name", reader.getFieldName());
+        assertEquals(END_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+    @Test
+    public void basicStepOutEarly() {
+        initializeReader(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD3, // Struct length 3
+            0x84, // Field SID 4 ("name")
+            0x21, 0x01 // Int 1
+        );
+        assertEquals(START_CONTAINER, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+        assertEquals(START_SCALAR, reader.nextValue());
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        assertNull(reader.getFieldName());
+        assertEquals(NEEDS_DATA, reader.nextValue());
+    }
+
+
+}

From e8e260a76f485507caeeb33f9ee5434ede2ed4d8 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 29 Jun 2023 16:28:54 -0700
Subject: [PATCH 265/490] Adds support for SymbolToken APIs and
 getSymbolTable() to IonReaderContinuableApplicationBinary.

---
 ...IonReaderContinuableApplicationBinary.java | 344 +++++++++++++++++-
 .../impl/SymbolTokenWithImportLocation.java   |  76 ++++
 2 files changed, 416 insertions(+), 4 deletions(-)
 create mode 100644 src/com/amazon/ion/impl/SymbolTokenWithImportLocation.java

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 9c8964f986..542244ff2a 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -5,21 +5,29 @@
 
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.ReadOnlyValueException;
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.SystemSymbols;
 import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.ValueFactory;
 import com.amazon.ion.impl.bin.IntList;
 import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.system.SimpleCatalog;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
 import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
@@ -69,6 +77,14 @@ class IonReaderContinuableApplicationBinary extends IonReaderContinuableCoreBina
     // The first lowest local symbol ID in the symbol table.
     private int firstLocalSymbolId = imports.getMaxId() + 1;
 
+    // A map of symbol ID to SymbolToken representation. Because most use cases only require symbol text, this
+    // is used only if necessary to avoid imposing the extra expense on all symbol lookups.
+    private List<SymbolToken> symbolTokensById = null;
+
+    // The cached SymbolTable representation of the current local symbol table. Invalidated whenever a local
+    // symbol table is encountered in the stream.
+    private SymbolTable cachedReadOnlySymbolTable = null;
+
     // ------
 
     /**
@@ -181,6 +197,218 @@ private SymbolTable getSystemSymbolTable() {
         return SharedSymbolTable.getSystemSymbolTable(getIonMajorVersion());
     }
 
+    /**
+     * Read-only snapshot of the local symbol table at the reader's current position.
+     */
+    private class LocalSymbolTableSnapshot implements SymbolTable, SymbolTableAsStruct {
+
+        // The system symbol table.
+        private final SymbolTable system = IonReaderContinuableApplicationBinary.this.getSystemSymbolTable();
+
+        // The max ID of this local symbol table.
+        private final int maxId;
+
+        // The shared symbol tables imported by this local symbol table.
+        private final LocalSymbolTableImports importedTables;
+
+        // Map representation of this symbol table. Keys are symbol text; values are the lowest symbol ID that maps
+        // to that text.
+        final Map<String, Integer> mapView;
+
+        // List representation of this symbol table, indexed by symbol ID.
+        final String[] listView;
+
+        private SymbolTableStructCache structCache = null;
+
+        LocalSymbolTableSnapshot() {
+            int importsMaxId = imports.getMaxId();
+            int numberOfLocalSymbols = localSymbolMaxId + 1;
+            // Note: 'imports' is immutable, so a clone is not needed.
+            importedTables = imports;
+            maxId = importsMaxId + numberOfLocalSymbols;
+            // Map with initial size the number of symbols and load factor 1, meaning it must be full before growing.
+            // It is not expected to grow.
+            listView = new String[numberOfLocalSymbols];
+            System.arraycopy(symbols, 0, listView, 0, numberOfLocalSymbols);
+            mapView = new HashMap<>((int) Math.ceil(numberOfLocalSymbols / 0.75), 0.75f);
+            for (int i = 0; i < numberOfLocalSymbols; i++) {
+                String symbol = listView[i];
+                if (symbol != null) {
+                    mapView.put(symbol, i + importsMaxId + 1);
+                }
+            }
+        }
+
+        @Override
+        public String getName() {
+            return null;
+        }
+
+        @Override
+        public int getVersion() {
+            return 0;
+        }
+
+        @Override
+        public boolean isLocalTable() {
+            return true;
+        }
+
+        @Override
+        public boolean isSharedTable() {
+            return false;
+        }
+
+        @Override
+        public boolean isSubstitute() {
+            return false;
+        }
+
+        @Override
+        public boolean isSystemTable() {
+            return false;
+        }
+
+        @Override
+        public SymbolTable getSystemSymbolTable() {
+            return system;
+        }
+
+        @Override
+        public String getIonVersionId() {
+            return system.getIonVersionId();
+        }
+
+        @Override
+        public SymbolTable[] getImportedTables() {
+            return importedTables.getImportedTables();
+        }
+
+        @Override
+        public int getImportedMaxId() {
+            return importedTables.getMaxId();
+        }
+
+        @Override
+        public SymbolToken find(String text) {
+            SymbolToken token = importedTables.find(text);
+            if (token != null) {
+                return token;
+            }
+            Integer sid = mapView.get(text);
+            if (sid == null) {
+                return null;
+            }
+            // The following per-call allocation is intentional. When weighed against the alternative of making
+            // 'mapView' a 'Map<String, SymbolToken>` instead of a `Map<String, Integer>`, the following points should
+            // be considered:
+            // 1. A LocalSymbolTableSnapshot is only created when getSymbolTable() is called on the reader. The reader
+            // does not use the LocalSymbolTableSnapshot internally. There are two cases when getSymbolTable() would be
+            // called: a) when the user calls it, which will basically never happen, and b) when the user uses
+            // IonSystem.iterate over the reader, in which case each top-level value holds a reference to the symbol
+            // table that was in scope when it occurred. In case a), in addition to rarely being called at all, it
+            // would be even rarer for a user to use find() to retrieve each symbol (especially more than once) from the
+            // returned symbol table. Case b) may be called more frequently, but it remains equally rare that a user
+            // would retrieve each symbol at least once.
+            // 2. If we make mapView a Map<String, SymbolToken>, then we are guaranteeing that we will allocate at least
+            // one SymbolToken per symbol (because mapView is created in the constructor of LocalSymbolTableSnapshot)
+            // even though it's unlikely most will ever be needed.
+            return new SymbolTokenWithImportLocation(text, sid, null);
+        }
+
+        @Override
+        public int findSymbol(String name) {
+            Integer sid = importedTables.findSymbol(name);
+            if (sid > UNKNOWN_SYMBOL_ID) {
+                return sid;
+            }
+            sid = mapView.get(name);
+            if (sid == null) {
+                return UNKNOWN_SYMBOL_ID;
+            }
+            return sid;
+        }
+
+        @Override
+        public String findKnownSymbol(int id) {
+            if (id < 0) {
+                throw new IllegalArgumentException("Symbol IDs must be at least 0.");
+            }
+            if (id > getMaxId()) {
+                return null;
+            }
+            return IonReaderContinuableApplicationBinary.this.getSymbolString(id, importedTables, listView);
+        }
+
+        @Override
+        public Iterator<String> iterateDeclaredSymbolNames() {
+            return new Iterator<String>() {
+
+                private int index = 0;
+
+                @Override
+                public boolean hasNext() {
+                    return index < listView.length;
+                }
+
+                @Override
+                public String next() {
+                    String symbol = listView[index];
+                    index++;
+                    return symbol;
+                }
+
+                @Override
+                public void remove() {
+                    throw new UnsupportedOperationException("This iterator does not support element removal.");
+                }
+            };
+        }
+
+        @Override
+        public SymbolToken intern(String text) {
+            SymbolToken token = find(text);
+            if (token != null) {
+                return token;
+            }
+            throw new ReadOnlyValueException();
+        }
+
+        @Override
+        public int getMaxId() {
+            return maxId;
+        }
+
+        @Override
+        public boolean isReadOnly() {
+            return true;
+        }
+
+        @Override
+        public void makeReadOnly() {
+            // The symbol table is already read-only.
+        }
+
+        @Override
+        public void writeTo(IonWriter writer) throws IOException {
+            IonReader reader = new com.amazon.ion.impl.SymbolTableReader(this);
+            writer.writeValues(reader);
+        }
+
+        @Override
+        public String toString() {
+            return "(LocalSymbolTable max_id:" + getMaxId() + ')';
+        }
+
+        @Override
+        public IonStruct getIonRepresentation(ValueFactory valueFactory) {
+            if (structCache == null) {
+                structCache = new SymbolTableStructCache(this, getImportedTables(), null);
+            }
+            return structCache.getIonRepresentation(valueFactory);
+        }
+    }
+
     /**
      * Reset the local symbol table to the system symbol table.
      */
@@ -189,6 +417,10 @@ private void resetSymbolTable() {
         // potentially allowing them to be garbage collected.
         Arrays.fill(symbols, 0, localSymbolMaxId + 1, null);
         localSymbolMaxId = -1;
+        cachedReadOnlySymbolTable = null;
+        if (symbolTokensById != null) {
+            symbolTokensById.clear();
+        }
     }
 
     /**
@@ -201,6 +433,34 @@ private void resetImports() {
         firstLocalSymbolId = imports.getMaxId() + 1;
     }
 
+    /**
+     * Restore a symbol table from a previous point in the stream.
+     * @param symbolTable the symbol table to restore.
+     */
+    protected void restoreSymbolTable(SymbolTable symbolTable) {
+        if (cachedReadOnlySymbolTable == symbolTable) {
+            return;
+        }
+        if (symbolTable instanceof LocalSymbolTableSnapshot) {
+            LocalSymbolTableSnapshot snapshot = (LocalSymbolTableSnapshot) symbolTable;
+            cachedReadOnlySymbolTable = snapshot;
+            imports = snapshot.importedTables;
+            firstLocalSymbolId = imports.getMaxId() + 1;
+            localSymbolMaxId = snapshot.maxId - firstLocalSymbolId;
+            // Note: because `symbols` only grows, `snapshot.listView` will always fit within `symbols`.
+            System.arraycopy(snapshot.listView, 0, symbols, 0, snapshot.listView.length);
+            if (symbolTokensById != null) {
+                symbolTokensById.clear();
+            }
+        } else {
+            // Note: this will only happen when `symbolTable` is the system symbol table.
+            resetSymbolTable();
+            cachedReadOnlySymbolTable = symbolTable;
+            resetImports();
+            localSymbolMaxId = -1;
+        }
+    }
+
     /**
      * Creates a shared symbol table import, resolving it from the catalog if possible.
      * @param name the name of the shared symbol table.
@@ -223,6 +483,21 @@ private SymbolTable createImport(String name, int version, int maxId) {
         }
     }
 
+    /**
+     * Gets the String representation of the given symbol ID. It is the caller's responsibility to ensure that the
+     * given symbol ID is within the max ID of the symbol table.
+     * @param sid the symbol ID.
+     * @param importedSymbols the symbol table's shared symbol table imports.
+     * @param localSymbols the symbol table's local symbols.
+     * @return a String, which will be null if the requested symbol ID has undefined text.
+     */
+    private String getSymbolString(int sid, LocalSymbolTableImports importedSymbols, String[] localSymbols) {
+        if (sid <= importedSymbols.getMaxId()) {
+            return importedSymbols.findKnownSymbol(sid);
+        }
+        return localSymbols[sid - (importedSymbols.getMaxId() + 1)];
+    }
+
     /**
      * Retrieves the String text for the given symbol ID.
      * @param sid a symbol ID.
@@ -239,6 +514,43 @@ String getSymbol(int sid) {
         return symbols[localSid];
     }
 
+    /**
+     * Creates a SymbolToken representation of the given symbol ID.
+     * @param sid a symbol ID.
+     * @return a SymbolToken.
+     */
+    private SymbolToken getSymbolToken(int sid) {
+        int symbolTableSize = localSymbolMaxId + firstLocalSymbolId + 1; // +1 because the max ID is 0-indexed.
+        if (symbolTokensById == null) {
+            symbolTokensById = new ArrayList<>(symbolTableSize);
+        }
+        if (symbolTokensById.size() < symbolTableSize) {
+            for (int i = symbolTokensById.size(); i < symbolTableSize; i++) {
+                symbolTokensById.add(null);
+            }
+        }
+        if (sid >= symbolTableSize) {
+            throw new IonException("Symbol ID exceeds the max ID of the symbol table.");
+        }
+        SymbolToken token = symbolTokensById.get(sid);
+        if (token == null) {
+            String text = getSymbolString(sid, imports, symbols);
+            ImportLocation importLocation = null;
+            if (text == null) {
+                // Note: this will never be a system symbol.
+                if (sid > 0 && sid < firstLocalSymbolId) {
+                    importLocation = imports.getImportLocation(sid);
+                } else {
+                    // All symbols with unknown text in the local symbol range are equivalent to symbol zero.
+                    sid = 0;
+                }
+            }
+            token = new SymbolTokenWithImportLocation(text, sid, importLocation);
+            symbolTokensById.set(sid, token);
+        }
+        return token;
+    }
+
     /**
      * Uses the underlying raw reader to read the symbol tables from the stream. Capable of resuming if not enough
      * data is currently available to complete the symbol table.
@@ -577,6 +889,7 @@ public Event nextValue() {
                 }
                 event = super.nextValue();
                 if (parent == null && isPositionedOnSymbolTable()) {
+                    cachedReadOnlySymbolTable = null;
                     symbolTableReader.resetState();
                     state = State.ON_SYMBOL_TABLE_STRUCT;
                     continue;
@@ -591,7 +904,14 @@ public Event nextValue() {
 
     @Override
     public SymbolTable getSymbolTable() {
-        throw new UnsupportedOperationException("Not yet implemented");
+        if (cachedReadOnlySymbolTable == null) {
+            if (localSymbolMaxId < 0 && imports == ION_1_0_IMPORTS) {
+                cachedReadOnlySymbolTable = imports.getSystemSymbolTable();
+            } else {
+                cachedReadOnlySymbolTable = new LocalSymbolTableSnapshot();
+            }
+        }
+        return cachedReadOnlySymbolTable;
     }
 
     @Override
@@ -618,7 +938,12 @@ public String stringValue() {
 
     @Override
     public SymbolToken symbolValue() {
-        throw new UnsupportedOperationException("Not yet implemented");
+        int sid = symbolValueId();
+        if (sid < 0) {
+            // The raw reader uses this to denote null.symbol.
+            return null;
+        }
+        return getSymbolToken(sid);
     }
 
     @Override
@@ -640,7 +965,15 @@ public String[] getTypeAnnotations() {
 
     @Override
     public SymbolToken[] getTypeAnnotationSymbols() {
-        throw new UnsupportedOperationException("Not yet implemented");
+        if (!hasAnnotations) {
+            return SymbolToken.EMPTY_ARRAY;
+        }
+        IntList annotationSids = getAnnotationSidList();
+        SymbolToken[] annotationArray = new SymbolToken[annotationSids.size()];
+        for (int i = 0; i < annotationArray.length; i++) {
+            annotationArray[i] = getSymbolToken(annotationSids.get(i));
+        }
+        return annotationArray;
     }
 
     private static final Iterator<String> EMPTY_ITERATOR = new Iterator<String>() {
@@ -683,7 +1016,10 @@ public String getFieldName() {
 
     @Override
     public SymbolToken getFieldNameSymbol() {
-        throw new UnsupportedOperationException("Not yet implemented");
+        if (fieldSid < 0) {
+            return null;
+        }
+        return getSymbolToken(fieldSid);
     }
 
 }
diff --git a/src/com/amazon/ion/impl/SymbolTokenWithImportLocation.java b/src/com/amazon/ion/impl/SymbolTokenWithImportLocation.java
new file mode 100644
index 0000000000..cafa55900d
--- /dev/null
+++ b/src/com/amazon/ion/impl/SymbolTokenWithImportLocation.java
@@ -0,0 +1,76 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.UnknownSymbolException;
+
+/**
+ * SymbolToken implementation that includes ImportLocation.
+ */
+class SymbolTokenWithImportLocation implements _Private_SymbolToken {
+
+    // The symbol's text, or null if the text is unknown.
+    private final String text;
+
+    // The local symbol ID of this symbol within a particular local symbol table.
+    private final int sid;
+
+    // The import location of the symbol (only relevant if the text is unknown).
+    private final ImportLocation importLocation;
+
+    SymbolTokenWithImportLocation(String text, int sid, ImportLocation importLocation) {
+        this.text = text;
+        this.sid = sid;
+        this.importLocation = importLocation;
+    }
+
+    @Override
+    public String getText() {
+        return text;
+    }
+
+    @Override
+    public String assumeText() {
+        if (text == null) {
+            throw new UnknownSymbolException(sid);
+        }
+        return text;
+    }
+
+    @Override
+    public int getSid() {
+        return sid;
+    }
+
+    // Will be @Override once added to the SymbolToken interface.
+    public ImportLocation getImportLocation() {
+        return importLocation;
+    }
+
+    @Override
+    public String toString() {
+        return String.format("SymbolToken::{text: %s, sid: %d, importLocation: %s}", text, sid, importLocation);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof SymbolToken)) return false;
+
+        // NOTE: once ImportLocation is available via the SymbolToken interface, it should be compared here
+        // when text is null.
+        SymbolToken other = (SymbolToken) o;
+        if (getText() == null || other.getText() == null) {
+            return getText() == other.getText();
+        }
+        return getText().equals(other.getText());
+    }
+
+    @Override
+    public int hashCode() {
+        if (getText() != null) return getText().hashCode();
+        return 0;
+    }
+}

From 4018d5bb4642771325e448fdb2766ad2093b3723 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 30 Jun 2023 11:24:24 -0700
Subject: [PATCH 266/490] Adds IonReaderContinuableTopLevelBinary, an IonReader
 adapter to the continuable reader, with non-continuable read support.

---
 .../IonReaderContinuableTopLevelBinary.java   | 216 ++++++
 ...onReaderContinuableTopLevelBinaryTest.java | 717 ++++++++++++++++++
 2 files changed, 933 insertions(+)
 create mode 100644 src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
 create mode 100644 test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
new file mode 100644
index 0000000000..9fcc38c7d6
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -0,0 +1,216 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonCursor;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.system.IonReaderBuilder;
+
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+
+/**
+ * An {@link IonReader} adapter to IonReaderContinuableApplicationBinary. Currently non-continuable. Support for
+ * continuability will be added.
+ */
+final class IonReaderContinuableTopLevelBinary extends IonReaderContinuableApplicationBinary implements IonReader, _Private_ReaderWriter {
+
+    // The type of value on which the reader is currently positioned.
+    private IonType type = null;
+
+    // The SymbolTable that was transferred via the last call to pop_passed_symbol_table.
+    private SymbolTable symbolTableLastTransferred = null;
+
+    /**
+     * Constructs a new reader from the given input stream.
+     * @param builder the builder containing the configuration for the new reader.
+     * @param alreadyRead the byte array containing the bytes already read (often the IVM).
+     * @param alreadyReadOff the offset into 'alreadyRead` at which the first byte that was already read exists.
+     * @param alreadyReadLen the number of bytes already read from `alreadyRead`.
+     */
+    IonReaderContinuableTopLevelBinary(IonReaderBuilder builder, InputStream inputStream, byte[] alreadyRead, int alreadyReadOff, int alreadyReadLen) {
+        super(builder, inputStream, alreadyRead, alreadyReadOff, alreadyReadLen);
+    }
+
+    /**
+     * Constructs a new reader from the given byte array.
+     * @param builder the builder containing the configuration for the new reader.
+     * @param data the byte array containing the bytes to read.
+     * @param offset the offset into the byte array at which the first byte of Ion data begins.
+     * @param length the number of bytes to be read from the byte array.
+     */
+    IonReaderContinuableTopLevelBinary(IonReaderBuilder builder, byte[] data, int offset, int length) {
+        super(builder, data, offset, length);
+    }
+
+    @Override
+    public SymbolTable pop_passed_symbol_table() {
+        SymbolTable currentSymbolTable = getSymbolTable();
+        if (currentSymbolTable == symbolTableLastTransferred) {
+            // This symbol table has already been returned. Since the contract is that it is a "pop", it should not
+            // be returned twice.
+            return null;
+        }
+        symbolTableLastTransferred = currentSymbolTable;
+        return symbolTableLastTransferred;
+    }
+
+    @Override
+    public boolean hasNext() {
+        throw new UnsupportedOperationException("Not implemented");
+    }
+
+    @Override
+    public IonType next() {
+        IonCursor.Event event = super.nextValue();
+        if (event == IonCursor.Event.NEEDS_DATA) {
+            endStream();
+            type = null;
+            return null;
+        }
+        type = super.getType();
+        return type;
+    }
+
+    @Override
+    public void stepIn() {
+        super.stepIntoContainer();
+        type = null;
+    }
+
+    @Override
+    public void stepOut() {
+        super.stepOutOfContainer();
+        type = null;
+    }
+
+    @Override
+    public IonType getType() {
+        return type;
+    }
+
+    /**
+     * Prepares a scalar value to be parsed by ensuring it is present in the buffer.
+     */
+    private void prepareScalar() {
+        if (event == IonCursor.Event.VALUE_READY) {
+            return;
+        }
+        if (event != IonCursor.Event.START_SCALAR) {
+            // Note: existing tests expect IllegalStateException in this case.
+            throw new IllegalStateException("Reader is not positioned on a scalar value.");
+        }
+        if (fillValue() == Event.VALUE_READY) {
+            return;
+        }
+        throw new IonException("Unexpected EOF.");
+    }
+
+    @Override
+    public IntegerSize getIntegerSize() {
+        if (type != IonType.INT) {
+            return null;
+        }
+        prepareScalar();
+        return super.getIntegerSize();
+    }
+
+    @Override
+    public boolean booleanValue() {
+        prepareScalar();
+        return super.booleanValue();
+    }
+
+    @Override
+    public int intValue() {
+        prepareScalar();
+        return super.intValue();
+    }
+
+    @Override
+    public long longValue() {
+        prepareScalar();
+        return super.longValue();
+    }
+
+    @Override
+    public BigInteger bigIntegerValue() {
+        prepareScalar();
+        return super.bigIntegerValue();
+    }
+
+    @Override
+    public double doubleValue() {
+        prepareScalar();
+        return super.doubleValue();
+    }
+
+    @Override
+    public BigDecimal bigDecimalValue() {
+        prepareScalar();
+        return super.bigDecimalValue();
+    }
+
+    @Override
+    public Decimal decimalValue() {
+        prepareScalar();
+        return super.decimalValue();
+    }
+
+    @Override
+    public Date dateValue() {
+        prepareScalar();
+        return super.dateValue();
+    }
+
+    @Override
+    public Timestamp timestampValue() {
+        prepareScalar();
+        return super.timestampValue();
+    }
+
+    @Override
+    public String stringValue() {
+        prepareScalar();
+        return super.stringValue();
+    }
+
+    @Override
+    public SymbolToken symbolValue() {
+        prepareScalar();
+        return super.symbolValue();
+    }
+
+    @Override
+    public int byteSize() {
+        prepareScalar();
+        return super.byteSize();
+    }
+
+    @Override
+    public byte[] newBytes() {
+        prepareScalar();
+        return super.newBytes();
+    }
+
+    @Override
+    public int getBytes(byte[] buffer, int offset, int len) {
+        prepareScalar();
+        return super.getBytes(buffer, offset, len);
+    }
+
+    @Override
+    public <T> T asFacet(Class<T> facetType) {
+        return null;
+    }
+}
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
new file mode 100644
index 0000000000..0de713afd0
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -0,0 +1,717 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.BufferConfiguration;
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonLoader;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonString;
+import com.amazon.ion.IonStruct;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonValue;
+import com.amazon.ion.IonWriter;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.TestUtils;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder;
+import com.amazon.ion.impl.bin._Private_IonManagedWriter;
+import com.amazon.ion.impl.bin._Private_IonRawWriter;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.SimpleCatalog;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static com.amazon.ion.BitUtils.bytes;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+@RunWith(Parameterized.class)
+public class IonReaderContinuableTopLevelBinaryTest {
+
+    private static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
+
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
+
+    @Parameterized.Parameters(name = "constructWithBytes={0}")
+    public static Object[] parameters() {
+        return new Object[]{true, false};
+    }
+
+    @Parameterized.Parameter
+    public boolean constructFromBytes;
+
+    // Builds the incremental reader. May be overwritten by individual tests.
+    private IonReaderBuilder readerBuilder;
+    // Builds binary writers for constructing test data. May be overwritten by individual tests.
+    private IonBinaryWriterBuilder writerBuilder;
+    // Counts the number of bytes reported by the reader.
+    private AtomicLong byteCounter;
+    // Counts the number of oversized values or symbol tables reported by the reader.
+    private AtomicInteger oversizedCounter;
+    // The total number of bytes in the input, to be compared against the total bytes consumed by the reader.
+    private long totalBytesInStream;
+
+    /**
+     * Unified handler interface to reduce boilerplate when defining test handlers.
+     */
+    private interface UnifiedTestHandler extends
+        BufferConfiguration.OversizedValueHandler,
+        IonBufferConfiguration.OversizedSymbolTableHandler,
+        BufferConfiguration.DataHandler {
+        // Empty.
+    }
+
+    /**
+     * A handler that counts consumed bytes using `byteCounter` and throws if any oversized value is encountered.
+     */
+    private final UnifiedTestHandler byteCountingHandler = new UnifiedTestHandler() {
+        @Override
+        public void onOversizedSymbolTable() {
+            Assert.fail("Oversized symbol table not expected.");
+        }
+
+        @Override
+        public void onOversizedValue() {
+            Assert.fail("Oversized value not expected.");
+        }
+
+        @Override
+        public void onData(int numberOfBytes) {
+            byteCounter.addAndGet(numberOfBytes);
+        }
+    };
+
+    // Standard byte-counting buffer configuration. Fails if any value is oversized.
+    private final IonBufferConfiguration standardBufferConfiguration = IonBufferConfiguration.Builder.standard()
+        .onOversizedSymbolTable(byteCountingHandler)
+        .onOversizedValue(byteCountingHandler)
+        .onData(byteCountingHandler)
+        .build();
+    
+    @Before
+    public void setup() {
+        byteCounter = new AtomicLong();
+        oversizedCounter = new AtomicInteger();
+        readerBuilder = IonReaderBuilder.standard()
+            .withBufferConfiguration(standardBufferConfiguration);
+        writerBuilder = IonBinaryWriterBuilder.standard();
+    }
+
+    private void assertBytesConsumed() {
+        assertEquals(totalBytesInStream, byteCounter.get());
+    }
+
+    /**
+     * Writes binary Ion streams with a user-level writer.
+     */
+    private interface WriterFunction {
+        void write(IonWriter writer) throws IOException;
+    }
+
+    /**
+     * Converts the given text Ion to the equivalent binary Ion.
+     * @param ion text Ion data.
+     * @return the equivalent binary Ion data.
+     */
+    private static byte[] toBinary(String ion) {
+        return TestUtils.ensureBinary(SYSTEM, ion.getBytes(StandardCharsets.UTF_8));
+    }
+
+    /**
+     * Creates an incremental reader over the given binary Ion, constructing a reader either from byte array or
+     * from InputStream depending on the value of the parameter 'constructFromBytes'.
+     * @param builder the reader builder.
+     * @param bytes the binary Ion data.
+     * @return a new reader.
+     */
+    private IonReader readerFor(IonReaderBuilder builder, byte[] bytes) {
+        totalBytesInStream = bytes.length;
+        if (constructFromBytes) {
+            return new IonReaderContinuableTopLevelBinary(builder, bytes, 0, bytes.length);
+        }
+        return new IonReaderContinuableTopLevelBinary(builder, new ByteArrayInputStream(bytes), null, 0, 0);
+    }
+
+    /**
+     * Creates an incremental reader over the binary equivalent of the given text Ion.
+     * @param ion text Ion data.
+     * @return a new reader.
+     */
+    private IonReader readerFor(String ion) {
+        byte[] binary = toBinary(ion);
+        totalBytesInStream = binary.length;
+        return readerFor(readerBuilder, binary);
+    }
+
+    /**
+     * Creates an incremental reader over the binary Ion data created by invoking the given WriterFunction.
+     * @param writerFunction the function used to generate the data.
+     * @return a new reader.
+     * @throws Exception if an exception is raised while writing the Ion data.
+     */
+    private IonReader readerFor(WriterFunction writerFunction) throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = writerBuilder.build(out);
+        writerFunction.write(writer);
+        writer.close();
+        byte[] binary = out.toByteArray();
+        totalBytesInStream = binary.length;
+        return readerFor(readerBuilder, binary);
+    }
+
+    /**
+     * Creates an incremental reader over the given bytes, prepended with the IVM.
+     * @param ion binary Ion bytes without an IVM.
+     * @return a new reader.
+     */
+    private IonReader readerFor(int... ion) throws Exception {
+        byte[] binary = new TestUtils.BinaryIonAppender().append(ion).toByteArray();
+        totalBytesInStream = binary.length;
+        return readerFor(readerBuilder, binary);
+    }
+
+    @Test
+    public void skipContainers() throws Exception {
+        IonReader reader = readerFor(
+            "[123] 456 {abc: foo::bar::123, def: baz::456} [123] 789 [foo::bar::123, baz::456] [123]"
+        );
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals(IonType.LIST, reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(IonType.STRUCT, reader.next());
+        assertEquals(IonType.STRUCT, reader.getType());
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals(IonType.LIST, reader.getType());
+        reader.stepIn();
+        assertNull(reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(123, reader.intValue());
+        reader.stepOut();
+        assertNull(reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(789, reader.intValue());
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals(IonType.LIST, reader.getType());
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals(IonType.LIST, reader.getType());
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void skipContainerAfterSteppingIn() throws Exception {
+        IonReader reader = readerFor("{abc: foo::bar::123, def: baz::456} 789");
+        assertEquals(IonType.STRUCT, reader.next());
+        assertEquals(IonType.STRUCT, reader.getType());
+        reader.stepIn();
+        assertNull(reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals(123, reader.intValue());
+        assertEquals(IonType.INT, reader.getType());
+        // Step out before completing the value.
+        reader.stepOut();
+        assertNull(reader.getType());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(IonType.INT, reader.getType());
+        assertEquals(789, reader.intValue());
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void skipValueInContainer() throws Exception {
+        IonReader reader = readerFor("{foo: \"bar\", abc: 123, baz: a}");
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals("abc", reader.getFieldName());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("baz", reader.getFieldName());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void symbolsAsStrings() throws Exception {
+        IonReader reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("bar", reader.getFieldName());
+        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("def", reader.stringValue());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void ivmOnly() throws Exception {
+        IonReader reader = readerFor();
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void twoIvmsOnly() throws Exception {
+        IonReader reader = readerFor(0xE0, 0x01, 0x00, 0xEA);
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void invalidVersion() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        out.write(bytes(0xE0, 0x01, 0x74, 0xEA, 0x20));
+        IonReader reader = readerFor(readerBuilder, out.toByteArray());
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void invalidVersionMarker() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        out.write(bytes(0xE0, 0x01, 0x00, 0xEB, 0x20));
+        IonReader reader = readerFor(readerBuilder, out.toByteArray());
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void lobsNewBytes() throws Exception {
+        final byte[] blobBytes = "abcdef".getBytes(StandardCharsets.UTF_8);
+        final byte[] clobBytes = "ghijklmnopqrstuv".getBytes(StandardCharsets.UTF_8);
+        IonReader reader = readerFor(writer -> {
+            writer.writeBlob(blobBytes);
+            writer.writeClob(clobBytes);
+            writer.setTypeAnnotations("foo");
+            writer.writeBlob(blobBytes);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("bar");
+            writer.writeClob(clobBytes);
+            writer.stepOut();
+        });
+
+        assertEquals(IonType.BLOB, reader.next());
+        assertArrayEquals(blobBytes, reader.newBytes());
+        assertEquals(IonType.CLOB, reader.next());
+        assertArrayEquals(clobBytes, reader.newBytes());
+        assertEquals(IonType.BLOB, reader.next());
+        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
+        assertArrayEquals(blobBytes, reader.newBytes());
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.CLOB, reader.next());
+        assertEquals("bar", reader.getFieldName());
+        assertArrayEquals(clobBytes, reader.newBytes());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void lobsGetBytes() throws Exception {
+        final byte[] blobBytes = "abcdef".getBytes(StandardCharsets.UTF_8);
+        final byte[] clobBytes = "ghijklmnopqrstuv".getBytes(StandardCharsets.UTF_8);
+        IonReader reader = readerFor(writer -> {
+            writer.writeBlob(blobBytes);
+            writer.writeClob(clobBytes);
+            writer.setTypeAnnotations("foo");
+            writer.writeBlob(blobBytes);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("bar");
+            writer.writeClob(clobBytes);
+            writer.stepOut();
+        });
+
+        assertEquals(IonType.BLOB, reader.next());
+        byte[] fullBlob = new byte[blobBytes.length];
+        assertEquals(fullBlob.length, reader.getBytes(fullBlob, 0, fullBlob.length));
+        assertArrayEquals(blobBytes, fullBlob);
+        assertEquals(IonType.CLOB, reader.next());
+        byte[] partialClob = new byte[clobBytes.length];
+        assertEquals(3, reader.getBytes(partialClob, 0, 3));
+        assertEquals(clobBytes.length - 3, reader.getBytes(partialClob, 3, clobBytes.length - 3));
+        assertArrayEquals(clobBytes, partialClob);
+        Arrays.fill(fullBlob, (byte) 0);
+        assertEquals(IonType.BLOB, reader.next());
+        assertEquals(fullBlob.length, reader.getBytes(fullBlob, 0, 100000));
+        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        Arrays.fill(partialClob, (byte) 0);
+        assertEquals(IonType.CLOB, reader.next());
+        assertEquals(5, reader.getBytes(partialClob, 0, 5));
+        assertEquals(clobBytes.length - 5, reader.getBytes(partialClob, 5, 100000));
+        assertArrayEquals(clobBytes, partialClob);
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void nopPad() throws Exception {
+        IonReader reader = readerFor(
+            // One byte no-op pad.
+            0x00,
+            // Two byte no-op pad.
+            0x01, 0xFF,
+            // Int 0.
+            0x20,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // 16-byte no-op pad.
+            0x0E, 0x8E,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Int 1.
+            0x21, 0x01,
+            // Struct with no-op pad at the start.
+            0xD9,
+            // Field SID 0.
+            0x80,
+            // Five byte no-op pad.
+            0x04, 0x00, 0x00, 0x00, 0x00,
+            // Field SID 4 ("name").
+            0x84,
+            // Int -1.
+            0x31, 0x01,
+            // Struct (empty) with no-op pad at the end.
+            0xD8,
+            // Field SID 0.
+            0x80,
+            // Seven byte no-op pad.
+            0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // List (empty) with long no-op pad.
+            0xBE,
+            // Length 16.
+            0x90,
+            // 16-byte no-op pad.
+            0x0E, 0x8E,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        );
+
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(-1, reader.intValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertNull(reader.next());
+        reader.stepOut();
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void intNegativeZeroFails() throws Exception {
+        IonReader reader = readerFor(0x31, 0x00);
+        reader.next();
+        thrown.expect(IonException.class);
+        reader.longValue();
+        reader.close();
+    }
+
+    @Test
+    public void bigIntNegativeZeroFails() throws Exception {
+        IonReader reader = readerFor(0x31, 0x00);
+        reader.next();
+        thrown.expect(IonException.class);
+        reader.bigIntegerValue();
+        reader.close();
+    }
+
+    @Test
+    public void listWithLengthTooShortFails() throws Exception {
+        IonReader reader = readerFor(0xB1, 0x21, 0x01);
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void listWithContainerValueLengthTooShortFails() throws Exception {
+        IonReader reader = readerFor(0xB2, 0xB2, 0x21, 0x01);
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void listWithVariableLengthTooShortFails() throws Exception {
+        IonReader reader = readerFor(0xBE, 0x81, 0x21, 0x01);
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test(expected = IonException.class)
+    public void noOpPadTooShort1() throws Exception {
+        IonReader reader = readerFor(0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01);
+        assertEquals(IonType.INT, reader.next());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test(expected = IonException.class)
+    public void noOpPadTooShort2() throws Exception {
+        IonReader reader = readerFor(
+            0x0e, 0x90, 0x00, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        );
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void nopPadOneByte() throws Exception {
+        IonReader reader = readerFor(0);
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+        reader.close();
+    }
+
+    @Test
+    public void stepInOnScalarFails() throws Exception {
+        IonReader reader = readerFor(0x20);
+        assertEquals(IonType.INT, reader.next());
+        thrown.expect(IonException.class);
+        reader.stepIn();
+        reader.close();
+    }
+
+    @Test
+    public void stepInBeforeNextFails() throws Exception {
+        IonReader reader = readerFor(0xD2, 0x84, 0xD0);
+        reader.next();
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.stepIn();
+        reader.close();
+    }
+
+    @Test
+    public void stepOutAtDepthZeroFails() throws Exception {
+        IonReader reader = readerFor(0x20);
+        reader.next();
+        thrown.expect(IllegalStateException.class);
+        reader.stepOut();
+        reader.close();
+    }
+
+    @Test
+    public void byteSizeNotOnLobFails() throws Exception {
+        IonReader reader = readerFor(0x20);
+        reader.next();
+        thrown.expect(IonException.class);
+        reader.byteSize();
+        reader.close();
+    }
+
+    @Test
+    public void doubleValueOnIntFails() throws Exception {
+        IonReader reader = readerFor(0x20);
+        reader.next();
+        thrown.expect(IllegalStateException.class);
+        reader.doubleValue();
+        reader.close();
+    }
+
+    @Test
+    public void floatWithInvalidLengthFails() throws Exception {
+        IonReader reader = readerFor(0x43, 0x01, 0x02, 0x03);
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void invalidTypeIdFFailsAtTopLevel() throws Exception {
+        IonReader reader = readerFor(0xF0);
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void invalidTypeIdFFailsBelowTopLevel() throws Exception {
+        IonReader reader = readerFor(0xB1, 0xF0);
+        reader.next();
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void reallyLargeString() throws Exception {
+        StringBuilder sb = new StringBuilder();
+        // 8192 is a arbitrarily large; it requires a couple bytes of length, and it doesn't fit in the preallocated
+        // string decoding buffer of size 4096.
+        for (int i = 0; i < 8192; i++) {
+            sb.append('a');
+        }
+        String string = sb.toString();
+        IonReader reader = readerFor("\"" + string + "\"");
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals(string, reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void nopPadInAnnotationWrapperFails() throws Exception {
+        IonReader reader = readerFor(
+            0xB5, // list
+            0xE4, // annotation wrapper
+            0x81, // 1 byte of annotations
+            0x84, // annotation: "name"
+            0x01, // 2-byte no-op pad
+            0x00
+        );
+        reader.next();
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void nestedAnnotationWrapperFails() throws Exception {
+        IonReader reader = readerFor(
+            0xB5, // list
+            0xE4, // annotation wrapper
+            0x81, // 1 byte of annotations
+            0x84, // annotation: "name"
+            0xE3, // annotation wrapper
+            0x81, // 1 byte of annotations
+            0x84, // annotation: "name"
+            0x20  // int 0
+        );
+        reader.next();
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void annotationWrapperLengthMismatchFails() throws Exception {
+        IonReader reader = readerFor(
+            0xB5, // list
+            0xE4, // annotation wrapper
+            0x81, // 1 byte of annotations
+            0x84, // annotation: "name"
+            0x20, // int 0
+            0x20  // next value
+        );
+        reader.next();
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void annotationWrapperVariableLengthMismatchFails() throws Exception {
+        IonReader reader = readerFor(
+            0xBE, // list
+            0x90, // Length 16
+            0xEE, // annotation wrapper
+            0x8E, // Length 14
+            0x81, // 1 byte of annotations
+            0x84, // annotation: "name"
+            0x89, // String length 9 (should be 11)
+            '1', '2', '3', '4', '5', '6', '7', '8', // String value
+            0x21, 0x01, // next value
+            0x20 // Another value
+        );
+        reader.next();
+        reader.stepIn();
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+}

From 45230ee38a8c51138b621b29037bb038f38bcce0 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 30 Jun 2023 12:27:46 -0700
Subject: [PATCH 267/490] Adds symbol processing tests to
 IonReaderContinuableTopLevelBinaryTest.

---
 ...onReaderContinuableTopLevelBinaryTest.java | 987 ++++++++++++++++++
 1 file changed, 987 insertions(+)

diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 0de713afd0..2c555dc531 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -146,6 +146,33 @@ private interface WriterFunction {
         void write(IonWriter writer) throws IOException;
     }
 
+    /**
+     * Writes binary Ion streams with a raw writer. Also allows bytes to be written directly to the stream.
+     */
+    private interface RawWriterFunction {
+        void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException;
+    }
+
+    /**
+     * Writes a raw binary stream using the provided raw writer function.
+     * @param writerFunction the write function.
+     * @param writeIvm true if an Ion 1.0 IVM should be written at the start of the stream; otherwise, false.
+     * @return the binary Ion bytes.
+     * @throws Exception if thrown during writing.
+     */
+    private byte[] writeRaw(RawWriterFunction writerFunction, boolean writeIvm) throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        _Private_IonRawWriter writer = writerBuilder.build(out)
+            .asFacet(_Private_IonManagedWriter.class)
+            .getRawWriter();
+        if (writeIvm) {
+            out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+        }
+        writerFunction.write(writer, out);
+        writer.close();
+        return out.toByteArray();
+    }
+
     /**
      * Converts the given text Ion to the equivalent binary Ion.
      * @param ion text Ion data.
@@ -181,6 +208,18 @@ private IonReader readerFor(String ion) {
         return readerFor(readerBuilder, binary);
     }
 
+    /**
+     * Creates an incremental reader over the binary Ion data created by invoking the given RawWriterFunction.
+     * @param writerFunction the function used to generate the data.
+     * @return a new reader.
+     * @throws Exception if an exception is raised while writing the Ion data.
+     */
+    private IonReader readerFor(RawWriterFunction writerFunction) throws Exception {
+        byte[] binary = writeRaw(writerFunction, true);
+        totalBytesInStream = binary.length;
+        return readerFor(readerBuilder, binary);
+    }
+
     /**
      * Creates an incremental reader over the binary Ion data created by invoking the given WriterFunction.
      * @param writerFunction the function used to generate the data.
@@ -301,6 +340,118 @@ public void symbolsAsStrings() throws Exception {
         assertBytesConsumed();
     }
 
+    @Test
+    public void lstAppend() throws Exception {
+        writerBuilder = writerBuilder.withLocalSymbolTableAppendEnabled();
+        IonReader reader = readerFor(writer -> {
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("foo");
+            writer.addTypeAnnotation("uvw");
+            writer.writeSymbol("abc");
+            writer.setFieldName("bar");
+            writer.setTypeAnnotations("qrs", "xyz");
+            writer.writeSymbol("def");
+            writer.stepOut();
+            writer.flush();
+            writer.writeSymbol("orange");
+        });
+
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("bar", reader.getFieldName());
+        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("def", reader.stringValue());
+        reader.stepOut();
+        SymbolTable preAppend = reader.getSymbolTable();
+        assertEquals(IonType.SYMBOL, reader.next());
+        SymbolTable postAppend = reader.getSymbolTable();
+        assertEquals("orange", reader.stringValue());
+        assertNull(preAppend.find("orange"));
+        assertNotNull(postAppend.find("orange"));
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void lstNonAppend() throws Exception {
+        writerBuilder = writerBuilder.withLocalSymbolTableAppendDisabled();
+        IonReader reader = readerFor(writer -> {
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("foo");
+            writer.addTypeAnnotation("uvw");
+            writer.writeSymbol("abc");
+            writer.setFieldName("bar");
+            writer.setTypeAnnotations("qrs", "xyz");
+            writer.writeSymbol("def");
+            writer.stepOut();
+            writer.setTypeAnnotations("$ion_symbol_table");
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("symbols");
+            writer.stepIn(IonType.LIST);
+            writer.writeString("orange");
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbol("orange");
+        });
+
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("bar", reader.getFieldName());
+        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("def", reader.stringValue());
+        reader.stepOut();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("orange", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void ivmBetweenValues() throws Exception {
+        writerBuilder = writerBuilder.withLocalSymbolTableAppendDisabled();
+        IonReader reader = readerFor(writer -> {
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("foo");
+            writer.addTypeAnnotation("uvw");
+            writer.writeSymbol("abc");
+            writer.setFieldName("bar");
+            writer.setTypeAnnotations("qrs", "xyz");
+            writer.writeSymbol("def");
+            writer.stepOut();
+            writer.finish();
+            writer.writeSymbol("orange");
+        });
+
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("bar", reader.getFieldName());
+        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("def", reader.stringValue());
+        reader.stepOut();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("orange", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
     @Test
     public void ivmOnly() throws Exception {
         IonReader reader = readerFor();
@@ -317,6 +468,90 @@ public void twoIvmsOnly() throws Exception {
         assertBytesConsumed();
     }
 
+    @Test
+    public void multipleSymbolTablesBetweenValues() throws Exception {
+        IonReader reader = readerFor(writer -> {
+            writer.setTypeAnnotations("$ion_symbol_table");
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("symbols");
+            writer.stepIn(IonType.LIST);
+            writer.writeString("abc");
+            writer.stepOut();
+            writer.stepOut();
+            writer.setTypeAnnotations("$ion_symbol_table");
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("symbols");
+            writer.stepIn(IonType.LIST);
+            writer.writeString("def");
+            writer.stepOut();
+            writer.setFieldName("imports");
+            writer.writeSymbol("$ion_symbol_table");
+            writer.stepOut();
+            writer.writeSymbol("abc");
+            writer.writeSymbol("def");
+            writer.setTypeAnnotations("$ion_symbol_table");
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("symbols");
+            writer.stepIn(IonType.LIST);
+            writer.writeString("orange");
+            writer.stepOut();
+            writer.stepOut();
+            writer.setTypeAnnotations("$ion_symbol_table");
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("symbols");
+            writer.stepIn(IonType.LIST);
+            writer.writeString("purple");
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbol("purple");
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("purple", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void multipleIvmsBetweenValues() throws Exception  {
+        IonReader reader = readerFor((writer, out) -> {
+            writer.setTypeAnnotationSymbols(3);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(7);
+            writer.stepIn(IonType.LIST);
+            writer.writeString("abc");
+            writer.stepOut();
+            writer.stepOut();
+            writer.finish();
+            out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+            writer.setTypeAnnotationSymbols(3);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(7);
+            writer.stepIn(IonType.LIST);
+            writer.writeString("def");
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbolToken(10);
+            writer.finish();
+            out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+            out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+            writer.writeSymbolToken(4);
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("name", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
     @Test
     public void invalidVersion() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -477,6 +712,310 @@ public void nopPad() throws Exception {
         assertBytesConsumed();
     }
 
+    @Test
+    public void symbolTableWithImportsThenSymbols() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        readerBuilder = readerBuilder.withCatalog(catalog);
+        writerBuilder = writerBuilder.withCatalog(catalog);
+
+        IonReader reader = readerFor(writer -> {
+            writer.setTypeAnnotations("$ion_symbol_table");
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("imports");
+            writer.stepIn(IonType.LIST);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldName("name");
+            writer.writeString("foo");
+            writer.setFieldName("version");
+            writer.writeInt(1);
+            writer.setFieldName("max_id");
+            writer.writeInt(2);
+            writer.stepOut();
+            writer.stepOut();
+            writer.setFieldName("symbols");
+            writer.stepIn(IonType.LIST);
+            writer.writeString("ghi");
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbol("abc");
+            writer.writeSymbol("def");
+            writer.writeSymbol("ghi");
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("ghi", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void symbolTableWithSymbolsThenImports() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        readerBuilder = readerBuilder.withCatalog(catalog);
+
+        IonReader reader = readerFor((writer, out) -> {
+            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+            writer.stepIn(IonType.LIST);
+            writer.writeString("ghi");
+            writer.stepOut();
+            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+            writer.stepIn(IonType.LIST);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+            writer.writeString("foo");
+            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+            writer.writeInt(1);
+            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+            writer.writeInt(2);
+            writer.stepOut();
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbolToken(10);
+            writer.writeSymbolToken(11);
+            writer.writeSymbolToken(12);
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("ghi", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void symbolTableWithManySymbolsThenImports() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        readerBuilder = readerBuilder.withCatalog(catalog);
+
+        IonReader reader = readerFor((writer, out) -> {
+            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+            writer.stepIn(IonType.LIST);
+            writer.writeString("ghi");
+            writer.writeString("jkl");
+            writer.writeString("mno");
+            writer.writeString("pqr");
+            writer.stepOut();
+            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+            writer.stepIn(IonType.LIST);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+            writer.writeString("foo");
+            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+            writer.writeInt(1);
+            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+            writer.writeInt(2);
+            writer.stepOut();
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbolToken(10);
+            writer.writeSymbolToken(11);
+            writer.writeSymbolToken(12);
+            writer.writeSymbolToken(13);
+            writer.writeSymbolToken(14);
+            writer.writeSymbolToken(15);
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("ghi", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("jkl", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("mno", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("pqr", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void multipleSymbolTablesWithSymbolsThenImports() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        catalog.putTable(SYSTEM.newSharedSymbolTable("bar", 1, Collections.singletonList("baz").iterator()));
+        readerBuilder = readerBuilder.withCatalog(catalog);
+
+        IonReader reader = readerFor((writer, out) -> {
+            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+            writer.stepIn(IonType.LIST);
+            writer.writeString("ghi");
+            writer.stepOut();
+            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+            writer.stepIn(IonType.LIST);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+            writer.writeString("foo");
+            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+            writer.writeInt(1);
+            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+            writer.writeInt(2);
+            writer.stepOut();
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbolToken(10);
+            writer.writeSymbolToken(11);
+            writer.writeSymbolToken(12);
+            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+            writer.stepIn(IonType.LIST);
+            writer.writeString("xyz");
+            writer.writeString("uvw");
+            writer.writeString("rst");
+            writer.stepOut();
+            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+            writer.stepIn(IonType.LIST);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+            writer.writeString("bar");
+            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+            writer.writeInt(1);
+            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+            writer.writeInt(1);
+            writer.stepOut();
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbolToken(10);
+            writer.writeSymbolToken(11);
+            writer.writeSymbolToken(12);
+            writer.writeSymbolToken(13);
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        SymbolTable[] imports = reader.getSymbolTable().getImportedTables();
+        assertEquals(1, imports.length);
+        assertEquals("foo", imports[0].getName());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("ghi", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("baz", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        imports = reader.getSymbolTable().getImportedTables();
+        assertEquals(1, imports.length);
+        assertEquals("bar", imports[0].getName());
+        assertEquals("xyz", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("uvw", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("rst", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void ivmResetsImports() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        readerBuilder = readerBuilder.withCatalog(catalog);
+
+        IonReader reader = readerFor((writer, out) -> {
+            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+            writer.stepIn(IonType.LIST);
+            writer.writeString("ghi");
+            writer.stepOut();
+            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+            writer.stepIn(IonType.LIST);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+            writer.writeString("foo");
+            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+            writer.writeInt(1);
+            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+            writer.writeInt(2);
+            writer.stepOut();
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbolToken(10);
+            writer.writeSymbolToken(11);
+            writer.writeSymbolToken(12);
+            writer.close();
+            out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+            out.write(0x20);
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        SymbolTable[] imports = reader.getSymbolTable().getImportedTables();
+        assertEquals(1, imports.length);
+        assertEquals("foo", imports[0].getName());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("ghi", reader.stringValue());
+        assertEquals(IonType.INT, reader.next());
+        assertTrue(reader.getSymbolTable().isSystemTable());
+        assertEquals(0, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    private static void assertSymbolEquals(
+        String expectedText,
+        ImportLocation expectedImportLocation,
+        SymbolToken actual
+    ) {
+        assertEquals(expectedText, actual.getText());
+        SymbolTokenWithImportLocation impl = (SymbolTokenWithImportLocation) actual;
+        assertEquals(expectedImportLocation, impl.getImportLocation());
+    }
+
+    @Test
+    public void symbolsAsTokens() throws Exception {
+        IonReader reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertSymbolEquals("foo", null, reader.getFieldNameSymbol());
+        SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
+        assertEquals(1, annotations.length);
+        assertSymbolEquals("uvw", null, annotations[0]);
+        assertSymbolEquals("abc", null, reader.symbolValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertSymbolEquals("bar", null, reader.getFieldNameSymbol());
+        annotations = reader.getTypeAnnotationSymbols();
+        assertEquals(2, annotations.length);
+        assertSymbolEquals("qrs", null, annotations[0]);
+        assertSymbolEquals("xyz", null, annotations[1]);
+        assertSymbolEquals("def", null, reader.symbolValue());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
     @Test
     public void intNegativeZeroFails() throws Exception {
         IonReader reader = readerFor(0x31, 0x00);
@@ -551,6 +1090,97 @@ public void nopPadOneByte() throws Exception {
         reader.close();
     }
 
+    @Test
+    public void localSidOutOfRangeStringValue() throws Exception {
+        IonReader reader = readerFor(0x71, 0x0A); // SID 10
+        assertEquals(IonType.SYMBOL, reader.next());
+        thrown.expect(IonException.class);
+        reader.stringValue();
+        reader.close();
+    }
+
+    @Test
+    public void localSidOutOfRangeSymbolValue() throws Exception {
+        IonReader reader = readerFor(0x71, 0x0A); // SID 10
+        assertEquals(IonType.SYMBOL, reader.next());
+        thrown.expect(IonException.class);
+        reader.symbolValue();
+        reader.close();
+    }
+
+    @Test
+    public void localSidOutOfRangeFieldName() throws Exception {
+        IonReader reader = readerFor(
+            0xD2, // Struct, length 2
+            0x8A, // SID 10
+            0x20 // int 0
+        );
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        thrown.expect(IonException.class);
+        reader.getFieldName();
+        reader.close();
+    }
+
+    @Test
+    public void localSidOutOfRangeFieldNameSymbol() throws Exception {
+        IonReader reader = readerFor(
+            0xD2, // Struct, length 2
+            0x8A, // SID 10
+            0x20 // int 0
+        );
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        thrown.expect(IonException.class);
+        reader.getFieldNameSymbol();
+        reader.close();
+    }
+
+    @Test
+    public void localSidOutOfRangeAnnotation() throws Exception {
+        IonReader reader = readerFor(
+            0xE3, // Annotation wrapper, length 3
+            0x81, // annotation SID length 1
+            0x8A, // SID 10
+            0x20 // int 0
+        );
+        assertEquals(IonType.INT, reader.next());
+        thrown.expect(IonException.class);
+        reader.getTypeAnnotations();
+        reader.close();
+    }
+
+    @Test
+    public void localSidOutOfRangeAnnotationSymbol() throws Exception {
+        IonReader reader = readerFor(
+            0xE3, // Annotation wrapper, length 3
+            0x81, // annotation SID length 1
+            0x8A, // SID 10
+            0x20 // int 0
+        );
+        assertEquals(IonType.INT, reader.next());
+        thrown.expect(IonException.class);
+        reader.getTypeAnnotationSymbols();
+        reader.close();
+    }
+
+    @Test
+    public void localSidOutOfRangeIterateAnnotations() throws Exception {
+        IonReader reader = readerFor(
+            0xE3, // Annotation wrapper, length 3
+            0x81, // annotation SID length 1
+            0x8A, // SID 10
+            0x20 // int 0
+        );
+        assertEquals(IonType.INT, reader.next());
+        Iterator<String> annotationIterator = reader.iterateTypeAnnotations();
+        thrown.expect(IonException.class);
+        annotationIterator.next();
+        reader.close();
+    }
+
     @Test
     public void stepInOnScalarFails() throws Exception {
         IonReader reader = readerFor(0x20);
@@ -714,4 +1344,361 @@ public void annotationWrapperVariableLengthMismatchFails() throws Exception {
         reader.close();
     }
 
+    @Test
+    public void multipleSymbolTableImportsFieldsFails() throws Exception {
+        IonReader reader = readerFor((writer, out) -> {
+            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+            writer.stepIn(IonType.LIST);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+            writer.writeString("bar");
+            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+            writer.writeInt(1);
+            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+            writer.writeInt(1);
+            writer.stepOut();
+            writer.stepOut();
+            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+            writer.stepIn(IonType.LIST);
+            writer.writeString("ghi");
+            writer.stepOut();
+            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+            writer.stepIn(IonType.LIST);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+            writer.writeString("foo");
+            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+            writer.writeInt(1);
+            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+            writer.writeInt(2);
+            writer.stepOut();
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbolToken(10);
+        });
+
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void multipleSymbolTableSymbolsFieldsFails() throws Exception {
+        IonReader reader = readerFor((writer, out) -> {
+            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+            writer.stepIn(IonType.LIST);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+            writer.writeString("bar");
+            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+            writer.writeInt(1);
+            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+            writer.writeInt(1);
+            writer.stepOut();
+            writer.stepOut();
+            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+            writer.stepIn(IonType.LIST);
+            writer.writeString("ghi");
+            writer.stepOut();
+            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+            writer.stepIn(IonType.LIST);
+            writer.writeString("abc");
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbolToken(10);
+        });
+
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void nonStringInSymbolsListCreatesNullSlot() throws Exception {
+        IonReader reader = readerFor((writer, out) -> {
+            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+            writer.stepIn(IonType.LIST);
+            writer.writeString(null);
+            writer.writeString("abc");
+            writer.writeInt(123);
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbolToken(10);
+            writer.writeSymbolToken(11);
+            writer.writeSymbolToken(12);
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        SymbolToken symbolValue = reader.symbolValue();
+        assertNull(symbolValue.getText());
+        assertEquals(0, symbolValue.getSid());
+        assertEquals(IonType.SYMBOL, reader.next());
+        symbolValue = reader.symbolValue();
+        assertEquals("abc", symbolValue.getText());
+        assertEquals(IonType.SYMBOL, reader.next());
+        symbolValue = reader.symbolValue();
+        assertNull(symbolValue.getText());
+        assertEquals(0, symbolValue.getSid());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations() throws Exception {
+        SimpleCatalog catalog = new SimpleCatalog();
+        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
+        catalog.putTable(SYSTEM.newSharedSymbolTable("bar", 1, Arrays.asList("123", "456").iterator()));
+        readerBuilder = readerBuilder.withCatalog(catalog);
+
+        IonReader reader = readerFor((writer, out) -> {
+            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+            writer.stepIn(IonType.LIST);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+            writer.writeString("foo");
+            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+            writer.writeInt(1);
+            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+            writer.writeInt(4); // The matching shared symbol table in the catalog only declares two symbols.
+            writer.stepOut();
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+            writer.writeString("bar");
+            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+            writer.writeInt(1);
+            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+            // The matching shared symbol table in the catalog declares two symbols, but only one is used.
+            writer.writeInt(1);
+            writer.stepOut();
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+            writer.writeString("baz"); // There is no match in the catalog; all symbols have unknown text.
+            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+            writer.writeInt(1);
+            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+            writer.writeInt(2);
+            writer.stepOut();
+            writer.stepOut();
+            writer.stepOut();
+            writer.writeSymbolToken(10); // abc
+            writer.writeSymbolToken(11); // def
+            writer.writeSymbolToken(12); // unknown text, import SID 3 (from foo)
+            writer.writeSymbolToken(13); // unknown text, import SID 4 (from foo)
+            writer.writeSymbolToken(14); // 123
+            writer.writeSymbolToken(15); // unknown text, import SID 1 (from baz)
+            writer.writeSymbolToken(16); // unknown text, import SID 2 (from baz)
+        });
+
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        SymbolTokenWithImportLocation symbolValue =
+            (SymbolTokenWithImportLocation) reader.symbolValue();
+        assertNull(symbolValue.getText());
+        assertEquals(new ImportLocation("foo", 3), symbolValue.getImportLocation());
+        assertEquals(IonType.SYMBOL, reader.next());
+        symbolValue = (SymbolTokenWithImportLocation) reader.symbolValue();
+        assertNull(symbolValue.getText());
+        assertEquals(new ImportLocation("foo", 4), symbolValue.getImportLocation());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("123", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        symbolValue = (SymbolTokenWithImportLocation) reader.symbolValue();
+        assertEquals(
+            new SymbolTokenWithImportLocation(
+                null,
+                15,
+                new ImportLocation("baz", 1)
+            ),
+            symbolValue
+        );
+        assertEquals(IonType.SYMBOL, reader.next());
+        symbolValue = (SymbolTokenWithImportLocation) reader.symbolValue();
+        assertEquals(
+            new SymbolTokenWithImportLocation(
+                null,
+                16,
+                new ImportLocation("baz", 2)
+            ),
+            symbolValue
+        );
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void symbolTableSnapshotImplementsBasicMethods() throws Exception {
+        IonReader reader = readerFor("'abc'");
+        reader.next();
+        SymbolTable symbolTable = reader.getSymbolTable();
+        assertNull(symbolTable.getName());
+        assertEquals(0, symbolTable.getVersion());
+        assertTrue(symbolTable.isLocalTable());
+        assertTrue(symbolTable.isReadOnly());
+        assertFalse(symbolTable.isSharedTable());
+        assertFalse(symbolTable.isSystemTable());
+        assertFalse(symbolTable.isSubstitute());
+        symbolTable.makeReadOnly();
+        assertEquals(10, symbolTable.getMaxId());
+        assertEquals("abc", symbolTable.findKnownSymbol(10));
+        assertNull(symbolTable.findKnownSymbol(symbolTable.getMaxId() + 1));
+        thrown.expect(IllegalArgumentException.class);
+        symbolTable.findKnownSymbol(-1);
+        reader.close();
+    }
+
+    /**
+     * Compares an iterator to the given list.
+     * @param expected the list containing the elements to compare to.
+     * @param actual the iterator to be compared.
+     */
+    private static void compareIterator(List<String> expected, Iterator<String> actual) {
+        int numberOfElements = 0;
+        while (actual.hasNext()) {
+            String actualValue = actual.next();
+            if (numberOfElements >= expected.size()) {
+                assertTrue(actual.hasNext());
+                break;
+            }
+            String expectedValue = expected.get(numberOfElements++);
+            assertEquals(expectedValue, actualValue);
+        }
+        assertEquals(expected.size(), numberOfElements);
+    }
+
+    @Test
+    public void annotationIteratorReuse() throws Exception {
+        IonReader reader = readerFor("foo::bar::123 baz::456");
+
+        assertEquals(IonType.INT, reader.next());
+        Iterator<String> firstValueAnnotationIterator = reader.iterateTypeAnnotations();
+        assertEquals(123, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        compareIterator(Arrays.asList("foo", "bar"), firstValueAnnotationIterator);
+        Iterator<String> secondValueAnnotationIterator = reader.iterateTypeAnnotations();
+        assertEquals(456, reader.intValue());
+        assertNull(reader.next());
+        compareIterator(Collections.singletonList("baz"), secondValueAnnotationIterator);
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void multiByteSymbolTokens() throws Exception {
+        IonReader reader = readerFor((writer, out) -> {
+            writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
+            writer.stepIn(IonType.LIST);
+            for (int i = SystemSymbols.ION_1_0_MAX_ID ; i < 332; i++) {
+                writer.writeNull(IonType.STRING);
+            }
+            writer.writeString("a");
+            writer.writeString("b");
+            writer.writeString("c");
+            writer.stepOut();
+            writer.stepOut();
+            writer.stepIn(IonType.STRUCT);
+            writer.addTypeAnnotationSymbol(333);
+            writer.setFieldNameSymbol(334);
+            writer.writeSymbolToken(335);
+            writer.stepOut();
+        });
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
+        assertEquals(1, annotations.length);
+        assertEquals("a", annotations[0].assumeText());
+        Iterator<String> annotationsIterator = reader.iterateTypeAnnotations();
+        assertTrue(annotationsIterator.hasNext());
+        assertEquals("a", annotationsIterator.next());
+        assertFalse(annotationsIterator.hasNext());
+        assertEquals("b", reader.getFieldNameSymbol().assumeText());
+        assertEquals("c", reader.symbolValue().assumeText());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void symbolTableWithOpenContentImportsListField() throws Exception {
+        IonReader reader = readerFor((writer, out) -> {
+            writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(SystemSymbols.NAME_SID);
+            writer.writeInt(123);
+            writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
+            writer.stepIn(IonType.LIST);
+            writer.writeString("a");
+            writer.stepOut();
+            writer.setFieldNameSymbol(SystemSymbols.IMPORTS_SID);
+            writer.writeString("foo");
+            writer.stepOut();
+            writer.writeSymbolToken(SystemSymbols.ION_1_0_MAX_ID + 1);
+        });
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("a", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void symbolTableWithOpenContentImportsSymbolField() throws Exception {
+        IonReader reader = readerFor((writer, out) -> {
+            writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
+            writer.stepIn(IonType.LIST);
+            writer.writeString("a");
+            writer.stepOut();
+            writer.setFieldNameSymbol(SystemSymbols.IMPORTS_SID);
+            writer.writeSymbolToken(SystemSymbols.NAME_SID);
+            writer.stepOut();
+            writer.writeSymbolToken(SystemSymbols.ION_1_0_MAX_ID + 1);
+        });
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("a", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void symbolTableWithOpenContentSymbolField() throws Exception {
+        IonReader reader = readerFor((writer, out) -> {
+            writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
+            writer.stepIn(IonType.STRUCT);
+            writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
+            writer.writeString("foo");
+            writer.setFieldNameSymbol(SystemSymbols.IMPORTS_SID);
+            writer.writeSymbolToken(SystemSymbols.NAME_SID);
+            writer.stepOut();
+            writer.writeSymbolToken(SystemSymbols.VERSION_SID);
+        });
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals(SystemSymbols.VERSION, reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
 }

From 2d18a89ba6b76b94a10a738425f388625a10d1fc Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 30 Jun 2023 13:32:24 -0700
Subject: [PATCH 268/490] Adds support for continuable reading in
 IonReaderContinuableTopLevelBinary.

---
 .../IonReaderContinuableTopLevelBinary.java   | 157 ++++++++--
 ...onReaderContinuableTopLevelBinaryTest.java | 286 ++++++++++++++++++
 2 files changed, 421 insertions(+), 22 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index 9fcc38c7d6..fb52949329 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -5,6 +5,7 @@
 
 import com.amazon.ion.Decimal;
 import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonCursor;
@@ -20,11 +21,42 @@
 import java.util.Date;
 
 /**
- * An {@link IonReader} adapter to IonReaderContinuableApplicationBinary. Currently non-continuable. Support for
- * continuability will be added.
+ * An optionally continuable (i.e., incremental) binary {@link IonReader} implementation. Continuability is enabled
+ * using {@code IonReaderBuilder.withIncrementalReadingEnabled(true)}.
+ * <p>
+ * When continuable reading is enabled, if
+ * {@link IonReader#next()} returns {@code null} at the top-level, it indicates that there is not (yet) enough data in
+ * the stream to complete a top-level value. The user may wait for more data to become available in the stream and
+ * call {@link IonReader#next()} again to continue reading. Unlike the non-incremental reader, the continuable reader
+ * will never throw an exception due to unexpected EOF during {@code next()}. If, however, {@link IonReader#close()} is
+ * called when an incomplete value is buffered, an {@link IonException} will be raised.
+ * </p>
+ * <p>
+ * There is one caveat with the continuable reader implementation: it must be able to buffer an entire top-level value
+ * and any preceding system values (Ion version marker(s) and symbol table(s)) in memory. This means that each value
+ * and preceding system values must be no larger than any of the following:
+ * <ul>
+ * <li>The configured maximum buffer size of the {@link IonBufferConfiguration}.</li>
+ * <li>The memory available to the JVM.</li>
+ * <li>2GB, because the buffer is held in a Java {@code byte[]}, which is indexed by an {@code int}.</li>
+ * </ul>
+ * This will not be a problem for the vast majority of Ion streams, as it is
+ * rare for a single top-level value or symbol table to exceed a few megabytes in size. However, if the size of the
+ * stream's values risk exceeding the available memory, then continuable reading must not be used.
+ * </p>
  */
 final class IonReaderContinuableTopLevelBinary extends IonReaderContinuableApplicationBinary implements IonReader, _Private_ReaderWriter {
 
+    // True if continuable reading is disabled.
+    private final boolean isNonContinuable;
+
+    // True if input is sourced from a non-fixed stream and the reader is non-continuable, meaning that its top level
+    // values are not automatically filled during next().
+    private final boolean isFillRequired;
+
+    // True if a value is in the process of being filled.
+    private boolean isFillingValue = false;
+
     // The type of value on which the reader is currently positioned.
     private IonType type = null;
 
@@ -40,6 +72,8 @@ final class IonReaderContinuableTopLevelBinary extends IonReaderContinuableAppli
      */
     IonReaderContinuableTopLevelBinary(IonReaderBuilder builder, InputStream inputStream, byte[] alreadyRead, int alreadyReadOff, int alreadyReadLen) {
         super(builder, inputStream, alreadyRead, alreadyReadOff, alreadyReadLen);
+        isNonContinuable = !builder.isIncrementalReadingEnabled();
+        isFillRequired = isNonContinuable;
     }
 
     /**
@@ -51,6 +85,8 @@ final class IonReaderContinuableTopLevelBinary extends IonReaderContinuableAppli
      */
     IonReaderContinuableTopLevelBinary(IonReaderBuilder builder, byte[] data, int offset, int length) {
         super(builder, data, offset, length);
+        isNonContinuable = !builder.isIncrementalReadingEnabled();
+        isFillRequired = false;
     }
 
     @Override
@@ -70,13 +106,52 @@ public boolean hasNext() {
         throw new UnsupportedOperationException("Not implemented");
     }
 
+    /**
+     * Advances to the next value and attempts to fill it.
+     * @return true if not enough data was available in the stream; otherwise, false.
+     */
+    private boolean nextAndFill() {
+        while (true) {
+            if (!isFillingValue) {
+                if (nextValue() == IonCursor.Event.NEEDS_DATA) {
+                    type = null;
+                    return true;
+                }
+            }
+            isFillingValue = true;
+            event = fillValue();
+            if (event == IonCursor.Event.NEEDS_DATA) {
+                type = null;
+                return true;
+            } else if (event == IonCursor.Event.NEEDS_INSTRUCTION) {
+                // The value was skipped for being too large. Get the next one.
+                isFillingValue = false;
+                continue;
+            }
+            break;
+        }
+        isFillingValue = false;
+        return false;
+    }
+
     @Override
     public IonType next() {
-        IonCursor.Event event = super.nextValue();
-        if (event == IonCursor.Event.NEEDS_DATA) {
-            endStream();
-            type = null;
-            return null;
+        if (!isSlowMode || isNonContinuable || parent != null) {
+            IonCursor.Event event = super.nextValue();
+            if (event == IonCursor.Event.NEEDS_DATA) {
+                if (isNonContinuable) {
+                    endStream();
+                }
+                type = null;
+                return null;
+            } else if (event == IonCursor.Event.NEEDS_INSTRUCTION) {
+                // The value was skipped for being too large.
+                isFillingValue = false;
+            }
+        } else {
+            if (nextAndFill()) {
+                return null;
+            }
         }
         type = super.getType();
         return type;
@@ -121,91 +196,121 @@ public IntegerSize getIntegerSize() {
         if (type != IonType.INT) {
             return null;
         }
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.getIntegerSize();
     }
 
     @Override
     public boolean booleanValue() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.booleanValue();
     }
 
     @Override
     public int intValue() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.intValue();
     }
 
     @Override
     public long longValue() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.longValue();
     }
 
     @Override
     public BigInteger bigIntegerValue() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.bigIntegerValue();
     }
 
     @Override
     public double doubleValue() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.doubleValue();
     }
 
     @Override
     public BigDecimal bigDecimalValue() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.bigDecimalValue();
     }
 
     @Override
     public Decimal decimalValue() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.decimalValue();
     }
 
     @Override
     public Date dateValue() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.dateValue();
     }
 
     @Override
     public Timestamp timestampValue() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.timestampValue();
     }
 
     @Override
     public String stringValue() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.stringValue();
     }
 
     @Override
     public SymbolToken symbolValue() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.symbolValue();
     }
 
     @Override
     public int byteSize() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.byteSize();
     }
 
     @Override
     public byte[] newBytes() {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.newBytes();
     }
 
     @Override
     public int getBytes(byte[] buffer, int offset, int len) {
-        prepareScalar();
+        if (isFillRequired) {
+            prepareScalar();
+        }
         return super.getBytes(buffer, offset, len);
     }
 
@@ -213,4 +318,12 @@ public int getBytes(byte[] buffer, int offset, int len) {
     public <T> T asFacet(Class<T> facetType) {
         return null;
     }
+
+    @Override
+    public void close() {
+        if (!isNonContinuable) {
+            endStream();
+        }
+        super.close();
+    }
 }
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 2c555dc531..160b857bf9 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -131,6 +131,7 @@ public void setup() {
         byteCounter = new AtomicLong();
         oversizedCounter = new AtomicInteger();
         readerBuilder = IonReaderBuilder.standard()
+            .withIncrementalReadingEnabled(true)
             .withBufferConfiguration(standardBufferConfiguration);
         writerBuilder = IonBinaryWriterBuilder.standard();
     }
@@ -247,6 +248,18 @@ private IonReader readerFor(int... ion) throws Exception {
         return readerFor(readerBuilder, binary);
     }
 
+    /**
+     * Creates an incremental reader over the given binary Ion. This should only be used in cases where tests exercise
+     * behavior that does not exist when constructing a reader over a fixed buffer via byte array. In all other cases,
+     * use one of the other `readerFor` variants, which construct readers according to the 'constructFromBytes'
+     * parameter.
+     * @param input the binary Ion data.
+     * @return a new reader.
+     */
+    private IonReader readerFor(InputStream input) {
+        return new IonReaderContinuableTopLevelBinary(readerBuilder, input, null, 0, 0);
+    }
+
     @Test
     public void skipContainers() throws Exception {
         IonReader reader = readerFor(
@@ -572,6 +585,243 @@ public void invalidVersionMarker() throws Exception {
         reader.close();
     }
 
+    /**
+     * Feeds all bytes from the given array into the pipe one-by-one, asserting before each byte that the reader
+     * is not positioned on a value.
+     * @param bytes the bytes to be fed.
+     * @param pipe the pipe into which the bytes are fed, and from which the reader consumes bytes.
+     * @param reader an incremental reader.
+     */
+    private void feedBytesOneByOne(byte[] bytes, ResizingPipedInputStream pipe, IonReader reader) {
+        for (byte b : bytes) {
+            assertNull(reader.next());
+            pipe.receive(b);
+        }
+    }
+
+    @Test
+    public void incrementalValue() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        IonReader reader = readerFor(pipe);
+        byte[] bytes = toBinary("\"StringValueLong\"");
+        totalBytesInStream = bytes.length;
+        feedBytesOneByOne(bytes, pipe, reader);
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("StringValueLong", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void incrementalMultipleValues() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        IonReader reader = readerFor(pipe);
+        byte[] bytes = toBinary("value_type::\"StringValueLong\"");
+        totalBytesInStream = bytes.length;
+        feedBytesOneByOne(bytes, pipe, reader);
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("StringValueLong", reader.stringValue());
+        assertEquals(Collections.singletonList("value_type"), Arrays.asList(reader.getTypeAnnotations()));
+        assertNull(reader.next());
+        assertBytesConsumed();
+        bytes = toBinary("{foobar: \"StringValueLong\"}");
+        totalBytesInStream += bytes.length;
+        feedBytesOneByOne(bytes, pipe, reader);
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("foobar", reader.getFieldName());
+        assertEquals("StringValueLong", reader.stringValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void incrementalMultipleValuesLoadFromReader() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        final IonReader reader = readerFor(pipe);
+        final IonLoader loader = SYSTEM.getLoader();
+        byte[] bytes = toBinary("value_type::\"StringValueLong\"");
+        totalBytesInStream = bytes.length;
+        for (byte b : bytes) {
+            IonDatagram empty = loader.load(reader);
+            assertTrue(empty.isEmpty());
+            pipe.receive(b);
+        }
+        IonDatagram firstValue = loader.load(reader);
+        assertEquals(1, firstValue.size());
+        IonString string = (IonString) firstValue.get(0);
+        assertEquals("StringValueLong", string.stringValue());
+        assertEquals(Collections.singletonList("value_type"), Arrays.asList(string.getTypeAnnotations()));
+        assertBytesConsumed();
+        bytes = toBinary("{foobar: \"StringValueLong\"}");
+        totalBytesInStream += bytes.length;
+        for (byte b : bytes) {
+            IonDatagram empty = loader.load(reader);
+            assertTrue(empty.isEmpty());
+            pipe.receive(b);
+        }
+        IonDatagram secondValue = loader.load(reader);
+        assertEquals(1, secondValue.size());
+        IonStruct struct = (IonStruct) secondValue.get(0);
+        string = (IonString) struct.get("foobar");
+        assertEquals("StringValueLong", string.stringValue());
+        IonDatagram empty = loader.load(reader);
+        assertTrue(empty.isEmpty());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void incrementalMultipleValuesLoadFromInputStreamFails() throws Exception {
+        final ResizingPipedInputStream pipe = new ResizingPipedInputStream(1);
+        final IonLoader loader = IonSystemBuilder.standard()
+            .withReaderBuilder(readerBuilder)
+            .build()
+            .getLoader();
+        IonDatagram empty = loader.load(pipe);
+        assertTrue(empty.isEmpty());
+        pipe.receive(_Private_IonConstants.BINARY_VERSION_MARKER_1_0[0]);
+        // Because reader does not persist across load invocations, the loader must throw an exception if the reader
+        // had an incomplete value buffered.
+        thrown.expect(IonException.class);
+        loader.load(pipe);
+    }
+
+    private void incrementalMultipleValuesIterate(Iterator<IonValue> iterator, ResizingPipedInputStream pipe) {
+        byte[] bytes = toBinary("value_type::\"StringValueLong\"");
+        totalBytesInStream = bytes.length;
+        for (byte b : bytes) {
+            assertFalse(iterator.hasNext());
+            pipe.receive(b);
+        }
+        assertTrue(iterator.hasNext());
+        IonString string = (IonString) iterator.next();
+        assertEquals("StringValueLong", string.stringValue());
+        assertEquals(Collections.singletonList("value_type"), Arrays.asList(string.getTypeAnnotations()));
+        assertFalse(iterator.hasNext());
+        assertBytesConsumed();
+        bytes = toBinary("{foobar: \"StringValueLong\"}");
+        totalBytesInStream += bytes.length;
+        for (byte b : bytes) {
+            assertFalse(iterator.hasNext());
+            pipe.receive(b);
+        }
+        assertTrue(iterator.hasNext());
+        IonStruct struct = (IonStruct) iterator.next();
+        string = (IonString) struct.get("foobar");
+        assertEquals("StringValueLong", string.stringValue());
+        assertFalse(iterator.hasNext());
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void incrementalMultipleValuesIterateFromReader() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        IonReader reader = readerBuilder.build(pipe);
+        Iterator<IonValue> iterator = SYSTEM.iterate(reader);
+        incrementalMultipleValuesIterate(iterator, pipe);
+        reader.close();
+    }
+
+    @Test
+    public void incrementalMultipleValuesIterateFromInputStream() {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        IonSystem system = IonSystemBuilder.standard().withReaderBuilder(readerBuilder).build();
+        Iterator<IonValue> iterator = system.iterate(pipe);
+        incrementalMultipleValuesIterate(iterator, pipe);
+    }
+
+
+    @Test
+    public void incrementalReadInitiallyEmptyStreamThatTurnsOutToBeText() {
+        // Note: if incremental text read support is added, this test will start failing, which is expected. For now,
+        // we ensure that this fails quickly.
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(1);
+        IonReader reader = readerBuilder.build(pipe);
+        assertNull(reader.next());
+        // Valid text Ion. Also hex 0x20, which is binary int 0. However, it is not preceded by the IVM, so it must be
+        // interpreted as text. The binary reader must fail.
+        pipe.receive(' ');
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void incrementalSymbolTables() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        byte[] firstValue = writeRaw(
+            (writer, out) -> {
+                writer.setTypeAnnotationSymbols(3);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(7);
+                writer.stepIn(IonType.LIST);
+                writer.writeString("abcdefghijklmnopqrstuvwxyz");
+                writer.writeString("def");
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepIn(IonType.STRUCT);
+                writer.setTypeAnnotationSymbols(11);
+                writer.setFieldNameSymbol(10);
+                writer.writeString("foo");
+                writer.stepOut();
+                writer.close();
+            },
+            true
+        );
+        byte[] secondValue = writeRaw(
+            (writer, out) -> {
+                writer.setTypeAnnotationSymbols(3);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(6);
+                writer.writeSymbolToken(3);
+                writer.setFieldNameSymbol(7);
+                writer.stepIn(IonType.LIST);
+                writer.writeString("foo");
+                writer.writeString("bar");
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(10);
+                writer.setTypeAnnotationSymbols(12, 13);
+                writer.writeString("fairlyLongString");
+                writer.stepOut();
+                writer.close();
+            },
+            false
+        );
+
+        IonReader reader = readerFor(pipe);
+        feedBytesOneByOne(firstValue, pipe, reader);
+        totalBytesInStream = firstValue.length;
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals(Collections.singletonList("def"), Arrays.asList(reader.getTypeAnnotations()));
+        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.getFieldName());
+        assertEquals("foo", reader.stringValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertBytesConsumed();
+        feedBytesOneByOne(secondValue, pipe, reader);
+        totalBytesInStream += secondValue.length;
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("fairlyLongString", reader.stringValue());
+        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.getFieldName());
+        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
     @Test
     public void lobsNewBytes() throws Exception {
         final byte[] blobBytes = "abcdef".getBytes(StandardCharsets.UTF_8);
@@ -1701,4 +1951,40 @@ public void symbolTableWithOpenContentSymbolField() throws Exception {
         assertBytesConsumed();
     }
 
+    @Test
+    public void stepOutWithoutEnoughDataNonIncrementalFails() throws Exception {
+        byte[] bytes = bytes(
+            0xE0, 0x01, 0x00, 0xEA,
+            0xB6, // List length 6
+            0x21, 0x01, // Int 1
+            0x21, 0x02 // Int 2
+        );
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        IonReader reader = readerFor(new ByteArrayInputStream(bytes));
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        // Early step out. Not enough bytes to complete the value. Throw if the reader attempts
+        // to advance the cursor.
+        reader.stepOut();
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
+    @Test
+    public void skipWithoutEnoughDataNonIncrementalFails() throws Exception {
+        byte[] bytes = bytes(
+            0xE0, 0x01, 0x00, 0xEA,
+            0x86, '1', '2', '3', '4' // String length 6; only 4 value bytes
+        );
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        IonReader reader = readerFor(new ByteArrayInputStream(bytes));
+        assertEquals(IonType.STRING, reader.next());
+        thrown.expect(IonException.class);
+        reader.next();
+        reader.close();
+    }
+
 }

From cf8f775d249bf1469c6f1ee760fe61385075d174 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 30 Jun 2023 13:54:08 -0700
Subject: [PATCH 269/490] Adds oversized value handling and tests to
 IonReaderContinuableTopLevelBinary.

---
 .../amazon/ion/OversizedValueException.java   |   26 +
 .../IonReaderContinuableTopLevelBinary.java   |    4 +
 ...onReaderContinuableTopLevelBinaryTest.java | 1051 +++++++++++++++++
 3 files changed, 1081 insertions(+)
 create mode 100644 src/com/amazon/ion/OversizedValueException.java

diff --git a/src/com/amazon/ion/OversizedValueException.java b/src/com/amazon/ion/OversizedValueException.java
new file mode 100644
index 0000000000..90cd6e052b
--- /dev/null
+++ b/src/com/amazon/ion/OversizedValueException.java
@@ -0,0 +1,26 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion;
+
+/**
+ * An error thrown when the user requests an IonReader to parse a scalar value that
+ * exceeds the reader's configured maximum buffer size. This is never thrown from
+ * {@link IonReader#next()}; oversized values encountered during next() are
+ * skipped. This may be thrown from any {@link IonReader} `*value()` method,
+ * but only when a maximum buffer size is specified, and only when incremental
+ * reading is disabled. When incremental reading is enabled, all oversized values
+ * will be detected during `IonReader.next()`, as calling that method at the top
+ * level causes the reader to attempt to buffer the entire top-level value. This
+ * custom exception type exists because several IonReader `*value()` interface
+ * methods return primitives, leaving no way to alert the user to failure.
+ * This exception is recoverable; after catching this exception, the user may
+ * call `IonReader.next()` to position the reader on the next value in the
+ * stream and continue processing.
+ */
+public class OversizedValueException extends IonException {
+
+    public OversizedValueException() {
+        super("Attempted to parse a scalar value that exceeded the reader's maximum buffer size.");
+    }
+}
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index fb52949329..ea62450785 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -10,6 +10,7 @@
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonCursor;
 import com.amazon.ion.IonType;
+import com.amazon.ion.OversizedValueException;
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.Timestamp;
@@ -188,6 +189,9 @@ private void prepareScalar() {
         if (fillValue() == Event.VALUE_READY) {
             return;
         }
+        if (event == Event.NEEDS_INSTRUCTION) {
+            throw new OversizedValueException();
+        }
         throw new IonException("Unexpected EOF.");
     }
 
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 160b857bf9..1a33fb15b9 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -17,6 +17,7 @@
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonValue;
 import com.amazon.ion.IonWriter;
+import com.amazon.ion.OversizedValueException;
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.SystemSymbols;
@@ -119,6 +120,48 @@ public void onData(int numberOfBytes) {
         }
     };
 
+    /**
+     * A handler that counts consumed bytes using `byteCounter`, counts oversized user values using `oversizedCounter`,
+     * and throws if any oversized symbol tables are encountered.
+     */
+    private final UnifiedTestHandler byteAndOversizedValueCountingHandler = new UnifiedTestHandler() {
+        @Override
+        public void onOversizedSymbolTable() {
+            throw new IllegalStateException("Oversized symbol table not expected.");
+        }
+
+        @Override
+        public void onOversizedValue() {
+            oversizedCounter.incrementAndGet();
+        }
+
+        @Override
+        public void onData(int numberOfBytes) {
+            byteCounter.addAndGet(numberOfBytes);
+        }
+    };
+
+    /**
+     * A handler that counts consumed bytes using `byteCounter`, counts oversized symbol tables using
+     * `oversizedCounter`, and throws if any oversized user values are encountered.
+     */
+    private final UnifiedTestHandler byteAndOversizedSymbolTableCountingHandler = new UnifiedTestHandler() {
+        @Override
+        public void onOversizedSymbolTable() {
+            oversizedCounter.incrementAndGet();
+        }
+
+        @Override
+        public void onOversizedValue() {
+            throw new IllegalStateException("Oversized value not expected.");
+        }
+
+        @Override
+        public void onData(int numberOfBytes) {
+            byteCounter.addAndGet(numberOfBytes);
+        }
+    };
+
     // Standard byte-counting buffer configuration. Fails if any value is oversized.
     private final IonBufferConfiguration standardBufferConfiguration = IonBufferConfiguration.Builder.standard()
         .onOversizedSymbolTable(byteCountingHandler)
@@ -1813,6 +1856,995 @@ public void symbolTableSnapshotImplementsBasicMethods() throws Exception {
         reader.close();
     }
 
+    /**
+     * Sets `readerBuilder`'s initial and maximum size bounds, and specifies the handler to use.
+     * @param initialSize the initial buffer size.
+     * @param maximumSize the maximum size to which the buffer may grow.
+     * @param handler the unified handler for byte counting and oversized value handling.
+     */
+    private void setBufferBounds(int initialSize, int maximumSize, UnifiedTestHandler handler) {
+        readerBuilder = readerBuilder.withBufferConfiguration(
+            IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(initialSize)
+                .withMaximumBufferSize(maximumSize)
+                .onOversizedValue(handler)
+                .onOversizedSymbolTable(handler)
+                .onData(handler)
+                .build()
+        );
+    }
+
+    /**
+     * Creates a bounded incremental reader over the given binary Ion, constructing a reader either from byte array or
+     * from InputStream depending on the value of the parameter 'constructFromBytes'.
+     * @param initialBufferSize the initial buffer size.
+     * @param maximumBufferSize the maximum size to which the buffer may grow.
+     * @param handler the unified handler for byte counting and oversized value handling.
+     */
+    private IonReader boundedReaderFor(byte[] bytes, int initialBufferSize, int maximumBufferSize, UnifiedTestHandler handler) {
+        byteCounter.set(0);
+        setBufferBounds(initialBufferSize, maximumBufferSize, handler);
+        return readerFor(readerBuilder, bytes);
+    }
+
+    /**
+     * Creates a bounded incremental reader over the given binary Ion. This should only be used in cases where tests
+     * exercise behavior that does not exist when constructing a reader over a fixed buffer via byte array. In all other
+     * cases, use one of the other `readerFor` variants, which construct readers according to the 'constructFromBytes'
+     * parameter.
+     * @param initialBufferSize the initial buffer size.
+     * @param maximumBufferSize the maximum size to which the buffer may grow.
+     * @param handler the unified handler for byte counting and oversized value handling.
+     */
+    private IonReader boundedReaderFor(InputStream stream, int initialBufferSize, int maximumBufferSize, UnifiedTestHandler handler) {
+        byteCounter.set(0);
+        setBufferBounds(initialBufferSize, maximumBufferSize, handler);
+        return readerFor(stream);
+    }
+
+    @Test
+    public void singleValueExceedsInitialBufferSize() throws Exception {
+        IonReader reader = boundedReaderFor(
+            toBinary("\"abcdefghijklmnopqrstuvwxyz\""),
+            8,
+            Integer.MAX_VALUE,
+            byteCountingHandler
+        );
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void maximumBufferSizeTooSmallFails() {
+        IonBufferConfiguration.Builder builder = IonBufferConfiguration.Builder.standard();
+        builder
+            .withMaximumBufferSize(builder.getMinimumMaximumBufferSize() - 1)
+            .withInitialBufferSize(builder.getMinimumMaximumBufferSize() - 1)
+            .onOversizedValue(builder.getNoOpOversizedValueHandler())
+            .onOversizedSymbolTable(builder.getNoOpOversizedSymbolTableHandler())
+            .onData(builder.getNoOpDataHandler());
+        thrown.expect(IllegalArgumentException.class);
+        builder.build();
+    }
+
+    @Test
+    public void maximumBufferSizeWithoutHandlerFails() {
+        IonBufferConfiguration.Builder builder = IonBufferConfiguration.Builder.standard();
+        builder
+            .withMaximumBufferSize(9)
+            .withInitialBufferSize(9);
+        thrown.expect(IllegalArgumentException.class);
+        builder.build();
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringScalarFill() throws Exception {
+        byte[] bytes = toBinary(
+            "\"abcdefghijklmnopqrstuvwxyz\" " + // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+            "\"abc\" " +
+            "\"abcdefghijklmnopqrstuvwxyz\" " +
+            "\"def\""
+        );
+
+        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 8, 16, byteAndOversizedValueCountingHandler);
+
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("abc", reader.stringValue());
+        assertEquals(1, oversizedCounter.get());
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("def", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(2, oversizedCounter.get());
+        totalBytesInStream = bytes.length;
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringScalarFillIncremental() throws Exception {
+        byte[] bytes = toBinary(
+            "\"abcdefghijklmnopqrstuvwxyz\" " + // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+            "\"abc\" " +
+            "\"abcdefghijklmnopqrstuvwxyz\" " +
+            "\"def\""
+        );
+
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
+        IonReader reader = boundedReaderFor(pipe, 8, 16, byteAndOversizedValueCountingHandler);
+        int valueCounter = 0;
+        for (byte b : bytes) {
+            pipe.receive(b);
+            IonType type = reader.next();
+            if (type != null) {
+                valueCounter++;
+                assertTrue(valueCounter < 3);
+                if (valueCounter == 1) {
+                    assertEquals(IonType.STRING, type);
+                    assertEquals("abc", reader.stringValue());
+                    assertEquals(1, oversizedCounter.get());
+                } else {
+                    assertEquals(2, valueCounter);
+                    assertEquals(IonType.STRING, type);
+                    assertEquals("def", reader.stringValue());
+                    assertEquals(2, oversizedCounter.get());
+                }
+            }
+        }
+        assertEquals(2, valueCounter);
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(2, oversizedCounter.get());
+        totalBytesInStream = bytes.length;
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringFillOfOnlyScalarInStream() throws Exception {
+        // Unlike the previous test, where excessive size is detected when trying to skip past the value portion,
+        // this test verifies that excessive size can be detected while reading a value header, which happens
+        // byte-by-byte.
+        byte[] bytes = toBinary("\"abcdefghijklmnopqrstuvwxyz\""); // Requires a 2-byte header.
+        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+
+        // The maximum buffer size is 5, which will be exceeded after the IVM (4 bytes), the type ID (1 byte), and
+        // the length byte (1 byte).
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+        totalBytesInStream = bytes.length;
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringFillOfOnlyScalarInStreamIncremental() throws Exception {
+        byte[] bytes = toBinary("\"abcdefghijklmnopqrstuvwxyz\""); // Requires a 2-byte header.
+
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
+        IonReader reader = boundedReaderFor(pipe, 5, 5, byteAndOversizedValueCountingHandler);
+        feedBytesOneByOne(bytes, pipe, reader);
+        // The maximum buffer size is 5, which will be exceeded after the IVM (4 bytes), the type ID (1 byte), and
+        // the length byte (1 byte).
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+        totalBytesInStream = bytes.length;
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringReadOfTypeIdOfSymbolTableAnnotatedValue() throws Exception {
+        // This value is not a symbol table, but follows most of the code path that symbol tables follow. Ensure that
+        // `onOversizedValue` (NOT `onOversizedSymbolTable`) is called, and that the stream continues to be read.
+        byte[] bytes = bytes(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xE6, 0x83, // Annotation wrapper with 3 bytes of annotations
+            0x00, 0x00, 0x83, // A single (overpadded) SID 3 ($ion_symbol_table)
+            0x21, 0x7B, // int 123
+            0x81, 'a' // String "a"
+        );
+        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);;
+
+        // The maximum buffer size is 5, which will be exceeded after the annotation wrapper type ID
+        // (1 byte), the annotations length (1 byte), and the annotation SID 3 (3 bytes). The next byte is the wrapped
+        // value type ID byte.
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("a", reader.stringValue());
+        assertEquals(1, oversizedCounter.get());
+        assertNull(reader.next());
+        reader.close();
+        totalBytesInStream = bytes.length;
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void oversizeValueDetectedDuringReadOfTypeIdOfSymbolTableAnnotatedValueIncremental() throws Exception {
+        // This value is not a symbol table, but follows most of the code path that symbol tables follow. If all bytes
+        // were available up-front it would be possible to determine that this value is not a symbol table and call
+        // `onOversizedValue` (see the test above). However, since the value is determined to be oversized in the
+        // annotation wrapper at the top level, it must yield back to the user before determining whether the value
+        // is actually a symbol table. Therefore, it must call `onOversizedSymbolTable` conservatively, as the value
+        // *might* end up being a symbol table.
+        byte[] bytes = bytes(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xE6, 0x83, // Annotation wrapper with 3 bytes of annotations
+            0x00, 0x00, 0x83, // A single (overpadded) SID 3 ($ion_symbol_table)
+            0x21, 0x7B, // int 123
+            0x81, 'a' // String "a"
+        );
+
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
+        IonReader reader = boundedReaderFor(pipe, 5, 5, byteAndOversizedSymbolTableCountingHandler);
+
+        // The maximum buffer size is 5, which will be exceeded after the annotation wrapper type ID
+        // (1 byte), the annotations length (1 byte), and the annotation SID 3 (3 bytes). The next byte is the wrapped
+        // value type ID byte.
+        feedBytesOneByOne(bytes, pipe, reader);
+        assertEquals(1, oversizedCounter.get());
+        assertNull(reader.next());
+        assertNull(reader.next());
+        reader.close();
+    }
+
+    @Test
+    public void valueAfterLargeSymbolTableNotOversized() throws Exception {
+        // The first value is not oversized even though its size plus the size of the preceding symbol table
+        // exceeds the maximum buffer size.
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = writerBuilder.build(out);
+        writer.writeString("12345678");
+        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+        writer.close();
+        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
+        // for symbol 10.
+        // The string "12345678" requires 9 bytes, bringing the total to ~49, above the max of 48.
+
+        IonReader reader = boundedReaderFor(new ByteArrayInputStream(out.toByteArray()), 8, 48, byteAndOversizedValueCountingHandler);
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals(0, oversizedCounter.get());
+        assertEquals("12345678", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals(0, oversizedCounter.get());
+        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(0, oversizedCounter.get());
+        totalBytesInStream = out.size();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void valueAfterLargeSymbolTableNotOversizedIncremental() throws Exception {
+        // The first value is not oversized even though its size plus the size of the preceding symbol table
+        // exceeds the maximum buffer size.
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = writerBuilder.build(out);
+        writer.writeString("12345678");
+        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+        writer.close();
+        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
+        // for symbol 10.
+        // The string "12345678" requires 9 bytes, bringing the total to ~49, above the max of 48.
+
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(out.size());
+        IonReader reader = boundedReaderFor(pipe, 8, 48, byteAndOversizedValueCountingHandler);
+        byte[] bytes = out.toByteArray();
+        int valueCounter = 0;
+        for (byte b : bytes) {
+            pipe.receive(b);
+            IonType type = reader.next();
+            if (type != null) {
+                valueCounter++;
+                if (valueCounter == 1) {
+                    assertEquals(IonType.STRING, type);
+                    assertEquals("12345678", reader.stringValue());
+                    assertEquals(0, oversizedCounter.get());
+                } else if (valueCounter == 2) {
+                    assertEquals(IonType.SYMBOL, type);
+                    assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
+                    assertEquals(0, oversizedCounter.get());
+                }
+            }
+        }
+        assertEquals(2, valueCounter);
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(0, oversizedCounter.get());
+        totalBytesInStream = out.size();
+        assertBytesConsumed();
+    }
+
+    /**
+     * Calls next() on the given reader and returns the result.
+     * @param reader an Ion reader.
+     * @param pipe the stream from which the reader pulls data. If null, all data is available up front.
+     * @param source the source of data to be fed into the pipe. Only used if pipe is not null.
+     * @return the result of the first non-null call to reader.next(), or null if the source data is exhausted before
+     *  reader.next() returns non-null.
+     */
+    private static IonType ionReaderNext(IonReader reader, ResizingPipedInputStream pipe, ByteArrayInputStream source) {
+        if (pipe == null) {
+            return reader.next();
+        }
+        while (source.available() > 0) {
+            pipe.receive(source.read());
+            if (reader.next() != null) {
+                return reader.getType();
+            }
+        }
+        return reader.next();
+    }
+
+    /**
+     * Verifies that oversized value handling works properly when the second value is oversized.
+     * @param withSymbolTable true if the first value should be preceded by a symbol table.
+     * @param withThirdValue true if the second (oversized) value should be followed by a third value that fits.
+     * @param byteByByte true if bytes should be fed to the reader one at a time.
+     * @throws Exception if thrown unexpectedly.
+     */
+    private void oversizedSecondValue(
+        boolean withSymbolTable,
+        boolean withThirdValue,
+        boolean byteByByte
+    ) throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = writerBuilder.build(out);
+        String firstValue = "12345678";
+        if (withSymbolTable) {
+            writer.writeSymbol(firstValue);
+        } else {
+            writer.writeString(firstValue);
+        }
+        writer.writeString("abcdefghijklmnopqrstuvwxyz");
+        String thirdValue = "abc";
+        if (withThirdValue) {
+            writer.writeString(thirdValue);
+        }
+        writer.close();
+        oversizedCounter.set(0);
+
+        // Greater than the first value (and symbol table, if any) and third value, less than the second value.
+        int maximumBufferSize = 25;
+        ResizingPipedInputStream pipe = null;
+        ByteArrayInputStream source = new ByteArrayInputStream(out.toByteArray());
+        InputStream in;
+        if (byteByByte) {
+            pipe = new ResizingPipedInputStream(out.size());
+            in = pipe;
+        } else {
+            in = source;
+        }
+        IonReader reader = boundedReaderFor(in, maximumBufferSize, maximumBufferSize, byteAndOversizedValueCountingHandler);
+        assertEquals(withSymbolTable ? IonType.SYMBOL : IonType.STRING, ionReaderNext(reader, pipe, source));
+        assertEquals(0, oversizedCounter.get());
+        assertEquals(firstValue, reader.stringValue());
+        if (withThirdValue) {
+            assertEquals(IonType.STRING, ionReaderNext(reader, pipe, source));
+            assertEquals(thirdValue, reader.stringValue());
+        }
+        assertNull(ionReaderNext(reader, pipe, source));
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+        totalBytesInStream = out.size();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void oversizedSecondValueWithoutSymbolTable() throws Exception {
+        oversizedSecondValue(false, false, false);
+        oversizedSecondValue(false, true, false);
+    }
+
+    @Test
+    public void oversizedSecondValueWithoutSymbolTableIncremental() throws Exception {
+        oversizedSecondValue(false, false, true);
+        oversizedSecondValue(false, true, true);
+    }
+
+    @Test
+    public void oversizedSecondValueWithSymbolTable() throws Exception {
+        oversizedSecondValue(true, false, false);
+        oversizedSecondValue(true, true, false);
+    }
+
+    @Test
+    public void oversizedSecondValueWithSymbolTableIncremental() throws Exception {
+        oversizedSecondValue(true, false, true);
+        oversizedSecondValue(true, true, true);
+    }
+
+    private void oversizeSymbolTableDetectedInHeader(int maximumBufferSize) throws Exception {
+        byte[] bytes = bytes(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xEE, 0x00, 0x00, 0x00, 0x00, 0x86, // Annotation wrapper length 5 (overpadded)
+            0x81, // Annotation wrapper with 3 bytes of annotations
+            0x83, // SID 3 ($ion_symbol_table)
+            0xDE, 0x82, 0x84, 0x20, // Struct with overpadded length
+            0x81, 'a' // String "a"
+        );
+        oversizedCounter.set(0);
+        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), maximumBufferSize, maximumBufferSize, byteAndOversizedSymbolTableCountingHandler);
+        assertNull(reader.next());
+        assertEquals(1, oversizedCounter.get());
+        reader.close();
+    }
+
+    @Test
+    public void oversizeSymbolTableDetectedInHeader() throws Exception {
+        // The symbol table is determined to be oversized when reading the length of the annotation wrapper.
+        oversizeSymbolTableDetectedInHeader(5);
+        // The symbol table is determined to be oversized when reading the annotations length.
+        oversizeSymbolTableDetectedInHeader(6);
+        // The symbol table is determined to be oversized when reading SID 3.
+        oversizeSymbolTableDetectedInHeader(7);
+        // The symbol table is determined to be oversized when reading the type ID of the wrapped struct.
+        oversizeSymbolTableDetectedInHeader(8);
+        // The symbol table is determined to be oversized when reading the length of the wrapped struct.
+        oversizeSymbolTableDetectedInHeader(9);
+    }
+
+    private void oversizeSymbolTableDetectedInHeaderIncremental(int maximumBufferSize) throws Exception {
+        byte[] bytes = bytes(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xEE, 0x00, 0x00, 0x00, 0x00, 0x86, // Annotation wrapper length 5 (overpadded)
+            0x81, // Annotation wrapper with 3 bytes of annotations
+            0x83, // SID 3 ($ion_symbol_table)
+            0xDE, 0x82, 0x84, 0x20, // Struct with overpadded length
+            0x81, 'a' // String "a"
+        );
+        oversizedCounter.set(0);
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
+        IonReader reader = boundedReaderFor(pipe, maximumBufferSize, maximumBufferSize, byteAndOversizedSymbolTableCountingHandler);
+        feedBytesOneByOne(bytes, pipe, reader);
+        assertNull(reader.next());
+        assertEquals(1, oversizedCounter.get());
+        reader.close();
+    }
+
+    @Test
+    public void oversizeSymbolTableDetectedInHeaderIncremental() throws Exception {
+        // The symbol table is determined to be oversized when reading the length of the annotation wrapper.
+        oversizeSymbolTableDetectedInHeaderIncremental(5);
+        // The symbol table is determined to be oversized when reading the annotations length.
+        oversizeSymbolTableDetectedInHeaderIncremental(6);
+        // The symbol table is determined to be oversized when reading SID 3.
+        oversizeSymbolTableDetectedInHeaderIncremental(7);
+        // The symbol table is determined to be oversized when reading the type ID of the wrapped struct.
+        oversizeSymbolTableDetectedInHeaderIncremental(8);
+        // The symbol table is determined to be oversized when reading the length of the wrapped struct.
+        oversizeSymbolTableDetectedInHeaderIncremental(9);
+    }
+
+    @Test
+    public void oversizeSymbolTableDetectedInTheMiddle() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = writerBuilder.build(out);
+        writer.writeString("12345678");
+        writer.finish();
+        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+        writer.close();
+        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
+        // for symbol 10.
+        IonReader reader = boundedReaderFor(new ByteArrayInputStream(out.toByteArray()), 8, 25, byteAndOversizedSymbolTableCountingHandler);
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("12345678", reader.stringValue());
+        assertNull(reader.next());
+        assertEquals(1, oversizedCounter.get());
+        reader.close();
+    }
+
+    @Test
+    public void oversizeSymbolTableDetectedInTheMiddleIncremental() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = writerBuilder.build(out);
+        writer.writeString("12345678");
+        writer.finish();
+        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
+        writer.close();
+        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
+        // for symbol 10.
+
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(out.size());
+        byte[] bytes = out.toByteArray();
+        IonReader reader = boundedReaderFor(pipe, 8, 25, byteAndOversizedSymbolTableCountingHandler);
+        boolean foundValue = false;
+        for (byte b : bytes) {
+            IonType type = reader.next();
+            if (type != null) {
+                assertFalse(foundValue);
+                assertEquals(IonType.STRING, type);
+                assertEquals("12345678", reader.stringValue());
+                foundValue = true;
+            }
+            pipe.receive(b);
+        }
+        assertTrue(foundValue);
+        assertNull(reader.next());
+        assertEquals(1, oversizedCounter.get());
+        reader.close();
+    }
+
+    @Test
+    public void skipOversizeScalarBelowTopLevelNonIncremental() throws Exception {
+        byte[] bytes = toBinary("[\"abcdefg\", 123]");
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertEquals(0, oversizedCounter.get());
+        // This value is oversized, but since it is not filled, `onOversizedValue` does not need to be called.
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals(0, oversizedCounter.get());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, oversizedCounter.get());
+        assertEquals(123, reader.intValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(0, oversizedCounter.get());
+        totalBytesInStream = bytes.length;
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void fillOversizeScalarBelowTopLevelNonIncremental() throws Exception {
+        byte[] bytes = toBinary("[\"abcdefg\", 123]");
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertEquals(0, oversizedCounter.get());
+        assertEquals(IonType.STRING, reader.next());
+        // This value is oversized. Since the user attempts to consume it, `onOversizedValue` is called. An
+        // OversizedValueException is called because the user attempted to force parsing of an oversized scalar
+        // via an IonReader method that has no other way of conveying the failure.
+        try {
+            assertNull(reader.stringValue());
+            fail("Expected oversized value.");
+        } catch (OversizedValueException e) {
+            // Continue
+        }
+        assertEquals(1, oversizedCounter.get());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, oversizedCounter.get());
+        assertEquals(123, reader.intValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+        totalBytesInStream = bytes.length;
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void oversizedValueBelowTopLevelDetectedInHeaderNonIncremental() throws Exception {
+        byte[] bytes = bytes(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xC7, // s-exp length 7
+            0xBE, 0x00, 0x00, 0x00, 0x00, 0x81, // List length 1 (overpadded)
+            0x20, // int 0
+            0x81, 'a' // String "a"
+        );
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+        assertEquals(IonType.SEXP, reader.next());
+        reader.stepIn();
+        assertEquals(0, oversizedCounter.get());
+        assertNull(reader.next());
+        assertEquals(1, oversizedCounter.get());
+        reader.stepOut();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("a", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+        totalBytesInStream = bytes.length;
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void oversizedAnnotatedValueBelowTopLevelDetectedInHeaderNonIncremental() throws Exception {
+        byte[] bytes = bytes(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xC8, // s-exp length 8
+            0xE7, // Annotation wrapper length 7
+            0x84, // 4 byte annotation SID sequence
+            0x00, 0x00, 0x00, 0x84, // Annotation SID 4 (overpadded)
+            0xB1, // List length 1
+            0x20, // int 0
+            0x81, 'a' // String "a"
+        );
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+        assertEquals(IonType.SEXP, reader.next());
+        reader.stepIn();
+        assertEquals(0, oversizedCounter.get());
+        assertNull(reader.next());
+        assertEquals(1, oversizedCounter.get());
+        reader.stepOut();
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("a", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+        totalBytesInStream = bytes.length;
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void deeplyNestedValueNotOversizedDueToContainerHeaderLengthsNonIncremental() throws Exception {
+        // The string value requires 5 bytes, the maximum buffer size. The value should not be considered oversized
+        // even though it is contained within containers whose headers cannot fit in the buffer.
+        byte[] bytes = bytes(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0x82, '1', '2', // String "12"
+            0xC7, // s-exp length 7
+            0xC6, // s-exp length 6
+            0xC5, // s-exp length 5
+            0x84, '1', '2', '3', '4', // String "1234"
+            0x20 // int 0
+        );
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("12", reader.stringValue());
+        assertEquals(IonType.SEXP, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SEXP, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SEXP, reader.next());
+        reader.stepIn();
+        assertEquals(0, oversizedCounter.get());
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals(0, oversizedCounter.get());
+        assertEquals("1234", reader.stringValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        reader.stepOut();
+        reader.stepOut();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+        assertEquals(0, oversizedCounter.get());
+        totalBytesInStream = bytes.length;
+        assertBytesConsumed();
+    }
+
+    private static void writeFirstStruct(IonWriter writer) throws IOException {
+        //{
+        //    foo: bar,
+        //    abc: [123, 456]
+        //}
+        writer.stepIn(IonType.STRUCT);
+        writer.setFieldName("foo");
+        writer.writeSymbol("bar");
+        writer.setFieldName("abc");
+        writer.stepIn(IonType.LIST);
+        writer.writeInt(123);
+        writer.writeInt(456);
+        writer.stepOut();
+        writer.stepOut();
+    }
+
+    private static void assertFirstStruct(IonReader reader) {
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals("bar", reader.stringValue());
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals("abc", reader.getFieldName());
+        reader.stepIn();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(123, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(456, reader.intValue());
+        reader.stepOut();
+        reader.stepOut();
+    }
+
+    private static void writeSecondStruct(IonWriter writer) throws IOException {
+        //{
+        //    foo: baz,
+        //    abc: [42.0, 43e0]
+        //}
+        writer.stepIn(IonType.STRUCT);
+        writer.setFieldName("foo");
+        writer.writeSymbol("baz");
+        writer.setFieldName("abc");
+        writer.stepIn(IonType.LIST);
+        writer.writeDecimal(new BigDecimal("42.0"));
+        writer.writeFloat(43.);
+        writer.stepOut();
+        writer.stepOut();
+    }
+
+    private static void assertSecondStruct(IonReader reader) {
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("foo", reader.getFieldName());
+        assertEquals("baz", reader.stringValue());
+        assertEquals(IonType.LIST, reader.next());
+        assertEquals("abc", reader.getFieldName());
+        reader.stepIn();
+        assertEquals(IonType.DECIMAL, reader.next());
+        assertEquals(new BigDecimal("42.0"), reader.decimalValue());
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(43., reader.doubleValue(), 1e-9);
+        reader.stepOut();
+        reader.stepOut();
+        assertNull(reader.next());
+    }
+
+    @Test
+    public void flushBetweenStructs() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = _Private_IonManagedBinaryWriterBuilder
+            .create(_Private_IonManagedBinaryWriterBuilder.AllocatorMode.BASIC)
+                .withLocalSymbolTableAppendEnabled()
+                .newWriter(out);
+        writeFirstStruct(writer);
+        writer.flush();
+        writeSecondStruct(writer);
+        writer.close();
+
+        IonReader reader = boundedReaderFor(out.toByteArray(), 64, 64, byteCountingHandler);
+        assertFirstStruct(reader);
+        assertSecondStruct(reader);
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void structsWithFloat32AndPreallocatedLength() throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = _Private_IonManagedBinaryWriterBuilder
+            .create(_Private_IonManagedBinaryWriterBuilder.AllocatorMode.BASIC)
+                .withPaddedLengthPreallocation(2)
+                .withFloatBinary32Enabled()
+                .newWriter(out);
+        writeFirstStruct(writer);
+        writeSecondStruct(writer);
+        writer.close();
+
+        IonReader reader = boundedReaderFor(out.toByteArray(), 64, 64, byteCountingHandler);
+        assertFirstStruct(reader);
+        assertSecondStruct(reader);
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void nopPadThatFillsBufferFollowedByValueNotOversized() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            0x03, 0x00, 0x00, 0x00, // 4 byte NOP pad.
+            0x20 // Int 0.
+        );
+        // The IVM is 4 bytes and the NOP pad is 4 bytes. The first value is the 9th byte and should not be considered
+        // oversize because the NOP pad can be discarded.
+        IonReader reader = boundedReaderFor(out.toByteArray(), 8, 8, byteCountingHandler);
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(0, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void nopPadFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            0x03, 0x00, 0x00, 0x00, // 4 byte NOP pad.
+            0x21, 0x01 // Int 1.
+        );
+        // The IVM is 4 bytes and the NOP pad is 4 bytes. The first byte of the value is the 9th byte and fits in the
+        // buffer. Even though there is a 10th byte, the value should not be considered oversize because the NOP pad
+        // can be discarded.
+        IonReader reader = boundedReaderFor(out.toByteArray(), 9, 9, byteCountingHandler);
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void symbolTableFollowedByNopPadFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            0x00, // 1-byte NOP pad.
+            0x71, 0x0A // SID 10 (hello).
+        );
+        // The IVM is 4 bytes, the symbol table is 12 bytes, and the symbol value is 2 bytes (total 18). The 1-byte NOP
+        // pad needs to be reclaimed to make space for the value. Once that is done, the value will fit.
+        IonReader reader = boundedReaderFor(out.toByteArray(), 18, 18, byteCountingHandler);
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("hello", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void multipleNopPadsFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // One byte no-op pad.
+            0x00,
+            // Two byte no-op pad.
+            0x01, 0xFF,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // Int 1
+            0x21, 0x01,
+            // IVM 1.0
+            0xE0, 0x01, 0x00, 0xEA,
+            // The following no-op pads exceed the maximum buffer size, but should not cause an error to be raised.
+            // 16-byte no-op pad.
+            0x0E, 0x8E,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // Int 2.
+            0x21, 0x02,
+            // 16-byte no-op pad.
+            0x0E, 0x8E,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+        );
+
+        IonReader reader = boundedReaderFor(out.toByteArray(), 11, 11, byteCountingHandler);
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(2, reader.intValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // One byte no-op pad.
+            0x00,
+            // Two byte no-op pad.
+            0x01, 0xFF,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // IVM 1.0
+            0xE0, 0x01, 0x00, 0xEA,
+            // 15-byte no-op pad.
+            0x0E, 0x8D,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // Symbol 10 (hello)
+            0x71, 0x0A
+        );
+
+        // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
+        IonReader reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("hello", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors2() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // One byte no-op pad.
+            0x00,
+            // Two byte no-op pad.
+            0x01, 0xFF,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // IVM 1.0
+            0xE0, 0x01, 0x00, 0xEA,
+            // 16-byte no-op pad.
+            0x0E, 0x8E,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // Symbol 10 (hello)
+            0x71, 0x0A
+        );
+
+        // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
+        IonReader reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("hello", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors3() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // One byte no-op pad.
+            0x00,
+            // Two byte no-op pad.
+            0x01, 0xFF,
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // IVM 1.0
+            0xE0, 0x01, 0x00, 0xEA,
+            // 14-byte no-op pad.
+            0x0E, 0x8C,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            // Three byte no-op pad.
+            0x02, 0x99, 0x42,
+            // Symbol 10 (hello)
+            0x71, 0x0A
+        );
+
+        // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
+        IonReader reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("hello", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void nopPadSurroundingSymbolTableThatFitsInBuffer() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            // 14-byte no-op pad.
+            0x0E, 0x8C,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // Symbol table with the symbol 'hello'.
+            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
+            // 14-byte no-op pad.
+            0x0E, 0x8C,
+            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+            // String abcdefg
+            0x87, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
+            // Symbol 10 (hello)
+            0x71, 0x0A
+        );
+
+        // Set the maximum size at IVM (4 bytes) + 14-byte NOP pad + the symbol table (12 bytes) + 2 value bytes.
+        IonReader reader = boundedReaderFor(out.toByteArray(), 32, 32, byteCountingHandler);
+        assertEquals(IonType.STRING, reader.next());
+        assertEquals("abcdefg", reader.stringValue());
+        assertEquals(IonType.SYMBOL, reader.next());
+        assertEquals("hello", reader.stringValue());
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
+    @Test
+    public void nopPadInStructNonIncremental() throws Exception {
+        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
+            0xD6, // Struct length 6
+            0x80, // Field name SID 0
+            0x04, 0x00, 0x00, 0x00, 0x00 // 5-byte NOP pad.
+        );
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        IonReader reader = boundedReaderFor(out.toByteArray(), 5, Integer.MAX_VALUE, byteCountingHandler);
+        assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        assertNull(reader.next());
+        reader.stepOut();
+        assertNull(reader.next());
+        reader.close();
+        assertBytesConsumed();
+    }
+
     /**
      * Compares an iterator to the given list.
      * @param expected the list containing the elements to compare to.
@@ -1849,6 +2881,25 @@ public void annotationIteratorReuse() throws Exception {
         assertBytesConsumed();
     }
 
+    @Test(expected = IonException.class)
+    public void failsOnMalformedSymbolTable() throws Exception {
+        byte[] data = bytes(
+            0xE0, 0x01, 0x00, 0xEA, // Binary IVM
+            0xE6, // 6-byte annotation wrapper
+            0x81, // 1 byte of annotation SIDs
+            0x83, // SID 3 ($ion_symbol_table)
+            0xD3, // 3-byte struct
+            0x84, // Field name SID 4 (name)
+            0xE7, // 7-byte annotation wrapper (error: there should only be two bytes remaining).
+            0x81, // Junk byte to fill the 6 bytes of the annotation wrapper and 3 bytes of the struct.
+            0x20  // Next top-level value (int 0).
+        );
+        IonReader reader = boundedReaderFor(data, 1024, 1024, byteCountingHandler);
+        assertNull(reader.next());
+        assertNull(reader.next());
+        reader.close();
+    }
+
     @Test
     public void multiByteSymbolTokens() throws Exception {
         IonReader reader = readerFor((writer, out) -> {

From 3f07ac5661cdc9f6fbb35fc3c14f8ad4db2d1da7 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 30 Jun 2023 14:03:17 -0700
Subject: [PATCH 270/490] Adds binary reader facets to
 IonReaderContinuableTopLevelBinary.

---
 .../IonReaderContinuableTopLevelBinary.java   | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index ea62450785..ea130068a1 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -10,7 +10,12 @@
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonCursor;
 import com.amazon.ion.IonType;
+import com.amazon.ion.OffsetSpan;
 import com.amazon.ion.OversizedValueException;
+import com.amazon.ion.RawValueSpanProvider;
+import com.amazon.ion.SeekableReader;
+import com.amazon.ion.Span;
+import com.amazon.ion.SpanProvider;
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.Timestamp;
@@ -318,8 +323,117 @@ public int getBytes(byte[] buffer, int offset, int len) {
         return super.getBytes(buffer, offset, len);
     }
 
+    private static class IonReaderBinarySpan extends DowncastingFaceted implements Span, OffsetSpan {
+        final long bufferOffset;
+        final long bufferLimit;
+        final long totalOffset;
+        final SymbolTable symbolTable;
+
+        /**
+         * @param bufferOffset the offset of the span's first byte in the cursor's internal buffer.
+         * @param bufferLimit the offset after the span's last byte in the cursor's internal buffer.
+         * @param totalOffset the total stream offset of the span's first byte. This can differ from 'bufferOffset' if
+         *                    the cursor's internal buffer is refillable, such as when it consumes data from an input
+         *                    stream.
+         * @param symbolTable the symbol table active where the span occurs.
+         */
+        IonReaderBinarySpan(long bufferOffset, long bufferLimit, long totalOffset, SymbolTable symbolTable) {
+            this.bufferOffset = bufferOffset;
+            this.bufferLimit = bufferLimit;
+            this.totalOffset = totalOffset;
+            this.symbolTable = symbolTable;
+        }
+
+        @Override
+        public long getStartOffset() {
+            return totalOffset;
+        }
+
+        @Override
+        public long getFinishOffset() {
+            return totalOffset + (bufferLimit - bufferOffset);
+        }
+
+    }
+
+    private class SpanProviderFacet implements SpanProvider {
+
+        @Override
+        public Span currentSpan() {
+            if (type == null) {
+                throw new IllegalStateException("IonReader isn't positioned on a value");
+            }
+            return new IonReaderBinarySpan(
+                valuePreHeaderIndex,
+                valueMarker.endIndex,
+                getTotalOffset(),
+                getSymbolTable()
+            );
+        }
+    }
+
+    private class RawValueSpanProviderFacet implements RawValueSpanProvider {
+
+        @Override
+        public Span valueSpan() {
+            if (type == null) {
+                throw new IllegalStateException("IonReader isn't positioned on a value");
+            }
+            return new IonReaderBinarySpan(
+                valueMarker.startIndex,
+                valueMarker.endIndex,
+                valueMarker.startIndex,
+                null
+            );
+        }
+
+        @Override
+        public byte[] buffer() {
+            return buffer;
+        }
+    }
+
+    private class SeekableReaderFacet extends SpanProviderFacet implements SeekableReader {
+
+        @Override
+        public void hoist(Span span) {
+            if (! (span instanceof IonReaderBinarySpan)) {
+                throw new IllegalArgumentException("Span isn't compatible with this reader.");
+            }
+            IonReaderBinarySpan binarySpan = (IonReaderBinarySpan) span;
+            if (binarySpan.symbolTable == null) {
+                throw new IllegalArgumentException("Span is not seekable.");
+            }
+            // Note: setting the limit at the end of the hoisted value causes the reader to consider the end
+            // of the value to be the end of the stream, in order to comply with the SeekableReader contract. From
+            // an implementation perspective, this is not necessary; if we leave the buffer's limit unchanged, the
+            // reader can continue after processing the hoisted value.
+            slice(binarySpan.bufferOffset, binarySpan.bufferLimit);
+            restoreSymbolTable(binarySpan.symbolTable);
+            type = null;
+        }
+    }
+
     @Override
     public <T> T asFacet(Class<T> facetType) {
+        if (facetType == SpanProvider.class) {
+            return facetType.cast(new SpanProviderFacet());
+        }
+        // Note: because IonCursorBinary has an internal buffer that can grow, it is possible to relax the restriction
+        // that readers must have been constructed with a byte array in order to be seekable or provide raw value spans.
+        // However, it requires some considerations that do not fit well with the existing interfaces. Most importantly,
+        // because the cursor's internal buffer is a byte array, its size is limited to 2GB. Pinning all bytes after the
+        // first span is requested could lead to buffer overflow for large streams, so there would need to be a way for
+        // a user to release a span and allow the reader to reclaim its bytes. This functionality is not included in the
+        // existing Span interfaces. See: amzn/ion-java/issues/17
+        if (isByteBacked()) {
+            if (facetType == SeekableReader.class) {
+                return facetType.cast(new SeekableReaderFacet());
+            }
+            if (facetType == RawValueSpanProvider.class) {
+                return facetType.cast(new RawValueSpanProviderFacet());
+            }
+        }
         return null;
     }
 

From 9b9003df917baf28db3909fe1e5030328bff6857 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 30 Jun 2023 15:37:11 -0700
Subject: [PATCH 271/490] Adds a system-level IonReader wrapper over the
 continuable reader.

---
 .../impl/IonReaderNonContinuableSystem.java   | 352 ++++++++++++++++++
 1 file changed, 352 insertions(+)
 create mode 100644 src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java

diff --git a/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java b/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java
new file mode 100644
index 0000000000..8c11f7bbbd
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java
@@ -0,0 +1,352 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IntegerSize;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonCursor;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.UnknownSymbolException;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayDeque;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Queue;
+
+import static com.amazon.ion.IonCursor.Event.NEEDS_DATA;
+
+/**
+ * Provides a system-level view of an Ion stream. This differs from the application-level view in that system values
+ * (IVMs and symbol tables) are surfaced as if they were user values and symbols are not mapped, except for symbols
+ * that occur within the system symbol table. Because this is primarily intended to be used for debugging and is not
+ * exposed via public interfaces, it is not currently considered performance-critical, and no continuable equivalent
+ * is provided.
+ */
+class IonReaderNonContinuableSystem implements IonReader {
+
+    protected final IonReaderContinuableCore reader;
+    private IonType type = null;
+    private IonType typeAfterIvm = null;
+    private final Queue<Integer> pendingIvmSids = new ArrayDeque<>(1);
+    private int pendingIvmSid = -1;
+
+    /**
+     * Constructs a new non-continuable system-level reader over the given continuable reader.
+     * @param reader the reader to wrap.
+     */
+    IonReaderNonContinuableSystem(IonReaderContinuableCore reader) {
+        this.reader = reader;
+        reader.registerIvmNotificationConsumer((x, y) -> {
+            pendingIvmSids.add(SystemSymbols.ION_1_0_SID); // TODO generalize for Ion 1.1
+        });
+    }
+
+    @Override
+    public boolean hasNext() {
+        throw new UnsupportedOperationException("Not implemented -- use `next() != null`");
+    }
+
+    /**
+     * Consumes an IVM that was encountered before the next value, presenting the IVM as a symbol value. If an IVM
+     * was emitted on the last invocation, restores the next value to be presented to the user.
+     * @return true if a value is ready to be presented to the user; otherwise, false.
+     */
+    private boolean handleIvm() {
+        Integer ivmSid = pendingIvmSids.poll();
+        if (ivmSid != null) {
+            // An IVM has been found between values.
+            if (typeAfterIvm == null) {
+                // Only save the type of the next user value the first time an IVM is encountered before that value.
+                typeAfterIvm = type;
+            }
+            // For consistency with the legacy implementation, the system reader surfaces IVMs as symbol values.
+            type = IonType.SYMBOL;
+            pendingIvmSid = ivmSid;
+            return true;
+        } else if (pendingIvmSid != -1) {
+            // All preceding IVMs have been surfaced. Restore the value that follows.
+            pendingIvmSid = -1;
+            type = typeAfterIvm;
+            typeAfterIvm = null;
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public IonType next() {
+        if (handleIvm()) {
+            // This happens if there were multiple IVMs between top-level values. They will be drained from the queue
+            // one-by-one on each call to next().
+            return type;
+        }
+        if (reader.nextValue() == NEEDS_DATA) {
+            if (handleIvm()) {
+                // This happens if one or more IVMs occurs before the end of the stream.
+                return type;
+            }
+            reader.endStream();
+            type = null;
+        } else {
+            type = reader.getType();
+            handleIvm(); // Handles the case where one or more IVMs occurred before the value.
+        }
+        return type;
+    }
+
+    @Override
+    public void stepIn() {
+        reader.stepIntoContainer();
+        type = null;
+    }
+
+    @Override
+    public void stepOut() {
+        reader.stepOutOfContainer();
+        type = null;
+    }
+
+    @Override
+    public int getDepth() {
+        return reader.getDepth();
+    }
+
+    @Override
+    public IonType getType() {
+        return type;
+    }
+
+    /**
+     * Prepares a scalar value to be parsed by ensuring it is present in the buffer.
+     */
+    protected void prepareScalar() {
+        IonCursor.Event event = reader.getCurrentEvent();
+        if (event == IonCursor.Event.VALUE_READY) {
+            return;
+        }
+        if (event != IonCursor.Event.START_SCALAR) {
+            // Note: existing tests expect IllegalStateException in this case.
+            throw new IllegalStateException("Reader is not positioned on a scalar value.");
+        }
+        if (reader.fillValue() != IonCursor.Event.VALUE_READY) {
+            throw new IonException("Unexpected EOF.");
+        }
+    }
+
+    @Override
+    public IntegerSize getIntegerSize() {
+        if (getType() != IonType.INT) {
+            return null;
+        }
+        prepareScalar();
+        return reader.getIntegerSize();
+    }
+
+    @Override
+    public boolean isNullValue() {
+        return pendingIvmSid == -1 && reader.isNullValue();
+    }
+
+    @Override
+    public boolean isInStruct() {
+        return reader.isInStruct();
+    }
+
+    @Override
+    public boolean booleanValue() {
+        prepareScalar();
+        return reader.booleanValue();
+    }
+
+    @Override
+    public int intValue() {
+        prepareScalar();
+        return reader.intValue();
+    }
+
+    @Override
+    public long longValue() {
+        prepareScalar();
+        return reader.longValue();
+    }
+
+    @Override
+    public BigInteger bigIntegerValue() {
+        prepareScalar();
+        return reader.bigIntegerValue();
+    }
+
+    @Override
+    public double doubleValue() {
+        prepareScalar();
+        return reader.doubleValue();
+    }
+
+    @Override
+    public BigDecimal bigDecimalValue() {
+        prepareScalar();
+        return reader.bigDecimalValue();
+    }
+
+    @Override
+    public Decimal decimalValue() {
+        prepareScalar();
+        return reader.decimalValue();
+    }
+
+    @Override
+    public Date dateValue() {
+        prepareScalar();
+        return reader.dateValue();
+    }
+
+    @Override
+    public Timestamp timestampValue() {
+        prepareScalar();
+        return reader.timestampValue();
+    }
+
+    @Override
+    public String stringValue() {
+        if (pendingIvmSid != -1) {
+            return getSymbolTable().findKnownSymbol(pendingIvmSid);
+        }
+        prepareScalar();
+        String value;
+        if (type == IonType.SYMBOL) {
+            int sid = reader.symbolValueId();
+            value = getSymbolTable().findKnownSymbol(sid);
+            if (value == null) {
+                throw new UnknownSymbolException(sid);
+            }
+        } else {
+            value = reader.stringValue();
+        }
+        return value;
+    }
+
+    @Override
+    public int byteSize() {
+        prepareScalar();
+        return reader.byteSize();
+    }
+
+    @Override
+    public byte[] newBytes() {
+        prepareScalar();
+        return reader.newBytes();
+    }
+
+    @Override
+    public int getBytes(byte[] buffer, int offset, int len) {
+        prepareScalar();
+        return reader.getBytes(buffer, offset, len);
+    }
+
+    @Override
+    public <T> T asFacet(Class<T> facetType) {
+        return null; // The system-level reader has no facets.
+    }
+
+    @Override
+    public SymbolTable getSymbolTable() {
+        // TODO generalize for Ion 1.1
+        return SharedSymbolTable.getSystemSymbolTable(reader.getIonMajorVersion());
+    }
+
+    @Override
+    public String[] getTypeAnnotations() {
+        if (pendingIvmSid != -1 || !reader.hasAnnotations()) {
+            return _Private_Utils.EMPTY_STRING_ARRAY;
+        }
+        int[] annotationIds = reader.getAnnotationIds();
+        String[] annotations = new String[annotationIds.length];
+        SymbolTable symbolTable = getSymbolTable();
+        for (int i = 0; i < annotationIds.length; i++) {
+            int sid = annotationIds[i];
+            String annotation = symbolTable.findKnownSymbol(sid);
+            if (annotation == null) {
+                throw new UnknownSymbolException(sid);
+            }
+            annotations[i] = annotation;
+        }
+        return annotations;
+    }
+
+    @Override
+    public SymbolToken[] getTypeAnnotationSymbols() {
+        if (pendingIvmSid != -1 || !reader.hasAnnotations()) {
+            return SymbolToken.EMPTY_ARRAY;
+        }
+        int[] annotationIds = reader.getAnnotationIds();
+        SymbolToken[] annotationSymbolTokens = new SymbolToken[annotationIds.length];
+        SymbolTable symbolTable = getSymbolTable();
+        for (int i = 0; i < annotationIds.length; i++) {
+            int sid = annotationIds[i];
+            annotationSymbolTokens[i] = new SymbolTokenWithImportLocation(symbolTable.findKnownSymbol(sid), sid, null);
+        }
+        return annotationSymbolTokens;
+    }
+
+    @Override
+    public Iterator<String> iterateTypeAnnotations() {
+        if (pendingIvmSid != -1 || !reader.hasAnnotations()) {
+            return _Private_Utils.emptyIterator();
+        }
+        return _Private_Utils.stringIterator(getTypeAnnotations());
+    }
+
+    @Override
+    public int getFieldId() {
+        return reader.getFieldId();
+    }
+
+    @Override
+    public String getFieldName() {
+        int sid = reader.getFieldId();
+        if (sid < 0) {
+            return null;
+        }
+        String name = getSymbolTable().findKnownSymbol(sid);
+        if (name == null) {
+            throw new UnknownSymbolException(sid);
+        }
+        return name;
+    }
+
+    @Override
+    public SymbolToken getFieldNameSymbol() {
+        int sid = reader.getFieldId();
+        if (sid < 0) {
+            return null;
+        }
+        return new SymbolTokenWithImportLocation(getSymbolTable().findKnownSymbol(sid), sid, null);
+    }
+
+    @Override
+    public SymbolToken symbolValue() {
+        int sid;
+        if (pendingIvmSid != -1) {
+            sid = pendingIvmSid;
+        } else {
+            prepareScalar();
+            sid = reader.symbolValueId();
+        }
+        return new SymbolTokenWithImportLocation(getSymbolTable().findKnownSymbol(sid), sid, null);
+    }
+
+    @Override
+    public void close() throws IOException {
+        reader.close();
+    }
+}

From e92af6a8c90fe6e942837215dba929aec4fb07ca Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 30 Jun 2023 16:43:03 -0700
Subject: [PATCH 272/490] Plumbs the new continuable binary reader through the
 IonReaderBuilder and all IonReader tests.

---
 src/com/amazon/ion/IonCursor.java             |   3 +
 src/com/amazon/ion/Timestamp.java             |  44 ++-
 .../impl/IonReaderContinuableApplication.java |   3 +
 .../ion/impl/IonReaderContinuableCore.java    |   3 +
 .../ion/impl/_Private_IonReaderBuilder.java   | 184 ++++++++----
 .../ion/impl/_Private_IonReaderFactory.java   | 270 ++++++------------
 .../amazon/ion/impl/lite/IonLoaderLite.java   |  21 +-
 .../amazon/ion/impl/lite/IonSystemLite.java   |  11 +-
 ...ByteArrayIteratorSystemProcessingTest.java |   2 +-
 ...IonReaderIteratorSystemProcessingTest.java |   2 +-
 .../ion/BinaryReaderSystemProcessingTest.java | 163 +++++++++++
 ...aryStreamIteratorSystemProcessingTest.java |   2 +-
 ...atagramTreeReaderSystemProcessingTest.java |   6 +-
 test/com/amazon/ion/IonSystemTest.java        |  10 -
 .../LoadBinaryBytesSystemProcessingTest.java  |   2 +-
 ...adBinaryIonReaderSystemProcessingTest.java |   2 +-
 .../LoadBinaryStreamSystemProcessingTest.java |   2 +-
 .../ion/RawValueSpanReaderBasicTest.java      |   8 -
 test/com/amazon/ion/ReaderMaker.java          |  29 --
 test/com/amazon/ion/TestUtils.java            |   2 +
 test/com/amazon/ion/TimestampTest.java        |  28 +-
 ...va => IonReaderBinaryLargeStreamTest.java} |  73 +++--
 .../ion/impl/RawValueSpanReaderTest.java      |  23 +-
 .../streaming/OffsetSpanBinaryReaderTest.java |  10 -
 .../ion/streaming/OffsetSpanReaderTest.java   |  10 -
 .../ion/streaming/ReaderFacetTestCase.java    |  17 +-
 .../ion/streaming/SeekableReaderTest.java     | 106 ++++---
 .../amazon/ion/streaming/SpanReaderTest.java  |  60 ----
 .../ion/system/IonReaderBuilderTest.java      |  22 +-
 29 files changed, 615 insertions(+), 503 deletions(-)
 rename test/com/amazon/ion/impl/{IonReaderBinaryRawLargeStreamTest.java => IonReaderBinaryLargeStreamTest.java} (88%)

diff --git a/src/com/amazon/ion/IonCursor.java b/src/com/amazon/ion/IonCursor.java
index ae3180ad4e..c0f0a02eae 100644
--- a/src/com/amazon/ion/IonCursor.java
+++ b/src/com/amazon/ion/IonCursor.java
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion;
 
 import java.io.Closeable;
diff --git a/src/com/amazon/ion/Timestamp.java b/src/com/amazon/ion/Timestamp.java
index 6c8955a8a5..3ecb91baa3 100644
--- a/src/com/amazon/ion/Timestamp.java
+++ b/src/com/amazon/ion/Timestamp.java
@@ -76,6 +76,8 @@ public final class Timestamp
 {
     private static final boolean APPLY_OFFSET_YES = true;
     private static final boolean APPLY_OFFSET_NO = false;
+    private static final boolean CHECK_FRACTION_YES = true;
+    private static final boolean CHECK_FRACTION_NO = false;
 
     private static final int NO_MONTH = 0;
     private static final int NO_DAY = 0;
@@ -444,7 +446,7 @@ private void set_fields_from_calendar(Calendar cal,
      */
     private Timestamp(int zyear)
     {
-        this(Precision.YEAR, zyear, NO_MONTH, NO_DAY, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO);
+        this(Precision.YEAR, zyear, NO_MONTH, NO_DAY, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO, CHECK_FRACTION_NO);
     }
 
     /**
@@ -454,7 +456,7 @@ private Timestamp(int zyear)
      */
     private Timestamp(int zyear, int zmonth)
     {
-        this(Precision.MONTH, zyear, zmonth, NO_DAY, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO);
+        this(Precision.MONTH, zyear, zmonth, NO_DAY, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO, CHECK_FRACTION_NO);
     }
 
     /**
@@ -467,7 +469,7 @@ private Timestamp(int zyear, int zmonth)
     @Deprecated
     public Timestamp(int zyear, int zmonth, int zday)
     {
-        this(Precision.DAY, zyear, zmonth, zday, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO);
+        this(Precision.DAY, zyear, zmonth, zday, NO_HOURS, NO_MINUTES, NO_SECONDS, NO_FRACTIONAL_SECONDS, UNKNOWN_OFFSET, APPLY_OFFSET_NO, CHECK_FRACTION_NO);
     }
 
 
@@ -490,7 +492,7 @@ public Timestamp(int year, int month, int day,
                      int hour, int minute,
                      Integer offset)
     {
-        this(Precision.MINUTE, year, month, day, hour, minute, NO_SECONDS, NO_FRACTIONAL_SECONDS, offset, APPLY_OFFSET_YES);
+        this(Precision.MINUTE, year, month, day, hour, minute, NO_SECONDS, NO_FRACTIONAL_SECONDS, offset, APPLY_OFFSET_YES, CHECK_FRACTION_NO);
     }
 
     /**
@@ -512,7 +514,7 @@ public Timestamp(int year, int month, int day,
                      int hour, int minute, int second,
                      Integer offset)
     {
-        this(Precision.SECOND, year, month, day, hour, minute, second, NO_FRACTIONAL_SECONDS, offset, APPLY_OFFSET_YES);
+        this(Precision.SECOND, year, month, day, hour, minute, second, NO_FRACTIONAL_SECONDS, offset, APPLY_OFFSET_YES, CHECK_FRACTION_NO);
     }
 
     /**
@@ -541,7 +543,7 @@ public Timestamp(int year, int month, int day,
                      int hour, int minute, int second, BigDecimal frac,
                      Integer offset)
     {
-        this(Precision.SECOND, year, month, day, hour, minute, second, frac, offset, APPLY_OFFSET_YES);
+        this(Precision.SECOND, year, month, day, hour, minute, second, frac, offset, APPLY_OFFSET_YES, CHECK_FRACTION_YES);
     }
 
     /**
@@ -564,7 +566,7 @@ public Timestamp(int year, int month, int day,
      */
     private Timestamp(Precision p, int zyear, int zmonth, int zday,
                       int zhour, int zminute, int zsecond, BigDecimal frac,
-                      Integer offset, boolean shouldApplyOffset)
+                      Integer offset, boolean shouldApplyOffset, boolean shouldCheckFraction)
     {
         boolean dayPrecision = false;
 
@@ -573,13 +575,22 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
             throw new IllegalArgumentException("invalid Precision passed to constructor");
         case FRACTION:
         case SECOND:
-            if (frac == null || frac.equals(BigDecimal.ZERO))
+            if (frac == null)
             {
                 _fraction = null;
             }
+            else if (shouldCheckFraction)
+            {
+                if (frac.equals(BigDecimal.ZERO)) {
+                    _fraction = null;
+                } else {
+                    checkFraction(p, frac);
+                    _fraction = frac;
+                }
+            }
             else
             {
-                _fraction = frac.abs();
+                _fraction = frac;
             }
             _second = checkAndCastSecond(zsecond);
         case MINUTE:
@@ -599,7 +610,7 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
             _day    = checkAndCastDay(zday, zyear, zmonth);
         }
 
-        _precision = checkFraction(p, _fraction);
+        _precision = p;
 
         if (shouldApplyOffset && offset != null) {
             apply_offset(offset);
@@ -662,7 +673,7 @@ private Timestamp(Precision p, int zyear, int zmonth, int zday,
     {
         return new Timestamp(p, zyear, zmonth, zday,
                              zhour, zminute, zsecond, frac,
-                             offset, APPLY_OFFSET_NO);
+                             offset, APPLY_OFFSET_NO, CHECK_FRACTION_YES);
     }
 
     /**
@@ -1111,7 +1122,7 @@ else if (timezone_start == '+' || timezone_start == '-')
 
         Timestamp ts =
             new Timestamp(precision, year, month, day,
-                          hour, minute, seconds, fraction, offset, APPLY_OFFSET_YES);
+                          hour, minute, seconds, fraction, offset, APPLY_OFFSET_YES, CHECK_FRACTION_NO);
         return ts;
     }
 
@@ -1198,7 +1209,8 @@ public Timestamp clone()
                              _second,
                              _fraction,
                              _offset,
-                             APPLY_OFFSET_NO);
+                             APPLY_OFFSET_NO,
+                             CHECK_FRACTION_NO);
     }
 
     /**
@@ -1229,7 +1241,8 @@ private Timestamp make_localtime()
                                             _second,
                                             _fraction,
                                             _offset,
-                                            APPLY_OFFSET_NO);
+                                            APPLY_OFFSET_NO,
+                                            CHECK_FRACTION_NO);
         // explicitly apply the local offset to the time field values
         localtime.apply_offset(-offset);
 
@@ -1344,7 +1357,8 @@ public static Timestamp forSecond(int year, int month, int day,
         // Storing them separately is silly.
         int s = second.intValue();
         BigDecimal frac = second.subtract(BigDecimal.valueOf(s));
-        return new Timestamp(Precision.SECOND, year, month, day, hour, minute, s, frac, offset, APPLY_OFFSET_YES);
+        return new Timestamp(Precision.SECOND, year, month, day, hour, minute, s, frac, offset, APPLY_OFFSET_YES,
+                             CHECK_FRACTION_YES);
     }
 
 
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplication.java b/src/com/amazon/ion/impl/IonReaderContinuableApplication.java
index 84b4c0d951..f087733d94 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplication.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplication.java
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonType;
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableCore.java b/src/com/amazon/ion/impl/IonReaderContinuableCore.java
index 35a22108c4..c6866e449f 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableCore.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableCore.java
@@ -1,3 +1,6 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion.impl;
 
 import com.amazon.ion.Decimal;
diff --git a/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java b/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
index 6e4f29263c..436d26ed77 100644
--- a/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
+++ b/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
@@ -1,5 +1,9 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion.impl;
 
+import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonTextReader;
@@ -7,15 +11,16 @@
 import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.util.IonStreamUtils;
 
-import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.io.SequenceInputStream;
+import java.util.zip.GZIPInputStream;
 
 import static com.amazon.ion.impl.LocalSymbolTable.DEFAULT_LST_FACTORY;
-import static com.amazon.ion.impl._Private_IonReaderFactory.makeIncrementalReader;
 import static com.amazon.ion.impl._Private_IonReaderFactory.makeReader;
+import static com.amazon.ion.impl._Private_IonReaderFactory.makeReaderText;
 
 /**
  * {@link IonReaderBuilder} extension for internal use only.
@@ -87,19 +92,53 @@ protected void mutationCheck() {
 
     }
 
+    @FunctionalInterface
+    interface IonReaderFromBytesFactoryText {
+        IonReader makeReader(IonCatalog catalog, byte[] ionData, int offset, int length, _Private_LocalSymbolTableFactory lstFactory);
+    }
+
+    @FunctionalInterface
+    interface IonReaderFromBytesFactoryBinary {
+        IonReader makeReader(_Private_IonReaderBuilder builder, byte[] ionData, int offset, int length);
+    }
+
+    static IonReader buildReader(
+        _Private_IonReaderBuilder builder,
+        byte[] ionData,
+        int offset,
+        int length,
+        IonReaderFromBytesFactoryBinary binary,
+        IonReaderFromBytesFactoryText text
+    ) {
+        if (IonStreamUtils.isGzip(ionData, offset, length)) {
+            try {
+                return buildReader(
+                    builder,
+                    new GZIPInputStream(new ByteArrayInputStream(ionData, offset, length)),
+                    _Private_IonReaderFactory::makeReaderBinary,
+                    _Private_IonReaderFactory::makeReaderText
+                );
+            } catch (IOException e) {
+                throw new IonException(e);
+            }
+        }
+        if (IonStreamUtils.isIonBinary(ionData, offset, length)) {
+            return binary.makeReader(builder, ionData, offset, length);
+        }
+        return text.makeReader(builder.validateCatalog(), ionData, offset, length, builder.lstFactory);
+    }
+
     @Override
     public IonReader build(byte[] ionData, int offset, int length)
     {
-        if (isIncrementalReadingEnabled()) {
-            if (IonStreamUtils.isGzip(ionData, offset, length)) {
-                throw new IllegalArgumentException("Automatic GZIP detection is not supported with incremental" +
-                    "support enabled. Wrap the bytes with a GZIPInputStream and call build(InputStream).");
-            }
-            if (IonStreamUtils.isIonBinary(ionData, offset, length)) {
-                return makeIncrementalReader(this, new ByteArrayInputStream(ionData, offset, length));
-            }
-        }
-        return makeReader(validateCatalog(), ionData, offset, length, lstFactory);
+        return buildReader(
+            this,
+            ionData,
+            offset,
+            length,
+            _Private_IonReaderFactory::makeReaderBinary,
+            _Private_IonReaderFactory::makeReaderText
+        );
     }
 
     /**
@@ -109,54 +148,103 @@ public IonReader build(byte[] ionData, int offset, int length)
      * @return true if the first 'length' bytes in 'buffer' match the first 'length' bytes in the binary IVM.
      */
     private static boolean startsWithIvm(byte[] buffer, int length) {
-        for (int i = 0; i < length; i++) {
-            if (_Private_IonConstants.BINARY_VERSION_MARKER_1_0[i] != buffer[i]) {
-                return false;
-            }
+        if (length >= _Private_IonConstants.BINARY_VERSION_MARKER_SIZE) {
+            return buffer[0] == (byte) 0xE0
+                && buffer[3] == (byte) 0xEA;
+        } else if (length >= 1) {
+            return buffer[0] == (byte) 0xE0;
         }
         return true;
     }
 
-    @Override
-    public IonReader build(InputStream ionData)
-    {
-        InputStream wrapper = ionData;
-        if (isIncrementalReadingEnabled()) {
-            if (!ionData.markSupported()) {
-                wrapper = new BufferedInputStream(ionData);
-            }
-            wrapper.mark(_Private_IonConstants.BINARY_VERSION_MARKER_SIZE);
-            byte[] possibleIVM = new byte[_Private_IonConstants.BINARY_VERSION_MARKER_SIZE];
-            int bytesRead;
+    static final byte[] GZIP_HEADER = {0x1F, (byte) 0x8B};
+
+    private static boolean startsWithGzipHeader(byte[] buffer, int length) {
+        if (length >= GZIP_HEADER.length) {
+            return buffer[0] == GZIP_HEADER[0] && buffer[1] == GZIP_HEADER[1];
+        }
+        return false;
+    }
+
+    @FunctionalInterface
+    interface IonReaderFromInputStreamFactoryText {
+        IonReader makeReader(IonCatalog catalog, InputStream source, _Private_LocalSymbolTableFactory lstFactory);
+    }
+
+    @FunctionalInterface
+    interface IonReaderFromInputStreamFactoryBinary {
+        IonReader makeReader(_Private_IonReaderBuilder builder, InputStream source, byte[] alreadyRead, int alreadyReadOff, int alreadyReadLen);
+    }
+
+    static IonReader buildReader(
+        _Private_IonReaderBuilder builder,
+        InputStream source,
+        IonReaderFromInputStreamFactoryBinary binary,
+        IonReaderFromInputStreamFactoryText text
+    ) {
+        if (source == null) {
+            throw new NullPointerException("Cannot build a reader from a null InputStream.");
+        }
+        // Note: this can create a lot of layers of InputStream wrappers. For example, if this method is called
+        // from build(byte[]) and the bytes contain GZIP, the chain will be SequenceInputStream(ByteArrayInputStream,
+        // GZIPInputStream -> PushbackInputStream -> ByteArrayInputStream). If this creates a drag on efficiency,
+        // alternatives should be evaluated.
+        byte[] possibleIVM = new byte[_Private_IonConstants.BINARY_VERSION_MARKER_SIZE];
+        InputStream ionData = source;
+        int bytesRead;
+        try {
+            bytesRead = ionData.read(possibleIVM);
+        } catch (IOException e) {
+            throw new IonException(e);
+        }
+        // If the input stream is growing, it is possible that fewer than BINARY_VERSION_MARKER_SIZE bytes are
+        // available yet. Simply check whether the stream *could* contain binary Ion based on the available bytes.
+        // If it can't, fall back to text.
+        // NOTE: if incremental text reading is added, there will need to be logic that handles the case where
+        // the reader is created with 0 bytes available, as it is impossible to determine text vs. binary without
+        // reading at least one byte. Currently, in that case, just create a binary incremental reader. Either the
+        // stream will always be empty (in which case it doesn't matter whether a text or binary reader is used)
+        // or it's a binary stream (in which case the correct reader was created) or it's a growing text stream
+        // (which has always been unsupported).
+        if (startsWithGzipHeader(possibleIVM, bytesRead)) {
             try {
-                bytesRead = wrapper.read(possibleIVM);
-                wrapper.reset();
+                ionData = new GZIPInputStream(
+                    new SequenceInputStream(new ByteArrayInputStream(possibleIVM, 0, bytesRead), ionData)
+                );
+                bytesRead = ionData.read(possibleIVM);
             } catch (IOException e) {
                 throw new IonException(e);
             }
-            if (IonStreamUtils.isGzip(possibleIVM, 0, possibleIVM.length)) {
-                throw new IllegalArgumentException("Automatic GZIP detection is not supported with incremental" +
-                    "support enabled. Wrap the bytes with a GZIPInputStream and call build(InputStream).");
-            }
-            // If the input stream is growing, it is possible that fewer than BINARY_VERSION_MARKER_SIZE bytes are
-            // available yet. Simply check whether the stream *could* contain binary Ion based on the available bytes.
-            // If it can't, fall back to text.
-            // NOTE: if incremental text reading is added, there will need to be logic that handles the case where
-            // the reader is created with 0 bytes available, as it is impossible to determine text vs. binary without
-            // reading at least one byte. Currently, in that case, just create a binary incremental reader. Either the
-            // stream will always be empty (in which case it doesn't matter whether a text or binary reader is used)
-            // or it's a binary stream (in which case the correct reader was created) or it's a growing text stream
-            // (which has always been unsupported).
-            if (startsWithIvm(possibleIVM, bytesRead)) {
-                return makeIncrementalReader(this, wrapper);
-            }
         }
-        return makeReader(validateCatalog(), wrapper, lstFactory);
+        if (startsWithIvm(possibleIVM, bytesRead)) {
+            return binary.makeReader(builder, ionData, possibleIVM, 0, bytesRead);
+        }
+        InputStream wrapper;
+        if (bytesRead > 0) {
+            wrapper = new SequenceInputStream(
+                new ByteArrayInputStream(possibleIVM, 0, bytesRead),
+                ionData
+            );
+        } else {
+            wrapper = ionData;
+        }
+        return text.makeReader(builder.validateCatalog(), wrapper, builder.lstFactory);
+    }
+
+    @Override
+    public IonReader build(InputStream source)
+    {
+        return buildReader(
+            this,
+            source,
+            _Private_IonReaderFactory::makeReaderBinary,
+            _Private_IonReaderFactory::makeReaderText
+        );
     }
 
     @Override
     public IonReader build(Reader ionText) {
-        return makeReader(validateCatalog(), ionText, lstFactory);
+        return makeReaderText(validateCatalog(), ionText, lstFactory);
     }
 
     @Override
@@ -166,7 +254,7 @@ public IonReader build(IonValue value) {
 
     @Override
     public IonTextReader build(String ionText) {
-        return makeReader(validateCatalog(), ionText, lstFactory);
+        return makeReaderText(validateCatalog(), ionText, lstFactory);
     }
 
 }
diff --git a/src/com/amazon/ion/impl/_Private_IonReaderFactory.java b/src/com/amazon/ion/impl/_Private_IonReaderFactory.java
index be09960dc4..1f0e83ce57 100644
--- a/src/com/amazon/ion/impl/_Private_IonReaderFactory.java
+++ b/src/com/amazon/ion/impl/_Private_IonReaderFactory.java
@@ -16,10 +16,7 @@
 package com.amazon.ion.impl;
 
 import static com.amazon.ion.impl.UnifiedInputStreamX.makeStream;
-import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_SIZE;
-import static com.amazon.ion.util.IonStreamUtils.isIonBinary;
 
-import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
@@ -41,184 +38,117 @@
 public final class _Private_IonReaderFactory
 {
 
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             byte[] bytes)
-    {
-        return makeReader(catalog, bytes, 0, bytes.length);
-    }
-
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             byte[] bytes,
-                                             _Private_LocalSymbolTableFactory lstFactory)
-    {
-        return makeReader(catalog, bytes, 0, bytes.length, lstFactory);
-    }
-
     public static IonReader makeSystemReader(byte[] bytes)
     {
         return makeSystemReader(bytes, 0, bytes.length);
     }
 
 
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             byte[] bytes,
-                                             int offset,
-                                             int length)
-    {
-        try
-        {
-            UnifiedInputStreamX uis = makeUnifiedStream(bytes, offset, length);
-            return makeReader(catalog, uis, offset, LocalSymbolTable.DEFAULT_LST_FACTORY);
-        }
-        catch (IOException e)
-        {
-            throw new IonException(e);
-        }
-    }
-
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             byte[] bytes,
-                                             int offset,
-                                             int length,
-                                             _Private_LocalSymbolTableFactory lstFactory)
+    public static final IonReader makeReaderText(IonCatalog catalog,
+                                                 byte[] bytes,
+                                                 int offset,
+                                                 int length,
+                                                 _Private_LocalSymbolTableFactory lstFactory)
     {
+        UnifiedInputStreamX uis;
         try
         {
-            UnifiedInputStreamX uis = makeUnifiedStream(bytes, offset, length);
-            return makeReader(catalog, uis, offset, lstFactory);
+            uis = makeUnifiedStream(bytes, offset, length);
         }
         catch (IOException e)
         {
             throw new IonException(e);
         }
+        return new IonReaderTextUserX(catalog, lstFactory, uis, offset);
     }
 
     public static IonReader makeSystemReader(byte[] bytes,
                                              int offset,
                                              int length)
     {
-        try
-        {
-            UnifiedInputStreamX uis = makeUnifiedStream(bytes, offset, length);
-            return makeSystemReader(uis);
-        }
-        catch (IOException e)
-        {
-            throw new IonException(e);
-        }
-    }
-
-
-    public static final IonTextReader makeReader(IonCatalog catalog,
-                                                 char[] chars)
-    {
-        return makeReader(catalog, chars, 0, chars.length);
-    }
-
-    public static final IonReader makeSystemReader(char[] chars)
-    {
-        UnifiedInputStreamX in = makeStream(chars);
-        return new IonReaderTextSystemX(in);
-    }
-
-
-    public static final IonTextReader makeReader(IonCatalog catalog,
-                                                 char[] chars,
-                                                 int offset,
-                                                 int length)
-    {
-        UnifiedInputStreamX in = makeStream(chars, offset, length);
-        return new IonReaderTextUserX(catalog, LocalSymbolTable.DEFAULT_LST_FACTORY, in, offset);
-    }
-
-    public static final IonReader makeSystemReader(char[] chars,
-                                                   int offset,
-                                                   int length)
-    {
-        UnifiedInputStreamX in = makeStream(chars, offset, length);
-        return new IonReaderTextSystemX(in);
-    }
-
-
-    public static final IonTextReader makeReader(IonCatalog catalog,
-                                                 CharSequence chars)
-    {
-        return makeReader(catalog, chars, LocalSymbolTable.DEFAULT_LST_FACTORY);
+        return _Private_IonReaderBuilder.buildReader(
+            (_Private_IonReaderBuilder) _Private_IonReaderBuilder.standard(),
+            bytes,
+            offset,
+            length,
+            _Private_IonReaderFactory::makeSystemReaderBinary,
+            _Private_IonReaderFactory::makeSystemReaderText
+        );
     }
 
-    public static final IonTextReader makeReader(IonCatalog catalog,
-                                                 CharSequence chars,
-                                                 _Private_LocalSymbolTableFactory lstFactory)
+    public static final IonTextReader makeReaderText(IonCatalog catalog,
+                                                     CharSequence chars,
+                                                     _Private_LocalSymbolTableFactory lstFactory)
     {
         UnifiedInputStreamX in = makeStream(chars);
         return new IonReaderTextUserX(catalog, lstFactory, in);
     }
 
-    public static final IonReader makeSystemReader(CharSequence chars)
+    public static final IonReader makeSystemReaderText(CharSequence chars)
     {
         UnifiedInputStreamX in = makeStream(chars);
         return new IonReaderTextSystemX(in);
     }
 
-
-    public static final IonTextReader makeReader(IonCatalog catalog,
-                                                 CharSequence chars,
-                                                 int offset,
-                                                 int length)
+    public static final IonReader makeReaderText(IonCatalog catalog,
+                                                 InputStream is,
+                                                 _Private_LocalSymbolTableFactory lstFactory)
     {
-        UnifiedInputStreamX in = makeStream(chars, offset, length);
-        return new IonReaderTextUserX(catalog, LocalSymbolTable.DEFAULT_LST_FACTORY, in, offset);
+        UnifiedInputStreamX uis;
+        try {
+            uis = makeUnifiedStream(is);
+        } catch (IOException e) {
+            throw new IonException(e);
+        }
+        return new IonReaderTextUserX(catalog, lstFactory, uis, 0);
     }
 
-    public static final IonReader makeSystemReader(CharSequence chars,
-                                                   int offset,
-                                                   int length)
+    public static IonReader makeSystemReaderText(InputStream is)
     {
-        UnifiedInputStreamX in = makeStream(chars, offset, length);
-        return new IonReaderTextSystemX(in);
+        return _Private_IonReaderBuilder.buildReader(
+            (_Private_IonReaderBuilder) _Private_IonReaderBuilder.standard(),
+            is,
+            _Private_IonReaderFactory::makeSystemReaderBinary,
+            _Private_IonReaderFactory::makeSystemReaderText
+        );
     }
 
-
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             InputStream is)
+    private static IonReader makeSystemReaderText(IonCatalog catalog,
+                                                  InputStream is,
+                                                  _Private_LocalSymbolTableFactory lstFactory)
     {
-        return makeReader(catalog, is, LocalSymbolTable.DEFAULT_LST_FACTORY);
-    }
-
-    public static final IonReader makeReader(IonCatalog catalog,
-                                             InputStream is,
-                                             _Private_LocalSymbolTableFactory lstFactory)
-    {
-        try {
-            UnifiedInputStreamX uis = makeUnifiedStream(is);
-            return makeReader(catalog, uis, 0, lstFactory);
+        UnifiedInputStreamX uis;
+        try
+        {
+            uis = makeUnifiedStream(is);
         }
-        catch (IOException e) {
+        catch (IOException e)
+        {
             throw new IonException(e);
         }
+        return new IonReaderTextSystemX(uis);
     }
 
-    public static IonReader makeSystemReader(InputStream is)
-    {
-        try {
-            UnifiedInputStreamX uis = makeUnifiedStream(is);
-            return makeSystemReader(uis);
+    private static IonReader makeSystemReaderText(IonCatalog catalog,
+                                                  byte[] bytes,
+                                                  int offset,
+                                                  int length,
+                                                  _Private_LocalSymbolTableFactory lstFactory) {
+        UnifiedInputStreamX uis;
+        try
+        {
+            uis = makeUnifiedStream(bytes, offset, length);
         }
-        catch (IOException e) {
+        catch (IOException e)
+        {
             throw new IonException(e);
         }
+        return new IonReaderTextSystemX(uis);
     }
 
-
-    public static final IonTextReader makeReader(IonCatalog catalog,
-                                                 Reader chars)
-    {
-        return makeReader(catalog, chars, LocalSymbolTable.DEFAULT_LST_FACTORY);
-    }
-
-    public static final IonTextReader makeReader(IonCatalog catalog,
-                                                 Reader chars,
-                                                 _Private_LocalSymbolTableFactory lstFactory)
+    public static final IonTextReader makeReaderText(IonCatalog catalog,
+                                                     Reader chars,
+                                                     _Private_LocalSymbolTableFactory lstFactory)
     {
         try {
             UnifiedInputStreamX in = makeStream(chars);
@@ -229,7 +159,7 @@ public static final IonTextReader makeReader(IonCatalog catalog,
         }
     }
 
-    public static final IonReader makeSystemReader(Reader chars)
+    public static final IonReader makeSystemReaderText(Reader chars)
     {
         try {
             UnifiedInputStreamX in = makeStream(chars);
@@ -247,8 +177,8 @@ public static final IonReader makeReader(IonCatalog catalog,
         return new IonReaderTreeUserX(value, catalog, lstFactory);
     }
 
-    public static final IonReader makeSystemReader(IonSystem system,
-                                                   IonValue value)
+    public static final IonReader makeSystemReaderText(IonSystem system,
+                                                       IonValue value)
     {
         if (system != null && system != value.getSystem()) {
             throw new IonException("you can't mix values from different systems");
@@ -256,47 +186,32 @@ public static final IonReader makeSystemReader(IonSystem system,
         return new IonReaderTreeSystem(value);
     }
 
-    public static final IonReader makeIncrementalReader(IonReaderBuilder builder, InputStream is)
+    public static final IonReader makeReaderBinary(IonReaderBuilder builder, InputStream is, byte[] alreadyRead, int alreadyReadOff, int alreadyReadLen)
     {
-        return new IonReaderBinaryIncremental(builder, is);
+        return new IonReaderContinuableTopLevelBinary(builder, is, alreadyRead, alreadyReadOff, alreadyReadLen);
     }
 
+    public static final IonReader makeSystemReaderBinary(IonReaderBuilder builder, InputStream is, byte[] alreadyRead, int alreadyReadOff, int alreadyReadLen)
+    {
+        return new IonReaderNonContinuableSystem(
+            new IonReaderContinuableCoreBinary(builder.getBufferConfiguration(), is, alreadyRead, alreadyReadOff, alreadyReadLen)
+        );
+    }
 
-    //=========================================================================
-
-
-
-    private static IonReader makeReader(IonCatalog catalog,
-                                        UnifiedInputStreamX uis,
-                                        int offset,
-                                        _Private_LocalSymbolTableFactory lstFactory)
-        throws IOException
+    public static final IonReader makeReaderBinary(IonReaderBuilder builder, byte[] buffer, int off, int len)
     {
-        IonReader r;
-        if (has_binary_cookie(uis)) {
-            r = new IonReaderBinaryUserX(catalog, lstFactory, uis, offset);
-        }
-        else {
-            r = new IonReaderTextUserX(catalog, lstFactory, uis, offset);
-        }
-        return r;
+        return new IonReaderContinuableTopLevelBinary(builder, buffer, off, len);
     }
 
-    private static IonReader makeSystemReader(UnifiedInputStreamX uis)
-        throws IOException
+    public static final IonReader makeSystemReaderBinary(IonReaderBuilder builder, byte[] buffer, int off, int len)
     {
-        IonReader r;
-        if (has_binary_cookie(uis)) {
-            // TODO pass offset, or spans will be incorrect
-            r = new IonReaderBinarySystemX(uis);
-        }
-        else {
-            // TODO pass offset, or spans will be incorrect
-            r = new IonReaderTextSystemX(uis);
-        }
-        return r;
+        return new IonReaderNonContinuableSystem(
+            new IonReaderContinuableCoreBinary(builder.getBufferConfiguration(), buffer, off, len)
+        );
     }
 
+
+    //=========================================================================
     //
     //  helper functions
     //
@@ -331,27 +246,4 @@ private static UnifiedInputStreamX makeUnifiedStream(InputStream in)
         UnifiedInputStreamX uis = UnifiedInputStreamX.makeStream(in);
         return uis;
     }
-
-    private static final boolean has_binary_cookie(UnifiedInputStreamX uis)
-        throws IOException
-    {
-        byte[] bytes = new byte[BINARY_VERSION_MARKER_SIZE];
-
-        // try to read the first 4 bytes and unread them (we want
-        // the data stream undisturbed by our peeking ahead)
-        int len;
-        for (len = 0; len < BINARY_VERSION_MARKER_SIZE; len++) {
-            int c = uis.read();
-            if (c == UnifiedInputStreamX.EOF) {
-                break;
-            }
-            bytes[len] = (byte)c;
-        }
-        for (int ii=len; ii>0; ) {
-            ii--;
-            uis.unread(bytes[ii] & 0xff);
-        }
-        boolean is_cookie = isIonBinary(bytes, 0, len);
-        return is_cookie;
-    }
 }
diff --git a/src/com/amazon/ion/impl/lite/IonLoaderLite.java b/src/com/amazon/ion/impl/lite/IonLoaderLite.java
index e0a2aff94e..91f97d3393 100644
--- a/src/com/amazon/ion/impl/lite/IonLoaderLite.java
+++ b/src/com/amazon/ion/impl/lite/IonLoaderLite.java
@@ -16,13 +16,13 @@
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonCursor;
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonLoader;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.IonWriter;
-import com.amazon.ion.impl._Private_IncrementalReader;
 import com.amazon.ion.impl._Private_IonWriterFactory;
 import com.amazon.ion.system.IonReaderBuilder;
 
@@ -85,6 +85,14 @@ private IonDatagramLite load_helper(IonReader reader)
         IonDatagramLite datagram = new IonDatagramLite(_system, _catalog);
         IonWriter writer = _Private_IonWriterFactory.makeWriter(datagram);
         writer.writeValues(reader);
+        if (_readerBuilder.isIncrementalReadingEnabled() && reader instanceof IonCursor) {
+            // Force incremental readers to either disambiguate an incomplete value or raise an error.
+            if (((IonCursor) reader).endStream() != IonCursor.Event.NEEDS_DATA) {
+                // Only text readers can reach this case, because it indicates that completion of an ambiguous token
+                // was forced. Add the resulting value to the datagram.
+                writer.writeValue(reader);
+            }
+        }
         return datagram;
     }
 
@@ -148,22 +156,15 @@ public IonDatagram load(byte[] ionData) throws IonException
     public IonDatagram load(InputStream ionData)
         throws IonException, IOException
     {
-        IonReader reader = null;
         try {
-            reader = _readerBuilder.build(ionData);
-            return load(reader);
+            return load(_readerBuilder.build(ionData));
         }
         catch (IonException e) {
             IOException io = e.causeOfType(IOException.class);
             if (io != null) throw io;
             throw e;
-        } finally {
-            // If a value was incomplete, incremental readers will not yet have raised an error. Force an error
-            // to be raised in this case.
-            if (_readerBuilder.isIncrementalReadingEnabled() && reader instanceof _Private_IncrementalReader) {
-                ((_Private_IncrementalReader) reader).requireCompleteValue();
-            }
         }
+        // Note: the reader cannot be closed, as this would close the InputStream, which was provided by the user.
     }
 
     public IonDatagram load(IonReader reader) throws IonException
diff --git a/src/com/amazon/ion/impl/lite/IonSystemLite.java b/src/com/amazon/ion/impl/lite/IonSystemLite.java
index 4444632832..525cff6e21 100644
--- a/src/com/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSystemLite.java
@@ -19,6 +19,7 @@
 import static com.amazon.ion.SystemSymbols.ION_1_0;
 import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
 import static com.amazon.ion.impl._Private_IonReaderFactory.makeSystemReader;
+import static com.amazon.ion.impl._Private_IonReaderFactory.makeSystemReaderText;
 import static com.amazon.ion.impl._Private_Utils.addAllNonNull;
 import static com.amazon.ion.impl._Private_Utils.initialSymtab;
 import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
@@ -128,7 +129,7 @@ public <T extends IonValue> T clone(T value) throws IonException
         {
             IonDatagram datagram = newDatagram();
             IonWriter writer = _Private_IonWriterFactory.makeWriter(datagram);
-            IonReader reader = makeSystemReader(value.getSystem(), value);
+            IonReader reader = makeSystemReaderText(value.getSystem(), value);
 
             try {
                 writer.writeValues(reader);
@@ -593,7 +594,7 @@ public IonTextReader newReader(String ionText)
 
     public IonReader newSystemReader(String ionText)
     {
-        return makeSystemReader(ionText);
+        return makeSystemReaderText(ionText);
     }
 
 
@@ -604,7 +605,7 @@ public IonReader newReader(InputStream ionData)
 
     public IonReader newSystemReader(InputStream ionData)
     {
-        return makeSystemReader(ionData);
+        return makeSystemReaderText(ionData);
     }
 
 
@@ -619,7 +620,7 @@ public IonReader newReader(Reader ionText)
 
     public IonReader newSystemReader(Reader ionText)
     {
-        return makeSystemReader(ionText);
+        return makeSystemReaderText(ionText);
     }
 
 
@@ -630,7 +631,7 @@ public IonReader newReader(IonValue value)
 
     public IonReader newSystemReader(IonValue value)
     {
-        return makeSystemReader(this, value);
+        return makeSystemReaderText(this, value);
     }
 
 
diff --git a/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java b/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
index cfa28c8f3c..8ce34efe35 100644
--- a/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
@@ -26,7 +26,7 @@ public class BinaryByteArrayIteratorSystemProcessingTest
     @Override
     protected int expectedLocalNullSlotSymbolId()
     {
-        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+        return 0;
     }
 
     @Override
diff --git a/test/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java b/test/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java
index f363b7c6b0..0e529939da 100644
--- a/test/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java
@@ -30,6 +30,6 @@ protected Iterator<IonValue> systemIterate()
     protected int expectedLocalNullSlotSymbolId() {
         // The spec allows for implementations to treat these malformed symbols as "null slots", and all "null slots"
         // in local symbol tables as equivalent to symbol zero.
-        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+        return 0;
     }
 }
diff --git a/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java b/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
index 3373712a93..a332d0462b 100644
--- a/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
+++ b/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
@@ -16,7 +16,14 @@
 package com.amazon.ion;
 
 
+import org.junit.Test;
 
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.Date;
+
+import static com.amazon.ion.SystemSymbols.ION_1_0;
+import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
 
 public class BinaryReaderSystemProcessingTest
     extends ReaderSystemProcessingTestCase
@@ -46,4 +53,160 @@ public IonReader systemRead() throws Exception
     {
         return system().newSystemReader(myBytes);
     }
+
+    private void prepare(int... binary) {
+        myMissingSymbolTokensHaveText = false;
+        myBytes = BitUtils.bytes(binary);
+    }
+
+    @Test
+    public void testMultipleIvmsBetweenValues()
+        throws Exception
+    {
+        prepare(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0x21, 0x01, // 1
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0x21, 0x02, // 2
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0x21, 0x03, // 3
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xE0, 0x01, 0x00, 0xEA  // IVM
+        );
+        startSystemIteration();
+
+        nextValue();
+        checkSymbol(ION_1_0, ION_1_0_SID);
+        nextValue();
+        checkSymbol(ION_1_0, ION_1_0_SID);
+        nextValue();
+        checkInt(1);
+
+        nextValue();
+        checkSymbol(ION_1_0, ION_1_0_SID);
+        nextValue();
+        checkInt(2);
+
+        nextValue();
+        checkSymbol(ION_1_0, ION_1_0_SID);
+        nextValue();
+        checkSymbol(ION_1_0, ION_1_0_SID);
+        nextValue();
+        checkSymbol(ION_1_0, ION_1_0_SID);
+        nextValue();
+        checkInt(3);
+
+        nextValue();
+        checkSymbol(ION_1_0, ION_1_0_SID);
+        nextValue();
+        checkSymbol(ION_1_0, ION_1_0_SID);
+    }
+
+    @Test
+    public void testSymbolTokensInSystemSymbolTable()
+        throws Exception
+    {
+        prepare("{name: imports::max_id}");
+        startSystemIteration();
+
+        nextValue();
+        checkSymbol(ION_1_0, ION_1_0_SID);
+        nextValue();
+        checkType(IonType.STRUCT);
+        myReader.stepIn();
+        nextValue();
+        checkFieldName("name", SystemSymbols.NAME_SID);
+        checkAnnotation("imports", SystemSymbols.IMPORTS_SID);
+        checkSymbol("max_id", SystemSymbols.MAX_ID_SID);
+        myReader.stepOut();
+        checkTopEof();
+    }
+
+    @Test
+    public void testSymbolTokensInLocalSymbolTable()
+        throws Exception
+    {
+        prepare("{foo: bar::baz}");
+        startSystemIteration();
+
+        nextValue();
+        checkSymbol(ION_1_0, ION_1_0_SID);
+
+        nextValue();
+        checkType(IonType.STRUCT);
+        checkAnnotation(SystemSymbols.ION_SYMBOL_TABLE, SystemSymbols.ION_SYMBOL_TABLE_SID);
+        myReader.stepIn();
+        nextValue();
+        checkType(IonType.LIST);
+        checkFieldName(SystemSymbols.SYMBOLS, SystemSymbols.SYMBOLS_SID);
+        myReader.stepIn();
+        nextValue();
+        checkString("baz");
+        nextValue();
+        checkString("bar");
+        nextValue();
+        checkString("foo");
+        myReader.stepOut();
+        myReader.stepOut();
+
+        nextValue();
+        checkType(IonType.STRUCT);
+        myReader.stepIn();
+        nextValue();
+        checkFieldName(null, SystemSymbols.ION_1_0_MAX_ID + 3);
+        checkAnnotation(null, SystemSymbols.ION_1_0_MAX_ID + 2);
+        checkSymbol(null, SystemSymbols.ION_1_0_MAX_ID + 1);
+        myReader.stepOut();
+        checkTopEof();
+    }
+
+    @Test
+    public void testSystemReaderReadsUserValues()
+        throws Exception
+    {
+        prepare("true 123 1.23e0 1.23d0 2023T {{ YWJj }}");
+
+        startSystemIteration();
+
+        nextValue();
+        checkSymbol(ION_1_0, ION_1_0_SID);
+
+        nextValue();
+        checkType(IonType.BOOL);
+        assertTrue(myReader.booleanValue());
+
+        nextValue();
+        checkType(IonType.INT);
+        assertEquals(IntegerSize.INT, myReader.getIntegerSize());
+        assertEquals(123, myReader.intValue());
+        assertEquals(123, myReader.longValue());
+        assertEquals(BigInteger.valueOf(123), myReader.bigIntegerValue());
+
+        nextValue();
+        checkFloat(1.23e0);
+
+        nextValue();
+        checkType(IonType.DECIMAL);
+        assertEquals(BigDecimal.valueOf(123, 2), myReader.bigDecimalValue());
+        assertEquals(Decimal.valueOf(123, 2), myReader.decimalValue());
+
+        nextValue();
+        checkType(IonType.TIMESTAMP);
+        assertEquals(Timestamp.valueOf("2023T"), myReader.timestampValue());
+        assertEquals(Timestamp.valueOf("2023T").dateValue(), myReader.dateValue());
+
+        nextValue();
+        checkType(IonType.BLOB);
+        assertEquals(3, myReader.byteSize());
+        byte[] expected = new byte[]{'a', 'b', 'c'};
+        assertArrayEquals(expected, myReader.newBytes());
+        byte[] result = new byte[3];
+        assertEquals(3, myReader.getBytes(result, 0, 3));
+        assertArrayEquals(expected, result);
+
+        checkTopEof();
+    }
 }
diff --git a/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java b/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
index e814e2982b..02e3be87fd 100644
--- a/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
+++ b/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
@@ -29,7 +29,7 @@ public class BinaryStreamIteratorSystemProcessingTest
     @Override
     protected int expectedLocalNullSlotSymbolId()
     {
-        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+        return 0;
     }
 
     @Override
diff --git a/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java b/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
index 9c328e8043..d689528a98 100644
--- a/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
+++ b/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
@@ -43,9 +43,9 @@ public void setDatagramMaker(DatagramMaker maker)
     @Override
     protected int expectedLocalNullSlotSymbolId()
     {
-        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL  && myDatagramMaker.sourceIsBinary()
-            ? 0
-            : 10;
+        // The spec allows for implementations to treat these malformed symbols as "null slots", and all "null slots"
+        // in local symbol tables as equivalent to symbol zero.
+        return myDatagramMaker.sourceIsBinary() ? 0 : 10;
     }
 
     /**
diff --git a/test/com/amazon/ion/IonSystemTest.java b/test/com/amazon/ion/IonSystemTest.java
index ff1f20d486..fdd0578100 100644
--- a/test/com/amazon/ion/IonSystemTest.java
+++ b/test/com/amazon/ion/IonSystemTest.java
@@ -319,12 +319,6 @@ private void checkGzipDetection(byte[] bytes)
         checkInt(1234, dg.get(0));
     }
 
-    private void expectIncrementalReaderToFail() {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            thrown.expect(IllegalArgumentException.class);
-        }
-    }
-
     @Test
     public void testGzipDetection()
         throws Exception
@@ -334,14 +328,12 @@ public void testGzipDetection()
         byte[] gzipTextBytes = gzip(textBytes);
 
         checkGzipDetection(textBytes);
-        expectIncrementalReaderToFail();
         checkGzipDetection(gzipTextBytes);
 
         byte[] binaryBytes = loader().load(ionText).getBytes();
         byte[] gzipBinaryBytes = gzip(binaryBytes);
 
         checkGzipDetection(binaryBytes);
-        expectIncrementalReaderToFail();
         checkGzipDetection(gzipBinaryBytes);
     }
 
@@ -362,7 +354,6 @@ public void singleValueTextGzip() throws IOException
         String ionText = "1234";
         byte[] textBytes = _Private_Utils.utf8(ionText);
         byte[] gzipTextBytes = gzip(textBytes);
-        expectIncrementalReaderToFail();
         IonInt ionValue = (IonInt) system().singleValue(gzipTextBytes);
 
         assertEquals(1234, ionValue.intValue());
@@ -374,7 +365,6 @@ public void singleValueBinaryGzip() throws IOException
         String ionText = "1234";
         byte[] binaryIon = toBinaryIon(ionText);
         byte[] gzipBytes = gzip(binaryIon);
-        expectIncrementalReaderToFail();
         IonInt ionValue = (IonInt) system().singleValue(gzipBytes);
 
         assertEquals(1234, ionValue.intValue());
diff --git a/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java b/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
index 5e46a99545..848da71f56 100644
--- a/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
+++ b/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
@@ -26,7 +26,7 @@ public class LoadBinaryBytesSystemProcessingTest
     @Override
     protected int expectedLocalNullSlotSymbolId()
     {
-        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+        return 0;
     }
 
     @Override
diff --git a/test/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java b/test/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java
index 90ec7b306f..c46d5f1227 100644
--- a/test/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java
+++ b/test/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java
@@ -26,6 +26,6 @@ protected IonDatagram load() throws Exception
     protected int expectedLocalNullSlotSymbolId() {
         // The spec allows for implementations to treat these malformed symbols as "null slots", and all "null slots"
         // in local symbol tables as equivalent to symbol zero.
-        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+        return 0;
     }
 }
diff --git a/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java b/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
index 487c0203bd..08904d3212 100644
--- a/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
+++ b/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
@@ -27,7 +27,7 @@ public class LoadBinaryStreamSystemProcessingTest
     @Override
     protected int expectedLocalNullSlotSymbolId()
     {
-        return getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL ? 0 : 10;
+        return 0;
     }
 
     @Override
diff --git a/test/com/amazon/ion/RawValueSpanReaderBasicTest.java b/test/com/amazon/ion/RawValueSpanReaderBasicTest.java
index 4da4cafe95..a6d30b6114 100644
--- a/test/com/amazon/ion/RawValueSpanReaderBasicTest.java
+++ b/test/com/amazon/ion/RawValueSpanReaderBasicTest.java
@@ -52,14 +52,6 @@ public void testTextReaderReturnsNullFacet()
         assertNull(reader.asFacet(RawValueSpanProvider.class));
     }
 
-    @Test
-    public void incrementalBinaryReaderReturnsNullFacet()
-    {
-        IonReader reader = IonReaderBuilder.standard().withIncrementalReadingEnabled(true).build(dummyData);
-        assertNull(reader.asFacet(RawValueSpanProvider.class));
-        assertNull(reader.asFacet(SeekableReader.class));
-    }
-
     @Test
     public void testNonByteBackedReaderNotSupported()
     {
diff --git a/test/com/amazon/ion/ReaderMaker.java b/test/com/amazon/ion/ReaderMaker.java
index b4a3e9a0ca..6e182da06f 100644
--- a/test/com/amazon/ion/ReaderMaker.java
+++ b/test/com/amazon/ion/ReaderMaker.java
@@ -19,7 +19,6 @@
 import static com.amazon.ion.TestUtils.ensureText;
 
 import com.amazon.ion.impl._Private_Utils;
-import com.amazon.ion.system.IonReaderBuilder;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -140,34 +139,6 @@ public IonReader newReader(IonSystem system, byte[] ionData)
         }
     },
 
-    FROM_INPUT_STREAM_BINARY_INCREMENTAL(Feature.BINARY, Feature.STREAM)
-    {
-        @Override
-        public IonReader newReader(IonSystem system, byte[] ionData,
-                                   InputStreamWrapper wrapper)
-            throws IOException
-        {
-            ionData = ensureBinary(system, ionData);
-            InputStream in = new ByteArrayInputStream(ionData);
-            InputStream wrapped = wrapper.wrap(in);
-            return newReader(system, wrapped);
-        }
-
-        @Override
-        public IonReader newReader(IonSystem system, byte[] ionData)
-        {
-            ionData = ensureBinary(system, ionData);
-            InputStream in = new ByteArrayInputStream(ionData);
-            return newReader(system, in);
-        }
-
-        @Override
-        public IonReader newReader(IonSystem system, InputStream inputStream) {
-            IonCatalog catalog = system.getCatalog();
-            return IonReaderBuilder.standard().withIncrementalReadingEnabled(true).withCatalog(catalog).build(inputStream);
-        }
-    },
-
     /**
      * Invokes {@link IonSystem#newReader(InputStream)} with Ion text.
      */
diff --git a/test/com/amazon/ion/TestUtils.java b/test/com/amazon/ion/TestUtils.java
index c8177b0e42..a1fb71c414 100644
--- a/test/com/amazon/ion/TestUtils.java
+++ b/test/com/amazon/ion/TestUtils.java
@@ -150,6 +150,8 @@ public boolean accept(File dir, String name)
                       ,"bad/typecodes/type_6_length_0.10n"     // TODO amazon-ion/ion-java#272
                       ,"good/typecodes/T7-large.10n"           // TODO amazon-ion/ion-java#273 
                       ,"good/equivs/clobNewlines.ion"          // TODO amazon-ion/ion-java#274
+                      ,"bad/minLongWithLenTooSmall.10n"        // Note: The long itself is fine. The data ends with 0x01, a 2-byte NOP pad header. It is not worth adding the logic to detect this as unexpected EOF.
+                      ,"bad/nopPadTooShort.10n"                // Note: There are fewer bytes than the NOP pad header declares. It is not worth adding the logic to detect this as unexpected EOF.
             )
         );
 
diff --git a/test/com/amazon/ion/TimestampTest.java b/test/com/amazon/ion/TimestampTest.java
index ede7f1d847..1709fe8da8 100644
--- a/test/com/amazon/ion/TimestampTest.java
+++ b/test/com/amazon/ion/TimestampTest.java
@@ -1288,7 +1288,7 @@ public void testNewTimestampFromClearCalendar()
 
 
     @Test
-    public void testTimestampWithNegativeFraction()
+    public void testTimestampWithNegativeZeroFraction()
     {
         BigDecimal frac = Decimal.negativeZero(3);
 
@@ -1296,10 +1296,27 @@ public void testTimestampWithNegativeFraction()
         Timestamp expected = Timestamp.valueOf("2000-11-14T17:30:12.000Z");
         assertEquals(expected, ts);
         assertEquals(expected.hashCode(), ts.hashCode());
+    }
+
+    @Test
+    public void testTimestampWithNegativeFractionDecimalFromConstructorFails() {
+        thrown.expect(IllegalArgumentException.class);
+        new Timestamp(2000, 11, 14, 17, 30, 12, new BigDecimal("-0.123"), 0);
+    }
+
+    @Test
+    public void testTimestampWithNegativeFractionDecimalFromUtcFieldsFails() {
+        thrown.expect(IllegalArgumentException.class);
+        createFromUtcFields(FRACTION, 2000, 11, 14, 17, 30, 12, Decimal.valueOf("-0.123"),
+            UTC_OFFSET);
+    }
 
-        frac = new BigDecimal("-0.123");
-        ts = new Timestamp(2000, 11, 14, 17, 30, 12, frac, 0);
-        assertEquals("2000-11-14T17:30:12.123Z", ts.toString());
+    @Test
+    public void testTimestampWithNegativeFractionBigDecimalFromUtcFieldsFails() {
+        thrown.expect(IllegalArgumentException.class);
+        checkFraction(".123", new BigDecimal ("-0.123"));
+        createFromUtcFields(FRACTION, 2000, 11, 14, 17, 30, 12, new BigDecimal("-0.123"),
+            UTC_OFFSET);
     }
 
 
@@ -1326,9 +1343,6 @@ public void testTimestampWithDecimalFraction()
 
         checkFraction(".345", Decimal.valueOf(".345"));
         checkFraction(".345", new BigDecimal (".345"));
-
-        checkFraction(".123", Decimal.valueOf("-0.123"));
-        checkFraction(".123", new BigDecimal ("-0.123"));
     }
 
     @Test
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java b/test/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java
similarity index 88%
rename from test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
rename to test/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java
index cd94276dc9..50123ac277 100644
--- a/test/com/amazon/ion/impl/IonReaderBinaryRawLargeStreamTest.java
+++ b/test/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java
@@ -1,5 +1,10 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
 package com.amazon.ion.impl;
 
+import com.amazon.ion.BufferConfiguration;
+import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonType;
@@ -24,7 +29,7 @@
 import static org.junit.Assert.assertEquals;
 
 // NOTE: these tests each take several seconds to complete.
-public class IonReaderBinaryRawLargeStreamTest {
+public class IonReaderBinaryLargeStreamTest {
 
     private byte[] testData(Timestamp timestamp) throws IOException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -40,22 +45,24 @@ private byte[] testData(Timestamp timestamp) throws IOException {
         return data;
     }
 
+    private static IonReaderBuilder newReaderBuilderThatThrowsOnOversizedValues(boolean enableIncremental) {
+        return IonReaderBuilder.standard()
+            .withIncrementalReadingEnabled(enableIncremental)
+            .withBufferConfiguration(
+                IonBufferConfiguration.Builder.standard()
+                    .onOversizedValue(new BufferConfiguration.OversizedValueHandler() {
+                        @Override
+                        public void onOversizedValue() {
+                            throw new IonException("oversized");
+                        }
+                    })
+                    .build()
+            );
+    }
+
     public void readLargeScalarStream(IonReaderBuilder readerBuilder) throws Exception {
         final Timestamp timestamp = Timestamp.forDay(2000, 1, 1);
         byte[] data = testData(timestamp);
-        // The binary reader uses Integer.MIN_VALUE to mean NO_LIMIT for its _local_remaining value, which keeps track
-        // of the remaining number of bytes in the current value. Between values at the top level, this should always be
-        // NO_LIMIT. No arithmetic should ever be performed on the value when it is set to NO_LIMIT. If bugs exist that
-        // violate this, then between top level values _local_remaining will never again be NO_LIMIT, meaning that
-        // arithmetic will continue to be performed on it. Eventually, due to integer overflow, the value will roll over
-        // into a small enough positive value that the reader will erroneously determine that there are fewer bytes
-        // remaining than are needed to complete the current value. The reader will then finish early before reading the
-        // entire stream. The bug that prompted this test to be written involved an unconditional subtraction of the
-        // current value's length as declared in its header from the current value of _local_remaining within
-        // stringValue(), decimalValue(), and timestampValue(). This caused _local_remaining to overflow to a very
-        // large value immediately. For every top level value subsequently read, the length of that value would be
-        // subtracted from _local_remaining until eventually _local_remaining prematurely reached 0 around the time
-        // the stream reached Integer.MAX_VALUE in length.
         // Repeat the batch a sufficient number of times to exceed a total stream length of Integer.MAX_VALUE, plus
         // a few more to make sure batches continue to be read correctly.
         final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 7; // 7 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
@@ -82,12 +89,12 @@ public void readLargeScalarStream(IonReaderBuilder readerBuilder) throws Excepti
 
     @Test
     public void readLargeScalarStreamNonIncremental() throws Exception {
-        readLargeScalarStream(IonReaderBuilder.standard());
+        readLargeScalarStream(newReaderBuilderThatThrowsOnOversizedValues(false));
     }
 
     @Test
     public void readLargeScalarStreamIncremental() throws Exception {
-        readLargeScalarStream(IonReaderBuilder.standard().withIncrementalReadingEnabled(true));
+        readLargeScalarStream(newReaderBuilderThatThrowsOnOversizedValues(true));
     }
 
     @Test
@@ -303,20 +310,26 @@ private void cleanlyFailsOnLargeScalar(IonReaderBuilder readerBuilder) throws Ex
             new RepeatInputStream(data, totalNumberOfBatches - 1) // This will provide the data 'totalNumberOfBatches' times
         );
         IonReader reader = readerBuilder.build(inputStream);
-        // If support for large scalars is added, the following line will be deleted and the rest of the test
+        // If support for large scalars is added, the following will be deleted and the rest of the test
         // completed to assert the correctness of the value.
-        thrown.expect(IonException.class);
-        reader.next();
+        if (readerBuilder.isIncrementalReadingEnabled()) {
+            thrown.expect(IonException.class);
+            reader.next();
+        } else {
+            assertEquals(IonType.STRING, reader.next());
+            thrown.expect(IonException.class);
+            reader.stringValue();
+        }
     }
 
     @Test
     public void cleanlyFailsOnLargeScalarNonIncremental() throws Exception {
-        cleanlyFailsOnLargeScalar(IonReaderBuilder.standard());
+        cleanlyFailsOnLargeScalar(newReaderBuilderThatThrowsOnOversizedValues(false));
     }
 
     @Test
     public void cleanlyFailsOnLargeScalarIncremental() throws Exception {
-        cleanlyFailsOnLargeScalar(IonReaderBuilder.standard().withIncrementalReadingEnabled(true));
+        cleanlyFailsOnLargeScalar(newReaderBuilderThatThrowsOnOversizedValues(true));
     }
 
     private void cleanlyFailsOnLargeAnnotatedScalar(IonReaderBuilder readerBuilder) throws Exception {
@@ -336,20 +349,26 @@ private void cleanlyFailsOnLargeAnnotatedScalar(IonReaderBuilder readerBuilder)
             new RepeatInputStream(data, totalNumberOfBatches - 1) // This will provide the data 'totalNumberOfBatches' times
         );
         IonReader reader = readerBuilder.build(inputStream);
-        // If support for large scalars is added, the following line will be deleted and the rest of the test
+        // If support for large scalars is added, the following will be deleted and the rest of the test
         // completed to assert the correctness of the value.
-        thrown.expect(IonException.class);
-        reader.next();
+        if (readerBuilder.isIncrementalReadingEnabled()) {
+            thrown.expect(IonException.class);
+            reader.next();
+        } else {
+            assertEquals(IonType.STRING, reader.next());
+            thrown.expect(IonException.class);
+            reader.stringValue();
+        }
     }
 
     @Test
     public void cleanlyFailsOnLargeAnnotatedScalarNonIncremental() throws Exception {
-        cleanlyFailsOnLargeAnnotatedScalar(IonReaderBuilder.standard());
+        cleanlyFailsOnLargeAnnotatedScalar(newReaderBuilderThatThrowsOnOversizedValues(false));
     }
 
     @Test
     public void cleanlyFailsOnLargeAnnotatedScalarIncremental() throws Exception {
-        cleanlyFailsOnLargeAnnotatedScalar(IonReaderBuilder.standard().withIncrementalReadingEnabled(true));
+        cleanlyFailsOnLargeAnnotatedScalar(newReaderBuilderThatThrowsOnOversizedValues(true));
     }
 
     @Test
@@ -368,7 +387,7 @@ public void cleanlyFailsOnLargeContainerIncremental() throws Exception {
             new RepeatInputStream(data, totalNumberOfBatches - 1) // This will provide the data 'totalNumberOfBatches' times
         );
 
-        IonReader reader = IonReaderBuilder.standard().withIncrementalReadingEnabled(true).build(inputStream);
+        IonReader reader = newReaderBuilderThatThrowsOnOversizedValues(true).build(inputStream);
         thrown.expect(IonException.class);
         reader.next();
     }
diff --git a/test/com/amazon/ion/impl/RawValueSpanReaderTest.java b/test/com/amazon/ion/impl/RawValueSpanReaderTest.java
index e99ee79569..8e06606ad2 100644
--- a/test/com/amazon/ion/impl/RawValueSpanReaderTest.java
+++ b/test/com/amazon/ion/impl/RawValueSpanReaderTest.java
@@ -40,6 +40,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -76,7 +77,8 @@ public void setTestFile(File file)
         myTestFile = file;
     }
 
-    private IonReaderBinaryUserX reader;
+    private IonReader reader;
+    private byte[] inputBytes;
     private RawValueSpanProvider spanProvider;
     private SeekableReader seekableReader;
 
@@ -262,7 +264,17 @@ private void assertSpan(SpanTester tester) throws Exception
         }
     }
 
-    private int countNopPad(int start) throws IOException
+    private int readVarUInt(int start) {
+        int currentByte = 0;
+        int result = 0;
+        while ((currentByte & 0x80) == 0) {
+            currentByte = inputBytes[start++];
+            result = (result << 7) | (currentByte & 0x7F);
+        }
+        return result;
+    }
+
+    private int countNopPad(int start)
     {
         int index = start;
         int len = 0;
@@ -274,13 +286,13 @@ private int countNopPad(int start) throws IOException
             len += index - start;
         }
 
-        int td = reader.getCurrentBuffer()[index] & 0xFF;
+        int td = inputBytes[index++] & 0xFF;
         int tid = _Private_IonConstants.getTypeCode(td);
         int typeLen = _Private_IonConstants.getLowNibble(td);
 
         if(tid == _Private_IonConstants.tidNull && typeLen != _Private_IonConstants.lnIsNull){
             if(typeLen == _Private_IonConstants.lnIsVarLen) {
-                len += reader.readVarUInt();
+                len += readVarUInt(index);
             }
             else {
                 len += 1;
@@ -310,7 +322,8 @@ private static byte[] readFileAsBytes(File file) throws IOException
     public void testSpans() throws Exception
     {
         // Seeking currently only works over byte-backed IonReaders -- not InputStreams
-        reader = (IonReaderBinaryUserX) IonReaderBuilder.standard().build(readFileAsBytes(myTestFile));
+        inputBytes = readFileAsBytes(myTestFile);
+        reader = IonReaderBuilder.standard().build(inputBytes);
         spanProvider = reader.asFacet(RawValueSpanProvider.class);
         seekableReader = reader.asFacet(SeekableReader.class);
 
diff --git a/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java b/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
index 5720b15701..665eb853d2 100644
--- a/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
+++ b/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
@@ -65,11 +65,6 @@ private void readBeyondMaxInt(byte[] data, IonType valueType)
     @Test
     public void testCurrentSpanBeyondMaxInt()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         IonDatagram dg = system().newDatagram();
         dg.add().newBlob(new byte[2000]);
         byte[] binary = dg.getBytes();
@@ -85,11 +80,6 @@ public void testCurrentSpanBeyondMaxInt()
     @Test
     public void testCurrentSpanBeyondMaxIntForOrderedStruct()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         // Value is ordered-struct { name:{{ /* 1024 bytes */}} }
 
         byte[] data = hexToBytes("E0 01 00 EA "
diff --git a/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java b/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
index 5c6fa61776..9c62e0312f 100644
--- a/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
+++ b/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
@@ -55,11 +55,6 @@ public void checkCurrentSpan(int binaryStart, int binaryFinish, int textStart)
     @Test
     public void testCurrentSpan()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         read("'''hello''' 1 2 3 4 5 6 7 8 9 10 '''Kumo the fluffy dog! He is so fluffy and yet so happy!'''");
         assertSame(IonType.STRING, in.next());
         checkCurrentSpan(4, 10, 0);
@@ -77,11 +72,6 @@ public void testCurrentSpan()
 
     @Test
     public void testCurrentSpanFromStreamMed() throws IOException {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         final ByteArrayOutputStream buf = new ByteArrayOutputStream();
         final int count = 8000;
         for (int i = 0; i < count; i++) {
diff --git a/test/com/amazon/ion/streaming/ReaderFacetTestCase.java b/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
index 83ba276449..4c1baf6417 100644
--- a/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
+++ b/test/com/amazon/ion/streaming/ReaderFacetTestCase.java
@@ -36,21 +36,13 @@ public abstract class ReaderFacetTestCase
      *
      * @see NonSpanReaderTest
      */
-    public static final ReaderMaker[] NON_SPAN_READERS =
-    {
-        ReaderMaker.FROM_INPUT_STREAM_BINARY_INCREMENTAL
-    };
+    public static final ReaderMaker[] NON_SPAN_READERS = {};
 
     /**
      * These are the readers that don't support {@link OffsetSpan}s.
      */
-    public static final ReaderMaker[] NON_OFFSET_SPAN_READERS;
-    static {
-        ReaderMaker[] domReaders = ReaderMaker.valuesWith(ReaderMaker.Feature.DOM);
-        NON_OFFSET_SPAN_READERS = new ReaderMaker[domReaders.length + 1];
-        System.arraycopy(domReaders, 0, NON_OFFSET_SPAN_READERS, 0, domReaders.length);
-        NON_OFFSET_SPAN_READERS[domReaders.length] = ReaderMaker.FROM_INPUT_STREAM_BINARY_INCREMENTAL;
-    }
+    public static final ReaderMaker[] NON_OFFSET_SPAN_READERS =
+        ReaderMaker.valuesWith(ReaderMaker.Feature.DOM);
 
     /**
      * These are the readers that don't support {@link TextSpan}s.
@@ -67,8 +59,7 @@ public abstract class ReaderFacetTestCase
     {
         ReaderMaker.FROM_INPUT_STREAM_BINARY,
         ReaderMaker.FROM_INPUT_STREAM_TEXT,
-        ReaderMaker.FROM_READER,
-        ReaderMaker.FROM_INPUT_STREAM_BINARY_INCREMENTAL
+        ReaderMaker.FROM_READER
     };
 
 
diff --git a/test/com/amazon/ion/streaming/SeekableReaderTest.java b/test/com/amazon/ion/streaming/SeekableReaderTest.java
index b31c2ad9aa..5510068edc 100644
--- a/test/com/amazon/ion/streaming/SeekableReaderTest.java
+++ b/test/com/amazon/ion/streaming/SeekableReaderTest.java
@@ -17,14 +17,20 @@
 
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
 import com.amazon.ion.ReaderMaker;
 import com.amazon.ion.Span;
 import com.amazon.ion.TestUtils;
 import com.amazon.ion.impl._Private_Utils;
 import com.amazon.ion.junit.Injected.Inject;
 import com.amazon.ion.junit.IonAssert;
+
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.SimpleCatalog;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -58,11 +64,6 @@ private void checkSpans(IonDatagram dg, Span[] positions)
     @Test
     public void testTrivialSpan()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         String text = "null";
         read(text);
         in.next();
@@ -78,11 +79,6 @@ public void testTrivialSpan()
     @Test
     public void testWalkingBackwards()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         String text =
             "null true 3 4e0 5.0 6666-06-06T '7' \"8\" {{\"\"}} {{}} [] () {}";
 
@@ -123,11 +119,6 @@ public void testWalkingBackwards()
     @Test
     public void testHoistingWithinContainers()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         read("{f:v,g:[c, (d), e], /* h */ $0:null} s");
 
         in.next();
@@ -203,11 +194,6 @@ public void testHoistingWithinContainers()
     @Test
     public void testHoistingLongValue()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         // This value is "long" in that it has a length subfield in the prefix.
         String text = " \"123456789012345\" ";
         read(text);
@@ -225,11 +211,6 @@ public void testHoistingLongValue()
     public void testHoistingOrderedStruct()
     throws IOException
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         File file = getTestdataFile("good/structOrdered.10n");
         byte[] binary = _Private_Utils.loadFileBytes(file);
 
@@ -249,11 +230,6 @@ public void testHoistingOrderedStruct()
     public void testHoistingAnnotatedTopLevelValue()
         throws IOException
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         read("a::v");
         in.next();
         Span span = sr.currentSpan();
@@ -271,11 +247,6 @@ public void testHoistingAnnotatedTopLevelValue()
     public void testHoistingAnnotatedContainedValue()
         throws IOException
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         read("[a::v]");
         in.next();
         in.stepIn();
@@ -291,6 +262,71 @@ public void testHoistingAnnotatedContainedValue()
         expectTopEof();
     }
 
+    @Test
+    public void testHoistingAcrossSymbolTableBoundary()
+        throws IOException
+    {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (IonWriter writer = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendEnabled().build(out)) {
+            writer.writeInt(123);
+            writer.finish();
+            writer.writeSymbol("abc");
+            writer.finish();
+            writer.writeSymbol("def");
+            writer.flush();
+            writer.writeSymbol("ghi");
+            writer.writeSymbol("jkl");
+            writer.finish();
+            writer.writeSymbol("mno");
+        }
+        if (myReaderMaker.sourceIsText()) {
+            read(out.toByteArray());
+        } else {
+            in = getStreamingMode().newIonReader(new SimpleCatalog(), out.toByteArray());
+            initFacets();
+        }
+
+        in.next();
+        Span integer = sp.currentSpan();
+        in.next();
+        Span abc = sp.currentSpan();
+        in.next();
+        Span def = sp.currentSpan();
+        in.next();
+        Span ghi = sp.currentSpan();
+        in.next();
+        Span jkl = sp.currentSpan();
+        in.next();
+        Span mno = sp.currentSpan();
+        in.next();
+
+        hoist(jkl);
+        assertSame(IonType.SYMBOL, in.next());
+        assertEquals("jkl", in.stringValue());
+
+        hoist(ghi);
+        assertSame(IonType.SYMBOL, in.next());
+        assertEquals("ghi", in.stringValue());
+
+        hoist(integer);
+        assertSame(IonType.INT, in.next());
+        assertEquals(123, in.intValue());
+
+        hoist(def);
+        assertSame(IonType.SYMBOL, in.next());
+        assertEquals("def", in.stringValue());
+
+        hoist(mno);
+        assertSame(IonType.SYMBOL, in.next());
+        assertEquals("mno", in.stringValue());
+
+        hoist(abc);
+        assertSame(IonType.SYMBOL, in.next());
+        assertEquals("abc", in.stringValue());
+
+        expectTopEof();
+    }
+
 
     //========================================================================
     // Failure cases
diff --git a/test/com/amazon/ion/streaming/SpanReaderTest.java b/test/com/amazon/ion/streaming/SpanReaderTest.java
index d582049b36..646906caca 100644
--- a/test/com/amazon/ion/streaming/SpanReaderTest.java
+++ b/test/com/amazon/ion/streaming/SpanReaderTest.java
@@ -43,11 +43,6 @@ public SpanReaderTest()
     @Test
     public void testCallingCurrentSpan()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         String text =
             "null true 3 4e0 5.0 6666-06-06T '7' \"8\" {{\"\"}} {{}} [] () {}";
 
@@ -85,11 +80,6 @@ public void testCallingCurrentSpan()
     @Test
     public void testCurrentSpanWithinContainers()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         read("{f:v,g:[c]} s");
 
         in.next();
@@ -120,11 +110,6 @@ public void testCurrentSpanWithinContainers()
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanBeforeFirstTopLevel()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            throw new IllegalStateException();
-        }
         read("foo");
         sp.currentSpan();
     }
@@ -132,11 +117,6 @@ public void testCurrentSpanBeforeFirstTopLevel()
 
     private void callCurrentSpanBeforeFirstChild(String ionText)
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         read(ionText);
         in.next();
         in.stepIn();
@@ -146,44 +126,24 @@ private void callCurrentSpanBeforeFirstChild(String ionText)
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanBeforeFirstListChild()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            throw new IllegalStateException();
-        }
         callCurrentSpanBeforeFirstChild("[v]");
     }
 
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanBeforeFirstSexpChild()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            throw new IllegalStateException();
-        }
         callCurrentSpanBeforeFirstChild("(v)");
     }
 
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanBeforeFirstStructChild()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            throw new IllegalStateException();
-        }
         callCurrentSpanBeforeFirstChild("{f:v}");
     }
 
 
     private void callCurrentSpanAfterLastChild(String ionText)
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            return;
-        }
         read(ionText);
         in.next();
         in.stepIn();
@@ -195,33 +155,18 @@ private void callCurrentSpanAfterLastChild(String ionText)
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanAfterLastListChild()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            throw new IllegalStateException();
-        }
         callCurrentSpanAfterLastChild("[v]");
     }
 
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanAfterLastSexpChild()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            throw new IllegalStateException();
-        }
         callCurrentSpanAfterLastChild("(v)");
     }
 
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanAfterLastStructChild()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            throw new IllegalStateException();
-        }
         callCurrentSpanAfterLastChild("{f:v}");
     }
 
@@ -229,11 +174,6 @@ public void testCurrentSpanAfterLastStructChild()
     @Test(expected=IllegalStateException.class)
     public void testCurrentSpanAtEndOfStream()
     {
-        if (getStreamingMode() == StreamingMode.NEW_STREAMING_INCREMENTAL) {
-            // TODO the incremental reader does not currently support the SpanProvider or SeekableReader facets.
-            //      See ion-java/issues/382 and ion-java/issues/383.
-            throw new IllegalStateException();
-        }
         read("foo");
         in.next();
         assertEquals(null, in.next());
diff --git a/test/com/amazon/ion/system/IonReaderBuilderTest.java b/test/com/amazon/ion/system/IonReaderBuilderTest.java
index f4433f2136..a79d6a7482 100644
--- a/test/com/amazon/ion/system/IonReaderBuilderTest.java
+++ b/test/com/amazon/ion/system/IonReaderBuilderTest.java
@@ -168,7 +168,7 @@ public void testBufferConfiguration()
     }
 
     @Test
-    public void testIncrementalReadingDoesNotSupportAutoGzip() throws IOException
+    public void testIncrementalReadingSupportsAutoGzip() throws IOException
     {
         IonReaderBuilder builder = IonReaderBuilder.standard();
         builder.withIncrementalReadingEnabled(true);
@@ -177,18 +177,14 @@ public void testIncrementalReadingDoesNotSupportAutoGzip() throws IOException
         gzip.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
         gzip.write(0x20); // int 0.
         gzip.close();
-        try {
-            builder.build(data.toByteArray());
-            fail();
-        } catch (IllegalArgumentException e) {
-            // Expected; non-incremental readers do not support auto-deflate of GZIP.
-        }
-        try {
-            builder.build(new ByteArrayInputStream(data.toByteArray()));
-            fail();
-        } catch (IllegalArgumentException e) {
-            // Expected; non-incremental readers do not support auto-deflate of GZIP.
-        }
+        IonReader reader1 = builder.build(data.toByteArray());
+        assertEquals(IonType.INT, reader1.next());
+        assertEquals(0, reader1.intValue());
+        reader1.close();
+        IonReader reader2 = builder.build(new ByteArrayInputStream(data.toByteArray()));
+        assertEquals(IonType.INT, reader2.next());
+        assertEquals(0, reader2.intValue());
+        reader2.close();
     }
 
 }

From f520e9261e148d3ab867b4d68e11926cd00fddf5 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 30 Jun 2023 17:50:49 -0700
Subject: [PATCH 273/490] Deletes the legacy binary reader implementation.

---
 .../amazon/ion/impl/IonReaderBinaryRawX.java  | 1356 -----------------
 .../ion/impl/IonReaderBinarySystemX.java      |  498 ------
 .../amazon/ion/impl/IonReaderBinaryUserX.java |  446 ------
 test/com/amazon/ion/impl/VarIntTest.java      |  140 --
 4 files changed, 2440 deletions(-)
 delete mode 100644 src/com/amazon/ion/impl/IonReaderBinaryRawX.java
 delete mode 100644 src/com/amazon/ion/impl/IonReaderBinarySystemX.java
 delete mode 100644 src/com/amazon/ion/impl/IonReaderBinaryUserX.java
 delete mode 100644 test/com/amazon/ion/impl/VarIntTest.java

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java b/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
deleted file mode 100644
index e1304035be..0000000000
--- a/src/com/amazon/ion/impl/IonReaderBinaryRawX.java
+++ /dev/null
@@ -1,1356 +0,0 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.amazon.ion.impl;
-
-import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
-
-import com.amazon.ion.Decimal;
-import com.amazon.ion.IonException;
-import com.amazon.ion.IonReader;
-import com.amazon.ion.IonType;
-import com.amazon.ion.SymbolTable;
-import com.amazon.ion.Timestamp;
-import com.amazon.ion.Timestamp.Precision;
-import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
-import com.amazon.ion.impl._Private_ScalarConversions.AS_TYPE;
-import com.amazon.ion.impl._Private_ScalarConversions.ValueVariant;
-import com.amazon.ion.impl.bin.utf8.ByteBufferPool;
-import com.amazon.ion.impl.bin.utf8.PoolableByteBuffer;
-import com.amazon.ion.impl.bin.utf8.Utf8StringDecoder;
-import com.amazon.ion.impl.bin.utf8.Utf8StringDecoderPool;
-
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.math.MathContext;
-import java.nio.ByteBuffer;
-
-
-/**
- *  low level reader, base class, for reading Ion binary
- *  input sources.  This using the UnifiedInputStream just
- *  as the updated (july 2009) text reader does.  The
- *  routines in this impl only include those needed to handle
- *  field id's, annotation ids', and access to the value
- *  headers.  In particular hasNext, next, stepIn and stepOut
- *  are handled here.
- *
- *  scalar values are handled by IonReaderBinarySystem and
- *  symbol tables (as well as field names and annotations as
- *  strings) are handled by IonBinaryReaderUser.
- */
-abstract class IonReaderBinaryRawX
-    implements IonReader
-{
-    static final int DEFAULT_CONTAINER_STACK_SIZE = 12; // a multiple of 3
-    static final int DEFAULT_ANNOTATION_SIZE = 10;
-    static final int NO_LIMIT = Integer.MIN_VALUE;
-
-    protected enum State {
-        S_INVALID,
-        S_BEFORE_FIELD, // only true in structs
-        S_BEFORE_TID,
-        S_BEFORE_VALUE,
-        S_AFTER_VALUE,
-        S_EOF
-    }
-    State               _state;
-    UnifiedInputStreamX _input;
-    long                _local_remaining;
-    boolean             _eof;
-    boolean             _has_next_needed;
-    ValueVariant        _v;
-    IonType             _value_type;
-    boolean             _value_is_null;
-    boolean             _value_is_true;   // cached boolean value (since we step on the length)
-
-    /**
-     * {@link SymbolTable#UNKNOWN_SYMBOL_ID} means "not on a struct field"
-     * since otherwise we always know the SID.
-     */
-    int                 _value_field_id;
-    int                 _value_tid;
-    long                _value_len;
-    long                _value_start;
-    int                 _value_lob_remaining;
-    boolean             _value_lob_is_ready;
-
-    long                _position_start;
-    long                _position_len;
-
-
-    SavePoint           _annotations;
-    int[]               _annotation_ids;
-    int                 _annotation_count;
-
-    // local stack for stepInto() and stepOut()
-    boolean             _is_in_struct;
-    boolean             _struct_is_ordered;
-    int                 _parent_tid;
-    int                 _container_top;
-    long[]              _container_stack; // triples of: position, type, local_end
-
-    // Pooled decoder for UTF-8 strings.
-    private final Utf8StringDecoder utf8Decoder = Utf8StringDecoderPool.getInstance().getOrCreate();
-
-    // Calling read() to pull in the next byte of a string requires an EOF check to be performed for each byte.
-    // This reusable buffer allows us to call read(utf8InputBuffer) instead, letting us can pay the cost of an EOF check
-    // once per buffer rather than once per byte.
-    private final PoolableByteBuffer pooledUtf8InputBuffer = ByteBufferPool.getInstance().getOrCreate();
-
-    protected IonReaderBinaryRawX() {
-    }
-
-    /**
-     * @return This implementation always returns null.
-     */
-    public <T> T asFacet(Class<T> facetType)
-    {
-        return null;
-    }
-
-    protected final void init_raw(UnifiedInputStreamX uis) {
-        _input = uis;
-        _container_stack = new long[DEFAULT_CONTAINER_STACK_SIZE];
-        _annotations = uis.savePointAllocate();
-        _v = new ValueVariant();
-        _annotation_ids = new int[DEFAULT_ANNOTATION_SIZE];
-
-        re_init_raw();
-
-        _position_start = -1;
-    }
-
-    final void re_init_raw() {
-        _local_remaining = NO_LIMIT;
-        _parent_tid = _Private_IonConstants.tidDATAGRAM;
-        _value_field_id = SymbolTable.UNKNOWN_SYMBOL_ID;
-        _state = State.S_BEFORE_TID; // this is where we always start
-        _has_next_needed = true;
-
-        _eof = false;
-        _value_type = null;
-        _value_is_null = false;
-        _value_is_true = false;
-
-        _value_len = 0;
-        _value_start = 0;
-        _value_lob_remaining = 0;
-        _value_lob_is_ready = false;
-
-        _annotation_count = 0;
-
-        _is_in_struct = false;
-        _struct_is_ordered = false;
-        _parent_tid = 0;
-        _container_top = 0;
-    }
-
-    public void close()
-        throws IOException
-    {
-        _input.close();
-        utf8Decoder.close();
-        pooledUtf8InputBuffer.close();
-    }
-
-    static private final int  POS_OFFSET        = 0;
-    static private final int  TYPE_LIMIT_OFFSET = 1;
-    // All type IDs can fit in one byte.
-    static private final long TYPE_MASK         = 0xff;
-    // The limit is restricted to 7 bytes (see readVarUIntOrEOF(boolean longAllowed)), leaving space for one byte
-    // to hold the type ID. Shift the limit 8 bits left to make room for the type ID byte.
-    static private final int  LIMIT_SHIFT       = 8;
-    static private final int  POS_STACK_STEP    = 2;
-
-    private final void push(int type, long position, long local_remaining)
-    {
-        int oldlen = _container_stack.length;
-        if ((_container_top + POS_STACK_STEP) >= oldlen) {
-            int newlen = oldlen * 2;
-            long[] temp = new long[newlen];
-            System.arraycopy(_container_stack, 0, temp, 0, oldlen);
-            _container_stack = temp;
-        }
-        _container_stack[_container_top + POS_OFFSET]  = position;
-        long type_limit = local_remaining;
-        type_limit <<= LIMIT_SHIFT;
-        type_limit  |= (type & TYPE_MASK);
-        _container_stack[_container_top + TYPE_LIMIT_OFFSET] = type_limit;
-        _container_top += POS_STACK_STEP;
-    }
-    private final long get_top_position() {
-        assert(_container_top > 0);
-        long pos = _container_stack[(_container_top - POS_STACK_STEP) + POS_OFFSET];
-        return pos;
-    }
-    private final int get_top_type() {
-        assert(_container_top > 0);
-        long type_limit = _container_stack[(_container_top - POS_STACK_STEP) + TYPE_LIMIT_OFFSET];
-        int type = (int)(type_limit & TYPE_MASK);
-        if (type < 0 || type > _Private_IonConstants.tidDATAGRAM) {
-            throwErrorAt("invalid type id in parent stack");
-        }
-        return type;
-    }
-    private final long get_top_local_remaining() {
-        assert(_container_top > 0);
-        long type_limit = _container_stack[_container_top - POS_STACK_STEP + TYPE_LIMIT_OFFSET];
-        return type_limit >> LIMIT_SHIFT;
-    }
-    private final void pop() {
-        assert(_container_top > 0);
-        _container_top -= POS_STACK_STEP;
-    }
-    public boolean hasNext()
-    {
-        if (!_eof && _has_next_needed) {
-            try {
-                has_next_helper_raw();
-            }
-            catch (IOException e) {
-                error(e);
-            }
-        }
-        return !_eof;
-    }
-    public IonType next()
-    {
-        if (_eof) {
-            return null;
-        }
-        if (_has_next_needed) {
-            try {
-                has_next_helper_raw();
-            }
-            catch (IOException e) {
-                error(e);
-            }
-        }
-        _has_next_needed = true;
-        // this should only be null here if we're at eof
-        assert( _value_type != null || _eof == true);
-        return _value_type;
-    }
-    //from IonConstants
-    //public static final byte[] BINARY_VERSION_MARKER_1_0 =
-    //    { (byte) 0xE0,
-    //      (byte) 0x01,
-    //      (byte) 0x00,
-    //      (byte) 0xEA };
-    private static final int BINARY_VERSION_MARKER_TID = _Private_IonConstants.getTypeCode(_Private_IonConstants.BINARY_VERSION_MARKER_1_0[0] & 0xff);
-    private static final int BINARY_VERSION_MARKER_LEN = _Private_IonConstants.getLowNibble(_Private_IonConstants.BINARY_VERSION_MARKER_1_0[0] & 0xff);
-    private final void has_next_helper_raw() throws IOException
-    {
-        clear_value();
-        while (_value_tid == -1 && !_eof) {
-            switch (_state) {
-            case S_BEFORE_FIELD:
-                assert _value_field_id == SymbolTable.UNKNOWN_SYMBOL_ID;
-                _value_field_id = read_field_id();
-                if (_value_field_id == UnifiedInputStreamX.EOF) {
-                    // FIXME why is EOF ever okay in the middle of a struct?
-                    assert UnifiedInputStreamX.EOF == SymbolTable.UNKNOWN_SYMBOL_ID;
-                    _eof = true;
-                    break;
-                }
-                // fall through to try to read the type id right now
-            case S_BEFORE_TID:
-                _state = State.S_BEFORE_VALUE; // read_type_id may change this for null and bool values
-                _value_tid = read_type_id();
-                if (_value_tid == UnifiedInputStreamX.EOF) {
-                    _state = State.S_EOF;
-                    _eof = true;
-                    break;
-                }
-                if (_value_tid == _Private_IonConstants.tidNopPad) {
-                    // skips size of pad and resets State machine
-                    skip(_value_len);
-                    clear_value();
-                    break;
-                }
-                else if (_value_tid == _Private_IonConstants.tidTypedecl) {
-                    assert (_value_tid == (BINARY_VERSION_MARKER_TID & 0xff)); // the bvm tid happens to be type decl
-                    if (_value_len == BINARY_VERSION_MARKER_LEN ) {
-                        if (getDepth() != 0) {
-                            // In Ion text, we can interpret an IVM in the wrong position as an ordinary Symbol,
-                            // but in Ion binary, the BVM is unambiguously an IVM rather than a Symbol, and it
-                            // is not allowed in any container type.
-                            throw newErrorAt("Encountered IVM type code E0 below the top level");
-                        }
-                        // this isn't valid for any type descriptor except the first byte
-                        // of a 4 byte version marker - so lets read the rest
-                        load_version_marker();
-                        _value_type = IonType.SYMBOL;
-                    }
-                    else {
-                        // if it's not a bvm then it's an ordinary annotated value
-
-                        // The next call changes our positions to that of the
-                        // wrapped value, but we need to remember the overall
-                        // wrapper position.
-                        long wrapperStart = _position_start;
-                        long wrapperLen   = _position_len;
-
-                        _value_type = load_annotation_start_with_value_type();
-
-                        // Wrapper and wrapped value should finish together!
-                        long wrapperFinish = wrapperStart + wrapperLen;
-                        long wrappedValueFinish = _position_start + _position_len;
-                        if (wrapperFinish != wrappedValueFinish) {
-                            throw newErrorAt(String.format("Wrapper length mismatch: wrapper %s wrapped value %s", wrapperFinish, wrappedValueFinish));
-                        }
-
-                        _position_start = wrapperStart;
-                        _position_len   = wrapperLen;
-                    }
-                }
-                else {
-                    // if it's not a typedesc then we just get the IonType and we're done
-                    _value_type = get_iontype_from_tid(_value_tid);
-                }
-                break;
-            case S_BEFORE_VALUE:
-                skip(_value_len);
-                // fall through to "after value"
-            case S_AFTER_VALUE:
-                if (isInStruct()) {
-                    _state = State.S_BEFORE_FIELD;
-                }
-                else {
-                    _state = State.S_BEFORE_TID;
-                }
-                break;
-            case S_EOF:
-                break;
-            default:
-                error("internal error: raw binary reader in invalid state!");
-            }
-        }
-        // we always want to exit here
-        _has_next_needed = false;
-        return;
-    }
-    private final void load_version_marker() throws IOException
-    {
-        for (int ii=1; ii<_Private_IonConstants.BINARY_VERSION_MARKER_1_0.length; ii++) {
-            int b = read();
-            if (b != (_Private_IonConstants.BINARY_VERSION_MARKER_1_0[ii] & 0xff)) {
-                throwErrorAt("invalid binary image");
-            }
-        }
-        // so it's a 4 byte version marker - make it look like
-        // the symbol $ion_1_0 ...
-        _value_tid = _Private_IonConstants.tidSymbol;
-        _value_len = 0; // so skip will go the right place - here
-        _value_start = 0;
-        _v.setValue(ION_1_0_SID);
-        _v.setAuthoritativeType(AS_TYPE.int_value);
-        // _value_type = IonType.SYMBOL;  we do this in the caller so it's easier to see
-        _value_is_null = false;
-        _value_lob_is_ready = false;
-        _annotations.clear();
-        _value_field_id = SymbolTable.UNKNOWN_SYMBOL_ID;
-        _state = State.S_AFTER_VALUE;
-    }
-    private final IonType load_annotation_start_with_value_type() throws IOException
-    {
-        IonType value_type;
-
-        // we need to skip over the annotations to read
-        // the actual type id byte for the value.  We'll
-        // save the annotations using a save point, which
-        // will pin the input buffers until we free this,
-        // not later than the next call to hasNext().
-
-        int alen = readVarUInt();
-        _annotations.start(getPosition(), 0);
-        skip(alen);
-        _annotations.markEnd();
-
-        // this will both get the type id and it will reset the
-        // length as well (over-writing the len + annotations value
-        // that is there now, before the call)
-        _value_tid = read_type_id();
-        if (_value_tid == _Private_IonConstants.tidNopPad) {
-            throwErrorAt("NOP padding is not allowed within annotation wrappers.");
-        }
-        if (_value_tid == UnifiedInputStreamX.EOF) {
-            throwErrorAt("unexpected EOF encountered where a type descriptor byte was expected");
-        }
-        if (_value_tid == _Private_IonConstants.tidTypedecl) {
-            throwErrorAt("An annotation wrapper may not contain another annotation wrapper.");
-        }
-
-        value_type = get_iontype_from_tid(_value_tid);
-        assert( value_type != null );
-
-        return value_type;
-    }
-
-    protected final int load_annotations() {
-        switch (_state) {
-        case S_BEFORE_VALUE:
-        case S_AFTER_VALUE:
-            if (_annotations.isDefined()) {
-                long local_remaining_save = _local_remaining;
-                _input._save_points.savePointPushActive(_annotations, getPosition(), 0);
-                _local_remaining =  NO_LIMIT; // limit will be handled by the save point
-                _annotation_count = 0;
-
-                try {
-                    do {
-                        int a = readVarUIntOrEOF();
-                        if (a == UnifiedInputStreamX.EOF) {
-                            break;
-                        }
-                        load_annotation_append(a);
-                    } while (!isEOF());
-                }
-                catch (IOException e) {
-                    error(e);
-                }
-
-                _input._save_points.savePointPopActive(_annotations);
-                _local_remaining = local_remaining_save;
-                _annotations.clear();
-            }
-            // else the count stays zero (or it was previously set)
-            break;
-        default:
-            throw new IllegalStateException("annotations require the value to be ready");
-        }
-        return _annotation_count;
-    }
-
-    private final void load_annotation_append(int a)
-    {
-        int oldlen = _annotation_ids.length;
-        if (_annotation_count >= oldlen) {
-            int newlen = oldlen * 2;
-            int[] temp = new int[newlen];
-            System.arraycopy(_annotation_ids, 0, temp, 0, oldlen);
-            _annotation_ids = temp;
-        }
-        _annotation_ids[_annotation_count++] =  a;
-    }
-    private final void clear_value()
-    {
-        _value_type = null;
-        _value_tid  = -1;
-        _value_is_null = false;
-        _value_lob_is_ready = false;
-        _annotations.clear();
-        _v.clear();
-        _annotation_count = 0;
-        _value_field_id = SymbolTable.UNKNOWN_SYMBOL_ID;
-    }
-
-    /**
-     * @return the field SID, or -1 if at EOF.
-     */
-    private final int read_field_id() throws IOException
-    {
-        int field_id = readVarUIntOrEOF();
-        return field_id;
-    }
-    private final int read_type_id() throws IOException
-    {
-        long start_of_tid   = _input.getPosition();
-        long start_of_value = start_of_tid + 1;
-
-        int td = read();
-        if (td < 0) {
-            return UnifiedInputStreamX.EOF;
-        }
-        int tid = _Private_IonConstants.getTypeCode(td);
-        long len = _Private_IonConstants.getLowNibble(td);
-
-        // NOP Padding
-        if (tid == _Private_IonConstants.tidNull && len != _Private_IonConstants.lnIsNull) {
-            if (len == _Private_IonConstants.lnIsVarLen) {
-                len = readVarUInt();
-            }
-            _state = _is_in_struct ? State.S_BEFORE_FIELD : State.S_BEFORE_TID;
-            tid = _Private_IonConstants.tidNopPad; // override typeId to use Pad marker
-        }
-        else if (len == _Private_IonConstants.lnIsVarLen) {
-            // For now, only allow *container* lengths to exceed Integer.MAX_VALUE.
-            // Note: for annotated scalars that exceed the limit, this method will be called again for the wrapped
-            // value's type ID, and will fail.
-            boolean isLongLengthAllowed = (
-                tid == _Private_IonConstants.tidTypedecl // Annotation wrapper
-                    || tid == _Private_IonConstants.tidList
-                    || tid == _Private_IonConstants.tidSexp
-                    || tid == _Private_IonConstants.tidStruct
-            );
-            len = readVarUInt(isLongLengthAllowed);
-            start_of_value = _input.getPosition();
-        }
-        else if (tid == _Private_IonConstants.tidNull) {
-            _value_is_null = true;
-            len = 0;
-            _state = State.S_AFTER_VALUE;
-        }
-        else if (len == _Private_IonConstants.lnIsNull) {
-            _value_is_null = true;
-            len = 0;
-            _state = State.S_AFTER_VALUE;
-        }
-        else if (tid == _Private_IonConstants.tidBoolean) {
-            switch ((int) len) {
-                case _Private_IonConstants.lnBooleanFalse:
-                    _value_is_true = false;
-                    break;
-                case _Private_IonConstants.lnBooleanTrue:
-                    _value_is_true = true;
-                    break;
-                default:
-                    throwErrorAt("invalid length nibble in boolean value: "+len);
-                    break;
-            }
-            len = 0;
-            _state = State.S_AFTER_VALUE;
-        }
-        else if (tid == _Private_IonConstants.tidStruct) {
-            if ((_struct_is_ordered = (len == 1))) {
-                // special case of an ordered struct, it gets the
-                // otherwise impossible to have length of 1
-                len = readVarUInt(true);
-                if (len == 0) {
-                    throwErrorAt("Structs flagged as having ordered keys must contain at least one key/value pair.");
-                }
-                start_of_value = _input.getPosition();
-            }
-        }
-        _value_tid = tid;
-        _value_len = len;
-        // TODO Keeping track of _value_start is only necessary because top-level
-        // symbol values are treated differently than all other values: they
-        // are read during has_next_helper_user in order to compare them
-        // against the IVM (symbol 2). This behavior is actually contrary to
-        // the spec, and leads to the reader position being advanced PAST
-        // the value BEFORE a *Value() method is even called. Once that is fixed,
-        // _value_start can be removed, and _input._pos can be used to find the
-        // start of the value at the current valid position.
-        // amazon-ion/ion-java/issues/88 tracks the fix for bringing IVM handling up to
-        // spec.
-        _value_start = start_of_value;
-        _position_len = len + (start_of_value - start_of_tid);
-        _position_start = start_of_tid;
-        return tid;
-    }
-    private final IonType get_iontype_from_tid(int tid)
-    {
-        IonType t = null;
-        switch (tid) {
-        case _Private_IonConstants.tidNull:      // 0
-            t = IonType.NULL;
-            break;
-        case _Private_IonConstants.tidBoolean:   // 1
-            t = IonType.BOOL;
-            break;
-        case _Private_IonConstants.tidPosInt:    // 2
-        case _Private_IonConstants.tidNegInt:    // 3
-            t = IonType.INT;
-            break;
-        case _Private_IonConstants.tidFloat:     // 4
-            t = IonType.FLOAT;
-            break;
-        case _Private_IonConstants.tidDecimal:   // 5
-            t = IonType.DECIMAL;
-            break;
-        case _Private_IonConstants.tidTimestamp: // 6
-            t = IonType.TIMESTAMP;
-            break;
-        case _Private_IonConstants.tidSymbol:    // 7
-            t = IonType.SYMBOL;
-            break;
-        case _Private_IonConstants.tidString:    // 8
-            t = IonType.STRING;
-            break;
-        case _Private_IonConstants.tidClob:      // 9
-            t = IonType.CLOB;
-            break;
-        case _Private_IonConstants.tidBlob:      // 10 A
-            t = IonType.BLOB;
-            break;
-        case _Private_IonConstants.tidList:      // 11 B
-            t = IonType.LIST;
-            break;
-        case _Private_IonConstants.tidSexp:      // 12 C
-            t = IonType.SEXP;
-            break;
-        case _Private_IonConstants.tidStruct:    // 13 D
-            t = IonType.STRUCT;
-            break;
-        case _Private_IonConstants.tidTypedecl:  // 14 E
-            t = null;  // we don't know yet
-            break;
-        default:
-            throw newErrorAt("unrecognized value type encountered: "+tid);
-        }
-        return t;
-    }
-    public void stepIn()
-    {
-        if (_value_type == null || _eof) {
-            throw new IllegalStateException();
-        }
-        switch (_value_type) {
-        case STRUCT:
-        case LIST:
-        case SEXP:
-            break;
-        default:
-            throw new IllegalStateException();
-        }
-        if (_value_is_null) {
-            if (_state != State.S_AFTER_VALUE) {
-                assert( _state == State.S_AFTER_VALUE );
-            }
-        }
-        else {
-            if (_state != State.S_BEFORE_VALUE) {
-                assert( _state == State.S_BEFORE_VALUE );
-            }
-        }
-        // first push place where we'll take up our next
-        // value processing when we step out
-        long curr_position = getPosition();
-        long next_position = curr_position + _value_len;
-        long  next_remaining = _local_remaining;
-        if (next_remaining != NO_LIMIT) {
-            next_remaining -= _value_len;
-            if (next_remaining < 0) {
-                next_remaining = 0; // we'll see and EOF down the road  TODO: should we error now?
-            }
-        }
-        push(_parent_tid, next_position, next_remaining);
-        _is_in_struct = (_value_tid == _Private_IonConstants.tidStruct);
-        _local_remaining = _value_len;
-        _state = _is_in_struct ? State.S_BEFORE_FIELD : State.S_BEFORE_TID;
-        _parent_tid = _value_tid;
-        clear_value();
-        _has_next_needed = true;
-    }
-    public void stepOut()
-    {
-        if (getDepth() < 1) {
-            throw new IllegalStateException(IonMessages.CANNOT_STEP_OUT);
-        }
-        // first we get the top values, then we
-        // pop them all off in one fell swoop.
-        long next_position   = get_top_position();
-        long local_remaining = get_top_local_remaining();
-        int  parent_tid      = get_top_type();
-        pop();
-        _eof = false;
-        _parent_tid = parent_tid;
-        // later, only after we've skipped to our new location: _local_remaining = local_remaining;
-        if (_parent_tid == _Private_IonConstants.tidStruct) {
-            _is_in_struct = true;
-            _state = State.S_BEFORE_FIELD;
-        }
-        else {
-            _is_in_struct = false;
-            _state = State.S_BEFORE_TID;
-        }
-        _has_next_needed = true;
-
-        clear_value();
-
-        long curr_position = getPosition();
-        if (next_position > curr_position) {
-            try {
-                long distance = next_position - curr_position;
-                int  max_skip = Integer.MAX_VALUE - 1; // -1 just in case
-                while (distance > max_skip) {
-                    skip(max_skip);
-                    distance -= max_skip;
-                }
-                if (distance > 0) {
-                    skip(distance);
-                }
-            }
-            catch (IOException e) {
-                error(e);
-            }
-        }
-        else if (next_position < curr_position) {
-            String message = "invalid position during stepOut, current position "
-                           + curr_position
-                           + " next value at "
-                           + next_position;
-            error(message);
-        }
-        assert(next_position == getPosition());
-        _local_remaining = local_remaining;
-    }
-    public int byteSize()
-    {
-        int len;
-        switch (_value_type) {
-        case BLOB:
-        case CLOB:
-            break;
-        default:
-            throw new IllegalStateException("only valid for LOB values");
-        }
-        if (!_value_lob_is_ready) {
-            if (_value_is_null) {
-                len = 0;
-            }
-            else {
-                len = (int) _value_len;
-            }
-            _value_lob_remaining = len;
-            _value_lob_is_ready = true;
-        }
-        return _value_lob_remaining;
-    }
-    public byte[] newBytes()
-    {
-        int len = byteSize(); // does out validation for us
-        byte[] bytes;
-        if (_value_is_null) {
-            bytes = null;
-        }
-        else {
-            bytes = new byte[len];
-            getBytes(bytes, 0, len);
-        }
-        return bytes;
-    }
-    public int getBytes(byte[] buffer, int offset, int len)
-    {
-        int value_len = byteSize(); // again validation
-        if (value_len > len) {
-            value_len = len;
-        }
-        int read_len = readBytes(buffer, offset, value_len);
-        return read_len;
-    }
-    public int readBytes(byte[] buffer, int offset, int len)
-    {
-        if (offset < 0 || len < 0) {
-            throw new IllegalArgumentException();
-        }
-        if (len < 1) {
-            return 0;
-        }
-        int read_len;
-        try {
-            read_len = read(buffer, offset, len);
-            _value_lob_remaining -= read_len;
-        }
-        catch (IOException e) {
-            read_len = -1;
-            error(e);
-        }
-        if (_value_lob_remaining == 0) {
-            _state = State.S_AFTER_VALUE;
-        }
-        else {
-            _value_len = _value_lob_remaining;
-        }
-        return read_len;
-    }
-    public int getDepth()
-    {
-        return (_container_top / POS_STACK_STEP);
-    }
-    public IonType getType()
-    {
-        //if (_has_next_needed) {
-        //    throw new IllegalStateException("getType() isn't valid until you have called next()");
-        //}
-        return _value_type;
-    }
-    public boolean isInStruct()
-    {
-        return _is_in_struct;
-    }
-    public boolean isNullValue()
-    {
-        return _value_is_null;
-    }
-    //
-    //  helper read routines - these were lifted
-    //  from SimpleByteBuffer.SimpleByteReader
-    //
-    private final int read() throws IOException
-    {
-        if (_local_remaining != NO_LIMIT) {
-            if (_local_remaining < 1) {
-                return UnifiedInputStreamX.EOF;
-            }
-            _local_remaining--;
-        }
-        return _input.read();
-    }
-    private final int read(byte[] dst, int start, int len) throws IOException
-    {
-        if (dst == null || start < 0 || len < 0 || start + len > dst.length) {
-            // no need to test this start >= dst.length ||
-            // since we test start+len > dst.length which is the correct test
-            throw new IllegalArgumentException();
-        }
-        int read;
-        if (_local_remaining == NO_LIMIT) {
-            read = _input.read(dst, start, len);
-        }
-        else {
-            if (len > _local_remaining) {
-                if (_local_remaining < 1) {
-                    throwUnexpectedEOFException();
-                }
-                len = (int) _local_remaining;
-            }
-            read = _input.read(dst, start, len);
-            _local_remaining -= read;
-        }
-        return read;
-    }
-    /**
-     * Uses {@link #read(byte[], int, int)} until the entire length is read.
-     * This method will block until the request is satisfied.
-     *
-     * @param buf       The buffer to read to.
-     * @param offset    The offset of the buffer to read from.
-     * @param len       The length of the data to read.
-     */
-    public void readAll(byte[] buf, int offset, int len) throws IOException
-    {
-        int rem = len;
-        while (rem > 0)
-        {
-            int amount = read(buf, offset, rem);
-            if (amount <= 0)
-            {
-                throwUnexpectedEOFException();
-            }
-            rem -= amount;
-            offset += amount;
-        }
-    }
-    private final boolean isEOF() {
-        if (_local_remaining > 0) return false;
-        if (_local_remaining == NO_LIMIT) {
-            return _input.isEOF();
-        }
-        return true;
-    }
-    private final long getPosition() {
-        long pos = _input.getPosition();
-        return pos;
-    }
-    private final void skip(long len) throws IOException
-    {
-        if (len < 0) {
-            // no need to test this start >= dst.length ||
-            // since we test start+len > dst.length which is the correct test
-            throw new IllegalArgumentException();
-        }
-        if (_local_remaining == NO_LIMIT) {
-            while (len > 0) {
-                int toSkip = (int) Math.min(Integer.MAX_VALUE, len);
-                _input.skip(toSkip);
-                len -= toSkip;
-            }
-        }
-        else {
-            if (len > _local_remaining) {
-                if (_local_remaining < 1) {
-                    throwUnexpectedEOFException();
-                }
-                len = _local_remaining;
-            }
-            _local_remaining -= len;
-            while (len > 0) {
-                int toSkip = (int) Math.min(Integer.MAX_VALUE, len);
-                _input.skip(toSkip);
-                len -= toSkip;
-            }
-        }
-        return;
-    }
-    protected final long readULong(int len) throws IOException
-    {
-        long    retvalue = 0;
-        int b;
-        switch (len) {
-        default:
-            throw new IonException("value too large for Java long");
-        case 8:
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 8) | b;
-        case 7:
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 8) | b;
-        case 6:
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 8) | b;
-        case 5:
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 8) | b;
-        case 4:
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 8) | b;
-        case 3:
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 8) | b;
-        case 2:
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 8) | b;
-        case 1:
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 8) | b;
-        case 0:
-            // do nothing, it's just a 0 length is a 0 value
-        }
-        return retvalue;
-    }
-    protected final BigInteger readBigInteger(int len, boolean is_negative) throws IOException
-    {
-        BigInteger value;
-        if (len > 0) {
-            byte[] bits = new byte[len];
-            readAll(bits, 0, len);
-            int signum = is_negative ? -1 : 1;
-            value = new BigInteger(signum, bits);
-        }
-        else {
-            value = BigInteger.ZERO;
-        }
-        return value;
-    }
-    protected final int readVarInt() throws IOException
-    {
-        return readVarInt(read());
-    }
-    /**
-     * Reads an integer value, returning null to mean -0.
-     * @throws IOException
-     */
-    protected final Integer readVarInteger() throws IOException
-    {
-        int firstByte = read();
-
-        // if byte represents -0 returns null
-        if (firstByte == 0xC0) {
-            return null;
-        }
-
-        return readVarInt(firstByte);
-    }
-    /**
-     * reads a varInt after the first byte was read. The first byte is used to specify the sign and -0 has different
-     * representation on the protected API that was called
-     *
-     * @param firstByte last varInt octet
-     */
-    private int readVarInt(int firstByte) throws IOException {
-        // VarInt uses the high-order bit of the last octet as a marker; some (but not all) 5-byte VarInts can fit
-        // into a Java int.
-        // To validate overflows we accumulate the VarInt in a long and then check if it can be represented by an int
-        //
-        // see https://amazon-ion.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields
-
-        long retValue = 0;
-        int b = firstByte;
-        boolean isNegative = false;
-
-        for (;;) {
-            if (b < 0) throwUnexpectedEOFException();
-            if ((b & 0x40) != 0) {
-                isNegative = true;
-            }
-
-            retValue = (b & 0x3F);
-            if ((b & 0x80) != 0) break;
-
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retValue = (retValue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-            // for the rest, they're all the same
-
-
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retValue = (retValue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-            // for the rest, they're all the same
-
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retValue = (retValue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-            // for the rest, they're all the same
-
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retValue = (retValue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-
-            // Don't support anything above a 5-byte VarInt for now, see https://github.com/amazon-ion/ion-java/issues/146
-            throwVarIntOverflowException(5);
-        }
-
-        if (isNegative) {
-            retValue = -retValue;
-        }
-
-        int retValueAsInt = (int) retValue;
-        if (retValue != ((long) retValueAsInt)) {
-            throwVarIntOverflowException(4);
-        }
-
-        return retValueAsInt;
-    }
-
-    protected final int readVarUIntOrEOF() throws IOException
-    {
-        return (int) readVarUIntOrEOF(false);
-    }
-
-    /**
-     * Attempts to read a VarUInt.
-     * @param longAllowed true if values over Integer.MAX_VALUE are allowed. If false, such values will raise an error.
-     * @return the value of the VarUInt, or -1 if EOF has been reached.
-     * @throws IOException if thrown when reading from the stream.
-     */
-    protected final long readVarUIntOrEOF(boolean longAllowed) throws IOException
-    {
-// VarUInt uses the high-order bit of the last octet as a marker; some (but not all) 5-byte VarUInt can fit
-        // into a Java int.
-        // To validate overflows we accumulate the VarInt in a long and then check if it can be represented by an int
-        //
-        // see https://amazon-ion.github.io/ion-docs/docs/binary.html#varuint-and-varint-fields
-
-        long retvalue = 0;
-        int  b;
-        for (;;) { // fake loop to create a "goto done"
-            if ((b = read()) < 0) {
-                return UnifiedInputStreamX.EOF;
-            }
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-
-            if ((b = read()) < 0) throwUnexpectedEOFException();
-            retvalue = (retvalue << 7) | (b & 0x7F);
-            if ((b & 0x80) != 0) break;
-
-            // Don't support anything above a 7-byte VarUInt for now, see https://github.com/amazon-ion/ion-java/issues/146
-            throwVarIntOverflowException(7);
-        }
-
-        if (!longAllowed) {
-            int retValueAsInt = (int) retvalue;
-            if (retvalue != ((long) retValueAsInt)) {
-                throwVarIntOverflowException(4);
-            }
-
-            return retValueAsInt;
-        }
-        return retvalue;
-    }
-    protected final int readVarUInt() throws IOException
-    {
-        return (int) readVarUInt(false);
-    }
-
-    /**
-     * Attempts to read a VarUInt, raising an error if EOF is encountered.
-     * @param longAllowed true if values over Integer.MAX_VALUE are allowed. If false, such values will raise an error.
-     * @return the value of the VarUInt.
-     * @throws IOException if thrown when reading from the stream.
-     */
-    protected final long readVarUInt(boolean longAllowed) throws IOException
-    {
-        long varUInt = readVarUIntOrEOF(longAllowed);
-        if (varUInt == UnifiedInputStreamX.EOF) {
-            throwUnexpectedEOFException();
-        }
-
-        return varUInt;
-    }
-
-    protected final double readFloat(int len) throws IOException
-    {
-        if (len == 0)
-        {
-            // special case, return pos zero
-            return 0.0d;
-        }
-        if (len != 4 && len != 8)
-        {
-            throw new IOException("Length of float read must be 0, 4, or 8");
-        }
-
-        long dBits = this.readULong(len);
-
-        return len == 4
-            ? (double) Float.intBitsToFloat((int) (dBits & 0xffffffffL))
-            : Double.longBitsToDouble(dBits);
-    }
-
-    protected final Decimal readDecimal(int len) throws IOException
-    {
-        MathContext mathContext = MathContext.UNLIMITED;
-        Decimal bd;
-        // we only write out the '0' value as the nibble 0
-        if (len == 0) {
-            bd = Decimal.valueOf(0, mathContext);
-        }
-        else {
-            // otherwise we to it the hard way ....
-            long save_limit = NO_LIMIT;
-            if (_local_remaining != NO_LIMIT) {
-                save_limit = _local_remaining - len;
-            }
-            _local_remaining = len;
-            int  exponent = readVarInt();
-            BigInteger value;
-            int signum;
-            if (_local_remaining > 0)
-            {
-                byte[] bits = new byte[(int) _local_remaining];
-                readAll(bits, 0, (int) _local_remaining);
-                signum = 1;
-                if (bits[0] < 0)
-                {
-                    // value is negative, clear the sign
-                    bits[0] &= 0x7F;
-                    signum = -1;
-                }
-                value = new BigInteger(signum, bits);
-            }
-            else {
-                signum = 0;
-                value = BigInteger.ZERO;
-            }
-            // Ion stores exponent, BigDecimal uses the negation "scale"
-            int scale = -exponent;
-            if (value.signum() == 0 && signum == -1)
-            {
-                assert value.equals(BigInteger.ZERO);
-                bd = Decimal.negativeZero(scale, mathContext);
-            }
-            else
-            {
-                bd = Decimal.valueOf(value, scale, mathContext);
-            }
-            _local_remaining = save_limit;
-        }
-        return bd;
-    }
-
-    /**
-     * @see IonBinary.Reader#readTimestampValue
-     */
-    protected final Timestamp readTimestamp(int len) throws IOException
-    {
-        if (len < 1) {
-            // nothing to do here - and the timestamp will be NULL
-            return null;
-        }
-
-        int         year = 0, month = 0, day = 0, hour = 0, minute = 0, second = 0;
-        BigDecimal  frac = null;
-        long        save_limit = NO_LIMIT;
-        if (_local_remaining != NO_LIMIT) {
-            save_limit = _local_remaining - len;
-        }
-        _local_remaining = len;  // > 0
-
-        // first up is the offset, which requires a special int reader
-        // to return the -0 as a null Integer
-        Integer offset = readVarInteger();
-        // now we'll read the struct values from the input stream
-
-        // year is from 0001 to 9999
-        // or 0x1 to 0x270F or 14 bits - 1 or 2 bytes
-        year  = readVarUInt();
-        Precision p = Precision.YEAR; // our lowest significant option
-
-        // now we look for months
-        if (_local_remaining > 0) {
-            month = readVarUInt();
-            p = Precision.MONTH;
-
-            // now we look for days
-            if (_local_remaining > 0) {
-                day   = readVarUInt();
-                p = Precision.DAY; // our lowest significant option
-
-                // now we look for hours and minutes
-                if (_local_remaining > 0) {
-                    hour   = readVarUInt();
-                    minute = readVarUInt();
-                    p = Precision.MINUTE;
-                    if (_local_remaining > 0) {
-                        second = readVarUInt();
-                        p = Precision.SECOND;
-                        if (_local_remaining > 0) {
-                            // now we read in our actual "milliseconds since the epoch"
-                            frac = readDecimal((int) _local_remaining);
-                            if (frac.compareTo(BigDecimal.ZERO) < 0 || frac.compareTo(BigDecimal.ONE) >= 0) {
-                                throwErrorAt(
-                                        "The fractional seconds value in a timestamp must be greater than or "
-                                              + "equal to zero and less than one."
-                                );
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        // restore out outer limit(s)
-        _local_remaining  = save_limit;
-        // now we let timestamp put it all together
-        try {
-            Timestamp val =
-                Timestamp.createFromUtcFields(p, year, month, day, hour,
-                                              minute, second, frac, offset);
-            return val;
-        }
-        catch (IllegalArgumentException e)
-        {
-            // Rewrap to the expected type.
-            throw newErrorAt("Invalid timestamp encoding: " + e.getMessage());
-        }
-    }
-
-    protected final String readString(int numberOfBytes) throws IOException
-    {
-        ByteBuffer utf8InputBuffer = pooledUtf8InputBuffer.getBuffer();
-        // If the string we're reading is small enough to fit in our reusable buffer, we can avoid the overhead
-        // of looping and bounds checking.
-        if (numberOfBytes <= utf8InputBuffer.capacity()) {
-            return readStringWithReusableBuffer(numberOfBytes, utf8InputBuffer);
-        }
-
-        utf8Decoder.prepareDecode(numberOfBytes);
-
-        long save_limit = NO_LIMIT;
-        if (_local_remaining != NO_LIMIT) {
-            save_limit = _local_remaining - numberOfBytes;
-        }
-        _local_remaining = numberOfBytes;
-
-        // The following loop will:
-        // * Fill the input buffer with utf8 bytes
-        // * Write decoded chars to the decoding buffer
-        // * Move any remaining partial character bytes to the front of the buffer
-        // * Repeat until the requested number of bytes have been decoded.
-        // * Create a new String object from the contents of the decoding buffer.
-        int totalBytesRead = 0;
-        int carryoverBytes = 0;
-        while (totalBytesRead < numberOfBytes) {
-
-            int bytesRemaining = numberOfBytes - totalBytesRead;
-            // When decoding, it's possible to have 'carryover' bytes left in the buffer which represent
-            // a partial unicode character. We need to leave these in the buffer so that we can complete the
-            // partial character in the next call to read().
-            int capacityRemaining = utf8InputBuffer.array().length - carryoverBytes;
-            int bytesToRead = Math.min(bytesRemaining, capacityRemaining);
-
-            int bytesRead = read(utf8InputBuffer.array(), carryoverBytes, bytesToRead);
-            if (bytesRead <= 0) {
-                // UnifiedInputStreamX doesn't adhere to InputStream's API. See the comments on
-                // UnifiedInputStreamX#read() for more information.
-                throwUnexpectedEOFException();
-            }
-
-            totalBytesRead += bytesRead;
-
-            utf8InputBuffer.position(0);
-            utf8InputBuffer.limit(carryoverBytes + bytesRead);
-
-            utf8Decoder.partialDecode(utf8InputBuffer, totalBytesRead >= numberOfBytes);
-
-            // Shift leftover partial character bytes (if any) to the beginning of the buffer
-            carryoverBytes = utf8InputBuffer.remaining();
-            if (carryoverBytes > 0) {
-                System.arraycopy(
-                        utf8InputBuffer.array(),
-                        utf8InputBuffer.position(),
-                        utf8InputBuffer.array(),
-                        0,
-                        carryoverBytes
-                );
-            }
-        }
-
-        _local_remaining = save_limit;
-
-        return utf8Decoder.finishDecode();
-    }
-
-    private String readStringWithReusableBuffer(int numberOfBytes, ByteBuffer utf8InputBuffer) throws IOException {
-        long save_limit = NO_LIMIT;
-        if (_local_remaining != NO_LIMIT) {
-            save_limit = _local_remaining - numberOfBytes;
-        }
-        _local_remaining = numberOfBytes;
-        readAll(utf8InputBuffer.array(), 0, numberOfBytes);
-        _local_remaining = save_limit;
-
-        utf8InputBuffer.position(0);
-        utf8InputBuffer.limit(numberOfBytes);
-
-        return utf8Decoder.decode(utf8InputBuffer, numberOfBytes);
-    }
-
-    private final void throwUnexpectedEOFException() throws IOException {
-        throwErrorAt("unexpected EOF in value");
-    }
-    private final void throwVarIntOverflowException(int byteLimit) throws IOException {
-        throwErrorAt("int in stream is too long to fit in " + byteLimit + " bytes.");
-    }
-
-    protected IonException newErrorAt(String msg) {
-        String msg2 = msg + " at position " + getPosition();
-        return new IonException(msg2);
-    }
-    protected void throwErrorAt(String msg) {
-        throw newErrorAt(msg);
-    }
-    protected void error(String msg) {
-        throw new IonException(msg);
-    }
-    protected void error(Exception e) {
-        throw new IonException(e);
-    }
-}
diff --git a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java b/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
deleted file mode 100644
index 78bc9f16e1..0000000000
--- a/src/com/amazon/ion/impl/IonReaderBinarySystemX.java
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.amazon.ion.impl;
-
-import static com.amazon.ion.IonType.SYMBOL;
-import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-
-import com.amazon.ion.Decimal;
-import com.amazon.ion.IntegerSize;
-import com.amazon.ion.IonType;
-import com.amazon.ion.NullValueException;
-import com.amazon.ion.SymbolTable;
-import com.amazon.ion.SymbolToken;
-import com.amazon.ion.Timestamp;
-import com.amazon.ion.UnknownSymbolException;
-import com.amazon.ion.impl._Private_ScalarConversions.AS_TYPE;
-import com.amazon.ion.impl._Private_ScalarConversions.ValueVariant;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.Iterator;
-
-
-class IonReaderBinarySystemX
-    extends IonReaderBinaryRawX
-    implements _Private_ReaderWriter
-{
-    SymbolTable _symbols;
-
-    @Deprecated
-    IonReaderBinarySystemX(byte[] bytes, int offset, int length) {
-        this(UnifiedInputStreamX.makeStream(bytes, offset, length));
-    }
-
-    IonReaderBinarySystemX(UnifiedInputStreamX in)
-    {
-        super();
-        init_raw(in);
-        // TODO check IVM to determine version: amazon-ion/ion-java#19, amazon-ion/ion-java#24
-        _symbols = SharedSymbolTable.getSystemSymbolTable(1);
-    }
-
-
-    //
-    // public methods that typically user level methods
-    // these are filled in by either the system reader
-    // or the user reader.  Here they just fail.
-    //
-
-    public final int getFieldId()
-    {
-        return _value_field_id;
-    }
-
-    public SymbolToken[] getTypeAnnotationSymbols()
-    {
-        load_annotations();
-
-        int count = _annotation_count;
-        if (count == 0) return SymbolToken.EMPTY_ARRAY;
-
-        SymbolTable symtab = getSymbolTable();
-
-        SymbolToken[] result = new SymbolToken[count];
-        for (int i = 0; i < count; i++)
-        {
-            int sid = _annotation_ids[i];
-            String text = symtab.findKnownSymbol(sid);
-            result[i] = new SymbolTokenImpl(text, sid);
-        }
-
-        return result;
-    }
-
-    private void load_once()
-    {
-        if (_v.isEmpty()) {
-            try {
-                load_scalar_value();
-            }
-            catch (IOException e) {
-                error(e);
-            }
-        }
-    }
-
-    //
-    //  basic scalar value getters (for actual content)
-    //
-    protected final void prepare_value(int as_type) {
-        load_once();
-        if (as_type != 0 && !_v.hasValueOfType(as_type)) {
-            // we should never get here with a symbol asking for anything other
-            // than a numeric cast (from some other numeric already loaded)
-            if (IonType.SYMBOL.equals(_value_type) && !ValueVariant.isNumericType(as_type)) {
-                assert(IonType.SYMBOL.equals(_value_type) && !ValueVariant.isNumericType(as_type));
-            }
-
-            if (!_v.can_convert(as_type)) {
-                String message = "can't cast from "
-                    +_Private_ScalarConversions.getValueTypeName(_v.getAuthoritativeType())
-                    +" to "
-                    +_Private_ScalarConversions.getValueTypeName(as_type);
-                throw new IllegalStateException(message);
-            }
-            int fnid = _v.get_conversion_fnid(as_type);
-            _v.cast(fnid);
-        }
-    }
-
-    /**
-     * this checks the state of the raw reader to make sure
-     * this is valid.  It also checks for an existing cached
-     * value of the correct type.  It will either cast the
-     * current value from an existing type to the type desired
-     * or it will construct the desired type from the raw
-     * input in the raw reader
-     *
-     * @param value_type desired value type (in local type terms)
-     * @throws IOException
-     */
-    protected final void load_cached_value(int value_type) throws IOException
-    {
-        if (_v.isEmpty()) {
-            load_scalar_value();
-        }
-    }
-
-    static final int MAX_BINARY_LENGTH_INT = 4;
-    static final int MAX_BINARY_LENGTH_LONG = 8;
-    static final BigInteger MIN_LONG_VALUE = BigInteger.valueOf(Long.MIN_VALUE);
-    static final BigInteger MAX_LONG_VALUE = BigInteger.valueOf(Long.MAX_VALUE);
-
-    private final void load_scalar_value() throws IOException
-    {
-        // make sure we're trying to load a scalar value here
-        switch(_value_type) {
-        case NULL:
-        case BOOL:
-        case INT:
-        case FLOAT:
-        case DECIMAL:
-        case TIMESTAMP:
-        case SYMBOL:
-        case STRING:
-            break;
-        default:
-            return;
-        }
-
-        // this will be true when the value_type is null as
-        // well as when we encounter a null of any other type
-        if (_value_is_null) {
-            _v.setValueToNull(_value_type);
-            _v.setAuthoritativeType(AS_TYPE.null_value);
-            return;
-        }
-
-        switch (_value_type) {
-        default:
-            return;
-        case BOOL:
-            _v.setValue(_value_is_true);
-            _v.setAuthoritativeType(AS_TYPE.boolean_value);
-            break;
-        case INT:
-            boolean is_negative = _value_tid == _Private_IonConstants.tidNegInt;
-
-            if (_value_len == 0) {
-                if (is_negative) {
-                    throwIllegalNegativeZeroException();
-                }
-                int v = 0;
-                _v.setValue(v);
-                _v.setAuthoritativeType(AS_TYPE.int_value);
-            }
-            else if (_value_len <= MAX_BINARY_LENGTH_LONG) {
-                long v = readULong((int) _value_len);
-
-                if (v < 0) {
-                    // we probably can't fit this magnitude properly into a Java long
-                    int signum = !is_negative ? 1 : -1;
-                    BigInteger big = IonBinary.unsignedLongToBigInteger(signum, v);
-                    _v.setValue(big);
-                    // boundary condition
-                    if (big.compareTo(MIN_LONG_VALUE) < 0 || big.compareTo(MAX_LONG_VALUE) > 0) {
-                        _v.setAuthoritativeType(AS_TYPE.bigInteger_value);
-                    } else {
-                        // fits in long
-                        _v.addValue(big.longValue()); // keep the BigInteger value set in case the user wants to resurrect it as such
-                        _v.setAuthoritativeType(AS_TYPE.long_value);
-                    }
-                }
-                else {
-                    if (is_negative) {
-                        if(v == 0) {
-                            throwIllegalNegativeZeroException();
-                        }
-                        v = -v;
-                    }
-                    if (v < Integer.MIN_VALUE || v > Integer.MAX_VALUE) {
-                        _v.setValue(v);
-                        _v.setAuthoritativeType(AS_TYPE.long_value);
-                    } else {
-                        _v.setValue((int)v);
-                        _v.setAuthoritativeType(AS_TYPE.int_value);
-                    }
-                }
-            }
-            else {
-                BigInteger v = readBigInteger((int) _value_len, is_negative);
-                _v.setValue(v);
-                _v.setAuthoritativeType(AS_TYPE.bigInteger_value);
-            }
-            break;
-        case FLOAT:
-            double d;
-            if (_value_len == 0) {
-                d = 0.0;
-            }
-            else {
-                d = readFloat((int) _value_len);
-            }
-            _v.setValue(d);
-            _v.setAuthoritativeType(AS_TYPE.double_value);
-            break;
-        case DECIMAL:
-            Decimal dec = readDecimal((int) _value_len);
-            _v.setValue(dec);
-            _v.setAuthoritativeType(AS_TYPE.decimal_value);
-            break;
-        case TIMESTAMP:
-            // TODO: it looks like a 0 length return a null timestamp - is that right?
-            Timestamp t = readTimestamp((int) _value_len);
-            _v.setValue(t);
-            _v.setAuthoritativeType(AS_TYPE.timestamp_value);
-            break;
-        case SYMBOL:
-            long sid = readULong((int) _value_len);
-            if (sid < 0 || sid > Integer.MAX_VALUE) {
-                String message = "symbol id ["
-                               + sid
-                               + "] out of range "
-                               + "(1-"
-                               + Integer.MAX_VALUE
-                               + ")";
-                throwErrorAt(message);
-            }
-            // TODO: is treating this as an int too misleading?
-            _v.setValue((int)sid);
-            _v.setAuthoritativeType(AS_TYPE.int_value);
-            break;
-        case STRING:
-            String s = readString((int) _value_len);
-            _v.setValue(s);
-            _v.setAuthoritativeType(AS_TYPE.string_value);
-            break;
-        }
-        _state = State.S_AFTER_VALUE;
-    }
-
-    //
-    // public value routines
-    //
-
-    @Override
-    public boolean isNullValue()
-    {
-        return _value_is_null;
-    }
-
-    public boolean booleanValue()
-    {
-        prepare_value(AS_TYPE.boolean_value);
-        return _v.getBoolean();
-    }
-
-    public double doubleValue()
-    {
-        prepare_value(AS_TYPE.double_value);
-        return _v.getDouble();
-    }
-
-    private void checkIsIntApplicableType()
-    {
-        if (_value_type != IonType.INT &&
-          _value_type != IonType.DECIMAL &&
-          _value_type != IonType.FLOAT)
-        {
-          throw new IllegalStateException("Unexpected value type: " + _value_type);
-        }
-    }
-
-    public int intValue()
-    {
-        checkIsIntApplicableType();
-
-        prepare_value(AS_TYPE.int_value);
-        return _v.getInt();
-    }
-
-    public long longValue()
-    {
-        checkIsIntApplicableType();
-
-        prepare_value(AS_TYPE.long_value);
-        return _v.getLong();
-    }
-
-    private void checkIsBigIntegerApplicableType()
-    {
-        if (_value_type != IonType.INT &&
-                _value_type != IonType.FLOAT)
-        {
-            throw new IllegalStateException("Unexpected value type: " + _value_type);
-        }
-    }
-
-    public BigInteger bigIntegerValue()
-    {
-        checkIsBigIntegerApplicableType();
-
-        if (_value_is_null) {
-            return null;
-        }
-        prepare_value(AS_TYPE.bigInteger_value);
-        return _v.getBigInteger();
-    }
-
-    public BigDecimal bigDecimalValue()
-    {
-        if (_value_is_null) {
-            return null;
-        }
-        prepare_value(AS_TYPE.decimal_value);
-        return _v.getBigDecimal();
-    }
-
-    public Decimal decimalValue()
-    {
-        if (_value_is_null) {
-            return null;
-        }
-        prepare_value(AS_TYPE.decimal_value);
-        return _v.getDecimal();
-    }
-
-    public Date dateValue()
-    {
-        if (_value_is_null) {
-            return null;
-        }
-        prepare_value(AS_TYPE.date_value);
-        return _v.getDate();
-    }
-
-    public Timestamp timestampValue()
-    {
-        if (_value_is_null) {
-            return null;
-        }
-        prepare_value(AS_TYPE.timestamp_value);
-        return _v.getTimestamp();
-    }
-
-    public IntegerSize getIntegerSize()
-    {
-        load_once();
-        if (_value_type != IonType.INT || _v.isNull())
-        {
-            return null;
-        }
-        return _Private_ScalarConversions.getIntegerSize(_v.getAuthoritativeType());
-    }
-
-    public String stringValue()
-    {
-        if (! IonType.isText(_value_type)) throw new IllegalStateException("Unexpected value type: " + _value_type);
-        if (_value_is_null) return null;
-
-        if (_value_type == SYMBOL) {
-            if (!_v.hasValueOfType(AS_TYPE.string_value)) {
-                int sid = getSymbolId();
-                String name = _symbols.findKnownSymbol(sid);
-                if (name == null) {
-                    throw new UnknownSymbolException(sid);
-                }
-                _v.addValue(name);
-            }
-        }
-        else {
-            prepare_value(AS_TYPE.string_value);
-        }
-        return _v.getString();
-    }
-
-    public SymbolToken symbolValue()
-    {
-        if (_value_type != SYMBOL) throw new IllegalStateException("Unexpected value type: " + _value_type);
-        if (_value_is_null) return null;
-
-        int sid = getSymbolId();
-        assert sid != UNKNOWN_SYMBOL_ID;
-        String text = _symbols.findKnownSymbol(sid);
-
-        return new SymbolTokenImpl(text, sid);
-    }
-
-    int getSymbolId()
-    {
-        if (_value_type != SYMBOL) throw new IllegalStateException("Unexpected value type: " + _value_type);
-        if (_value_is_null) throw new NullValueException();
-
-        prepare_value(AS_TYPE.int_value);
-        return _v.getInt();
-    }
-
-    //
-    // unsupported public methods that require a symbol table
-    // to operate - which is only supported on a user reader
-    //
-    public String getFieldName()
-    {
-        String name;
-        if (_value_field_id == SymbolTable.UNKNOWN_SYMBOL_ID) {
-            name = null;
-        }
-        else {
-            name = _symbols.findKnownSymbol(_value_field_id);
-            if (name == null) {
-                throw new UnknownSymbolException(_value_field_id);
-            }
-        }
-        return name;
-    }
-
-    public SymbolToken getFieldNameSymbol()
-    {
-        if (_value_field_id == SymbolTable.UNKNOWN_SYMBOL_ID) return null;
-        int sid = _value_field_id;
-        String text = _symbols.findKnownSymbol(sid);
-        return new SymbolTokenImpl(text, sid);
-    }
-
-    public final Iterator<String> iterateTypeAnnotations()
-    {
-        String[] annotations = getTypeAnnotations();
-        return _Private_Utils.stringIterator(annotations);
-    }
-
-    public final String[] getTypeAnnotations()
-    {
-        load_annotations();
-        String[] anns;
-        if (_annotation_count < 1) {
-            anns = _Private_Utils.EMPTY_STRING_ARRAY;
-        }
-        else {
-            anns = new String[_annotation_count];
-            for (int ii=0; ii<_annotation_count; ii++) {
-                anns[ii] = _symbols.findKnownSymbol(_annotation_ids[ii]);
-                if (anns[ii] == null) {
-                    throw new UnknownSymbolException(_annotation_ids[ii]);
-                }
-            }
-        }
-        return anns;
-    }
-
-    public SymbolTable getSymbolTable()
-    {
-        return _symbols;
-    }
-
-    // system readers don't skip any symbol tables
-    public SymbolTable pop_passed_symbol_table()
-    {
-        return null;
-    }
-
-    private void throwIllegalNegativeZeroException() {
-        throw newErrorAt("negative zero is illegal in the binary format");
-    }
-}
diff --git a/src/com/amazon/ion/impl/IonReaderBinaryUserX.java b/src/com/amazon/ion/impl/IonReaderBinaryUserX.java
deleted file mode 100644
index a9ea04080f..0000000000
--- a/src/com/amazon/ion/impl/IonReaderBinaryUserX.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.amazon.ion.impl;
-
-import com.amazon.ion.IonSystem;
-import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
-import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
-
-import com.amazon.ion.IonCatalog;
-import com.amazon.ion.IonType;
-import com.amazon.ion.OffsetSpan;
-import com.amazon.ion.RawValueSpanProvider;
-import com.amazon.ion.SeekableReader;
-import com.amazon.ion.Span;
-import com.amazon.ion.SpanProvider;
-import com.amazon.ion.SymbolTable;
-import com.amazon.ion.SymbolToken;
-import com.amazon.ion.UnknownSymbolException;
-import com.amazon.ion.impl.UnifiedInputStreamX.FromByteArray;
-import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
-import com.amazon.ion.impl._Private_ScalarConversions.AS_TYPE;
-import java.io.IOException;
-import java.util.Iterator;
-
-final class IonReaderBinaryUserX
-    extends IonReaderBinarySystemX
-    implements _Private_ReaderWriter
-{
-    /**
-     * This is the physical start-of-stream offset when this reader was created.
-     * It must be subtracted from the logical offsets exposed by
-     * {@link OffsetSpan}s.
-     */
-    private final int _physical_start_offset;
-    private final _Private_LocalSymbolTableFactory _lstFactory;
-
-    IonCatalog  _catalog;
-
-    private static class IonReaderBinarySpan
-        extends DowncastingFaceted
-        implements Span, OffsetSpan
-    {
-        private final boolean _isSeekable;
-
-        public IonReaderBinarySpan(boolean isSeekable)
-        {
-            _isSeekable = isSeekable;
-        }
-
-        State       _state;
-        long        _offset;
-        long        _limit;
-        SymbolTable _symbol_table;
-
-        public long getStartOffset()
-        {
-            return _offset;
-        }
-
-        public long getFinishOffset()
-        {
-            return _limit;
-        }
-
-        public boolean isSeekable()
-        {
-            return _isSeekable;
-        }
-
-    }
-
-    public IonReaderBinaryUserX(IonCatalog catalog,
-                                _Private_LocalSymbolTableFactory lstFactory,
-                                UnifiedInputStreamX userBytes,
-                                int physicalStartOffset)
-    {
-        super(userBytes);
-        _physical_start_offset = physicalStartOffset;
-        init_user(catalog);
-        _lstFactory = lstFactory;
-    }
-
-    //FIXME: PERF_TEST was :private
-    final void init_user(IonCatalog catalog)
-    {
-        // TODO check IVM to determine version: amazon-ion/ion-java#19, amazon-ion/ion-java#24
-        _symbols = SharedSymbolTable.getSystemSymbolTable(1);
-        _catalog = catalog;
-    }
-
-    /**
-     * Determines the abstract position of the reader, such that one can
-     * later {@link #seek} back to it.
-     * <p>
-     * The current implementation only works when the reader is positioned on
-     * a value (not before, between, or after values). In other words, one
-     * should only call this method when {@link #getType()} is non-null.
-     *
-     * @param beforeTid -
-     *          When true, the position returned starts before the
-     *          type/length octet.
-     *          When false, the position returned starts after the
-     *          type/length octet and any optional length octets.
-     *
-     * @return the current position; not null.
-     *
-     * @throws IllegalStateException if the reader doesn't have a current
-     * value.
-     */
-    public Span getCurrentPosition(boolean beforeTid)
-    {
-        if (getType() == null)
-        {
-            throw new IllegalStateException("IonReader isn't positioned on a value");
-        }
-        // Only spans that include the TID octet are seekable.
-        IonReaderBinarySpan pos = new IonReaderBinarySpan(beforeTid);
-        long start = beforeTid ?  _position_start : _value_start;
-        long len = beforeTid ? _position_len : _value_len;
-        pos._offset = start - _physical_start_offset;
-        pos._limit = pos._offset + len;
-        pos._symbol_table = _symbols;
-        pos._state = _state;
-        return pos;
-    }
-
-    public byte[] getCurrentBuffer()
-    {
-        return _input._bytes;
-    }
-
-
-    public void seek(IonReaderBinarySpan position)
-    {
-        IonReaderBinarySpan pos = position;
-
-        if (pos == null)
-        {
-            throw new IllegalArgumentException("Position invalid for binary reader");
-        }
-        if (!(_input instanceof FromByteArray))
-        {
-            throw new UnsupportedOperationException("Binary seek not implemented for non-byte array backed sources");
-        }
-
-        // TODO test that span is within the bounds of the input byte[]
-
-        // manually reset the input specific type of input stream
-        FromByteArray input = (FromByteArray)_input;
-        input._pos   = (int) (pos._offset + _physical_start_offset);
-        input._limit = (int) (pos._limit  + _physical_start_offset);
-
-        // TODO: these (eof and save points) should be put into
-        //       a re-init method on the input stream
-        input._eof = false;
-        for (;;) {
-            SavePoint sp = input._save_points._active_stack;
-            if (sp == null) break;
-            input._save_points.savePointPopActive(sp);
-            sp.free();
-        }
-
-        // reset the raw reader
-        re_init_raw();
-
-        // reset the system reader
-        // - nothing to do
-
-        // reset the user reader
-        init_user(this._catalog);
-
-        // now we need to set our symbol table
-        _symbols = pos._symbol_table;
-
-        // and the other misc state variables we had
-        // read past before getPosition gets called
-        //           Don't do this, we'll re-read the data from the stream.
-        //           Otherwise, this reader will be in the wrong state.
-        //           For example, getType() will return non-null but that
-        //           shouldn't happen until the user calls next().
-//        _state         = pos._state;
-//        _value_type    = pos._value_type;
-//        _value_is_null = pos._value_is_null;
-//        _value_is_true = pos._value_is_true;
-
-//        _is_in_struct = false;
-    }
-
-
-    @Override
-    public IonType next()
-    {
-        IonType t = null;
-        if (hasNext()) {
-            _has_next_needed = true;
-            t = _value_type;
-        }
-        return t;
-    }
-
-    @Override
-    public boolean hasNext()
-    {
-        if (!_eof && _has_next_needed) {
-            clear_system_value_stack();
-            try {
-                while (!_eof && _has_next_needed) {
-                    has_next_helper_user();
-                }
-            }
-            catch (IOException e) {
-                error(e);
-            }
-        }
-        return !_eof;
-    }
-
-
-    private final void has_next_helper_user() throws IOException
-    {
-        super.hasNext();
-        if (getDepth() == 0 && !_value_is_null) {
-            if (_value_tid == _Private_IonConstants.tidSymbol) {
-                if (load_annotations() == 0) {
-                    // $ion_1_0 is read as an IVM only if it is not annotated
-                    load_cached_value(AS_TYPE.int_value);
-                    int sid = _v.getInt();
-                    if (sid == ION_1_0_SID) {
-                        _symbols = SharedSymbolTable.getSystemSymbolTable(1);
-                        push_symbol_table(_symbols);
-                        _has_next_needed = true;
-                    }
-                }
-            }
-            else if (_value_tid == _Private_IonConstants.tidStruct) {
-                int count = load_annotations();
-                if (count > 0 && _annotation_ids[0] == ION_SYMBOL_TABLE_SID) {
-                    _symbols = _lstFactory.newLocalSymtab(_catalog, this, false);
-                    push_symbol_table(_symbols);
-                    _has_next_needed = true;
-                }
-            }
-            else {
-                assert (_value_tid != _Private_IonConstants.tidTypedecl);
-            }
-        }
-    }
-
-    private void validateSymbolToken(SymbolToken symbol) {
-        if (symbol != null) {
-            if (symbol.getText() == null && symbol.getSid() > getSymbolTable().getMaxId()) {
-                throw new UnknownSymbolException(symbol.getSid());
-            }
-        }
-    }
-
-    @Override
-    public SymbolToken[] getTypeAnnotationSymbols() {
-        SymbolToken[] annotations = super.getTypeAnnotationSymbols();
-        for (SymbolToken annotation : annotations) {
-            validateSymbolToken(annotation);
-        }
-        return annotations;
-    }
-
-    @Override
-    public final SymbolToken getFieldNameSymbol() {
-        SymbolToken fieldName = super.getFieldNameSymbol();
-        validateSymbolToken(fieldName);
-        return fieldName;
-    }
-
-    @Override
-    public final SymbolToken symbolValue() {
-        SymbolToken symbol = super.symbolValue();
-        validateSymbolToken(symbol);
-        return symbol;
-    }
-
-    //  This code handles the skipped symbol table
-    //  support - it is cloned in IonReaderTextUserX,
-    //  IonReaderBinaryUserX and _Private_IonWriterBase
-    //
-    //  SO ANY FIXES HERE WILL BE NEEDED IN THOSE
-    //  THREE LOCATIONS AS WELL.
-    //
-    private int _symbol_table_top = 0;
-    private SymbolTable[] _symbol_table_stack = new SymbolTable[3]; // 3 is rare, IVM followed by a local sym tab with open content
-    private void clear_system_value_stack()
-    {
-        while (_symbol_table_top > 0) {
-            _symbol_table_top--;
-            _symbol_table_stack[_symbol_table_top] = null;
-        }
-    }
-    private void push_symbol_table(SymbolTable symbols)
-    {
-        assert(symbols != null);
-        if (_symbol_table_top >= _symbol_table_stack.length) {
-            int new_len = _symbol_table_stack.length * 2;
-            SymbolTable[] temp = new SymbolTable[new_len];
-            System.arraycopy(_symbol_table_stack, 0, temp, 0, _symbol_table_stack.length);
-            _symbol_table_stack = temp;
-        }
-        _symbol_table_stack[_symbol_table_top++] = symbols;
-    }
-    @Override
-    public SymbolTable pop_passed_symbol_table()
-    {
-        if (_symbol_table_top <= 0) {
-            return null;
-        }
-        _symbol_table_top--;
-        SymbolTable symbols = _symbol_table_stack[_symbol_table_top];
-        _symbol_table_stack[_symbol_table_top] = null;
-        return symbols;
-    }
-
-
-    //========================================================================
-    // Facet support
-
-
-    @Override
-    public <T> T asFacet(Class<T> facetType)
-    {
-        if (facetType == SpanProvider.class)
-        {
-            return facetType.cast(new SpanProviderFacet());
-        }
-
-        // TODO amazon-ion/ion-java/issues/17 support seeking over InputStream
-        if (_input instanceof FromByteArray)
-        {
-            if (facetType == SeekableReader.class)
-            {
-                return facetType.cast(new SeekableReaderFacet());
-            }
-            if (facetType == RawValueSpanProvider.class)
-            {
-                return facetType.cast(new RawValueSpanProviderFacet());
-            }
-        }
-
-        if (facetType == _Private_ByteTransferReader.class)
-        {
-            // This is a rather sketchy use of Facets, since the availability
-            // of the facet depends upon the current state of this subject,
-            // and that can change over time.
-
-            // TODO amazon-ion/ion-java/issues/16 Our {@link #transferCurrentValue} doesn't handle
-            //  field names and annotations.
-
-            // Ensure there's a contiguous buffer we can copy.
-            if (_input instanceof UnifiedInputStreamX.FromByteArray
-                && getTypeAnnotationSymbols().length == 0
-                && ! isInStruct())
-            {
-                return facetType.cast(new ByteTransferReaderFacet());
-            }
-        }
-
-        return super.asFacet(facetType);
-    }
-
-
-    private class SpanProviderFacet implements SpanProvider
-    {
-        public Span currentSpan()
-        {
-            return getCurrentPosition(true);
-        }
-    }
-
-    private class RawValueSpanProviderFacet implements RawValueSpanProvider
-    {
-
-        public Span valueSpan()
-        {
-            return getCurrentPosition(false);
-        }
-
-        public byte[] buffer()
-        {
-            return getCurrentBuffer();
-        }
-
-    }
-
-    private class SeekableReaderFacet
-        extends SpanProviderFacet
-        implements SeekableReader
-    {
-
-        public void hoist(Span span)
-        {
-            if (! (span instanceof IonReaderBinarySpan) || !((IonReaderBinarySpan)span).isSeekable())
-            {
-                throw new IllegalArgumentException("Span isn't compatible with this reader.");
-            }
-
-            seek((IonReaderBinarySpan) span);
-        }
-
-    }
-
-
-    private class ByteTransferReaderFacet implements _Private_ByteTransferReader
-    {
-        public void transferCurrentValue(_Private_ByteTransferSink sink)
-            throws IOException
-        {
-            // Ensure there's a contiguous buffer we can copy.
-            // TODO Copy from a stream should also be possible.
-            if (! (_input instanceof UnifiedInputStreamX.FromByteArray))
-            {
-                throw new UnsupportedOperationException();
-            }
-
-            // TODO amazon-ion/ion-java/issues/16 wrong if current value has a field name or
-            //   annotations since the position is in the wrong place.
-            // TODO when implementing that, be careful to handle the case where
-            //   the writer already holds a pending field name or annotations!
-            //   Meaning: the user has set it and then called writeValue().
-
-            int inOffset = (int) _position_start;
-            int inLen    = (int) _position_len;
-
-            sink.writeBytes(_input._bytes, inOffset, inLen);
-        }
-    }
-}
diff --git a/test/com/amazon/ion/impl/VarIntTest.java b/test/com/amazon/ion/impl/VarIntTest.java
deleted file mode 100644
index 1e297b317b..0000000000
--- a/test/com/amazon/ion/impl/VarIntTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.amazon.ion.impl;
-
-import org.junit.Test;
-import com.amazon.ion.IonException;
-import com.amazon.ion.IonTestCase;
-import com.amazon.ion.system.SimpleCatalog;
-
-import java.io.ByteArrayInputStream;
-import java.math.BigInteger;
-
-public class VarIntTest extends IonTestCase {
-
-    @Test
-    public void readMaxVarUInt() throws Exception {
-        assertEquals(Integer.MAX_VALUE, makeReader("077F7F7FFF").readVarUInt());
-    }
-
-    @Test(expected = IonException.class)
-    public void overflowVarUInt() throws Exception {
-        makeReader("0800000080").readVarUInt(); // Integer.MAX_VALUE + 1
-    }
-
-    @Test(expected = IonException.class)
-    public void readEOFVarUInt() throws Exception {
-        makeReader("").readVarUInt();
-    }
-
-    @Test
-    public void readMaxVarUIntOrEOF() throws Exception {
-        assertEquals(Integer.MAX_VALUE, makeReader("077F7F7FFF").readVarUIntOrEOF());
-    }
-
-    @Test(expected = IonException.class)
-    public void overflowVarUIntOrEOF() throws Exception {
-        makeReader("0800000080").readVarUIntOrEOF(); // Integer.MAX_VALUE + 1
-    }
-
-    @Test
-    public void readEOFVarUIntOrEOF() throws Exception {
-        assertEquals(UnifiedInputStreamX.EOF, makeReader("").readVarUIntOrEOF());
-    }
-
-    @Test
-    public void readMaxVarInt() throws Exception {
-        assertEquals(Integer.MAX_VALUE, makeReader("077F7F7FFF").readVarInt());
-    }
-
-    @Test
-    public void readMinVarInt() throws Exception {
-        assertEquals(Integer.MIN_VALUE, makeReader("4800000080").readVarInt());
-    }
-
-    @Test(expected = IonException.class)
-    public void readVarIntOverflow() throws Exception {
-        makeReader("0800000080").readVarInt(); // Integer.MAX_VALUE + 1
-    }
-
-    @Test(expected = IonException.class)
-    public void readVarIntUnderflow() throws Exception {
-        makeReader("4800000081").readVarInt(); // Integer.MIN_VALUE - 1
-    }
-
-    @Test
-    public void readMaxVarInteger() throws Exception {
-        assertEquals(Integer.MAX_VALUE, (int) makeReader("077F7F7FFF").readVarInteger());
-    }
-
-    @Test
-    public void readMinVarInteger() throws Exception {
-        assertEquals(Integer.MIN_VALUE, (int) makeReader("4800000080").readVarInteger());
-    }
-
-    @Test(expected = IonException.class)
-    public void readVarIntegerOverflow() throws Exception {
-        makeReader("0800000080").readVarInteger(); // Integer.MAX_VALUE + 1
-    }
-
-    @Test(expected = IonException.class)
-    public void readVarIntegerUnderflow() throws Exception {
-        makeReader("4800000081").readVarInt(); // Integer.MIN_VALUE - 1
-    }
-
-    @Test
-    public void readVarIntegerNegativeZero() throws Exception {
-        assertNull(makeReader("C0").readVarInteger());
-    }
-
-    private IonReaderBinaryUserX makeReader(String hex) throws Exception {
-        ByteArrayInputStream input = new ByteArrayInputStream(parseHexBinary("E00100EA" + hex));
-        UnifiedInputStreamX uis = UnifiedInputStreamX.makeStream(input);
-        uis.skip(4);
-
-        return new IonReaderBinaryUserX(new SimpleCatalog(), LocalSymbolTable.DEFAULT_LST_FACTORY, uis, 0);
-    }
-
-    private static byte[] parseHexBinary(String str) {
-        int len = str.length();
-        if (len % 2 != 0) {
-            throw new IllegalArgumentException("str must have even length");
-        }
-
-        byte[] result = new byte[len / 2];
-
-        for (int i = 0; i < len; i += 2) {
-            int high = parseHexChar(str.charAt(i));
-            int low  = parseHexChar(str.charAt(i + 1));
-            result[i / 2] = (byte) ((high << 4) | low);
-        }
-
-        return result;
-    }
-
-    private static int parseHexChar(char c) {
-        if (c >= '0' && c <= '9') {
-            return c - '0';
-        }
-        if (c >= 'a' && c <= 'f') {
-            return (c - 'a') + 10;
-        }
-        if (c >= 'A' && c <= 'F') {
-            return (c - 'A') + 10;
-        }
-        throw new IllegalArgumentException("invalid hex character: " + c);
-    }
-}

From 533f060eadec451b13927b26653dc54c84ae94d0 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 30 Jun 2023 18:13:37 -0700
Subject: [PATCH 274/490] Deletes the legacy incremental binary reader
 implementation.

---
 .../ion/impl/IonReaderBinaryIncremental.java  | 1943 ----------
 .../ion/impl/IonReaderLookaheadBuffer.java    |  962 -----
 .../ion/impl/ReaderLookaheadBuffer.java       |   46 -
 .../ion/impl/ReaderLookaheadBufferBase.java   |  201 -
 .../impl/IonReaderBinaryIncrementalTest.java  | 3409 -----------------
 .../impl/IonReaderLookaheadBufferTest.java    | 1237 ------
 .../IonReaderLookaheadBufferTestBase.java     |  679 ----
 7 files changed, 8477 deletions(-)
 delete mode 100644 src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
 delete mode 100644 src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
 delete mode 100644 src/com/amazon/ion/impl/ReaderLookaheadBuffer.java
 delete mode 100644 src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java
 delete mode 100644 test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
 delete mode 100644 test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java
 delete mode 100644 test/com/amazon/ion/impl/IonReaderLookaheadBufferTestBase.java

diff --git a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java b/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
deleted file mode 100644
index 8c166fc70c..0000000000
--- a/src/com/amazon/ion/impl/IonReaderBinaryIncremental.java
+++ /dev/null
@@ -1,1943 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package com.amazon.ion.impl;
-
-import com.amazon.ion.Decimal;
-import com.amazon.ion.IntegerSize;
-import com.amazon.ion.IonBufferConfiguration;
-import com.amazon.ion.IonCatalog;
-import com.amazon.ion.IonException;
-import com.amazon.ion.IonReader;
-import com.amazon.ion.IonStruct;
-import com.amazon.ion.IonType;
-import com.amazon.ion.IonWriter;
-import com.amazon.ion.ReadOnlyValueException;
-import com.amazon.ion.SymbolTable;
-import com.amazon.ion.SymbolToken;
-import com.amazon.ion.Timestamp;
-import com.amazon.ion.UnknownSymbolException;
-import com.amazon.ion.ValueFactory;
-import com.amazon.ion.impl.bin.IntList;
-import com.amazon.ion.system.IonReaderBuilder;
-import com.amazon.ion.impl.bin.utf8.Utf8StringDecoder;
-import com.amazon.ion.impl.bin.utf8.Utf8StringDecoderPool;
-import com.amazon.ion.system.SimpleCatalog;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- * This implementation differs from the existing non-incremental binary reader implementation in that if
- * {@link IonReader#next()} returns {@code null} at the top-level, it indicates that there is not (yet) enough data in
- * the stream to complete a top-level value. The user may wait for more data to become available in the stream and
- * call {@link IonReader#next()} again to continue reading. Unlike the non-incremental reader, the incremental reader
- * will never throw an exception due to unexpected EOF during {@code next()}. If, however, {@link IonReader#close()} is
- * called when an incomplete value is buffered, an {@link IonException} will be raised.
- * </p>
- * <p>
- * Although the incremental binary reader implementation provides performance superior to the non-incremental reader
- * implementation for both incremental and non-incremental use cases, there is one caveat: the incremental
- * implementation must be able to buffer an entire top-level value and any preceding system values (Ion version
- * marker(s) and symbol table(s)) in memory. This means that each value and preceding system values must be no larger
- * than any of the following:
- * <ul>
- * <li>The configured maximum buffer size of the {@link IonBufferConfiguration}.</li>
- * <li>The memory available to the JVM.</li>
- * <li>2GB, because the buffer is held in a Java {@code byte[]}, which is indexed by an {@code int}.</li>
- * </ul>
- * This will not be a problem for the vast majority of Ion streams, as it is
- * rare for a single top-level value or symbol table to exceed a few megabytes in size. However, if the size of the
- * stream's values risk exceeding the available memory, then this implementation must not be used.
- * </p>
- * <p>
- * To enable this implementation, use {@code IonReaderBuilder.withIncrementalReadingEnabled(true)}.
- * </p>
- */
-class IonReaderBinaryIncremental implements IonReader, _Private_ReaderWriter, _Private_IncrementalReader {
-
-    /*
-     * Potential future enhancements:
-     * - Split this implementation into a user-level reader and a system-level reader, like the existing implementation.
-     *   This allows this implementation to be used when the user requests a system reader.
-     * - Do not require buffering an entire top-level value. This would be a pretty major overhaul. It may be possible
-     *   to implement using different buffers for each depth. Doing this may also make it possible to avoid buffering
-     *   a value (at any depth) until stepIn() or *Value() is called on it, enabling faster skip-scanning.
-     * - Allow for this implementation to produce the same non-incremental behavior as the old implementation; namely,
-     *   that running out of data during next() would raise an IonException. See the note in the implementation of
-     *   close() below. Implementing this bullet and the previous two bullets would allow us to remove the old binary
-     *   IonReader implementation.
-     * - Add a builder/constructor option that uses a user-provided byte[] directly. This would allow data to be read
-     *   in-place without the need to copy to a separate buffer. Non-incremental behavior (as described in the previous
-     *   bullet) is likely a requirement of this feature.
-     * - System symbol table configuration needs to be generalized to support future Ion versions. See the constructor,
-     *   resetSymbolTable(), and resetImports().
-     * - When accessed via an iterator, annotations can be parsed incrementally instead of parsing the entire sequence
-     *   up-front.
-     * - Provide users the option to spawn a thread that pre-buffers the next value. There would be two buffers: one
-     *   for the user thread, and one for the pre-fetching thread. They are swapped every time the user calls next().
-     */
-
-    /**
-     * Holds the information that the binary reader must keep track of for containers at any depth.
-     */
-    private static class ContainerInfo {
-
-        /**
-         * The container's type.
-         */
-        private IonType type;
-
-        /**
-         * The byte position of the end of the container.
-         */
-        private int endPosition;
-    }
-
-    /**
-     * The standard {@link IonBufferConfiguration}. This will be used unless the user chooses custom settings.
-     */
-    private static final IonBufferConfiguration STANDARD_BUFFER_CONFIGURATION =
-        IonBufferConfiguration.Builder.standard().build();
-
-    // Constructs ContainerInfo instances.
-    private static final _Private_RecyclingStack.ElementFactory<ContainerInfo> CONTAINER_INFO_FACTORY =
-        new _Private_RecyclingStack.ElementFactory<ContainerInfo>() {
-
-        @Override
-        public ContainerInfo newElement() {
-            return new ContainerInfo();
-        }
-    };
-
-    // Symbol IDs for symbols contained in the system symbol table.
-    private static class SystemSymbolIDs {
-
-        // The system symbol table SID for the text "$ion_symbol_table".
-        private static final int ION_SYMBOL_TABLE_ID = 3;
-
-        // The system symbol table SID for the text "name".
-        private static final int NAME_ID = 4;
-
-        // The system symbol table SID for the text "version".
-        private static final int VERSION_ID = 5;
-
-        // The system symbol table SID for the text "imports".
-        private static final int IMPORTS_ID = 6;
-
-        // The system symbol table SID for the text "symbols".
-        private static final int SYMBOLS_ID = 7;
-
-        // The system symbol table SID for the text "max_id".
-        private static final int MAX_ID_ID = 8;
-    }
-
-    /**
-     * @param value a non-negative number.
-     * @return the exponent of the next power of two greater than the given number.
-     */
-    private static int logBase2(int value) {
-        return 32 - Integer.numberOfLeadingZeros(value == 0 ? 0 : value - 1);
-    }
-
-    /**
-     * Cache of configurations for fixed-sized streams. FIXED_SIZE_CONFIGURATIONS[i] returns a configuration with
-     * buffer size max(8, 2^i). Retrieve a configuration large enough for a given size using
-     * FIXED_SIZE_CONFIGURATIONS(logBase2(size)). Only supports sizes less than or equal to
-     * STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize().
-     */
-    private static final IonBufferConfiguration[] FIXED_SIZE_CONFIGURATIONS;
-
-    static {
-        int maxBufferSizeExponent = logBase2(STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize());
-        FIXED_SIZE_CONFIGURATIONS = new IonBufferConfiguration[maxBufferSizeExponent + 1];
-        for (int i = 0; i <= maxBufferSizeExponent; i++) {
-            // Create a buffer configuration for buffers of size 2^i. The minimum size is 8: the smallest power of two
-            // larger than the minimum buffer size allowed.
-            int size = Math.max(8, (int) Math.pow(2, i));
-            FIXED_SIZE_CONFIGURATIONS[i] = IonBufferConfiguration.Builder.from(STANDARD_BUFFER_CONFIGURATION)
-                .withInitialBufferSize(size)
-                .withMaximumBufferSize(size)
-                .build();
-        }
-    }
-
-    // The final byte of the binary IVM.
-    private static final int IVM_FINAL_BYTE = 0xEA;
-
-    // Isolates the highest bit in a byte.
-    private static final int HIGHEST_BIT_BITMASK = 0x80;
-
-    // Isolates the lowest seven bits in a byte.
-    private static final int LOWER_SEVEN_BITS_BITMASK = 0x7F;
-
-    // Isolates the lowest six bits in a byte.
-    private static final int LOWER_SIX_BITS_BITMASK = 0x3F;
-
-    // The number of significant bits in each UInt byte.
-    private static final int VALUE_BITS_PER_UINT_BYTE = 8;
-
-    // The number of significant bits in each VarUInt byte.
-    private static final int VALUE_BITS_PER_VARUINT_BYTE = 7;
-
-    // An IonCatalog containing zero shared symbol tables.
-    private static final IonCatalog EMPTY_CATALOG = new SimpleCatalog();
-
-    // Initial capacity of the stack used to hold ContainerInfo. Each additional level of nesting in the data requires
-    // a new ContainerInfo. Depths greater than 8 will be rare.
-    private static final int CONTAINER_STACK_INITIAL_CAPACITY = 8;
-
-    // Initial capacity of the ArrayList used to hold the symbol IDs of the annotations on the current value.
-    private static final int ANNOTATIONS_LIST_INITIAL_CAPACITY = 8;
-
-    // Initial capacity of the ArrayList used to hold the text in the current symbol table.
-    private static final int SYMBOLS_LIST_INITIAL_CAPACITY = 128;
-
-    // Single byte negative zero, represented as a VarInt. Often used in timestamp encodings to indicate unknown local
-    // offset.
-    private static final int VAR_INT_NEGATIVE_ZERO = 0xC0;
-
-    // The number of bytes occupied by a Java int.
-    private static final int INT_SIZE_IN_BYTES = 4;
-
-    // The number of bytes occupied by a Java long.
-    private static final int LONG_SIZE_IN_BYTES = 8;
-
-    // The smallest negative 8-byte integer that can fit in a long is -0x80_00_00_00_00_00_00_00.
-    private static final int MOST_SIGNIFICANT_BYTE_OF_MIN_LONG = 0x80;
-
-    // The largest positive 8-byte integer that can fit in a long is 0x7F_FF_FF_FF_FF_FF_FF_FF.
-    private static final int MOST_SIGNIFICANT_BYTE_OF_MAX_LONG = 0x7F;
-
-    // The second-most significant bit in the most significant byte of a VarInt is the sign.
-    private static final int VAR_INT_SIGN_BITMASK = 0x40;
-
-    // 32-bit floats must declare length 4.
-    private static final int FLOAT_32_BYTE_LENGTH = 4;
-
-    // The imports for Ion 1.0 data with no shared user imports.
-    private static final LocalSymbolTableImports ION_1_0_IMPORTS
-        = new LocalSymbolTableImports(SharedSymbolTable.getSystemSymbolTable(1));
-
-    // The InputStream that provides the binary Ion data.
-    private final InputStream inputStream;
-
-    // Wrapper for the InputStream that ensures an entire top-level value is available.
-    private final IonReaderLookaheadBuffer lookahead;
-
-    // Buffer that stores top-level values.
-    private final ResizingPipedInputStream buffer;
-
-    // Converter between scalar types, allowing, for example, for a value encoded as an Ion float to be returned as a
-    // Java `long` via `IonReader.longValue()`.
-    private final _Private_ScalarConversions.ValueVariant scalarConverter;
-
-    // Stack to hold container info. Stepping into a container results in a push; stepping out results in a pop.
-    private final _Private_RecyclingStack<ContainerInfo> containerStack;
-
-    private final Utf8StringDecoder utf8Decoder = Utf8StringDecoderPool.getInstance().getOrCreate();
-
-    // The symbol IDs for the annotations on the current value.
-    private final IntList annotationSids;
-
-    // True if the annotation iterator will be reused across values; otherwise, false.
-    private final boolean isAnnotationIteratorReuseEnabled;
-
-    // Reusable iterator over the annotations on the current value.
-    private final AnnotationIterator annotationIterator;
-
-    // The text representations of the symbol table that is currently in scope, indexed by symbol ID. If the element at
-    // a particular index is null, that symbol has unknown text.
-    private final List<String> symbols;
-
-    // The catalog used by the reader to resolve shared symbol table imports.
-    private final IonCatalog catalog;
-
-    // The shared symbol tables imported by the local symbol table that is currently in scope.
-    private LocalSymbolTableImports imports = ION_1_0_IMPORTS;
-
-    // A map of symbol ID to SymbolToken representation. Because most use cases only require symbol text, this
-    // is used only if necessary to avoid imposing the extra expense on all symbol lookups.
-    private List<SymbolToken> symbolTokensById = null;
-
-    // The cached SymbolTable representation of the current local symbol table. Invalidated whenever a local
-    // symbol table is encountered in the stream.
-    private SymbolTable cachedReadOnlySymbolTable = null;
-
-    // The SymbolTable that was transferred via the last call to pop_passed_symbol_table.
-    private SymbolTable symbolTableLastTransferred = null;
-
-    // The symbol ID of the current value's field name, or -1 if the current value is not in a struct.
-    private int fieldNameSid = -1;
-
-    // The major version of the Ion encoding currently being read.
-    private int majorVersion = 1;
-
-    // The minor version of the Ion encoding currently being read.
-    private int minorVersion = 0;
-
-    // The number of bytes of a lob value that the user has consumed, allowing for piecewise reads.
-    private int lobBytesRead = 0;
-
-    // The type of value at which the reader is currently positioned.
-    private IonType valueType = null;
-
-    // Information about the type ID byte for the value at which the reader is currently positioned.
-    private IonTypeID valueTypeID = null;
-
-    // Indicates whether there are annotations on the current value.
-    private boolean hasAnnotations = false;
-
-    // Indicates whether a complete top-level value is currenty buffered.
-    private boolean completeValueBuffered = false;
-
-    // --- Byte position markers ---
-    // Note: absolute positions/indexes can be used because the bytes that represent a single top-level value are
-    // always handled in two sequential phases: first, the bytes are buffered, and then they are read. These operations
-    // will never be interleaved during the processing of a single value. As a result, the underlying buffer
-    // will always hold all of the bytes for a single top-level value in a contiguous sequence, even if the buffer
-    // has to grow to hold all of the value's bytes.
-
-    // The buffer position of the first byte of the value representation (after the type ID and optional length field).
-    private int valueStartPosition = -1;
-
-    // The buffer position of the byte after the last byte in the value representation.
-    private int valueEndPosition = -1;
-
-    // The buffer position of the first byte of the annotation wrapper for the current value.
-    private int annotationStartPosition = -1;
-
-    // The buffer position of the byte after the last byte in the annotation wrapper for the current value.
-    private int annotationEndPosition = -1;
-
-    // The index of the next byte to peek from the underlying buffer.
-    private int peekIndex = -1;
-
-    // ------
-
-    /**
-     * Constructor.
-     * @param builder the builder containing the configuration for the new reader.
-     * @param inputStream the InputStream that provides binary Ion data.
-     */
-    IonReaderBinaryIncremental(IonReaderBuilder builder, InputStream inputStream) {
-        this.inputStream = inputStream;
-        this.catalog = builder.getCatalog() == null ? EMPTY_CATALOG : builder.getCatalog();
-        if (builder.isAnnotationIteratorReuseEnabled()) {
-            isAnnotationIteratorReuseEnabled = true;
-            annotationIterator = new AnnotationIterator();
-        } else {
-            isAnnotationIteratorReuseEnabled = false;
-            annotationIterator = null;
-        }
-        IonBufferConfiguration configuration = builder.getBufferConfiguration();
-        if (configuration == null) {
-            configuration = STANDARD_BUFFER_CONFIGURATION;
-            if (inputStream instanceof ByteArrayInputStream) {
-                // ByteArrayInputStreams are fixed-size streams. Clamp the reader's internal buffer size at the size of
-                // the stream to avoid wastefully allocating extra space that will never be needed. It is still
-                // preferable for the user to manually specify the buffer size if it's less than the default, as doing
-                // so allows this branch to be skipped.
-                int fixedBufferSize;
-                try {
-                    fixedBufferSize = inputStream.available();
-                } catch (IOException e) {
-                    // ByteArrayInputStream.available() does not throw.
-                    throw new IllegalStateException(e);
-                }
-                if (configuration.getInitialBufferSize() > fixedBufferSize) {
-                    configuration = FIXED_SIZE_CONFIGURATIONS[logBase2(fixedBufferSize)];
-                }
-            }
-        }
-        lookahead = new IonReaderLookaheadBuffer(configuration, inputStream);
-        buffer = (ResizingPipedInputStream) lookahead.getPipe();
-        containerStack = new _Private_RecyclingStack<ContainerInfo>(
-            CONTAINER_STACK_INITIAL_CAPACITY,
-            CONTAINER_INFO_FACTORY
-        );
-        annotationSids = new IntList(ANNOTATIONS_LIST_INITIAL_CAPACITY);
-        symbols = new ArrayList<String>(SYMBOLS_LIST_INITIAL_CAPACITY);
-        scalarConverter = new _Private_ScalarConversions.ValueVariant();
-        resetImports();
-    }
-
-    /**
-     * Reusable iterator over the annotations on the current value.
-     */
-    private class AnnotationIterator implements Iterator<String> {
-
-        // The byte position of the annotation to return from the next call to next().
-        private int nextAnnotationPeekIndex;
-
-        @Override
-        public boolean hasNext() {
-            return nextAnnotationPeekIndex < annotationEndPosition;
-        }
-
-        @Override
-        public String next() {
-            int savedPeekIndex = peekIndex;
-            peekIndex = nextAnnotationPeekIndex;
-            int sid = readVarUInt();
-            nextAnnotationPeekIndex = peekIndex;
-            peekIndex = savedPeekIndex;
-            String annotation = getSymbol(sid);
-            if (annotation == null) {
-                throw new UnknownSymbolException(sid);
-            }
-            return annotation;
-        }
-
-        @Override
-        public void remove() {
-            throw new UnsupportedOperationException("This iterator does not support element removal.");
-        }
-
-        /**
-         * Prepare the iterator to iterate over the annotations on the current value.
-         */
-        void ready() {
-            nextAnnotationPeekIndex = annotationStartPosition;
-        }
-
-        /**
-         * Invalidate the iterator so that all future calls to {@link #hasNext()} will return false until the
-         * next call to {@link #ready()}.
-         */
-        void invalidate() {
-            nextAnnotationPeekIndex = Integer.MAX_VALUE;
-        }
-    }
-
-    /**
-     * Non-reusable iterator over the annotations on the current value. May be iterated even if the reader advances
-     * past the current value.
-     */
-    private class SingleUseAnnotationIterator implements Iterator<String> {
-
-        // All of the annotation SIDs on the current value.
-        private final IntList annotationSids;
-        // The index into `annotationSids` containing the next annotation to be returned.
-        private int index = 0;
-
-        SingleUseAnnotationIterator() {
-            annotationSids = new IntList(getAnnotationSids());
-        }
-
-        @Override
-        public boolean hasNext() {
-            return index < annotationSids.size();
-        }
-
-        @Override
-        public String next() {
-            int sid = annotationSids.get(index);
-            String annotation = getSymbol(sid);
-            if (annotation == null) {
-                throw new UnknownSymbolException(sid);
-            }
-            index++;
-            return annotation;
-        }
-
-        @Override
-        public void remove() {
-            throw new UnsupportedOperationException("This iterator does not support element removal.");
-        }
-    }
-
-    /**
-     * SymbolToken implementation that includes ImportLocation.
-     */
-    static class SymbolTokenImpl implements _Private_SymbolToken {
-
-        // The symbol's text, or null if the text is unknown.
-        private final String text;
-
-        // The local symbol ID of this symbol within a particular local symbol table.
-        private final int sid;
-
-        // The import location of the symbol (only relevant if the text is unknown).
-        private final ImportLocation importLocation;
-
-        SymbolTokenImpl(String text, int sid, ImportLocation importLocation) {
-            this.text = text;
-            this.sid = sid;
-            this.importLocation = importLocation;
-        }
-
-        @Override
-        public String getText() {
-            return text;
-        }
-
-        @Override
-        public String assumeText() {
-            if (text == null) {
-                throw new UnknownSymbolException(sid);
-            }
-            return text;
-        }
-
-        @Override
-        public int getSid() {
-            return sid;
-        }
-
-        // Will be @Override once added to the SymbolToken interface.
-        public ImportLocation getImportLocation() {
-            return importLocation;
-        }
-
-        @Override
-        public String toString() {
-            return String.format("SymbolToken::{text: %s, sid: %d, importLocation: %s}", text, sid, importLocation);
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (!(o instanceof SymbolToken)) return false;
-
-            // NOTE: once ImportLocation is available via the SymbolToken interface, it should be compared here
-            // when text is null.
-            SymbolToken other = (SymbolToken) o;
-            if(getText() == null || other.getText() == null) {
-                return getText() == other.getText();
-            }
-            return getText().equals(other.getText());
-        }
-
-        @Override
-        public int hashCode() {
-            if(getText() != null) return getText().hashCode();
-            return 0;
-        }
-    }
-
-    /**
-     * Gets the system symbol table for the Ion version currently active.
-     * @return a system SymbolTable.
-     */
-    private SymbolTable getSystemSymbolTable() {
-        // Note: Ion 1.1 currently proposes changes to the system symbol table. If this is finalized, then
-        // 'majorVersion' cannot be used to look up the system symbol table; both 'majorVersion' and 'minorVersion'
-        // will need to be used.
-        return SharedSymbolTable.getSystemSymbolTable(majorVersion);
-    }
-
-    /**
-     * Read-only snapshot of the local symbol table at the reader's current position.
-     */
-    private class LocalSymbolTableSnapshot implements SymbolTable, SymbolTableAsStruct {
-
-        // The system symbol table.
-        private final SymbolTable system = IonReaderBinaryIncremental.this.getSystemSymbolTable();
-
-        // The max ID of this local symbol table.
-        private final int maxId;
-
-        // The shared symbol tables imported by this local symbol table.
-        private final LocalSymbolTableImports importedTables;
-
-        // Map representation of this symbol table. Keys are symbol text; values are the lowest symbol ID that maps
-        // to that text.
-        final Map<String, Integer> mapView;
-
-        // List representation of this symbol table, indexed by symbol ID.
-        final List<String> listView;
-
-        private SymbolTableStructCache structCache = null;
-
-        LocalSymbolTableSnapshot() {
-            int importsMaxId = imports.getMaxId();
-            int numberOfLocalSymbols = symbols.size();
-            // Note: 'imports' is immutable, so a clone is not needed.
-            importedTables = imports;
-            maxId = importsMaxId + numberOfLocalSymbols;
-            // Map with initial size the number of symbols and load factor 1, meaning it must be full before growing.
-            // It is not expected to grow.
-            listView = new ArrayList<String>(symbols.subList(0, numberOfLocalSymbols));
-            mapView = new HashMap<String, Integer>((int) Math.ceil(numberOfLocalSymbols / 0.75), 0.75f);
-            for (int i = 0; i < numberOfLocalSymbols; i++) {
-                String symbol = listView.get(i);
-                if (symbol != null) {
-                    mapView.put(symbol, i + importsMaxId + 1);
-                }
-            }
-        }
-
-        @Override
-        public String getName() {
-            return null;
-        }
-
-        @Override
-        public int getVersion() {
-            return 0;
-        }
-
-        @Override
-        public boolean isLocalTable() {
-            return true;
-        }
-
-        @Override
-        public boolean isSharedTable() {
-            return false;
-        }
-
-        @Override
-        public boolean isSubstitute() {
-            return false;
-        }
-
-        @Override
-        public boolean isSystemTable() {
-            return false;
-        }
-
-        @Override
-        public SymbolTable getSystemSymbolTable() {
-            return system;
-        }
-
-        @Override
-        public String getIonVersionId() {
-            return system.getIonVersionId();
-        }
-
-        @Override
-        public SymbolTable[] getImportedTables() {
-            return importedTables.getImportedTables();
-        }
-
-        @Override
-        public int getImportedMaxId() {
-            return importedTables.getMaxId();
-        }
-
-        @Override
-        public SymbolToken find(String text) {
-            SymbolToken token = importedTables.find(text);
-            if (token != null) {
-                return token;
-            }
-            Integer sid = mapView.get(text);
-            if (sid == null) {
-                return null;
-            }
-            // The following per-call allocation is intentional. When weighed against the alternative of making
-            // 'mapView' a 'Map<String, SymbolToken>` instead of a `Map<String, Integer>`, the following points should
-            // be considered:
-            // 1. A LocalSymbolTableSnapshot is only created when getSymbolTable() is called on the reader. The reader
-            // does not use the LocalSymbolTableSnapshot internally. There are two cases when getSymbolTable() would be
-            // called: a) when the user calls it, which will basically never happen, and b) when the user uses
-            // IonSystem.iterate over the reader, in which case each top-level value holds a reference to the symbol
-            // table that was in scope when it occurred. In case a), in addition to rarely being called at all, it
-            // would be even rarer for a user to use find() to retrieve each symbol (especially more than once) from the
-            // returned symbol table. Case b) may be called more frequently, but it remains equally rare that a user
-            // would retrieve each symbol at least once.
-            // 2. If we make mapView a Map<String, SymbolToken>, then we are guaranteeing that we will allocate at least
-            // one SymbolToken per symbol (because mapView is created in the constructor of LocalSymbolTableSnapshot)
-            // even though it's unlikely most will ever be needed.
-            return new SymbolTokenImpl(text, sid, null);
-        }
-
-        @Override
-        public int findSymbol(String name) {
-            Integer sid = importedTables.findSymbol(name);
-            if (sid > UNKNOWN_SYMBOL_ID) {
-                return sid;
-            }
-            sid = mapView.get(name);
-            if (sid == null) {
-                return UNKNOWN_SYMBOL_ID;
-            }
-            return sid;
-        }
-
-        @Override
-        public String findKnownSymbol(int id) {
-            if (id < 0) {
-                throw new IllegalArgumentException("Symbol IDs must be at least 0.");
-            }
-            if (id > getMaxId()) {
-                return null;
-            }
-            return IonReaderBinaryIncremental.this.getSymbolString(id, importedTables, listView);
-        }
-
-        @Override
-        public Iterator<String> iterateDeclaredSymbolNames() {
-            return new Iterator<String>() {
-
-                private int index = 0;
-
-                @Override
-                public boolean hasNext() {
-                    return index < listView.size();
-                }
-
-                @Override
-                public String next() {
-                    String symbol = listView.get(index);
-                    index++;
-                    return symbol;
-                }
-
-                @Override
-                public void remove() {
-                    throw new UnsupportedOperationException("This iterator does not support element removal.");
-                }
-            };
-        }
-
-        @Override
-        public SymbolToken intern(String text) {
-            SymbolToken token = find(text);
-            if (token != null) {
-                return token;
-            }
-            throw new ReadOnlyValueException();
-        }
-
-        @Override
-        public int getMaxId() {
-            return maxId;
-        }
-
-        @Override
-        public boolean isReadOnly() {
-            return true;
-        }
-
-        @Override
-        public void makeReadOnly() {
-            // The symbol table is already read-only.
-        }
-
-        @Override
-        public void writeTo(IonWriter writer) throws IOException {
-            IonReader reader = new SymbolTableReader(this);
-            writer.writeValues(reader);
-        }
-
-        @Override
-        public String toString() {
-            return "(LocalSymbolTable max_id:" + getMaxId() + ')';
-        }
-
-        @Override
-        public IonStruct getIonRepresentation(ValueFactory valueFactory) {
-            if (structCache == null) {
-                structCache = new SymbolTableStructCache(this, getImportedTables(), null);
-            }
-            return structCache.getIonRepresentation(valueFactory);
-        }
-    }
-
-    /**
-     * Throw if the reader is attempting to process an Ion version that it does not support.
-     */
-    private void requireSupportedIonVersion() {
-        if (majorVersion != 1 || minorVersion != 0) {
-            throw new IonException(String.format("Unsupported Ion version: %d.%d", majorVersion, minorVersion));
-        }
-    }
-
-    /**
-     * Reset the local symbol table to the system symbol table.
-     */
-    private void resetSymbolTable() {
-        // Note: when there is a new version of Ion, check majorVersion and minorVersion here and set the appropriate
-        // system symbol table.
-        symbols.clear();
-        cachedReadOnlySymbolTable = null;
-        if (symbolTokensById != null) {
-            symbolTokensById.clear();
-        }
-    }
-
-    /**
-     * Resets the value's annotations.
-     */
-    private void resetAnnotations() {
-        hasAnnotations = false;
-        if (isAnnotationIteratorReuseEnabled) {
-            annotationIterator.invalidate();
-        }
-    }
-
-    /**
-     * Clear the list of imported shared symbol tables.
-     */
-    private void resetImports() {
-        // Note: when support for the next version of Ion is added, conditionals on 'majorVersion' and 'minorVersion'
-        // must be added here.
-        imports = ION_1_0_IMPORTS;
-    }
-
-    /**
-     * Creates a shared symbol table import, resolving it from the catalog if possible.
-     * @param name the name of the shared symbol table.
-     * @param version the version of the shared symbol table.
-     * @param maxId the max_id of the shared symbol table. This value takes precedence over the actual max_id for the
-     *              shared symbol table at the requested version.
-     */
-    private SymbolTable createImport(String name, int version, int maxId) {
-        SymbolTable shared = catalog.getTable(name, version);
-        if (shared == null) {
-            // No match. All symbol IDs that fall within this shared symbol table's range will have unknown text.
-            return new SubstituteSymbolTable(name, version, maxId);
-        } else if (shared.getMaxId() != maxId || shared.getVersion() != version) {
-            // Partial match. If the requested max_id exceeds the actual max_id of the resolved shared symbol table,
-            // symbol IDs that exceed the max_id of the resolved shared symbol table will have unknown text.
-            return new SubstituteSymbolTable(shared, version, maxId);
-        } else {
-            // Exact match; the resolved shared symbol table may be used as-is.
-            return shared;
-        }
-    }
-
-    /**
-     * Gets the String representation of the given symbol ID. It is the caller's responsibility to ensure that the
-     * given symbol ID is within the max ID of the symbol table.
-     * @param sid the symbol ID.
-     * @param importedSymbols the symbol table's shared symbol table imports.
-     * @param localSymbols the symbol table's local symbols.
-     * @return a String, which will be null if the requested symbol ID has undefined text.
-     */
-    private String getSymbolString(int sid, LocalSymbolTableImports importedSymbols, List<String> localSymbols) {
-        if (sid <= importedSymbols.getMaxId()) {
-            return importedSymbols.findKnownSymbol(sid);
-        }
-        return localSymbols.get(sid - (importedSymbols.getMaxId() + 1));
-    }
-
-    /**
-     * Calculates the symbol table's max ID.
-     * @return the max ID.
-     */
-    private int maxSymbolId() {
-        return symbols.size() + imports.getMaxId();
-    }
-
-    /**
-     * Retrieves the String text for the given symbol ID.
-     * @param sid a symbol ID.
-     * @return a String.
-     */
-    private String getSymbol(int sid) {
-        if (sid > maxSymbolId()) {
-            throw new IonException("Symbol ID exceeds the max ID of the symbol table.");
-        }
-        return getSymbolString(sid, imports, symbols);
-    }
-
-    /**
-     * Creates a SymbolToken representation of the given symbol ID.
-     * @param sid a symbol ID.
-     * @return a SymbolToken.
-     */
-    private SymbolToken getSymbolToken(int sid) {
-        int symbolTableSize = maxSymbolId() + 1;
-        if (symbolTokensById == null) {
-            symbolTokensById = new ArrayList<SymbolToken>(symbolTableSize);
-        }
-        if (symbolTokensById.size() < symbolTableSize) {
-            for (int i = symbolTokensById.size(); i < symbolTableSize; i++) {
-                symbolTokensById.add(null);
-            }
-        }
-        if (sid >= symbolTableSize) {
-            throw new IonException("Symbol ID exceeds the max ID of the symbol table.");
-        }
-        SymbolToken token = symbolTokensById.get(sid);
-        if (token == null) {
-            String text = getSymbolString(sid, imports, symbols);
-            ImportLocation importLocation = null;
-            if (text == null) {
-                // Note: this will never be a system symbol.
-                if (sid > 0 && sid <= imports.getMaxId()) {
-                    importLocation = imports.getImportLocation(sid);
-                } else {
-                    // All symbols with unknown text in the local symbol range are equivalent to symbol zero.
-                    sid = 0;
-                }
-            }
-            token = new SymbolTokenImpl(text, sid, importLocation);
-            symbolTokensById.set(sid, token);
-        }
-        return token;
-    }
-
-    /**
-     * Reads a local symbol table from the buffer.
-     * @param marker marker for the start and end positions of the local symbol table in the buffer.
-     */
-    private void readSymbolTable(IonReaderLookaheadBuffer.Marker marker) {
-        peekIndex = marker.startIndex;
-        boolean isAppend = false;
-        boolean hasSeenImports = false;
-        boolean hasSeenSymbols = false;
-        int symbolsPosition = -1;
-        int symbolsEndPosition = -1;
-        List<SymbolTable> newImports;
-        while (peekIndex < marker.endIndex) {
-            fieldNameSid = readVarUInt();
-            IonTypeID typeID = readTypeId();
-            calculateEndPosition(typeID);
-            int currentValueEndPosition = valueEndPosition;
-            if (fieldNameSid == SystemSymbolIDs.IMPORTS_ID) {
-                if (hasSeenImports) {
-                    throw new IonException("Symbol table contained multiple imports fields.");
-                }
-                if (typeID.type == IonType.SYMBOL) {
-                    isAppend = readUInt(peekIndex, currentValueEndPosition) == SystemSymbolIDs.ION_SYMBOL_TABLE_ID;
-                    peekIndex = currentValueEndPosition;
-                } else if (typeID.type == IonType.LIST) {
-                    resetImports();
-                    newImports = new ArrayList<SymbolTable>(3);
-                    newImports.add(getSystemSymbolTable());
-                    stepIn();
-                    IonType type = next();
-                    while (type != null) {
-                        String name = null;
-                        int version = -1;
-                        int maxId = -1;
-                        if (type == IonType.STRUCT) {
-                            stepIn();
-                            type = next();
-                            while (type != null) {
-                                int fieldSid = getFieldId();
-                                if (fieldSid == SystemSymbolIDs.NAME_ID) {
-                                    if (type == IonType.STRING) {
-                                        name = stringValue();
-                                    }
-                                } else if (fieldSid == SystemSymbolIDs.VERSION_ID) {
-                                    if (type == IonType.INT) {
-                                        version = intValue();
-                                    }
-                                } else if (fieldSid == SystemSymbolIDs.MAX_ID_ID) {
-                                    if (type == IonType.INT) {
-                                        maxId = intValue();
-                                    }
-                                }
-                                type = next();
-                            }
-                            stepOut();
-                        }
-                        newImports.add(createImport(name, version, maxId));
-                        type = next();
-                    }
-                    stepOut();
-                    imports = new LocalSymbolTableImports(newImports);
-                }
-                if (!isAppend) {
-                    // Clear the existing symbols before adding the new imported symbols.
-                    resetSymbolTable();
-                }
-                hasSeenImports = true;
-            } else if (fieldNameSid == SystemSymbolIDs.SYMBOLS_ID) {
-                if (hasSeenSymbols) {
-                    throw new IonException("Symbol table contained multiple symbols fields.");
-                }
-                if (typeID.type == IonType.LIST) {
-                    // Just record this position and skip forward. Come back after the imports (if any) are parsed.
-                    symbolsPosition = peekIndex;
-                    symbolsEndPosition = currentValueEndPosition;
-                }
-                hasSeenSymbols = true;
-            }
-            peekIndex = currentValueEndPosition;
-        }
-        if (peekIndex > marker.endIndex) {
-            throw new IonException("Malformed symbol table. Child values exceeded the length declared in the header.");
-        }
-        if (!hasSeenImports) {
-            resetSymbolTable();
-            resetImports();
-        }
-        if (symbolsPosition > -1) {
-            peekIndex = symbolsPosition;
-            valueType = IonType.LIST;
-            valueEndPosition = symbolsEndPosition;
-            stepIn();
-            while (next() != null) {
-                if (valueType != IonType.STRING) {
-                    symbols.add(null);
-                } else {
-                    symbols.add(stringValue());
-                }
-            }
-            stepOut();
-            peekIndex = valueEndPosition;
-        }
-    }
-
-    /**
-     * Advance the reader to the next top-level value. Buffers an entire top-level value, reads any IVMs and/or local
-     * symbol tables that precede the value, and sets the byte positions of important components of the value.
-     */
-    private void nextAtTopLevel() {
-        if (completeValueBuffered) {
-            // There is already data buffered, but the user is choosing to skip it.
-            buffer.seekTo(valueEndPosition);
-            completeValueBuffered = false;
-        }
-        try {
-            lookahead.fillInput();
-        } catch (Exception e) {
-            throw new IonException(e);
-        }
-        if (lookahead.moreDataRequired()) {
-            valueType = null;
-            valueTypeID = null;
-            return;
-        }
-        completeValueBuffered = true;
-        if (lookahead.getIvmIndex() > -1) {
-            peekIndex = lookahead.getIvmIndex();
-            majorVersion = buffer.peek(peekIndex++);
-            minorVersion = buffer.peek(peekIndex++);
-            if (buffer.peek(peekIndex++) != IVM_FINAL_BYTE) {
-                throw new IonException("Invalid Ion version marker.");
-            }
-            requireSupportedIonVersion();
-            resetSymbolTable();
-            resetImports();
-            lookahead.resetIvmIndex();
-        } else if (peekIndex < 0) {
-            // peekIndex is initialized to -1 and only increases. This branch is reached if the IVM does not occur
-            // first in the stream. This is necessary because currently a binary incremental reader will be created if
-            // an empty stream is provided to the IonReaderBuilder. If, once bytes appear in the stream, those bytes do
-            // not represent valid binary Ion, a quick failure is necessary.
-            throw new IonException("Binary Ion must start with an Ion version marker.");
-        }
-        List<IonReaderLookaheadBuffer.Marker> symbolTableMarkers = lookahead.getSymbolTableMarkers();
-        if (!symbolTableMarkers.isEmpty()) {
-            // The cached SymbolTable (if any) is a snapshot in time, so it must be cleared whenever a new symbol
-            // table is read regardless of whether the new LST is an append or a reset.
-            cachedReadOnlySymbolTable = null;
-            for (IonReaderLookaheadBuffer.Marker symbolTableMarker : symbolTableMarkers) {
-                readSymbolTable(symbolTableMarker);
-            }
-            lookahead.resetSymbolTableMarkers();
-        }
-        peekIndex = lookahead.getValueStart();
-        hasAnnotations = lookahead.hasAnnotations();
-        if (hasAnnotations) {
-            if (peekIndex >= lookahead.getValueEnd()) {
-                throw new IonException("Annotation wrappers without values are invalid.");
-            }
-            annotationSids.clear();
-            IonReaderLookaheadBuffer.Marker annotationSidsMarker = lookahead.getAnnotationSidsMarker();
-            annotationStartPosition = annotationSidsMarker.startIndex;
-            annotationEndPosition = annotationSidsMarker.endIndex;
-            peekIndex = annotationEndPosition;
-            valueTypeID = IonTypeID.TYPE_IDS_1_0[buffer.peek(peekIndex++)];
-            int wrappedValueLength = valueTypeID.length;
-            if (valueTypeID.variableLength) {
-                wrappedValueLength = readVarUInt();
-            }
-            if (valueTypeID.isNopPad) {
-                throw new IonException("Annotated NOP padding is invalid.");
-            }
-            valueType = valueTypeID.type;
-            if (valueType == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
-                throw new IonException("Nested annotations are invalid.");
-            }
-            if (peekIndex + wrappedValueLength != lookahead.getValueEnd()) {
-                throw new IonException("Mismatched annotation wrapper length.");
-            }
-        } else {
-            valueTypeID = lookahead.getValueTid();
-            valueType = valueTypeID.type;
-        }
-        valueStartPosition = peekIndex;
-        valueEndPosition = lookahead.getValueEnd();
-        lookahead.resetNopPadIndex();
-    }
-
-    /**
-     * Reads the type ID byte.
-     * @return the TypeAndLength descriptor for the type ID byte.
-     */
-    private IonTypeID readTypeId() {
-        valueTypeID = IonTypeID.TYPE_IDS_1_0[buffer.peek(peekIndex++)];
-        if (!valueTypeID.isValid) {
-            throw new IonException("Invalid type ID.");
-        }
-        valueType = valueTypeID.type;
-        return valueTypeID;
-    }
-
-    /**
-     * Calculates the end position for the given type ID descriptor.
-     * @param typeID the type ID descriptor.
-     */
-    private void calculateEndPosition(IonTypeID typeID) {
-        if (typeID.variableLength) {
-            valueEndPosition = readVarUInt() + peekIndex;
-        } else {
-            valueEndPosition = typeID.length + peekIndex;
-        }
-    }
-
-    @Override
-    public boolean hasNext() {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    /**
-     * Marks the end of the current container by indicating that the reader is no longer positioned on a value.
-     */
-    private void endContainer() {
-        valueType = null;
-        valueTypeID = null;
-        annotationStartPosition = -1;
-        annotationEndPosition = -1;
-        hasAnnotations = false;
-    }
-
-    /**
-     * Advance the reader to the next value within a container, which must already be buffered.
-     */
-    private void nextBelowTopLevel() {
-        // Seek past the previous value.
-        if (peekIndex < valueEndPosition) {
-            peekIndex = valueEndPosition;
-        }
-        if (peekIndex >= containerStack.peek().endPosition) {
-            endContainer();
-        } else {
-            if (containerStack.peek().type == IonType.STRUCT) {
-                fieldNameSid = readVarUInt();
-            }
-            IonTypeID typeID = readTypeId();
-            while (typeID.isNopPad) {
-                calculateEndPosition(typeID);
-                peekIndex = valueEndPosition;
-                if (peekIndex >= containerStack.peek().endPosition) {
-                    endContainer();
-                    return;
-                }
-                if (containerStack.peek().type == IonType.STRUCT) {
-                    fieldNameSid = readVarUInt();
-                }
-                typeID = readTypeId();
-            }
-            calculateEndPosition(typeID);
-            if (valueType == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
-                hasAnnotations = true;
-                annotationSids.clear();
-                int annotationsLength = readVarUInt();
-                annotationStartPosition = peekIndex;
-                annotationEndPosition = annotationStartPosition + annotationsLength;
-                peekIndex = annotationEndPosition;
-                typeID = readTypeId();
-                if (typeID.isNopPad) {
-                    throw new IonException(
-                        "Invalid annotation wrapper: NOP pad may not occur inside an annotation wrapper."
-                    );
-                }
-                if (valueType == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
-                    throw new IonException("Nested annotations are invalid.");
-                }
-                long annotationWrapperEndPosition = valueEndPosition;
-                calculateEndPosition(typeID);
-                if (annotationWrapperEndPosition != valueEndPosition) {
-                    throw new IonException(
-                        "Invalid annotation wrapper: end of the wrapper did not match end of the value."
-                    );
-                }
-            } else {
-                annotationStartPosition = -1;
-                annotationEndPosition = -1;
-                hasAnnotations = false;
-                if (valueEndPosition > containerStack.peek().endPosition) {
-                    throw new IonException("Value overflowed its container.");
-                }
-            }
-            if (!valueTypeID.isValid) {
-                throw new IonException("Invalid type ID.");
-            }
-            valueStartPosition = peekIndex;
-        }
-    }
-
-    @Override
-    public IonType next() {
-        fieldNameSid = -1;
-        lobBytesRead = 0;
-        valueStartPosition = -1;
-        resetAnnotations();
-        if (containerStack.isEmpty()) {
-            nextAtTopLevel();
-        } else {
-            nextBelowTopLevel();
-        }
-        // Note: the following check is necessary to catch empty ordered structs, which are prohibited by the spec.
-        // Unfortunately, this requires a check on every value for a condition that will probably never happen.
-        if (
-            valueType == IonType.STRUCT &&
-            valueTypeID.lowerNibble == IonTypeID.ORDERED_STRUCT_NIBBLE &&
-            valueStartPosition == valueEndPosition
-        ) {
-            throw new IonException("Ordered struct must not be empty.");
-        }
-        return valueType;
-    }
-
-    @Override
-    public void stepIn() {
-        if (!IonType.isContainer(valueType)) {
-            throw new IonException("Must be positioned on a container to step in.");
-        }
-        // Note: the IonReader interface dictates that stepping into a null container has the same behavior as
-        // an empty container.
-        ContainerInfo containerInfo = containerStack.push();
-        containerInfo.type = valueType;
-        containerInfo.endPosition = valueEndPosition;
-        valueType = null;
-        valueTypeID = null;
-        valueEndPosition = -1;
-        fieldNameSid = -1;
-        valueStartPosition = -1;
-    }
-
-    @Override
-    public void stepOut() {
-        if (containerStack.isEmpty()) {
-            // Note: this is IllegalStateException for consistency with the other binary IonReader implementation.
-            throw new IllegalStateException("Cannot step out at top level.");
-        }
-        ContainerInfo containerInfo = containerStack.pop();
-        valueEndPosition = containerInfo.endPosition;
-        valueType = null;
-        valueTypeID = null;
-        fieldNameSid = -1;
-        valueStartPosition = -1;
-    }
-
-    @Override
-    public int getDepth() {
-        return containerStack.size();
-    }
-
-    @Override
-    public SymbolTable getSymbolTable() {
-        if (cachedReadOnlySymbolTable == null) {
-            if (symbols.size() == 0 && imports == ION_1_0_IMPORTS) {
-                cachedReadOnlySymbolTable = imports.getSystemSymbolTable();
-            } else {
-                cachedReadOnlySymbolTable = new LocalSymbolTableSnapshot();
-            }
-        }
-        return cachedReadOnlySymbolTable;
-    }
-
-    @Override
-    public SymbolTable pop_passed_symbol_table() {
-        SymbolTable currentSymbolTable = getSymbolTable();
-        if (currentSymbolTable == symbolTableLastTransferred) {
-            // This symbol table has already been returned. Since the contract is that it is a "pop", it should not
-            // be returned twice.
-            return null;
-        }
-        symbolTableLastTransferred = currentSymbolTable;
-        return symbolTableLastTransferred;
-    }
-
-    @Override
-    public IonType getType() {
-        return valueType;
-    }
-
-    @Override
-    public IntegerSize getIntegerSize() {
-        if (valueType != IonType.INT || isNullValue()) {
-            return null;
-        }
-        if (valueTypeID.length < INT_SIZE_IN_BYTES) {
-            // Note: this is conservative. Most integers of size 4 also fit in an int, but since exactly the
-            // same parsing code is used for ints and longs, there is no point wasting the time to determine the
-            // smallest possible type.
-            return IntegerSize.INT;
-        } else if (valueTypeID.length < LONG_SIZE_IN_BYTES) {
-            return IntegerSize.LONG;
-        } else if (valueTypeID.length == LONG_SIZE_IN_BYTES) {
-            // Because creating BigIntegers is so expensive, it is worth it to look ahead and determine exactly
-            // which 8-byte integers can fit in a long.
-            if (valueTypeID.isNegativeInt) {
-                // The smallest negative 8-byte integer that can fit in a long is -0x80_00_00_00_00_00_00_00.
-                int firstByte = buffer.peek(valueStartPosition);
-                if (firstByte < MOST_SIGNIFICANT_BYTE_OF_MIN_LONG) {
-                    return IntegerSize.LONG;
-                } else if (firstByte > MOST_SIGNIFICANT_BYTE_OF_MIN_LONG) {
-                    return IntegerSize.BIG_INTEGER;
-                }
-                for (int i = valueStartPosition + 1; i < valueEndPosition; i++) {
-                    if (0x00 != buffer.peek(i)) {
-                        return IntegerSize.BIG_INTEGER;
-                    }
-                }
-            } else {
-                // The largest positive 8-byte integer that can fit in a long is 0x7F_FF_FF_FF_FF_FF_FF_FF.
-                if (buffer.peek(valueStartPosition) > MOST_SIGNIFICANT_BYTE_OF_MAX_LONG) {
-                    return IntegerSize.BIG_INTEGER;
-                }
-            }
-            return IntegerSize.LONG;
-        }
-        return IntegerSize.BIG_INTEGER;
-    }
-
-    /**
-     * Require that the given type matches the type of the current value.
-     * @param required the required type of current value.
-     */
-    private void requireType(IonType required) {
-        if (required != valueType) {
-            // Note: this is IllegalStateException to match the behavior of the other binary IonReader implementation.
-            throw new IllegalStateException(
-                String.format("Invalid type. Required %s but found %s.", required, valueType)
-            );
-        }
-    }
-
-    /**
-     * Reads a VarUInt.
-     * @return the value.
-     */
-    private int readVarUInt() {
-        int currentByte = 0;
-        int result = 0;
-        while ((currentByte & HIGHEST_BIT_BITMASK) == 0) {
-            currentByte = buffer.peek(peekIndex++);
-            result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
-        }
-        return result;
-    }
-
-    /**
-     * Reads a UInt.
-     * @param limit the position of the first byte after the end of the UInt value.
-     * @return the value.
-     */
-    private long readUInt(int startIndex, int limit) {
-        long result = 0;
-        for (int i = startIndex; i < limit; i++) {
-            result = (result << VALUE_BITS_PER_UINT_BYTE) | buffer.peek(i);
-        }
-        return result;
-    }
-
-    /**
-     * Reads a UInt starting at `valueStartPosition` and ending at `valueEndPosition`.
-     * @return the value.
-     */
-    private long readUInt() {
-        return readUInt(valueStartPosition, valueEndPosition);
-    }
-
-    /**
-     * Reads a VarInt.
-     * @param firstByte the first byte of the VarInt representation, which has already been retrieved from the buffer.
-     * @return the value.
-     */
-    private int readVarInt(int firstByte) {
-        int currentByte = firstByte;
-        int sign = (currentByte & VAR_INT_SIGN_BITMASK) == 0 ? 1 : -1;
-        int result = currentByte & LOWER_SIX_BITS_BITMASK;
-        while ((currentByte & HIGHEST_BIT_BITMASK) == 0) {
-            currentByte = buffer.peek(peekIndex++);
-            result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
-        }
-        return result * sign;
-    }
-
-    /**
-     * Reads a VarInt.
-     * @return the value.
-     */
-    private int readVarInt() {
-        return readVarInt(buffer.peek(peekIndex++));
-    }
-
-    // Scratch space for various byte sizes. Only for use while computing a single value.
-    private final byte[][] scratchForSize = new byte[][] {
-        new byte[0],
-        new byte[1],
-        new byte[2],
-        new byte[3],
-        new byte[4],
-        new byte[5],
-        new byte[6],
-        new byte[7],
-        new byte[8],
-        new byte[9],
-        new byte[10],
-        new byte[11],
-        new byte[12],
-    };
-
-    /**
-     * Copy the requested number of bytes from the buffer into a scratch buffer of exactly the requested length.
-     * @param startIndex the start index from which to copy.
-     * @param length the number of bytes to copy.
-     * @return the scratch byte array.
-     */
-    private byte[] copyBytesToScratch(int startIndex, int length) {
-        // Note: using reusable scratch buffers makes reading ints and decimals 1-5% faster and causes much less
-        // GC churn.
-        byte[] bytes = null;
-        if (length < scratchForSize.length) {
-            bytes = scratchForSize[length];
-        }
-        if (bytes == null) {
-            bytes = new byte[length];
-        }
-        // The correct number of bytes will be requested from the buffer, so the limit is set at the capacity to
-        // avoid having to calculate a limit.
-        buffer.copyBytes(startIndex, bytes, 0, bytes.length);
-        return bytes;
-    }
-
-    /**
-     * Reads a UInt value into a BigInteger.
-     * @param isNegative true if the resulting BigInteger value should be negative; false if it should be positive.
-     * @return the value.
-     */
-    private BigInteger readUIntAsBigInteger(boolean isNegative) {
-        int length = valueEndPosition - valueStartPosition;
-        // NOTE: unfortunately, there is no BigInteger(int signum, byte[] bits, int offset, int length) constructor
-        // until JDK 9, so copying to scratch space is always required. Migrating to the new constructor will
-        // lead to a significant performance improvement.
-        byte[] magnitude = copyBytesToScratch(valueStartPosition, length);
-        int signum = isNegative ? -1 : 1;
-        return new BigInteger(signum, magnitude);
-    }
-
-    /**
-     * Get and clear the most significant bit in the given byte array.
-     * @param intBytes bytes representing a signed int.
-     * @return -1 if the most significant bit was set; otherwise, 1.
-     */
-    private int getAndClearSignBit(byte[] intBytes) {
-        boolean isNegative = (intBytes[0] & HIGHEST_BIT_BITMASK) != 0;
-        int signum = isNegative ? -1 : 1;
-        if (isNegative) {
-            intBytes[0] &= LOWER_SEVEN_BITS_BITMASK;
-        }
-        return signum;
-    }
-
-    /**
-     * Reads an Int value into a BigInteger.
-     * @param limit the position of the first byte after the end of the UInt value.
-     * @return the value.
-     */
-    private BigInteger readIntAsBigInteger(int limit) {
-        BigInteger value;
-        int length = limit - peekIndex;
-        if (length > 0) {
-            // NOTE: unfortunately, there is no BigInteger(int signum, byte[] bits, int offset, int length) constructor
-            // until JDK 9, so copying to scratch space is always required. Migrating to the new constructor will
-            // lead to a significant performance improvement.
-            byte[] bytes = copyBytesToScratch(peekIndex, length);
-            value = new BigInteger(getAndClearSignBit(bytes), bytes);
-        }
-        else {
-            value = BigInteger.ZERO;
-        }
-        return value;
-    }
-
-    @Override
-    public long longValue() {
-        long value;
-        if (valueType == IonType.INT) {
-            if (valueTypeID.length == 0) {
-                return 0;
-            }
-            value = readUInt();
-            if (valueTypeID.isNegativeInt) {
-                if (value == 0) {
-                    throw new IonException("Int zero may not be negative.");
-                }
-                value *= -1;
-            }
-        } else if (valueType == IonType.FLOAT) {
-            scalarConverter.addValue(doubleValue());
-            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.double_value);
-            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.long_value));
-            value = scalarConverter.getLong();
-            scalarConverter.clear();
-        } else if (valueType == IonType.DECIMAL) {
-            scalarConverter.addValue(decimalValue());
-            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.decimal_value);
-            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.long_value));
-            value = scalarConverter.getLong();
-            scalarConverter.clear();
-        } else {
-            throw new IllegalStateException("longValue() may only be called on values of type int, float, or decimal.");
-        }
-        return value;
-    }
-
-    @Override
-    public BigInteger bigIntegerValue() {
-        BigInteger value;
-        if (valueType == IonType.INT) {
-            if (isNullValue()) {
-                // NOTE: this mimics existing behavior, but should probably be undefined (as, e.g., longValue() is in this
-                //  case).
-                return null;
-            }
-            if (valueTypeID.length == 0) {
-                return BigInteger.ZERO;
-            }
-            value = readUIntAsBigInteger(valueTypeID.isNegativeInt);
-            if (valueTypeID.isNegativeInt && value.signum() == 0) {
-                throw new IonException("Int zero may not be negative.");
-            }
-        } else if (valueType == IonType.FLOAT) {
-            if (isNullValue()) {
-                value = null;
-            } else {
-                scalarConverter.addValue(doubleValue());
-                scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.double_value);
-                scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.bigInteger_value));
-                value = scalarConverter.getBigInteger();
-                scalarConverter.clear();
-            }
-        } else {
-            throw new IllegalStateException("bigIntegerValue() may only be called on values of type int or float.");
-        }
-        return value;
-    }
-
-    @Override
-    public Date dateValue() {
-        Timestamp timestamp = timestampValue();
-        if (timestamp == null) {
-            return null;
-        }
-        return timestamp.dateValue();
-    }
-
-    @Override
-    public int intValue() {
-        return (int) longValue();
-    }
-
-    @Override
-    public double doubleValue() {
-        double value;
-        if (valueType == IonType.FLOAT) {
-            int length = valueEndPosition - valueStartPosition;
-            if (length == 0) {
-                return 0.0d;
-            }
-            ByteBuffer bytes = buffer.getByteBuffer(valueStartPosition, valueEndPosition);
-            if (length == FLOAT_32_BYTE_LENGTH) {
-                value = bytes.getFloat();
-            } else {
-                // Note: there is no need to check for other lengths here; the type ID byte is validated during next().
-                value = bytes.getDouble();
-            }
-        }  else if (valueType == IonType.DECIMAL) {
-            scalarConverter.addValue(decimalValue());
-            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.decimal_value);
-            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.double_value));
-            value = scalarConverter.getDouble();
-            scalarConverter.clear();
-        } else {
-            throw new IllegalStateException("doubleValue() may only be called on values of type float or decimal.");
-        }
-        return value;
-    }
-
-    /**
-     * Decodes a string from the buffer into a String value.
-     * @param valueStart the position in the buffer of the first byte in the string.
-     * @param valueEnd the position in the buffer of the last byte in the string.
-     * @return the value.
-     */
-    private String readString(int valueStart, int valueEnd) {
-        ByteBuffer utf8InputBuffer = buffer.getByteBuffer(valueStart, valueEnd);
-        int numberOfBytes = valueEnd - valueStart;
-        return utf8Decoder.decode(utf8InputBuffer, numberOfBytes);
-    }
-
-    @Override
-    public String stringValue() {
-        String value;
-        if (valueType == IonType.STRING) {
-            if (isNullValue()) {
-                return null;
-            }
-            value = readString(valueStartPosition, valueEndPosition);
-        } else if (valueType == IonType.SYMBOL) {
-            if (isNullValue()) {
-                return null;
-            }
-            int sid = (int) readUInt();
-            value = getSymbol(sid);
-            if (value == null) {
-                throw new UnknownSymbolException(sid);
-            }
-        } else {
-            throw new IllegalStateException("Invalid type requested.");
-        }
-        return value;
-    }
-
-    @Override
-    public SymbolToken symbolValue() {
-        requireType(IonType.SYMBOL);
-        if (isNullValue()) {
-            return null;
-        }
-        int sid = (int) readUInt();
-        return getSymbolToken(sid);
-    }
-
-    @Override
-    public int byteSize() {
-        if (!IonType.isLob(valueType) && !isNullValue()) {
-            throw new IonException("Reader must be positioned on a blob or clob.");
-        }
-        return valueEndPosition - valueStartPosition;
-    }
-
-    @Override
-    public byte[] newBytes() {
-        byte[] bytes = new byte[byteSize()];
-        // The correct number of bytes will be requested from the buffer, so the limit is set at the capacity to
-        // avoid having to calculate a limit.
-        buffer.copyBytes(valueStartPosition, bytes, 0, bytes.length);
-        return bytes;
-    }
-
-    @Override
-    public int getBytes(byte[] bytes, int offset, int len) {
-        int length = Math.min(len, byteSize() - lobBytesRead);
-        // The correct number of bytes will be requested from the buffer, so the limit is set at the capacity to
-        // avoid having to calculate a limit.
-        buffer.copyBytes(valueStartPosition + lobBytesRead, bytes, offset, length);
-        lobBytesRead += length;
-        return length;
-    }
-
-    /**
-     * Reads a decimal value as a BigDecimal.
-     * @return the value.
-     */
-    private BigDecimal readBigDecimal() {
-        int length = valueEndPosition - peekIndex;
-        if (length == 0) {
-            return BigDecimal.ZERO;
-        }
-        int scale = -readVarInt();
-        BigDecimal value;
-        if (length < LONG_SIZE_IN_BYTES) {
-            // No need to allocate a BigInteger to hold the coefficient.
-            long coefficient = 0;
-            int sign = 1;
-            if (peekIndex < valueEndPosition) {
-                int firstByte = buffer.peek(peekIndex++);
-                sign = (firstByte & HIGHEST_BIT_BITMASK) == 0 ? 1 : -1;
-                coefficient = firstByte & LOWER_SEVEN_BITS_BITMASK;
-            }
-            while (peekIndex < valueEndPosition) {
-                coefficient = (coefficient << VALUE_BITS_PER_UINT_BYTE) | buffer.peek(peekIndex++);
-            }
-            value = BigDecimal.valueOf(coefficient * sign, scale);
-        } else {
-            // The coefficient may overflow a long, so a BigInteger is required.
-            value = new BigDecimal(readIntAsBigInteger(valueEndPosition), scale);
-        }
-        return value;
-    }
-
-    /**
-     * Reads a decimal value as a Decimal.
-     * @return the value.
-     */
-    private Decimal readDecimal() {
-        int length = valueEndPosition - peekIndex;
-        if (length == 0) {
-            return Decimal.ZERO;
-        }
-        int scale = -readVarInt();
-        BigInteger coefficient;
-        length = valueEndPosition - peekIndex;
-        if (length > 0) {
-            // NOTE: unfortunately, there is no BigInteger(int signum, byte[] bits, int offset, int length) constructor,
-            // so copying to scratch space is always required.
-            byte[] bits = copyBytesToScratch(peekIndex, length);
-            int signum = getAndClearSignBit(bits);
-            // NOTE: there is a BigInteger.valueOf(long unscaledValue, int scale) factory method that avoids allocating
-            // a BigInteger for coefficients that fit in a long. See its use in readBigDecimal() above. Unfortunately,
-            // it is not possible to use this for Decimal because the necessary BigDecimal constructor is
-            // package-private. If a compatible BigDecimal constructor is added in a future JDK revision, a
-            // corresponding factory method should be added to Decimal to enable this optimization.
-            coefficient = new BigInteger(signum, bits);
-            if (coefficient.signum() == 0 && signum < 0) {
-                return Decimal.negativeZero(scale);
-            }
-        }
-        else {
-            coefficient = BigInteger.ZERO;
-        }
-        return Decimal.valueOf(coefficient, scale);
-    }
-
-    @Override
-    public BigDecimal bigDecimalValue() {
-        requireType(IonType.DECIMAL);
-        if (isNullValue()) {
-            return null;
-        }
-        peekIndex = valueStartPosition;
-        return readBigDecimal();
-    }
-
-    @Override
-    public Decimal decimalValue() {
-        requireType(IonType.DECIMAL);
-        if (isNullValue()) {
-            return null;
-        }
-        peekIndex = valueStartPosition;
-        return readDecimal();
-    }
-
-    @Override
-    public Timestamp timestampValue() {
-        requireType(IonType.TIMESTAMP);
-        if (isNullValue()) {
-            return null;
-        }
-        peekIndex = valueStartPosition;
-        int firstByte = buffer.peek(peekIndex++);
-        Integer offset = null;
-        if (firstByte != VAR_INT_NEGATIVE_ZERO) {
-            offset = readVarInt(firstByte);
-        }
-        int year = readVarUInt();
-        int month = 0;
-        int day = 0;
-        int hour = 0;
-        int minute = 0;
-        int second = 0;
-        BigDecimal fractionalSecond = null;
-        Timestamp.Precision precision = Timestamp.Precision.YEAR;
-        if (peekIndex < valueEndPosition) {
-            month = readVarUInt();
-            precision = Timestamp.Precision.MONTH;
-            if (peekIndex < valueEndPosition) {
-                day = readVarUInt();
-                precision = Timestamp.Precision.DAY;
-                if (peekIndex < valueEndPosition) {
-                    hour = readVarUInt();
-                    if (peekIndex >= valueEndPosition) {
-                        throw new IonException("Timestamps may not specify hour without specifying minute.");
-                    }
-                    minute = readVarUInt();
-                    precision = Timestamp.Precision.MINUTE;
-                    if (peekIndex < valueEndPosition) {
-                        second = readVarUInt();
-                        precision = Timestamp.Precision.SECOND;
-                        if (peekIndex < valueEndPosition) {
-                            fractionalSecond = readBigDecimal();
-                            if (fractionalSecond.signum() < 0 || fractionalSecond.compareTo(BigDecimal.ONE) >= 0) {
-                                throw new IonException("The fractional seconds value in a timestamp must be greater" +
-                                        "than or equal to zero and less than one.");
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        try {
-            return Timestamp.createFromUtcFields(
-                    precision,
-                    year,
-                    month,
-                    day,
-                    hour,
-                    minute,
-                    second,
-                    fractionalSecond,
-                    offset
-            );
-        } catch (IllegalArgumentException e) {
-            throw new IonException("Illegal timestamp encoding. ", e);
-        }
-    }
-
-    /**
-     * Gets the annotation symbol IDs for the current value, reading them from the buffer first if necessary.
-     * @return the annotation symbol IDs, or an empty list if the current value is not annotated.
-     */
-    private IntList getAnnotationSids() {
-        if (annotationSids.isEmpty()) {
-            int savedPeekIndex = peekIndex;
-            peekIndex = annotationStartPosition;
-            while (peekIndex < annotationEndPosition) {
-                annotationSids.add(readVarUInt());
-            }
-            peekIndex = savedPeekIndex;
-        }
-        return annotationSids;
-    }
-
-    @Override
-    public String[] getTypeAnnotations() {
-        if (hasAnnotations) {
-            IntList annotationSids = getAnnotationSids();
-            String[] annotationArray = new String[annotationSids.size()];
-            for (int i = 0; i < annotationArray.length; i++) {
-                String symbol = getSymbol(annotationSids.get(i));
-                if (symbol == null) {
-                    throw new UnknownSymbolException(annotationSids.get(i));
-                }
-                annotationArray[i] = symbol;
-            }
-            return annotationArray;
-        }
-        return _Private_Utils.EMPTY_STRING_ARRAY;
-    }
-
-    @Override
-    public SymbolToken[] getTypeAnnotationSymbols() {
-        if (hasAnnotations) {
-            IntList annotationSids = getAnnotationSids();
-            SymbolToken[] annotationArray = new SymbolToken[annotationSids.size()];
-            for (int i = 0; i < annotationArray.length; i++) {
-                annotationArray[i] = getSymbolToken(annotationSids.get(i));
-            }
-            return annotationArray;
-        }
-        return SymbolToken.EMPTY_ARRAY;
-    }
-
-    private static final Iterator<String> EMPTY_ITERATOR = new Iterator<String>() {
-
-        @Override
-        public boolean hasNext() {
-            return false;
-        }
-
-        @Override
-        public String next() {
-            return null;
-        }
-
-        @Override
-        public void remove() {
-            throw new UnsupportedOperationException("Cannot remove from an empty iterator.");
-        }
-    };
-
-    @Override
-    public Iterator<String> iterateTypeAnnotations() {
-        if (hasAnnotations) {
-            if (isAnnotationIteratorReuseEnabled) {
-                annotationIterator.ready();
-                return annotationIterator;
-            } else {
-                return new SingleUseAnnotationIterator();
-            }
-        }
-        return EMPTY_ITERATOR;
-    }
-
-    @Override
-    public int getFieldId() {
-        return fieldNameSid;
-    }
-
-    @Override
-    public String getFieldName() {
-        if (fieldNameSid < 0) {
-            return null;
-        }
-        String fieldName = getSymbol(fieldNameSid);
-        if (fieldName == null) {
-            throw new UnknownSymbolException(fieldNameSid);
-        }
-        return fieldName;
-    }
-
-    @Override
-    public SymbolToken getFieldNameSymbol() {
-        if (fieldNameSid < 0) {
-            return null;
-        }
-        return getSymbolToken(fieldNameSid);
-    }
-
-    @Override
-    public boolean isNullValue() {
-        return valueTypeID != null && valueTypeID.isNull;
-    }
-
-    @Override
-    public boolean isInStruct() {
-        return !containerStack.isEmpty() && containerStack.peek().type == IonType.STRUCT;
-    }
-
-    @Override
-    public boolean booleanValue() {
-        requireType(IonType.BOOL);
-        return valueTypeID.lowerNibble == 1;
-    }
-
-    @Override
-    public <T> T asFacet(Class<T> facetType) {
-        return null;
-    }
-
-    @Override
-    public void requireCompleteValue() {
-        // NOTE: If we want to replace the other binary IonReader implementation with this one, the following
-        // validation could be performed in next() if incremental mode is not enabled. That would allow this
-        // implementation to behave in the same way as the other implementation when an incomplete value is
-        // encountered.
-        if (lookahead.isSkippingCurrentValue()) {
-            throw new IonException("Unexpected EOF.");
-        }
-        if (lookahead.available() > 0 && lookahead.moreDataRequired()) {
-            if (lookahead.getIvmIndex() < 0
-                || lookahead.available() != _Private_IonConstants.BINARY_VERSION_MARKER_SIZE) {
-                throw new IonException("Unexpected EOF.");
-            }
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        requireCompleteValue();
-        inputStream.close();
-        utf8Decoder.close();
-    }
-
-}
diff --git a/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java b/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
deleted file mode 100644
index e9cffc1897..0000000000
--- a/src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java
+++ /dev/null
@@ -1,962 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package com.amazon.ion.impl;
-
-import com.amazon.ion.IonBufferConfiguration;
-import com.amazon.ion.IonException;
-import com.amazon.ion.IonType;
-
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Monitors an InputStream over binary Ion data to ensure enough data is available to be navigated successfully by a
- * non-incremental IonReader.
- * <p>
- * Error reporting: this wrapper reads the least amount of Ion data possible in order to determine whether a value
- * is complete. As such, it will not raise any errors if invalid data exists anywhere outside the header of a
- * top-level value. Any such invalid data will be detected as normal by the IonReader. In the few cases where this
- * wrapper does detect an error (e.g. upon finding the illegal type 0xF), it will raise {@link IonException}.
- */
-public final class IonReaderLookaheadBuffer extends ReaderLookaheadBufferBase {
-
-    private static final int LOWER_SEVEN_BITS_BITMASK = 0x7F;
-    private static final int HIGHEST_BIT_BITMASK = 0x80;
-    private static final int VALUE_BITS_PER_VARUINT_BYTE = 7;
-    // Note: because long is a signed type, Long.MAX_VALUE is represented in Long.SIZE - 1 bits.
-    private static final int MAXIMUM_SUPPORTED_VAR_UINT_BYTES = (Long.SIZE - 1) / VALUE_BITS_PER_VARUINT_BYTE;
-    private static final int IVM_START_BYTE = 0xE0;
-    private static final int IVM_REMAINING_LENGTH = 3; // Length of the IVM after the first byte.
-    private static final int ION_SYMBOL_TABLE_SID = 3;
-    // The following is a limitation imposed by this implementation, not the Ion specification.
-    private static final long MAXIMUM_VALUE_SIZE = Integer.MAX_VALUE;
-
-    /**
-     * Represents a VarUInt that may be read in multiple steps.
-     */
-    private static final class VarUInt {
-
-        /**
-         * The location of the VarUInt in the value header.
-         */
-        private enum Location {
-            /**
-             * The length field that is included when the low nibble of a value's type ID is VARIABLE_LENGTH_NIBBLE.
-             */
-            VALUE_LENGTH,
-            /**
-             * The length field that is included when the low nibble of an annotation wrapper's type ID is
-             * VARIABLE_LENGTH_NIBBLE.
-             */
-            ANNOTATION_WRAPPER_LENGTH,
-            /**
-             * The annot_length field that always precedes the SIDs in an annotation wrapper. Indicates the number
-             * of total bytes used to represent the SIDs that follow.
-             */
-            ANNOTATION_WRAPPER_SIDS_LENGTH,
-            /**
-             * A symbol ID. An annotation wrapper may contain more than one.
-             */
-            ANNOTATION_WRAPPER_SID
-        }
-
-        /**
-         * The location.
-         */
-        private VarUInt.Location location;
-
-        /**
-         * The value accumulated so far. This will only be the actual value when `isComplete` is true.
-         */
-        private long value;
-
-        /**
-         * The number of bytes in the VarUInt representation that have been read so far. This is only the total
-         * number of bytes in the representation when `isComplete` is true.
-         */
-        private int numberOfBytesRead;
-
-        /**
-         * True when the VarUInt is complete; otherwise, false.
-         */
-        private boolean isComplete;
-
-        /**
-         * Constructor.
-         */
-        private VarUInt() {
-            reset(Location.VALUE_LENGTH);
-        }
-
-        /**
-         * Resets the value to zero.
-         * @param nextLocation the location of the next VarUInt to read.
-         */
-        private void reset(final Location nextLocation) {
-            location = nextLocation;
-            value = 0;
-            numberOfBytesRead = 0;
-            isComplete = false;
-        }
-    }
-
-    /**
-     * The state of the wrapper.
-     */
-    private enum State {
-        /**
-         * Positioned before the type ID of a top-level value.
-         */
-        BEFORE_TYPE_ID,
-
-        /**
-         * Started reading a value's type ID, but did not finish because the byte was not yet available.
-         */
-        READING_TYPE_ID,
-
-        /**
-         * Reading the value's header, which includes all bytes between the type ID and the first byte of
-         * the value representation.
-         */
-        READING_HEADER,
-
-        /**
-         * Skipping over the value representation.
-         */
-        SKIPPING_VALUE,
-
-        /**
-         * Reading the type ID of a value annotated with $ion_symbol_table to determine whether it is a
-         * struct.
-         */
-        READING_VALUE_WITH_SYMBOL_TABLE_ANNOTATION,
-
-        /**
-         * Reading the length of a struct annotated with $ion_symbol_table.
-         */
-        READING_SYMBOL_TABLE_LENGTH,
-
-        /**
-         * There is nothing left to do.
-         */
-        DONE
-    }
-
-    /**
-     * Holds the start and end indices of a slice of the buffer.
-     */
-    static class Marker {
-        /**
-         * Index of the first byte in the slice.
-         */
-        int startIndex;
-
-        /**
-         * Index of the first byte after the end of the slice.
-         */
-        int endIndex;
-
-        /**
-         * @param startIndex index of the first byte in the slice.
-         * @param length the number of bytes in the slice.
-         */
-        private Marker(final int startIndex, final int length) {
-            this.startIndex = startIndex;
-            this.endIndex = startIndex + length;
-        }
-    }
-
-    /**
-     * The number of bytes to attempt to buffer each time more bytes are required.
-     */
-    private final int pageSize;
-
-    /**
-     * The VarUInt currently in progress.
-     */
-    private final VarUInt inProgressVarUInt;
-
-    /**
-     * Markers for any symbol tables that occurred in the stream between the last value and the current value.
-     */
-    private final List<Marker> symbolTableMarkers = new ArrayList<Marker>(2);
-
-    /**
-     * Marker for the sequence of annotation symbol IDs on the current value. If there are no annotations on the
-     * current value, the startIndex will be negative.
-     */
-    private final Marker annotationSidsMarker = new Marker(-1, 0);
-
-    /**
-     * The handler that will be notified when a symbol table exceeds the maximum buffer size.
-     */
-    private final IonBufferConfiguration.OversizedSymbolTableHandler oversizedSymbolTableHandler;
-
-    /**
-     * The number of additional bytes that must be read from `input` and stored in `pipe` before
-     * {@link #moreDataRequired()} can return false.
-     */
-    private long additionalBytesNeeded;
-
-    /**
-     * True if the current value is a system value (IVM, symbol table, or NOP pad), not a user value.
-     * `IonReader#next()` consumes any system values before the next user value, so the wrapper
-     * must be able to identify system values so that their bytes can be included in `pipe` before
-     * {@link #moreDataRequired()} returns false.
-     */
-    private boolean isSystemValue;
-
-    /**
-     * The number of bytes of annotation SIDs left to read from the value's annotation wrapper.
-     */
-    private long numberOfAnnotationSidBytesRemaining;
-
-    /**
-     * The number of annotations in the annotation wrapper that have been processed so far.
-     */
-    private long currentNumberOfAnnotations;
-
-    /**
-     * The current state of the wrapper.
-     */
-    private State state = State.BEFORE_TYPE_ID;
-
-    /**
-     * The write index of the start of the current value.
-     */
-    private int valueStartWriteIndex;
-
-    /**
-     * The number of bytes available in the buffer if truncated to `valueStartWriteIndex`.
-     */
-    private int valueStartAvailable;
-
-    /**
-     * The read index of the type ID byte of the current value.
-     */
-    private int valuePreHeaderIndex;
-
-    /**
-     * The read index of the first byte of the value representation of the current value (past the type ID and the
-     * optional length field).
-     */
-    private int valuePostHeaderIndex;
-
-    /**
-     * The type ID byte of the current value.
-     */
-    private IonTypeID valueTid;
-
-    /**
-     * The index of the first byte after the end of the current value.
-     */
-    private int valueEndIndex;
-
-    /**
-     * The index of the first byte of the first no-op pad that precedes the current value. -1 indicates either that
-     * the current value was not preceded by no-op padding or that the space occupied by the no-op padding that preceded
-     * the current value has already been reclaimed.
-     */
-    private int nopPadStartIndex = -1;
-
-    /**
-     * The index of the second byte of the IVM.
-     */
-    private int ivmSecondByteIndex = -1;
-
-    /**
-     * The index of the next byte to peek from the buffer.
-     */
-    private int peekIndex = 0;
-
-    /**
-     * True if the event handler has not yet been notified if the current value is oversized.
-     */
-    private boolean handlerNeedsToBeNotifiedOfOversizedValue = true;
-
-    /**
-     * Resets the wrapper to the start of a new value.
-     */
-    private void reset() {
-        additionalBytesNeeded = 0;
-        isSystemValue = false;
-        numberOfAnnotationSidBytesRemaining = 0;
-        currentNumberOfAnnotations = 0;
-        valuePreHeaderIndex = -1;
-        valuePostHeaderIndex = -1;
-        valueTid = null;
-        valueEndIndex = -1;
-        annotationSidsMarker.startIndex = -1;
-        valueStartAvailable = pipe.available();
-        startNewValue();
-    }
-
-    /**
-     * Constructs a wrapper with the given configuration.
-     * @param configuration the configuration for the new instance.
-     * @param inputStream an InputStream over binary Ion data.
-     */
-    public IonReaderLookaheadBuffer(final IonBufferConfiguration configuration, final InputStream inputStream) {
-        super(configuration, configuration.getOversizedValueHandler(), inputStream);
-        pipe.registerNotificationConsumer(
-            new ResizingPipedInputStream.NotificationConsumer() {
-                @Override
-                public void bytesConsolidatedToStartOfBuffer(int leftShiftAmount) {
-                    // The existing data in the buffer has been shifted to the start. Adjust the saved indexes
-                    // accordingly. -1 indicates that all indices starting at 0 will be shifted.
-                    shiftIndicesLeft(-1, leftShiftAmount);
-                }
-            }
-        );
-        pageSize = configuration.getInitialBufferSize();
-        oversizedSymbolTableHandler = configuration.getOversizedSymbolTableHandler();
-        inProgressVarUInt = new VarUInt();
-        reset();
-    }
-
-    /**
-     * Resets the `inProgressVarUInt`.
-     * @param location the VarUInt's location.
-     */
-    private void initializeVarUInt(final VarUInt.Location location) {
-        inProgressVarUInt.reset(location);
-        state = State.READING_HEADER;
-    }
-
-    /**
-     * Reads one byte, if possible.
-     * @return the byte, or -1 if none was available.
-     * @throws Exception if thrown by a handler method or if an IOException is thrown by the underlying InputStream.
-     */
-    private int readByte() throws Exception {
-        if (pipe.availableBeyondBoundary() == 0 && fillPage(1) < 1) {
-            return -1;
-        }
-        int b;
-        if (isSkippingCurrentValue()) {
-            // If the value is being skipped, the byte will not have been buffered.
-            b = getInput().read();
-        } else {
-            b = pipe.peek(peekIndex);
-            pipe.extendBoundary(1);
-            peekIndex++;
-        }
-        return b;
-    }
-
-    /**
-     * Reads a VarUInt. NOTE: the VarUInt must fit in a `long`. This is not a true limitation, as IonJava requires
-     * VarUInts to fit in an `int`.
-     * @throws Exception if thrown by a handler method or if an IOException is thrown by the underlying InputStream.
-     */
-    private void readVarUInt() throws Exception {
-        int currentByte;
-        while (inProgressVarUInt.numberOfBytesRead < MAXIMUM_SUPPORTED_VAR_UINT_BYTES) {
-            currentByte = readByte();
-            if (currentByte < 0) {
-                return;
-            }
-            inProgressVarUInt.numberOfBytesRead++;
-            inProgressVarUInt.value =
-                    (inProgressVarUInt.value << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
-            if ((currentByte & HIGHEST_BIT_BITMASK) != 0) {
-                inProgressVarUInt.isComplete = true;
-                dataHandler.onData(inProgressVarUInt.numberOfBytesRead);
-                return;
-            }
-        }
-        throw new IonException("Found a VarUInt that was too large to fit in a `long`");
-    }
-
-    /**
-     * Sets `additionalBytesNeeded` if and only if the value is not within an annotation wrapper. When the
-     * value is contained in an annotation wrapper, `additionalBytesNeeded` was set when reading the annotation
-     * wrapper's length and already includes the value's length.
-     * @param value the new value of `additionalBytesNeeded`.
-     * @param isUnannotated true if this type ID is not on a value within an annotation wrapper; false if it is.
-     */
-    private void setAdditionalBytesNeeded(final long value, final boolean isUnannotated) {
-        if (isUnannotated) {
-            additionalBytesNeeded = value;
-        }
-    }
-
-    /**
-     * Conveys the result of {@link #readTypeID(boolean)}.
-     */
-    private enum ReadTypeIdResult {
-        /**
-         * The type ID is for a struct value.
-         */
-        STRUCT,
-        /**
-         * The type ID is not for a struct value.
-         */
-        NOT_STRUCT,
-        /**
-         * The type ID could not be read because there is no data available. `readTypeID` should be called
-         * again when more data is available.
-         */
-        NO_DATA
-    }
-
-    /**
-     * Reads the type ID byte.
-     * @param isUnannotated true if this type ID is not on a value within an annotation wrapper; false if it is.
-     * @return the result as a {@link ReadTypeIdResult}.
-     * @throws Exception if thrown by a handler method or if an IOException is thrown by the underlying InputStream.
-     */
-    private ReadTypeIdResult readTypeID(final boolean isUnannotated) throws Exception {
-        int header = readByte();
-        if (header < 0) {
-            return ReadTypeIdResult.NO_DATA;
-        }
-        valueTid = IonTypeID.TYPE_IDS_1_0[header];
-        dataHandler.onData(1);
-        if (header == IVM_START_BYTE) {
-            if (!isUnannotated) {
-                throw new IonException("Invalid annotation header.");
-            }
-            additionalBytesNeeded = IVM_REMAINING_LENGTH;
-            isSystemValue = true;
-            // Encountering an IVM resets the symbol table context; no need to parse any previous symbol tables.
-            resetSymbolTableMarkers();
-            ivmSecondByteIndex = peekIndex;
-            state = State.SKIPPING_VALUE;
-        } else if (!valueTid.isValid) {
-            throw new IonException("Invalid type ID.");
-        } else if (valueTid.type == IonType.BOOL) {
-            // bool values are always a single byte.
-            state = State.BEFORE_TYPE_ID;
-        } else if (valueTid.type == IonTypeID.ION_TYPE_ANNOTATION_WRAPPER) {
-            // Annotation.
-            if (valueTid.variableLength) {
-                initializeVarUInt(VarUInt.Location.ANNOTATION_WRAPPER_LENGTH);
-            } else {
-                setAdditionalBytesNeeded(valueTid.length, isUnannotated);
-                initializeVarUInt(VarUInt.Location.ANNOTATION_WRAPPER_SIDS_LENGTH);
-            }
-        } else {
-            if (valueTid.isNull) {
-                // null values are always a single byte.
-                state = State.BEFORE_TYPE_ID;
-            } else {
-                // Not null
-                if (valueTid.variableLength) {
-                    initializeVarUInt(VarUInt.Location.VALUE_LENGTH);
-                } else {
-                    setAdditionalBytesNeeded(valueTid.length, isUnannotated);
-                    state = State.SKIPPING_VALUE;
-                }
-            }
-        }
-        if (valueTid.type == IonType.STRUCT) {
-            return ReadTypeIdResult.STRUCT;
-        }
-        return ReadTypeIdResult.NOT_STRUCT;
-    }
-
-    /**
-     * Reads the bytes of the value header that occur after the type ID byte and before the first value byte.
-     * @throws Exception if thrown by a handler method or if an IOException is thrown by the underlying InputStream.
-     */
-    private void readHeader() throws Exception {
-        if (inProgressVarUInt.location == VarUInt.Location.VALUE_LENGTH) {
-            readVarUInt();
-            if (inProgressVarUInt.isComplete) {
-                additionalBytesNeeded = inProgressVarUInt.value;
-                state = State.SKIPPING_VALUE;
-            }
-            return;
-        }
-        if (inProgressVarUInt.location == VarUInt.Location.ANNOTATION_WRAPPER_LENGTH) {
-            readVarUInt();
-            if (!inProgressVarUInt.isComplete) {
-                return;
-            }
-            additionalBytesNeeded = inProgressVarUInt.value;
-            initializeVarUInt(VarUInt.Location.ANNOTATION_WRAPPER_SIDS_LENGTH);
-        }
-        if (inProgressVarUInt.location == VarUInt.Location.ANNOTATION_WRAPPER_SIDS_LENGTH) {
-            readVarUInt();
-            if (!inProgressVarUInt.isComplete) {
-                return;
-            }
-            additionalBytesNeeded -= inProgressVarUInt.numberOfBytesRead;
-            numberOfAnnotationSidBytesRemaining = inProgressVarUInt.value;
-            initializeVarUInt(VarUInt.Location.ANNOTATION_WRAPPER_SID);
-            annotationSidsMarker.startIndex = peekIndex;
-            annotationSidsMarker.endIndex = annotationSidsMarker.startIndex + (int) numberOfAnnotationSidBytesRemaining;
-        }
-        if (inProgressVarUInt.location == VarUInt.Location.ANNOTATION_WRAPPER_SID) {
-            // Read the first annotation SID, which is all that is required to determine whether the value is a
-            // symbol table.
-            readVarUInt();
-            if (inProgressVarUInt.isComplete) {
-                numberOfAnnotationSidBytesRemaining -= inProgressVarUInt.numberOfBytesRead;
-                additionalBytesNeeded -= inProgressVarUInt.numberOfBytesRead;
-                if (inProgressVarUInt.value == ION_SYMBOL_TABLE_SID) {
-                    state = State.READING_VALUE_WITH_SYMBOL_TABLE_ANNOTATION;
-                } else {
-                    state = State.SKIPPING_VALUE;
-                }
-            }
-        }
-    }
-
-    /**
-     * Shift all indices after 'afterIndex' left by the given amount. This is used when data is moved in the underlying
-     * buffer either due to buffer growth or NOP padding being reclaimed to make room for a value that would otherwise
-     * exceed the buffer's maximum size.
-     * @param afterIndex all indices after this index will be shifted (-1 indicates that all indices should be shifted).
-     * @param shiftAmount the amount to shift left.
-     */
-    private void shiftIndicesLeft(int afterIndex, int shiftAmount) {
-        peekIndex = Math.max(peekIndex - shiftAmount, 0);
-        valuePreHeaderIndex -= shiftAmount;
-        valuePostHeaderIndex -= shiftAmount;
-        valueStartWriteIndex -= shiftAmount;
-        for (Marker symbolTableMarker : symbolTableMarkers) {
-            if (symbolTableMarker.startIndex > afterIndex) {
-                symbolTableMarker.startIndex -= shiftAmount;
-                symbolTableMarker.endIndex -= shiftAmount;
-            }
-        }
-        if (annotationSidsMarker.startIndex > afterIndex) {
-            annotationSidsMarker.startIndex -= shiftAmount;
-            annotationSidsMarker.endIndex -= shiftAmount;
-        }
-        if (ivmSecondByteIndex > afterIndex) {
-            ivmSecondByteIndex -= shiftAmount;
-        }
-    }
-
-    /**
-     * Reclaim the NOP padding that occurred before the current value, making space for the value in the buffer.
-     */
-    private void reclaimNopPadding() {
-        pipe.consolidate(valuePreHeaderIndex, nopPadStartIndex);
-        shiftIndicesLeft(nopPadStartIndex, valuePreHeaderIndex - nopPadStartIndex);
-        resetNopPadIndex();
-    }
-
-    /**
-     * Skip bytes from the underlying InputStream without ever buffering them.
-     * @param numberOfBytesToSkip the number of bytes to attempt to skip.
-     * @return the number of bytes actually skipped.
-     * @throws IOException if thrown by the underlying InputStream.
-     */
-    private long skipBytesFromInput(long numberOfBytesToSkip) throws IOException {
-        try {
-            return getInput().skip(numberOfBytesToSkip);
-        } catch (EOFException e) {
-            // Certain InputStream implementations (e.g. GZIPInputStream) throw EOFException if more bytes are requested
-            // to skip than are currently available (e.g. if a header or trailer is incomplete).
-            return 0;
-        }
-    }
-
-    /**
-     * Retrieve and buffer up to {@link #pageSize} bytes from the input.
-     * @param numberOfBytesRequested the minimum amount of space that must be available before the buffer reaches
-     *                               its configured maximum size.
-     * @return the number of bytes buffered by this operation.
-     * @throws Exception if thrown by the underlying InputStream.
-     */
-    private int fillPage(int numberOfBytesRequested) throws Exception {
-        int amountToFill = pipe.capacity() - pipe.size();
-        if (amountToFill <= 0) {
-            // Try to fill the remainder of the existing buffer to avoid growing unnecessarily. If there is no
-            // space, that indicates that a single value exceeds the size of a page. In that case, fill another page,
-            // growing the buffer only up to the configured maximum size.
-            int spaceAvailable = getMaximumBufferSize() - pipe.capacity();
-            if (numberOfBytesRequested > spaceAvailable) {
-                if (nopPadStartIndex > -1 && valuePreHeaderIndex - nopPadStartIndex >= numberOfBytesRequested) {
-                    // Reclaim the NOP pad space if doing so would allow the value to fit.
-                    reclaimNopPadding();
-                } else {
-                    startSkippingValue();
-                }
-                amountToFill = numberOfBytesRequested;
-            } else {
-                amountToFill = Math.min(pageSize, spaceAvailable);
-            }
-        }
-        int received;
-        if (isSkippingCurrentValue()) {
-            if (state == State.SKIPPING_VALUE) {
-                // This is a seek operation, meaning that the bytes don't need to be interpreted.
-                received = (int) skipBytesFromInput(amountToFill);
-            } else {
-                // The bytes need to be interpreted, so they cannot be skipped. The caller must retrieve them from
-                // the input.
-                received = amountToFill;
-            }
-        } else {
-            received = pipe.receive(getInput(), amountToFill);
-        }
-        return received;
-    }
-
-    /**
-     * Notifies the event handler that the current value is oversized, if the handler has not already been notified.
-     * @throws Exception if thrown by the handler.
-     */
-    private void notifyHandlerOfOversizedValue() throws Exception {
-        if (handlerNeedsToBeNotifiedOfOversizedValue) {
-            if (isSystemValue) {
-                // Processing cannot continue after system values (symbol tables) are truncated because subsequent
-                // values may be unreadable. Notify the user.
-                oversizedSymbolTableHandler.onOversizedSymbolTable();
-            } else {
-                // An oversized user value has been encountered. Notify the user so they can decide whether to continue
-                // or abort.
-                oversizedValueHandler.onOversizedValue();
-            }
-        }
-        handlerNeedsToBeNotifiedOfOversizedValue = false;
-    }
-
-    /**
-     * Attempt to retrieve at least `additionalBytesNeeded` bytes from the input and either buffer them (if the value
-     * is being consumed) or skip them (if the value is being skipped due to being oversize).
-     * @return the number of bytes filled or skipped.
-     * @throws Exception if thrown by the event handler.
-     */
-    private long fillOrSkip() throws Exception {
-        // Clamping at the number of buffered bytes available guarantees that the buffer
-        // will never grow beyond its initial size.
-        long bytesRequested = additionalBytesNeeded - pipe.availableBeyondBoundary();
-        long bytesFilled;
-        if (isSkippingCurrentValue()) {
-            bytesFilled = skipBytesFromInput(bytesRequested);
-        } else {
-            if (additionalBytesNeeded > MAXIMUM_VALUE_SIZE) {
-                throw new IonException("The size of the value exceeds the limits of the implementation.");
-            }
-            bytesFilled = fillPage((int) bytesRequested);
-        }
-        if (bytesFilled < 1) {
-            return 0;
-        }
-        if (isSkippingCurrentValue()) {
-            // The user cannot be notified of a size violation until it has been determined whether
-            // the value is a symbol table or user value, which is only true in the SKIPPING_VALUE
-            // state.
-            notifyHandlerOfOversizedValue();
-            // Skip all of the bytes skipped from the InputStream as well as all bytes previously
-            // buffered.
-            bytesFilled = bytesFilled + ((int) additionalBytesNeeded - bytesRequested);
-        } else {
-            bytesFilled = Math.min(additionalBytesNeeded, bytesFilled);
-            pipe.extendBoundary((int) bytesFilled);
-            peekIndex += (int) bytesFilled;
-        }
-        return bytesFilled;
-    }
-
-    /**
-     * Attempts to skip the requested number of bytes.
-     * @param numberOfBytesToSkip the number of bytes to attempt to skip.
-     * @return the number of bytes actually skipped.
-     * @throws Exception if thrown by the event handler.
-     */
-    private long skip(long numberOfBytesToSkip) throws Exception {
-        long numberOfBytesSkipped;
-        if (pipe.availableBeyondBoundary() >= numberOfBytesToSkip) {
-            numberOfBytesSkipped = (int) numberOfBytesToSkip;
-            pipe.extendBoundary((int) numberOfBytesSkipped);
-            peekIndex += (int) numberOfBytesSkipped;
-        } else {
-            numberOfBytesSkipped = fillOrSkip();
-        }
-        if (numberOfBytesSkipped > 0) {
-            long numberOfBytesToReport = numberOfBytesSkipped;
-            while (numberOfBytesToReport > 0) {
-                int numberOfBytesToReportThisIteration = (int) Math.min(Integer.MAX_VALUE, numberOfBytesToReport);
-                dataHandler.onData(numberOfBytesToReportThisIteration);
-                numberOfBytesToReport -= numberOfBytesToReportThisIteration;
-            }
-        }
-        return numberOfBytesSkipped;
-    }
-
-    /*
-     * The state transitions of the fillInput() method are summarized by the following diagram.
-     *
-     *                                 fillInput()
-     *                                       |
-     *                                       |   +----------------------------------------------------+
-     *                                       |   |                                                    |
-     *       Read first byte of IVM +--------v---v-+                                                  |
-     *   +--------------------------+BEFORE_TYPE_ID<--+                                               |
-     *   |   Or length was inferred |              +--+1-byte value(null or bool) read                |
-     *   |    from the type ID    +>+------+-------+                                                  |
-     *   |                        |        |                                                          |
-     *   |                        |        |No bytes available                                        |
-     *   |           1-byte value |        v                                                          |
-     *   |                        | +----------------+                                                |
-     *   |                        +-+READING_TYPE_ID <-+                                              |
-     *   |                          |                +-+No bytes available                            |
-     *   |                          +------+---------+                                                |
-     *   |                                 |Read type-id of multi-byte value                          |
-     *   |                                 v                                                          |
-     *   |      Finished header     +----------------+                                                |
-     *   | +------------------------+READING_HEADER  <--+                                             |
-     *   | |                        |                +--+Not enough bytes to complete header          |
-     *   | |                        +------+---------+                                                |
-     *   | |                               |Read annotation wrapper with symbol table annotation      |
-     *   | |                               v                                                          |
-     *   | |             +---------------------------------------------+                              |
-     *   | |             |READING_VALUE_WITH_SYMBOL_TABLE_ANNOTATION   <--+                           |
-     *   | |             |                                             +--+No bytes available         |
-     *   | |             +--+--------------+---------------------------+                              |
-     *   | |                |              |The wrapped value is a struct                             |
-     *   | | The wrapped    |              v                                                          |
-     *   | |  value is not  |  +-----------------------------+                                        |
-     *   | |   a struct     |  | READING_SYMBOL_TABLE_LENGTH <--+                                     |
-     *   | |                |  |                             +--+Not enough bytes to complete length  |
-     *   | |                |  +-----------+-----------------+                                        |
-     *   | |                |              |Read length                                               |
-     *   | |                |              v                                                          |
-     *   | |                |      +-----------------+                                                |
-     *   | +--------------->+----->| SKIPPING_VALUE  <--+                                             |
-     *   |                         |                 +--+More bytes needed to complete skip           |
-     *   +------------------------>+-------+---------+                                                |
-     *                                     |                                                          |
-     *                                     |All bytes skipped                                         |
-     *                                     |                                                          |
-     *                                     +----------------------------------------------------------+
-     */
-    @Override
-    protected void fillInputHelper() throws Exception {
-        while (true) {
-            if (state == State.BEFORE_TYPE_ID || state == State.READING_TYPE_ID) {
-                reset();
-                state = State.READING_TYPE_ID;
-                if (readTypeID(true) != ReadTypeIdResult.NO_DATA) {
-                    // The previous line transfers at most one byte, so the pre-header index is the write index minus
-                    // one.
-                    valuePostHeaderIndex = peekIndex;
-                    valuePreHeaderIndex = valuePostHeaderIndex - 1;
-                    valueStartWriteIndex = valuePreHeaderIndex;
-                }
-            }
-            if (state == State.READING_HEADER) {
-                readHeader();
-                if (!inProgressVarUInt.isComplete) {
-                    return;
-                }
-                valuePostHeaderIndex = peekIndex;
-            }
-            if (state == State.READING_VALUE_WITH_SYMBOL_TABLE_ANNOTATION) {
-                // Skip annotations until positioned on the value's type ID.
-                while (numberOfAnnotationSidBytesRemaining > 0) {
-                    long numberOfBytesSkipped = skip(numberOfAnnotationSidBytesRemaining);
-                    if (numberOfBytesSkipped < 1) {
-                        return;
-                    }
-                    numberOfAnnotationSidBytesRemaining -= numberOfBytesSkipped;
-                    additionalBytesNeeded -= numberOfBytesSkipped;
-                }
-                ReadTypeIdResult result = readTypeID(false);
-                if (result == ReadTypeIdResult.NO_DATA) {
-                    return;
-                }
-                // When successful, readTypeID reads exactly one byte.
-                additionalBytesNeeded--;
-                if (result == ReadTypeIdResult.STRUCT) {
-                    state = State.READING_SYMBOL_TABLE_LENGTH;
-                } else {
-                    state = State.SKIPPING_VALUE;
-                }
-            }
-            if (state == State.READING_SYMBOL_TABLE_LENGTH) {
-                isSystemValue = true;
-                if (inProgressVarUInt.location == VarUInt.Location.VALUE_LENGTH) {
-                    readVarUInt();
-                    if (!inProgressVarUInt.isComplete) {
-                        return;
-                    }
-                    additionalBytesNeeded = inProgressVarUInt.value;
-                }
-                symbolTableMarkers.add(new Marker(peekIndex, (int) additionalBytesNeeded));
-                state = State.SKIPPING_VALUE;
-            }
-            if (state == State.SKIPPING_VALUE) {
-                if (valueTid.isNopPad) {
-                    if (pipe.availableBeyondBoundary() <= additionalBytesNeeded) {
-                        // There cannot be any meaningful data beyond the NOP pad, so the buffer can be truncated
-                        // immediately and the rest of the NOP pad skipped.
-                        additionalBytesNeeded -= pipe.availableBeyondBoundary();
-                        startSkippingValue();
-                        // NOP padding will not be buffered, so it is never considered oversized.
-                        handlerNeedsToBeNotifiedOfOversizedValue = false;
-                    }
-                    // Else, the rest of the NOP pad is already buffered, and there is a value at least partially
-                    // buffered beyond it. The NOP pad will only be deleted from the buffer if the next value is
-                    // large enough that it doesn't fit within the buffer's configured maximum size.
-                }
-                while (additionalBytesNeeded > 0) {
-                    long numberOfBytesSkipped = skip(additionalBytesNeeded);
-                    if (numberOfBytesSkipped < 1) {
-                        return;
-                    }
-                    additionalBytesNeeded -= numberOfBytesSkipped;
-                }
-                state = State.BEFORE_TYPE_ID;
-            }
-            if (state == State.BEFORE_TYPE_ID) {
-                valueEndIndex = peekIndex;
-                if (isSystemValue || isSkippingCurrentValue() || valueTid.isNopPad) {
-                    if (valueTid.isNopPad && nopPadStartIndex < 0) {
-                        // This is the first NOP before the next value. Mark the start index in case the space needs to
-                        // be reclaimed later.
-                        nopPadStartIndex = valuePreHeaderIndex;
-                    }
-                    if (isSystemValue && isSkippingCurrentValue()) {
-                        // The symbol table(s) currently buffered exceed the maximum buffer size. This is not
-                        // recoverable; future invocations of fillInput() will do nothing.
-                        reset();
-                        state = State.DONE;
-                    } else {
-                        if (isSystemValue && nopPadStartIndex > -1) {
-                            // Reclaim any NOP pad space that precedes system values. This will usually not be strictly
-                            // necessary, but it simplifies the implementation and will be rare in practice. Without
-                            // this simplification, we would need to keep track of a list of NOP pad start/end indexes
-                            // as we do with the symbol table markers. This way, we know that there can only be one
-                            // uninterrupted run of NOP pad bytes immediately preceding any user value, making it easy
-                            // to reclaim this space if necessary.
-                            reclaimNopPadding();
-                        }
-                        // Just skipped over system value or an oversized value. Consume the next value too so that a
-                        // call to reader.next() won't return null.
-                        continue;
-                    }
-                }
-            }
-            break;
-        }
-    }
-
-    @Override
-    void truncateToEndOfPreviousValue() {
-        peekIndex = valueStartWriteIndex;
-        pipe.truncate(valueStartWriteIndex, valueStartAvailable);
-        handlerNeedsToBeNotifiedOfOversizedValue = true;
-    }
-
-    @Override
-    public boolean moreDataRequired() {
-        return pipe.available() <= 0 || state != State.BEFORE_TYPE_ID;
-    }
-
-    /**
-     * Rewinds to the start of the value currently buffered. Does not include any system values that may precede
-     * the value. This method is not called in conjunction with {@link #mark()} / {@link #rewind()}, which may be
-     * used if the caller wants to rewind to the start of any system values that precede the current value. This
-     * method may be used to re-read the current value and may only be called after {@code IonReader.next()}
-     * has been called on the current value; otherwise, the data representing any system values that precede the
-     * current value would be lost.
-     *
-     * @throws IllegalStateException if there is no value currently buffered or if system value data would be lost
-     *   as a result of calling this method before {@code IonReader.next()} was called.
-     */
-    public void rewindToValueStart() {
-        if (valuePreHeaderIndex < 0) {
-            throw new IllegalStateException("A value must be buffered before calling rewindToValueStart().");
-        }
-        int availableAtValueStart = pipe.getBoundary() - valuePreHeaderIndex;
-        // If rewinding would reduce the amount of data available, that indicates that system value data would be lost.
-        if (availableAtValueStart < available()) {
-            throw new IllegalStateException(
-                "IonReader.next() must be called on the current value before calling rewindToValueStart()."
-            );
-        }
-        pipe.rewind(valuePreHeaderIndex, availableAtValueStart);
-        peekIndex = valuePreHeaderIndex;
-    }
-
-    /**
-     * @return the index of the second byte of the IVM.
-     */
-    int getIvmIndex() {
-        return ivmSecondByteIndex;
-    }
-
-    /**
-     * Clears the IVM index. Should be called between user values.
-     */
-    void resetIvmIndex() {
-        ivmSecondByteIndex = -1;
-    }
-
-    /**
-     * Clears the NOP pad index. Should be called between user values.
-     */
-    void resetNopPadIndex() {
-        nopPadStartIndex = -1;
-    }
-
-    /**
-     * @return the index of the first byte of the value representation (past the type ID and the optional length field).
-     */
-    int getValueStart() {
-        if (hasAnnotations()) {
-            return annotationSidsMarker.endIndex;
-        }
-        return valuePostHeaderIndex;
-    }
-
-    /**
-     * @return the type ID of the current value.
-     */
-    IonTypeID getValueTid() {
-        return valueTid;
-    }
-
-    /**
-     * @return the index of the first byte after the end of the current value.
-     */
-    int getValueEnd() {
-        return valueEndIndex;
-    }
-
-    /**
-     * Returns markers for any symbol tables that occurred in the stream between the last value and the current value.
-     * The startIndex of the returned markers is the index of the first byte of the symbol table struct's contents.
-     * The endIndex of the returned markers is the index of the first byte after the end of the symbol table.
-     * @return the markers.
-     */
-    List<Marker> getSymbolTableMarkers() {
-        return symbolTableMarkers;
-    }
-
-    /**
-     * Clears the symbol table markers.
-     */
-    void resetSymbolTableMarkers() {
-        symbolTableMarkers.clear();
-    }
-
-    /**
-     * @return true if the current value has annotations; otherwise, false.
-     */
-    boolean hasAnnotations() {
-        return annotationSidsMarker.startIndex >= 0;
-    }
-    /**
-     * Returns the marker for the sequence of annotation symbol IDs on the current value. The startIndex of the
-     * returned marker is the index of the first byte of the first annotation symbol ID in the sequence. The endIndex
-     * of the returned marker is the index of the type ID byte of the value to which the annotations are applied.
-     * @return  the marker.
-     */
-    Marker getAnnotationSidsMarker() {
-        return annotationSidsMarker;
-    }
-
-}
diff --git a/src/com/amazon/ion/impl/ReaderLookaheadBuffer.java b/src/com/amazon/ion/impl/ReaderLookaheadBuffer.java
deleted file mode 100644
index 6264b31bd4..0000000000
--- a/src/com/amazon/ion/impl/ReaderLookaheadBuffer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.amazon.ion.impl;
-
-import com.amazon.ion.IonReader;
-import com.amazon.ion.system.IonReaderBuilder;
-
-/**
- * Interface for lookahead buffers that enable incremental reading of streaming data.
- */
-public interface ReaderLookaheadBuffer {
-
-    /**
-     * If possible, fills the input pipe with enough bytes to enable one more successful call to
-     * {@link IonReader#next()} on the non-incremental reader attached to the pipe. If not enough bytes were available
-     * in the raw input stream to complete the next top-level user value, calling {@link #moreDataRequired()} after this
-     * method returns will return `true`. In this case, this method must be called again before calling
-     * `IonReader.next()` to position the reader on this value. Otherwise, `moreDataRequired()` will return `false` and
-     * a call to `IonReader.next()` may be made to position the reader on this value. Implementations may throw
-     * `IonException` if invalid Ion data is detected. Implementations may define exceptional cases.
-     * @throws Exception if an IOException is thrown by the underlying InputStream.
-     */
-    void fillInput() throws Exception;
-
-    /**
-     * Indicates whether more data must become present in the raw input stream before a successful call to
-     * {@link IonReader#next()} may be made to position the reader on the most-recently-buffered value.
-     * @return true if more data is required to complete the next top-level user value; otherwise, false.
-     */
-    boolean moreDataRequired();
-
-    /**
-     * Indicates how many bytes are currently stored in the internal buffer. This can be used to detect whether
-     * calls to fillInput() are successfully retrieving data.
-     * @return The number of bytes waiting in the input buffer.
-     */
-    int available();
-
-    /**
-     * Builds a reader over the input pipe. NOTE: because IonReader construction consumes bytes from the stream
-     * (to determine whether the stream is binary or text Ion), {@link #fillInput()} must have been called (such that
-     * {@link #moreDataRequired()} returns `false`)  before calling this method. For the same reason, this method must
-     * only be called once per instance of this class.
-     * @param builder the builder containing the reader's configuration.
-     * @return a new IonReader.
-     */
-    IonReader newIonReader(IonReaderBuilder builder);
-}
diff --git a/src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java b/src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java
deleted file mode 100644
index a5128a0893..0000000000
--- a/src/com/amazon/ion/impl/ReaderLookaheadBufferBase.java
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package com.amazon.ion.impl;
-
-import com.amazon.ion.BufferConfiguration;
-import com.amazon.ion.IonReader;
-import com.amazon.ion.system.IonReaderBuilder;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Base class for lookahead buffers that enable incremental reading of streaming data.
- */
-abstract class ReaderLookaheadBufferBase implements ReaderLookaheadBuffer {
-
-    /**
-     * An InputStream over binary Ion data.
-     */
-    private final InputStream input;
-
-    /**
-     * A buffer for the bytes required for a successful call to {@link IonReader#next()}.
-     */
-    protected final ResizingPipedInputStream pipe;
-
-    /**
-     * The maximum number of bytes that will be buffered.
-     */
-    private final int maximumBufferSize;
-
-    /**
-     * The handler that will be notified when a value exceeds the maximum buffer size.
-     */
-    protected final BufferConfiguration.OversizedValueHandler oversizedValueHandler;
-
-    /**
-     * The handler that will be notified when data is processed.
-     */
-    protected final BufferConfiguration.DataHandler dataHandler;
-
-    /**
-     * The current mark for the pipe's value of 'available'.
-     */
-    private int markedAvailable;
-
-    /**
-     * The current mark for the pipe's value of 'readIndex'.
-     */
-    private int markedReadIndex;
-
-    /**
-     * Indicates whether the current value is being skipped due to being oversized.
-     */
-    private boolean isSkippingCurrentValue;
-
-    /**
-     * Constructs a wrapper over the given stream using the given configuration.
-     * @param configuration the buffer configuration.
-     * @param inputStream an InputStream over Ion data.
-     */
-    ReaderLookaheadBufferBase(
-        final BufferConfiguration<?> configuration,
-        final BufferConfiguration.OversizedValueHandler oversizedValueHandler,
-        final InputStream inputStream
-    ) {
-        input = inputStream;
-        pipe = new ResizingPipedInputStream(
-            configuration.getInitialBufferSize(),
-            configuration.getMaximumBufferSize(),
-            true
-        );
-        maximumBufferSize = configuration.getMaximumBufferSize();
-        this.oversizedValueHandler = oversizedValueHandler;
-        dataHandler = configuration.getDataHandler();
-        clearMark();
-    }
-
-    /**
-     * @inheritDoc
-     * @throws Exception if thrown by a handler method or if an IOException is thrown by the underlying InputStream.
-     */
-    @Override
-    public final void fillInput() throws Exception {
-        clearMark();
-        fillInputHelper();
-    }
-
-    /**
-     * Implements the behavior described in {@link #fillInput()}, except for clearing the mark.
-     * @throws IOException if thrown by the underlying input stream.
-     * @throws Exception if thrown by a handler method.
-     */
-    protected abstract void fillInputHelper() throws Exception;
-
-    @Override
-    public final int available() {
-        return pipe.available();
-    }
-
-    @Override
-    public final IonReader newIonReader(final IonReaderBuilder builder) {
-        return builder.build(pipe);
-    }
-
-    /**
-     * Marks the current read position in the underlying buffer. This mark remains valid only until the next call
-     * to {@link #fillInput()}.
-     * @throws IllegalStateException if more data is required to complete a value.
-     */
-    public final void mark() {
-        if (moreDataRequired()) {
-            throw new IllegalStateException("moreDataRequired() must be false before calling mark().");
-        }
-        uncheckedMark();
-    }
-
-    /**
-     * Sets the mark without verifying that a complete value is buffered.
-     */
-    final void uncheckedMark() {
-        markedAvailable = available();
-        markedReadIndex = pipe.getReadIndex();
-    }
-
-    /**
-     * Rewinds the underlying buffer to the mark.
-     * @see #mark()
-     * @throws IllegalStateException if there is no valid mark.
-     */
-    public final void rewind() {
-        if (markedReadIndex < 0 || markedAvailable < 0) {
-            throw new IllegalStateException("Must call mark() before rewind().");
-        }
-        pipe.rewind(markedReadIndex, markedAvailable);
-    }
-
-    /**
-     * Truncates the buffer to the end of the last complete value.
-     * @throws Exception if thrown by a handler.
-     */
-    abstract void truncateToEndOfPreviousValue() throws Exception;
-
-    /**
-     * Clears the mark.
-     * @see #mark()
-     */
-    public final void clearMark() {
-        markedAvailable = -1;
-        markedReadIndex = -1;
-    }
-
-    /**
-     * @return the underlying pipe.
-     */
-    protected InputStream getPipe() {
-        return pipe;
-    }
-
-    /**
-     * @return the underlying input.
-     */
-    protected InputStream getInput() {
-        return input;
-    }
-
-    /**
-     * Prepares for the start of a new value by clearing the {@link #isSkippingCurrentValue} flag.
-     */
-    protected void startNewValue() {
-        isSkippingCurrentValue = false;
-    }
-
-    /**
-     * Start skipping the current value, if it is not already being skipped. This should be called when the value
-     * is determined to be oversize. This truncates the buffer to the end of the previous value, reclaiming the space.
-     * @throws Exception if thrown by the event handler.
-     */
-    protected void startSkippingValue() throws Exception {
-        if (!isSkippingCurrentValue) {
-            isSkippingCurrentValue = true;
-            truncateToEndOfPreviousValue();
-        }
-    }
-
-    /**
-     * Indicates whether the current value is being skipped due to being oversized.
-     * @return true if the value is being skipped; otherwise, false.
-     */
-    protected boolean isSkippingCurrentValue() {
-        return isSkippingCurrentValue;
-    }
-
-    /**
-     * @return the maximum size of the buffer.
-     */
-    protected int getMaximumBufferSize() {
-        return maximumBufferSize;
-    }
-}
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java b/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
deleted file mode 100644
index 534cffdbdb..0000000000
--- a/test/com/amazon/ion/impl/IonReaderBinaryIncrementalTest.java
+++ /dev/null
@@ -1,3409 +0,0 @@
-package com.amazon.ion.impl;
-
-import com.amazon.ion.BufferConfiguration;
-import com.amazon.ion.Decimal;
-import com.amazon.ion.IntegerSize;
-import com.amazon.ion.IonBufferConfiguration;
-import com.amazon.ion.IonDatagram;
-import com.amazon.ion.IonException;
-import com.amazon.ion.IonLoader;
-import com.amazon.ion.IonReader;
-import com.amazon.ion.IonString;
-import com.amazon.ion.IonStruct;
-import com.amazon.ion.IonSystem;
-import com.amazon.ion.IonType;
-import com.amazon.ion.IonValue;
-import com.amazon.ion.IonWriter;
-import com.amazon.ion.SymbolTable;
-import com.amazon.ion.SymbolToken;
-import com.amazon.ion.TestUtils;
-import com.amazon.ion.Timestamp;
-import com.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder;
-import com.amazon.ion.impl.bin._Private_IonManagedWriter;
-import com.amazon.ion.impl.bin._Private_IonRawWriter;
-import com.amazon.ion.system.IonBinaryWriterBuilder;
-import com.amazon.ion.system.IonReaderBuilder;
-import com.amazon.ion.system.IonSystemBuilder;
-import com.amazon.ion.system.SimpleCatalog;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import static com.amazon.ion.BitUtils.bytes;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-public class IonReaderBinaryIncrementalTest {
-
-    private static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
-    private static final IonReaderBuilder STANDARD_READER_BUILDER = IonReaderBuilder.standard()
-        .withIncrementalReadingEnabled(true);
-    private static final IonBinaryWriterBuilder STANDARD_WRITER_BUILDER = IonBinaryWriterBuilder.standard();
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    // Builds the incremental reader. May be overwritten by individual tests.
-    private IonReaderBuilder readerBuilder;
-    // Builds binary writers for constructing test data. May be overwritten by individual tests.
-    private IonBinaryWriterBuilder writerBuilder;
-
-    @Before
-    public void setup() {
-        readerBuilder = STANDARD_READER_BUILDER;
-        writerBuilder = STANDARD_WRITER_BUILDER;
-    }
-
-    /**
-     * Writes binary Ion streams with a user-level writer.
-     */
-    private interface WriterFunction {
-        void write(IonWriter writer) throws IOException;
-    }
-
-    /**
-     * Writes binary Ion streams with a raw writer. Also allows bytes to be written directly to the stream.
-     */
-    private interface RawWriterFunction {
-        void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException;
-    }
-
-    /**
-     * Converts the given text Ion to the equivalent binary Ion.
-     * @param ion text Ion data.
-     * @return the equivalent binary Ion data.
-     * @throws Exception if the given data is invalid.
-     */
-    private static byte[] toBinary(String ion) throws Exception {
-        return TestUtils.ensureBinary(SYSTEM, ion.getBytes("UTF-8"));
-    }
-
-    /**
-     * Creates an incremental reader over the binary equivalent of the given text Ion.
-     * @param ion text Ion data.
-     * @return a new reader.
-     * @throws Exception if an exception is raised while converting the Ion data.
-     */
-    private IonReaderBinaryIncremental readerFor(String ion) throws Exception {
-        return new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(toBinary(ion)));
-    }
-
-    /**
-     * Creates an incremental reader over the binary Ion data created by invoking the given RawWriterFunction.
-     * @param writerFunction the function used to generate the data.
-     * @return a new reader.
-     * @throws Exception if an exception is raised while writing the Ion data.
-     */
-    private IonReaderBinaryIncremental readerFor(RawWriterFunction writerFunction) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        _Private_IonRawWriter writer = writerBuilder.build(out)
-            .asFacet(_Private_IonManagedWriter.class)
-            .getRawWriter();
-        out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
-        writerFunction.write(writer, out);
-        writer.close();
-        return new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(out.toByteArray()));
-    }
-
-    /**
-     * Creates an incremental reader over the binary Ion data created by invoking the given WriterFunction.
-     * @param writerFunction the function used to generate the data.
-     * @return a new reader.
-     * @throws Exception if an exception is raised while writing the Ion data.
-     */
-    private IonReaderBinaryIncremental readerFor(WriterFunction writerFunction) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        IonWriter writer = writerBuilder.build(out);
-        writerFunction.write(writer);
-        writer.close();
-        return new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(out.toByteArray()));
-    }
-
-    /**
-     * Creates an incremental reader over the given bytes, prepended with the IVM.
-     * @param ion binary Ion bytes without an IVM.
-     * @return a new reader.
-     */
-    private IonReaderBinaryIncremental readerFor(int... ion) throws Exception {
-        return new IonReaderBinaryIncremental(
-            readerBuilder,
-            new ByteArrayInputStream(new TestUtils.BinaryIonAppender().append(ion).toByteArray())
-        );
-    }
-
-    @Test
-    public void readInts() throws Exception {
-        final int numberOfValues = 1000000;
-        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
-            @Override
-            public void write(IonWriter writer) throws IOException {
-                for (int i = -(numberOfValues / 2); i < numberOfValues / 2; i++) {
-                    writer.writeInt(i);
-                }
-            }
-        });
-        for (int i = -(numberOfValues / 2); i < numberOfValues / 2; i++) {
-            assertEquals(IonType.INT, reader.next());
-            assertEquals(i, reader.intValue());
-        }
-        reader.close();
-    }
-
-    @Test
-    public void emptyContainers() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("[{}, [], ()] 123");
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertTrue(reader.isInStruct());
-        reader.stepOut();
-        assertFalse(reader.isInStruct());
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        assertFalse(reader.isInStruct());
-        assertNull(reader.next());
-        // The following is repeated intentionally to ensure that the reader acts consistently and sanely when
-        // next() is called multiple times at the end of a container.
-        assertNull(reader.next());
-        reader.stepOut();
-        assertEquals(IonType.SEXP, reader.next());
-        reader.stepIn();
-        assertNull(reader.next());
-        reader.stepOut();
-        reader.stepOut();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(123, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    private static void drainAnnotations(IonReader reader, List<String> annotationsSink) {
-        Iterator<String> iterator = reader.iterateTypeAnnotations();
-        while (iterator.hasNext()) {
-            annotationsSink.add(iterator.next());
-        }
-    }
-
-    @Test
-    public void annotatedTopLevelIterator() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("foo::bar::123 baz::456");
-        assertEquals(IonType.INT, reader.next());
-        List<String> annotations = new ArrayList<String>();
-        drainAnnotations(reader, annotations);
-        assertEquals(Arrays.asList("foo", "bar"), annotations);
-        annotations.clear();
-        assertEquals(123, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
-        drainAnnotations(reader, annotations);
-        assertEquals(Collections.singletonList("baz"), annotations);
-        assertEquals(456, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void annotatedTopLevelAsStrings() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("foo::bar::123 baz::456");
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals(123, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(Collections.singletonList("baz"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals(456, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void annotatedInContainer() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("[foo::bar::123, baz::456]");
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals(123, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(Collections.singletonList("baz"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals(456, reader.intValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void annotatedInContainerIterator() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("[foo::bar::123, baz::456]");
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
-        List<String> annotations = new ArrayList<String>();
-        drainAnnotations(reader, annotations);
-        assertEquals(Arrays.asList("foo", "bar"), annotations);
-        annotations.clear();
-        assertEquals(123, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
-        drainAnnotations(reader, annotations);
-        assertEquals(Collections.singletonList("baz"), annotations);
-        assertEquals(456, reader.intValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void nestedContainers() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("{abc: foo::bar::(123), def: baz::[456, {}]}");
-        assertNull(reader.getType());
-        assertEquals(0, reader.getDepth());
-        assertEquals(IonType.STRUCT, reader.next());
-        assertEquals(IonType.STRUCT, reader.getType());
-        reader.stepIn();
-        assertTrue(reader.isInStruct());
-        assertNull(reader.getType());
-        assertEquals(1, reader.getDepth());
-        assertEquals(IonType.SEXP, reader.next());
-        assertEquals(IonType.SEXP, reader.getType());
-        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
-        reader.stepIn();
-        assertFalse(reader.isInStruct());
-        assertEquals(2, reader.getDepth());
-        assertNull(reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(123, reader.intValue());
-        assertNull(reader.next());
-        assertEquals(2, reader.getDepth());
-        assertNull(reader.getType());
-        reader.stepOut();
-        assertEquals(1, reader.getDepth());
-        assertNull(reader.getType());
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals(IonType.LIST, reader.getType());
-        assertEquals(Collections.singletonList("baz"), Arrays.asList(reader.getTypeAnnotations()));
-        reader.stepIn();
-        assertEquals(2, reader.getDepth());
-        assertNull(reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(456, reader.intValue());
-        assertEquals(IonType.STRUCT, reader.next());
-        assertEquals(IonType.STRUCT, reader.getType());
-        assertEquals(2, reader.getDepth());
-        assertNull(reader.next());
-        assertEquals(2, reader.getDepth());
-        assertNull(reader.getType());
-        reader.stepOut();
-        assertEquals(1, reader.getDepth());
-        assertNull(reader.getType());
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        assertEquals(1, reader.getDepth());
-        reader.stepOut();
-        assertEquals(0, reader.getDepth());
-        assertNull(reader.getType());
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        reader.close();
-    }
-
-    @Test
-    public void skipContainers() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            "[123] 456 {abc: foo::bar::123, def: baz::456} [123] 789 [foo::bar::123, baz::456] [123]"
-        );
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals(IonType.LIST, reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(IonType.STRUCT, reader.next());
-        assertEquals(IonType.STRUCT, reader.getType());
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals(IonType.LIST, reader.getType());
-        reader.stepIn();
-        assertNull(reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(123, reader.intValue());
-        reader.stepOut();
-        assertNull(reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(789, reader.intValue());
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals(IonType.LIST, reader.getType());
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals(IonType.LIST, reader.getType());
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        reader.close();
-    }
-
-    @Test
-    public void skipContainerAfterSteppingIn() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("{abc: foo::bar::123, def: baz::456} 789");
-        assertEquals(IonType.STRUCT, reader.next());
-        assertEquals(IonType.STRUCT, reader.getType());
-        reader.stepIn();
-        assertNull(reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals(123, reader.intValue());
-        assertEquals(IonType.INT, reader.getType());
-        // Step out before completing the value.
-        reader.stepOut();
-        assertNull(reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(789, reader.intValue());
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        reader.close();
-    }
-
-    @Test
-    public void skipValueInContainer() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("{foo: \"bar\", abc: 123, baz: a}");
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals("abc", reader.getFieldName());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("baz", reader.getFieldName());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void fieldNameLength14() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("{multipleValues: [\"first\", \"second\"]}");
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals("multipleValues", reader.getFieldName());
-        reader.stepIn();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("first", reader.stringValue());
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("second", reader.stringValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void annotatedStringLength14() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("value_type::\"StringValueLong\" 123");
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("StringValueLong", reader.stringValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(123, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void annotatedContainerLength14() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("value_type::[\"StringValueLong\"] 123");
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("StringValueLong", reader.stringValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(123, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void symbolsAsStrings() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("bar", reader.getFieldName());
-        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("def", reader.stringValue());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void lstAppend() throws Exception {
-        writerBuilder = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendEnabled();
-        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
-            @Override
-            public void write(IonWriter writer) throws IOException {
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("foo");
-                writer.addTypeAnnotation("uvw");
-                writer.writeSymbol("abc");
-                writer.setFieldName("bar");
-                writer.setTypeAnnotations("qrs", "xyz");
-                writer.writeSymbol("def");
-                writer.stepOut();
-                writer.flush();
-                writer.writeSymbol("orange");
-            }
-        });
-
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("bar", reader.getFieldName());
-        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("def", reader.stringValue());
-        reader.stepOut();
-        SymbolTable preAppend = reader.getSymbolTable();
-        assertEquals(IonType.SYMBOL, reader.next());
-        SymbolTable postAppend = reader.getSymbolTable();
-        assertEquals("orange", reader.stringValue());
-        assertNull(preAppend.find("orange"));
-        assertNotNull(postAppend.find("orange"));
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void lstNonAppend() throws Exception {
-        writerBuilder = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendDisabled();
-        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
-            @Override
-            public void write(IonWriter writer) throws IOException {
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("foo");
-                writer.addTypeAnnotation("uvw");
-                writer.writeSymbol("abc");
-                writer.setFieldName("bar");
-                writer.setTypeAnnotations("qrs", "xyz");
-                writer.writeSymbol("def");
-                writer.stepOut();
-                writer.setTypeAnnotations("$ion_symbol_table");
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("symbols");
-                writer.stepIn(IonType.LIST);
-                writer.writeString("orange");
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbol("orange");
-            }
-        });
-
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("bar", reader.getFieldName());
-        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("def", reader.stringValue());
-        reader.stepOut();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("orange", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void ivmBetweenValues() throws Exception {
-        writerBuilder = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendDisabled();
-        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
-            @Override
-            public void write(IonWriter writer) throws IOException {
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("foo");
-                writer.addTypeAnnotation("uvw");
-                writer.writeSymbol("abc");
-                writer.setFieldName("bar");
-                writer.setTypeAnnotations("qrs", "xyz");
-                writer.writeSymbol("def");
-                writer.stepOut();
-                writer.finish();
-                writer.writeSymbol("orange");
-            }
-        });
-
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("bar", reader.getFieldName());
-        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("def", reader.stringValue());
-        reader.stepOut();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("orange", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void multipleSymbolTablesBetweenValues() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
-            @Override
-            public void write(IonWriter writer) throws IOException {
-                writer.setTypeAnnotations("$ion_symbol_table");
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("symbols");
-                writer.stepIn(IonType.LIST);
-                writer.writeString("abc");
-                writer.stepOut();
-                writer.stepOut();
-                writer.setTypeAnnotations("$ion_symbol_table");
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("symbols");
-                writer.stepIn(IonType.LIST);
-                writer.writeString("def");
-                writer.stepOut();
-                writer.setFieldName("imports");
-                writer.writeSymbol("$ion_symbol_table");
-                writer.stepOut();
-                writer.writeSymbol("abc");
-                writer.writeSymbol("def");
-                writer.setTypeAnnotations("$ion_symbol_table");
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("symbols");
-                writer.stepIn(IonType.LIST);
-                writer.writeString("orange");
-                writer.stepOut();
-                writer.stepOut();
-                writer.setTypeAnnotations("$ion_symbol_table");
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("symbols");
-                writer.stepIn(IonType.LIST);
-                writer.writeString("purple");
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbol("purple");
-            }
-        });
-
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("purple", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void multipleIvmsBetweenValues() throws Exception  {
-        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
-            @Override
-            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
-                writer.setTypeAnnotationSymbols(3);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(7);
-                writer.stepIn(IonType.LIST);
-                writer.writeString("abc");
-                writer.stepOut();
-                writer.stepOut();
-                writer.finish();
-                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
-                writer.setTypeAnnotationSymbols(3);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(7);
-                writer.stepIn(IonType.LIST);
-                writer.writeString("def");
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbolToken(10);
-                writer.finish();
-                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
-                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
-                writer.writeSymbolToken(4);
-            }
-        });
-
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("name", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void invalidVersion() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        out.write(bytes(0xE0, 0x01, 0x74, 0xEA, 0x20));
-        InputStream input = new ByteArrayInputStream(out.toByteArray());
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, input);
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void invalidVersionMarker() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        out.write(bytes(0xE0, 0x01, 0x00, 0xEB, 0x20));
-        InputStream input = new ByteArrayInputStream(out.toByteArray());
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, input);
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void incrementalRead() throws Exception {
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-        ByteArrayOutputStream firstValue = new ByteArrayOutputStream();
-        _Private_IonRawWriter firstValueWriter = IonBinaryWriterBuilder.standard().build(firstValue)
-            .asFacet(_Private_IonManagedWriter.class)
-            .getRawWriter();
-        firstValue.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
-        firstValueWriter.setTypeAnnotationSymbols(3);
-        firstValueWriter.stepIn(IonType.STRUCT);
-        firstValueWriter.setFieldNameSymbol(7);
-        firstValueWriter.stepIn(IonType.LIST);
-        firstValueWriter.writeString("abc");
-        firstValueWriter.writeString("def");
-        firstValueWriter.stepOut();
-        firstValueWriter.stepOut();
-        firstValueWriter.stepIn(IonType.STRUCT);
-        firstValueWriter.setTypeAnnotationSymbols(11);
-        firstValueWriter.setFieldNameSymbol(10);
-        firstValueWriter.writeString("foo");
-        firstValueWriter.stepOut();
-        firstValueWriter.close();
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, pipe);
-        assertNull(reader.getType());
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        byte[] firstValueBytes = firstValue.toByteArray();
-        pipe.receive(firstValueBytes, 0, firstValueBytes.length / 2);
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        pipe.receive(
-            firstValueBytes,
-            firstValueBytes.length / 2,
-            firstValueBytes.length - firstValueBytes.length / 2
-        );
-        assertEquals(IonType.STRUCT, reader.next());
-        assertEquals(IonType.STRUCT, reader.getType());
-        reader.stepIn();
-        assertNull(reader.getType());
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("abc", reader.getFieldName());
-        assertEquals(Collections.singletonList("def"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("foo", reader.stringValue());
-        assertEquals(IonType.STRING, reader.getType());
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        reader.stepOut();
-        assertNull(reader.getType());
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        pipe.receive(0x71);
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        pipe.receive(0x0B);
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals(IonType.SYMBOL, reader.getType());
-        assertEquals("def", reader.stringValue());
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        reader.close();
-    }
-
-    @Test
-    public void incrementalValue() throws Exception {
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, pipe);
-        byte[] bytes = toBinary("\"StringValueLong\"");
-        for (byte b : bytes) {
-            assertNull(reader.next());
-            pipe.receive(b);
-        }
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("StringValueLong", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void incrementalMultipleValues() throws Exception {
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, pipe);
-        byte[] bytes = toBinary("value_type::\"StringValueLong\"");
-        for (byte b : bytes) {
-            assertNull(reader.next());
-            pipe.receive(b);
-        }
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("StringValueLong", reader.stringValue());
-        assertEquals(Collections.singletonList("value_type"), Arrays.asList(reader.getTypeAnnotations()));
-        bytes = toBinary("{foobar: \"StringValueLong\"}");
-        for (byte b : bytes) {
-            assertNull(reader.next());
-            pipe.receive(b);
-        }
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("foobar", reader.getFieldName());
-        assertEquals("StringValueLong", reader.stringValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void incrementalMultipleValuesLoadFromReader() throws Exception {
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-        final IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, pipe);
-        final IonLoader loader = SYSTEM.getLoader();
-        byte[] bytes = toBinary("value_type::\"StringValueLong\"");
-        for (byte b : bytes) {
-            IonDatagram empty = loader.load(reader);
-            assertTrue(empty.isEmpty());
-            pipe.receive(b);
-        }
-        IonDatagram firstValue = loader.load(reader);
-        assertEquals(1, firstValue.size());
-        IonString string = (IonString) firstValue.get(0);
-        assertEquals("StringValueLong", string.stringValue());
-        assertEquals(Collections.singletonList("value_type"), Arrays.asList(string.getTypeAnnotations()));
-        bytes = toBinary("{foobar: \"StringValueLong\"}");
-        for (byte b : bytes) {
-            IonDatagram empty = loader.load(reader);
-            assertTrue(empty.isEmpty());
-            pipe.receive(b);
-        }
-        IonDatagram secondValue = loader.load(reader);
-        assertEquals(1, secondValue.size());
-        IonStruct struct = (IonStruct) secondValue.get(0);
-        string = (IonString) struct.get("foobar");
-        assertEquals("StringValueLong", string.stringValue());
-        IonDatagram empty = loader.load(reader);
-        assertTrue(empty.isEmpty());
-        reader.close();
-    }
-
-    @Test
-    public void incrementalMultipleValuesLoadFromInputStreamFails() throws Exception {
-        final ResizingPipedInputStream pipe = new ResizingPipedInputStream(1);
-        final IonLoader loader = IonSystemBuilder.standard()
-            .withReaderBuilder(STANDARD_READER_BUILDER)
-            .build()
-            .getLoader();
-        IonDatagram empty = loader.load(pipe);
-        assertTrue(empty.isEmpty());
-        pipe.receive(_Private_IonConstants.BINARY_VERSION_MARKER_1_0[0]);
-        // Because reader does not persist across load invocations, the loader must throw an exception if the reader
-        // had an incomplete value buffered.
-        thrown.expect(IonException.class);
-        loader.load(pipe);
-    }
-
-    private static void incrementalMultipleValuesIterate(
-        Iterator<IonValue> iterator,
-        ResizingPipedInputStream pipe
-    ) throws Exception {
-        byte[] bytes = toBinary("value_type::\"StringValueLong\"");
-        for (byte b : bytes) {
-            assertFalse(iterator.hasNext());
-            pipe.receive(b);
-        }
-        assertTrue(iterator.hasNext());
-        IonString string = (IonString) iterator.next();
-        assertEquals("StringValueLong", string.stringValue());
-        assertEquals(Collections.singletonList("value_type"), Arrays.asList(string.getTypeAnnotations()));
-        bytes = toBinary("{foobar: \"StringValueLong\"}");
-        for (byte b : bytes) {
-            assertFalse(iterator.hasNext());
-            pipe.receive(b);
-        }
-        assertTrue(iterator.hasNext());
-        IonStruct struct = (IonStruct) iterator.next();
-        string = (IonString) struct.get("foobar");
-        assertEquals("StringValueLong", string.stringValue());
-        assertFalse(iterator.hasNext());
-    }
-
-    @Test
-    public void incrementalMultipleValuesIterateFromReader() throws Exception {
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-        IonReader reader = STANDARD_READER_BUILDER.build(pipe);
-        Iterator<IonValue> iterator = SYSTEM.iterate(reader);
-        incrementalMultipleValuesIterate(iterator, pipe);
-        reader.close();
-    }
-
-    @Test
-    public void incrementalMultipleValuesIterateFromInputStream() throws Exception {
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-        IonSystem system = IonSystemBuilder.standard().withReaderBuilder(STANDARD_READER_BUILDER).build();
-        Iterator<IonValue> iterator = system.iterate(pipe);
-        incrementalMultipleValuesIterate(iterator, pipe);
-    }
-
-    @Test
-    public void incrementalReadInitiallyEmptyStreamThatTurnsOutToBeText() {
-        // Note: if incremental text read support is added, this test will start failing, which is expected. For now,
-        // we ensure that this fails quickly.
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(1);
-        IonReader reader = STANDARD_READER_BUILDER.build(pipe);
-        assertNull(reader.next());
-        // Valid text Ion. Also hex 0x20, which is binary int 0. However, it is not preceded by the IVM, so it must be
-        // interpreted as text. The binary reader must fail.
-        pipe.receive(' ');
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void incrementalSymbolTables() throws Exception {
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-        ByteArrayOutputStream firstValue = new ByteArrayOutputStream();
-        _Private_IonRawWriter writer = IonBinaryWriterBuilder.standard().build(firstValue)
-            .asFacet(_Private_IonManagedWriter.class)
-            .getRawWriter();
-        firstValue.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
-        writer.setTypeAnnotationSymbols(3);
-        writer.stepIn(IonType.STRUCT);
-        writer.setFieldNameSymbol(7);
-        writer.stepIn(IonType.LIST);
-        writer.writeString("abcdefghijklmnopqrstuvwxyz");
-        writer.writeString("def");
-        writer.stepOut();
-        writer.stepOut();
-        writer.stepIn(IonType.STRUCT);
-        writer.setTypeAnnotationSymbols(11);
-        writer.setFieldNameSymbol(10);
-        writer.writeString("foo");
-        writer.stepOut();
-        writer.close();
-
-        ByteArrayOutputStream secondValue = new ByteArrayOutputStream();
-        writer = IonBinaryWriterBuilder.standard().build(secondValue)
-            .asFacet(_Private_IonManagedWriter.class)
-            .getRawWriter();
-        writer.setTypeAnnotationSymbols(3);
-        writer.stepIn(IonType.STRUCT);
-        writer.setFieldNameSymbol(6);
-        writer.writeSymbolToken(3);
-        writer.setFieldNameSymbol(7);
-        writer.stepIn(IonType.LIST);
-        writer.writeString("foo");
-        writer.writeString("bar");
-        writer.stepOut();
-        writer.stepOut();
-        writer.stepIn(IonType.STRUCT);
-        writer.setFieldNameSymbol(10);
-        writer.setTypeAnnotationSymbols(12, 13);
-        writer.writeString("fairlyLongString");
-        writer.stepOut();
-        writer.close();
-
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(STANDARD_READER_BUILDER, pipe);
-        byte[] bytes = firstValue.toByteArray();
-        for (byte b : bytes) {
-            assertNull(reader.next());
-            pipe.receive(b);
-        }
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals(Collections.singletonList("def"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.getFieldName());
-        assertEquals("foo", reader.stringValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        bytes = secondValue.toByteArray();
-        for (byte b : bytes) {
-            assertNull(reader.next());
-            pipe.receive(b);
-        }
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("fairlyLongString", reader.stringValue());
-        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.getFieldName());
-        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void floats() throws Exception {
-        double acceptableDelta = 1e-9;
-        writerBuilder = IonBinaryWriterBuilder.standard().withFloatBinary32Enabled();
-        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
-            @Override
-            public void write(IonWriter writer) throws IOException {
-                writer.writeFloat(0.);
-                writer.writeFloat(Double.MAX_VALUE);
-                writer.writeFloat(Double.MIN_VALUE);
-                writer.writeFloat(Float.MAX_VALUE);
-                writer.writeFloat(Float.MIN_VALUE);
-                writer.writeFloat(1.23e4);
-                writer.writeFloat(1.23e-4);
-                writer.writeFloat(-1.23e4);
-                writer.writeFloat(-1.23e-4);
-            }
-        });
-
-        assertNull(reader.getType());
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(0., reader.doubleValue(), acceptableDelta);
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(Double.MAX_VALUE, reader.doubleValue(), acceptableDelta);
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(Double.MIN_VALUE, reader.doubleValue(), acceptableDelta);
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(Float.MAX_VALUE, reader.doubleValue(), acceptableDelta);
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(IonType.FLOAT, reader.getType());
-        assertEquals(Float.MIN_VALUE, reader.doubleValue(), acceptableDelta);
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(1.23e4, reader.doubleValue(), acceptableDelta);
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(1.23e-4, reader.doubleValue(), acceptableDelta);
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(-1.23e4, reader.doubleValue(), acceptableDelta);
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(-1.23e-4, reader.doubleValue(), acceptableDelta);
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void timestamps() throws Exception {
-        final List<Timestamp> timestamps = new ArrayList<Timestamp>();
-        timestamps.add(Timestamp.valueOf("2000T"));
-        timestamps.add(Timestamp.valueOf("2000-01T"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04Z"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05Z"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.6Z"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.06Z"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.006Z"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.600Z"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.060Z"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.060-07:00"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.060+07:00"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05+07:00"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04+07:00"));
-        timestamps.add(Timestamp.valueOf("2000-01-02T03:04:05.9999999Z"));
-
-        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
-            @Override
-            public void write(IonWriter writer) throws IOException {
-                for (Timestamp timestamp : timestamps) {
-                    writer.writeTimestamp(timestamp);
-                }
-            }
-        });
-
-        for (Timestamp timestamp : timestamps) {
-            assertEquals(IonType.TIMESTAMP, reader.next());
-            assertEquals(timestamp, reader.timestampValue());
-        }
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        reader.close();
-    }
-
-    @Test
-    public void nullValues() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            "null " +
-            "null.bool " +
-            "null.int " +
-            "null.float " +
-            "null.decimal " +
-            "null.timestamp " +
-            "null.symbol " +
-            "null.string " +
-            "null.blob " +
-            "null.clob " +
-            "null.list " +
-            "null.sexp " +
-            "foo::null.struct " +
-            "[null.null, null.bool, null.int, {zar: bar::baz::null.float, abc: null.decimal}]"
-        );
-
-        assertEquals(IonType.NULL, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.BOOL, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.INT, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.FLOAT, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.DECIMAL, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.TIMESTAMP, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.STRING, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.BLOB, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.CLOB, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.LIST, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.SEXP, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.STRUCT, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals(IonType.LIST, reader.next());
-        assertFalse(reader.isNullValue());
-        reader.stepIn();
-        assertFalse(reader.isNullValue());
-        assertEquals(IonType.NULL, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.BOOL, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.INT, reader.next());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertFalse(reader.isNullValue());
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(Arrays.asList("bar", "baz"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("zar", reader.getFieldName());
-        assertTrue(reader.isNullValue());
-        assertEquals(IonType.DECIMAL, reader.next());
-        assertEquals("abc", reader.getFieldName());
-        assertTrue(reader.isNullValue());
-        assertNull(reader.next());
-        assertFalse(reader.isNullValue());
-        reader.stepOut();
-        assertNull(reader.next());
-        assertFalse(reader.isNullValue());
-        reader.stepOut();
-        assertNull(reader.next());
-        assertFalse(reader.isNullValue());
-        reader.close();
-    }
-
-    @Test
-    public void booleans() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("true false foo::true {bar: true, baz: zar::false}");
-        assertEquals(IonType.BOOL, reader.next());
-        assertTrue(reader.booleanValue());
-        assertEquals(IonType.BOOL, reader.next());
-        assertFalse(reader.booleanValue());
-        assertEquals(IonType.BOOL, reader.next());
-        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
-        assertTrue(reader.booleanValue());
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.BOOL, reader.next());
-        assertEquals("bar", reader.getFieldName());
-        assertTrue(reader.booleanValue());
-        assertEquals(IonType.BOOL, reader.next());
-        assertEquals("baz", reader.getFieldName());
-        assertEquals(Collections.singletonList("zar"), Arrays.asList(reader.getTypeAnnotations()));
-        assertFalse(reader.booleanValue());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void lobsNewBytes() throws Exception {
-        final byte[] blobBytes = "abcdef".getBytes("UTF-8");
-        final byte[] clobBytes = "ghijklmnopqrstuv".getBytes("UTF-8");
-        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
-            @Override
-            public void write(IonWriter writer) throws IOException {
-                writer.writeBlob(blobBytes);
-                writer.writeClob(clobBytes);
-                writer.setTypeAnnotations("foo");
-                writer.writeBlob(blobBytes);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("bar");
-                writer.writeClob(clobBytes);
-                writer.stepOut();
-            }
-        });
-
-        assertEquals(IonType.BLOB, reader.next());
-        assertArrayEquals(blobBytes, reader.newBytes());
-        assertEquals(IonType.CLOB, reader.next());
-        assertArrayEquals(clobBytes, reader.newBytes());
-        assertEquals(IonType.BLOB, reader.next());
-        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
-        assertArrayEquals(blobBytes, reader.newBytes());
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.CLOB, reader.next());
-        assertEquals("bar", reader.getFieldName());
-        assertArrayEquals(clobBytes, reader.newBytes());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void lobsGetBytes() throws Exception {
-        final byte[] blobBytes = "abcdef".getBytes("UTF-8");
-        final byte[] clobBytes = "ghijklmnopqrstuv".getBytes("UTF-8");
-        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
-            @Override
-            public void write(IonWriter writer) throws IOException {
-                writer.writeBlob(blobBytes);
-                writer.writeClob(clobBytes);
-                writer.setTypeAnnotations("foo");
-                writer.writeBlob(blobBytes);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("bar");
-                writer.writeClob(clobBytes);
-                writer.stepOut();
-            }
-        });
-
-        assertEquals(IonType.BLOB, reader.next());
-        byte[] fullBlob = new byte[blobBytes.length];
-        assertEquals(fullBlob.length, reader.getBytes(fullBlob, 0, fullBlob.length));
-        assertArrayEquals(blobBytes, fullBlob);
-        assertEquals(IonType.CLOB, reader.next());
-        byte[] partialClob = new byte[clobBytes.length];
-        assertEquals(3, reader.getBytes(partialClob, 0, 3));
-        assertEquals(clobBytes.length - 3, reader.getBytes(partialClob, 3, clobBytes.length - 3));
-        assertArrayEquals(clobBytes, partialClob);
-        Arrays.fill(fullBlob, (byte) 0);
-        assertEquals(IonType.BLOB, reader.next());
-        assertEquals(fullBlob.length, reader.getBytes(fullBlob, 0, 100000));
-        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        Arrays.fill(partialClob, (byte) 0);
-        assertEquals(IonType.CLOB, reader.next());
-        assertEquals(5, reader.getBytes(partialClob, 0, 5));
-        assertEquals(clobBytes.length - 5, reader.getBytes(partialClob, 5, 100000));
-        assertArrayEquals(clobBytes, partialClob);
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void nopPad() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            // One byte no-op pad.
-            0x00,
-            // Two byte no-op pad.
-            0x01, 0xFF,
-            // Int 0.
-            0x20,
-            // Three byte no-op pad.
-            0x02, 0x99, 0x42,
-            // 16-byte no-op pad.
-            0x0E, 0x8E,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            // Int 1.
-            0x21, 0x01,
-            // Struct with no-op pad at the start.
-            0xD9,
-            // Field SID 0.
-            0x80,
-            // Five byte no-op pad.
-            0x04, 0x00, 0x00, 0x00, 0x00,
-            // Field SID 4 ("name").
-            0x84,
-            // Int -1.
-            0x31, 0x01,
-            // Struct (empty) with no-op pad at the end.
-            0xD8,
-            // Field SID 0.
-            0x80,
-            // Seven byte no-op pad.
-            0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            // List (empty) with long no-op pad.
-            0xBE,
-            // Length 16.
-            0x90,
-            // 16-byte no-op pad.
-            0x0E, 0x8E,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        );
-
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(-1, reader.intValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertNull(reader.next());
-        reader.stepOut();
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void decimals() throws Exception {
-        final List<BigDecimal> decimals = Arrays.asList(
-            Decimal.ZERO,
-            Decimal.NEGATIVE_ZERO,
-            Decimal.valueOf("1.23e4"),
-            Decimal.valueOf("1.23e-4"),
-            Decimal.valueOf("-1.23e4"),
-            Decimal.valueOf("-1.23e-4"),
-            Decimal.valueOf(Long.MAX_VALUE).add(BigDecimal.ONE),
-            Decimal.valueOf(Long.MIN_VALUE).subtract(BigDecimal.ONE)
-        );
-        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
-            @Override
-            public void write(IonWriter writer) throws IOException {
-                for (BigDecimal decimal : decimals) {
-                    writer.writeDecimal(decimal);
-                }
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("foo");
-                writer.setTypeAnnotations("bar");
-                writer.writeDecimal(Decimal.valueOf(Long.MAX_VALUE).add(BigDecimal.ONE).scaleByPowerOfTen(-7));
-                writer.stepOut();
-            }
-        });
-
-        for (BigDecimal decimal : decimals) {
-            assertEquals(IonType.DECIMAL, reader.next());
-            assertEquals(decimal, reader.decimalValue());
-        }
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.DECIMAL, reader.next());
-        assertEquals(
-            BigDecimal.valueOf(Long.MAX_VALUE).add(BigDecimal.ONE).scaleByPowerOfTen(-7),
-            reader.bigDecimalValue()
-        );
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void bigInts() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
-            @Override
-            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
-                writer.writeInt(0);
-                writer.writeInt(-1);
-                writer.writeInt(1);
-                writer.writeInt((long) Integer.MAX_VALUE + 1);
-                writer.writeInt((long) Integer.MIN_VALUE - 1);
-                writer.writeInt(Long.MIN_VALUE + 1); // Just shy of the boundary.
-                writer.writeInt(BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE));
-                writer.writeInt(BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.ONE));
-                writer.close();
-                out.write(bytes(0x38, 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00));
-            }
-        });
-
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IntegerSize.INT, reader.getIntegerSize());
-        assertEquals(BigInteger.ZERO, reader.bigIntegerValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IntegerSize.INT, reader.getIntegerSize());
-        assertEquals(BigInteger.ONE.negate(), reader.bigIntegerValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IntegerSize.INT, reader.getIntegerSize());
-        assertEquals(BigInteger.ONE, reader.bigIntegerValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IntegerSize.LONG, reader.getIntegerSize());
-        assertEquals(BigInteger.valueOf(Integer.MAX_VALUE).add(BigInteger.ONE), reader.bigIntegerValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IntegerSize.LONG, reader.getIntegerSize());
-        assertEquals(BigInteger.valueOf(Integer.MIN_VALUE).subtract(BigInteger.ONE), reader.bigIntegerValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IntegerSize.LONG, reader.getIntegerSize());
-        assertEquals(Long.MIN_VALUE + 1, reader.longValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IntegerSize.BIG_INTEGER, reader.getIntegerSize());
-        assertEquals(BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE), reader.bigIntegerValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IntegerSize.BIG_INTEGER, reader.getIntegerSize());
-        assertEquals(BigInteger.valueOf(Long.MIN_VALUE).subtract(BigInteger.ONE), reader.bigIntegerValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IntegerSize.BIG_INTEGER, reader.getIntegerSize());
-        assertEquals(
-            new BigInteger(-1, bytes(0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)),
-            reader.bigIntegerValue()
-        );
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void symbolTableWithImportsThenSymbols() throws Exception {
-        SimpleCatalog catalog = new SimpleCatalog();
-        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
-        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
-        writerBuilder = IonBinaryWriterBuilder.standard().withCatalog(catalog);
-
-        IonReaderBinaryIncremental reader = readerFor(new WriterFunction() {
-            @Override
-            public void write(IonWriter writer) throws IOException {
-                writer.setTypeAnnotations("$ion_symbol_table");
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("imports");
-                writer.stepIn(IonType.LIST);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldName("name");
-                writer.writeString("foo");
-                writer.setFieldName("version");
-                writer.writeInt(1);
-                writer.setFieldName("max_id");
-                writer.writeInt(2);
-                writer.stepOut();
-                writer.stepOut();
-                writer.setFieldName("symbols");
-                writer.stepIn(IonType.LIST);
-                writer.writeString("ghi");
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbol("abc");
-                writer.writeSymbol("def");
-                writer.writeSymbol("ghi");
-            }
-        });
-
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("ghi", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void symbolTableWithSymbolsThenImports() throws Exception {
-        SimpleCatalog catalog = new SimpleCatalog();
-        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
-        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
-
-        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
-            @Override
-            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
-                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-                writer.stepIn(IonType.LIST);
-                writer.writeString("ghi");
-                writer.stepOut();
-                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-                writer.stepIn(IonType.LIST);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-                writer.writeString("foo");
-                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-                writer.writeInt(1);
-                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-                writer.writeInt(2);
-                writer.stepOut();
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbolToken(10);
-                writer.writeSymbolToken(11);
-                writer.writeSymbolToken(12);
-            }
-        });
-
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("ghi", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void symbolTableWithManySymbolsThenImports() throws Exception {
-        SimpleCatalog catalog = new SimpleCatalog();
-        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
-        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
-
-        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
-            @Override
-            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
-                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-                writer.stepIn(IonType.LIST);
-                writer.writeString("ghi");
-                writer.writeString("jkl");
-                writer.writeString("mno");
-                writer.writeString("pqr");
-                writer.stepOut();
-                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-                writer.stepIn(IonType.LIST);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-                writer.writeString("foo");
-                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-                writer.writeInt(1);
-                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-                writer.writeInt(2);
-                writer.stepOut();
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbolToken(10);
-                writer.writeSymbolToken(11);
-                writer.writeSymbolToken(12);
-                writer.writeSymbolToken(13);
-                writer.writeSymbolToken(14);
-                writer.writeSymbolToken(15);
-            }
-        });
-
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("ghi", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("jkl", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("mno", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("pqr", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void multipleSymbolTablesWithSymbolsThenImports() throws Exception {
-        SimpleCatalog catalog = new SimpleCatalog();
-        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
-        catalog.putTable(SYSTEM.newSharedSymbolTable("bar", 1, Collections.singletonList("baz").iterator()));
-        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
-
-        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
-            @Override
-            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
-                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-                writer.stepIn(IonType.LIST);
-                writer.writeString("ghi");
-                writer.stepOut();
-                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-                writer.stepIn(IonType.LIST);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-                writer.writeString("foo");
-                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-                writer.writeInt(1);
-                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-                writer.writeInt(2);
-                writer.stepOut();
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbolToken(10);
-                writer.writeSymbolToken(11);
-                writer.writeSymbolToken(12);
-                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-                writer.stepIn(IonType.LIST);
-                writer.writeString("xyz");
-                writer.writeString("uvw");
-                writer.writeString("rst");
-                writer.stepOut();
-                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-                writer.stepIn(IonType.LIST);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-                writer.writeString("bar");
-                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-                writer.writeInt(1);
-                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-                writer.writeInt(1);
-                writer.stepOut();
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbolToken(10);
-                writer.writeSymbolToken(11);
-                writer.writeSymbolToken(12);
-                writer.writeSymbolToken(13);
-            }
-        });
-
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        SymbolTable[] imports = reader.getSymbolTable().getImportedTables();
-        assertEquals(1, imports.length);
-        assertEquals("foo", imports[0].getName());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("ghi", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("baz", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        imports = reader.getSymbolTable().getImportedTables();
-        assertEquals(1, imports.length);
-        assertEquals("bar", imports[0].getName());
-        assertEquals("xyz", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("uvw", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("rst", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void ivmResetsImports() throws Exception {
-        SimpleCatalog catalog = new SimpleCatalog();
-        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
-        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
-
-        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
-            @Override
-            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
-                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-                writer.stepIn(IonType.LIST);
-                writer.writeString("ghi");
-                writer.stepOut();
-                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-                writer.stepIn(IonType.LIST);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-                writer.writeString("foo");
-                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-                writer.writeInt(1);
-                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-                writer.writeInt(2);
-                writer.stepOut();
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbolToken(10);
-                writer.writeSymbolToken(11);
-                writer.writeSymbolToken(12);
-                writer.close();
-                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
-                out.write(0x20);
-            }
-        });
-
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        SymbolTable[] imports = reader.getSymbolTable().getImportedTables();
-        assertEquals(1, imports.length);
-        assertEquals("foo", imports[0].getName());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("ghi", reader.stringValue());
-        assertEquals(IonType.INT, reader.next());
-        assertTrue(reader.getSymbolTable().isSystemTable());
-        assertEquals(0, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    private static void assertSymbolEquals(
-        String expectedText,
-        ImportLocation expectedImportLocation,
-        SymbolToken actual
-    ) {
-        assertEquals(expectedText, actual.getText());
-        IonReaderBinaryIncremental.SymbolTokenImpl impl = (IonReaderBinaryIncremental.SymbolTokenImpl) actual;
-        assertEquals(expectedImportLocation, impl.getImportLocation());
-    }
-
-    @Test
-    public void symbolsAsTokens() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertSymbolEquals("foo", null, reader.getFieldNameSymbol());
-        SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
-        assertEquals(1, annotations.length);
-        assertSymbolEquals("uvw", null, annotations[0]);
-        assertSymbolEquals("abc", null, reader.symbolValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertSymbolEquals("bar", null, reader.getFieldNameSymbol());
-        annotations = reader.getTypeAnnotationSymbols();
-        assertEquals(2, annotations.length);
-        assertSymbolEquals("qrs", null, annotations[0]);
-        assertSymbolEquals("xyz", null, annotations[1]);
-        assertSymbolEquals("def", null, reader.symbolValue());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void nullContainers() throws Exception {
-        IonReader reader = readerFor("null.struct null.list null.sexp");
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertNull(reader.next());
-        reader.stepOut();
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        assertNull(reader.next());
-        reader.stepOut();
-        assertEquals(IonType.SEXP, reader.next());
-        reader.stepIn();
-        assertNull(reader.next());
-        reader.stepOut();
-        reader.close();
-    }
-
-    @Test
-    public void intNegativeZeroFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0x31, 0x00);
-        reader.next();
-        thrown.expect(IonException.class);
-        reader.longValue();
-    }
-
-    @Test
-    public void bigIntNegativeZeroFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0x31, 0x00);
-        reader.next();
-        thrown.expect(IonException.class);
-        reader.bigIntegerValue();
-    }
-
-    @Test
-    public void listWithLengthTooShortFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0xB1, 0x21, 0x01);
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void noOpPadTooShort1() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01);
-        assertEquals(IonType.INT, reader.next());
-        assertNull(reader.next());
-        thrown.expect(IonException.class);
-        reader.close();
-    }
-
-    @Test
-    public void noOpPadTooShort2() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            0x0e, 0x90, 0x00, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        );
-        assertNull(reader.next());
-        thrown.expect(IonException.class);
-        reader.close();
-    }
-
-    @Test
-    public void nopPadOneByte() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0);
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void localSidOutOfRangeStringValue() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0x71, 0x0A); // SID 10
-        assertEquals(IonType.SYMBOL, reader.next());
-        thrown.expect(IonException.class);
-        reader.stringValue();
-    }
-
-    @Test
-    public void localSidOutOfRangeSymbolValue() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0x71, 0x0A); // SID 10
-        assertEquals(IonType.SYMBOL, reader.next());
-        thrown.expect(IonException.class);
-        reader.symbolValue();
-    }
-
-    @Test
-    public void localSidOutOfRangeFieldName() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            0xD2, // Struct, length 2
-            0x8A, // SID 10
-            0x20 // int 0
-        );
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
-        thrown.expect(IonException.class);
-        reader.getFieldName();
-    }
-
-    @Test
-    public void localSidOutOfRangeFieldNameSymbol() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            0xD2, // Struct, length 2
-            0x8A, // SID 10
-            0x20 // int 0
-        );
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
-        thrown.expect(IonException.class);
-        reader.getFieldNameSymbol();
-    }
-
-    @Test
-    public void localSidOutOfRangeAnnotation() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            0xE3, // Annotation wrapper, length 3
-            0x81, // annotation SID length 1
-            0x8A, // SID 10
-            0x20 // int 0
-        );
-        assertEquals(IonType.INT, reader.next());
-        thrown.expect(IonException.class);
-        reader.getTypeAnnotations();
-    }
-
-    @Test
-    public void localSidOutOfRangeAnnotationSymbol() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            0xE3, // Annotation wrapper, length 3
-            0x81, // annotation SID length 1
-            0x8A, // SID 10
-            0x20 // int 0
-        );
-        assertEquals(IonType.INT, reader.next());
-        thrown.expect(IonException.class);
-        reader.getTypeAnnotationSymbols();
-    }
-
-    @Test
-    public void localSidOutOfRangeIterateAnnotations() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            0xE3, // Annotation wrapper, length 3
-            0x81, // annotation SID length 1
-            0x8A, // SID 10
-            0x20 // int 0
-        );
-        assertEquals(IonType.INT, reader.next());
-        Iterator<String> annotationIterator = reader.iterateTypeAnnotations();
-        thrown.expect(IonException.class);
-        annotationIterator.next();
-    }
-
-    @Test
-    public void stepInOnScalarFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0x20);
-        assertEquals(IonType.INT, reader.next());
-        thrown.expect(IonException.class);
-        reader.stepIn();
-    }
-
-    @Test
-    public void stepInBeforeNextFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0xD2, 0x84, 0xD0);
-        reader.next();
-        reader.stepIn();
-        thrown.expect(IonException.class);
-        reader.stepIn();
-    }
-
-    @Test
-    public void stepOutAtDepthZeroFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0x20);
-        reader.next();
-        thrown.expect(IllegalStateException.class);
-        reader.stepOut();
-    }
-
-    @Test
-    public void byteSizeNotOnLobFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0x20);
-        reader.next();
-        thrown.expect(IonException.class);
-        reader.byteSize();
-    }
-
-    @Test
-    public void doubleValueOnIntFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0x20);
-        reader.next();
-        thrown.expect(IllegalStateException.class);
-        reader.doubleValue();
-    }
-
-    @Test
-    public void floatWithInvalidLengthFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0x43, 0x01, 0x02, 0x03);
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void invalidTypeIdFFailsAtTopLevel() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0xF0);
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void invalidTypeIdFFailsBelowTopLevel() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(0xB1, 0xF0);
-        reader.next();
-        reader.stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void reallyLargeString() throws Exception {
-        StringBuilder sb = new StringBuilder();
-        // 8192 is a arbitrarily large; it requires a couple bytes of length, and it doesn't fit in the preallocated
-        // string decoding buffer of size 4096.
-        for (int i = 0; i < 8192; i++) {
-            sb.append('a');
-        }
-        String string = sb.toString();
-        IonReaderBinaryIncremental reader = readerFor("\"" + string + "\"");
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals(string, reader.stringValue());
-        reader.close();
-    }
-
-    @Test
-    public void nopPadInAnnotationWrapperFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            0xB5, // list
-            0xE4, // annotation wrapper
-            0x81, // 1 byte of annotations
-            0x84, // annotation: "name"
-            0x01, // 2-byte no-op pad
-            0x00
-        );
-        reader.next();
-        reader.stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void nestedAnnotationWrapperFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            0xB5, // list
-            0xE4, // annotation wrapper
-            0x81, // 1 byte of annotations
-            0x84, // annotation: "name"
-            0xE3, // annotation wrapper
-            0x81, // 1 byte of annotations
-            0x84, // annotation: "name"
-            0x20  // int 0
-        );
-        reader.next();
-        reader.stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void annotationWrapperLengthMismatchFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(
-            0xB5, // list
-            0xE4, // annotation wrapper
-            0x81, // 1 byte of annotations
-            0x84, // annotation: "name"
-            0x20, // int 0
-            0x20  // next value
-        );
-        reader.next();
-        reader.stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void multipleSymbolTableImportsFieldsFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
-            @Override
-            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
-                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-                writer.stepIn(IonType.LIST);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-                writer.writeString("bar");
-                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-                writer.writeInt(1);
-                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-                writer.writeInt(1);
-                writer.stepOut();
-                writer.stepOut();
-                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-                writer.stepIn(IonType.LIST);
-                writer.writeString("ghi");
-                writer.stepOut();
-                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-                writer.stepIn(IonType.LIST);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-                writer.writeString("foo");
-                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-                writer.writeInt(1);
-                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-                writer.writeInt(2);
-                writer.stepOut();
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbolToken(10);
-            }
-        });
-
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void multipleSymbolTableSymbolsFieldsFails() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
-            @Override
-            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
-                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-                writer.stepIn(IonType.LIST);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-                writer.writeString("bar");
-                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-                writer.writeInt(1);
-                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-                writer.writeInt(1);
-                writer.stepOut();
-                writer.stepOut();
-                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-                writer.stepIn(IonType.LIST);
-                writer.writeString("ghi");
-                writer.stepOut();
-                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-                writer.stepIn(IonType.LIST);
-                writer.writeString("abc");
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbolToken(10);
-            }
-        });
-
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-
-    @Test
-    public void nonStringInSymbolsListCreatesNullSlot() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
-            @Override
-            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
-                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-                writer.stepIn(IonType.LIST);
-                writer.writeString(null);
-                writer.writeString("abc");
-                writer.writeInt(123);
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbolToken(10);
-                writer.writeSymbolToken(11);
-                writer.writeSymbolToken(12);
-            }
-        });
-
-        assertEquals(IonType.SYMBOL, reader.next());
-        SymbolToken symbolValue = reader.symbolValue();
-        assertNull(symbolValue.getText());
-        assertEquals(0, symbolValue.getSid());
-        assertEquals(IonType.SYMBOL, reader.next());
-        symbolValue = reader.symbolValue();
-        assertEquals("abc", symbolValue.getText());
-        assertEquals(IonType.SYMBOL, reader.next());
-        symbolValue = reader.symbolValue();
-        assertNull(symbolValue.getText());
-        assertEquals(0, symbolValue.getSid());
-        reader.close();
-    }
-
-    @Test
-    public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations() throws Exception {
-        SimpleCatalog catalog = new SimpleCatalog();
-        catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
-        catalog.putTable(SYSTEM.newSharedSymbolTable("bar", 1, Arrays.asList("123", "456").iterator()));
-        readerBuilder = IonReaderBuilder.standard().withCatalog(catalog);
-
-        IonReaderBinaryIncremental reader = readerFor(new RawWriterFunction() {
-            @Override
-            public void write(_Private_IonRawWriter writer, ByteArrayOutputStream out) throws IOException {
-                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-                writer.stepIn(IonType.LIST);
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-                writer.writeString("foo");
-                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-                writer.writeInt(1);
-                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-                writer.writeInt(4); // The matching shared symbol table in the catalog only declares two symbols.
-                writer.stepOut();
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-                writer.writeString("bar");
-                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-                writer.writeInt(1);
-                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-                // The matching shared symbol table in the catalog declares two symbols, but only one is used.
-                writer.writeInt(1);
-                writer.stepOut();
-                writer.stepIn(IonType.STRUCT);
-                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-                writer.writeString("baz"); // There is no match in the catalog; all symbols have unknown text.
-                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-                writer.writeInt(1);
-                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-                writer.writeInt(2);
-                writer.stepOut();
-                writer.stepOut();
-                writer.stepOut();
-                writer.writeSymbolToken(10); // abc
-                writer.writeSymbolToken(11); // def
-                writer.writeSymbolToken(12); // unknown text, import SID 3 (from foo)
-                writer.writeSymbolToken(13); // unknown text, import SID 4 (from foo)
-                writer.writeSymbolToken(14); // 123
-                writer.writeSymbolToken(15); // unknown text, import SID 1 (from baz)
-                writer.writeSymbolToken(16); // unknown text, import SID 2 (from baz)
-            }
-        });
-
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        IonReaderBinaryIncremental.SymbolTokenImpl symbolValue =
-            (IonReaderBinaryIncremental.SymbolTokenImpl) reader.symbolValue();
-        assertNull(symbolValue.getText());
-        assertEquals(new ImportLocation("foo", 3), symbolValue.getImportLocation());
-        assertEquals(IonType.SYMBOL, reader.next());
-        symbolValue = (IonReaderBinaryIncremental.SymbolTokenImpl) reader.symbolValue();
-        assertNull(symbolValue.getText());
-        assertEquals(new ImportLocation("foo", 4), symbolValue.getImportLocation());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("123", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        symbolValue = (IonReaderBinaryIncremental.SymbolTokenImpl) reader.symbolValue();
-        assertEquals(
-            new IonReaderBinaryIncremental.SymbolTokenImpl(
-                null,
-                15,
-                new ImportLocation("baz", 1)
-            ),
-            symbolValue
-        );
-        assertEquals(IonType.SYMBOL, reader.next());
-        symbolValue = (IonReaderBinaryIncremental.SymbolTokenImpl) reader.symbolValue();
-        assertEquals(
-            new IonReaderBinaryIncremental.SymbolTokenImpl(
-                null,
-                16,
-                new ImportLocation("baz", 2)
-            ),
-            symbolValue
-        );
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void symbolTableSnapshotImplementsBasicMethods() throws Exception {
-        IonReaderBinaryIncremental reader = readerFor("'abc'");
-        reader.next();
-        SymbolTable symbolTable = reader.getSymbolTable();
-        assertNull(symbolTable.getName());
-        assertEquals(0, symbolTable.getVersion());
-        assertTrue(symbolTable.isLocalTable());
-        assertTrue(symbolTable.isReadOnly());
-        assertFalse(symbolTable.isSharedTable());
-        assertFalse(symbolTable.isSystemTable());
-        assertFalse(symbolTable.isSubstitute());
-        symbolTable.makeReadOnly();
-        assertEquals(10, symbolTable.getMaxId());
-        assertEquals("abc", symbolTable.findKnownSymbol(10));
-        assertNull(symbolTable.findKnownSymbol(symbolTable.getMaxId() + 1));
-        thrown.expect(IllegalArgumentException.class);
-        symbolTable.findKnownSymbol(-1);
-    }
-
-    @Test
-    public void singleValueExceedsBufferSize() throws Exception {
-        readerBuilder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard().withInitialBufferSize(8).build()
-        );
-        IonReaderBinaryIncremental reader = readerFor("\"abcdefghijklmnopqrstuvwxyz\"");
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void maximumBufferSizeTooSmallFails() {
-        IonBufferConfiguration.Builder builder = IonBufferConfiguration.Builder.standard();
-        builder
-            .withMaximumBufferSize(builder.getMinimumMaximumBufferSize() - 1)
-            .withInitialBufferSize(builder.getMinimumMaximumBufferSize() - 1)
-            .onOversizedValue(builder.getNoOpOversizedValueHandler())
-            .onOversizedSymbolTable(builder.getNoOpOversizedSymbolTableHandler())
-            .onData(builder.getNoOpDataHandler());
-        thrown.expect(IllegalArgumentException.class);
-        builder.build();
-    }
-
-    @Test
-    public void maximumBufferSizeWithoutHandlerFails() {
-        IonBufferConfiguration.Builder builder = IonBufferConfiguration.Builder.standard();
-        builder
-            .withMaximumBufferSize(9)
-            .withInitialBufferSize(9);
-        thrown.expect(IllegalArgumentException.class);
-        builder.build();
-    }
-
-    /**
-     * Unified handler interface to reduce boilerplate when defining test handlers.
-     */
-    private interface UnifiedTestHandler extends
-        BufferConfiguration.OversizedValueHandler,
-        IonBufferConfiguration.OversizedSymbolTableHandler,
-        BufferConfiguration.DataHandler {
-        // Empty.
-    }
-
-    @Test
-    public void oversizeValueDetectedDuringMultiByteRead() throws Exception {
-        byte[] bytes = toBinary(
-            "\"abcdefghijklmnopqrstuvwxyz\" " + // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
-            "\"abc\" " +
-            "\"abcdefghijklmnopqrstuvwxyz\" " +
-            "\"def\""
-        );
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        final AtomicInteger byteCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onOversizedValue() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-                byteCounter.addAndGet(numberOfBytes);
-            }
-        };
-        readerBuilder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(8)
-                .withMaximumBufferSize(16)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(bytes));
-
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(1, oversizedCounter.get());
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(2, oversizedCounter.get());
-        assertEquals(bytes.length, byteCounter.get());
-    }
-
-    @Test
-    public void oversizeValueDetectedDuringMultiByteReadIncremental() throws Exception {
-        byte[] bytes = toBinary(
-            "\"abcdefghijklmnopqrstuvwxyz\" " + // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
-            "\"abc\" " +
-            "\"abcdefghijklmnopqrstuvwxyz\" " +
-            "\"def\""
-        );
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        final AtomicInteger byteCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onOversizedValue() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-                byteCounter.addAndGet(numberOfBytes);
-            }
-        };
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
-        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(8)
-                .withMaximumBufferSize(16)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
-        int valueCounter = 0;
-        for (byte b : bytes) {
-            pipe.receive(b);
-            IonType type = reader.next();
-            if (type != null) {
-                valueCounter++;
-                assertTrue(valueCounter < 3);
-                if (valueCounter == 1) {
-                    assertEquals(IonType.STRING, type);
-                    assertEquals("abc", reader.stringValue());
-                    assertEquals(1, oversizedCounter.get());
-                } else {
-                    assertEquals(2, valueCounter);
-                    assertEquals(IonType.STRING, type);
-                    assertEquals("def", reader.stringValue());
-                    assertEquals(2, oversizedCounter.get());
-                }
-            }
-        }
-        assertEquals(2, valueCounter);
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(2, oversizedCounter.get());
-        assertEquals(bytes.length, byteCounter.get());
-    }
-
-    @Test
-    public void oversizeValueDetectedDuringSingleByteRead() throws Exception {
-        // Unlike the previous test, where excessive size is detected when trying to skip past the value portion,
-        // this test verifies that excessive size can be detected while reading a value header, which happens
-        // byte-by-byte.
-        byte[] bytes = toBinary("\"abcdefghijklmnopqrstuvwxyz\""); // Requires a 2-byte header.
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        final AtomicInteger byteCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onOversizedValue() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-                byteCounter.addAndGet(numberOfBytes);
-            }
-        };
-        readerBuilder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(5)
-                .withMaximumBufferSize(5)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(bytes));
-
-        // The maximum buffer size is 5, which will be exceeded after the IVM (4 bytes), the type ID (1 byte), and
-        // the length byte (1 byte).
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(1, oversizedCounter.get());
-        assertEquals(bytes.length, byteCounter.get());
-    }
-
-    @Test
-    public void oversizeValueDetectedDuringSingleByteReadIncremental() throws Exception {
-        byte[] bytes = toBinary("\"abcdefghijklmnopqrstuvwxyz\""); // Requires a 2-byte header.
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        final AtomicInteger byteCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onOversizedValue() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-                byteCounter.addAndGet(numberOfBytes);
-            }
-        };
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
-        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(5)
-                .withMaximumBufferSize(5)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
-        for (byte b : bytes) {
-            assertNull(reader.next());
-            pipe.receive(b);
-        }
-        // The maximum buffer size is 5, which will be exceeded after the IVM (4 bytes), the type ID (1 byte), and
-        // the length byte (1 byte).
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(1, oversizedCounter.get());
-        assertEquals(bytes.length, byteCounter.get());
-    }
-
-    @Test
-    public void oversizeValueDetectedDuringReadOfTypeIdOfSymbolTableAnnotatedValue() throws Exception {
-        // This value is not a symbol table, but follows most of the code path that symbol tables follow. Ensure that
-        // `onOversizedValue` (NOT `onOversizedSymbolTable`) is called, and that the stream continues to be read.
-        byte[] bytes = toBinary("$ion_symbol_table::123 \"a\"");
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        final AtomicInteger byteCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onOversizedValue() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-                byteCounter.addAndGet(numberOfBytes);
-            }
-        };
-        readerBuilder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(7)
-                .withMaximumBufferSize(7)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(readerBuilder, new ByteArrayInputStream(bytes));
-
-        // The maximum buffer size is 7, which will be exceeded after the IVM (4 bytes), the annotation wrapper type ID
-        // (1 byte), the annotations length (1 byte), and the annotation SID 3 (1 byte). The next byte is the wrapped
-        // value type ID byte.
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("a", reader.stringValue());
-        assertEquals(1, oversizedCounter.get());
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(bytes.length, byteCounter.get());
-    }
-
-    @Test
-    public void oversizeValueDetectedDuringReadOfTypeIdOfSymbolTableAnnotatedValueIncremental() throws Exception {
-        // This value is not a symbol table, but follows most of the code path that symbol tables follow. Ensure that
-        // `onOversizedValue` (NOT `onOversizedSymbolTable`) is called, and that the stream continues to be read.
-        byte[] bytes = toBinary("$ion_symbol_table::123 \"a\"");
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        final AtomicInteger byteCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onOversizedValue() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-                byteCounter.addAndGet(numberOfBytes);
-            }
-        };
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
-        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(7)
-                .withMaximumBufferSize(7)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
-
-        // The maximum buffer size is 7, which will be exceeded after the IVM (4 bytes), the annotation wrapper type ID
-        // (1 byte), the annotations length (1 byte), and the annotation SID 3 (1 byte). The next byte is the wrapped
-        // value type ID byte.
-        boolean foundValue = false;
-        for (byte b : bytes) {
-            pipe.receive(b);
-            IonType type = reader.next();
-            if (type != null) {
-                assertFalse(foundValue);
-                assertEquals(IonType.STRING, type);
-                assertEquals("a", reader.stringValue());
-                assertEquals(1, oversizedCounter.get());
-                foundValue = true;
-            }
-        }
-        assertTrue(foundValue);
-        assertEquals(1, oversizedCounter.get());
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(bytes.length, byteCounter.get());
-    }
-
-    @Test
-    public void oversizeValueWithSymbolTable() throws Exception {
-        // The first value is oversized because it cannot be buffered at the same time as the preceding symbol table
-        // without exceeding the maximum buffer size. The next value fits.
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
-        writer.writeString("12345678");
-        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
-        writer.close();
-        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
-        // for symbol 10.
-        // The string "12345678" requires 9 bytes, bringing the total to ~49, above the max of 48.
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        final AtomicInteger byteCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onOversizedValue() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-                byteCounter.addAndGet(numberOfBytes);
-            }
-        };
-        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(8)
-                .withMaximumBufferSize(48)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(
-            builder,
-            new ByteArrayInputStream(out.toByteArray())
-        );
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals(1, oversizedCounter.get());
-        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(1, oversizedCounter.get());
-        assertEquals(out.size(), byteCounter.get());
-    }
-
-    @Test
-    public void oversizeValueWithSymbolTableIncremental() throws Exception {
-        // The first value is oversized because it cannot be buffered at the same time as the preceding symbol table
-        // without exceeding the maximum buffer size. The next value fits.
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
-        writer.writeString("12345678");
-        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
-        writer.close();
-        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
-        // for symbol 10.
-        // The string "12345678" requires 9 bytes, bringing the total to ~49, above the max of 48.
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        final AtomicInteger byteCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onOversizedValue() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-                byteCounter.addAndGet(numberOfBytes);
-            }
-        };
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(out.size());
-        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(8)
-                .withMaximumBufferSize(48)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
-        byte[] bytes = out.toByteArray();
-        boolean foundValue = false;
-        for (byte b : bytes) {
-            pipe.receive(b);
-            IonType type = reader.next();
-            if (type != null) {
-                assertFalse(foundValue);
-                assertEquals(IonType.SYMBOL, type);
-                assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
-                assertEquals(1, oversizedCounter.get());
-                foundValue = true;
-            }
-        }
-        assertTrue(foundValue);
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(1, oversizedCounter.get());
-        assertEquals(out.size(), byteCounter.get());
-    }
-
-    /**
-     * Calls next() on the given reader and returns the result.
-     * @param reader an Ion reader.
-     * @param pipe the stream from which the reader pulls data. If null, all data is available up front.
-     * @param source the source of data to be fed into the pipe. Only used if pipe is not null.
-     * @return the result of the first non-null call to reader.next(), or null if the source data is exhausted before
-     *  reader.next() returns non-null.
-     */
-    private static IonType ionReaderNext(IonReader reader, ResizingPipedInputStream pipe, ByteArrayInputStream source) {
-        if (pipe == null) {
-            return reader.next();
-        }
-        while (source.available() > 0) {
-            pipe.receive(source.read());
-            if (reader.next() != null) {
-                return reader.getType();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Verifies that oversized value handling works properly when the second value is oversized.
-     * @param withSymbolTable true if the first value should be preceded by a symbol table.
-     * @param withThirdValue true if the second (oversized) value should be followed by a third value that fits.
-     * @param byteByByte true if bytes should be fed to the reader one at a time.
-     * @throws Exception if thrown unexpectedly.
-     */
-    private static void oversizedSecondValue(
-        boolean withSymbolTable,
-        boolean withThirdValue,
-        boolean byteByByte
-    ) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
-        String firstValue = "12345678";
-        if (withSymbolTable) {
-            writer.writeSymbol(firstValue);
-        } else {
-            writer.writeString(firstValue);
-        }
-        writer.writeString("abcdefghijklmnopqrstuvwxyz");
-        String thirdValue = "abc";
-        if (withThirdValue) {
-            writer.writeString(thirdValue);
-        }
-        writer.close();
-
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        final AtomicInteger byteCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onOversizedValue() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-                byteCounter.addAndGet(numberOfBytes);
-            }
-        };
-        // Greater than the first value (and symbol table, if any) and third value, less than the second value.
-        int maximumBufferSize = 25;
-        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(maximumBufferSize)
-                .withMaximumBufferSize(maximumBufferSize)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        ResizingPipedInputStream pipe = null;
-        ByteArrayInputStream source = new ByteArrayInputStream(out.toByteArray());
-        InputStream in;
-        if (byteByByte) {
-            pipe = new ResizingPipedInputStream(out.size());
-            in = pipe;
-        } else {
-            in = source;
-        }
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, in);
-        assertEquals(withSymbolTable ? IonType.SYMBOL : IonType.STRING, ionReaderNext(reader, pipe, source));
-        assertEquals(0, oversizedCounter.get());
-        assertEquals(firstValue, reader.stringValue());
-        if (withThirdValue) {
-            assertEquals(IonType.STRING, ionReaderNext(reader, pipe, source));
-            assertEquals(thirdValue, reader.stringValue());
-        }
-        assertNull(ionReaderNext(reader, pipe, source));
-        reader.close();
-        assertEquals(1, oversizedCounter.get());
-        assertEquals(out.size(), byteCounter.get());
-    }
-
-    @Test
-    public void oversizedSecondValueWithoutSymbolTable() throws Exception {
-        oversizedSecondValue(false, false, false);
-        oversizedSecondValue(false, true, false);
-    }
-
-    @Test
-    public void oversizedSecondValueWithoutSymbolTableIncremental() throws Exception {
-        oversizedSecondValue(false, false, true);
-        oversizedSecondValue(false, true, true);
-    }
-
-    @Test
-    public void oversizedSecondValueWithSymbolTable() throws Exception {
-        oversizedSecondValue(true, false, false);
-        oversizedSecondValue(true, true, false);
-    }
-
-    @Test
-    public void oversizedSecondValueWithSymbolTableIncremental() throws Exception {
-        oversizedSecondValue(true, false, true);
-        oversizedSecondValue(true, true, true);
-    }
-
-    private void oversizeSymbolTableDetectedInHeader(int maximumBufferSize) throws Exception {
-        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
-        // for symbol 10.
-        byte[] bytes = toBinary("abcdefghijklmnopqrstuvwxyz");
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onOversizedValue() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-
-            }
-        };
-        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(maximumBufferSize)
-                .withMaximumBufferSize(maximumBufferSize)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, new ByteArrayInputStream(bytes));
-        assertNull(reader.next());
-        assertEquals(1, oversizedCounter.get());
-        reader.close();
-    }
-
-    @Test
-    public void oversizeSymbolTableDetectedInHeader() throws Exception {
-        // The symbol table is determined to be oversized when reading the length of the annotation wrapper.
-        oversizeSymbolTableDetectedInHeader(5);
-        // The symbol table is determined to be oversized when reading the annotations length.
-        oversizeSymbolTableDetectedInHeader(6);
-        // The symbol table is determined to be oversized when reading SID 3.
-        oversizeSymbolTableDetectedInHeader(7);
-        // The symbol table is determined to be oversized when reading the type ID of the wrapped struct.
-        oversizeSymbolTableDetectedInHeader(8);
-        // The symbol table is determined to be oversized when reading the length of the wrapped struct.
-        oversizeSymbolTableDetectedInHeader(9);
-    }
-
-    private void oversizeSymbolTableDetectedInHeaderIncremental(int maximumBufferSize) throws Exception {
-        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
-        // for symbol 10.
-        byte[] bytes = toBinary("abcdefghijklmnopqrstuvwxyz");
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onOversizedValue() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-
-            }
-        };
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
-        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(maximumBufferSize)
-                .withMaximumBufferSize(maximumBufferSize)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
-        for (byte b : bytes) {
-            assertNull(reader.next());
-            pipe.receive(b);
-        }
-        assertNull(reader.next());
-        assertEquals(1, oversizedCounter.get());
-        reader.close();
-    }
-
-    @Test
-    public void oversizeSymbolTableDetectedInHeaderIncremental() throws Exception {
-        // The symbol table is determined to be oversized when reading the length of the annotation wrapper.
-        oversizeSymbolTableDetectedInHeaderIncremental(5);
-        // The symbol table is determined to be oversized when reading the annotations length.
-        oversizeSymbolTableDetectedInHeaderIncremental(6);
-        // The symbol table is determined to be oversized when reading SID 3.
-        oversizeSymbolTableDetectedInHeaderIncremental(7);
-        // The symbol table is determined to be oversized when reading the type ID of the wrapped struct.
-        oversizeSymbolTableDetectedInHeaderIncremental(8);
-        // The symbol table is determined to be oversized when reading the length of the wrapped struct.
-        oversizeSymbolTableDetectedInHeaderIncremental(9);
-    }
-
-    @Test
-    public void oversizeSymbolTableDetectedInTheMiddle() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
-        writer.writeString("12345678");
-        writer.finish();
-        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
-        writer.close();
-        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
-        // for symbol 10.
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onOversizedValue() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-
-            }
-        };
-        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(8)
-                .withMaximumBufferSize(32)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(
-            builder,
-            new ByteArrayInputStream(out.toByteArray())
-        );
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("12345678", reader.stringValue());
-        assertNull(reader.next());
-        assertEquals(1, oversizedCounter.get());
-        reader.close();
-    }
-
-    @Test
-    public void oversizeSymbolTableDetectedInTheMiddleIncremental() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
-        writer.writeString("12345678");
-        writer.finish();
-        writer.writeSymbol("abcdefghijklmnopqrstuvwxyz"); // Requires 32 bytes (4 IVM, 1 TID, 1 length, 26 chars)
-        writer.close();
-        // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
-        // for symbol 10.
-        final AtomicInteger oversizedCounter = new AtomicInteger();
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                oversizedCounter.incrementAndGet();
-            }
-
-            @Override
-            public void onOversizedValue() {
-                throw new IllegalStateException("not expected");
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-
-            }
-        };
-        ResizingPipedInputStream pipe = new ResizingPipedInputStream(out.size());
-        byte[] bytes = out.toByteArray();
-        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(8)
-                .withMaximumBufferSize(32)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        IonReaderBinaryIncremental reader = new IonReaderBinaryIncremental(builder, pipe);
-        boolean foundValue = false;
-        for (byte b : bytes) {
-            IonType type = reader.next();
-            if (type != null) {
-                assertFalse(foundValue);
-                assertEquals(IonType.STRING, type);
-                assertEquals("12345678", reader.stringValue());
-                foundValue = true;
-            }
-            pipe.receive(b);
-        }
-        assertTrue(foundValue);
-        assertNull(reader.next());
-        assertEquals(1, oversizedCounter.get());
-        reader.close();
-    }
-
-    private static void writeFirstStruct(IonWriter writer) throws IOException {
-        //{
-        //    foo: bar,
-        //    abc: [123, 456]
-        //}
-        writer.stepIn(IonType.STRUCT);
-        writer.setFieldName("foo");
-        writer.writeSymbol("bar");
-        writer.setFieldName("abc");
-        writer.stepIn(IonType.LIST);
-        writer.writeInt(123);
-        writer.writeInt(456);
-        writer.stepOut();
-        writer.stepOut();
-    }
-
-    private static void assertFirstStruct(IonReader reader) {
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals("bar", reader.stringValue());
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals("abc", reader.getFieldName());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(123, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(456, reader.intValue());
-        reader.stepOut();
-        reader.stepOut();
-    }
-
-    private static void writeSecondStruct(IonWriter writer) throws IOException {
-        //{
-        //    foo: baz,
-        //    abc: [42.0, 43e0]
-        //}
-        writer.stepIn(IonType.STRUCT);
-        writer.setFieldName("foo");
-        writer.writeSymbol("baz");
-        writer.setFieldName("abc");
-        writer.stepIn(IonType.LIST);
-        writer.writeDecimal(new BigDecimal("42.0"));
-        writer.writeFloat(43.);
-        writer.stepOut();
-        writer.stepOut();
-    }
-
-    private static void assertSecondStruct(IonReader reader) {
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals("baz", reader.stringValue());
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals("abc", reader.getFieldName());
-        reader.stepIn();
-        assertEquals(IonType.DECIMAL, reader.next());
-        assertEquals(new BigDecimal("42.0"), reader.decimalValue());
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(43., reader.doubleValue(), 1e-9);
-        reader.stepOut();
-        reader.stepOut();
-        assertNull(reader.next());
-    }
-
-    IonReader newBoundedIncrementalReader(byte[] bytes, int maximumBufferSize) {
-        UnifiedTestHandler handler = new UnifiedTestHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                Assert.fail("Oversized symbol table not expected.");
-            }
-
-            @Override
-            public void onOversizedValue() {
-                Assert.fail("Oversized value not expected.");
-            }
-
-            @Override
-            public void onData(int numberOfBytes) {
-                // Do nothing.
-            }
-        };
-        IonReaderBuilder builder = IonReaderBuilder.standard().withBufferConfiguration(
-            IonBufferConfiguration.Builder.standard()
-                .withInitialBufferSize(maximumBufferSize)
-                .withMaximumBufferSize(maximumBufferSize)
-                .onOversizedValue(handler)
-                .onOversizedSymbolTable(handler)
-                .onData(handler)
-                .build()
-        );
-        return new IonReaderBinaryIncremental(
-            builder,
-            new ByteArrayInputStream(bytes)
-        );
-    }
-
-    @Test
-    public void flushBetweenStructs() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        IonWriter writer = _Private_IonManagedBinaryWriterBuilder
-            .create(_Private_IonManagedBinaryWriterBuilder.AllocatorMode.BASIC)
-                .withLocalSymbolTableAppendEnabled()
-                .newWriter(out);
-        writeFirstStruct(writer);
-        writer.flush();
-        writeSecondStruct(writer);
-        writer.close();
-
-        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 64);
-        assertFirstStruct(reader);
-        assertSecondStruct(reader);
-        reader.close();
-    }
-
-    @Test
-    public void structsWithFloat32AndPreallocatedLength() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        IonWriter writer = _Private_IonManagedBinaryWriterBuilder
-            .create(_Private_IonManagedBinaryWriterBuilder.AllocatorMode.BASIC)
-                .withPaddedLengthPreallocation(2)
-                .withFloatBinary32Enabled()
-                .newWriter(out);
-        writeFirstStruct(writer);
-        writeSecondStruct(writer);
-        writer.close();
-
-        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 64);
-        assertFirstStruct(reader);
-        assertSecondStruct(reader);
-    }
-
-    @Test
-    public void nopPadThatFillsBufferFollowedByValueNotOversized() throws Exception {
-        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
-            0x03, 0x00, 0x00, 0x00, // 4 byte NOP pad.
-            0x20 // Int 0.
-        );
-        // The IVM is 4 bytes and the NOP pad is 4 bytes. The first value is the 9th byte and should not be considered
-        // oversize because the NOP pad can be discarded.
-        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 8);
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, reader.intValue());
-        reader.close();
-    }
-
-    @Test
-    public void nopPadFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
-        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
-            0x03, 0x00, 0x00, 0x00, // 4 byte NOP pad.
-            0x21, 0x01 // Int 1.
-        );
-        // The IVM is 4 bytes and the NOP pad is 4 bytes. The first byte of the value is the 9th byte and fits in the
-        // buffer. Even though there is a 10th byte, the value should not be considered oversize because the NOP pad
-        // can be discarded.
-        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 9);
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        reader.close();
-    }
-
-    @Test
-    public void symbolTableFollowedByNopPadFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
-        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
-            // Symbol table with the symbol 'hello'.
-            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
-            0x00, // 1-byte NOP pad.
-            0x71, 0x0A // SID 10 (hello).
-        );
-        // The IVM is 4 bytes, the symbol table is 12 bytes, and the symbol value is 2 bytes (total 18). The 1-byte NOP
-        // pad needs to be reclaimed to make space for the value. Once that is done, the value will fit.
-        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 18);
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("hello", reader.stringValue());
-        reader.close();
-    }
-
-    @Test
-    public void multipleNopPadsFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
-        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
-            // One byte no-op pad.
-            0x00,
-            // Two byte no-op pad.
-            0x01, 0xFF,
-            // Three byte no-op pad.
-            0x02, 0x99, 0x42,
-            // Int 1
-            0x21, 0x01,
-            // IVM 1.0
-            0xE0, 0x01, 0x00, 0xEA,
-            // The following no-op pads exceed the maximum buffer size, but should not cause an error to be raised.
-            // 16-byte no-op pad.
-            0x0E, 0x8E,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            // Three byte no-op pad.
-            0x02, 0x99, 0x42,
-            // Int 2.
-            0x21, 0x02,
-            // 16-byte no-op pad.
-            0x0E, 0x8E,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-        );
-
-        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 11);
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(2, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors() throws Exception {
-        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
-            // One byte no-op pad.
-            0x00,
-            // Two byte no-op pad.
-            0x01, 0xFF,
-            // Three byte no-op pad.
-            0x02, 0x99, 0x42,
-            // IVM 1.0
-            0xE0, 0x01, 0x00, 0xEA,
-            // 15-byte no-op pad.
-            0x0E, 0x8D,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            // Symbol table with the symbol 'hello'.
-            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
-            // Three byte no-op pad.
-            0x02, 0x99, 0x42,
-            // Symbol 10 (hello)
-            0x71, 0x0A
-        );
-
-        // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
-        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 22);
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("hello", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors2() throws Exception {
-        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
-            // One byte no-op pad.
-            0x00,
-            // Two byte no-op pad.
-            0x01, 0xFF,
-            // Three byte no-op pad.
-            0x02, 0x99, 0x42,
-            // IVM 1.0
-            0xE0, 0x01, 0x00, 0xEA,
-            // 16-byte no-op pad.
-            0x0E, 0x8E,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            // Symbol table with the symbol 'hello'.
-            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
-            // Three byte no-op pad.
-            0x02, 0x99, 0x42,
-            // Symbol 10 (hello)
-            0x71, 0x0A
-        );
-
-        // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
-        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 22);
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("hello", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors3() throws Exception {
-        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
-            // One byte no-op pad.
-            0x00,
-            // Two byte no-op pad.
-            0x01, 0xFF,
-            // Three byte no-op pad.
-            0x02, 0x99, 0x42,
-            // IVM 1.0
-            0xE0, 0x01, 0x00, 0xEA,
-            // 14-byte no-op pad.
-            0x0E, 0x8C,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            // Symbol table with the symbol 'hello'.
-            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
-            // Three byte no-op pad.
-            0x02, 0x99, 0x42,
-            // Symbol 10 (hello)
-            0x71, 0x0A
-        );
-
-        // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
-        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 22);
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("hello", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void nopPadSurroundingSymbolTableThatFitsInBuffer() throws Exception {
-        TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
-            // 14-byte no-op pad.
-            0x0E, 0x8C,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            // Symbol table with the symbol 'hello'.
-            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
-            // 14-byte no-op pad.
-            0x0E, 0x8C,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            // String abcdefg
-            0x87, 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-            // Symbol 10 (hello)
-            0x71, 0x0A
-        );
-
-        // Set the maximum size at IVM (4 bytes) + 14-byte NOP pad + the symbol table (12 bytes) + 2 value bytes.
-        IonReader reader = newBoundedIncrementalReader(out.toByteArray(), 32);
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("abcdefg", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("hello", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    /**
-     * Compares an iterator to the given list.
-     * @param expected the list containing the elements to compare to.
-     * @param actual the iterator to be compared.
-     * @param isEqualityExpected true if the iterator is expected to contain the same elements as the list; otherwise,
-     *                           false.
-     */
-    private static void compareIterator(List<String> expected, Iterator<String> actual, boolean isEqualityExpected) {
-        int numberOfElements = 0;
-        while (actual.hasNext()) {
-            String actualValue = actual.next();
-            if (numberOfElements >= expected.size()) {
-                assertEquals(isEqualityExpected, !actual.hasNext());
-                break;
-            }
-            String expectedValue = expected.get(numberOfElements++);
-            if (isEqualityExpected) {
-                assertEquals(expectedValue, actualValue);
-            } else {
-                assertNotEquals(expectedValue, actualValue);
-            }
-        }
-        assertEquals(isEqualityExpected, numberOfElements == expected.size());
-    }
-
-    /**
-     * Tests the annotation iterator reuse option.
-     * @param isEnabled true if the option is enabled, false if it is disabled.
-     */
-    private void annotationIteratorReuse(boolean isEnabled) throws Exception {
-        readerBuilder = IonReaderBuilder.standard().withAnnotationIteratorReuseEnabled(isEnabled);
-        IonReaderBinaryIncremental reader = readerFor("foo::bar::123 baz::456");
-
-        assertEquals(IonType.INT, reader.next());
-        Iterator<String> firstValueAnnotationIterator = reader.iterateTypeAnnotations();
-        assertEquals(123, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
-        compareIterator(Arrays.asList("foo", "bar"), firstValueAnnotationIterator, !isEnabled);
-        Iterator<String> secondValueAnnotationIterator = reader.iterateTypeAnnotations();
-        assertEquals(456, reader.intValue());
-        assertNull(reader.next());
-        compareIterator(Collections.singletonList("baz"), secondValueAnnotationIterator, !isEnabled);
-        reader.close();
-    }
-
-    @Test
-    public void annotationIteratorReuseEnabled() throws Exception {
-        annotationIteratorReuse(true);
-    }
-
-    @Test
-    public void annotationIteratorReuseDisabled() throws Exception {
-        annotationIteratorReuse(false);
-    }
-
-    @Test
-    public void failsOnMalformedSymbolTable() {
-        byte[] data = bytes(
-            0xE0, 0x01, 0x00, 0xEA, // Binary IVM
-            0xE6, // 6-byte annotation wrapper
-            0x81, // 1 byte of annotation SIDs
-            0x83, // SID 3 ($ion_symbol_table)
-            0xD3, // 3-byte struct
-            0x84, // Field name SID 4 (name)
-            0xE7, // 7-byte annotation wrapper (error: there should only be two bytes remaining).
-            0x81, // Junk byte to fill the 6 bytes of the annotation wrapper and 3 bytes of the struct.
-            0x20  // Next top-level value (int 0).
-        );
-        IonReader reader = newBoundedIncrementalReader(data, 1024);
-        thrown.expect(IonException.class);
-        reader.next();
-    }
-}
diff --git a/test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java b/test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java
deleted file mode 100644
index bac28697eb..0000000000
--- a/test/com/amazon/ion/impl/IonReaderLookaheadBufferTest.java
+++ /dev/null
@@ -1,1237 +0,0 @@
-package com.amazon.ion.impl;
-
-import com.amazon.ion.BufferConfiguration;
-import com.amazon.ion.IonBufferConfiguration;
-import com.amazon.ion.IonDatagram;
-import com.amazon.ion.IonException;
-import com.amazon.ion.IonReader;
-import com.amazon.ion.IonSystem;
-import com.amazon.ion.IonType;
-import com.amazon.ion.IonWriter;
-import com.amazon.ion.SymbolTable;
-import com.amazon.ion.TestUtils;
-import com.amazon.ion.system.IonBinaryWriterBuilder;
-import com.amazon.ion.system.IonReaderBuilder;
-import com.amazon.ion.system.IonSystemBuilder;
-import com.amazon.ion.util.Equivalence;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
-
-import static com.amazon.ion.BitUtils.bytes;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-@RunWith(Parameterized.class)
-public class IonReaderLookaheadBufferTest
-    extends IonReaderLookaheadBufferTestBase<IonBufferConfiguration, IonBufferConfiguration.Builder>
-{
-
-    private static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
-
-    // The source of data that the standard lookahead buffer will draw from.
-    private ResizingPipedInputStream input;
-    // The lookahead buffer to test.
-    private IonReaderLookaheadBuffer lookahead;
-    // Builds IonBufferConfigurations used by 'lookahead'. May be overwritten by individual tests.
-    private IonBufferConfiguration.Builder builder;
-
-    @Before
-    public void reset() {
-        input = null;
-        lookahead = null;
-        builder = IonBufferConfiguration.Builder.standard();
-    }
-
-    /**
-     * Creates a standard buffer (`lookahead`) that draws from a ResizingPipedInputStream (`input`) that can be
-     * incrementally filled with data.
-     */
-    private void initializeStandardPipedBuffer() {
-        input = new ResizingPipedInputStream(1);
-        if (initialBufferSize != null) {
-            builder.withInitialBufferSize(initialBufferSize);
-        }
-        lookahead = new IonReaderLookaheadBuffer(builder.build(), input);
-    }
-
-    /**
-     * Creates a lookahead buffer over the given bytes, prepended with the IVM.
-     * @param ion binary Ion bytes without an IVM.
-     * @return a new buffer.
-     */
-    private IonReaderLookaheadBuffer bufferFor(int... ion) throws Exception {
-        return new IonReaderLookaheadBuffer(
-            builder.build(),
-            new ByteArrayInputStream(new TestUtils.BinaryIonAppender().append(ion).toByteArray())
-        );
-    }
-
-    @Override
-    BuilderSupplier<IonBufferConfiguration, IonBufferConfiguration.Builder> defaultBuilderSupplier() {
-        return new BuilderSupplier<IonBufferConfiguration, IonBufferConfiguration.Builder>() {
-
-            @Override
-            public IonBufferConfiguration.Builder get() {
-                return IonBufferConfiguration.Builder.standard();
-            }
-        };
-    }
-
-    @Override
-    ReaderLookaheadBufferBase build(
-        IonBufferConfiguration.Builder configuration,
-        InputStream inputStream
-    ) {
-        return new IonReaderLookaheadBuffer(configuration.build(), inputStream);
-    }
-
-    @Override
-    void createThrowingOversizedEventHandlers(IonBufferConfiguration.Builder builder) {
-        builder.onOversizedValue(new BufferConfiguration.OversizedValueHandler() {
-            @Override
-            public void onOversizedValue() {
-                throw new IllegalStateException();
-            }
-        })
-        .onOversizedSymbolTable(new IonBufferConfiguration.OversizedSymbolTableHandler() {
-            @Override
-            public void onOversizedSymbolTable() {
-                throw new IllegalStateException();
-            }
-        });
-    }
-
-    @Override
-    void createCountingEventHandler(IonBufferConfiguration.Builder builder, final AtomicLong byteCount) {
-        createThrowingOversizedEventHandlers(builder);
-        builder.onData(new BufferConfiguration.DataHandler() {
-            @Override
-            public void onData(int numberOfBytes) {
-                byteCount.addAndGet(numberOfBytes);
-            }
-        });
-    }
-
-    @Override
-    byte[] toBytes(String textIon) throws IOException {
-        ByteArrayOutputStream output = new ByteArrayOutputStream();
-        _Private_IonSystem system = (_Private_IonSystem) IonSystemBuilder.standard().build();
-        IonReader reader = system.newSystemReader(textIon);
-        IonWriter writer = IonBinaryWriterBuilder.standard().build(output);
-        writer.writeValues(reader);
-        reader.close();
-        writer.close();
-        return output.toByteArray();
-    }
-
-    @Override
-    byte[] intZeroWithoutIvm() {
-        return bytes(0x20);
-    }
-
-    @Test
-    public void nopPadding() throws Exception {
-        byte[] threeByteNopPadBeforeIntegerZero = bytes(0xE0, 0x01, 0x00, 0xEA, 0x0E, 0x81, 0x00, 0x20);
-        readSingleValueOneByteAtATime(
-            threeByteNopPadBeforeIntegerZero,
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.INT, reader.next());
-                    assertEquals(0, reader.intValue());
-                }
-            }
-        );
-    }
-
-    @Test
-    public void annotationWithMultiByteSID() throws Exception {
-        // The SID 1010 takes multiple bytes to express, but the total length of the annotation wrapper is still small
-        // enough that the length is encoded in the lower nibble of the type ID. This test verifies that the
-        // annot_length VarUInt is correctly treated as a length of the SIDs, not the number of SIDs.
-        readSingleValueOneByteAtATime(
-            toBytes("$ion_symbol_table::{imports:[{name:\"foo\", version:1, max_id:1000}], symbols:[\"abc\"]} $1010::123"),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.INT, reader.next());
-                    String[] annotations = reader.getTypeAnnotations();
-                    assertEquals(1, annotations.length);
-                    assertEquals("abc", annotations[0]);
-                    assertEquals(123, reader.intValue());
-                }
-            }
-        );
-        // This test is similar, except that the annotation wrapper's length requires the 'length' VarUInt.
-        readSingleValueOneByteAtATime(
-            toBytes("$ion_symbol_table::{imports:[{name:\"foo\", version:1, max_id:1000}], symbols:[\"abc\"]} $1010::\"abcdefghijklmnopqrstuvwxyz0123456789\""),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.STRING, reader.next());
-                    String[] annotations = reader.getTypeAnnotations();
-                    assertEquals(1, annotations.length);
-                    assertEquals("abc", annotations[0]);
-                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
-                }
-            }
-        );
-        // Two multibyte SIDs.
-        readSingleValueOneByteAtATime(
-            toBytes("$ion_symbol_table::{imports:[{name:\"foo\", version:1, max_id:1000}], symbols:[\"abc\"]} $1010::$1010::123"),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.INT, reader.next());
-                    String[] annotations = reader.getTypeAnnotations();
-                    assertEquals(2, annotations.length);
-                    assertEquals("abc", annotations[0]);
-                    assertEquals("abc", annotations[1]);
-                    assertEquals(123, reader.intValue());
-                }
-            }
-        );
-        // One multibyte SID and one one-byte SID.
-        readSingleValueOneByteAtATime(
-            toBytes("$ion_symbol_table::{imports:[{name:\"foo\", version:1, max_id:1000}], symbols:[\"abc\"]} $4::$1010::\"abcdefghijklmnopqrstuvwxyz0123456789\""),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.STRING, reader.next());
-                    String[] annotations = reader.getTypeAnnotations();
-                    assertEquals(2, annotations.length);
-                    assertEquals("name", annotations[0]); // SID 4 is "name"
-                    assertEquals("abc", annotations[1]);
-                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
-                }
-            }
-        );
-    }
-
-    @Test
-    public void symbolTableAnnotationOnStructNotFirst() throws Exception {
-        readSingleValueOneByteAtATime(
-            // Note: the following more readable line will be possible once ion-java#222 is fixed.
-            // toBytes("name::$ion_symbol_table::{}"),
-            bytes(0xE0, 0x01, 0x00, 0xEA, 0xE4, 0x82, 0x84, 0x83, 0xD0),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.STRUCT, reader.next());
-                    String[] annotations = reader.getTypeAnnotations();
-                    assertEquals(2, annotations.length);
-                    assertEquals("name", annotations[0]);
-                    assertEquals("$ion_symbol_table", annotations[1]);
-                    reader.stepIn();
-                    assertNull(reader.next());
-                    reader.stepOut();
-                }
-            }
-        );
-    }
-
-    @Test
-    public void errorOnInvalidTypeF() throws Exception {
-        // Type F is illegal in Ion 1.0.
-        thrown.expect(IonException.class);
-        readSingleValueOneByteAtATime(
-            bytes(0xE0, 0x01, 0x00, 0xEA, 0xF0),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    fail();
-                }
-            }
-        );
-    }
-
-    @Test
-    public void errorOnInvalidAnnotationTooShort() throws Exception {
-        // Annotation wrappers must have length at least three.
-        thrown.expect(IonException.class);
-        readSingleValueOneByteAtATime(
-            bytes(0xE0, 0x01, 0x00, 0xEA, 0xE2, 0x81, 0x80),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    fail();
-                }
-            }
-        );
-    }
-
-    @Test
-    public void errorOnInvalidAnnotationNull() throws Exception {
-        // Annotation wrappers cannot be null.
-        thrown.expect(IonException.class);
-        readSingleValueOneByteAtATime(
-            bytes(0xE0, 0x01, 0x00, 0xEA, 0xE2),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    fail();
-                }
-            }
-        );
-    }
-
-    @Test
-    public void errorOnIVMInAnnotation() throws Exception {
-        // The IVM must only occur at the top level.
-        thrown.expect(IonException.class);
-        readSingleValueOneByteAtATime(
-            bytes(0xE0, 0x01, 0x00, 0xEA, 0xE6, 0x81, 0x83, 0xE0, 0x01, 0x00, 0xEA),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    fail();
-                }
-            }
-        );
-    }
-
-    @Test
-    public void errorOnInvalidAnnotationWithinAnnotation() throws Exception {
-        // An annotation wrapper cannot wrap another annotation wrapper. This is an example of invalid Ion
-        // that is not detected by the lookahead wrapper. The error will be conveyed by the reader as normal.
-        readSingleValueOneByteAtATime(
-            bytes(0xE0, 0x01, 0x00, 0xEA, 0xE6, 0x81, 0x84, 0xE3, 0x81, 0x84, 0x20),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    thrown.expect(IonException.class);
-                    reader.next();
-                }
-            }
-        );
-    }
-
-    @Test
-    public void errorOnSpecifiedMaxSizeAndNullSymbolTableHandler() {
-        IonBufferConfiguration.Builder builder = builderSupplier.get();
-        thrown.expect(IllegalArgumentException.class);
-        build(
-            builder
-                .withMaximumBufferSize(10)
-                .onOversizedValue(builder.getNoOpOversizedValueHandler())
-                .onOversizedSymbolTable(null),
-            new ByteArrayInputStream(new byte[]{})
-        );
-    }
-
-    private static final int VALUE_BITS_PER_VARUINT_BYTE = 7;
-    private static final int LOWER_SEVEN_BITS_BITMASK = 0x7F;
-
-    @Test
-    public void succeedsOnVarUIntMaxLong() throws Exception {
-        initializeStandardPipedBuffer();
-        // The IVM and the start of a variable-length NOP pad.
-        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x0E));
-        lookahead.fillInput();
-        assertTrue(lookahead.moreDataRequired());
-        // The following writes the VarUInt representation of Long.MAX_VALUE one byte at a time.
-        // Note: Long.MAX_VALUE is represented in Long.SIZE - 1 bits because long is signed.
-        for (int i = Long.SIZE - 1; i > 0; i -= VALUE_BITS_PER_VARUINT_BYTE) {
-            int bitsToShift = i - VALUE_BITS_PER_VARUINT_BYTE;
-            int endMask = 0;
-            if (i <= VALUE_BITS_PER_VARUINT_BYTE) {
-                endMask = 0x80;
-                bitsToShift = 0;
-            }
-            input.receive((byte) (((Long.MAX_VALUE >>> bitsToShift) & LOWER_SEVEN_BITS_BITMASK) | endMask));
-            lookahead.fillInput();
-            assertTrue(lookahead.moreDataRequired());
-        }
-        // This is the first of the Long.MAX_VALUE bytes of NOP pad that the Ion reader would skip. Writing
-        // all of them is out of scope for this test, but testing that the first one succeeds verifies that
-        // the lookahead wrapper has exited its VarUInt parsing state.
-        input.receive(0);
-        lookahead.fillInput();
-        assertTrue(lookahead.moreDataRequired());
-    }
-
-    @Test
-    public void errorOnVarUIntTooLarge() throws Exception {
-        BigInteger longPlusOne = BigInteger.valueOf(Long.MAX_VALUE).add(BigInteger.ONE);
-        initializeStandardPipedBuffer();
-        // The IVM and the start of a variable-length NOP pad.
-        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x0E));
-        lookahead.fillInput();
-        // The following writes the VarUInt representation of `longPlusOne` one byte at a time.
-        for (int i = longPlusOne.bitLength(); i > 0; i -= VALUE_BITS_PER_VARUINT_BYTE) {
-            assertTrue(lookahead.moreDataRequired());
-            if (i >= VALUE_BITS_PER_VARUINT_BYTE) {
-                int bitsToShift = i - VALUE_BITS_PER_VARUINT_BYTE;
-                input.receive(
-                    longPlusOne
-                        .shiftRight(bitsToShift)
-                        .and(BigInteger.valueOf(LOWER_SEVEN_BITS_BITMASK))
-                        .byteValue()
-                );
-                if (bitsToShift < VALUE_BITS_PER_VARUINT_BYTE) {
-                    // This is the second-to-last byte. A failure is expected because this is not the end
-                    // byte, so no matter what the next byte is, the value can't fit in a long.
-                    thrown.expect(IonException.class);
-                }
-                lookahead.fillInput();
-            } else {
-                fail("Reached the last byte, which should not be possible.");
-            }
-        }
-    }
-
-    @Test
-    public void errorOnRewindAtBeginning() {
-        initializeStandardPipedBuffer();
-        thrown.expect(IllegalStateException.class);
-        lookahead.rewind();
-    }
-
-    @Test
-    public void errorOnRewindToValueStartAtBeginning() {
-        initializeStandardPipedBuffer();
-        thrown.expect(IllegalStateException.class);
-        lookahead.rewindToValueStart();
-    }
-
-    @Test
-    public void errorOnMarkWhenMoreDataIsRequired() throws Exception {
-        initializeStandardPipedBuffer();
-        // The IVM and the start of a variable-length NOP pad.
-        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0xE0));
-        lookahead.fillInput();
-        assertTrue(lookahead.moreDataRequired());
-        thrown.expect(IllegalStateException.class);
-        lookahead.mark();
-    }
-
-    @Test
-    public void errorOnRewindToValueStartWhenDataWouldBeLost() throws Exception {
-        initializeStandardPipedBuffer();
-        // The IVM and the start of a variable-length NOP pad.
-        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0xE0));
-        lookahead.fillInput();
-        assertTrue(lookahead.moreDataRequired());
-        thrown.expect(IllegalStateException.class);
-        lookahead.rewindToValueStart();
-    }
-
-    @Test
-    public void errorOnRewindAfterClear() throws Exception {
-        initializeStandardPipedBuffer();
-        // The IVM followed by int 0.
-        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x20));
-        lookahead.fillInput();
-        lookahead.mark();
-        lookahead.clearMark();
-        thrown.expect(IllegalStateException.class);
-        lookahead.rewind();
-    }
-
-    @Test
-    public void errorOnRewindToValueStartWhenNoValueIsBuffered() throws Exception {
-        initializeStandardPipedBuffer();
-        // The IVM followed by int 0.
-        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x20));
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, reader.intValue());
-        lookahead.fillInput();
-        assertTrue(lookahead.moreDataRequired());
-        thrown.expect(IllegalStateException.class);
-        lookahead.rewindToValueStart();
-    }
-
-    @Test
-    public void errorOnRewindAfterFillInput() throws Exception {
-        initializeStandardPipedBuffer();
-        // The IVM followed by int 0.
-        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x20));
-        lookahead.fillInput();
-        lookahead.mark();
-        input.receive(bytes(0x20));
-        lookahead.fillInput();
-        thrown.expect(IllegalStateException.class);
-        lookahead.rewind();
-    }
-
-    @Test
-    public void rewind() throws Exception {
-        initializeStandardPipedBuffer();
-        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x20));
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        lookahead.mark();
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, reader.intValue());
-        lookahead.rewind();
-        // 4-byte IVM + 1-byte value
-        assertEquals(5, lookahead.available());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, reader.intValue());
-        input.receive(bytes(0x21, 0x01));
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        lookahead.mark();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        lookahead.rewind();
-        assertEquals(2, lookahead.available());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        lookahead.rewind();
-        assertEquals(2, lookahead.available());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        assertTrue(lookahead.moreDataRequired());
-        assertEquals(0, lookahead.available());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void rewindToValueStart() throws Exception {
-        initializeStandardPipedBuffer();
-        input.receive(bytes(0xE0, 0x01, 0x00, 0xEA, 0x20));
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, reader.intValue());
-        lookahead.rewindToValueStart();
-        // No IVM, just 1-byte value.
-        assertEquals(1, lookahead.available());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, reader.intValue());
-        input.receive(bytes(0x21, 0x01));
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        lookahead.rewindToValueStart();
-        assertEquals(2, lookahead.available());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        lookahead.rewindToValueStart();
-        assertEquals(2, lookahead.available());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        assertTrue(lookahead.moreDataRequired());
-        assertEquals(0, lookahead.available());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    private static class RecordingEventHandler implements
-        BufferConfiguration.OversizedValueHandler,
-        IonBufferConfiguration.OversizedSymbolTableHandler,
-        BufferConfiguration.DataHandler {
-
-        int oversizedSymbolTableCount = 0;
-        int oversizedValueCount = 0;
-        long numberOfBytesProcessed = 0;
-
-        @Override
-        public void onOversizedSymbolTable() {
-            oversizedSymbolTableCount++;
-        }
-
-        @Override
-        public void onOversizedValue() {
-            oversizedValueCount++;
-        }
-
-        @Override
-        public void onData(int numberOfBytes) {
-            numberOfBytesProcessed += numberOfBytes;
-        }
-    }
-
-    @Test
-    public void skipOversizedValues() throws Exception {
-        if (initialBufferSize == null) {
-            // This test tests buffers of limited size, while an initialBufferSize of null indicates that the size
-            // of the buffer is unlimited. Skip.
-            return;
-        }
-        // 14 values ranging in size from 1-14 bytes. There are 14 - x values larger than x bytes.
-        TestUtils.BinaryIonAppender appender = new TestUtils.BinaryIonAppender().append(
-            0x11, // boolean true
-            0x21, 0x00, // int 0 (overpadded)
-            0x22, 0x00, 0x01, // int 1 (overpadded)
-            0x33, 0x00, 0x00, 0x02, // int -2 (overpadded)
-            0x44, 0x00, 0x00, 0x00, 0x00, // float 0e0
-            0x55, 0x00, 0x00, 0x80, 0x00, 0x00, // decimal 0d0 (overpadded)
-            0x66, 0x80, 0x81, 0x81, 0x81, 0x80, 0x80, // timestamp 0001-01-01T00:00Z
-            0x7E, 0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, // symbol 0 (overpadded length and value)
-            0x88, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', // string abcdefgh
-            0x99, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', // clob abcdefghi
-            0xAA, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, // blob
-            // list with ten int 0
-            0xBB, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
-            // sexp with ten decimal 0d0
-            0xCC, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50,
-            // struct with system symbol field names and int 0 values (some overpadded)
-            0xDD, 0x84, 0x20, 0x85, 0x20, 0x86, 0x20, 0x87, 0x21, 0x00, 0x88, 0x22, 0x00, 0x00
-        );
-        byte[] data = appender.toByteArray();
-        IonDatagram expectedValues = SYSTEM.getLoader().load(data);;
-        for (int maxValueSize : Arrays.asList(5, 7, 8, 10, 13)) {
-            if (maxValueSize < initialBufferSize) {
-                // This would violate the IonBufferConfiguration contract; no need to test here.
-                continue;
-            }
-            ByteArrayInputStream input = new ByteArrayInputStream(data);
-            RecordingEventHandler eventHandler = new RecordingEventHandler();
-            IonBufferConfiguration.Builder builder = IonBufferConfiguration.Builder.standard()
-                .withMaximumBufferSize(maxValueSize)
-                .onOversizedValue(eventHandler)
-                .onOversizedSymbolTable(eventHandler)
-                .onData(eventHandler)
-                .withInitialBufferSize(initialBufferSize);
-            IonReaderLookaheadBuffer lookahead = new IonReaderLookaheadBuffer(builder.build(), input);
-            IonReader reader = null;
-            try {
-                int valueIndex = 0;
-                while (true) {
-                    lookahead.fillInput();
-                    if (lookahead.moreDataRequired()) {
-                        break;
-                    }
-                    if (reader == null) {
-                        reader = lookahead.newIonReader(IonReaderBuilder.standard());
-                    }
-                    assertNotNull(reader.next());
-                    assertTrue(Equivalence.ionEquals(expectedValues.get(valueIndex), SYSTEM.newValue(reader)));
-                    valueIndex++;
-                }
-                // There is one value per size. For a max size of x, `moreDataRequired` should be false x times.
-                assertEquals(valueIndex, maxValueSize);
-            } finally {
-                if (reader != null) {
-                    reader.close();
-                }
-            }
-            int expectedOversizedValues = expectedValues.size() - maxValueSize;
-            assertEquals(
-                String.format("Expect %d oversized values for max size %d", expectedOversizedValues, maxValueSize),
-                expectedOversizedValues,
-                eventHandler.oversizedValueCount
-            );
-            assertEquals(0, eventHandler.oversizedSymbolTableCount);
-            ResizingPipedInputStream buffer = (ResizingPipedInputStream) lookahead.getPipe();
-            // The buffer grows in increments of its initial buffer size. Therefore, the final capacity will be at
-            // most `initialBufferSize` larger than the lookahead wrapper's configured max value size.
-            assertTrue(buffer.capacity() <= maxValueSize + buffer.getInitialBufferSize());
-        }
-    }
-
-    @Test
-    public void skipOversizedValuesButRetainSymbolTablesWhenReadingOneByOne() throws Exception {
-        if (initialBufferSize == null) {
-            // This test tests buffers of limited size, while an initialBufferSize of null indicates that the size
-            // of the buffer is unlimited. Skip.
-            return;
-        }
-        // 4 byte IVM + 30 bytes for the symbol tables + 2 bytes for a symbol value.
-        final int maximumSize = 36;
-        RecordingEventHandler eventHandler = new RecordingEventHandler();
-        builder = IonBufferConfiguration.Builder.standard()
-            .withMaximumBufferSize(maximumSize)
-            .onOversizedValue(eventHandler)
-            .onOversizedSymbolTable(eventHandler)
-            .onData(eventHandler)
-            .withInitialBufferSize(initialBufferSize);
-        lookahead = bufferFor(
-            // Total buffered data: 4 bytes. The following value is 33 bytes in order to exceed the max of 36.
-            0xBE, 0x9F, // list of size 31
-            0x7E, 0x00, 0x00, 0x00, 0x00, 0x82, 0x00, 0x00, // symbol 0 (overpadded length and value)
-            0xAA, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, // blob
-            0xBB, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, // list with ten int 0
-            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'A', // symbol table declaring the symbol 'A'.
-            // Total buffered data: 4 + 8 = 12 bytes. The following value is 25 bytes in order to exceed the max of 36.
-            0xBE, 0x97, // list of size 23
-            0xAA, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, // blob
-            0xBB, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, // list with ten int 0
-            0xEA, 0x81, 0x83, 0xD7, 0x86, 0x71, 0x03, 0x87, 0xB2, 0x81, 'B', // symbol table appending the symbol 'B'.
-            // Total buffered data: 4 + 8 + 11 = 23 bytes. The following value is 14 bytes in order to exceed the max of 36.
-            // struct with system symbol field names and int 0 values (some overpadded)
-            0xDD, 0x84, 0x20, 0x85, 0x20, 0x86, 0x20, 0x87, 0x21, 0x00, 0x88, 0x22, 0x00, 0x00,
-            0xEA, 0x81, 0x83, 0xD7, 0x86, 0x71, 0x03, 0x87, 0xB2, 0x81, 'C', // symbol table appending the symbol 'C'.
-            // Total buffered data: 4 + 8 + 11 + 11 = 34 bytes. The following value is 3 bytes in order to exceed the max of 36.
-            0x22, 0x00, 0x01, // int 1 (overpadded)
-            0x71, 0x0A, // symbol 'A'
-            // Since the previous value was successfully read, the buffer is now empty. A 3-byte value can be read.
-            0x72, 0x00, 0x0B, // symbol 'B'
-            0x71, 0x0C // symbol 'C'
-        );
-
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("A", reader.stringValue());
-
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("B", reader.stringValue());
-
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("C", reader.stringValue());
-
-        lookahead.fillInput();
-        assertTrue(lookahead.moreDataRequired());
-        reader.close();
-
-        assertEquals(4, eventHandler.oversizedValueCount);
-        assertEquals(0, eventHandler.oversizedSymbolTableCount);
-        ResizingPipedInputStream buffer = (ResizingPipedInputStream) lookahead.getPipe();
-        // The buffer grows in increments of its initial buffer size. Therefore, the final capacity will be at
-        // most `initialBufferSize` larger than the lookahead wrapper's configured max value size.
-        assertTrue(buffer.capacity() <= maximumSize + buffer.getInitialBufferSize());
-    }
-
-    @Test
-    public void skipOversizedValuesButRetainSymbolTablesWhenReadingAllAtOnce() throws Exception {
-        if (initialBufferSize == null) {
-            // This test tests buffers of limited size, while an initialBufferSize of null indicates that the size
-            // of the buffer is unlimited. Skip.
-            return;
-        }
-        // 4 byte IVM + 8 bytes for the symbol tables + 6 bytes for the integer and symbol values.
-        final int maximumSize = 18;
-        RecordingEventHandler eventHandler = new RecordingEventHandler();
-        builder = IonBufferConfiguration.Builder.standard()
-            .withMaximumBufferSize(maximumSize)
-            .onOversizedValue(eventHandler)
-            .onOversizedSymbolTable(eventHandler)
-            .onData(eventHandler)
-            .withInitialBufferSize(initialBufferSize);
-        lookahead = bufferFor(
-            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'A', // symbol table declaring the symbol 'A'.
-            // Total buffered data: 12 bytes. The following value is 7 bytes in order to exceed the max of 18.
-            0x66, 0x80, 0x81, 0x81, 0x81, 0x80, 0x80, // timestamp 0001-01-01T00:00Z
-            0x21, 0x01, // int 1
-            0x71, 0x0A, // symbol 'A'
-            0x31, 0x01  // int -1
-        );
-
-        // Skips the oversized values and buffers the int 1.
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-
-        // Buffers the symbol value 'A'.
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-
-        // Buffers the int -1.
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-
-        // End of the input.
-        lookahead.fillInput();
-        assertTrue(lookahead.moreDataRequired());
-
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("A", reader.stringValue());
-
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(-1, reader.intValue());
-
-        assertNull(reader.next());
-        reader.close();
-
-        assertEquals(1, eventHandler.oversizedValueCount);
-        assertEquals(0, eventHandler.oversizedSymbolTableCount);
-        ResizingPipedInputStream buffer = (ResizingPipedInputStream) lookahead.getPipe();
-        // The buffer grows in increments of its initial buffer size. Therefore, the final capacity will be at
-        // most `initialBufferSize` larger than the lookahead wrapper's configured max value size.
-        assertTrue(buffer.capacity() <= maximumSize + buffer.getInitialBufferSize());
-    }
-
-    @Test
-    public void oversizedSymbolTable() throws Exception {
-        // 4 byte IVM + 3 byte value.
-        final int maximumSize = 7;
-        if (initialBufferSize == null || initialBufferSize > maximumSize) {
-            // This test tests buffers of limited size, while an initialBufferSize of null indicates that the size
-            // of the buffer is unlimited. Skip.
-            return;
-        }
-        RecordingEventHandler eventHandler = new RecordingEventHandler();
-        builder = IonBufferConfiguration.Builder.standard()
-            .withMaximumBufferSize(maximumSize)
-            .onOversizedValue(eventHandler)
-            .onOversizedSymbolTable(eventHandler)
-            .onData(eventHandler)
-            .withInitialBufferSize(initialBufferSize);
-        lookahead = bufferFor(
-            0x22, 0x00, 0x01, // int 1 (overpadded)
-            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'A', // symbol table declaring the symbol 'A'.
-            0x71, 0x0A // symbol 'A'
-        );
-
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-
-        // This causes the oversized symbol table to be skipped.
-        lookahead.fillInput();
-        assertEquals(0, lookahead.available());
-        assertTrue(lookahead.moreDataRequired());
-        assertEquals(1, eventHandler.oversizedSymbolTableCount);
-
-        // Subsequent invocations of fillInput have no effect.
-        lookahead.fillInput();
-        assertEquals(0, lookahead.available());
-        assertTrue(lookahead.moreDataRequired());
-        assertEquals(1, eventHandler.oversizedSymbolTableCount);
-        reader.close();
-
-        assertEquals(0, eventHandler.oversizedValueCount);
-        ResizingPipedInputStream buffer = (ResizingPipedInputStream) lookahead.getPipe();
-        // The buffer grows in increments of its initial buffer size. Therefore, the final capacity will be at
-        // most `initialBufferSize` larger than the lookahead wrapper's configured max value size.
-        assertTrue(buffer.capacity() <= maximumSize + buffer.getInitialBufferSize());
-    }
-
-    @Test
-    public void moreDataRequiredInTheMiddleOfOversizedValue() throws Exception {
-        // 4 byte IVM + 3 byte value.
-        final int maximumSize = 7;
-        if (initialBufferSize == null || initialBufferSize > maximumSize) {
-            // This test tests buffers of limited size, while an initialBufferSize of null indicates that the size
-            // of the buffer is unlimited. Skip.
-            return;
-        }
-        TestUtils.BinaryIonAppender appender = new TestUtils.BinaryIonAppender().append(
-            // Once the fourth byte in the following value is reached, the value is considered oversized. It will remain
-            // that way even though fillInput yields back to the user for every remaining byte in the value.
-            0x66, 0x80, 0x81, 0x81, 0x81, 0x80, 0x80, // timestamp 0001-01-01T00:00Z
-            0x20 // int 0
-        );
-        final RecordingEventHandler eventHandler = new RecordingEventHandler();
-        builderSupplier = new BuilderSupplier<IonBufferConfiguration, IonBufferConfiguration.Builder>() {
-            @Override
-            public IonBufferConfiguration.Builder get() {
-                return IonBufferConfiguration.Builder.standard()
-                    .withMaximumBufferSize(maximumSize)
-                    .onOversizedValue(eventHandler)
-                    .onOversizedSymbolTable(eventHandler)
-                    .onData(eventHandler);
-            }
-        } ;
-
-        readSingleValueOneByteAtATime(
-            appender.toByteArray(),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.INT, reader.next());
-                    assertEquals(0, reader.intValue());
-                    assertNull(reader.next());
-                }
-            }
-        );
-
-        assertEquals(1, eventHandler.oversizedValueCount);
-        assertEquals(0, eventHandler.oversizedSymbolTableCount);
-    }
-
-    @Test
-    public void oversizedIncompleteGzipValueDoesNotThrow() throws Exception {
-        // Tests that InputStream implementations that throw EOFException when too many bytes are requested to be
-        // skipped do not cause the lookahead wrapper to throw.
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        OutputStream gzip = new GZIPOutputStream(out);
-        gzip.write(bytes(0xE0, 0x01, 0x00, 0xEA));
-        gzip.write(bytes(0x66, 0x80, 0x81, 0x81, 0x81, 0x80, 0x80)); // timestamp 0001-01-01T00:00Z
-        gzip.close();
-        byte[] bytes = out.toByteArray();
-        final int maximumSize = 5; // Less than the length of the timestamp value.
-        // Cutting off 15 bytes removes the entire GZIP trailer and part of the value.
-        byte[] truncatedBytes = new byte[bytes.length - 15];
-        System.arraycopy(bytes, 0, truncatedBytes, 0, truncatedBytes.length);
-        final RecordingEventHandler eventHandler = new RecordingEventHandler();
-        builderSupplier = new BuilderSupplier<IonBufferConfiguration, IonBufferConfiguration.Builder>() {
-            @Override
-            public IonBufferConfiguration.Builder get() {
-                return IonBufferConfiguration.Builder.standard()
-                    .withMaximumBufferSize(maximumSize)
-                    .withInitialBufferSize(maximumSize)
-                    .onOversizedValue(eventHandler)
-                    .onOversizedSymbolTable(eventHandler)
-                    .onData(eventHandler);
-            }
-        };
-
-        InputStream input = new GZIPInputStream(new ByteArrayInputStream(truncatedBytes));
-        IonReaderLookaheadBuffer lookahead = new IonReaderLookaheadBuffer(builder.build(), input);
-        lookahead.fillInput();
-        assertTrue(lookahead.moreDataRequired());
-        lookahead.fillInput();
-        assertTrue(lookahead.moreDataRequired());
-        input.close();
-        // Note: even though the value would be considered oversize, the event handler may not have been notified
-        // before the input is closed, so nothing is asserted here. The purpose of this test is to verify that
-        // an EOFException is not thrown.
-    }
-
-    @Test
-    public void rewindToValueStartWithLstAppend() throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        IonWriter writer = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendEnabled().build(out);
-        writer.writeSymbol("abc");
-        writer.flush();
-        writer.writeSymbol("def");
-        writer.close();
-        InputStream input = new ByteArrayInputStream(out.toByteArray());
-        IonReaderLookaheadBuffer lookahead = new IonReaderLookaheadBuffer(builder.build(), input);
-        lookahead.fillInput();
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertTrue(lookahead.moreDataRequired());
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        lookahead.rewindToValueStart();
-        // 2-byte value (0x71 0x0B). No IVM or symbol table.
-        assertEquals(2, lookahead.available());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        // Note: if mark() / rewind() is used instead of rewindToValueStart(), the following lines will fail; there
-        // will be 12 local symbols and "def" will occur twice in the symbol table. That's because mark() includes
-        // the symbol table (in this case an LST append), and rewinding past the symbol table causes the append
-        // to be processed a second time by IonReader.next().
-        SymbolTable symbolTable = reader.getSymbolTable();
-        assertEquals(symbolTable.getSystemSymbolTable().getMaxId() + 2, reader.getSymbolTable().getMaxId());
-        List<String> symbols = new ArrayList<String>(2);
-        Iterator<String> iterator = symbolTable.iterateDeclaredSymbolNames();
-        while (iterator.hasNext()) {
-            symbols.add(iterator.next());
-        }
-        assertEquals(Arrays.asList("abc", "def"), symbols);
-        input.close();
-    }
-
-    private static void assertIonTypeId(IonType expectedType, int expectedLowerNibble, IonTypeID actualTypeID) {
-        assertEquals(expectedType, actualTypeID.type);
-        assertEquals(expectedLowerNibble, actualTypeID.lowerNibble);
-    }
-
-    /**
-     * Returns one of the provided indices, depending on the value of the 'initialBufferSize' test parameter. Bytes may
-     * occur at different indices in the buffer depending on the buffer's initial size because space will be reclaimed
-     * when possible to avoid unnecessary growth. So a buffer that starts out larger than the total size of the data,
-     * for example, will have ever-increasing indices, while smaller buffers may have indices that roll back to the
-     * beginning when space is reclaimed.
-     * @param indexIfSizeIs1 the expected index when the initial buffer size is 1.
-     * @param indexIfSizeIs10 the expected index when the initial buffer size is 10.
-     * @param indexIfSizeIsLarge the expected index when the initial buffer size is larger than the test data.
-     * @return the index for the current value of initialBufferSize.
-     */
-    private int indexForInitialBufferSize(int indexIfSizeIs1, int indexIfSizeIs10, int indexIfSizeIsLarge) {
-        if (initialBufferSize == null) {
-            return indexIfSizeIsLarge;
-        }
-        if (initialBufferSize == 1) {
-            return indexIfSizeIs1;
-        }
-        if (initialBufferSize == 10) {
-            return indexIfSizeIs10;
-        }
-        throw new IllegalStateException("Add a branch for initialBufferSize " + initialBufferSize);
-    }
-
-    @Test
-    public void valueMarkersAreSet() throws Exception {
-        if (initialBufferSize != null) {
-            builder.withInitialBufferSize(initialBufferSize);
-        }
-        lookahead = bufferFor(
-            // Value start is at byte index 5. Type ID is 0x21. Value end is at byte index 6.
-            0x21, 0x0D,
-            // The value will be consumed, so the indices reset if the initial buffer size is smaller than the data size.
-            0xE0, 0x01, 0x00, 0xEA,
-            // Type ID is 0xD1.
-            0xD1, 0x82, 0x84, 0x20,
-            // The value will not be consumed, so the indices continue.
-            // Annotations are SIDs 4 (name) and 5 (version). Type ID is 0xE5.
-            0xE5, 0x82, 0x84, 0x85, 0x31, 0x01,
-            // The value will not be consumed, so the indices continue.
-            // Type ID is 0x20.
-            0x20
-        );
-
-        lookahead.fillInput();
-        assertEquals(1, lookahead.getIvmIndex());
-        assertFalse(lookahead.hasAnnotations());
-        assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
-        assertEquals(5, lookahead.getValueStart());
-        assertIonTypeId(IonType.INT, 0x1, lookahead.getValueTid());
-        assertEquals(6, lookahead.getValueEnd());
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0x0D, reader.intValue());
-        assertTrue(lookahead.moreDataRequired());
-
-        lookahead.fillInput();
-        assertEquals(indexForInitialBufferSize(1, 1, 7), lookahead.getIvmIndex());
-        lookahead.resetIvmIndex();
-        assertEquals(-1, lookahead.getIvmIndex());
-        assertFalse(lookahead.hasAnnotations());
-        assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
-        assertEquals(indexForInitialBufferSize(6, 6, 12), lookahead.getValueStart());
-        assertIonTypeId(IonType.STRUCT, 0x1, lookahead.getValueTid());
-        assertEquals(indexForInitialBufferSize(8, 8, 14), lookahead.getValueEnd());
-
-        lookahead.fillInput();
-        assertEquals(-1, lookahead.getIvmIndex());
-        assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
-        assertTrue(lookahead.hasAnnotations());
-        assertEquals(indexForInitialBufferSize(10, 10, 16), lookahead.getAnnotationSidsMarker().startIndex);
-        assertEquals(indexForInitialBufferSize(12, 12, 18), lookahead.getAnnotationSidsMarker().endIndex);
-        assertEquals(indexForInitialBufferSize(12, 12, 18), lookahead.getValueStart());
-        assertIonTypeId(IonTypeID.ION_TYPE_ANNOTATION_WRAPPER, 0x5, lookahead.getValueTid());
-        assertEquals(indexForInitialBufferSize(14, 14, 20), lookahead.getValueEnd());
-
-        lookahead.fillInput();
-        assertEquals(-1, lookahead.getIvmIndex());
-        assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
-        assertFalse(lookahead.hasAnnotations());
-        assertEquals(indexForInitialBufferSize(15, 15, 21), lookahead.getValueStart());
-        assertIonTypeId(IonType.INT, 0x0, lookahead.getValueTid());
-        assertEquals(indexForInitialBufferSize(15, 15, 21), lookahead.getValueEnd());
-
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals("name", reader.getFieldName());
-        assertEquals(0, reader.intValue());
-        reader.stepOut();
-
-        assertEquals(IonType.INT, reader.next());
-        assertArrayEquals(new String[]{"name", "version"}, reader.getTypeAnnotations());
-        assertEquals(-1, reader.intValue());
-
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, reader.intValue());
-
-        assertTrue(lookahead.moreDataRequired());
-        reader.close();
-    }
-
-    @Test
-    public void symbolTableMarkersAreSet() throws Exception {
-        if (initialBufferSize != null) {
-            builder.withInitialBufferSize(initialBufferSize);
-        }
-        lookahead = bufferFor(
-            // Symbol table with extra annotation 'name' declaring symbol 'x'.
-            0xE8, 0x82, 0x83, 0x84, 0xD4, 0x87, 0xB2, 0x81, 'x',
-            // Symbol value with SID 10 ('x').
-            0x71, 0x0A,
-            // The value will not be consumed, so the indices continue.
-            // Symbol table appending symbol 'y'.
-            0xEA, 0x81, 0x83, 0xD7, 0x86, 0x71, 0x03, 0x87, 0xB2, 0x81, 'y',
-            // Symbol value with SID 11 ('y').
-            0x71, 0x0B,
-            // The value will be consumed, so the indices reset if the initial buffer size is smaller than the data size.
-            // Second byte of IVM is at byte index 1. The IVM resets the symbol table markers.
-            0xE0, 0x01, 0x00, 0xEA,
-            // Symbol table declaring symbol 'a'.
-            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'a',
-            // Symbol table declaring symbol 'b'.
-            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'b',
-            // The IVM resets the symbol table markers.
-            0xE0, 0x01, 0x00, 0xEA,
-            // Symbol table declaring symbol 'c'.
-            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'c',
-            // Symbol table declaring symbol 'd'.
-            0xE7, 0x81, 0x83, 0xD4, 0x87, 0xB2, 0x81, 'd',
-            // Symbol value with SID 10 ('d').
-            0x71, 0x0A
-        );
-        lookahead.fillInput();
-        assertEquals(1, lookahead.getIvmIndex());
-        assertFalse(lookahead.hasAnnotations());
-        List<IonReaderLookaheadBuffer.Marker> symbolTableMarkers = lookahead.getSymbolTableMarkers();
-        assertEquals(1, symbolTableMarkers.size());
-        assertEquals(9, symbolTableMarkers.get(0).startIndex);
-        assertEquals(13, symbolTableMarkers.get(0).endIndex);
-        assertEquals(14, lookahead.getValueStart());
-        assertIonTypeId(IonType.SYMBOL, 0x1, lookahead.getValueTid());
-        assertEquals(15, lookahead.getValueEnd());
-        lookahead.resetSymbolTableMarkers();
-        assertTrue(lookahead.getSymbolTableMarkers().isEmpty());
-
-        lookahead.fillInput();
-        symbolTableMarkers = lookahead.getSymbolTableMarkers();
-        assertEquals(1, symbolTableMarkers.size());
-        assertEquals(19, symbolTableMarkers.get(0).startIndex);
-        assertEquals(26, symbolTableMarkers.get(0).endIndex);
-        assertEquals(27, lookahead.getValueStart());
-        assertIonTypeId(IonType.SYMBOL, 0x1, lookahead.getValueTid());
-        assertEquals(28, lookahead.getValueEnd());
-
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("x", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("y", reader.stringValue());
-
-        lookahead.fillInput();
-        symbolTableMarkers = lookahead.getSymbolTableMarkers();
-        assertEquals(2, symbolTableMarkers.size());
-        assertEquals(indexForInitialBufferSize(28, 28, 56), symbolTableMarkers.get(0).startIndex);
-        assertEquals(indexForInitialBufferSize(32, 32, 60), symbolTableMarkers.get(0).endIndex);
-        assertEquals(indexForInitialBufferSize(36, 36, 64), symbolTableMarkers.get(1).startIndex);
-        assertEquals(indexForInitialBufferSize(40, 40, 68), symbolTableMarkers.get(1).endIndex);
-        assertEquals(indexForInitialBufferSize(41, 41, 69), lookahead.getValueStart());
-        assertIonTypeId(IonType.SYMBOL, 0x1, lookahead.getValueTid());
-        assertEquals(indexForInitialBufferSize(42, 42, 70), lookahead.getValueEnd());
-
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("d", reader.stringValue());
-
-        assertTrue(lookahead.moreDataRequired());
-        reader.close();
-    }
-
-    @Test
-    public void nopPadFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
-        if (initialBufferSize == null || initialBufferSize != 1) {
-            return;
-        }
-        builder = IonBufferConfiguration.Builder.standard()
-            .withInitialBufferSize(9)
-            .withMaximumBufferSize(9);
-        createCountingEventHandler(builder, new AtomicLong());
-        lookahead = bufferFor(
-            0x03, 0x00, 0x00, 0x00, // 4 byte NOP pad.
-            0x21, 0x01 // Int 1.
-        );
-        // The IVM is 4 bytes and the NOP pad is 4 bytes. The first byte of the value is the 9th byte and fits in the
-        // buffer. Even though there is a 10th byte, the value should not be considered oversize because the NOP pad
-        // can be discarded.
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        lookahead.resetNopPadIndex();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        reader.close();
-    }
-
-    @Test
-    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors() throws Exception {
-        if (initialBufferSize == null || initialBufferSize != 1) {
-            return;
-        }
-        // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
-        builder = IonBufferConfiguration.Builder.standard()
-            .withInitialBufferSize(22)
-            .withMaximumBufferSize(22);
-        createCountingEventHandler(builder, new AtomicLong());
-        lookahead = bufferFor(
-            // One byte no-op pad.
-            0x00,
-            // Two byte no-op pad.
-            0x01, 0xFF,
-            // Three byte no-op pad.
-            0x02, 0x99, 0x42,
-            // IVM 1.0
-            0xE0, 0x01, 0x00, 0xEA,
-            // 15-byte no-op pad.
-            0x0E, 0x8D,
-            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-            // Symbol table with the symbol 'hello'.
-            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
-            // Three byte no-op pad.
-            0x02, 0x99, 0x42,
-            // Symbol 10 (hello)
-            0x71, 0x0A
-        );
-
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("hello", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-    }
-
-    @Test
-    public void annotationMarkersAreCorrectlyShifted() throws Exception {
-        if (initialBufferSize == null || initialBufferSize != 1) {
-            return;
-        }
-        // Set the maximum size at 1 IVM (4 bytes) + the symbol table (12 bytes) + the value (2 bytes) + part of the
-        // next value (3 bytes).
-        builder = IonBufferConfiguration.Builder.standard()
-            .withInitialBufferSize(21)
-            .withMaximumBufferSize(21);
-        createCountingEventHandler(builder, new AtomicLong());
-        lookahead = bufferFor(
-            // Symbol table with the symbol 'hello'.
-            0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
-            // Symbol 10 (hello)
-            0x71, 0x0A,
-            // name::hello
-            0xE4, 0x81, 0x84, 0x71, 0x0A
-        );
-
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        IonReader reader = lookahead.newIonReader(IonReaderBuilder.standard());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertFalse(lookahead.hasAnnotations());
-        // The buffer will reach its maximum size after recording the annotation marker. The marker's indices will
-        // be shifted left when space is reclaimed to fit the value.
-        lookahead.fillInput();
-        assertFalse(lookahead.moreDataRequired());
-        assertEquals("hello", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertTrue(lookahead.hasAnnotations());
-        assertEquals(2, lookahead.getAnnotationSidsMarker().startIndex);
-        assertEquals(3, lookahead.getAnnotationSidsMarker().endIndex);
-        assertNull(reader.next());
-        reader.close();
-    }
-}
diff --git a/test/com/amazon/ion/impl/IonReaderLookaheadBufferTestBase.java b/test/com/amazon/ion/impl/IonReaderLookaheadBufferTestBase.java
deleted file mode 100644
index 98135f7e7c..0000000000
--- a/test/com/amazon/ion/impl/IonReaderLookaheadBufferTestBase.java
+++ /dev/null
@@ -1,679 +0,0 @@
-package com.amazon.ion.impl;
-
-import com.amazon.ion.BufferConfiguration;
-import com.amazon.ion.Decimal;
-import com.amazon.ion.IonLob;
-import com.amazon.ion.IonReader;
-import com.amazon.ion.IonSystem;
-import com.amazon.ion.IonText;
-import com.amazon.ion.IonType;
-import com.amazon.ion.SymbolToken;
-import com.amazon.ion.Timestamp;
-import com.amazon.ion.system.IonReaderBuilder;
-import com.amazon.ion.system.IonSystemBuilder;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.nio.charset.Charset;
-import java.util.Arrays;
-import java.util.concurrent.atomic.AtomicLong;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.runners.Parameterized.Parameter;
-import static org.junit.runners.Parameterized.Parameters;
-
-public abstract class IonReaderLookaheadBufferTestBase<
-    Configuration extends BufferConfiguration<Configuration>,
-    Builder extends BufferConfiguration.Builder<Configuration, Builder>
-> {
-
-    private static final IonSystem ION_SYSTEM = IonSystemBuilder.standard().build();
-    private static final Charset UTF_8 = Charset.forName("UTF-8");
-
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    @Parameters(name = "initialBufferSize={0}")
-    public static Iterable<Integer> initialBufferSizes() {
-        return Arrays.asList(1, 10, null);
-    }
-
-    @Parameter
-    public Integer initialBufferSize;
-
-    interface IonReaderAssertion {
-        void evaluate(IonReader reader);
-    }
-
-    static class Value {
-        byte[] stream;
-        IonReaderAssertion assertion;
-
-        Value(byte[] stream, IonReaderAssertion assertion) {
-            this.stream = stream;
-            this.assertion = assertion;
-        }
-    }
-
-    interface BuilderSupplier<
-        Configuration extends BufferConfiguration<Configuration>,
-        Builder extends BufferConfiguration.Builder<Configuration, Builder>
-    > {
-        Builder get();
-    }
-
-    BuilderSupplier<Configuration, Builder> builderSupplier = null;
-
-    abstract BuilderSupplier<Configuration, Builder> defaultBuilderSupplier();
-
-    @Before
-    public void setup() {
-        builderSupplier = defaultBuilderSupplier();
-    }
-
-    abstract ReaderLookaheadBufferBase build(Builder builder, InputStream inputStream);
-
-    abstract void createThrowingOversizedEventHandlers(Builder builder);
-    abstract void createCountingEventHandler(Builder builder, AtomicLong byteCount);
-
-    void readValuesOneByteAtATime(Value... values) throws Exception {
-        IonReader reader = null;
-        ResizingPipedInputStream input = new ResizingPipedInputStream(1);
-        Builder builder = builderSupplier.get();
-        if (initialBufferSize != null) {
-            builder.withInitialBufferSize(initialBufferSize);
-        }
-        ReaderLookaheadBufferBase lookahead = build(builder, input);
-        try {
-            for (Value value : values) {
-                for (int i = -1; i < value.stream.length; i++) {
-                    if (i >= 0) {
-                        input.receive(value.stream[i]);
-                        lookahead.fillInput();
-                    }
-                    assertEquals(i < value.stream.length - 1, lookahead.moreDataRequired());
-                }
-                if (reader == null) {
-                    reader = lookahead.newIonReader(IonReaderBuilder.standard());
-                }
-                value.assertion.evaluate(reader);
-            }
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-    }
-
-    void readSingleValueOneByteAtATime(byte[] stream, IonReaderAssertion assertion) throws Exception {
-        readValuesOneByteAtATime(new Value(stream, assertion));
-    }
-
-    abstract byte[] toBytes(String textIon) throws IOException;
-    abstract byte[] intZeroWithoutIvm();
-
-    private void typedNull(final IonType type) throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes("null." + type.name().toLowerCase()),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(type, reader.next());
-                    assertTrue(reader.isNullValue());
-                }
-            }
-        );
-    }
-
-    @Test
-    public void nulls() throws Exception {
-        for (IonType type : IonType.values()) {
-            if (type == IonType.DATAGRAM) continue;
-            typedNull(type);
-        }
-    }
-
-    private void booleanValue(final boolean value) throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes("" + value),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.BOOL, reader.next());
-                    assertEquals(value, reader.booleanValue());
-                }
-            }
-        );
-    }
-
-    @Test
-    public void booleans() throws Exception {
-        booleanValue(true);
-        booleanValue(false);
-    }
-
-    private void integerValue(final int value) throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes("" + value),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.INT, reader.next());
-                    assertEquals(value, reader.intValue());
-                }
-            }
-        );
-    }
-
-    @Test
-    public void integers() throws Exception {
-        integerValue(0);
-        integerValue(-1);
-        integerValue(Integer.MAX_VALUE);
-        integerValue(Integer.MIN_VALUE);
-    }
-
-    private void floatValue(final String ion, final double value) throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes(ion),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.FLOAT, reader.next());
-                    assertEquals(value, reader.doubleValue(), 1e-9);
-                }
-            }
-        );
-    }
-
-    @Test
-    public void floats() throws Exception {
-        floatValue("0e0", 0.);
-        floatValue("nan", Double.NaN);
-        floatValue("+inf", Double.POSITIVE_INFINITY);
-        floatValue("-inf", Double.NEGATIVE_INFINITY);
-    }
-
-    private void decimalValue(final String ion, final Decimal value) throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes(ion),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.DECIMAL, reader.next());
-                    assertEquals(value, reader.decimalValue());
-                }
-            }
-        );
-    }
-
-    @Test
-    public void decimals() throws Exception {
-        decimalValue("0.", Decimal.ZERO);
-        decimalValue("-0.", Decimal.NEGATIVE_ZERO);
-        decimalValue("1000000000000.0", Decimal.valueOf(new BigDecimal("1000000000000.0")));
-    }
-
-    private void timestampValue(final Timestamp value) throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes(value.toString()),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.TIMESTAMP, reader.next());
-                    assertEquals(value, reader.timestampValue());
-                }
-            }
-        );
-    }
-
-    @Test
-    public void timestamps() throws Exception {
-        timestampValue(Timestamp.valueOf("2000T"));
-        timestampValue(Timestamp.valueOf("2000-01T"));
-        timestampValue(Timestamp.valueOf("2000-01-01"));
-        timestampValue(Timestamp.valueOf("2000-01-01T00:00Z"));
-        timestampValue(Timestamp.valueOf("2000-01-01T00:00:00Z"));
-        timestampValue(Timestamp.valueOf("2000-01-01T00:00:00.000Z"));
-        timestampValue(Timestamp.valueOf("2000-01-01T00:00:00.000-07:00"));
-    }
-
-    private void textValue(final IonText value) throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes(value.toString()),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(value.getType(), reader.next());
-                    assertEquals(value.stringValue(), reader.stringValue());
-                }
-            }
-        );
-    }
-
-    @Test
-    public void symbols() throws Exception {
-        // NOTE: these exercise skipping over a symbol table.
-        textValue(ION_SYSTEM.newSymbol(""));
-        textValue(ION_SYSTEM.newString("abc"));
-        textValue(ION_SYSTEM.newString("abcdefghijklmnopqrstuvwxyz0123456789"));
-    }
-
-    @Test
-    public void symbolWithUnknownText() throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes("$0"),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.SYMBOL, reader.next());
-                    SymbolToken symbolToken = reader.symbolValue();
-                    assertNull(symbolToken.getText());
-                    assertEquals(0, symbolToken.getSid());
-                }
-            }
-        );
-    }
-
-    @Test
-    public void strings() throws Exception {
-        textValue(ION_SYSTEM.newString(""));
-        textValue(ION_SYSTEM.newString("abc"));
-        textValue(ION_SYSTEM.newString("abcdefghijklmnopqrstuvwxyz0123456789"));
-    }
-
-    private void lobValue(final IonLob lob) throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes(lob.toString()),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(lob.getType(), reader.next());
-                    assertArrayEquals(lob.getBytes(), reader.newBytes());
-                }
-            }
-        );
-    }
-
-    @Test
-    public void clobs() throws Exception {
-        lobValue(ION_SYSTEM.newClob("a".getBytes(UTF_8)));
-        lobValue(ION_SYSTEM.newClob("abcdefghijklmnopqrstuvwxyz0123456789".getBytes(UTF_8)));
-    }
-
-    @Test
-    public void blobs() throws Exception {
-        lobValue(ION_SYSTEM.newBlob(new byte[]{}));
-        lobValue(ION_SYSTEM.newBlob(new byte[]{ 0x01 }));
-        lobValue(ION_SYSTEM.newBlob("abcdefghijklmnopqrstuvwxyz0123456789".getBytes(UTF_8)));
-    }
-
-    private void emptyContainer(final String ion, final IonType type) throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes(ion),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(type, reader.next());
-                    reader.stepIn();
-                    assertNull(reader.next());
-                    reader.stepOut();
-                }
-            }
-        );
-    }
-
-    @Test
-    public void emptyContainers() throws Exception {
-        emptyContainer("[]", IonType.LIST);
-        emptyContainer("()", IonType.SEXP);
-        emptyContainer("{}", IonType.STRUCT);
-    }
-
-    @Test
-    public void annotations() throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes("abc::0"),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.INT, reader.next());
-                    String[] annotations = reader.getTypeAnnotations();
-                    assertEquals(1, annotations.length);
-                    assertEquals("abc", annotations[0]);
-                    assertEquals(0, reader.intValue());
-                }
-            }
-        );
-        readSingleValueOneByteAtATime(
-            toBytes("abc::abcdefghijklmnopqrstuvwxyz0123456789"),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.SYMBOL, reader.next());
-                    String[] annotations = reader.getTypeAnnotations();
-                    assertEquals(1, annotations.length);
-                    assertEquals("abc", annotations[0]);
-                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
-                }
-            }
-        );
-        readSingleValueOneByteAtATime(
-            toBytes("abc::def::abcdefghijklmnopqrstuvwxyz0123456789::\"abcdefghijklmnopqrstuvwxyz0123456789\""),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.STRING, reader.next());
-                    String[] annotations = reader.getTypeAnnotations();
-                    assertEquals(3, annotations.length);
-                    assertEquals("abc", annotations[0]);
-                    assertEquals("def", annotations[1]);
-                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", annotations[2]);
-                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
-                }
-            }
-        );
-    }
-
-    @Test
-    public void list() throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes("[-0., 2000T, (abc)]"),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.LIST, reader.next());
-                    reader.stepIn();
-                    assertEquals(IonType.DECIMAL, reader.next());
-                    assertEquals(Decimal.NEGATIVE_ZERO, reader.decimalValue());
-                    assertEquals(IonType.TIMESTAMP, reader.next());
-                    assertEquals(Timestamp.valueOf("2000T"), reader.timestampValue());
-                    assertEquals(IonType.SEXP, reader.next());
-                    assertNull(reader.next());
-                    reader.stepOut();
-                }
-            }
-        );
-    }
-
-    @Test
-    public void sexp() throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes("'123'::($ion_symbol_table::{} abcdefghijklmnopqrstuvwxyz0123456789)"),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.SEXP, reader.next());
-                    String[] annotations = reader.getTypeAnnotations();
-                    assertEquals(1, annotations.length);
-                    assertEquals("123", annotations[0]);
-                    reader.stepIn();
-                    assertEquals(IonType.STRUCT, reader.next());
-                    annotations = reader.getTypeAnnotations();
-                    assertEquals(1, annotations.length);
-                    assertEquals("$ion_symbol_table", annotations[0]);
-                    reader.stepIn();
-                    assertNull(reader.next());
-                    reader.stepOut();
-                    assertEquals(IonType.SYMBOL, reader.next());
-                    assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
-                    assertNull(reader.next());
-                    reader.stepOut();
-                }
-            }
-        );
-    }
-
-    @Test
-    public void struct() throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes("{'':[-1], a:b::nan, xyz:null.clob, bool:true}"),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.STRUCT, reader.next());
-                    reader.stepIn();
-                    assertEquals(IonType.LIST, reader.next());
-                    assertEquals("", reader.getFieldName());
-                    reader.stepIn();
-                    assertEquals(IonType.INT, reader.next());
-                    assertEquals(-1, reader.intValue());
-                    assertNull(reader.next());
-                    reader.stepOut();
-                    assertEquals(IonType.FLOAT, reader.next());
-                    assertEquals("a", reader.getFieldName());
-                    String[] annotations = reader.getTypeAnnotations();
-                    assertEquals(1, annotations.length);
-                    assertEquals("b", annotations[0]);
-                    assertEquals(Double.NaN, reader.doubleValue(), 1e-9);
-                    assertEquals(IonType.CLOB, reader.next());
-                    assertTrue(reader.isNullValue());
-                    assertEquals(IonType.BOOL, reader.next());
-                    assertEquals("bool", reader.getFieldName());
-                    assertTrue(reader.booleanValue());
-                    assertNull(reader.next());
-                    reader.stepOut();
-                }
-            }
-        );
-    }
-
-    @Test
-    public void multipleTopLevelScalars() throws Exception {
-        readValuesOneByteAtATime(
-            new Value(
-                toBytes("abc"),
-                new IonReaderAssertion() {
-                    @Override
-                    public void evaluate(IonReader reader) {
-                        assertEquals(IonType.SYMBOL, reader.next());
-                        assertEquals("abc", reader.stringValue());
-                    }
-                }
-            ),
-            new Value(
-                intZeroWithoutIvm(),
-                new IonReaderAssertion() {
-                    @Override
-                    public void evaluate(IonReader reader) {
-                        assertEquals(IonType.INT, reader.next());
-                        assertEquals(0, reader.intValue());
-                    }
-                }
-            )
-        );
-    }
-
-    @Test
-    public void multipleTopLevelValuesWithSystemValuesInBetween() throws Exception {
-        readValuesOneByteAtATime(
-            new Value(
-                toBytes("0e0"),
-                new IonReaderAssertion() {
-                    @Override
-                    public void evaluate(IonReader reader) {
-                        assertEquals(IonType.FLOAT, reader.next());
-                        assertEquals(0., reader.doubleValue(), 0e-9);
-                    }
-                }
-            ),
-            new Value(
-                toBytes("abcdefghijklmnopqrstuvwxyz0123456789"), // Includes an IVM and symbol table.
-                new IonReaderAssertion() {
-                    @Override
-                    public void evaluate(IonReader reader) {
-                        assertEquals(IonType.SYMBOL, reader.next());
-                        assertEquals("abcdefghijklmnopqrstuvwxyz0123456789", reader.stringValue());
-                    }
-                }
-            ),
-            new Value(
-                toBytes("{foo:abc::2001-01T}"), // Includes an IVM and symbol table.
-                new IonReaderAssertion() {
-                    @Override
-                    public void evaluate(IonReader reader) {
-                        assertEquals(IonType.STRUCT, reader.next());
-                        reader.stepIn();
-                        assertEquals(IonType.TIMESTAMP, reader.next());
-                        assertEquals("foo", reader.getFieldName());
-                        String[] annotations = reader.getTypeAnnotations();
-                        assertEquals(1, annotations.length);
-                        assertEquals("abc", annotations[0]);
-                        assertEquals(Timestamp.valueOf("2001-01T"), reader.timestampValue());
-                        assertNull(reader.next());
-                        reader.stepOut();
-                    }
-                }
-            )
-        );
-    }
-
-    @Test
-    public void multipleTopLevelContainers() throws Exception {
-        readValuesOneByteAtATime(
-            new Value(
-                toBytes("{foo:abc::2001-01T}"),
-                new IonReaderAssertion() {
-                    @Override
-                    public void evaluate(IonReader reader) {
-                        assertEquals(IonType.STRUCT, reader.next());
-                        reader.stepIn();
-                        assertEquals(IonType.TIMESTAMP, reader.next());
-                        assertEquals("foo", reader.getFieldName());
-                        String[] annotations = reader.getTypeAnnotations();
-                        assertEquals(1, annotations.length);
-                        assertEquals("abc", annotations[0]);
-                        assertEquals(Timestamp.valueOf("2001-01T"), reader.timestampValue());
-                        assertNull(reader.next());
-                        reader.stepOut();
-                    }
-                }
-            ),
-            new Value(
-                toBytes("[{foo:bar}, (baz zar), 123]"),
-                new IonReaderAssertion() {
-                    @Override
-                    public void evaluate(IonReader reader) {
-                        assertEquals(IonType.LIST, reader.next());
-                        reader.stepIn();
-                        assertEquals(IonType.STRUCT, reader.next());
-                        reader.stepIn();
-                        assertEquals(IonType.SYMBOL, reader.next());
-                        assertEquals("foo", reader.getFieldName());
-                        assertEquals("bar", reader.stringValue());
-                        reader.stepOut();
-                        assertEquals(IonType.SEXP, reader.next());
-                        assertEquals(IonType.INT, reader.next());
-                        assertEquals(123, reader.intValue());
-                        assertNull(reader.next());
-                        reader.stepOut();
-                    }
-                }
-            ),
-            new Value(
-                toBytes("()"),
-                new IonReaderAssertion() {
-                    @Override
-                    public void evaluate(IonReader reader) {
-                        assertEquals(IonType.SEXP, reader.next());
-                        reader.stepIn();
-                        assertNull(reader.next());
-                        reader.stepOut();
-                    }
-                }
-            )
-        );
-    }
-
-    @Test
-    public void symbolTableAnnotationOnNonSymbolTable() throws Exception {
-        readSingleValueOneByteAtATime(
-            toBytes("$ion_symbol_table::[123]"),
-            new IonReaderAssertion() {
-                @Override
-                public void evaluate(IonReader reader) {
-                    assertEquals(IonType.LIST, reader.next());
-                    String[] annotations = reader.getTypeAnnotations();
-                    assertEquals(1, annotations.length);
-                    assertEquals("$ion_symbol_table", annotations[0]);
-                    reader.stepIn();
-                    assertEquals(IonType.INT, reader.next());
-                    assertEquals(123, reader.intValue());
-                    reader.stepOut();
-                }
-            }
-        );
-    }
-
-    @Test
-    public void handlerWithUnlimitedMaxSizeCountsBytesProcessed() throws Exception {
-        final AtomicLong totalBytesProcessed = new AtomicLong();
-        builderSupplier = new BuilderSupplier<Configuration, Builder>() {
-            @Override
-            public Builder get() {
-                Builder builder = defaultBuilderSupplier().get();
-                builder.withMaximumBufferSize(Integer.MAX_VALUE);
-                createCountingEventHandler(builder, totalBytesProcessed);
-                return builder;
-            }
-        };
-        byte[] valueBytes = toBytes("[{foo:bar}, (baz zar), 123]");
-        readValuesOneByteAtATime(
-            new Value(
-                valueBytes,
-                new IonReaderAssertion() {
-                    @Override
-                    public void evaluate(IonReader reader) {
-                        assertEquals(IonType.LIST, reader.next());
-                        reader.stepIn();
-                        assertEquals(IonType.STRUCT, reader.next());
-                        reader.stepIn();
-                        assertEquals(IonType.SYMBOL, reader.next());
-                        assertEquals("foo", reader.getFieldName());
-                        assertEquals("bar", reader.stringValue());
-                        reader.stepOut();
-                        assertEquals(IonType.SEXP, reader.next());
-                        assertEquals(IonType.INT, reader.next());
-                        assertEquals(123, reader.intValue());
-                        assertNull(reader.next());
-                        reader.stepOut();
-                    }
-                }
-            )
-        );
-        assertEquals(valueBytes.length, totalBytesProcessed.longValue());
-    }
-
-    @Test
-    public void errorOnSpecifiedMaxSizeAndNullHandler() {
-        thrown.expect(IllegalArgumentException.class);
-        build(
-            builderSupplier.get()
-                .withMaximumBufferSize(10)
-                .onOversizedValue(null),
-            new ByteArrayInputStream(new byte[]{})
-        );
-    }
-
-    @Test
-    public void errorOnMaximumSizeLessThanFive() {
-        Builder builder = builderSupplier.get();
-        int minimumMaximumBufferSize = builder.getMinimumMaximumBufferSize();
-        builder.withMaximumBufferSize(minimumMaximumBufferSize - 1);
-        createThrowingOversizedEventHandlers(builder);
-        thrown.expect(IllegalArgumentException.class);
-        build(
-            builder,
-            new ByteArrayInputStream(new byte[]{})
-        );
-    }
-}

From 361674840b7cfd97028e3fdc17482a0c26bd3ef4 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 5 Jul 2023 13:20:39 -0700
Subject: [PATCH 275/490] Removes support for reading decimal values as
 BigInteger.

---
 .../ion/impl/IonReaderContinuableCoreBinary.java     | 12 +-----------
 test/com/amazon/ion/streaming/ReaderTest.java        |  9 ++-------
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
index c922f7c24e..5ab13d2dd7 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -653,18 +653,8 @@ public BigInteger bigIntegerValue() {
                 value = scalarConverter.getBigInteger();
                 scalarConverter.clear();
             }
-        } else if (valueTid.type == IonType.DECIMAL) {
-            if (valueTid.isNull) {
-                value = null;
-            } else {
-                scalarConverter.addValue(decimalValue());
-                scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.decimal_value);
-                scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.bigInteger_value));
-                value = scalarConverter.getBigInteger();
-                scalarConverter.clear();
-            }
         } else {
-            throw new IllegalStateException("longValue() may only be called on values of type int, float, or decimal.");
+            throw new IllegalStateException("longValue() may only be called on values of type int or float.");
         }
         return value;
     }
diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/test/com/amazon/ion/streaming/ReaderTest.java
index ba05b23835..554a741b33 100644
--- a/test/com/amazon/ion/streaming/ReaderTest.java
+++ b/test/com/amazon/ion/streaming/ReaderTest.java
@@ -245,15 +245,10 @@ public void testReadingDecimalAsLong()
         assertEquals(readLong("9223372036854775807."), readLong("9223372036854775807")); // Max long
     }
 
-    @Test
+    @Test(expected = IllegalStateException.class)
     public void testReadingDecimalAsBigInteger()
     {
-        try {
-            readBigInteger("0.");
-            Assert.fail();
-        } catch (Exception e) {
-            // Pass
-        }
+        readBigInteger("0.");
     }
 
     @Test

From 4bc3c5089ce920e115ebd57951366735269c6ac7 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 11 Jul 2023 12:30:00 -0700
Subject: [PATCH 276/490] Simplifies continuable reader tests by using
 assertion helper methods.

---
 .../amazon/ion/impl/IonCursorBinaryTest.java  |  180 +--
 ...eaderContinuableApplicationBinaryTest.java |   99 +-
 .../IonReaderContinuableCoreBinaryTest.java   |  183 ++-
 ...onReaderContinuableTopLevelBinaryTest.java | 1388 ++++++++---------
 4 files changed, 955 insertions(+), 895 deletions(-)

diff --git a/test/com/amazon/ion/impl/IonCursorBinaryTest.java b/test/com/amazon/ion/impl/IonCursorBinaryTest.java
index ab0c1a410d..098845e830 100644
--- a/test/com/amazon/ion/impl/IonCursorBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonCursorBinaryTest.java
@@ -71,6 +71,28 @@ private void initializeCursor(int... data) {
         cursor.registerOversizedValueHandler(STANDARD_BUFFER_CONFIGURATION.getOversizedValueHandler());
     }
 
+    private void nextExpect(IonCursor.Event expected) {
+        assertEquals(expected, cursor.nextValue());
+    }
+
+    private void fillExpect(IonCursor.Event expected) {
+        assertEquals(expected, cursor.fillValue());
+    }
+
+    private void stepIn() {
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+    }
+
+    private void stepOut() {
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+    }
+
+    private void expectMarker(int expectedStart, int expectedEnd) {
+        Marker marker = loadScalar(cursor);
+        assertEquals(expectedStart, marker.startIndex);
+        assertEquals(expectedEnd, marker.endIndex);
+    }
+
     @Test
     public void basicContainer() {
         initializeCursor(
@@ -79,15 +101,13 @@ public void basicContainer() {
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 7
         );
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
-        assertEquals(START_SCALAR, cursor.nextValue());
-        Marker marker = loadScalar(cursor);
-        assertEquals(7, marker.startIndex);
-        assertEquals(8, marker.endIndex);
-        assertEquals(END_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, cursor.nextValue());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        expectMarker(7, 8);
+        nextExpect(END_CONTAINER);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -97,15 +117,11 @@ public void basicStrings() {
             0x83, 'f', 'o', 'o', // String length 3, starting at byte index 5
             0x83, 'b', 'a', 'r' // String length 3, starting at byte index 9
         );
-        assertEquals(START_SCALAR, cursor.nextValue());
-        Marker marker = loadScalar(cursor);
-        assertEquals(5, marker.startIndex);
-        assertEquals(8, marker.endIndex);
-        assertEquals(START_SCALAR, cursor.nextValue());
-        marker = loadScalar(cursor);
-        assertEquals(9, marker.startIndex);
-        assertEquals(12, marker.endIndex);
-        assertEquals(NEEDS_DATA, cursor.nextValue());
+        nextExpect(START_SCALAR);
+        expectMarker(5, 8);
+        nextExpect(START_SCALAR);
+        expectMarker(9, 12);
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -116,12 +132,12 @@ public void basicNoFill() {
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 7
         );
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
-        assertEquals(START_SCALAR, cursor.nextValue());
-        assertEquals(END_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, cursor.nextValue());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        nextExpect(END_CONTAINER);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -132,11 +148,11 @@ public void basicStepOutEarly() {
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 7
         );
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
-        assertEquals(START_SCALAR, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, cursor.nextValue());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -147,8 +163,8 @@ public void basicTopLevelSkip() {
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 7
         );
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_DATA, cursor.nextValue());
+        nextExpect(START_CONTAINER);
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -160,12 +176,10 @@ public void basicTopLevelSkipThenConsume() {
             0x21, 0x01, // Int length 1, starting at byte index 7
             0x21, 0x03 // Int length 1, starting at byte index 9
         );
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(START_SCALAR, cursor.nextValue());
-        Marker marker = loadScalar(cursor);
-        assertEquals(9, marker.startIndex);
-        assertEquals(10, marker.endIndex);
-        assertEquals(NEEDS_DATA, cursor.nextValue());
+        nextExpect(START_CONTAINER);
+        nextExpect(START_SCALAR);
+        expectMarker(9, 10);
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -179,18 +193,16 @@ public void nestedContainers() {
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 10
         );
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
-        assertEquals(START_SCALAR, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
-        assertEquals(START_SCALAR, cursor.nextValue());
-        Marker marker = loadScalar(cursor);
-        assertEquals(10, marker.startIndex);
-        assertEquals(11, marker.endIndex);
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, cursor.nextValue());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        stepOut();
+        nextExpect(START_SCALAR);
+        expectMarker(10, 11);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -204,22 +216,18 @@ public void fillContainerAtDepth0() {
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 10
         );
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(VALUE_READY, cursor.fillValue());
-        Marker marker = cursor.getValueMarker();
-        assertEquals(5, marker.startIndex);
-        assertEquals(11, marker.endIndex);
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
-        assertEquals(START_SCALAR, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
-        assertEquals(START_SCALAR, cursor.nextValue());
-        marker = loadScalar(cursor);
-        assertEquals(10, marker.startIndex);
-        assertEquals(11, marker.endIndex);
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, cursor.nextValue());
+        nextExpect(START_CONTAINER);
+        fillExpect(VALUE_READY);
+        expectMarker(5, 11);
+        stepIn();
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        stepOut();
+        nextExpect(START_SCALAR);
+        expectMarker(10, 11);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -233,17 +241,15 @@ public void fillContainerAtDepth1() {
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 10
         );
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(VALUE_READY, cursor.fillValue());
-        Marker marker = cursor.getValueMarker();
-        assertEquals(7, marker.startIndex);
-        assertEquals(8, marker.endIndex);
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
-        assertEquals(START_SCALAR, cursor.nextValue());
-        assertEquals(END_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_CONTAINER);
+        fillExpect(VALUE_READY);
+        expectMarker(7, 8);
+        stepIn();
+        nextExpect(START_SCALAR);
+        nextExpect(END_CONTAINER);
+        stepOut();
     }
 
     @Test
@@ -260,17 +266,15 @@ public void fillContainerThenSkip() {
             0x84, // Field SID 4
             0x20 // Int length 0, at byte index 14
         );
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(VALUE_READY, cursor.fillValue());
-        assertEquals(START_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
-        assertEquals(START_SCALAR, cursor.nextValue());
-        assertEquals(VALUE_READY, cursor.fillValue());
-        Marker marker = cursor.getValueMarker();
-        assertEquals(14, marker.startIndex);
-        assertEquals(14, marker.endIndex);
-        assertEquals(END_CONTAINER, cursor.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, cursor.nextValue());
+        nextExpect(START_CONTAINER);
+        fillExpect(VALUE_READY);
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        fillExpect(VALUE_READY);
+        expectMarker(14, 14);
+        nextExpect(END_CONTAINER);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 }
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
index bb267ed605..d9c97adb5b 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
@@ -4,6 +4,7 @@
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonCursor;
 import com.amazon.ion.IvmNotificationConsumer;
 import com.amazon.ion.system.IonReaderBuilder;
 import org.junit.Before;
@@ -66,6 +67,34 @@ private void initializeReader(int... data) {
         );
     }
 
+    private void nextExpect(IonCursor.Event expected) {
+        assertEquals(expected, reader.nextValue());
+    }
+
+    private void fillExpect(IonCursor.Event expected) {
+        assertEquals(expected, reader.fillValue());
+    }
+
+    private void stepIn() {
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+    }
+
+    private void stepOut() {
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+    }
+
+    private void expectField(String name) {
+        assertEquals(name, reader.getFieldName());
+    }
+
+    private void expectInt(int value) {
+        assertEquals(value, reader.intValue());
+    }
+
+    private void expectString(String value) {
+        assertEquals(value, reader.stringValue());
+    }
+
     @Test
     public void basicContainer() {
         initializeReader(
@@ -74,15 +103,15 @@ public void basicContainer() {
             0x84, // Field SID 4 ("name")
             0x21, 0x01 // Int 1
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals("name", reader.getFieldName());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals(1, reader.intValue());
-        assertEquals(END_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        expectField("name");
+        fillExpect(VALUE_READY);
+        expectInt(1);
+        nextExpect(END_CONTAINER);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -92,13 +121,13 @@ public void basicSystemSymbols() {
             0x71, 0x04, // Symbol value SID 4 ("name")
             0x71, 0x05 // Symbol value SID 5 ("version")
         );
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals("name", reader.stringValue());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals("version", reader.stringValue());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_SCALAR);
+        fillExpect(VALUE_READY);
+        expectString("name");
+        nextExpect(START_SCALAR);
+        fillExpect(VALUE_READY);
+        expectString("version");
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -116,13 +145,13 @@ public void basicLocalSymbols() {
             0x71, 0x0A, // Symbol value SID 10 ("A")
             0x71, 0x0B // Symbol value SID 11 ("B")
         );
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals("A", reader.stringValue());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals("B", reader.stringValue());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_SCALAR);
+        fillExpect(VALUE_READY);
+        expectString("A");
+        nextExpect(START_SCALAR);
+        fillExpect(VALUE_READY);
+        expectString("B");
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -133,13 +162,13 @@ public void basicNoFill() {
             0x84, // Field SID 4 ("name")
             0x21, 0x01 // Int 1
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals("name", reader.getFieldName());
-        assertEquals(END_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        expectField("name");
+        nextExpect(END_CONTAINER);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -150,12 +179,12 @@ public void basicStepOutEarly() {
             0x84, // Field SID 4 ("name")
             0x21, 0x01 // Int 1
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        stepOut();
         assertNull(reader.getFieldName());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(NEEDS_DATA);
     }
 
 
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
index 78209422fe..b148a4bf70 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
@@ -4,6 +4,7 @@
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonCursor;
 import com.amazon.ion.IvmNotificationConsumer;
 import org.junit.Before;
 import org.junit.Test;
@@ -62,6 +63,34 @@ private void initializeReader(int... data) {
         );
     }
 
+    private void nextExpect(IonCursor.Event expected) {
+        assertEquals(expected, reader.nextValue());
+    }
+
+    private void fillExpect(IonCursor.Event expected) {
+        assertEquals(expected, reader.fillValue());
+    }
+
+    private void stepIn() {
+        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
+    }
+
+    private void stepOut() {
+        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+    }
+
+    private void expectField(int sid) {
+        assertEquals(sid, reader.getFieldId());
+    }
+
+    private void expectInt(int value) {
+        assertEquals(value, reader.intValue());
+    }
+
+    private void expectString(String value) {
+        assertEquals(value, reader.stringValue());
+    }
+
     @Test
     public void basicContainer() {
         initializeReader(
@@ -70,15 +99,15 @@ public void basicContainer() {
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(4, reader.getFieldId());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals(1, reader.intValue());
-        assertEquals(END_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        expectField(4);
+        fillExpect(VALUE_READY);
+        expectInt(1);
+        nextExpect(END_CONTAINER);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -88,13 +117,13 @@ public void basicStrings() {
             0x83, 'f', 'o', 'o', // String length 3
             0x83, 'b', 'a', 'r' // String length 3
         );
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals("foo", reader.stringValue());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals("bar", reader.stringValue());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_SCALAR);
+        fillExpect(VALUE_READY);
+        expectString("foo");
+        nextExpect(START_SCALAR);
+        fillExpect(VALUE_READY);
+        expectString("bar");
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -105,13 +134,13 @@ public void basicNoFill() {
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(4, reader.getFieldId());
-        assertEquals(END_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        expectField(4);
+        nextExpect(END_CONTAINER);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -122,12 +151,12 @@ public void basicStepOutEarly() {
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
-        assertEquals(-1, reader.getFieldId());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        stepOut();
+        expectField(-1);
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -138,8 +167,8 @@ public void basicTopLevelSkip() {
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_CONTAINER);
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -151,11 +180,11 @@ public void basicTopLevelSkipThenConsume() {
             0x21, 0x01, // Int 1
             0x21, 0x03 // Int 3
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals(3, reader.intValue());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_CONTAINER);
+        nextExpect(START_SCALAR);
+        fillExpect(VALUE_READY);
+        expectInt(3);
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -169,17 +198,17 @@ public void nestedContainers() {
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals(1, reader.intValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        stepOut();
+        nextExpect(START_SCALAR);
+        fillExpect(VALUE_READY);
+        expectInt(1);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -193,18 +222,18 @@ public void fillContainerAtDepth0() {
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals(1, reader.intValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_CONTAINER);
+        fillExpect(VALUE_READY);
+        stepIn();
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        stepOut();
+        nextExpect(START_SCALAR);
+        fillExpect(VALUE_READY);
+        expectInt(1);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 
     @Test
@@ -218,14 +247,14 @@ public void fillContainerAtDepth1() {
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(END_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_CONTAINER);
+        fillExpect(VALUE_READY);
+        stepIn();
+        nextExpect(START_SCALAR);
+        nextExpect(END_CONTAINER);
+        stepOut();
     }
 
     @Test
@@ -242,15 +271,15 @@ public void fillContainerThenSkip() {
             0x84, // Field SID 4
             0x20 // Int 0
         );
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals(START_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-        assertEquals(START_SCALAR, reader.nextValue());
-        assertEquals(VALUE_READY, reader.fillValue());
-        assertEquals(0, reader.intValue());
-        assertEquals(END_CONTAINER, reader.nextValue());
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
-        assertEquals(NEEDS_DATA, reader.nextValue());
+        nextExpect(START_CONTAINER);
+        fillExpect(VALUE_READY);
+        nextExpect(START_CONTAINER);
+        stepIn();
+        nextExpect(START_SCALAR);
+        fillExpect(VALUE_READY);
+        expectInt(0);
+        nextExpect(END_CONTAINER);
+        stepOut();
+        nextExpect(NEEDS_DATA);
     }
 }
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 1a33fb15b9..d1ce02f9b8 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -32,7 +32,6 @@
 import com.amazon.ion.system.SimpleCatalog;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -89,6 +88,8 @@ public static Object[] parameters() {
     private AtomicInteger oversizedCounter;
     // The total number of bytes in the input, to be compared against the total bytes consumed by the reader.
     private long totalBytesInStream;
+    // The reader under test.
+    private IonReader reader;
 
     /**
      * Unified handler interface to reduce boilerplate when defining test handlers.
@@ -177,6 +178,7 @@ public void setup() {
             .withIncrementalReadingEnabled(true)
             .withBufferConfiguration(standardBufferConfiguration);
         writerBuilder = IonBinaryWriterBuilder.standard();
+        reader = null;
     }
 
     private void assertBytesConsumed() {
@@ -303,103 +305,136 @@ private IonReader readerFor(InputStream input) {
         return new IonReaderContinuableTopLevelBinary(readerBuilder, input, null, 0, 0);
     }
 
-    @Test
-    public void skipContainers() throws Exception {
-        IonReader reader = readerFor(
-            "[123] 456 {abc: foo::bar::123, def: baz::456} [123] 789 [foo::bar::123, baz::456] [123]"
-        );
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals(IonType.LIST, reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(IonType.STRUCT, reader.next());
-        assertEquals(IonType.STRUCT, reader.getType());
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals(IonType.LIST, reader.getType());
+    private void nextExpect(IonType type) {
+        assertEquals(type, reader.next());
+    }
+
+    private void typeExpect(IonType type) {
+        assertEquals(type, reader.getType());
+    }
+
+    private void stepIn() {
         reader.stepIn();
-        assertNull(reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(123, reader.intValue());
+    }
+
+    private void stepOut() {
         reader.stepOut();
-        assertNull(reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(789, reader.intValue());
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals(IonType.LIST, reader.getType());
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals(IonType.LIST, reader.getType());
-        assertNull(reader.next());
-        assertNull(reader.getType());
+    }
+
+    private void expectAnnotations(String... annotations) {
+        assertEquals(Arrays.asList(annotations), Arrays.asList(reader.getTypeAnnotations()));
+    }
+
+    private void expectField(String name) {
+        assertEquals(name, reader.getFieldName());
+    }
+
+    private void expectInt(int value) {
+        assertEquals(value, reader.intValue());
+    }
+
+    private void expectString(String value) {
+        assertEquals(value, reader.stringValue());
+    }
+
+    private void closeAndCount() throws IOException {
         reader.close();
         assertBytesConsumed();
     }
 
+    @Test
+    public void skipContainers() throws Exception {
+        reader = readerFor(
+            "[123] 456 {abc: foo::bar::123, def: baz::456} [123] 789 [foo::bar::123, baz::456] [123]"
+        );
+        nextExpect(IonType.LIST);
+        typeExpect(IonType.LIST);
+        nextExpect(IonType.INT);
+        typeExpect(IonType.INT);
+        nextExpect(IonType.STRUCT);
+        typeExpect(IonType.STRUCT);
+        nextExpect(IonType.LIST);
+        typeExpect(IonType.LIST);
+        stepIn();
+        typeExpect(null);
+        nextExpect(IonType.INT);
+        typeExpect(IonType.INT);
+        expectInt(123);
+        stepOut();
+        typeExpect(null);
+        nextExpect(IonType.INT);
+        typeExpect(IonType.INT);
+        expectInt(789);
+        nextExpect(IonType.LIST);
+        typeExpect(IonType.LIST);
+        nextExpect(IonType.LIST);
+        typeExpect(IonType.LIST);
+        nextExpect(null);
+        typeExpect(null);
+        closeAndCount();
+    }
+
     @Test
     public void skipContainerAfterSteppingIn() throws Exception {
-        IonReader reader = readerFor("{abc: foo::bar::123, def: baz::456} 789");
-        assertEquals(IonType.STRUCT, reader.next());
-        assertEquals(IonType.STRUCT, reader.getType());
-        reader.stepIn();
-        assertNull(reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals(123, reader.intValue());
-        assertEquals(IonType.INT, reader.getType());
+        reader = readerFor("{abc: foo::bar::123, def: baz::456} 789");
+        nextExpect(IonType.STRUCT);
+        typeExpect(IonType.STRUCT);
+        stepIn();
+        typeExpect(null);
+        nextExpect(IonType.INT);
+        typeExpect(IonType.INT);
+        expectAnnotations("foo", "bar");
+        expectInt(123);
+        typeExpect(IonType.INT);
         // Step out before completing the value.
-        reader.stepOut();
-        assertNull(reader.getType());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(IonType.INT, reader.getType());
-        assertEquals(789, reader.intValue());
-        assertNull(reader.next());
-        assertNull(reader.getType());
-        reader.close();
-        assertBytesConsumed();
+        stepOut();
+        typeExpect(null);
+        nextExpect(IonType.INT);
+        typeExpect(IonType.INT);
+        expectInt(789);
+        nextExpect(null);
+        typeExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void skipValueInContainer() throws Exception {
-        IonReader reader = readerFor("{foo: \"bar\", abc: 123, baz: a}");
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals("abc", reader.getFieldName());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("baz", reader.getFieldName());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = readerFor("{foo: \"bar\", abc: 123, baz: a}");
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.STRING);
+        nextExpect(IonType.INT);
+        expectField("abc");
+        nextExpect(IonType.SYMBOL);
+        expectField("baz");
+        nextExpect(null);
+        stepOut();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void symbolsAsStrings() throws Exception {
-        IonReader reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("bar", reader.getFieldName());
-        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("def", reader.stringValue());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.SYMBOL);
+        expectField("foo");
+        expectAnnotations("uvw");
+        expectString("abc");
+        nextExpect(IonType.SYMBOL);
+        expectField("bar");
+        expectAnnotations("qrs", "xyz");
+        expectString("def");
+        stepOut();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void lstAppend() throws Exception {
         writerBuilder = writerBuilder.withLocalSymbolTableAppendEnabled();
-        IonReader reader = readerFor(writer -> {
+        reader = readerFor(writer -> {
             writer.stepIn(IonType.STRUCT);
             writer.setFieldName("foo");
             writer.addTypeAnnotation("uvw");
@@ -412,32 +447,31 @@ public void lstAppend() throws Exception {
             writer.writeSymbol("orange");
         });
 
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("bar", reader.getFieldName());
-        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("def", reader.stringValue());
-        reader.stepOut();
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.SYMBOL);
+        expectField("foo");
+        expectAnnotations("uvw");
+        expectString("abc");
+        nextExpect(IonType.SYMBOL);
+        expectField("bar");
+        expectAnnotations("qrs", "xyz");
+        expectString("def");
+        stepOut();
         SymbolTable preAppend = reader.getSymbolTable();
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.SYMBOL);
         SymbolTable postAppend = reader.getSymbolTable();
-        assertEquals("orange", reader.stringValue());
+        expectString("orange");
         assertNull(preAppend.find("orange"));
         assertNotNull(postAppend.find("orange"));
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void lstNonAppend() throws Exception {
         writerBuilder = writerBuilder.withLocalSymbolTableAppendDisabled();
-        IonReader reader = readerFor(writer -> {
+        reader = readerFor(writer -> {
             writer.stepIn(IonType.STRUCT);
             writer.setFieldName("foo");
             writer.addTypeAnnotation("uvw");
@@ -456,28 +490,27 @@ public void lstNonAppend() throws Exception {
             writer.writeSymbol("orange");
         });
 
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("bar", reader.getFieldName());
-        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("def", reader.stringValue());
-        reader.stepOut();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("orange", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.SYMBOL);
+        expectField("foo");
+        expectAnnotations("uvw");
+        expectString("abc");
+        nextExpect(IonType.SYMBOL);
+        expectField("bar");
+        expectAnnotations("qrs", "xyz");
+        expectString("def");
+        stepOut();
+        nextExpect(IonType.SYMBOL);
+        expectString("orange");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void ivmBetweenValues() throws Exception {
         writerBuilder = writerBuilder.withLocalSymbolTableAppendDisabled();
-        IonReader reader = readerFor(writer -> {
+        reader = readerFor(writer -> {
             writer.stepIn(IonType.STRUCT);
             writer.setFieldName("foo");
             writer.addTypeAnnotation("uvw");
@@ -490,43 +523,40 @@ public void ivmBetweenValues() throws Exception {
             writer.writeSymbol("orange");
         });
 
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals(Collections.singletonList("uvw"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("bar", reader.getFieldName());
-        assertEquals(Arrays.asList("qrs", "xyz"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("def", reader.stringValue());
-        reader.stepOut();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("orange", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.SYMBOL);
+        expectField("foo");
+        expectAnnotations("uvw");
+        expectString("abc");
+        nextExpect(IonType.SYMBOL);
+        expectField("bar");
+        expectAnnotations("qrs", "xyz");
+        expectString("def");
+        stepOut();
+        nextExpect(IonType.SYMBOL);
+        expectString("orange");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void ivmOnly() throws Exception {
-        IonReader reader = readerFor();
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = readerFor();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void twoIvmsOnly() throws Exception {
-        IonReader reader = readerFor(0xE0, 0x01, 0x00, 0xEA);
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = readerFor(0xE0, 0x01, 0x00, 0xEA);
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void multipleSymbolTablesBetweenValues() throws Exception {
-        IonReader reader = readerFor(writer -> {
+        reader = readerFor(writer -> {
             writer.setTypeAnnotations("$ion_symbol_table");
             writer.stepIn(IonType.STRUCT);
             writer.setFieldName("symbols");
@@ -562,20 +592,19 @@ public void multipleSymbolTablesBetweenValues() throws Exception {
             writer.writeSymbol("purple");
         });
 
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("purple", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.SYMBOL);
+        expectString("abc");
+        nextExpect(IonType.SYMBOL);
+        expectString("def");
+        nextExpect(IonType.SYMBOL);
+        expectString("purple");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void multipleIvmsBetweenValues() throws Exception  {
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             writer.setTypeAnnotationSymbols(3);
             writer.stepIn(IonType.STRUCT);
             writer.setFieldNameSymbol(7);
@@ -599,20 +628,19 @@ public void multipleIvmsBetweenValues() throws Exception  {
             writer.writeSymbolToken(4);
         });
 
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("name", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.SYMBOL);
+        expectString("def");
+        nextExpect(IonType.SYMBOL);
+        expectString("name");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void invalidVersion() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         out.write(bytes(0xE0, 0x01, 0x74, 0xEA, 0x20));
-        IonReader reader = readerFor(readerBuilder, out.toByteArray());
+        reader = readerFor(readerBuilder, out.toByteArray());
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -622,7 +650,7 @@ public void invalidVersion() throws Exception {
     public void invalidVersionMarker() throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         out.write(bytes(0xE0, 0x01, 0x00, 0xEB, 0x20));
-        IonReader reader = readerFor(readerBuilder, out.toByteArray());
+        reader = readerFor(readerBuilder, out.toByteArray());
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -637,7 +665,7 @@ public void invalidVersionMarker() throws Exception {
      */
     private void feedBytesOneByOne(byte[] bytes, ResizingPipedInputStream pipe, IonReader reader) {
         for (byte b : bytes) {
-            assertNull(reader.next());
+            nextExpect(null);
             pipe.receive(b);
         }
     }
@@ -645,48 +673,46 @@ private void feedBytesOneByOne(byte[] bytes, ResizingPipedInputStream pipe, IonR
     @Test
     public void incrementalValue() throws Exception {
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-        IonReader reader = readerFor(pipe);
+        reader = readerFor(pipe);
         byte[] bytes = toBinary("\"StringValueLong\"");
         totalBytesInStream = bytes.length;
         feedBytesOneByOne(bytes, pipe, reader);
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("StringValueLong", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.STRING);
+        expectString("StringValueLong");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void incrementalMultipleValues() throws Exception {
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-        IonReader reader = readerFor(pipe);
+        reader = readerFor(pipe);
         byte[] bytes = toBinary("value_type::\"StringValueLong\"");
         totalBytesInStream = bytes.length;
         feedBytesOneByOne(bytes, pipe, reader);
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("StringValueLong", reader.stringValue());
-        assertEquals(Collections.singletonList("value_type"), Arrays.asList(reader.getTypeAnnotations()));
-        assertNull(reader.next());
+        nextExpect(IonType.STRING);
+        expectString("StringValueLong");
+        expectAnnotations("value_type");
+        nextExpect(null);
         assertBytesConsumed();
         bytes = toBinary("{foobar: \"StringValueLong\"}");
         totalBytesInStream += bytes.length;
         feedBytesOneByOne(bytes, pipe, reader);
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("foobar", reader.getFieldName());
-        assertEquals("StringValueLong", reader.stringValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.STRING);
+        expectField("foobar");
+        expectString("StringValueLong");
+        nextExpect(null);
+        stepOut();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void incrementalMultipleValuesLoadFromReader() throws Exception {
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-        final IonReader reader = readerFor(pipe);
+        reader = readerFor(pipe);
         final IonLoader loader = SYSTEM.getLoader();
         byte[] bytes = toBinary("value_type::\"StringValueLong\"");
         totalBytesInStream = bytes.length;
@@ -715,8 +741,7 @@ public void incrementalMultipleValuesLoadFromReader() throws Exception {
         assertEquals("StringValueLong", string.stringValue());
         IonDatagram empty = loader.load(reader);
         assertTrue(empty.isEmpty());
-        reader.close();
-        assertBytesConsumed();
+        closeAndCount();
     }
 
     @Test
@@ -785,8 +810,8 @@ public void incrementalReadInitiallyEmptyStreamThatTurnsOutToBeText() {
         // Note: if incremental text read support is added, this test will start failing, which is expected. For now,
         // we ensure that this fails quickly.
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(1);
-        IonReader reader = readerBuilder.build(pipe);
-        assertNull(reader.next());
+        reader = readerBuilder.build(pipe);
+        nextExpect(null);
         // Valid text Ion. Also hex 0x20, which is binary int 0. However, it is not preceded by the IVM, so it must be
         // interpreted as text. The binary reader must fail.
         pipe.receive(' ');
@@ -838,38 +863,37 @@ public void incrementalSymbolTables() throws Exception {
             false
         );
 
-        IonReader reader = readerFor(pipe);
+        reader = readerFor(pipe);
         feedBytesOneByOne(firstValue, pipe, reader);
         totalBytesInStream = firstValue.length;
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals(Collections.singletonList("def"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.getFieldName());
-        assertEquals("foo", reader.stringValue());
-        assertNull(reader.next());
-        reader.stepOut();
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.STRING);
+        expectAnnotations("def");
+        expectField("abcdefghijklmnopqrstuvwxyz");
+        expectString("foo");
+        nextExpect(null);
+        stepOut();
         assertBytesConsumed();
         feedBytesOneByOne(secondValue, pipe, reader);
         totalBytesInStream += secondValue.length;
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("fairlyLongString", reader.stringValue());
-        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.getFieldName());
-        assertEquals(Arrays.asList("foo", "bar"), Arrays.asList(reader.getTypeAnnotations()));
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.STRING);
+        expectString("fairlyLongString");
+        expectField("abcdefghijklmnopqrstuvwxyz");
+        expectAnnotations("foo", "bar");
+        nextExpect(null);
+        stepOut();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void lobsNewBytes() throws Exception {
         final byte[] blobBytes = "abcdef".getBytes(StandardCharsets.UTF_8);
         final byte[] clobBytes = "ghijklmnopqrstuv".getBytes(StandardCharsets.UTF_8);
-        IonReader reader = readerFor(writer -> {
+        reader = readerFor(writer -> {
             writer.writeBlob(blobBytes);
             writer.writeClob(clobBytes);
             writer.setTypeAnnotations("foo");
@@ -880,30 +904,29 @@ public void lobsNewBytes() throws Exception {
             writer.stepOut();
         });
 
-        assertEquals(IonType.BLOB, reader.next());
+        nextExpect(IonType.BLOB);
         assertArrayEquals(blobBytes, reader.newBytes());
-        assertEquals(IonType.CLOB, reader.next());
+        nextExpect(IonType.CLOB);
         assertArrayEquals(clobBytes, reader.newBytes());
-        assertEquals(IonType.BLOB, reader.next());
-        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
+        nextExpect(IonType.BLOB);
+        expectAnnotations("foo");
         assertArrayEquals(blobBytes, reader.newBytes());
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.CLOB, reader.next());
-        assertEquals("bar", reader.getFieldName());
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.CLOB);
+        expectField("bar");
         assertArrayEquals(clobBytes, reader.newBytes());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(null);
+        stepOut();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void lobsGetBytes() throws Exception {
         final byte[] blobBytes = "abcdef".getBytes(StandardCharsets.UTF_8);
         final byte[] clobBytes = "ghijklmnopqrstuv".getBytes(StandardCharsets.UTF_8);
-        IonReader reader = readerFor(writer -> {
+        reader = readerFor(writer -> {
             writer.writeBlob(blobBytes);
             writer.writeClob(clobBytes);
             writer.setTypeAnnotations("foo");
@@ -914,36 +937,35 @@ public void lobsGetBytes() throws Exception {
             writer.stepOut();
         });
 
-        assertEquals(IonType.BLOB, reader.next());
+        nextExpect(IonType.BLOB);
         byte[] fullBlob = new byte[blobBytes.length];
         assertEquals(fullBlob.length, reader.getBytes(fullBlob, 0, fullBlob.length));
         assertArrayEquals(blobBytes, fullBlob);
-        assertEquals(IonType.CLOB, reader.next());
+        nextExpect(IonType.CLOB);
         byte[] partialClob = new byte[clobBytes.length];
         assertEquals(3, reader.getBytes(partialClob, 0, 3));
         assertEquals(clobBytes.length - 3, reader.getBytes(partialClob, 3, clobBytes.length - 3));
         assertArrayEquals(clobBytes, partialClob);
         Arrays.fill(fullBlob, (byte) 0);
-        assertEquals(IonType.BLOB, reader.next());
+        nextExpect(IonType.BLOB);
         assertEquals(fullBlob.length, reader.getBytes(fullBlob, 0, 100000));
-        assertEquals(Collections.singletonList("foo"), Arrays.asList(reader.getTypeAnnotations()));
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
+        expectAnnotations("foo");
+        nextExpect(IonType.STRUCT);
+        stepIn();
         Arrays.fill(partialClob, (byte) 0);
-        assertEquals(IonType.CLOB, reader.next());
+        nextExpect(IonType.CLOB);
         assertEquals(5, reader.getBytes(partialClob, 0, 5));
         assertEquals(clobBytes.length - 5, reader.getBytes(partialClob, 5, 100000));
         assertArrayEquals(clobBytes, partialClob);
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(null);
+        stepOut();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void nopPad() throws Exception {
-        IonReader reader = readerFor(
+        reader = readerFor(
             // One byte no-op pad.
             0x00,
             // Two byte no-op pad.
@@ -982,27 +1004,26 @@ public void nopPad() throws Exception {
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         );
 
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(-1, reader.intValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertNull(reader.next());
-        reader.stepOut();
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.INT);
+        expectInt(0);
+        nextExpect(IonType.INT);
+        expectInt(1);
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.INT);
+        expectInt(-1);
+        nextExpect(null);
+        stepOut();
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(null);
+        stepOut();
+        nextExpect(IonType.LIST);
+        stepIn();
+        nextExpect(null);
+        stepOut();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -1012,7 +1033,7 @@ public void symbolTableWithImportsThenSymbols() throws Exception {
         readerBuilder = readerBuilder.withCatalog(catalog);
         writerBuilder = writerBuilder.withCatalog(catalog);
 
-        IonReader reader = readerFor(writer -> {
+        reader = readerFor(writer -> {
             writer.setTypeAnnotations("$ion_symbol_table");
             writer.stepIn(IonType.STRUCT);
             writer.setFieldName("imports");
@@ -1036,15 +1057,14 @@ public void symbolTableWithImportsThenSymbols() throws Exception {
             writer.writeSymbol("ghi");
         });
 
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("ghi", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.SYMBOL);
+        expectString("abc");
+        nextExpect(IonType.SYMBOL);
+        expectString("def");
+        nextExpect(IonType.SYMBOL);
+        expectString("ghi");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -1053,7 +1073,7 @@ public void symbolTableWithSymbolsThenImports() throws Exception {
         catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
         readerBuilder = readerBuilder.withCatalog(catalog);
 
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
             writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
             writer.stepIn(IonType.STRUCT);
@@ -1078,15 +1098,14 @@ public void symbolTableWithSymbolsThenImports() throws Exception {
             writer.writeSymbolToken(12);
         });
 
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("ghi", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.SYMBOL);
+        expectString("abc");
+        nextExpect(IonType.SYMBOL);
+        expectString("def");
+        nextExpect(IonType.SYMBOL);
+        expectString("ghi");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -1095,7 +1114,7 @@ public void symbolTableWithManySymbolsThenImports() throws Exception {
         catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
         readerBuilder = readerBuilder.withCatalog(catalog);
 
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
             writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
             writer.stepIn(IonType.STRUCT);
@@ -1126,21 +1145,20 @@ public void symbolTableWithManySymbolsThenImports() throws Exception {
             writer.writeSymbolToken(15);
         });
 
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("ghi", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("jkl", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("mno", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("pqr", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.SYMBOL);
+        expectString("abc");
+        nextExpect(IonType.SYMBOL);
+        expectString("def");
+        nextExpect(IonType.SYMBOL);
+        expectString("ghi");
+        nextExpect(IonType.SYMBOL);
+        expectString("jkl");
+        nextExpect(IonType.SYMBOL);
+        expectString("mno");
+        nextExpect(IonType.SYMBOL);
+        expectString("pqr");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -1150,7 +1168,7 @@ public void multipleSymbolTablesWithSymbolsThenImports() throws Exception {
         catalog.putTable(SYSTEM.newSharedSymbolTable("bar", 1, Collections.singletonList("baz").iterator()));
         readerBuilder = readerBuilder.withCatalog(catalog);
 
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
             writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
             writer.stepIn(IonType.STRUCT);
@@ -1199,29 +1217,28 @@ public void multipleSymbolTablesWithSymbolsThenImports() throws Exception {
             writer.writeSymbolToken(13);
         });
 
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
+        nextExpect(IonType.SYMBOL);
+        expectString("abc");
         SymbolTable[] imports = reader.getSymbolTable().getImportedTables();
         assertEquals(1, imports.length);
         assertEquals("foo", imports[0].getName());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("ghi", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("baz", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.SYMBOL);
+        expectString("def");
+        nextExpect(IonType.SYMBOL);
+        expectString("ghi");
+        nextExpect(IonType.SYMBOL);
+        expectString("baz");
+        nextExpect(IonType.SYMBOL);
         imports = reader.getSymbolTable().getImportedTables();
         assertEquals(1, imports.length);
         assertEquals("bar", imports[0].getName());
-        assertEquals("xyz", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("uvw", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("rst", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        expectString("xyz");
+        nextExpect(IonType.SYMBOL);
+        expectString("uvw");
+        nextExpect(IonType.SYMBOL);
+        expectString("rst");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -1230,7 +1247,7 @@ public void ivmResetsImports() throws Exception {
         catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
         readerBuilder = readerBuilder.withCatalog(catalog);
 
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
             writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
             writer.stepIn(IonType.STRUCT);
@@ -1258,21 +1275,20 @@ public void ivmResetsImports() throws Exception {
             out.write(0x20);
         });
 
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
+        nextExpect(IonType.SYMBOL);
+        expectString("abc");
         SymbolTable[] imports = reader.getSymbolTable().getImportedTables();
         assertEquals(1, imports.length);
         assertEquals("foo", imports[0].getName());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("ghi", reader.stringValue());
-        assertEquals(IonType.INT, reader.next());
+        nextExpect(IonType.SYMBOL);
+        expectString("def");
+        nextExpect(IonType.SYMBOL);
+        expectString("ghi");
+        nextExpect(IonType.INT);
         assertTrue(reader.getSymbolTable().isSystemTable());
-        assertEquals(0, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        expectInt(0);
+        nextExpect(null);
+        closeAndCount();
     }
 
     private static void assertSymbolEquals(
@@ -1287,31 +1303,30 @@ private static void assertSymbolEquals(
 
     @Test
     public void symbolsAsTokens() throws Exception {
-        IonReader reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
+        reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.SYMBOL);
         assertSymbolEquals("foo", null, reader.getFieldNameSymbol());
         SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
         assertEquals(1, annotations.length);
         assertSymbolEquals("uvw", null, annotations[0]);
         assertSymbolEquals("abc", null, reader.symbolValue());
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.SYMBOL);
         assertSymbolEquals("bar", null, reader.getFieldNameSymbol());
         annotations = reader.getTypeAnnotationSymbols();
         assertEquals(2, annotations.length);
         assertSymbolEquals("qrs", null, annotations[0]);
         assertSymbolEquals("xyz", null, annotations[1]);
         assertSymbolEquals("def", null, reader.symbolValue());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        stepOut();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void intNegativeZeroFails() throws Exception {
-        IonReader reader = readerFor(0x31, 0x00);
+        reader = readerFor(0x31, 0x00);
         reader.next();
         thrown.expect(IonException.class);
         reader.longValue();
@@ -1320,7 +1335,7 @@ public void intNegativeZeroFails() throws Exception {
 
     @Test
     public void bigIntNegativeZeroFails() throws Exception {
-        IonReader reader = readerFor(0x31, 0x00);
+        reader = readerFor(0x31, 0x00);
         reader.next();
         thrown.expect(IonException.class);
         reader.bigIntegerValue();
@@ -1329,9 +1344,9 @@ public void bigIntNegativeZeroFails() throws Exception {
 
     @Test
     public void listWithLengthTooShortFails() throws Exception {
-        IonReader reader = readerFor(0xB1, 0x21, 0x01);
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
+        reader = readerFor(0xB1, 0x21, 0x01);
+        nextExpect(IonType.LIST);
+        stepIn();
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -1339,9 +1354,9 @@ public void listWithLengthTooShortFails() throws Exception {
 
     @Test
     public void listWithContainerValueLengthTooShortFails() throws Exception {
-        IonReader reader = readerFor(0xB2, 0xB2, 0x21, 0x01);
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
+        reader = readerFor(0xB2, 0xB2, 0x21, 0x01);
+        nextExpect(IonType.LIST);
+        stepIn();
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -1349,9 +1364,9 @@ public void listWithContainerValueLengthTooShortFails() throws Exception {
 
     @Test
     public void listWithVariableLengthTooShortFails() throws Exception {
-        IonReader reader = readerFor(0xBE, 0x81, 0x21, 0x01);
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
+        reader = readerFor(0xBE, 0x81, 0x21, 0x01);
+        nextExpect(IonType.LIST);
+        stepIn();
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -1359,34 +1374,33 @@ public void listWithVariableLengthTooShortFails() throws Exception {
 
     @Test(expected = IonException.class)
     public void noOpPadTooShort1() throws Exception {
-        IonReader reader = readerFor(0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01);
-        assertEquals(IonType.INT, reader.next());
-        assertNull(reader.next());
+        reader = readerFor(0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01);
+        nextExpect(IonType.INT);
+        nextExpect(null);
         reader.close();
     }
 
     @Test(expected = IonException.class)
     public void noOpPadTooShort2() throws Exception {
-        IonReader reader = readerFor(
+        reader = readerFor(
             0x0e, 0x90, 0x00, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         );
-        assertNull(reader.next());
+        nextExpect(null);
         reader.close();
     }
 
     @Test
     public void nopPadOneByte() throws Exception {
-        IonReader reader = readerFor(0);
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = readerFor(0);
+        nextExpect(null);
+        closeAndCount();
         reader.close();
     }
 
     @Test
     public void localSidOutOfRangeStringValue() throws Exception {
-        IonReader reader = readerFor(0x71, 0x0A); // SID 10
-        assertEquals(IonType.SYMBOL, reader.next());
+        reader = readerFor(0x71, 0x0A); // SID 10
+        nextExpect(IonType.SYMBOL);
         thrown.expect(IonException.class);
         reader.stringValue();
         reader.close();
@@ -1394,8 +1408,8 @@ public void localSidOutOfRangeStringValue() throws Exception {
 
     @Test
     public void localSidOutOfRangeSymbolValue() throws Exception {
-        IonReader reader = readerFor(0x71, 0x0A); // SID 10
-        assertEquals(IonType.SYMBOL, reader.next());
+        reader = readerFor(0x71, 0x0A); // SID 10
+        nextExpect(IonType.SYMBOL);
         thrown.expect(IonException.class);
         reader.symbolValue();
         reader.close();
@@ -1403,14 +1417,14 @@ public void localSidOutOfRangeSymbolValue() throws Exception {
 
     @Test
     public void localSidOutOfRangeFieldName() throws Exception {
-        IonReader reader = readerFor(
+        reader = readerFor(
             0xD2, // Struct, length 2
             0x8A, // SID 10
             0x20 // int 0
         );
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.INT);
         thrown.expect(IonException.class);
         reader.getFieldName();
         reader.close();
@@ -1418,14 +1432,14 @@ public void localSidOutOfRangeFieldName() throws Exception {
 
     @Test
     public void localSidOutOfRangeFieldNameSymbol() throws Exception {
-        IonReader reader = readerFor(
+        reader = readerFor(
             0xD2, // Struct, length 2
             0x8A, // SID 10
             0x20 // int 0
         );
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.INT);
         thrown.expect(IonException.class);
         reader.getFieldNameSymbol();
         reader.close();
@@ -1433,13 +1447,13 @@ public void localSidOutOfRangeFieldNameSymbol() throws Exception {
 
     @Test
     public void localSidOutOfRangeAnnotation() throws Exception {
-        IonReader reader = readerFor(
+        reader = readerFor(
             0xE3, // Annotation wrapper, length 3
             0x81, // annotation SID length 1
             0x8A, // SID 10
             0x20 // int 0
         );
-        assertEquals(IonType.INT, reader.next());
+        nextExpect(IonType.INT);
         thrown.expect(IonException.class);
         reader.getTypeAnnotations();
         reader.close();
@@ -1447,13 +1461,13 @@ public void localSidOutOfRangeAnnotation() throws Exception {
 
     @Test
     public void localSidOutOfRangeAnnotationSymbol() throws Exception {
-        IonReader reader = readerFor(
+        reader = readerFor(
             0xE3, // Annotation wrapper, length 3
             0x81, // annotation SID length 1
             0x8A, // SID 10
             0x20 // int 0
         );
-        assertEquals(IonType.INT, reader.next());
+        nextExpect(IonType.INT);
         thrown.expect(IonException.class);
         reader.getTypeAnnotationSymbols();
         reader.close();
@@ -1461,13 +1475,13 @@ public void localSidOutOfRangeAnnotationSymbol() throws Exception {
 
     @Test
     public void localSidOutOfRangeIterateAnnotations() throws Exception {
-        IonReader reader = readerFor(
+        reader = readerFor(
             0xE3, // Annotation wrapper, length 3
             0x81, // annotation SID length 1
             0x8A, // SID 10
             0x20 // int 0
         );
-        assertEquals(IonType.INT, reader.next());
+        nextExpect(IonType.INT);
         Iterator<String> annotationIterator = reader.iterateTypeAnnotations();
         thrown.expect(IonException.class);
         annotationIterator.next();
@@ -1476,35 +1490,35 @@ public void localSidOutOfRangeIterateAnnotations() throws Exception {
 
     @Test
     public void stepInOnScalarFails() throws Exception {
-        IonReader reader = readerFor(0x20);
-        assertEquals(IonType.INT, reader.next());
+        reader = readerFor(0x20);
+        nextExpect(IonType.INT);
         thrown.expect(IonException.class);
-        reader.stepIn();
+        stepIn();
         reader.close();
     }
 
     @Test
     public void stepInBeforeNextFails() throws Exception {
-        IonReader reader = readerFor(0xD2, 0x84, 0xD0);
+        reader = readerFor(0xD2, 0x84, 0xD0);
         reader.next();
-        reader.stepIn();
+        stepIn();
         thrown.expect(IonException.class);
-        reader.stepIn();
+        stepIn();
         reader.close();
     }
 
     @Test
     public void stepOutAtDepthZeroFails() throws Exception {
-        IonReader reader = readerFor(0x20);
+        reader = readerFor(0x20);
         reader.next();
         thrown.expect(IllegalStateException.class);
-        reader.stepOut();
+        stepOut();
         reader.close();
     }
 
     @Test
     public void byteSizeNotOnLobFails() throws Exception {
-        IonReader reader = readerFor(0x20);
+        reader = readerFor(0x20);
         reader.next();
         thrown.expect(IonException.class);
         reader.byteSize();
@@ -1513,7 +1527,7 @@ public void byteSizeNotOnLobFails() throws Exception {
 
     @Test
     public void doubleValueOnIntFails() throws Exception {
-        IonReader reader = readerFor(0x20);
+        reader = readerFor(0x20);
         reader.next();
         thrown.expect(IllegalStateException.class);
         reader.doubleValue();
@@ -1522,7 +1536,7 @@ public void doubleValueOnIntFails() throws Exception {
 
     @Test
     public void floatWithInvalidLengthFails() throws Exception {
-        IonReader reader = readerFor(0x43, 0x01, 0x02, 0x03);
+        reader = readerFor(0x43, 0x01, 0x02, 0x03);
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -1530,7 +1544,7 @@ public void floatWithInvalidLengthFails() throws Exception {
 
     @Test
     public void invalidTypeIdFFailsAtTopLevel() throws Exception {
-        IonReader reader = readerFor(0xF0);
+        reader = readerFor(0xF0);
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -1538,9 +1552,9 @@ public void invalidTypeIdFFailsAtTopLevel() throws Exception {
 
     @Test
     public void invalidTypeIdFFailsBelowTopLevel() throws Exception {
-        IonReader reader = readerFor(0xB1, 0xF0);
+        reader = readerFor(0xB1, 0xF0);
         reader.next();
-        reader.stepIn();
+        stepIn();
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -1555,17 +1569,16 @@ public void reallyLargeString() throws Exception {
             sb.append('a');
         }
         String string = sb.toString();
-        IonReader reader = readerFor("\"" + string + "\"");
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals(string, reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = readerFor("\"" + string + "\"");
+        nextExpect(IonType.STRING);
+        expectString(string);
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void nopPadInAnnotationWrapperFails() throws Exception {
-        IonReader reader = readerFor(
+        reader = readerFor(
             0xB5, // list
             0xE4, // annotation wrapper
             0x81, // 1 byte of annotations
@@ -1574,7 +1587,7 @@ public void nopPadInAnnotationWrapperFails() throws Exception {
             0x00
         );
         reader.next();
-        reader.stepIn();
+        stepIn();
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -1582,7 +1595,7 @@ public void nopPadInAnnotationWrapperFails() throws Exception {
 
     @Test
     public void nestedAnnotationWrapperFails() throws Exception {
-        IonReader reader = readerFor(
+        reader = readerFor(
             0xB5, // list
             0xE4, // annotation wrapper
             0x81, // 1 byte of annotations
@@ -1593,7 +1606,7 @@ public void nestedAnnotationWrapperFails() throws Exception {
             0x20  // int 0
         );
         reader.next();
-        reader.stepIn();
+        stepIn();
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -1601,7 +1614,7 @@ public void nestedAnnotationWrapperFails() throws Exception {
 
     @Test
     public void annotationWrapperLengthMismatchFails() throws Exception {
-        IonReader reader = readerFor(
+        reader = readerFor(
             0xB5, // list
             0xE4, // annotation wrapper
             0x81, // 1 byte of annotations
@@ -1610,7 +1623,7 @@ public void annotationWrapperLengthMismatchFails() throws Exception {
             0x20  // next value
         );
         reader.next();
-        reader.stepIn();
+        stepIn();
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -1618,7 +1631,7 @@ public void annotationWrapperLengthMismatchFails() throws Exception {
 
     @Test
     public void annotationWrapperVariableLengthMismatchFails() throws Exception {
-        IonReader reader = readerFor(
+        reader = readerFor(
             0xBE, // list
             0x90, // Length 16
             0xEE, // annotation wrapper
@@ -1631,7 +1644,7 @@ public void annotationWrapperVariableLengthMismatchFails() throws Exception {
             0x20 // Another value
         );
         reader.next();
-        reader.stepIn();
+        stepIn();
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -1639,7 +1652,7 @@ public void annotationWrapperVariableLengthMismatchFails() throws Exception {
 
     @Test
     public void multipleSymbolTableImportsFieldsFails() throws Exception {
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
             writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
             writer.stepIn(IonType.STRUCT);
@@ -1680,7 +1693,7 @@ public void multipleSymbolTableImportsFieldsFails() throws Exception {
 
     @Test
     public void multipleSymbolTableSymbolsFieldsFails() throws Exception {
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
             writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
             writer.stepIn(IonType.STRUCT);
@@ -1714,7 +1727,7 @@ public void multipleSymbolTableSymbolsFieldsFails() throws Exception {
 
     @Test
     public void nonStringInSymbolsListCreatesNullSlot() throws Exception {
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
             writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
             writer.stepIn(IonType.STRUCT);
@@ -1730,20 +1743,19 @@ public void nonStringInSymbolsListCreatesNullSlot() throws Exception {
             writer.writeSymbolToken(12);
         });
 
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.SYMBOL);
         SymbolToken symbolValue = reader.symbolValue();
         assertNull(symbolValue.getText());
         assertEquals(0, symbolValue.getSid());
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.SYMBOL);
         symbolValue = reader.symbolValue();
         assertEquals("abc", symbolValue.getText());
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.SYMBOL);
         symbolValue = reader.symbolValue();
         assertNull(symbolValue.getText());
         assertEquals(0, symbolValue.getSid());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -1753,7 +1765,7 @@ public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations() thro
         catalog.putTable(SYSTEM.newSharedSymbolTable("bar", 1, Arrays.asList("123", "456").iterator()));
         readerBuilder = readerBuilder.withCatalog(catalog);
 
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
             writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
             writer.stepIn(IonType.STRUCT);
@@ -1795,22 +1807,22 @@ public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations() thro
             writer.writeSymbolToken(16); // unknown text, import SID 2 (from baz)
         });
 
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.SYMBOL);
+        expectString("abc");
+        nextExpect(IonType.SYMBOL);
+        expectString("def");
+        nextExpect(IonType.SYMBOL);
         SymbolTokenWithImportLocation symbolValue =
             (SymbolTokenWithImportLocation) reader.symbolValue();
         assertNull(symbolValue.getText());
         assertEquals(new ImportLocation("foo", 3), symbolValue.getImportLocation());
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.SYMBOL);
         symbolValue = (SymbolTokenWithImportLocation) reader.symbolValue();
         assertNull(symbolValue.getText());
         assertEquals(new ImportLocation("foo", 4), symbolValue.getImportLocation());
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.SYMBOL);
         assertEquals("123", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.SYMBOL);
         symbolValue = (SymbolTokenWithImportLocation) reader.symbolValue();
         assertEquals(
             new SymbolTokenWithImportLocation(
@@ -1820,7 +1832,7 @@ public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations() thro
             ),
             symbolValue
         );
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.SYMBOL);
         symbolValue = (SymbolTokenWithImportLocation) reader.symbolValue();
         assertEquals(
             new SymbolTokenWithImportLocation(
@@ -1830,14 +1842,13 @@ public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations() thro
             ),
             symbolValue
         );
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void symbolTableSnapshotImplementsBasicMethods() throws Exception {
-        IonReader reader = readerFor("'abc'");
+        reader = readerFor("'abc'");
         reader.next();
         SymbolTable symbolTable = reader.getSymbolTable();
         assertNull(symbolTable.getName());
@@ -1904,17 +1915,16 @@ private IonReader boundedReaderFor(InputStream stream, int initialBufferSize, in
 
     @Test
     public void singleValueExceedsInitialBufferSize() throws Exception {
-        IonReader reader = boundedReaderFor(
+        reader = boundedReaderFor(
             toBinary("\"abcdefghijklmnopqrstuvwxyz\""),
             8,
             Integer.MAX_VALUE,
             byteCountingHandler
         );
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.STRING);
+        expectString("abcdefghijklmnopqrstuvwxyz");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -1939,6 +1949,10 @@ public void maximumBufferSizeWithoutHandlerFails() {
         thrown.expect(IllegalArgumentException.class);
         builder.build();
     }
+    
+    private void expectOversized(int numberOfValues) {
+        assertEquals(numberOfValues, oversizedCounter.get());
+    }
 
     @Test
     public void oversizeValueDetectedDuringScalarFill() throws Exception {
@@ -1949,16 +1963,16 @@ public void oversizeValueDetectedDuringScalarFill() throws Exception {
             "\"def\""
         );
 
-        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 8, 16, byteAndOversizedValueCountingHandler);
+        reader = boundedReaderFor(new ByteArrayInputStream(bytes), 8, 16, byteAndOversizedValueCountingHandler);
 
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("abc", reader.stringValue());
-        assertEquals(1, oversizedCounter.get());
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("def", reader.stringValue());
-        assertNull(reader.next());
+        nextExpect(IonType.STRING);
+        expectString("abc");
+        expectOversized(1);
+        nextExpect(IonType.STRING);
+        expectString("def");
+        nextExpect(null);
         reader.close();
-        assertEquals(2, oversizedCounter.get());
+        expectOversized(2);
         totalBytesInStream = bytes.length;
         assertBytesConsumed();
     }
@@ -1973,7 +1987,7 @@ public void oversizeValueDetectedDuringScalarFillIncremental() throws Exception
         );
 
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
-        IonReader reader = boundedReaderFor(pipe, 8, 16, byteAndOversizedValueCountingHandler);
+        reader = boundedReaderFor(pipe, 8, 16, byteAndOversizedValueCountingHandler);
         int valueCounter = 0;
         for (byte b : bytes) {
             pipe.receive(b);
@@ -1983,20 +1997,20 @@ public void oversizeValueDetectedDuringScalarFillIncremental() throws Exception
                 assertTrue(valueCounter < 3);
                 if (valueCounter == 1) {
                     assertEquals(IonType.STRING, type);
-                    assertEquals("abc", reader.stringValue());
-                    assertEquals(1, oversizedCounter.get());
+                    expectString("abc");
+                    expectOversized(1);
                 } else {
                     assertEquals(2, valueCounter);
                     assertEquals(IonType.STRING, type);
-                    assertEquals("def", reader.stringValue());
-                    assertEquals(2, oversizedCounter.get());
+                    expectString("def");
+                    expectOversized(2);
                 }
             }
         }
         assertEquals(2, valueCounter);
-        assertNull(reader.next());
+        nextExpect(null);
         reader.close();
-        assertEquals(2, oversizedCounter.get());
+        expectOversized(2);
         totalBytesInStream = bytes.length;
         assertBytesConsumed();
     }
@@ -2007,13 +2021,13 @@ public void oversizeValueDetectedDuringFillOfOnlyScalarInStream() throws Excepti
         // this test verifies that excessive size can be detected while reading a value header, which happens
         // byte-by-byte.
         byte[] bytes = toBinary("\"abcdefghijklmnopqrstuvwxyz\""); // Requires a 2-byte header.
-        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+        reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
 
         // The maximum buffer size is 5, which will be exceeded after the IVM (4 bytes), the type ID (1 byte), and
         // the length byte (1 byte).
-        assertNull(reader.next());
+        nextExpect(null);
         reader.close();
-        assertEquals(1, oversizedCounter.get());
+        expectOversized(1);
         totalBytesInStream = bytes.length;
         assertBytesConsumed();
     }
@@ -2023,13 +2037,13 @@ public void oversizeValueDetectedDuringFillOfOnlyScalarInStreamIncremental() thr
         byte[] bytes = toBinary("\"abcdefghijklmnopqrstuvwxyz\""); // Requires a 2-byte header.
 
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
-        IonReader reader = boundedReaderFor(pipe, 5, 5, byteAndOversizedValueCountingHandler);
+        reader = boundedReaderFor(pipe, 5, 5, byteAndOversizedValueCountingHandler);
         feedBytesOneByOne(bytes, pipe, reader);
         // The maximum buffer size is 5, which will be exceeded after the IVM (4 bytes), the type ID (1 byte), and
         // the length byte (1 byte).
-        assertNull(reader.next());
+        nextExpect(null);
         reader.close();
-        assertEquals(1, oversizedCounter.get());
+        expectOversized(1);
         totalBytesInStream = bytes.length;
         assertBytesConsumed();
     }
@@ -2045,15 +2059,15 @@ public void oversizeValueDetectedDuringReadOfTypeIdOfSymbolTableAnnotatedValue()
             0x21, 0x7B, // int 123
             0x81, 'a' // String "a"
         );
-        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);;
+        reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);;
 
         // The maximum buffer size is 5, which will be exceeded after the annotation wrapper type ID
         // (1 byte), the annotations length (1 byte), and the annotation SID 3 (3 bytes). The next byte is the wrapped
         // value type ID byte.
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("a", reader.stringValue());
-        assertEquals(1, oversizedCounter.get());
-        assertNull(reader.next());
+        nextExpect(IonType.STRING);
+        expectString("a");
+        expectOversized(1);
+        nextExpect(null);
         reader.close();
         totalBytesInStream = bytes.length;
         assertBytesConsumed();
@@ -2076,15 +2090,15 @@ public void oversizeValueDetectedDuringReadOfTypeIdOfSymbolTableAnnotatedValueIn
         );
 
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
-        IonReader reader = boundedReaderFor(pipe, 5, 5, byteAndOversizedSymbolTableCountingHandler);
+        reader = boundedReaderFor(pipe, 5, 5, byteAndOversizedSymbolTableCountingHandler);
 
         // The maximum buffer size is 5, which will be exceeded after the annotation wrapper type ID
         // (1 byte), the annotations length (1 byte), and the annotation SID 3 (3 bytes). The next byte is the wrapped
         // value type ID byte.
         feedBytesOneByOne(bytes, pipe, reader);
-        assertEquals(1, oversizedCounter.get());
-        assertNull(reader.next());
-        assertNull(reader.next());
+        expectOversized(1);
+        nextExpect(null);
+        nextExpect(null);
         reader.close();
     }
 
@@ -2101,16 +2115,16 @@ public void valueAfterLargeSymbolTableNotOversized() throws Exception {
         // for symbol 10.
         // The string "12345678" requires 9 bytes, bringing the total to ~49, above the max of 48.
 
-        IonReader reader = boundedReaderFor(new ByteArrayInputStream(out.toByteArray()), 8, 48, byteAndOversizedValueCountingHandler);
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals(0, oversizedCounter.get());
-        assertEquals("12345678", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals(0, oversizedCounter.get());
-        assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
-        assertNull(reader.next());
+        reader = boundedReaderFor(new ByteArrayInputStream(out.toByteArray()), 8, 48, byteAndOversizedValueCountingHandler);
+        nextExpect(IonType.STRING);
+        expectOversized(0);
+        expectString("12345678");
+        nextExpect(IonType.SYMBOL);
+        expectOversized(0);
+        expectString("abcdefghijklmnopqrstuvwxyz");
+        nextExpect(null);
         reader.close();
-        assertEquals(0, oversizedCounter.get());
+        expectOversized(0);
         totalBytesInStream = out.size();
         assertBytesConsumed();
     }
@@ -2129,7 +2143,7 @@ public void valueAfterLargeSymbolTableNotOversizedIncremental() throws Exception
         // The string "12345678" requires 9 bytes, bringing the total to ~49, above the max of 48.
 
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(out.size());
-        IonReader reader = boundedReaderFor(pipe, 8, 48, byteAndOversizedValueCountingHandler);
+        reader = boundedReaderFor(pipe, 8, 48, byteAndOversizedValueCountingHandler);
         byte[] bytes = out.toByteArray();
         int valueCounter = 0;
         for (byte b : bytes) {
@@ -2139,19 +2153,19 @@ public void valueAfterLargeSymbolTableNotOversizedIncremental() throws Exception
                 valueCounter++;
                 if (valueCounter == 1) {
                     assertEquals(IonType.STRING, type);
-                    assertEquals("12345678", reader.stringValue());
-                    assertEquals(0, oversizedCounter.get());
+                    expectString("12345678");
+                    expectOversized(0);
                 } else if (valueCounter == 2) {
                     assertEquals(IonType.SYMBOL, type);
-                    assertEquals("abcdefghijklmnopqrstuvwxyz", reader.stringValue());
-                    assertEquals(0, oversizedCounter.get());
+                    expectString("abcdefghijklmnopqrstuvwxyz");
+                    expectOversized(0);
                 }
             }
         }
         assertEquals(2, valueCounter);
-        assertNull(reader.next());
+        nextExpect(null);
         reader.close();
-        assertEquals(0, oversizedCounter.get());
+        expectOversized(0);
         totalBytesInStream = out.size();
         assertBytesConsumed();
     }
@@ -2216,9 +2230,9 @@ private void oversizedSecondValue(
         } else {
             in = source;
         }
-        IonReader reader = boundedReaderFor(in, maximumBufferSize, maximumBufferSize, byteAndOversizedValueCountingHandler);
+        reader = boundedReaderFor(in, maximumBufferSize, maximumBufferSize, byteAndOversizedValueCountingHandler);
         assertEquals(withSymbolTable ? IonType.SYMBOL : IonType.STRING, ionReaderNext(reader, pipe, source));
-        assertEquals(0, oversizedCounter.get());
+        expectOversized(0);
         assertEquals(firstValue, reader.stringValue());
         if (withThirdValue) {
             assertEquals(IonType.STRING, ionReaderNext(reader, pipe, source));
@@ -2226,7 +2240,7 @@ private void oversizedSecondValue(
         }
         assertNull(ionReaderNext(reader, pipe, source));
         reader.close();
-        assertEquals(1, oversizedCounter.get());
+        expectOversized(1);
         totalBytesInStream = out.size();
         assertBytesConsumed();
     }
@@ -2265,9 +2279,9 @@ private void oversizeSymbolTableDetectedInHeader(int maximumBufferSize) throws E
             0x81, 'a' // String "a"
         );
         oversizedCounter.set(0);
-        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), maximumBufferSize, maximumBufferSize, byteAndOversizedSymbolTableCountingHandler);
-        assertNull(reader.next());
-        assertEquals(1, oversizedCounter.get());
+        reader = boundedReaderFor(new ByteArrayInputStream(bytes), maximumBufferSize, maximumBufferSize, byteAndOversizedSymbolTableCountingHandler);
+        nextExpect(null);
+        expectOversized(1);
         reader.close();
     }
 
@@ -2296,10 +2310,10 @@ private void oversizeSymbolTableDetectedInHeaderIncremental(int maximumBufferSiz
         );
         oversizedCounter.set(0);
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
-        IonReader reader = boundedReaderFor(pipe, maximumBufferSize, maximumBufferSize, byteAndOversizedSymbolTableCountingHandler);
+        reader = boundedReaderFor(pipe, maximumBufferSize, maximumBufferSize, byteAndOversizedSymbolTableCountingHandler);
         feedBytesOneByOne(bytes, pipe, reader);
-        assertNull(reader.next());
-        assertEquals(1, oversizedCounter.get());
+        nextExpect(null);
+        expectOversized(1);
         reader.close();
     }
 
@@ -2327,11 +2341,11 @@ public void oversizeSymbolTableDetectedInTheMiddle() throws Exception {
         writer.close();
         // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
         // for symbol 10.
-        IonReader reader = boundedReaderFor(new ByteArrayInputStream(out.toByteArray()), 8, 25, byteAndOversizedSymbolTableCountingHandler);
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("12345678", reader.stringValue());
-        assertNull(reader.next());
-        assertEquals(1, oversizedCounter.get());
+        reader = boundedReaderFor(new ByteArrayInputStream(out.toByteArray()), 8, 25, byteAndOversizedSymbolTableCountingHandler);
+        nextExpect(IonType.STRING);
+        expectString("12345678");
+        nextExpect(null);
+        expectOversized(1);
         reader.close();
     }
 
@@ -2348,21 +2362,21 @@ public void oversizeSymbolTableDetectedInTheMiddleIncremental() throws Exception
 
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(out.size());
         byte[] bytes = out.toByteArray();
-        IonReader reader = boundedReaderFor(pipe, 8, 25, byteAndOversizedSymbolTableCountingHandler);
+        reader = boundedReaderFor(pipe, 8, 25, byteAndOversizedSymbolTableCountingHandler);
         boolean foundValue = false;
         for (byte b : bytes) {
             IonType type = reader.next();
             if (type != null) {
                 assertFalse(foundValue);
                 assertEquals(IonType.STRING, type);
-                assertEquals("12345678", reader.stringValue());
+                expectString("12345678");
                 foundValue = true;
             }
             pipe.receive(b);
         }
         assertTrue(foundValue);
-        assertNull(reader.next());
-        assertEquals(1, oversizedCounter.get());
+        nextExpect(null);
+        expectOversized(1);
         reader.close();
     }
 
@@ -2370,21 +2384,21 @@ public void oversizeSymbolTableDetectedInTheMiddleIncremental() throws Exception
     public void skipOversizeScalarBelowTopLevelNonIncremental() throws Exception {
         byte[] bytes = toBinary("[\"abcdefg\", 123]");
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
-        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        assertEquals(0, oversizedCounter.get());
+        reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+        nextExpect(IonType.LIST);
+        stepIn();
+        expectOversized(0);
         // This value is oversized, but since it is not filled, `onOversizedValue` does not need to be called.
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals(0, oversizedCounter.get());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, oversizedCounter.get());
-        assertEquals(123, reader.intValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(0, oversizedCounter.get());
+        nextExpect(IonType.STRING);
+        expectOversized(0);
+        nextExpect(IonType.INT);
+        expectOversized(0);
+        expectInt(123);
+        nextExpect(null);
+        stepOut();
+        nextExpect(null);
+        reader.close();
+        expectOversized(0);
         totalBytesInStream = bytes.length;
         assertBytesConsumed();
     }
@@ -2393,11 +2407,11 @@ public void skipOversizeScalarBelowTopLevelNonIncremental() throws Exception {
     public void fillOversizeScalarBelowTopLevelNonIncremental() throws Exception {
         byte[] bytes = toBinary("[\"abcdefg\", 123]");
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
-        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        assertEquals(0, oversizedCounter.get());
-        assertEquals(IonType.STRING, reader.next());
+        reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+        nextExpect(IonType.LIST);
+        stepIn();
+        expectOversized(0);
+        nextExpect(IonType.STRING);
         // This value is oversized. Since the user attempts to consume it, `onOversizedValue` is called. An
         // OversizedValueException is called because the user attempted to force parsing of an oversized scalar
         // via an IonReader method that has no other way of conveying the failure.
@@ -2407,15 +2421,15 @@ public void fillOversizeScalarBelowTopLevelNonIncremental() throws Exception {
         } catch (OversizedValueException e) {
             // Continue
         }
-        assertEquals(1, oversizedCounter.get());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, oversizedCounter.get());
-        assertEquals(123, reader.intValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(1, oversizedCounter.get());
+        expectOversized(1);
+        nextExpect(IonType.INT);
+        expectOversized(1);
+        expectInt(123);
+        nextExpect(null);
+        stepOut();
+        nextExpect(null);
+        reader.close();
+        expectOversized(1);
         totalBytesInStream = bytes.length;
         assertBytesConsumed();
     }
@@ -2430,18 +2444,18 @@ public void oversizedValueBelowTopLevelDetectedInHeaderNonIncremental() throws E
             0x81, 'a' // String "a"
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
-        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
-        assertEquals(IonType.SEXP, reader.next());
-        reader.stepIn();
-        assertEquals(0, oversizedCounter.get());
-        assertNull(reader.next());
-        assertEquals(1, oversizedCounter.get());
-        reader.stepOut();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("a", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(1, oversizedCounter.get());
+        reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+        nextExpect(IonType.SEXP);
+        stepIn();
+        expectOversized(0);
+        nextExpect(null);
+        expectOversized(1);
+        stepOut();
+        nextExpect(IonType.STRING);
+        expectString("a");
+        nextExpect(null);
+        reader.close();
+        expectOversized(1);
         totalBytesInStream = bytes.length;
         assertBytesConsumed();
     }
@@ -2459,18 +2473,18 @@ public void oversizedAnnotatedValueBelowTopLevelDetectedInHeaderNonIncremental()
             0x81, 'a' // String "a"
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
-        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
-        assertEquals(IonType.SEXP, reader.next());
-        reader.stepIn();
-        assertEquals(0, oversizedCounter.get());
-        assertNull(reader.next());
-        assertEquals(1, oversizedCounter.get());
-        reader.stepOut();
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("a", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(1, oversizedCounter.get());
+        reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+        nextExpect(IonType.SEXP);
+        stepIn();
+        expectOversized(0);
+        nextExpect(null);
+        expectOversized(1);
+        stepOut();
+        nextExpect(IonType.STRING);
+        expectString("a");
+        nextExpect(null);
+        reader.close();
+        expectOversized(1);
         totalBytesInStream = bytes.length;
         assertBytesConsumed();
     }
@@ -2489,28 +2503,28 @@ public void deeplyNestedValueNotOversizedDueToContainerHeaderLengthsNonIncrement
             0x20 // int 0
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
-        IonReader reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("12", reader.stringValue());
-        assertEquals(IonType.SEXP, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SEXP, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SEXP, reader.next());
-        reader.stepIn();
-        assertEquals(0, oversizedCounter.get());
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals(0, oversizedCounter.get());
-        assertEquals("1234", reader.stringValue());
-        assertNull(reader.next());
-        reader.stepOut();
-        reader.stepOut();
-        reader.stepOut();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-        assertEquals(0, oversizedCounter.get());
+        reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
+        nextExpect(IonType.STRING);
+        expectString("12");
+        nextExpect(IonType.SEXP);
+        stepIn();
+        nextExpect(IonType.SEXP);
+        stepIn();
+        nextExpect(IonType.SEXP);
+        stepIn();
+        expectOversized(0);
+        nextExpect(IonType.STRING);
+        expectOversized(0);
+        expectString("1234");
+        nextExpect(null);
+        stepOut();
+        stepOut();
+        stepOut();
+        nextExpect(IonType.INT);
+        expectInt(0);
+        nextExpect(null);
+        reader.close();
+        expectOversized(0);
         totalBytesInStream = bytes.length;
         assertBytesConsumed();
     }
@@ -2531,21 +2545,21 @@ private static void writeFirstStruct(IonWriter writer) throws IOException {
         writer.stepOut();
     }
 
-    private static void assertFirstStruct(IonReader reader) {
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals("bar", reader.stringValue());
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals("abc", reader.getFieldName());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(123, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(456, reader.intValue());
-        reader.stepOut();
-        reader.stepOut();
+    private void assertFirstStruct(IonReader reader) {
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.SYMBOL);
+        expectField("foo");
+        expectString("bar");
+        nextExpect(IonType.LIST);
+        expectField("abc");
+        stepIn();
+        nextExpect(IonType.INT);
+        expectInt(123);
+        nextExpect(IonType.INT);
+        expectInt(456);
+        stepOut();
+        stepOut();
     }
 
     private static void writeSecondStruct(IonWriter writer) throws IOException {
@@ -2564,22 +2578,22 @@ private static void writeSecondStruct(IonWriter writer) throws IOException {
         writer.stepOut();
     }
 
-    private static void assertSecondStruct(IonReader reader) {
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("foo", reader.getFieldName());
-        assertEquals("baz", reader.stringValue());
-        assertEquals(IonType.LIST, reader.next());
-        assertEquals("abc", reader.getFieldName());
-        reader.stepIn();
+    private void assertSecondStruct(IonReader reader) {
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.SYMBOL);
+        expectField("foo");
+        expectString("baz");
+        nextExpect(IonType.LIST);
+        expectField("abc");
+        stepIn();
         assertEquals(IonType.DECIMAL, reader.next());
         assertEquals(new BigDecimal("42.0"), reader.decimalValue());
         assertEquals(IonType.FLOAT, reader.next());
         assertEquals(43., reader.doubleValue(), 1e-9);
-        reader.stepOut();
-        reader.stepOut();
-        assertNull(reader.next());
+        stepOut();
+        stepOut();
+        nextExpect(null);
     }
 
     @Test
@@ -2594,11 +2608,10 @@ public void flushBetweenStructs() throws Exception {
         writeSecondStruct(writer);
         writer.close();
 
-        IonReader reader = boundedReaderFor(out.toByteArray(), 64, 64, byteCountingHandler);
+        reader = boundedReaderFor(out.toByteArray(), 64, 64, byteCountingHandler);
         assertFirstStruct(reader);
         assertSecondStruct(reader);
-        reader.close();
-        assertBytesConsumed();
+        closeAndCount();
     }
 
     @Test
@@ -2613,7 +2626,7 @@ public void structsWithFloat32AndPreallocatedLength() throws Exception {
         writeSecondStruct(writer);
         writer.close();
 
-        IonReader reader = boundedReaderFor(out.toByteArray(), 64, 64, byteCountingHandler);
+        reader = boundedReaderFor(out.toByteArray(), 64, 64, byteCountingHandler);
         assertFirstStruct(reader);
         assertSecondStruct(reader);
         assertBytesConsumed();
@@ -2627,12 +2640,11 @@ public void nopPadThatFillsBufferFollowedByValueNotOversized() throws Exception
         );
         // The IVM is 4 bytes and the NOP pad is 4 bytes. The first value is the 9th byte and should not be considered
         // oversize because the NOP pad can be discarded.
-        IonReader reader = boundedReaderFor(out.toByteArray(), 8, 8, byteCountingHandler);
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(0, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = boundedReaderFor(out.toByteArray(), 8, 8, byteCountingHandler);
+        nextExpect(IonType.INT);
+        expectInt(0);
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -2644,12 +2656,11 @@ public void nopPadFollowedByValueThatOverflowsBufferNotOversized() throws Except
         // The IVM is 4 bytes and the NOP pad is 4 bytes. The first byte of the value is the 9th byte and fits in the
         // buffer. Even though there is a 10th byte, the value should not be considered oversize because the NOP pad
         // can be discarded.
-        IonReader reader = boundedReaderFor(out.toByteArray(), 9, 9, byteCountingHandler);
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = boundedReaderFor(out.toByteArray(), 9, 9, byteCountingHandler);
+        nextExpect(IonType.INT);
+        expectInt(1);
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -2662,12 +2673,11 @@ public void symbolTableFollowedByNopPadFollowedByValueThatOverflowsBufferNotOver
         );
         // The IVM is 4 bytes, the symbol table is 12 bytes, and the symbol value is 2 bytes (total 18). The 1-byte NOP
         // pad needs to be reclaimed to make space for the value. Once that is done, the value will fit.
-        IonReader reader = boundedReaderFor(out.toByteArray(), 18, 18, byteCountingHandler);
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("hello", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = boundedReaderFor(out.toByteArray(), 18, 18, byteCountingHandler);
+        nextExpect(IonType.SYMBOL);
+        expectString("hello");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -2696,14 +2706,13 @@ public void multipleNopPadsFollowedByValueThatOverflowsBufferNotOversized() thro
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         );
 
-        IonReader reader = boundedReaderFor(out.toByteArray(), 11, 11, byteCountingHandler);
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(2, reader.intValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = boundedReaderFor(out.toByteArray(), 11, 11, byteCountingHandler);
+        nextExpect(IonType.INT);
+        expectInt(1);
+        nextExpect(IonType.INT);
+        expectInt(2);
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -2729,12 +2738,11 @@ public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors() throw
         );
 
         // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
-        IonReader reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("hello", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
+        nextExpect(IonType.SYMBOL);
+        expectString("hello");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -2760,12 +2768,11 @@ public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors2() thro
         );
 
         // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
-        IonReader reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("hello", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
+        nextExpect(IonType.SYMBOL);
+        expectString("hello");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -2791,12 +2798,11 @@ public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors3() thro
         );
 
         // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
-        IonReader reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("hello", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
+        nextExpect(IonType.SYMBOL);
+        expectString("hello");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -2817,14 +2823,13 @@ public void nopPadSurroundingSymbolTableThatFitsInBuffer() throws Exception {
         );
 
         // Set the maximum size at IVM (4 bytes) + 14-byte NOP pad + the symbol table (12 bytes) + 2 value bytes.
-        IonReader reader = boundedReaderFor(out.toByteArray(), 32, 32, byteCountingHandler);
-        assertEquals(IonType.STRING, reader.next());
-        assertEquals("abcdefg", reader.stringValue());
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("hello", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = boundedReaderFor(out.toByteArray(), 32, 32, byteCountingHandler);
+        nextExpect(IonType.STRING);
+        expectString("abcdefg");
+        nextExpect(IonType.SYMBOL);
+        expectString("hello");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -2835,14 +2840,13 @@ public void nopPadInStructNonIncremental() throws Exception {
             0x04, 0x00, 0x00, 0x00, 0x00 // 5-byte NOP pad.
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
-        IonReader reader = boundedReaderFor(out.toByteArray(), 5, Integer.MAX_VALUE, byteCountingHandler);
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertNull(reader.next());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        reader = boundedReaderFor(out.toByteArray(), 5, Integer.MAX_VALUE, byteCountingHandler);
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(null);
+        stepOut();
+        nextExpect(null);
+        closeAndCount();
     }
 
     /**
@@ -2866,19 +2870,17 @@ private static void compareIterator(List<String> expected, Iterator<String> actu
 
     @Test
     public void annotationIteratorReuse() throws Exception {
-        IonReader reader = readerFor("foo::bar::123 baz::456");
-
-        assertEquals(IonType.INT, reader.next());
+        reader = readerFor("foo::bar::123 baz::456");
+        nextExpect(IonType.INT);
         Iterator<String> firstValueAnnotationIterator = reader.iterateTypeAnnotations();
-        assertEquals(123, reader.intValue());
-        assertEquals(IonType.INT, reader.next());
+        expectInt(123);
+        nextExpect(IonType.INT);
         compareIterator(Arrays.asList("foo", "bar"), firstValueAnnotationIterator);
         Iterator<String> secondValueAnnotationIterator = reader.iterateTypeAnnotations();
-        assertEquals(456, reader.intValue());
-        assertNull(reader.next());
+        expectInt(456);
+        nextExpect(null);
         compareIterator(Collections.singletonList("baz"), secondValueAnnotationIterator);
-        reader.close();
-        assertBytesConsumed();
+        closeAndCount();
     }
 
     @Test(expected = IonException.class)
@@ -2894,15 +2896,15 @@ public void failsOnMalformedSymbolTable() throws Exception {
             0x81, // Junk byte to fill the 6 bytes of the annotation wrapper and 3 bytes of the struct.
             0x20  // Next top-level value (int 0).
         );
-        IonReader reader = boundedReaderFor(data, 1024, 1024, byteCountingHandler);
-        assertNull(reader.next());
-        assertNull(reader.next());
+        reader = boundedReaderFor(data, 1024, 1024, byteCountingHandler);
+        nextExpect(null);
+        nextExpect(null);
         reader.close();
     }
 
     @Test
     public void multiByteSymbolTokens() throws Exception {
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
             writer.stepIn(IonType.STRUCT);
             writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
@@ -2921,9 +2923,9 @@ public void multiByteSymbolTokens() throws Exception {
             writer.writeSymbolToken(335);
             writer.stepOut();
         });
-        assertEquals(IonType.STRUCT, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.SYMBOL, reader.next());
+        nextExpect(IonType.STRUCT);
+        stepIn();
+        nextExpect(IonType.SYMBOL);
         SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
         assertEquals(1, annotations.length);
         assertEquals("a", annotations[0].assumeText());
@@ -2933,15 +2935,14 @@ public void multiByteSymbolTokens() throws Exception {
         assertFalse(annotationsIterator.hasNext());
         assertEquals("b", reader.getFieldNameSymbol().assumeText());
         assertEquals("c", reader.symbolValue().assumeText());
-        reader.stepOut();
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        stepOut();
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void symbolTableWithOpenContentImportsListField() throws Exception {
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
             writer.stepIn(IonType.STRUCT);
             writer.setFieldNameSymbol(SystemSymbols.NAME_SID);
@@ -2955,16 +2956,15 @@ public void symbolTableWithOpenContentImportsListField() throws Exception {
             writer.stepOut();
             writer.writeSymbolToken(SystemSymbols.ION_1_0_MAX_ID + 1);
         });
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("a", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.SYMBOL);
+        expectString("a");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void symbolTableWithOpenContentImportsSymbolField() throws Exception {
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
             writer.stepIn(IonType.STRUCT);
             writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
@@ -2976,16 +2976,15 @@ public void symbolTableWithOpenContentImportsSymbolField() throws Exception {
             writer.stepOut();
             writer.writeSymbolToken(SystemSymbols.ION_1_0_MAX_ID + 1);
         });
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals("a", reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.SYMBOL);
+        expectString("a");
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
     public void symbolTableWithOpenContentSymbolField() throws Exception {
-        IonReader reader = readerFor((writer, out) -> {
+        reader = readerFor((writer, out) -> {
             writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
             writer.stepIn(IonType.STRUCT);
             writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
@@ -2995,11 +2994,10 @@ public void symbolTableWithOpenContentSymbolField() throws Exception {
             writer.stepOut();
             writer.writeSymbolToken(SystemSymbols.VERSION_SID);
         });
-        assertEquals(IonType.SYMBOL, reader.next());
-        assertEquals(SystemSymbols.VERSION, reader.stringValue());
-        assertNull(reader.next());
-        reader.close();
-        assertBytesConsumed();
+        nextExpect(IonType.SYMBOL);
+        expectString(SystemSymbols.VERSION);
+        nextExpect(null);
+        closeAndCount();
     }
 
     @Test
@@ -3011,14 +3009,14 @@ public void stepOutWithoutEnoughDataNonIncrementalFails() throws Exception {
             0x21, 0x02 // Int 2
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
-        IonReader reader = readerFor(new ByteArrayInputStream(bytes));
-        assertEquals(IonType.LIST, reader.next());
-        reader.stepIn();
-        assertEquals(IonType.INT, reader.next());
-        assertEquals(1, reader.intValue());
+        reader = readerFor(new ByteArrayInputStream(bytes));
+        nextExpect(IonType.LIST);
+        stepIn();
+        nextExpect(IonType.INT);
+        expectInt(1);
         // Early step out. Not enough bytes to complete the value. Throw if the reader attempts
         // to advance the cursor.
-        reader.stepOut();
+        stepOut();
         thrown.expect(IonException.class);
         reader.next();
         reader.close();
@@ -3031,8 +3029,8 @@ public void skipWithoutEnoughDataNonIncrementalFails() throws Exception {
             0x86, '1', '2', '3', '4' // String length 6; only 4 value bytes
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
-        IonReader reader = readerFor(new ByteArrayInputStream(bytes));
-        assertEquals(IonType.STRING, reader.next());
+        reader = readerFor(new ByteArrayInputStream(bytes));
+        nextExpect(IonType.STRING);
         thrown.expect(IonException.class);
         reader.next();
         reader.close();

From d3df2b34ab49ffc27f5774af8c427be2adbfb7c4 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 25 Jul 2023 14:41:44 -0700
Subject: [PATCH 277/490] Addresses PR feedback on IonCursorBinary.

---
 src/com/amazon/ion/impl/IonCursorBinary.java  | 113 ++++++++++--------
 src/com/amazon/ion/impl/IonTypeID.java        |   2 +-
 ...onReaderContinuableTopLevelBinaryTest.java |   4 +-
 3 files changed, 66 insertions(+), 53 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index bdb6df2cdc..ce160e9ea5 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -37,7 +37,7 @@ class IonCursorBinary implements IonCursor {
     private static final IvmNotificationConsumer NO_OP_IVM_NOTIFICATION_CONSUMER = (x, y) -> {};
 
     // Initial capacity of the stack used to hold ContainerInfo. Each additional level of nesting in the data requires
-    // a new ContainerInfo. Depths greater than 8 will be rare.
+    // a new ContainerInfo. Depths greater than 8 are assumed to be rare.
     private static final int CONTAINER_STACK_INITIAL_CAPACITY = 8;
 
     /**
@@ -76,13 +76,13 @@ private static class RefillableState {
         /**
          * The current size of the internal buffer.
          */
-        private long capacity;
+        long capacity;
 
         /**
          * The total number of bytes that have been discarded (shifted out of the buffer or skipped directly from
          * the input stream).
          */
-        protected long totalDiscardedBytes = 0;
+        long totalDiscardedBytes = 0;
 
         /**
          * The state of the reader when in slow mode (when slow mode is disabled, the reader is always implicitly in the
@@ -104,22 +104,22 @@ private static class RefillableState {
         /**
          * The source of data, for refillable streams.
          */
-        private final InputStream inputStream;
+        final InputStream inputStream;
 
         /**
          * Handler invoked when a single value would exceed `maximumBufferSize`.
          */
-        private BufferConfiguration.OversizedValueHandler oversizedValueHandler;
+        BufferConfiguration.OversizedValueHandler oversizedValueHandler;
 
         /**
          * Indicates whether the current value is being skipped due to being oversized.
          */
-        private boolean isSkippingCurrentValue = false;
+        boolean isSkippingCurrentValue = false;
 
         /**
          * The number of bytes of an oversized value skipped during single-byte read operations.
          */
-        private int individualBytesSkippedWithoutBuffering = 0;
+        int individualBytesSkippedWithoutBuffering = 0;
 
         RefillableState(InputStream inputStream, int capacity, int maximumBufferSize) {
             this.inputStream = inputStream;
@@ -132,17 +132,17 @@ private static class RefillableState {
     /**
      * Stack to hold container info. Stepping into a container results in a push; stepping out results in a pop.
      */
-    protected Marker[] containerStack = new Marker[CONTAINER_STACK_INITIAL_CAPACITY];
+    Marker[] containerStack = new Marker[CONTAINER_STACK_INITIAL_CAPACITY];
 
     /**
      * The index of the current container in `containerStack`.
      */
-    protected int containerIndex = -1;
+    int containerIndex = -1;
 
     /**
      * The Marker representing the parent container of the current value.
      */
-    protected Marker parent = null;
+    Marker parent = null;
 
     /**
      * The start offset into the user-provided byte array, or 0 if the user provided an InputStream.
@@ -162,7 +162,7 @@ private static class RefillableState {
     /**
      * A slice of the current buffer.
      */
-    protected ByteBuffer byteBuffer;
+    ByteBuffer byteBuffer;
 
     /**
      * The handler that will be notified when data is processed.
@@ -183,17 +183,17 @@ private static class RefillableState {
     /**
      * Marker representing the current value.
      */
-    protected final Marker valueMarker = new Marker(-1, 0);
+    final Marker valueMarker = new Marker(-1, 0);
 
     /**
      * The index of the first byte in the header of the value at which the reader is currently positioned.
      */
-    protected long valuePreHeaderIndex = 0;
+    long valuePreHeaderIndex = 0;
 
     /**
      * Type ID for the current value.
      */
-    protected IonTypeID valueTid = null;
+    IonTypeID valueTid = null;
 
     /**
      * The consumer to be notified when Ion version markers are encountered.
@@ -203,12 +203,12 @@ private static class RefillableState {
     /**
      * The event that occurred as a result of the last call to any of the cursor's IonCursor methods.
      */
-    protected IonCursor.Event event = IonCursor.Event.NEEDS_DATA;
+    IonCursor.Event event = IonCursor.Event.NEEDS_DATA;
 
     /**
      * The buffer in which the cursor stores slices of the Ion stream.
      */
-    protected byte[] buffer;
+    byte[] buffer;
 
     /**
      * The major version of the Ion encoding currently being read.
@@ -223,7 +223,7 @@ private static class RefillableState {
     /**
      * The field SID of the current value, if any.
      */
-    protected int fieldSid = -1;
+    int fieldSid = -1;
 
     /**
      * The index of the first byte in the buffer that has not yet been successfully processed. The checkpoint is
@@ -349,14 +349,34 @@ static int nextPowerOfTwo(int value) {
      * @param configuration the configuration to validate.
      * @return the validated configuration.
      */
-    private static IonBufferConfiguration validate(IonBufferConfiguration configuration) {
+    private static void validate(IonBufferConfiguration configuration) {
         if (configuration.getInitialBufferSize() < 1) {
             throw new IllegalArgumentException("Initial buffer size must be at least 1.");
         }
         if (configuration.getMaximumBufferSize() < configuration.getInitialBufferSize()) {
             throw new IllegalArgumentException("Maximum buffer size cannot be less than the initial buffer size.");
         }
-        return configuration;
+    }
+
+    /**
+     * Provides a fixed-size buffer configuration suitable for the given ByteArrayInputStream.
+     * @param inputStream the stream.
+     * @param alreadyReadLen the number of bytes already read from the stream. The configuration provided will allow
+     *                       enough space for these bytes.
+     * @return a fixed IonBufferConfiguration.
+     */
+    private static IonBufferConfiguration getFixedSizeConfigurationFor(
+        ByteArrayInputStream inputStream,
+        int alreadyReadLen
+    ) {
+        int fixedBufferSize = inputStream.available();
+        if (alreadyReadLen > 0) {
+            fixedBufferSize += alreadyReadLen;
+        }
+        if (STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize() > fixedBufferSize) {
+            return FIXED_SIZE_CONFIGURATIONS[logBase2(fixedBufferSize)];
+        }
+        return STANDARD_BUFFER_CONFIGURATION;
     }
 
     /**
@@ -380,26 +400,13 @@ private static IonBufferConfiguration validate(IonBufferConfiguration configurat
                 // the stream to avoid wastefully allocating extra space that will never be needed. It is still
                 // preferable for the user to manually specify the buffer size if it's less than the default, as doing
                 // so allows this branch to be skipped.
-                int fixedBufferSize;
-                try {
-                    fixedBufferSize = inputStream.available();
-                } catch (IOException e) {
-                    // ByteArrayInputStream.available() does not throw.
-                    throw new IllegalStateException(e);
-                }
-                if (alreadyReadLen > 0) {
-                    fixedBufferSize += alreadyReadLen;
-                }
-                if (STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize() > fixedBufferSize) {
-                    configuration = FIXED_SIZE_CONFIGURATIONS[logBase2(fixedBufferSize)];
-                } else {
-                    configuration = STANDARD_BUFFER_CONFIGURATION;
-                }
+                configuration = getFixedSizeConfigurationFor((ByteArrayInputStream) inputStream, alreadyReadLen);
             } else {
                 configuration = STANDARD_BUFFER_CONFIGURATION;
             }
+        } else {
+            validate(configuration);
         }
-        validate(configuration);
         peekIndex = 0;
         checkpoint = 0;
 
@@ -1297,7 +1304,10 @@ private void pushContainer() {
      */
     private void quickStepIntoContainer() {
         if (valueTid == null || valueTid.type.ordinal() < LIST_TYPE_ORDINAL) {
-            throw new IonException("Must be positioned on a container to step in.");
+            // Note: this is IllegalStateException for consistency with the legacy binary IonReader implementation.
+            // Ideally it would be IonException and IllegalStateException would be reserved for indicating bugs in
+            // within the library.
+            throw new IllegalStateException("Must be positioned on a container to step in.");
         }
         // Push the remaining length onto the stack, seek past the container's header, and increase the depth.
         pushContainer();
@@ -1318,7 +1328,10 @@ private Event slowStepIntoContainer() {
         }
         // Must be positioned on a container.
         if (checkpointLocation != CheckpointLocation.AFTER_CONTAINER_HEADER) {
-            throw new IonException("Must be positioned on a container to step in.");
+            // Note: this is IllegalStateException for consistency with the legacy binary IonReader implementation.
+            // Ideally it would be IonException and IllegalStateException would be reserved for indicating bugs in
+            // within the library.
+            throw new IllegalStateException("Must be positioned on a container to step in.");
         }
         // Push the remaining length onto the stack, seek past the container's header, and increase the depth.
         pushContainer();
@@ -1360,7 +1373,9 @@ public Event stepOutOfContainer() {
             return slowStepOutOfContainer();
         }
         if (parent == null) {
-            // Note: this is IllegalStateException for consistency with the other binary IonReader implementation.
+            // Note: this is IllegalStateException for consistency with the legacy binary IonReader implementation.
+            // Ideally it would be IonException and IllegalStateException would be reserved for indicating bugs in
+            // within the library.
             throw new IllegalStateException("Cannot step out at top level.");
         }
         // Seek past the remaining bytes at this depth and pop from the stack.
@@ -1401,6 +1416,8 @@ public Event stepOutOfContainer() {
     private Event slowStepOutOfContainer() {
         if (parent == null) {
             // Note: this is IllegalStateException for consistency with the legacy binary IonReader implementation.
+            // Ideally it would be IonException and IllegalStateException would be reserved for indicating bugs in
+            // within the library.
             throw new IllegalStateException("Cannot step out at top level.");
         }
         if (refillableState.state != State.READY && !slowMakeBufferReady()) {
@@ -1472,7 +1489,7 @@ private void reportConsumedData() {
     /**
      * Advances to the next token, seeking past the previous value if necessary. After return `event` will convey
      * the result (e.g. START_SCALAR, END_CONTAINER)
-     * @return false if the next token was an Ion version marker or NOP pad; otherwise, true. If false, this method
+     * @return true if the next token was an Ion version marker or NOP pad; otherwise, false. If true, this method
      *  should be called again to advance to the following value.
      */
     private boolean nextToken() {
@@ -1490,7 +1507,7 @@ private boolean nextToken() {
             if (parent != null && parent.endIndex == peekIndex) {
                 event = Event.END_CONTAINER;
             }
-            return true;
+            return false;
         }
         reset();
         int b;
@@ -1499,20 +1516,20 @@ private boolean nextToken() {
             b = buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK;
             if (b == IVM_START_BYTE) {
                 readIvm();
-                return false;
+                return true;
             }
         } else {
             if (nextContainedToken()) {
-                return true;
+                return false;
             }
             b = buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK;
         }
         if (readHeader(b, false, valueMarker)) {
             valueTid = valueMarker.typeId;
-            return true;
+            return false;
         }
         valueTid = valueMarker.typeId;
-        return false;
+        return true;
     }
 
     /**
@@ -1651,11 +1668,7 @@ public Event nextValue() {
             return slowNextValue();
         }
         event = Event.NEEDS_DATA;
-        while (true) {
-            if (nextToken()) {
-                break;
-            }
-        }
+        while (nextToken());
         return event;
     }
 
@@ -1750,7 +1763,7 @@ Marker getValueMarker() {
      * @param offset the offset at which the slice will begin.
      * @param limit the slice's limit.
      */
-    protected void slice(long offset, long limit) {
+    void slice(long offset, long limit) {
         peekIndex = offset;
         this.limit = limit;
         setCheckpointBeforeUnannotatedTypeId();
diff --git a/src/com/amazon/ion/impl/IonTypeID.java b/src/com/amazon/ion/impl/IonTypeID.java
index 1db102265a..bfa50a6569 100644
--- a/src/com/amazon/ion/impl/IonTypeID.java
+++ b/src/com/amazon/ion/impl/IonTypeID.java
@@ -26,7 +26,7 @@ final class IonTypeID {
     // does not have a type ID, so we will use it to mean 'annotation wrapper' instead.
     static final IonType ION_TYPE_ANNOTATION_WRAPPER = IonType.DATAGRAM;
 
-    // Lookup table from type ID to IonType. See https://amazon-ion.github.io/ion-docs/docs/binary.html#typed-value-formats
+    // Lookup table from type ID to IonType. See https://amzn.github.io/ion-docs/docs/binary.html#typed-value-formats
     static final IonType[] ION_TYPES_1_0 = new IonType[] {
         IonType.NULL,
         IonType.BOOL,
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index d1ce02f9b8..05eb631070 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -1492,7 +1492,7 @@ public void localSidOutOfRangeIterateAnnotations() throws Exception {
     public void stepInOnScalarFails() throws Exception {
         reader = readerFor(0x20);
         nextExpect(IonType.INT);
-        thrown.expect(IonException.class);
+        thrown.expect(IllegalStateException.class);
         stepIn();
         reader.close();
     }
@@ -1502,7 +1502,7 @@ public void stepInBeforeNextFails() throws Exception {
         reader = readerFor(0xD2, 0x84, 0xD0);
         reader.next();
         stepIn();
-        thrown.expect(IonException.class);
+        thrown.expect(IllegalStateException.class);
         stepIn();
         reader.close();
     }

From 5dad9d0b8afc0212a42fdfc64cf4c71befdeebb0 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 25 Jul 2023 14:50:15 -0700
Subject: [PATCH 278/490] Addresses PR feedback on
 IonReaderContinuableApplicationBinary; fortifies SymbolReaderTest and fixes
 bugs uncovered by increased coverage.

---
 ...IonReaderContinuableApplicationBinary.java |  64 +++--
 .../impl/IonReaderNonContinuableSystem.java   |   6 +-
 .../amazon/ion/impl/IonReaderTreeUserX.java   |   4 +-
 test/com/amazon/ion/ReaderMaker.java          |  76 ++++++
 test/com/amazon/ion/impl/SymbolTableTest.java | 191 ++++++++++++---
 ...stemSymbolResolvingIonRawBinaryWriter.java | 224 ++++++++++++++++++
 .../amazon/ion/streaming/ReaderTestCase.java  |  11 +-
 7 files changed, 512 insertions(+), 64 deletions(-)
 create mode 100644 test/com/amazon/ion/impl/bin/SystemSymbolResolvingIonRawBinaryWriter.java

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 542244ff2a..d7b4340ede 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -30,6 +30,7 @@
 import java.util.Map;
 
 import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
+import static com.amazon.ion.SystemSymbols.ION;
 import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
 import static com.amazon.ion.SystemSymbols.MAX_ID_SID;
 import static com.amazon.ion.SystemSymbols.NAME_SID;
@@ -213,10 +214,10 @@ private class LocalSymbolTableSnapshot implements SymbolTable, SymbolTableAsStru
 
         // Map representation of this symbol table. Keys are symbol text; values are the lowest symbol ID that maps
         // to that text.
-        final Map<String, Integer> mapView;
+        final Map<String, Integer> textToId;
 
         // List representation of this symbol table, indexed by symbol ID.
-        final String[] listView;
+        final String[] idToText;
 
         private SymbolTableStructCache structCache = null;
 
@@ -228,13 +229,13 @@ private class LocalSymbolTableSnapshot implements SymbolTable, SymbolTableAsStru
             maxId = importsMaxId + numberOfLocalSymbols;
             // Map with initial size the number of symbols and load factor 1, meaning it must be full before growing.
             // It is not expected to grow.
-            listView = new String[numberOfLocalSymbols];
-            System.arraycopy(symbols, 0, listView, 0, numberOfLocalSymbols);
-            mapView = new HashMap<>((int) Math.ceil(numberOfLocalSymbols / 0.75), 0.75f);
+            idToText = new String[numberOfLocalSymbols];
+            System.arraycopy(symbols, 0, idToText, 0, numberOfLocalSymbols);
+            textToId = new HashMap<>((int) Math.ceil(numberOfLocalSymbols / 0.75), 0.75f);
             for (int i = 0; i < numberOfLocalSymbols; i++) {
-                String symbol = listView[i];
+                String symbol = idToText[i];
                 if (symbol != null) {
-                    mapView.put(symbol, i + importsMaxId + 1);
+                    textToId.put(symbol, i + importsMaxId + 1);
                 }
             }
         }
@@ -295,7 +296,7 @@ public SymbolToken find(String text) {
             if (token != null) {
                 return token;
             }
-            Integer sid = mapView.get(text);
+            Integer sid = textToId.get(text);
             if (sid == null) {
                 return null;
             }
@@ -322,7 +323,7 @@ public int findSymbol(String name) {
             if (sid > UNKNOWN_SYMBOL_ID) {
                 return sid;
             }
-            sid = mapView.get(name);
+            sid = textToId.get(name);
             if (sid == null) {
                 return UNKNOWN_SYMBOL_ID;
             }
@@ -337,7 +338,7 @@ public String findKnownSymbol(int id) {
             if (id > getMaxId()) {
                 return null;
             }
-            return IonReaderContinuableApplicationBinary.this.getSymbolString(id, importedTables, listView);
+            return IonReaderContinuableApplicationBinary.this.getSymbolString(id, importedTables, idToText);
         }
 
         @Override
@@ -348,12 +349,12 @@ public Iterator<String> iterateDeclaredSymbolNames() {
 
                 @Override
                 public boolean hasNext() {
-                    return index < listView.length;
+                    return index < idToText.length;
                 }
 
                 @Override
                 public String next() {
-                    String symbol = listView[index];
+                    String symbol = idToText[index];
                     index++;
                     return symbol;
                 }
@@ -448,7 +449,7 @@ protected void restoreSymbolTable(SymbolTable symbolTable) {
             firstLocalSymbolId = imports.getMaxId() + 1;
             localSymbolMaxId = snapshot.maxId - firstLocalSymbolId;
             // Note: because `symbols` only grows, `snapshot.listView` will always fit within `symbols`.
-            System.arraycopy(snapshot.listView, 0, symbols, 0, snapshot.listView.length);
+            System.arraycopy(snapshot.idToText, 0, symbols, 0, snapshot.idToText.length);
             if (symbolTokensById != null) {
                 symbolTokensById.clear();
             }
@@ -470,6 +471,23 @@ protected void restoreSymbolTable(SymbolTable symbolTable) {
      */
     private SymbolTable createImport(String name, int version, int maxId) {
         SymbolTable shared = catalog.getTable(name, version);
+        if (maxId < 0) {
+            if (shared == null || version != shared.getVersion()) {
+                String message =
+                    "Import of shared table "
+                        + name
+                        + " lacks a valid max_id field, but an exact match was not"
+                        + " found in the catalog";
+                if (shared != null) {
+                    message += " (found version " + shared.getVersion() + ")";
+                }
+                throw new IonException(message);
+            }
+
+            // Exact match is found, but max_id is undefined in import declaration. Set max_id to tge largest SID of
+            // the matching symbol table.
+            maxId = shared.getMaxId();
+        }
         if (shared == null) {
             // No match. All symbol IDs that fall within this shared symbol table's range will have unknown text.
             return new SubstituteSymbolTable(name, version, maxId);
@@ -559,7 +577,6 @@ private class SymbolTableReader {
 
         private boolean hasSeenImports;
         private boolean hasSeenSymbols;
-        private boolean isAppend;
         private String name = null;
         private int version = -1;
         private int maxId = -1;
@@ -569,7 +586,6 @@ private class SymbolTableReader {
         private void resetState() {
             hasSeenImports = false;
             hasSeenSymbols = false;
-            isAppend = false;
             newImports = null;
             newSymbols = null;
             name = null;
@@ -636,9 +652,7 @@ private void startReadingImportsList() {
         }
 
         private void preparePossibleAppend() {
-            if (symbolValueId() == ION_SYMBOL_TABLE_SID) {
-                isAppend = true;
-            } else {
+            if (symbolValueId() != ION_SYMBOL_TABLE_SID) {
                 resetSymbolTable();
             }
             state = State.ON_SYMBOL_TABLE_FIELD;
@@ -676,7 +690,7 @@ private void finishReadingSymbolsList() {
 
         private void startReadingImportStruct() {
             name = null;
-            version = -1;
+            version = 1;
             maxId = -1;
             if (IonReaderContinuableApplicationBinary.super.getType() == IonType.STRUCT) {
                 stepIntoContainer();
@@ -686,8 +700,12 @@ private void startReadingImportStruct() {
 
         private void finishReadingImportStruct() {
             stepOutOfContainer();
-            newImports.add(createImport(name, version, maxId));
             state = State.READING_SYMBOL_TABLE_IMPORTS_LIST;
+            // Ignore import clauses with malformed name field.
+            if (name == null || name.length() == 0 || name.equals(ION)) {
+                return;
+            }
+            newImports.add(createImport(name, version, maxId));
         }
 
         private void startReadingImportStructField() {
@@ -709,14 +727,14 @@ private void readImportName() {
         }
 
         private void readImportVersion() {
-            if (IonReaderContinuableApplicationBinary.super.getType() == IonType.INT) {
-                version = intValue();
+            if (IonReaderContinuableApplicationBinary.super.getType() == IonType.INT && !IonReaderContinuableApplicationBinary.super.isNullValue()) {
+                version = Math.max(1, intValue());
             }
             state = State.READING_SYMBOL_TABLE_IMPORT_STRUCT;
         }
 
         private void readImportMaxId() {
-            if (IonReaderContinuableApplicationBinary.super.getType() == IonType.INT) {
+            if (IonReaderContinuableApplicationBinary.super.getType() == IonType.INT && !IonReaderContinuableApplicationBinary.super.isNullValue()) {
                 maxId = intValue();
             }
             state = State.READING_SYMBOL_TABLE_IMPORT_STRUCT;
diff --git a/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java b/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java
index 8c11f7bbbd..e6642486c4 100644
--- a/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java
+++ b/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java
@@ -32,9 +32,9 @@
  * exposed via public interfaces, it is not currently considered performance-critical, and no continuable equivalent
  * is provided.
  */
-class IonReaderNonContinuableSystem implements IonReader {
+final class IonReaderNonContinuableSystem implements IonReader {
 
-    protected final IonReaderContinuableCore reader;
+    private final IonReaderContinuableCore reader;
     private IonType type = null;
     private IonType typeAfterIvm = null;
     private final Queue<Integer> pendingIvmSids = new ArrayDeque<>(1);
@@ -129,7 +129,7 @@ public IonType getType() {
     /**
      * Prepares a scalar value to be parsed by ensuring it is present in the buffer.
      */
-    protected void prepareScalar() {
+    private void prepareScalar() {
         IonCursor.Event event = reader.getCurrentEvent();
         if (event == IonCursor.Event.VALUE_READY) {
             return;
diff --git a/src/com/amazon/ion/impl/IonReaderTreeUserX.java b/src/com/amazon/ion/impl/IonReaderTreeUserX.java
index 1ed1c31bfe..be70bc2d09 100644
--- a/src/com/amazon/ion/impl/IonReaderTreeUserX.java
+++ b/src/com/amazon/ion/impl/IonReaderTreeUserX.java
@@ -127,7 +127,9 @@ else if (IonType.STRUCT.equals(next_type)
                 ) {
                     assert(_next instanceof IonStruct);
                     // read a local symbol table
-                    IonReader reader = new IonReaderTreeUserX(_next, _catalog, _lstFactory);
+                    IonReaderTreeUserX reader = new IonReaderTreeUserX(_next, _catalog, _lstFactory);
+                    // The child reader's symbol table is the symbol table that was active when the value began.
+                    reader._symbols = _symbols;
                     SymbolTable symtab = _lstFactory.newLocalSymtab(_catalog, reader, false);
                     _symbols = symtab;
                     push_symbol_table(symtab);
diff --git a/test/com/amazon/ion/ReaderMaker.java b/test/com/amazon/ion/ReaderMaker.java
index 6e182da06f..74e6ac0572 100644
--- a/test/com/amazon/ion/ReaderMaker.java
+++ b/test/com/amazon/ion/ReaderMaker.java
@@ -18,9 +18,15 @@
 import static com.amazon.ion.TestUtils.ensureBinary;
 import static com.amazon.ion.TestUtils.ensureText;
 
+import com.amazon.ion.impl._Private_IonConstants;
+import com.amazon.ion.impl._Private_IonSystem;
 import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.impl.bin.SystemSymbolResolvingIonRawBinaryWriter;
+import com.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder;
+import com.amazon.ion.impl.bin._Private_IonManagedWriter;
 
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -28,6 +34,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
+import java.util.Iterator;
 
 /**
  * Abstracts the various ways that {@link IonReader}s can be created, so test
@@ -59,6 +66,11 @@ public IonReader newReader(IonSystem system, byte[] ionData)
             ionData = ensureBinary(system, ionData);
             return system.newReader(ionData);
         }
+
+        @Override
+        public IonReader newReaderVerbatim(IonSystem system, String ionText) {
+            return system.newReader(convertToBinaryVerbatim(system, ionText));
+        }
     },
 
 
@@ -92,6 +104,14 @@ public IonReader newReader(IonSystem system, byte[] ionData)
             System.arraycopy(ionData, 0, padded, 37, ionData.length);
             return system.newReader(padded, 37, ionData.length);
         }
+
+        @Override
+        public IonReader newReaderVerbatim(IonSystem system, String ionText) {
+            byte[] ionData = convertToBinaryVerbatim(system, ionText);
+            byte[] padded = new byte[ionData.length + 70];
+            System.arraycopy(ionData, 0, padded, 37, ionData.length);
+            return system.newReader(padded, 37, ionData.length);
+        }
     },
 
 
@@ -137,6 +157,11 @@ public IonReader newReader(IonSystem system, byte[] ionData)
             InputStream in = new ByteArrayInputStream(ionData);
             return system.newReader(in);
         }
+
+        @Override
+        public IonReader newReaderVerbatim(IonSystem system, String ionText) {
+            return system.newReader(new ByteArrayInputStream(convertToBinaryVerbatim(system, ionText)));
+        }
     },
 
     /**
@@ -194,6 +219,18 @@ public IonReader newReader(IonSystem system, byte[] ionData)
             IonDatagram dg = system.getLoader().load(ionData);
             return system.newReader(dg);
         }
+
+        @Override
+        public IonReader newReaderVerbatim(IonSystem system, String ionText) {
+            Iterator<IonValue> systemIterator = ((_Private_IonSystem) system).systemIterate(
+                ((_Private_IonSystem) system).newSystemReader(ionText)
+            );
+            IonDatagram dg = system.newDatagram();
+            while (systemIterator.hasNext()) {
+                dg.add(systemIterator.next());
+            }
+            return system.newReader(dg);
+        }
     };
 
 
@@ -233,6 +270,45 @@ public IonReader newReader(IonSystem system, String ionText)
         return newReader(system, utf8);
     }
 
+    /**
+     * Create a reader over an Ion stream that is identical to the given Ion text, even at the system level. In
+     * other words, symbol table boundaries and symbol ID assignments are preserved. Any symbol tables in the provided
+     * text are not parsed as system values, so open content is preserved. Note: certain aspects of the text encoding
+     * have no binary Ion 1.0 equivalent, such as symbol tokens not present in any symbol table. If such text is
+     * provided to this method, the output may not be valid when converted to binary.
+     * @param system an IonSystem instance.
+     * @param ionText the text Ion to read verbatim.
+     * @return a new IonReader.
+     */
+    public IonReader newReaderVerbatim(IonSystem system, String ionText) {
+        // Note: this is the default implementation when the requested source type is text Ion; no conversion is
+        // necessary. Binary Ion and DOM sources override this method and perform a verbatim conversion.
+        return newReader(system, ionText);
+    }
+
+    /**
+     * Converts the given text Ion to a verbatim representation in binary.
+     * @param system an IonSystem instance.
+     * @param ionText the text Ion to convert verbatim.
+     * @return the converted binary Ion.
+     */
+    private static byte[] convertToBinaryVerbatim(IonSystem system, String ionText) {
+        IonReader reader = ((_Private_IonSystem) system).newSystemReader(ionText);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (IonWriter rawWriter = new SystemSymbolResolvingIonRawBinaryWriter(
+            _Private_IonManagedBinaryWriterBuilder
+                .create(_Private_IonManagedBinaryWriterBuilder.AllocatorMode.POOLED)
+                .newWriter(out)
+                .asFacet(_Private_IonManagedWriter.class)
+                .getRawWriter()
+        )) {
+            out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+            rawWriter.writeValues(reader);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+        return out.toByteArray();
+    }
 
     public IonReader newReader(IonSystem system, byte[] ionData)
     {
diff --git a/test/com/amazon/ion/impl/SymbolTableTest.java b/test/com/amazon/ion/impl/SymbolTableTest.java
index 97fe16d153..944ac5903e 100644
--- a/test/com/amazon/ion/impl/SymbolTableTest.java
+++ b/test/com/amazon/ion/impl/SymbolTableTest.java
@@ -16,6 +16,8 @@
 package com.amazon.ion.impl;
 
 import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+
+import com.amazon.ion.ReaderMaker;
 import com.amazon.ion.SymbolToken;
 import static com.amazon.ion.SystemSymbols.ION;
 import static com.amazon.ion.SystemSymbols.ION_1_0;
@@ -40,7 +42,6 @@
 import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonSymbol;
 import com.amazon.ion.IonSystem;
-import com.amazon.ion.IonTestCase;
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonValue;
 import com.amazon.ion.IonWriter;
@@ -48,6 +49,8 @@
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SystemSymbols;
 import com.amazon.ion.Timestamp;
+import com.amazon.ion.junit.Injected;
+import com.amazon.ion.streaming.ReaderTestCase;
 import com.amazon.ion.system.IonBinaryWriterBuilder;
 import com.amazon.ion.system.IonSystemBuilder;
 import com.amazon.ion.system.IonTextWriterBuilder;
@@ -71,7 +74,7 @@
  */
 @SuppressWarnings("deprecation")
 public class SymbolTableTest
-    extends IonTestCase
+    extends ReaderTestCase
 {
     public static final String LocalSymbolTablePrefix = ION_SYMBOL_TABLE + "::";
     public static final String SharedSymbolTablePrefix = ION_SHARED_SYMBOL_TABLE + "::";
@@ -88,6 +91,9 @@ public class SymbolTableTest
         "  symbols:['''imported 1''', '''imported 2''']" +
         "}";
 
+    @Injected.Inject("readerMaker")
+    public static final ReaderMaker[] READER_MAKERS = ReaderMaker.values();
+
 
     public SymbolTable registerImportedV1()
     {
@@ -150,6 +156,22 @@ public SymbolTable registerImportedV3()
         return importedTable;
     }
 
+    @Override
+    public IonValue oneValue(String text) {
+        readVerbatim(text);
+        return singleValue(system().iterate(in));
+    }
+
+    private IonDatagram allValues(String text) {
+        readVerbatim(text);
+        return loader().load(in);
+    }
+
+    private Iterator<IonValue> iterate(String text) {
+        readVerbatim(text);
+        return system().iterate(in);
+    }
+
 
     //=========================================================================
     // Test cases
@@ -266,18 +288,16 @@ public void testLocalSymbolTableAppendImportBoundary() throws IOException
                 "}\n" +
                 "null";
 
-        IonDatagram datagram = loader().load(text);
+        IonDatagram datagram = allValues(text);
 
-        SymbolTable symbolTable = datagram.get(0).getSymbolTable();
-        assertSame(symbolTable, datagram.get(1).getSymbolTable());
-        symbolTable.intern("o1");
-        symbolTable.intern("a1");
-
-        // new symbols don't influence SIDs for existing symbols; they are appended
-        checkSymbol("s11", systemMaxId() + 1, symbolTable);
-        checkSymbol("s21", systemMaxId() + 2, symbolTable);
-        checkSymbol("o1", systemMaxId() + 3, symbolTable);
-        checkSymbol("a1", systemMaxId() + 4, symbolTable);
+        SymbolTable symbolTable0 = datagram.get(0).getSymbolTable();
+        SymbolTable symbolTable1 = datagram.get(1).getSymbolTable();
+        // Note: previously, this test attempted to intern "o1" and "a1", symbols not yet present in the table. This should
+        // always have been explicitly disallowed when operating on a symbol table provided by an IonReader, as
+        // mutating the reader's symbol table while it may still be in use is unsafe.
+        checkSymbol("s11", systemMaxId() + 1, symbolTable0);
+        checkSymbol("s11", systemMaxId() + 1, symbolTable1);
+        checkSymbol("s21", systemMaxId() + 2, symbolTable1);
 
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         IonWriter writer = IonBinaryWriterBuilder.standard().build(out);
@@ -303,7 +323,7 @@ public void testMutateDomAfterLocalSymbolTableAppend() throws IOException {
                 "   symbols:[\"s3\"]" +
                 "}\n" +
                 "$12"; // s2
-        IonDatagram datagram = loader().load(text);
+        IonDatagram datagram = allValues(text);
         datagram.add(1, system().newSymbol("abc"));
         datagram.add(system().newSymbol(new SymbolTokenImpl(null, 13))); // s3
         datagram.add(system().newSymbol(new SymbolTokenImpl(null, 10))); // Symbol with unknown text from "foo"
@@ -358,7 +378,7 @@ public void testInitialSystemSymtab()
         SymbolTable st = v.getSymbolTable();
         assertSame(systemTable, st.getSystemSymbolTable());
 
-        IonDatagram dg = loader().load(text);
+        IonDatagram dg = allValues(text);
         IonSymbol sysId = (IonSymbol) dg.systemGet(0);
         checkSymbol(ION_1_0, ION_1_0_SID, sysId);
         assertSame(systemTable, sysId.getSymbolTable());
@@ -424,9 +444,12 @@ public void testParsedLocalTableMakeReadOnly()
             "null";
 
         SymbolTable symbolTable = oneValue(text).getSymbolTable();
-        symbolTable.intern("baz");
+        // Note: previously, this test attempted to intern "baz", a symbol not yet present in the table. This should
+        // always have been explicitly disallowed when operating on a symbol table provided by an IonReader, as
+        // mutating the reader's symbol table while it may still be in use is unsafe.
+        symbolTable.intern("bar");
         symbolTable.makeReadOnly();
-        symbolTable.intern("baz");
+        symbolTable.intern("bar");
 
         try {
             symbolTable.intern("boo");
@@ -443,20 +466,52 @@ public void testImportsFollowSymbols()
 
         final int import1id = systemMaxId() + 1;
         final int local1id = systemMaxId() + IMPORTED_1_MAX_ID + 1;
-        final int local2id = local1id + 1;
 
         String importingText =
-            "$ion_1_0 "+
             LocalSymbolTablePrefix +
             "{" +
             "  symbols:[ '''local1''' ]," +
             "  imports:[{name:'''imported''', version:1, max_id:2}]," +
             "}\n" +
-            "local2\n" +  // This symbol is added to end of locals
-            "local1\n" +
-            "'imported 1'";
+            "$" + local1id + "\n" +
+            "$" + import1id;
 
-        Iterator<IonValue> scanner = system().iterate(importingText);
+        Iterator<IonValue> scanner = iterate(importingText);
+
+        IonValue value = scanner.next();
+        SymbolTable symtab = value.getSymbolTable();
+        checkLocalTable(symtab);
+        checkSymbol("local1", local1id, value);
+
+        value = scanner.next();
+        checkSymbol("imported 1", import1id, value);
+    }
+
+    @Test
+    public void testTextSymbolNotInLocalSymbolTable()
+    {
+        if (myReaderMaker.sourceIsBinary()) {
+            // This is skipped for binary because this case is not representable verbatim in binary, which requires
+            // every symbol token to be present in the symbol table.
+            return;
+        }
+        registerImportedV1();
+
+        final int import1id = systemMaxId() + 1;
+        final int local1id = systemMaxId() + IMPORTED_1_MAX_ID + 1;
+        final int local2id = local1id + 1;
+
+        String importingText =
+            LocalSymbolTablePrefix +
+                "{" +
+                "  symbols:[ '''local1''' ]," +
+                "  imports:[{name:'''imported''', version:1, max_id:2}]," +
+                "}\n" +
+                "local2\n" +  // This symbol is added to end of locals
+                "local1\n" +
+                "'imported 1'";
+
+        Iterator<IonValue> scanner = iterate(importingText);
 
         IonValue value = scanner.next();
         SymbolTable symtab = value.getSymbolTable();
@@ -484,7 +539,7 @@ public void testOverridingSystemSymbolId()
             "}\n" +
             "null";
 
-        Iterator<IonValue> scanner = system().iterate(importingText);
+        Iterator<IonValue> scanner = iterate(importingText);
         IonValue v = scanner.next();
         SymbolTable symtab = v.getSymbolTable();
         assertTrue(symtab.isLocalTable());
@@ -501,19 +556,18 @@ public void testOverridingImportedSymbolId()
         final int import1DupId = systemMaxId() + importedTable.getMaxId() + 1;
 
         String importingText =
-            "$ion_1_0 "+
             LocalSymbolTablePrefix +
             "{" +
             "  imports:[{name:'''imported''', version:1, max_id:2}]," +
             "  symbols:[ '''imported 1''' ]," +
             "}\n" +
-            "'imported 1'\n" +
+            "$" + import1DupId + "\n" +
             "$" + import1id;
 
-        Iterator<IonValue> scanner = system().iterate(importingText);
+        Iterator<IonValue> scanner = iterate(importingText);
 
         IonValue value = scanner.next();
-        checkSymbol("imported 1", import1id, value);
+        checkSymbol("imported 1", value);
 
         SymbolTable symtab = value.getSymbolTable();
         checkLocalTable(symtab);
@@ -537,7 +591,7 @@ public void testInjectingMaxIdIntoImport() // TODO implement
             "  imports:[{name:'''imported''',version:1}],\n" +
             "}\n" +
             "null";
-        IonDatagram dg = loader().load(text);
+        IonDatagram dg = allValues(text);
 
         SymbolTable symbolTable = dg.get(0).getSymbolTable();
         checkLocalTable(symbolTable);
@@ -778,14 +832,20 @@ public void testMalformedImportsField()
         testMalformedImportsField("null");
         testMalformedImportsField("'''hello'''");
         testMalformedImportsField("imports");
-        testMalformedImportsField("a_symbol");
+        if (!myReaderMaker.sourceIsBinary()) {
+            // A SID-less symbol token cannot be represented verbatim in binary.
+            testMalformedImportsField("a_symbol");
+        }
 
 
         testMalformedImportsField("[{}]");
         testMalformedImportsField("[null.struct]");
         testMalformedImportsField("[null]");
         testMalformedImportsField("[1009]");
-        testMalformedImportsField("[a_symbol]");
+        if (!myReaderMaker.sourceIsBinary()) {
+            // A SID-less symbol token cannot be represented verbatim in binary.
+            testMalformedImportsField("[a_symbol]");
+        }
     }
 
     private void testMalformedImportsField(String value)
@@ -814,7 +874,10 @@ public void testImportWithMalformedName()
         testImportWithMalformedName(importedV1, " \"\" ");  // empty string
         testImportWithMalformedName(importedV1, "null.string");
         testImportWithMalformedName(importedV1, "null");
-        testImportWithMalformedName(importedV1, "'syms'");  // symbol
+        if (!myReaderMaker.sourceIsBinary()) {
+            // A SID-less symbol token cannot be represented verbatim in binary.
+            testImportWithMalformedName(importedV1, "'syms'");  // symbol
+        }
         testImportWithMalformedName(importedV1, "123");
 
         // Cannot import system symtab
@@ -841,6 +904,47 @@ private void testImportWithMalformedName(SymbolTable importedV1,
                      symbolTable.getMaxId());
     }
 
+    @Test
+    public void testImportWithBadVersion()
+    {
+        // From the spec: "The version field should be an int and at least 1. If the field is missing or has any other
+        // value, it is treated as if it were 1."
+        SymbolTable importedV1 = registerImportedV1();
+
+        testImportWithBadVersion(importedV1, "null.int");
+        testImportWithBadVersion(importedV1, "null");
+        if (!myReaderMaker.sourceIsBinary()) {
+            // A SID-less symbol token cannot be represented verbatim in binary.
+            testImportWithBadVersion(importedV1, "not_an_int");
+        }
+        testImportWithBadVersion(importedV1, "0");
+        testImportWithBadVersion(importedV1, "-1");
+        testImportWithBadVersion(importedV1, "-2223");
+
+        String text =
+            LocalSymbolTablePrefix +
+                "{" +
+                "  imports:[{name:\"imported\", max_id:2}]," +
+                "}\n" +
+                "null";
+        IonValue v = oneValue(text);
+        assertSame(importedV1, v.getSymbolTable().getImportedTables()[0]);
+    }
+
+    public void testImportWithBadVersion(SymbolTable expected, String versionText)
+    {
+        String text =
+            LocalSymbolTablePrefix +
+                "{" +
+                "  imports:[{name:\"imported\", version:" + versionText + "," +
+                "            max_id:2" +
+                "  }]," +
+                "}\n" +
+                "null";
+        IonValue v = oneValue(text);
+        assertSame(expected, v.getSymbolTable().getImportedTables()[0]);
+    }
+
 
     // TODO test getUsedTable(null)
     // TODO test getImportedTable(null)
@@ -877,7 +981,10 @@ public void testImportWithBadMaxId()
 
         testImportWithBadMaxId(importedV1, "null.int");
         testImportWithBadMaxId(importedV1, "null");
-        testImportWithBadMaxId(importedV1, "not_an_int");
+        if (!myReaderMaker.sourceIsBinary()) {
+            // A SID-less symbol token cannot be represented verbatim in binary.
+            testImportWithBadMaxId(importedV1, "not_an_int");
+        }
 //        testImportWithBadMaxId(importedV1, "0");  Zero isn't bad, its zero!
         testImportWithBadMaxId(importedV1, "-1");
         testImportWithBadMaxId(importedV1, "-2223");
@@ -910,6 +1017,21 @@ public void testImportWithBadMaxId(SymbolTable expected, String maxIdText)
         assertSame(expected, v.getSymbolTable().getImportedTables()[0]);
     }
 
+    @Test(expected = IonException.class)
+    public void testImportWithInexactMatchAndUndefinedMaxId() {
+        registerSharedSymtab(IMPORTED_1_SERIALIZED);
+        String text =
+            LocalSymbolTablePrefix +
+            "{" +
+            "  imports:[{name:\"imported\", version:2}]," +
+            "}\n" +
+            "null";
+        // Version 1 is registered in the catalog, but the stream requests version 2. If the import declaration had
+        // included a max_id then this would be fine. However, when the declaration omits max_id, an exact match is
+        // required.
+        oneValue(text);
+    }
+
 
     //-------------------------------------------------------------------------
     // Local symtab creation
@@ -1404,7 +1526,8 @@ public void testSymtabBinaryInjection() throws Exception
         writer.stepOut();
         writer.finish();
 
-        IonReader reader = system().newReader(baos.toByteArray());
+        read(baos.toByteArray());
+        IonReader reader = in;
         assertEquals(IonType.LIST, reader.next());
         reader.stepIn();
         assertEquals(IonType.NULL, reader.next());
diff --git a/test/com/amazon/ion/impl/bin/SystemSymbolResolvingIonRawBinaryWriter.java b/test/com/amazon/ion/impl/bin/SystemSymbolResolvingIonRawBinaryWriter.java
new file mode 100644
index 0000000000..dc5bb63bb9
--- /dev/null
+++ b/test/com/amazon/ion/impl/bin/SystemSymbolResolvingIonRawBinaryWriter.java
@@ -0,0 +1,224 @@
+package com.amazon.ion.impl.bin;
+
+import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolTable;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.Timestamp;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
+
+/**
+ * An IonWriter that delegates to an IonRawBinaryWriter, intercepting and attempting to resolve any SymbolTokens
+ * in the system symbol table. This allows for system values to be translated verbatim from text to binary.
+ */
+public class SystemSymbolResolvingIonRawBinaryWriter extends AbstractIonWriter {
+    private final IonRawBinaryWriter delegate;
+    private final SymbolTable systemSymbolTable;
+
+    public SystemSymbolResolvingIonRawBinaryWriter(_Private_IonRawWriter delegate) {
+        super(WriteValueOptimization.NONE);
+        this.delegate = (IonRawBinaryWriter) delegate;
+        systemSymbolTable = delegate.getSymbolTable().getSystemSymbolTable();
+    }
+
+    /**
+     * Attempts to resolve a SymbolToken, if necessary, using the system symbol table. If the given token already has
+     * a defined symbol ID, then no resolution is required. Otherwise, attempts to look up the given token's text
+     * in the system symbol table. If no match is found, then an error is raised, as a symbol token without a symbol ID
+     * cannot be represented in binary Ion 1.0.
+     * @param token a SymbolToken with defined text.
+     * @return a SymbolToken with defined symbol ID.
+     */
+    private SymbolToken resolve(SymbolToken token) {
+        if (token.getSid() > UNKNOWN_SYMBOL_ID) {
+            return token;
+        }
+        SymbolToken resolved = systemSymbolTable.find(token.getText());
+        if (resolved == null) {
+            throw new IllegalStateException("Cannot write a symbol token without a SID in binary Ion 1.0.");
+        }
+        return resolved;
+    }
+
+    @Override
+    public void setFieldNameSymbol(final SymbolToken name) {
+        delegate.setFieldNameSymbol(resolve(name));
+    }
+
+    @Override
+    public void setTypeAnnotationSymbols(final SymbolToken... annotations) {
+        SymbolToken[] resolved = new SymbolToken[annotations.length];
+        int i = 0;
+        for (SymbolToken annotation : annotations) {
+            resolved[i++] = resolve(annotation);
+        }
+        delegate.setTypeAnnotationSymbols(resolved);
+    }
+    @Override
+    public void writeSymbolToken(final SymbolToken content) throws IOException {
+        SymbolToken token = resolve(content);
+        delegate.writeSymbolToken(token);
+    }
+
+    /* ---- Everything that follows simply calls through to the delegate directly. ---- */
+
+    @Override
+    public <T> T asFacet(Class<T> facetType) {
+        return delegate.asFacet(facetType);
+    }
+
+    @Override
+    public void writeString(byte[] data, int offset, int length) throws IOException {
+        delegate.writeString(data, offset, length);
+    }
+
+    @Override
+    public SymbolTable getSymbolTable() {
+        return delegate.getSymbolTable();
+    }
+
+    @Override
+    public void setFieldName(final String name) {
+        delegate.setFieldName(name);
+    }
+
+    @Override
+    public void setTypeAnnotations(final String... annotations) {
+        delegate.setTypeAnnotations(annotations);
+    }
+
+    @Override
+    public void addTypeAnnotation(final String annotation) {
+        delegate.addTypeAnnotation(annotation);
+    }
+
+    @Override
+    public IonCatalog getCatalog() {
+        return delegate.getCatalog();
+    }
+
+    @Override
+    public boolean isFieldNameSet() {
+        return delegate.isFieldNameSet();
+    }
+
+    @Override
+    public void writeIonVersionMarker() throws IOException {
+        delegate.writeIonVersionMarker();
+    }
+
+    @Override
+    public int getDepth() {
+        return delegate.getDepth();
+    }
+
+    @Override
+    public void stepIn(final IonType containerType) throws IOException {
+        delegate.stepIn(containerType);
+    }
+
+    @Override
+    public void stepOut() throws IOException {
+        delegate.stepOut();
+    }
+
+    @Override
+    public boolean isInStruct() {
+        return delegate.isInStruct();
+    }
+
+    @Override
+    public void writeNull() throws IOException {
+        delegate.writeNull();
+    }
+
+    @Override
+    public void writeNull(final IonType type) throws IOException {
+        delegate.writeNull(type);
+    }
+
+    @Override
+    public void writeBool(final boolean value) throws IOException {
+        delegate.writeBool(value);
+    }
+
+    @Override
+    public void writeInt(long value) throws IOException {
+        delegate.writeInt(value);
+    }
+
+    @Override
+    public void writeInt(BigInteger value) throws IOException {
+        delegate.writeInt(value);
+    }
+
+    @Override
+    public void writeFloat(final double value) throws IOException {
+        delegate.writeFloat(value);
+    }
+
+    @Override
+    public void writeDecimal(final BigDecimal value) throws IOException {
+        delegate.writeDecimal(value);
+    }
+
+    @Override
+    public void writeTimestamp(final Timestamp value) throws IOException {
+        delegate.writeTimestamp(value);
+    }
+
+    @Override
+    public void writeSymbol(String content) throws IOException {
+        delegate.writeSymbol(content);
+    }
+
+    @Override
+    public void writeString(final String value) throws IOException {
+        delegate.writeString(value);
+    }
+
+    @Override
+    public void writeClob(byte[] data) throws IOException {
+        delegate.writeClob(data);
+    }
+
+    @Override
+    public void writeClob(final byte[] data, final int offset, final int length) throws IOException {
+        delegate.writeClob(data, offset, length);
+    }
+
+    @Override
+    public void writeBlob(byte[] data) throws IOException {
+        delegate.writeBlob(data);
+    }
+
+    @Override
+    public void writeBlob(final byte[] data, final int offset, final int length) throws IOException {
+        delegate.writeBlob(data, offset, length);
+    }
+
+    @Override
+    public void writeBytes(byte[] data, int offset, int length) throws IOException {
+        delegate.writeBytes(data, offset, length);
+    }
+
+    @Override
+    public void flush() throws IOException {
+        delegate.flush();
+    }
+
+    @Override
+    public void finish() throws IOException {
+        delegate.finish();
+    }
+
+    @Override
+    public void close() throws IOException {
+        delegate.close();
+    }
+}
diff --git a/test/com/amazon/ion/streaming/ReaderTestCase.java b/test/com/amazon/ion/streaming/ReaderTestCase.java
index c39208d8b0..07fd80bb74 100644
--- a/test/com/amazon/ion/streaming/ReaderTestCase.java
+++ b/test/com/amazon/ion/streaming/ReaderTestCase.java
@@ -47,22 +47,27 @@ public void tearDown() throws Exception
 
     //========================================================================
 
-    void read(byte[] ionData)
+    protected void read(byte[] ionData)
     {
         in = myReaderMaker.newReader(system(), ionData);
     }
 
-    void read(byte[] ionData, InputStreamWrapper wrapper)
+    protected void read(byte[] ionData, InputStreamWrapper wrapper)
         throws IOException
     {
         in = myReaderMaker.newReader(system(), ionData, wrapper);
     }
 
-    void read(String ionText)
+    protected void read(String ionText)
     {
         in = myReaderMaker.newReader(system(), ionText);
     }
 
+    protected void readVerbatim(String ionText)
+    {
+        in = myReaderMaker.newReaderVerbatim(system(), ionText);
+    }
+
     //========================================================================
 
     protected ReaderChecker check()

From e821b665031f1f478c6bf0a4d8d8382a3217a004 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 25 Jul 2023 15:04:00 -0700
Subject: [PATCH 279/490] Adds missing null checks to binary IonReader methods
 that return primitives.

---
 .../impl/IonReaderContinuableCoreBinary.java  |  8 ++--
 .../IonReaderContinuableTopLevelBinary.java   | 16 -------
 .../amazon/ion/impl/IonReaderTextSystemX.java |  1 -
 test/com/amazon/ion/streaming/ReaderTest.java | 45 ++++++++++++++++++-
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
index 5ab13d2dd7..f0c17da89d 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -549,7 +549,7 @@ private void throwDueToInvalidType(IonType type) {
 
     @Override
     public int byteSize() {
-        if (valueTid == null || (!IonType.isLob(valueTid.type) && !valueTid.isNull)) {
+        if (valueTid == null || !IonType.isLob(valueTid.type) || valueTid.isNull) {
             throw new IonException("Reader must be positioned on a blob or clob.");
         }
         return (int) (valueMarker.endIndex - valueMarker.startIndex);
@@ -607,7 +607,7 @@ public Decimal decimalValue() {
     @Override
     public long longValue() {
         long value;
-        if (valueTid.type == IonType.INT) {
+        if (valueTid.type == IonType.INT && !valueTid.isNull) {
             if (valueTid.length == 0) {
                 return 0;
             }
@@ -667,7 +667,7 @@ public int intValue() {
     @Override
     public double doubleValue() {
         double value;
-        if (valueTid.type == IonType.FLOAT) {
+        if (valueTid.type == IonType.FLOAT && !valueTid.isNull) {
             int length = (int) (valueMarker.endIndex - valueMarker.startIndex);
             if (length == 0) {
                 return 0.0d;
@@ -714,7 +714,7 @@ public Date dateValue() {
 
     @Override
     public boolean booleanValue() {
-        if (valueTid == null || IonType.BOOL != valueTid.type) {
+        if (valueTid == null || IonType.BOOL != valueTid.type || valueTid.isNull) {
             throwDueToInvalidType(IonType.BOOL);
         }
         return minorVersion == 0 ? readBoolean_1_0() : readBoolean_1_1();
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index ea130068a1..d3e0da6a5c 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -219,14 +219,6 @@ public boolean booleanValue() {
         return super.booleanValue();
     }
 
-    @Override
-    public int intValue() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.intValue();
-    }
-
     @Override
     public long longValue() {
         if (isFillRequired) {
@@ -299,14 +291,6 @@ public SymbolToken symbolValue() {
         return super.symbolValue();
     }
 
-    @Override
-    public int byteSize() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.byteSize();
-    }
-
     @Override
     public byte[] newBytes() {
         if (isFillRequired) {
diff --git a/src/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
index b04423034a..023288f03a 100644
--- a/src/com/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/com/amazon/ion/impl/IonReaderTextSystemX.java
@@ -845,7 +845,6 @@ public int getBytes(byte[] buffer, int offset, int len)
                     _lob_value_position = 0;
                 }
 
-                assert(_current_value_save_point_loaded && _current_value_save_point.isDefined());
                 _scanner.save_point_activate(_current_value_save_point);
 
                 len_read = readBytes(buffer, offset, len);
diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/test/com/amazon/ion/streaming/ReaderTest.java
index 554a741b33..363b91aa5d 100644
--- a/test/com/amazon/ion/streaming/ReaderTest.java
+++ b/test/com/amazon/ion/streaming/ReaderTest.java
@@ -51,18 +51,59 @@ public void testNullInt()
             read("null.int");
             assertEquals(IonType.INT, in.next());
             assertTrue(in.isNullValue());
-            assertEquals(null, in.bigIntegerValue());
+            assertNull(in.bigIntegerValue());
+            assertThrows(Exception.class, () -> in.intValue());
+            assertThrows(Exception.class, () -> in.longValue());
         }
         {
             for (final String hex : Arrays.asList("E0 01 00 EA 2F", "E0 01 00 EA 3F")) {
                 read(BinaryTest.hexToBytes(hex));
                 assertEquals(IonType.INT, in.next());
                 assertTrue(in.isNullValue());
-                assertEquals(null, in.bigIntegerValue());
+                assertNull(in.bigIntegerValue());
             }
         }
     }
 
+    @Test
+    public void testNullFloat()
+    {
+        read("null.float");
+        assertEquals(IonType.FLOAT, in.next());
+        assertTrue(in.isNullValue());
+        assertNull(in.bigIntegerValue());
+        assertThrows(Exception.class, () -> in.intValue());
+        assertThrows(Exception.class, () -> in.longValue());
+        assertThrows(Exception.class, () -> in.doubleValue());
+    }
+
+    @Test
+    public void testNullBool()
+    {
+        read("null.bool");
+        assertEquals(IonType.BOOL, in.next());
+        assertTrue(in.isNullValue());
+        assertThrows(Exception.class, () -> in.booleanValue());
+    }
+
+    @Test
+    public void testNullBlob() {
+        testNullLob(IonType.BLOB);
+    }
+
+    @Test
+    public void testNullClob() {
+        testNullLob(IonType.CLOB);
+    }
+
+    public void testNullLob(IonType type) {
+        read("null." + type.name().toLowerCase());
+        assertEquals(type, in.next());
+        assertTrue(in.isNullValue());
+        assertThrows(Exception.class, () -> in.newBytes());
+        assertThrows(Exception.class, () -> in.getBytes(new byte[0], 0, 0));
+    }
+
     @Test
     public void testStepInOnNull() throws IOException
     {

From 165f6d73a5bf99f4e460a29d6eb4263e79fe7e70 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 14 Aug 2023 16:08:00 -0700
Subject: [PATCH 280/490] Allows the binary reader to read incrementally from
 GZIP streams containing incomplete payloads.

---
 src/com/amazon/ion/impl/IonCursorBinary.java  |   8 +-
 ...IonReaderContinuableApplicationBinary.java |  31 ++++--
 .../ion/impl/_Private_IonReaderBuilder.java   | 102 +++++++++++++++++-
 ...onReaderContinuableTopLevelBinaryTest.java |  87 +++++++++++++++
 .../ion/system/IonReaderBuilderTest.java      |  40 +++++++
 5 files changed, 253 insertions(+), 15 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index ce160e9ea5..30f292d6f9 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -157,7 +157,7 @@ private static class RefillableState {
     /**
      * The index at which the next byte received will be written. Always greater than or equal to `offset`.
      */
-    private long limit;
+    long limit;
 
     /**
      * A slice of the current buffer.
@@ -553,6 +553,9 @@ private int readByteWithoutBuffering() {
         int b = -1;
         try {
             b = refillableState.inputStream.read();
+        } catch (EOFException e) {
+            // Certain InputStream implementations (e.g. GZIPInputStream) throw EOFException if more bytes are requested
+            // to read than are currently available (e.g. if a header or trailer is incomplete).
         } catch (IOException e) {
             throwAsIonException(e);
         }
@@ -630,6 +633,9 @@ private void refill(long numberOfBytesToFill) {
         int numberOfBytesFilled = -1;
         try {
             numberOfBytesFilled = refillableState.inputStream.read(buffer, (int) limit, (int) numberOfBytesToFill);
+        } catch (EOFException e) {
+            // Certain InputStream implementations (e.g. GZIPInputStream) throw EOFException if more bytes are requested
+            // to read than are currently available (e.g. if a header or trailer is incomplete).
         } catch (IOException e) {
             throwAsIonException(e);
         }
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index d7b4340ede..13f882b82e 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -130,17 +130,26 @@ class IonReaderContinuableApplicationBinary extends IonReaderContinuableCoreBina
         });
         registerOversizedValueHandler(
             () -> {
-                if (
-                    state != State.READING_VALUE || // The reader is currently processing a symbol table.
-                    (
-                        parent == null && hasAnnotations && ( // The reader is on an annotated top-level value.
-                            // The value's type is not yet known; it might be a symbol table.
-                            super.getType() == null ||
-                            // The value's type is known. It can be determined whether it is a symbol table.
-                            isPositionedOnSymbolTable()
-                        )
-                    )
-                ) {
+                boolean mightBeSymbolTable = true;
+                if (state == State.READING_VALUE) {
+                    // The reader is not currently processing a symbol table.
+                    if (parent != null || !hasAnnotations) {
+                        // The value is either not at the top level, or is unannotated, so it cannot be a symbol table.
+                        mightBeSymbolTable = false;
+                    } else if (annotationSequenceMarker.startIndex >= 0 && annotationSequenceMarker.endIndex <= limit) {
+                        // The annotations on the value are available.
+                        if (startsWithIonSymbolTable()) {
+                            // The first annotation on the value is $ion_symbol_table. It may be a symbol table if
+                            // its type is not yet known (null); it is definitely a symbol table if its type is STRUCT.
+                            IonType type = super.getType();
+                            mightBeSymbolTable = type == null || type == IonType.STRUCT;
+                        } else {
+                            // The first annotation on the value is not $ion_symbol_table, so it cannot be a symbol table.
+                            mightBeSymbolTable = false;
+                        }
+                    }
+                }
+                if (mightBeSymbolTable) {
                     builder.getBufferConfiguration().getOversizedSymbolTableHandler().onOversizedSymbolTable();
                     terminate();
                 } else {
diff --git a/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java b/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
index 436d26ed77..17834a0bc0 100644
--- a/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
+++ b/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
@@ -12,6 +12,7 @@
 import com.amazon.ion.util.IonStreamUtils;
 
 import java.io.ByteArrayInputStream;
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -92,6 +93,96 @@ protected void mutationCheck() {
 
     }
 
+    /**
+     * InputStream that reads from exactly two delegate InputStreams in sequence. The second delegate remains
+     * in place even if it indicates EOF during a read call. This behavior differentiates this implementation from
+     * SequenceInputStream, which will return EOF forever after its final delegate returns EOF for the first time.
+     * The TwoElementSequenceInputStream allows the second delegate InputStream to return valid data if it subsequently
+     * receives more data, which is common when performing continuable reads.
+     */
+    private static final class TwoElementSequenceInputStream extends InputStream {
+
+        /**
+         * The first InputStream in the sequence.
+         */
+        private final InputStream first;
+
+        /**
+         * The last InputStream in the sequence.
+         */
+        private final InputStream last;
+
+        /**
+         * The current InputStream.
+         */
+        private InputStream in;
+
+        /**
+         * Constructor.
+         * @param first first InputStream in the sequence.
+         * @param last last InputStream in the sequence.
+         */
+        private TwoElementSequenceInputStream(final InputStream first, final InputStream last) {
+            this.first = first;
+            this.last = last;
+            this.in = first;
+        }
+
+        @Override
+        public int available() throws IOException {
+            return first.available() + last.available();
+        }
+
+        @Override
+        public int read() throws IOException {
+            int b = in.read();
+            if (b < 0 && in == first) {
+                in = last;
+                b = in.read();
+            }
+            return b;
+        }
+
+        @Override
+        public int read(final byte[] b, final int off, final int len) throws IOException {
+            int bytesToRead = len;
+            int bytesRead = 0;
+            int destinationOffset = off;
+            while (true) {
+                int bytesReadThisIteration = in.read(b, destinationOffset, bytesToRead);
+                if (bytesReadThisIteration < 0) {
+                    if (in == first) {
+                        in = last;
+                        continue;
+                    }
+                    break;
+                }
+                bytesRead += bytesReadThisIteration;
+                if (bytesRead == len) {
+                    break;
+                } else if (in == last) {
+                    // There's no other source of bytes, so return fewer bytes than requested.
+                    break;
+                }
+                bytesToRead -= bytesReadThisIteration;
+                destinationOffset += bytesReadThisIteration;
+            }
+            if (bytesRead > 0) {
+                return bytesRead;
+            }
+            return -1;
+        }
+
+        @Override
+        public void close() throws IOException {
+            try {
+                first.close();
+            } finally {
+                last.close();
+            }
+        }
+    }
+
     @FunctionalInterface
     interface IonReaderFromBytesFactoryText {
         IonReader makeReader(IonCatalog catalog, byte[] ionData, int offset, int length, _Private_LocalSymbolTableFactory lstFactory);
@@ -209,9 +300,14 @@ static IonReader buildReader(
         if (startsWithGzipHeader(possibleIVM, bytesRead)) {
             try {
                 ionData = new GZIPInputStream(
-                    new SequenceInputStream(new ByteArrayInputStream(possibleIVM, 0, bytesRead), ionData)
+                    new TwoElementSequenceInputStream(new ByteArrayInputStream(possibleIVM, 0, bytesRead), ionData)
                 );
-                bytesRead = ionData.read(possibleIVM);
+                try {
+                    bytesRead = ionData.read(possibleIVM);
+                } catch (EOFException e) {
+                    // Only a GZIP header was available, so this may be a binary Ion stream.
+                    bytesRead = 0;
+                }
             } catch (IOException e) {
                 throw new IonException(e);
             }
@@ -221,7 +317,7 @@ static IonReader buildReader(
         }
         InputStream wrapper;
         if (bytesRead > 0) {
-            wrapper = new SequenceInputStream(
+            wrapper = new TwoElementSequenceInputStream(
                 new ByteArrayInputStream(possibleIVM, 0, bytesRead),
                 ionData
             );
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 05eb631070..95bac6362d 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -42,6 +42,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
@@ -51,6 +52,8 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
 
 import static com.amazon.ion.BitUtils.bytes;
 import static org.junit.Assert.assertArrayEquals;
@@ -3036,4 +3039,88 @@ public void skipWithoutEnoughDataNonIncrementalFails() throws Exception {
         reader.close();
     }
 
+    @Test
+    public void concatenatedAfterGZIPHeader() throws Exception {
+        // Tests that a stream that initially contains only a GZIP header can be read successfully if more data
+        // is later made available.
+        final int gzipHeaderLength = 10; // Length of the GZIP header, as defined by the GZIP spec.
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (OutputStream gzip = new GZIPOutputStream(out)) {
+            gzip.write(bytes(0xE0, 0x01, 0x00, 0xEA)); // IVM
+        }
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+
+        // First, feed just the GZIP header bytes. On next(), the GZIPInputStream will throw EOFException, which is
+        // handled by the reader.
+        pipe.receive(out.toByteArray(), 0, gzipHeaderLength);
+        reader = readerFor(new GZIPInputStream(pipe));
+        nextExpect(null);
+
+        // Now feed the bytes for an Ion value, spanning the value across two GZIP payloads.
+        try (OutputStream gzip = new GZIPOutputStream(out)) {
+            gzip.write(bytes(0x2E)); // Positive int with length subfield
+        }
+        try (OutputStream gzip = new GZIPOutputStream(out)) {
+            gzip.write(bytes(0x81, 0x01)); // Length 1, value 1
+        }
+        byte[] bytes = out.toByteArray();
+        byte[] withoutGzipHeader = new byte[bytes.length - gzipHeaderLength];
+        System.arraycopy(bytes, gzipHeaderLength, withoutGzipHeader, 0, withoutGzipHeader.length);
+        pipe.receive(withoutGzipHeader);
+        nextExpect(IonType.INT);
+        expectInt(1);
+        nextExpect(null);
+    }
+
+    @Test
+    public void concatenatedAfterMissingGZIPTrailer() throws Exception {
+        // Tests that a stream that initially ends without a GZIP trailer can be read successfully if more data
+        // eventually ending with a GZIP trailer is made available.
+        final int gzipTrailerLength = 8; // Length of the GZIP trailer, as defined by the GZIP spec.
+        // Limiting the size of the buffer allows the test to exercise a single-byte read from the underlying input,
+        // which only occurs after a value is determined to be oversized, but still needs to be partially processed
+        // to determine whether it might be a symbol table.
+        final int maxBufferSize = 6;
+        ByteArrayOutputStream out1 = new ByteArrayOutputStream();
+        try (OutputStream gzip = new GZIPOutputStream(out1)) {
+            // IVM followed by an annotation wrapper that declares length 7, then three overpadded VarUInt bytes that
+            // indicate two bytes of annotations follow, followed by two overpadded VarUInt bytes that indicate that
+            // the value's only annotation has SID 4 ('name').
+            gzip.write(bytes(0xE0, 0x01, 0x00, 0xEA, 0xE7, 0x00, 0x00, 0x82, 0x00, 0x84));
+        }
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+
+        // First, feed the bytes (representing an incomplete Ion value) to the reader, but without a GZIP trailer.
+        byte[] out1Bytes = out1.toByteArray();
+        byte[] withoutTrailer = new byte[out1Bytes.length - gzipTrailerLength];
+        System.arraycopy(out1Bytes, 0, withoutTrailer, 0, withoutTrailer.length);
+        pipe.receive(withoutTrailer);
+        reader = boundedReaderFor(new GZIPInputStream(pipe), maxBufferSize, maxBufferSize, byteAndOversizedValueCountingHandler);
+
+        // During this next(), the reader will read and discard
+        // the IVM, then hold all the rest of these bytes in its buffer, which is then at its maximum size. At that
+        // point, the reader will attempt to read another byte (expecting a type ID byte), and determine that the
+        // value is oversized because the buffer is already at its maximum size. Since the byte cannot be buffered,
+        // the reader consumes it directly from the underlying InputStream using a single-byte read, which causes
+        // GZIPInputStream to throw EOFException because the GZIP trailer is missing.
+        nextExpect(null);
+
+        // Now, finish the previous GZIP payload by appending the trailer, then append a concatenated GZIP payload
+        // that contains the rest of the Ion value.
+        pipe.receive(out1Bytes, out1Bytes.length - gzipTrailerLength, gzipTrailerLength);
+        ByteArrayOutputStream out2 = new ByteArrayOutputStream();
+        try (OutputStream gzip = new GZIPOutputStream(out2)) {
+            // Positive integer length 1, with value 1 (the rest of the annotated value), then integer 0.
+            gzip.write(bytes(0x21, 0x01, 0x20));
+        }
+        pipe.receive(out2.toByteArray());
+
+        // On this next, the reader will finish skipping the oversized value by calling skip() on the underlying
+        // GZIPInputStream, which is able to complete the request successfully now that the GZIP trailer is available.
+        // The following value (integer 0) is then read successfully.
+        nextExpect(IonType.INT);
+        expectInt(0);
+        assertEquals(1, oversizedCounter.get());
+        nextExpect(null);
+    }
 }
diff --git a/test/com/amazon/ion/system/IonReaderBuilderTest.java b/test/com/amazon/ion/system/IonReaderBuilderTest.java
index a79d6a7482..a58928cd71 100644
--- a/test/com/amazon/ion/system/IonReaderBuilderTest.java
+++ b/test/com/amazon/ion/system/IonReaderBuilderTest.java
@@ -15,6 +15,7 @@
 
 package com.amazon.ion.system;
 
+import static com.amazon.ion.BitUtils.bytes;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
@@ -29,11 +30,14 @@
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonWriter;
+import com.amazon.ion.impl.ResizingPipedInputStream;
 import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 import com.amazon.ion.impl._Private_IonConstants;
@@ -187,4 +191,40 @@ public void testIncrementalReadingSupportsAutoGzip() throws IOException
         reader2.close();
     }
 
+    @Test
+    public void concatenatedAfterGZIPHeader() throws Exception {
+        // Tests that a stream that initially contains only a GZIP header can be read successfully if more data
+        // is later made available.
+        IonReaderBuilder builder = IonReaderBuilder.standard();
+        builder.withIncrementalReadingEnabled(true);
+        final int gzipHeaderLength = 10; // Length of the GZIP header, as defined by the GZIP spec.
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (OutputStream gzip = new GZIPOutputStream(out)) {
+            gzip.write(bytes(0xE0, 0x01, 0x00, 0xEA)); // IVM
+        }
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+
+        // First, feed just the GZIP header bytes. On next(), the GZIPInputStream will throw EOFException, which is
+        // handled by the reader.
+        pipe.receive(out.toByteArray(), 0, gzipHeaderLength);
+
+        IonReader reader = builder.build(pipe);
+        assertNull(reader.next());
+
+        // Now feed the bytes for an Ion value, spanning the value across two GZIP payloads.
+        try (OutputStream gzip = new GZIPOutputStream(out)) {
+            gzip.write(bytes(0x2E)); // Positive int with length subfield
+        }
+        try (OutputStream gzip = new GZIPOutputStream(out)) {
+            gzip.write(bytes(0x81, 0x01)); // Length 1, value 1
+        }
+        byte[] bytes = out.toByteArray();
+        byte[] withoutGzipHeader = new byte[bytes.length - gzipHeaderLength];
+        System.arraycopy(bytes, gzipHeaderLength, withoutGzipHeader, 0, withoutGzipHeader.length);
+        pipe.receive(withoutGzipHeader);
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(1, reader.intValue());
+        assertNull(reader.next());
+    }
+
 }

From 64acc2e039725601f1f4d68539b71f733d514d4d Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 21 Aug 2023 17:14:54 -0700
Subject: [PATCH 281/490] Fixes EOF detection logic to allow for partial reads
 of incomplete values when incremental reading is disabled.

---
 src/com/amazon/ion/impl/IonCursorBinary.java  |  15 +-
 .../impl/IonReaderContinuableCoreBinary.java  |  19 ++
 .../IonReaderContinuableTopLevelBinary.java   | 223 ++++++------------
 .../amazon/ion/system/IonReaderBuilder.java   |  17 +-
 ...onReaderContinuableTopLevelBinaryTest.java |  90 +++++++
 5 files changed, 192 insertions(+), 172 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index 30f292d6f9..1015a94f6f 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -261,6 +261,11 @@ private static class RefillableState {
      */
     boolean isSlowMode;
 
+    /**
+     * Indicates whether the current value extends beyond the end of the buffer.
+     */
+    boolean isValueIncomplete = false;
+
     /**
      * The total number of bytes that had been consumed from the stream as of the last time progress was reported to
      * the data handler.
@@ -852,6 +857,9 @@ private long calculateEndIndex_1_0(IonTypeID valueTid, boolean isAnnotated) {
                 endIndex = (b & LOWER_SEVEN_BITS_BITMASK);
             } else {
                 endIndex = readVarUInt_1_0(b);
+                if (endIndex < 0) {
+                    throw new IonException("Unsupported value: declared length is too long.");
+                }
             }
         } else {
             endIndex = valueTid.length;
@@ -1163,8 +1171,7 @@ private boolean readHeader(final int typeIdByte, final boolean isAnnotated, fina
             }
             setMarker(endIndex, markerToSet);
             if (endIndex > limit) {
-                event = Event.NEEDS_DATA;
-                return true;
+                isValueIncomplete = true;
             }
         }
         markerToSet.typeId = valueTid;
@@ -1276,7 +1283,7 @@ private boolean slowReadValueHeader(IonTypeID valueTid, boolean isAnnotated, Mar
             validateAnnotationWrapperEndIndex(endIndex);
         }
         setMarker(endIndex, markerToSet);
-        if (event == Event.START_CONTAINER && endIndex > -1 && availableAt(peekIndex) >= valueLength) {
+        if (event == Event.START_CONTAINER && endIndex > -1 && endIndex <= limit) {
             refillableState.fillDepth = containerIndex + 1;
         }
         return false;
@@ -1803,7 +1810,7 @@ void registerOversizedValueHandler(BufferConfiguration.OversizedValueHandler ove
 
     @Override
     public Event endStream() {
-        if (isAwaitingMoreData()) {
+        if (isValueIncomplete || isAwaitingMoreData()) {
             throw new IonException("Unexpected EOF.");
         }
         return Event.NEEDS_DATA;
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
index f0c17da89d..cbb5f2a272 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -519,11 +519,20 @@ public boolean isNullValue() {
         return valueTid != null && valueTid.isNull;
     }
 
+    /**
+     * Performs any logic necessary to prepare a scalar value for parsing. In general nothing needs to be done, but
+     * subclasses may wish to provide different behavior, such as ensuring that the value is present in the buffer.
+     */
+    void prepareScalar() {
+        // May be overridden.
+    }
+
     @Override
     public IntegerSize getIntegerSize() {
         if (valueTid.type != IonType.INT || valueTid.isNull) {
             return null;
         }
+        prepareScalar();
         if (valueTid.length < 0) {
             return IntegerSize.BIG_INTEGER;
         } else if (valueTid.length < INT_SIZE_IN_BYTES) {
@@ -552,6 +561,7 @@ public int byteSize() {
         if (valueTid == null || !IonType.isLob(valueTid.type) || valueTid.isNull) {
             throw new IonException("Reader must be positioned on a blob or clob.");
         }
+        prepareScalar();
         return (int) (valueMarker.endIndex - valueMarker.startIndex);
     }
 
@@ -582,6 +592,7 @@ public BigDecimal bigDecimalValue() {
         if (valueTid.isNull) {
             return null;
         }
+        prepareScalar();
         peekIndex = valueMarker.startIndex;
         if (peekIndex >= valueMarker.endIndex) {
             return BigDecimal.ZERO;
@@ -597,6 +608,7 @@ public Decimal decimalValue() {
         if (valueTid.isNull) {
             return null;
         }
+        prepareScalar();
         peekIndex = valueMarker.startIndex;
         if (peekIndex >= valueMarker.endIndex) {
             return Decimal.ZERO;
@@ -611,6 +623,7 @@ public long longValue() {
             if (valueTid.length == 0) {
                 return 0;
             }
+            prepareScalar();
             value = minorVersion == 0 ? readLong_1_0() : readLong_1_1();
         } else if (valueTid.type == IonType.FLOAT) {
             scalarConverter.addValue(doubleValue());
@@ -642,6 +655,7 @@ public BigInteger bigIntegerValue() {
             if (valueTid.length == 0) {
                 return BigInteger.ZERO;
             }
+            prepareScalar();
             value = minorVersion == 0 ? readBigInteger_1_0() : readBigInteger_1_1();
         } else if (valueTid.type == IonType.FLOAT) {
             if (valueTid.isNull) {
@@ -668,6 +682,7 @@ public int intValue() {
     public double doubleValue() {
         double value;
         if (valueTid.type == IonType.FLOAT && !valueTid.isNull) {
+            prepareScalar();
             int length = (int) (valueMarker.endIndex - valueMarker.startIndex);
             if (length == 0) {
                 return 0.0d;
@@ -699,6 +714,7 @@ public Timestamp timestampValue() {
         if (valueTid.isNull) {
             return null;
         }
+        prepareScalar();
         peekIndex = valueMarker.startIndex;
         return minorVersion == 0 ? readTimestamp_1_0() : readTimestamp_1_1();
     }
@@ -717,6 +733,7 @@ public boolean booleanValue() {
         if (valueTid == null || IonType.BOOL != valueTid.type || valueTid.isNull) {
             throwDueToInvalidType(IonType.BOOL);
         }
+        prepareScalar();
         return minorVersion == 0 ? readBoolean_1_0() : readBoolean_1_1();
     }
 
@@ -728,6 +745,7 @@ public String stringValue() {
         if (valueTid.isNull) {
             return null;
         }
+        prepareScalar();
         ByteBuffer utf8InputBuffer = prepareByteBuffer(valueMarker.startIndex, valueMarker.endIndex);
         return utf8Decoder.decode(utf8InputBuffer, (int) (valueMarker.endIndex - valueMarker.startIndex));
     }
@@ -740,6 +758,7 @@ public int symbolValueId() {
         if (valueTid.isNull) {
             return -1;
         }
+        prepareScalar();
         return (int) readUInt(valueMarker.startIndex, valueMarker.endIndex);
     }
 
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index d3e0da6a5c..318e1c8c22 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -3,8 +3,6 @@
 
 package com.amazon.ion.impl;
 
-import com.amazon.ion.Decimal;
-import com.amazon.ion.IntegerSize;
 import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
@@ -17,14 +15,9 @@
 import com.amazon.ion.Span;
 import com.amazon.ion.SpanProvider;
 import com.amazon.ion.SymbolTable;
-import com.amazon.ion.SymbolToken;
-import com.amazon.ion.Timestamp;
 import com.amazon.ion.system.IonReaderBuilder;
 
 import java.io.InputStream;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Date;
 
 /**
  * An optionally continuable (i.e., incremental) binary {@link IonReader} implementation. Continuability is enabled
@@ -114,52 +107,75 @@ public boolean hasNext() {
 
     /**
      * Advances to the next value and attempts to fill it.
-     * @return true if not enough data was available in the stream; otherwise, false.
      */
-    private boolean nextAndFill() {
+    private void nextAndFill() {
         while (true) {
-            if (!isFillingValue) {
-                if (nextValue() == IonCursor.Event.NEEDS_DATA) {
-                    type = null;
-                    return true;
-                }
+            if (!isFillingValue && nextValue() == IonCursor.Event.NEEDS_DATA) {
+                return;
             }
             isFillingValue = true;
-            event = fillValue();
-            if (event == IonCursor.Event.NEEDS_DATA) {
-                type = null;
-                return true;
-            } else if (event == IonCursor.Event.NEEDS_INSTRUCTION) {
-                // The value was skipped for being too large. Get the next one.
-                isFillingValue = false;
-                continue;
+            if (fillValue() == IonCursor.Event.NEEDS_DATA) {
+                return;
+            }
+            isFillingValue = false;
+            if (event != IonCursor.Event.NEEDS_INSTRUCTION) {
+                type = super.getType();
+                return;
+            }
+            // The value was skipped for being too large. Get the next one.
+        }
+    }
+
+    /**
+     * Handles the case where the current value extends beyond the end of the reader's internal buffer.
+     */
+    private void handleIncompleteValue() {
+        if (event == Event.NEEDS_DATA) {
+            // The reader has already consumed all bytes from the buffer. If non-continuable, this is the end of the
+            // stream. If continuable, continue to return null from next().
+            if (isNonContinuable) {
+                endStream();
+            }
+        } else if (isNonContinuable) {
+            // The reader is non-continuable and has not yet consumed all bytes from the buffer, so it can continue
+            // reading the incomplete container until the end is reached.
+            // Each value contains its own length prefix, so it is safe to reset the incomplete flag before attempting
+            // to read the value.
+            isValueIncomplete = false;
+            if (nextValue() == IonCursor.Event.NEEDS_DATA) {
+                // Attempting to read the partial value required consuming the remaining bytes in the stream, which
+                // is now at its end.
+                isValueIncomplete = true;
+                endStream();
+            } else {
+                // The reader successfully positioned itself on a value within an incomplete container.
+                type = super.getType();
             }
-            break;
         }
-        isFillingValue = false;
-        return false;
     }
 
     @Override
     public IonType next() {
-        if (!isSlowMode || isNonContinuable || parent != null) {
-            IonCursor.Event event = super.nextValue();
-            if (event == IonCursor.Event.NEEDS_DATA) {
+        type = null;
+        if (isValueIncomplete) {
+            handleIncompleteValue();
+        } else if (!isSlowMode || isNonContinuable || parent != null) {
+            if (nextValue() == IonCursor.Event.NEEDS_DATA) {
                 if (isNonContinuable) {
                     endStream();
                 }
-                type = null;
-                return null;
-            } else if (event == IonCursor.Event.NEEDS_INSTRUCTION) {
-                // The value was skipped for being too large.
+            } else if (isValueIncomplete && !isNonContinuable) {
+                // The value is incomplete and the reader is continuable, so the reader must return null from next().
+                // Setting the event to NEEDS_DATA ensures that if the user attempts to skip past the incomplete
+                // value, null will continue to be returned.
+                event = Event.NEEDS_DATA;
+            } else {
                 isFillingValue = false;
+                type = super.getType();
             }
         } else {
-            if (nextAndFill()) {
-                return null;
-            }
+            nextAndFill();
         }
-        type = super.getType();
         return type;
     }
 
@@ -183,128 +199,23 @@ public IonType getType() {
     /**
      * Prepares a scalar value to be parsed by ensuring it is present in the buffer.
      */
-    private void prepareScalar() {
-        if (event == IonCursor.Event.VALUE_READY) {
-            return;
-        }
-        if (event != IonCursor.Event.START_SCALAR) {
-            // Note: existing tests expect IllegalStateException in this case.
-            throw new IllegalStateException("Reader is not positioned on a scalar value.");
-        }
-        if (fillValue() == Event.VALUE_READY) {
-            return;
-        }
-        if (event == Event.NEEDS_INSTRUCTION) {
-            throw new OversizedValueException();
-        }
-        throw new IonException("Unexpected EOF.");
-    }
-
-    @Override
-    public IntegerSize getIntegerSize() {
-        if (type != IonType.INT) {
-            return null;
-        }
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.getIntegerSize();
-    }
-
-    @Override
-    public boolean booleanValue() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.booleanValue();
-    }
-
-    @Override
-    public long longValue() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.longValue();
-    }
-
-    @Override
-    public BigInteger bigIntegerValue() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.bigIntegerValue();
-    }
-
     @Override
-    public double doubleValue() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.doubleValue();
-    }
-
-    @Override
-    public BigDecimal bigDecimalValue() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.bigDecimalValue();
-    }
-
-    @Override
-    public Decimal decimalValue() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.decimalValue();
-    }
-
-    @Override
-    public Date dateValue() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.dateValue();
-    }
-
-    @Override
-    public Timestamp timestampValue() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.timestampValue();
-    }
-
-    @Override
-    public String stringValue() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.stringValue();
-    }
-
-    @Override
-    public SymbolToken symbolValue() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.symbolValue();
-    }
-
-    @Override
-    public byte[] newBytes() {
-        if (isFillRequired) {
-            prepareScalar();
-        }
-        return super.newBytes();
-    }
-
-    @Override
-    public int getBytes(byte[] buffer, int offset, int len) {
-        if (isFillRequired) {
-            prepareScalar();
+    void prepareScalar() {
+        if (!isValueIncomplete) {
+            if (!isSlowMode || event == IonCursor.Event.VALUE_READY) {
+                // Nothing to do.
+                return;
+            }
+            if (isFillRequired) {
+                if (fillValue() == Event.VALUE_READY) {
+                    return;
+                }
+                if (event == Event.NEEDS_INSTRUCTION) {
+                    throw new OversizedValueException();
+                }
+            }
         }
-        return super.getBytes(buffer, offset, len);
+        throw new IonException("Unexpected EOF.");
     }
 
     private static class IonReaderBinarySpan extends DowncastingFaceted implements Span, OffsetSpan {
diff --git a/src/com/amazon/ion/system/IonReaderBuilder.java b/src/com/amazon/ion/system/IonReaderBuilder.java
index 17a99c1110..c5d3240d24 100644
--- a/src/com/amazon/ion/system/IonReaderBuilder.java
+++ b/src/com/amazon/ion/system/IonReaderBuilder.java
@@ -179,21 +179,14 @@ protected IonCatalog validateCatalog()
      * may be enabled via this option.
      * </p>
      * <p>
-     * When this option is enabled, auto-detection of GZIP data is not supported; the byte array or InputStream
-     * implementation provided to {@link #build(byte[])} or {@link #build(InputStream)} must return uncompressed bytes.
-     * This can be achieved by wrapping the data in a GZIPInputStream and passing it to {@link #build(InputStream)}.
-     * </p>
-     * <p>
-     * Additionally, when this option is enabled, annotation iterators are reused by default, improving performance.
+     * When this option is enabled, annotation iterators are reused by default, improving performance.
      * See {@link #withAnnotationIteratorReuseEnabled(boolean)} for more information and to disable that option.
      * </p>
      * <p>
-     * Although the incremental binary IonReader provides performance superior to the non-incremental binary IonReader
-     * for both incremental and non-incremental use cases, there is one caveat: the incremental implementation
-     * must be able to buffer an entire top-level value and any preceding system values (Ion version marker(s) and
-     * symbol table(s)) in memory. This will not be a problem for the vast majority of Ion streams, as it is rare for a
-     * single top-level value or symbol table to exceed a few megabytes in size. However, if the size of the stream's
-     * values risk exceeding the available memory, then this option must not be enabled.
+     * There is one caveat to note when using this option: the incremental implementation must be able to buffer an
+     * entire top-level value in memory. This will not be a problem for the vast majority of Ion streams, as it is rare
+     * for a single top-level value or symbol table to exceed a few megabytes in size. However, if the size of the
+     * stream's values risks exceeding the available memory, then this option must not be enabled.
      * </p>
      * @param isEnabled true if the option is enabled; otherwise, false.
      *
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 95bac6362d..e2dcbabbfc 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -3123,4 +3123,94 @@ public void concatenatedAfterMissingGZIPTrailer() throws Exception {
         assertEquals(1, oversizedCounter.get());
         nextExpect(null);
     }
+
+    @Test
+    public void incompleteContainerNonContinuable() throws Exception {
+        readerBuilder.withIncrementalReadingEnabled(false);
+        reader = readerFor(0xB6, 0x20);
+        // Because the reader is non-continuable, it can safely convey the incomplete value's type without making any
+        // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
+        // read incomplete values. If the user attempts to consume or skip past the value, the reader will raise an
+        // unexpected EOF exception.
+        nextExpect(IonType.LIST);
+        // Note: the legacy binary reader implementation did not throw in this case; that behavior remains.
+        reader.close();
+    }
+
+    @Test
+    public void incompleteContainerContinuable() throws Exception {
+        readerBuilder.withIncrementalReadingEnabled(true);
+        reader = readerFor(0xB6, 0x20);
+        // Unlike the non-continuable case, the continuable reader cannot return LIST in this case because the
+        // value is not yet complete. If it returned LIST, it would indicate to the user that it is safe to consume
+        // or skip the value with the guarantee that no unexpected EOF exception can occur.
+        nextExpect(null);
+        // When closed, the reader must throw an exception for unexpected EOF to disambiguate clean stream end from
+        // incomplete value.
+        thrown.expect(IonException.class);
+        reader.close();
+    }
+
+    @Test
+    public void skipIncompleteContainerNonContinuable() throws Exception {
+        readerBuilder.withIncrementalReadingEnabled(false);
+        reader = readerFor(0xB6, 0x20);
+        // Because the reader is non-continuable, it can safely convey the incomplete value's type without making any
+        // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
+        // read incomplete values.
+        nextExpect(IonType.LIST);
+        // Attempting to skip past the value, results in an unexpected EOF exception.
+        thrown.expect(IonException.class);
+        reader.next();
+    }
+
+    @Test
+    public void skipIncompleteContainerContinuable() throws Exception {
+        readerBuilder.withIncrementalReadingEnabled(true);
+        reader = readerFor(0xB6, 0x20);
+        // Unlike the non-continuable case, the continuable reader cannot return LIST in this case because the
+        // value is not yet complete. If it returned LIST, it would indicate to the user that it is safe to consume
+        // or skip the value with the guarantee that no unexpected EOF exception can occur.
+        nextExpect(null);
+        // Attempting to skip past the incomplete value should still not raise an exception in continuable mode.
+        nextExpect(null);
+        // When closed, the reader must throw an exception for unexpected EOF to disambiguate clean stream end from
+        // incomplete value.
+        thrown.expect(IonException.class);
+        reader.close();
+    }
+
+    @Test
+    public void completeValueInIncompleteContainerNonContinuable() throws Exception {
+        readerBuilder.withIncrementalReadingEnabled(false);
+        reader = readerFor(0xB6, 0x20);
+        // Because the reader is non-continuable, it can safely convey the incomplete value's type without making any
+        // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
+        // read incomplete values. If the user attempts to consume or skip past the value, the reader will raise an
+        // unexpected EOF exception.
+        nextExpect(IonType.LIST);
+        // The incomplete container can be partially read until the bytes run out.
+        stepIn();
+        nextExpect(IonType.INT);
+        expectInt(0);
+        nextExpect(null);
+        // Note: the legacy binary reader implementation did not throw in this case; that behavior remains.
+        reader.close();
+    }
+
+    @Test
+    public void incompleteValueInIncompleteContainerNonContinuable() throws Exception {
+        readerBuilder.withIncrementalReadingEnabled(false);
+        reader = readerFor(0xB6, 0x21);
+        // Because the reader is non-continuable, it can safely convey the incomplete value's type without making any
+        // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
+        // read incomplete values. If the user attempts to consume or skip past the value, the reader will raise an
+        // unexpected EOF exception.
+        nextExpect(IonType.LIST);
+        stepIn();
+        nextExpect(IonType.INT);
+        // Attempting to skip past the incomplete value results in an error.
+        thrown.expect(IonException.class);
+        reader.next();
+    }
 }

From 27dd6fec0767dbd800a79cc342a506b55f97bc38 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 22 Aug 2023 12:03:59 -0700
Subject: [PATCH 282/490] Clarified that annotation iterators are only valid
 while positioned on the current value.

---
 src/com/amazon/ion/IonReader.java             |  8 ++-
 .../impl/IonReaderContinuableApplication.java |  8 ++-
 ...IonReaderContinuableApplicationBinary.java | 18 +++---
 .../amazon/ion/system/IonReaderBuilder.java   | 63 -------------------
 4 files changed, 25 insertions(+), 72 deletions(-)

diff --git a/src/com/amazon/ion/IonReader.java b/src/com/amazon/ion/IonReader.java
index ae22818048..233e58cc0f 100644
--- a/src/com/amazon/ion/IonReader.java
+++ b/src/com/amazon/ion/IonReader.java
@@ -225,12 +225,18 @@ public interface IonReader
      * Return the annotations on the curent value as an iterator.  The
      * iterator is empty (hasNext() returns false on the first call) if
      * there are no annotations on the current value.
-     *
+     * <p>
      * Implementations *may* throw {@link UnknownSymbolException} from
      * this method if any annotation contains unknown text. Alternatively,
      * implementations may provide an Iterator that throws
      * {@link UnknownSymbolException} only when the user navigates the
      * iterator to an annotation with unknown text.
+     * <p>
+     * Note: the iterator returned by this method is only valid while
+     * the reader remains positioned on the current value (i.e., before
+     * next, step in, or step out). Use cases that require storing a
+     * value's annotations after advancing past that value should either
+     * copy them from the iterator or call {@link #getTypeAnnotations()}.
      *
      * @return not null.
      */
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplication.java b/src/com/amazon/ion/impl/IonReaderContinuableApplication.java
index f087733d94..81b80f41bc 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplication.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplication.java
@@ -36,12 +36,18 @@ interface IonReaderContinuableApplication extends IonReaderContinuableCore {
      * Return the annotations on the curent value as an iterator.  The
      * iterator is empty (hasNext() returns false on the first call) if
      * there are no annotations on the current value.
-     *
+     * <p>
      * Implementations *may* throw {@link UnknownSymbolException} from
      * this method if any annotation contains unknown text. Alternatively,
      * implementations may provide an Iterator that throws
      * {@link UnknownSymbolException} only when the user navigates the
      * iterator to an annotation with unknown text.
+     * <p>
+     * Note: the iterator returned by this method is only valid while
+     * the reader remains positioned on the current value (i.e., before
+     * next, step in, or step out). Use cases that require storing a
+     * value's annotations after advancing past that value should either
+     * copy them from the iterator or call {@link #getTypeAnnotations()}.
      *
      * @return not null.
      */
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 13f882b82e..2e1901ad51 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -86,6 +86,9 @@ class IonReaderContinuableApplicationBinary extends IonReaderContinuableCoreBina
     // symbol table is encountered in the stream.
     private SymbolTable cachedReadOnlySymbolTable = null;
 
+    // The reusable annotation iterator.
+    private final AnnotationSequenceIterator annotationIterator = new AnnotationSequenceIterator();
+
     // ------
 
     /**
@@ -160,18 +163,18 @@ class IonReaderContinuableApplicationBinary extends IonReaderContinuableCoreBina
     }
 
     /**
-     * Non-reusable iterator over the annotations on the current value. May be iterated even if the reader advances
-     * past the current value.
+     * Reusable iterator over the annotations on the current value.
      */
-    private class SingleUseAnnotationSequenceIterator implements Iterator<String> {
+    private class AnnotationSequenceIterator implements Iterator<String> {
 
         // All of the annotation SIDs on the current value.
-        private final IntList annotationSids;
+        private IntList annotationSids;
         // The index into `annotationSids` containing the next annotation to be returned.
         private int index = 0;
 
-        SingleUseAnnotationSequenceIterator() {
-            annotationSids = new IntList(getAnnotationSidList());
+        void reset() {
+            index = 0;
+            annotationSids = getAnnotationSidList();
         }
 
         @Override
@@ -1026,7 +1029,8 @@ public Iterator<String> iterateTypeAnnotations() {
         if (!hasAnnotations) {
             return EMPTY_ITERATOR;
         }
-        return new SingleUseAnnotationSequenceIterator();
+        annotationIterator.reset();
+        return annotationIterator;
     }
 
     @Override
diff --git a/src/com/amazon/ion/system/IonReaderBuilder.java b/src/com/amazon/ion/system/IonReaderBuilder.java
index c5d3240d24..17c2fa9142 100644
--- a/src/com/amazon/ion/system/IonReaderBuilder.java
+++ b/src/com/amazon/ion/system/IonReaderBuilder.java
@@ -45,7 +45,6 @@ public abstract class IonReaderBuilder
     private IonCatalog catalog = null;
     private boolean isIncrementalReadingEnabled = false;
     private IonBufferConfiguration bufferConfiguration = null;
-    private boolean isAnnotationIteratorReuseEnabled = true;
 
     protected IonReaderBuilder()
     {
@@ -56,7 +55,6 @@ protected IonReaderBuilder(IonReaderBuilder that)
         this.catalog = that.catalog;
         this.isIncrementalReadingEnabled = that.isIncrementalReadingEnabled;
         this.bufferConfiguration = that.bufferConfiguration;
-        this.isAnnotationIteratorReuseEnabled = that.isAnnotationIteratorReuseEnabled;
     }
 
     /**
@@ -179,10 +177,6 @@ protected IonCatalog validateCatalog()
      * may be enabled via this option.
      * </p>
      * <p>
-     * When this option is enabled, annotation iterators are reused by default, improving performance.
-     * See {@link #withAnnotationIteratorReuseEnabled(boolean)} for more information and to disable that option.
-     * </p>
-     * <p>
      * There is one caveat to note when using this option: the incremental implementation must be able to buffer an
      * entire top-level value in memory. This will not be a problem for the vast majority of Ion streams, as it is rare
      * for a single top-level value or symbol table to exceed a few megabytes in size. However, if the size of the
@@ -266,63 +260,6 @@ public IonBufferConfiguration getBufferConfiguration() {
         return bufferConfiguration;
     }
 
-    /**
-     * <p>
-     * Determines whether readers will reuse the annotation iterator returned by
-     * {@link IonReader#iterateTypeAnnotations()}. When enabled, the returned iterator remains valid only while the
-     * reader remains positioned at the current value; storing the iterator and iterating its values after that will
-     * cause undefined behavior. This provides improved performance and memory efficiency when frequently iterating
-     * annotations. When disabled, the returned iterator may be stored and used to retrieve the annotations that were
-     * on the value at the reader's position at the time of the call, regardless of where the reader is currently
-     * positioned.
-     * </p>
-     * <p>
-     * Currently, this option only has an effect when incremental reading is enabled (see
-     * {@link #withIncrementalReadingEnabled(boolean)}). In that case, it is enabled by default. Non-incremental readers
-     * always act as if this option were disabled.
-     * </p>
-     * @param isEnabled true if the option is enabled; otherwise, false.
-     *
-     * @return this builder instance, if mutable;
-     * otherwise a mutable copy of this builder.
-     *
-     * @see #setAnnotationIteratorReuseEnabled()
-     * @see #setAnnotationIteratorReuseDisabled()
-     */
-    public IonReaderBuilder withAnnotationIteratorReuseEnabled(boolean isEnabled) {
-        IonReaderBuilder b = mutable();
-        if (isEnabled) {
-            b.setAnnotationIteratorReuseEnabled();
-        } else {
-            b.setAnnotationIteratorReuseDisabled();
-        }
-        return b;
-    }
-
-    /**
-     * @see #withAnnotationIteratorReuseEnabled(boolean)
-     */
-    public void setAnnotationIteratorReuseEnabled() {
-        mutationCheck();
-        isAnnotationIteratorReuseEnabled = true;
-    }
-
-    /**
-     * @see #withAnnotationIteratorReuseEnabled(boolean)
-     */
-    public void setAnnotationIteratorReuseDisabled() {
-        mutationCheck();
-        isAnnotationIteratorReuseEnabled = false;
-    }
-
-    /**
-     * @see #withAnnotationIteratorReuseEnabled(boolean)
-     * @return true if annotation iterator reuse is enabled; otherwise, false.
-     */
-    public boolean isAnnotationIteratorReuseEnabled() {
-        return isAnnotationIteratorReuseEnabled;
-    }
-
     /**
      * Based on the builder's configuration properties, creates a new IonReader
      * instance over the given block of Ion data, detecting whether it's text or

From dba64fc7b1e12720487d0eb7a8a87c8bc5605812 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 22 Aug 2023 14:54:27 -0700
Subject: [PATCH 283/490] Removes SymbolTokenWithImportLocation.

---
 src/com/amazon/ion/impl/ImportLocation.java   | 53 -------------
 ...IonReaderContinuableApplicationBinary.java | 16 ++--
 .../impl/IonReaderNonContinuableSystem.java   |  6 +-
 .../ion/impl/LocalSymbolTableImports.java     | 15 ----
 .../impl/SymbolTokenWithImportLocation.java   | 76 -------------------
 ...onReaderContinuableTopLevelBinaryTest.java | 46 ++++-------
 6 files changed, 21 insertions(+), 191 deletions(-)
 delete mode 100644 src/com/amazon/ion/impl/ImportLocation.java
 delete mode 100644 src/com/amazon/ion/impl/SymbolTokenWithImportLocation.java

diff --git a/src/com/amazon/ion/impl/ImportLocation.java b/src/com/amazon/ion/impl/ImportLocation.java
deleted file mode 100644
index 0fa859e9a9..0000000000
--- a/src/com/amazon/ion/impl/ImportLocation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.amazon.ion.impl;
-
-/**
- * A SymbolToken's import location, allowing for symbols with unknown text to be mapped to a particular slot
- * in a shared symbol table.
- * NOTE: this is currently not publicly accessible, but it is an important step toward being able to correctly
- * round-trip symbols with unknown text from shared symbol tables in different symbol table contexts. See
- * https://github.com/amazon-ion/ion-java/issues/126 . Support is added now to avoid risking the appearance of performance
- * degradation if ImportLocation support were added after initial release of the incremental IonReader.
- */
-class ImportLocation {
-
-    // The name of the shared symbol table.
-    final String name;
-
-    // The index into the shared symbol table.
-    final int sid;
-
-    ImportLocation(String name, int sid) {
-        this.name = name;
-        this.sid = sid;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getSid() {
-        return sid;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("ImportLocation::{name: %s, sid: %d}", name, sid);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof ImportLocation)) {
-            return false;
-        }
-        ImportLocation that = (ImportLocation) o;
-        return this.getName().equals(that.getName()) && this.getSid() == that.getSid();
-    }
-
-    @Override
-    public int hashCode() {
-        int result = 17;
-        result += 31 * getName().hashCode();
-        result += 31 * getSid();
-        return result;
-    }
-}
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 2e1901ad51..7364ed9cff 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -326,7 +326,7 @@ public SymbolToken find(String text) {
             // 2. If we make mapView a Map<String, SymbolToken>, then we are guaranteeing that we will allocate at least
             // one SymbolToken per symbol (because mapView is created in the constructor of LocalSymbolTableSnapshot)
             // even though it's unlikely most will ever be needed.
-            return new SymbolTokenWithImportLocation(text, sid, null);
+            return new SymbolTokenImpl(text, sid);
         }
 
         @Override
@@ -565,17 +565,11 @@ private SymbolToken getSymbolToken(int sid) {
         SymbolToken token = symbolTokensById.get(sid);
         if (token == null) {
             String text = getSymbolString(sid, imports, symbols);
-            ImportLocation importLocation = null;
-            if (text == null) {
-                // Note: this will never be a system symbol.
-                if (sid > 0 && sid < firstLocalSymbolId) {
-                    importLocation = imports.getImportLocation(sid);
-                } else {
-                    // All symbols with unknown text in the local symbol range are equivalent to symbol zero.
-                    sid = 0;
-                }
+            if (text == null && sid >= firstLocalSymbolId) {
+                // All symbols with unknown text in the local symbol range are equivalent to symbol zero.
+                sid = 0;
             }
-            token = new SymbolTokenWithImportLocation(text, sid, importLocation);
+            token = new SymbolTokenImpl(text, sid);
             symbolTokensById.set(sid, token);
         }
         return token;
diff --git a/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java b/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java
index e6642486c4..36112fa7bc 100644
--- a/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java
+++ b/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java
@@ -293,7 +293,7 @@ public SymbolToken[] getTypeAnnotationSymbols() {
         SymbolTable symbolTable = getSymbolTable();
         for (int i = 0; i < annotationIds.length; i++) {
             int sid = annotationIds[i];
-            annotationSymbolTokens[i] = new SymbolTokenWithImportLocation(symbolTable.findKnownSymbol(sid), sid, null);
+            annotationSymbolTokens[i] = new SymbolTokenImpl(symbolTable.findKnownSymbol(sid), sid);
         }
         return annotationSymbolTokens;
     }
@@ -330,7 +330,7 @@ public SymbolToken getFieldNameSymbol() {
         if (sid < 0) {
             return null;
         }
-        return new SymbolTokenWithImportLocation(getSymbolTable().findKnownSymbol(sid), sid, null);
+        return new SymbolTokenImpl(getSymbolTable().findKnownSymbol(sid), sid);
     }
 
     @Override
@@ -342,7 +342,7 @@ public SymbolToken symbolValue() {
             prepareScalar();
             sid = reader.symbolValueId();
         }
-        return new SymbolTokenWithImportLocation(getSymbolTable().findKnownSymbol(sid), sid, null);
+        return new SymbolTokenImpl(getSymbolTable().findKnownSymbol(sid), sid);
     }
 
     @Override
diff --git a/src/com/amazon/ion/impl/LocalSymbolTableImports.java b/src/com/amazon/ion/impl/LocalSymbolTableImports.java
index eb03bf0af9..3f6efe9d5c 100644
--- a/src/com/amazon/ion/impl/LocalSymbolTableImports.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTableImports.java
@@ -278,21 +278,6 @@ SymbolTable[] getImportedTablesNoCopy()
         return myImports;
     }
 
-    /**
-     * Gets the {@link ImportLocation} for the given symbol ID.
-     * @param sid the symbol ID.
-     * @return an ImportLocation, or null if the given symbol ID is not present in the imports.
-     */
-    ImportLocation getImportLocation(int sid) {
-        // TODO once ion-java moves to Java 1.6+, the search for the import could use Arrays.binarySearch.
-        for (int i = myBaseSids.length - 1; i >= 0; i--) {
-            if (myBaseSids[i] < sid) {
-                return new ImportLocation(myImports[i].getName(), sid - myBaseSids[i]);
-            }
-        }
-        return null;
-    }
-
     @Override
     public String toString()
     {
diff --git a/src/com/amazon/ion/impl/SymbolTokenWithImportLocation.java b/src/com/amazon/ion/impl/SymbolTokenWithImportLocation.java
deleted file mode 100644
index cafa55900d..0000000000
--- a/src/com/amazon/ion/impl/SymbolTokenWithImportLocation.java
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-
-package com.amazon.ion.impl;
-
-import com.amazon.ion.SymbolToken;
-import com.amazon.ion.UnknownSymbolException;
-
-/**
- * SymbolToken implementation that includes ImportLocation.
- */
-class SymbolTokenWithImportLocation implements _Private_SymbolToken {
-
-    // The symbol's text, or null if the text is unknown.
-    private final String text;
-
-    // The local symbol ID of this symbol within a particular local symbol table.
-    private final int sid;
-
-    // The import location of the symbol (only relevant if the text is unknown).
-    private final ImportLocation importLocation;
-
-    SymbolTokenWithImportLocation(String text, int sid, ImportLocation importLocation) {
-        this.text = text;
-        this.sid = sid;
-        this.importLocation = importLocation;
-    }
-
-    @Override
-    public String getText() {
-        return text;
-    }
-
-    @Override
-    public String assumeText() {
-        if (text == null) {
-            throw new UnknownSymbolException(sid);
-        }
-        return text;
-    }
-
-    @Override
-    public int getSid() {
-        return sid;
-    }
-
-    // Will be @Override once added to the SymbolToken interface.
-    public ImportLocation getImportLocation() {
-        return importLocation;
-    }
-
-    @Override
-    public String toString() {
-        return String.format("SymbolToken::{text: %s, sid: %d, importLocation: %s}", text, sid, importLocation);
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (!(o instanceof SymbolToken)) return false;
-
-        // NOTE: once ImportLocation is available via the SymbolToken interface, it should be compared here
-        // when text is null.
-        SymbolToken other = (SymbolToken) o;
-        if (getText() == null || other.getText() == null) {
-            return getText() == other.getText();
-        }
-        return getText().equals(other.getText());
-    }
-
-    @Override
-    public int hashCode() {
-        if (getText() != null) return getText().hashCode();
-        return 0;
-    }
-}
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index e2dcbabbfc..4620ac9ac7 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -1296,12 +1296,9 @@ public void ivmResetsImports() throws Exception {
 
     private static void assertSymbolEquals(
         String expectedText,
-        ImportLocation expectedImportLocation,
         SymbolToken actual
     ) {
         assertEquals(expectedText, actual.getText());
-        SymbolTokenWithImportLocation impl = (SymbolTokenWithImportLocation) actual;
-        assertEquals(expectedImportLocation, impl.getImportLocation());
     }
 
     @Test
@@ -1310,18 +1307,18 @@ public void symbolsAsTokens() throws Exception {
         nextExpect(IonType.STRUCT);
         stepIn();
         nextExpect(IonType.SYMBOL);
-        assertSymbolEquals("foo", null, reader.getFieldNameSymbol());
+        assertSymbolEquals("foo", reader.getFieldNameSymbol());
         SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
         assertEquals(1, annotations.length);
-        assertSymbolEquals("uvw", null, annotations[0]);
-        assertSymbolEquals("abc", null, reader.symbolValue());
+        assertSymbolEquals("uvw", annotations[0]);
+        assertSymbolEquals("abc", reader.symbolValue());
         nextExpect(IonType.SYMBOL);
-        assertSymbolEquals("bar", null, reader.getFieldNameSymbol());
+        assertSymbolEquals("bar", reader.getFieldNameSymbol());
         annotations = reader.getTypeAnnotationSymbols();
         assertEquals(2, annotations.length);
-        assertSymbolEquals("qrs", null, annotations[0]);
-        assertSymbolEquals("xyz", null, annotations[1]);
-        assertSymbolEquals("def", null, reader.symbolValue());
+        assertSymbolEquals("qrs", annotations[0]);
+        assertSymbolEquals("xyz", annotations[1]);
+        assertSymbolEquals("def", reader.symbolValue());
         stepOut();
         nextExpect(null);
         closeAndCount();
@@ -1815,36 +1812,19 @@ public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations() thro
         nextExpect(IonType.SYMBOL);
         expectString("def");
         nextExpect(IonType.SYMBOL);
-        SymbolTokenWithImportLocation symbolValue =
-            (SymbolTokenWithImportLocation) reader.symbolValue();
+        SymbolToken symbolValue = reader.symbolValue();
         assertNull(symbolValue.getText());
-        assertEquals(new ImportLocation("foo", 3), symbolValue.getImportLocation());
         nextExpect(IonType.SYMBOL);
-        symbolValue = (SymbolTokenWithImportLocation) reader.symbolValue();
+        symbolValue = reader.symbolValue();
         assertNull(symbolValue.getText());
-        assertEquals(new ImportLocation("foo", 4), symbolValue.getImportLocation());
         nextExpect(IonType.SYMBOL);
         assertEquals("123", reader.stringValue());
         nextExpect(IonType.SYMBOL);
-        symbolValue = (SymbolTokenWithImportLocation) reader.symbolValue();
-        assertEquals(
-            new SymbolTokenWithImportLocation(
-                null,
-                15,
-                new ImportLocation("baz", 1)
-            ),
-            symbolValue
-        );
+        symbolValue = reader.symbolValue();
+        assertEquals(new SymbolTokenImpl(null, 15), symbolValue);
         nextExpect(IonType.SYMBOL);
-        symbolValue = (SymbolTokenWithImportLocation) reader.symbolValue();
-        assertEquals(
-            new SymbolTokenWithImportLocation(
-                null,
-                16,
-                new ImportLocation("baz", 2)
-            ),
-            symbolValue
-        );
+        symbolValue = reader.symbolValue();
+        assertEquals(new SymbolTokenImpl(null, 16), symbolValue);
         nextExpect(null);
         closeAndCount();
     }

From bace02f8d10f9c9867914b189bac6e6528f46548 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 20 Sep 2023 15:48:07 -0700
Subject: [PATCH 284/490] Incorporates feedback from PR #503.

---
 src/com/amazon/ion/IonCursor.java             |  3 +-
 src/com/amazon/ion/impl/IonCursorBinary.java  | 46 ++++++++++---------
 src/com/amazon/ion/impl/IonTypeID.java        | 17 +++++--
 src/com/amazon/ion/impl/Marker.java           |  8 ++++
 ...onReaderContinuableTopLevelBinaryTest.java | 14 ++++++
 5 files changed, 62 insertions(+), 26 deletions(-)

diff --git a/src/com/amazon/ion/IonCursor.java b/src/com/amazon/ion/IonCursor.java
index c0f0a02eae..e124bbb3b7 100644
--- a/src/com/amazon/ion/IonCursor.java
+++ b/src/com/amazon/ion/IonCursor.java
@@ -17,7 +17,8 @@ enum Event {
 
         /**
          * There is not enough data in the stream to complete the requested operation. The operation should be retried
-         * when more data is available.
+         * when more data is available. Note that there is no way to "cancel" a previously requested operation;
+         * requesting a different operation after a `NEEDS_DATA` event has undefined behavior.
          */
         NEEDS_DATA,
 
diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index 1015a94f6f..3f2906dec6 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -40,6 +40,9 @@ class IonCursorBinary implements IonCursor {
     // a new ContainerInfo. Depths greater than 8 are assumed to be rare.
     private static final int CONTAINER_STACK_INITIAL_CAPACITY = 8;
 
+    // When set as an 'endIndex', indicates that the value is delimited.
+    private static final int DELIMITED_MARKER = -1;
+
     /**
      * The kind of location at which `checkpoint` points.
      */
@@ -160,7 +163,8 @@ private static class RefillableState {
     long limit;
 
     /**
-     * A slice of the current buffer.
+     * A slice of the current buffer. May be used to create ByteBuffer views over value representation bytes for
+     * quicker parsing.
      */
     ByteBuffer byteBuffer;
 
@@ -1016,7 +1020,7 @@ private void setCheckpointBeforeUnannotatedTypeId() {
      * @param markerToSet the marker to set.
      */
     private void setMarker(long endIndex, Marker markerToSet) {
-        if (parent != null && endIndex > parent.endIndex && parent.endIndex > -1) {
+        if (parent != null && endIndex > parent.endIndex && parent.endIndex > DELIMITED_MARKER) {
             throw new IonException("Value exceeds the length of its parent container.");
         }
         markerToSet.startIndex = peekIndex;
@@ -1032,7 +1036,7 @@ private boolean checkContainerEnd() {
         if (parent.endIndex > peekIndex) {
             return false;
         }
-        if (parent.endIndex == -1) {
+        if (parent.endIndex == DELIMITED_MARKER) {
             return isSlowMode ? slowIsDelimitedEnd_1_1() : isDelimitedEnd_1_1();
         }
         if (parent.endIndex == peekIndex) {
@@ -1246,7 +1250,7 @@ private boolean slowReadValueHeader(IonTypeID valueTid, boolean isAnnotated, Mar
         long valueLength = 0;
         long endIndex = 0;
         if (valueTid.isDelimited) {
-            endIndex = -1;
+            endIndex = DELIMITED_MARKER;
         } else if (valueTid.variableLength) {
             // At this point the value must be at least 2 more bytes: 1 for the smallest-possible value length
             // and 1 for the smallest-possible value representation.
@@ -1275,15 +1279,15 @@ private boolean slowReadValueHeader(IonTypeID valueTid, boolean isAnnotated, Mar
         if (refillableState.isSkippingCurrentValue) {
             // Any bytes that were skipped directly from the input must still be included in the logical endIndex so
             // that the rest of the oversized value's bytes may be skipped.
-            endIndex = endIndex == -1 ? -1 : (peekIndex + valueLength + refillableState.individualBytesSkippedWithoutBuffering);
+            endIndex = endIndex == DELIMITED_MARKER ? DELIMITED_MARKER : (peekIndex + valueLength + refillableState.individualBytesSkippedWithoutBuffering);
         } else {
-            endIndex = endIndex == -1 ? -1 : (peekIndex + valueLength);
+            endIndex = endIndex == DELIMITED_MARKER ? DELIMITED_MARKER : (peekIndex + valueLength);
         }
         if (isAnnotated) {
             validateAnnotationWrapperEndIndex(endIndex);
         }
         setMarker(endIndex, markerToSet);
-        if (event == Event.START_CONTAINER && endIndex > -1 && endIndex <= limit) {
+        if (event == Event.START_CONTAINER && endIndex > DELIMITED_MARKER && endIndex <= limit) {
             refillableState.fillDepth = containerIndex + 1;
         }
         return false;
@@ -1296,7 +1300,7 @@ private void growContainerStack() {
         Marker[] newStack = new Marker[containerStack.length * 2];
         System.arraycopy(containerStack, 0, newStack, 0, containerStack.length);
         for (int i = containerStack.length; i < newStack.length; i++) {
-            newStack[i] = new Marker(-1 ,-1);
+            newStack[i] = new Marker(-1, -1);
         }
         containerStack = newStack;
     }
@@ -1305,8 +1309,7 @@ private void growContainerStack() {
      * Push a Marker representing the current container onto the stack.
      */
     private void pushContainer() {
-        containerIndex++;
-        if (containerIndex >= containerStack.length) {
+        if (++containerIndex >= containerStack.length) {
             growContainerStack();
         }
         parent = containerStack[containerIndex];
@@ -1325,7 +1328,7 @@ private void quickStepIntoContainer() {
         // Push the remaining length onto the stack, seek past the container's header, and increase the depth.
         pushContainer();
         parent.typeId = valueTid;
-        parent.endIndex = valueTid.isDelimited ? -1 : valueMarker.endIndex;
+        parent.endIndex = valueTid.isDelimited ? DELIMITED_MARKER : valueMarker.endIndex;
         valueTid = null;
         event = Event.NEEDS_INSTRUCTION;
         reset();
@@ -1352,7 +1355,7 @@ private Event slowStepIntoContainer() {
             isSlowMode = false;
         }
         parent.typeId = valueMarker.typeId;
-        parent.endIndex = valueTid.isDelimited ? -1 : valueMarker.endIndex;
+        parent.endIndex = valueTid.isDelimited ? DELIMITED_MARKER : valueMarker.endIndex;
         setCheckpointBeforeUnannotatedTypeId();
         valueTid = null;
         hasAnnotations = false;
@@ -1392,7 +1395,7 @@ public Event stepOutOfContainer() {
             throw new IllegalStateException("Cannot step out at top level.");
         }
         // Seek past the remaining bytes at this depth and pop from the stack.
-        if (parent.endIndex == -1) {
+        if (parent.endIndex == DELIMITED_MARKER) {
             if (skipRemainingDelimitedContainerElements_1_1()) {
                 return event;
             }
@@ -1402,8 +1405,7 @@ public Event stepOutOfContainer() {
         if (!isSlowMode) {
             setCheckpointBeforeUnannotatedTypeId();
         }
-        containerIndex--;
-        if (containerIndex >= 0) {
+        if (--containerIndex >= 0) {
             parent = containerStack[containerIndex];
             if (refillableState != null && containerIndex < refillableState.fillDepth) {
                 resumeSlowMode();
@@ -1438,7 +1440,7 @@ private Event slowStepOutOfContainer() {
         }
         event = Event.NEEDS_DATA;
         // Seek past any remaining bytes from the previous value.
-        if (parent.endIndex == -1) {
+        if (parent.endIndex == DELIMITED_MARKER) {
             if (slowSkipRemainingDelimitedContainerElements_1_1()) {
                 return event;
             }
@@ -1449,8 +1451,7 @@ private Event slowStepOutOfContainer() {
             peekIndex = parent.endIndex;
         }
         setCheckpointBeforeUnannotatedTypeId();
-        containerIndex--;
-        if (containerIndex >= 0) {
+        if (--containerIndex >= 0) {
             parent = containerStack[containerIndex];
         } else {
             parent = null;
@@ -1467,7 +1468,7 @@ private Event slowStepOutOfContainer() {
      * @return true if the end of the container has been reached; otherwise, false.
      */
     private boolean nextContainedToken() {
-        if (parent.endIndex == -1) {
+        if (parent.endIndex == DELIMITED_MARKER) {
             return isDelimitedEnd_1_1();
         } else if (parent.endIndex == peekIndex) {
             event = Event.END_CONTAINER;
@@ -1615,7 +1616,7 @@ private void slowNextToken() {
      * @return true if not enough data was available in the stream; otherwise, false.
      */
     private boolean slowSkipRemainingValueBytes() {
-        if (valueMarker.endIndex == -1 && valueTid != null && valueTid.isDelimited) {
+        if (valueMarker.endIndex == DELIMITED_MARKER && valueTid != null && valueTid.isDelimited) {
             seekPastDelimitedContainer_1_1();
             if (event == Event.NEEDS_DATA) {
                 return true;
@@ -1730,7 +1731,7 @@ private Event slowFillValue() {
         }
         event = Event.NEEDS_DATA;
 
-        if (valueMarker.endIndex == -1) {
+        if (valueMarker.endIndex == DELIMITED_MARKER) {
             if (slowFillDelimitedContainer_1_1()) {
                 return event;
             }
@@ -1772,7 +1773,8 @@ Marker getValueMarker() {
     }
 
     /**
-     * Slices the buffer using the given offset and limit. Slices are treated as if they were at the top level.
+     * Slices the buffer using the given offset and limit. Slices are treated as if they were at the top level. This
+     * can be used to seek the reader to a "span" of bytes that represent a value in the stream.
      * @param offset the offset at which the slice will begin.
      * @param limit the slice's limit.
      */
diff --git a/src/com/amazon/ion/impl/IonTypeID.java b/src/com/amazon/ion/impl/IonTypeID.java
index bfa50a6569..20b3cf9860 100644
--- a/src/com/amazon/ion/impl/IonTypeID.java
+++ b/src/com/amazon/ion/impl/IonTypeID.java
@@ -26,8 +26,11 @@ final class IonTypeID {
     // does not have a type ID, so we will use it to mean 'annotation wrapper' instead.
     static final IonType ION_TYPE_ANNOTATION_WRAPPER = IonType.DATAGRAM;
 
-    // Lookup table from type ID to IonType. See https://amzn.github.io/ion-docs/docs/binary.html#typed-value-formats
-    static final IonType[] ION_TYPES_1_0 = new IonType[] {
+    // Lookup table from type ID to "binary token type", loosely represented by the IonType enum to avoid the need to
+    // define a completely new enum with translations between them. "Binary token types" are a superset of IonType,
+    // adding annotation wrapper and `null` (i.e., illegal).
+    // See https://amzn.github.io/ion-docs/docs/binary.html#typed-value-formats
+    static final IonType[] BINARY_TOKEN_TYPES_1_0 = new IonType[] {
         IonType.NULL,
         IonType.BOOL,
         IonType.INT,
@@ -115,7 +118,7 @@ private IonTypeID(byte id, int minorVersion) {
                 this.type = null;
             } else {
                 this.isNopPad = false;
-                this.type = ION_TYPES_1_0[upperNibble];
+                this.type = BINARY_TOKEN_TYPES_1_0[upperNibble];
             }
             this.isValid = isValid_1_0(upperNibble, lowerNibble, type);
             this.isNull = lowerNibble == NULL_VALUE_NIBBLE;
@@ -141,4 +144,12 @@ private IonTypeID(byte id, int minorVersion) {
             throw new IllegalStateException("Only Ion 1.0 is currently supported.");
         }
     }
+
+    /**
+     * @return a String representation of this object (for debugging).
+     */
+    @Override
+    public String toString() {
+        return String.format("%s(%s)", type, length);
+    }
 }
diff --git a/src/com/amazon/ion/impl/Marker.java b/src/com/amazon/ion/impl/Marker.java
index 72d179747e..593e4fee90 100644
--- a/src/com/amazon/ion/impl/Marker.java
+++ b/src/com/amazon/ion/impl/Marker.java
@@ -31,4 +31,12 @@ class Marker {
         this.startIndex = startIndex;
         this.endIndex = startIndex + length;
     }
+
+    /**
+     * @return a String representation of this object (for debugging).
+     */
+    @Override
+    public String toString() {
+        return String.format("%s[%d:%d]", typeId, startIndex, endIndex);
+    }
 }
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 4620ac9ac7..1e1ac3fc14 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -3193,4 +3193,18 @@ public void incompleteValueInIncompleteContainerNonContinuable() throws Exceptio
         thrown.expect(IonException.class);
         reader.next();
     }
+
+    @Test
+    public void earlyStepOutNonIncremental() throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        reader = readerFor(0xB4, 0x20); // List length 4 followed by a single byte
+        nextExpect(IonType.LIST);
+        stepIn();
+        // Early step-out. The reader could choose to fail here, but it is expensive to check for EOF on every stepOut.
+        stepOut();
+        // However, the reader *must* fail if the user requests the next value, because the stream is incomplete.
+        thrown.expect(IonException.class); // Unexpected EOF
+        nextExpect(null);
+    }
+
 }

From 97e5173647f6d800cf6d96fc41d6ca2bf26c5c9f Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 21 Sep 2023 16:50:20 -0700
Subject: [PATCH 285/490] Incorporates feedback from PRs #504, #505, #506,
 #507, and #508.

---
 src/com/amazon/ion/impl/IonCursorBinary.java  | 46 +++++++++++--------
 ...IonReaderContinuableApplicationBinary.java | 37 +++++++--------
 .../impl/IonReaderContinuableCoreBinary.java  |  2 +-
 3 files changed, 48 insertions(+), 37 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index 3f2906dec6..bbe9dc6faf 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -15,6 +15,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 
 import static com.amazon.ion.util.IonStreamUtils.throwAsIonException;
 
@@ -328,14 +329,25 @@ private static int logBase2(int value) {
      * @return the next power of two greater than or equal to the given number.
      */
     static int nextPowerOfTwo(int value) {
-        return (int) Math.pow(2, logBase2(value));
+        long highBit = Integer.toUnsignedLong(Integer.highestOneBit(value));
+        // Paraphrased from JLS 5.1.3. Narrowing Primitive Conversion
+        // For a narrowing conversion of a floating-point number to an integral type T
+        // If the input is not NaN and is not representable as the target type int, then the value must be too large
+        // (a positive value of large magnitude or positive infinity), and the result is the largest representable
+        // value of type int.
+        return (int)(double) ((highBit == value) ? value : highBit << 1);
     }
 
     /**
      * Cache of configurations for fixed-sized streams. FIXED_SIZE_CONFIGURATIONS[i] returns a configuration with
      * buffer size max(8, 2^i). Retrieve a configuration large enough for a given size using
      * FIXED_SIZE_CONFIGURATIONS(logBase2(size)). Only supports sizes less than or equal to
-     * STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize().
+     * STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize(). This limits the number of fixed-size configurations,
+     * keeping the footprint small and avoiding the need to create fixed-size configurations that require allocating
+     * really large initial buffers. Say the user provides a ByteArrayInputStream backed by a 2 GB byte array -- in
+     * that case, even though the data is fixed, the cursor should not allocate another 2 GB buffer to copy into. In
+     * that case, unless the user provides a custom buffer configuration, the cursor will just use the standard one
+     * that starts at 32K and copy into it incrementally as needed.
      */
     private static final IonBufferConfiguration[] FIXED_SIZE_CONFIGURATIONS;
 
@@ -657,7 +669,7 @@ private void refill(long numberOfBytesToFill) {
     /**
      * Seeks forward in the stream up to the requested number of bytes, from `offset`.
      * @param numberOfBytes the number of bytes to seek from `offset`.
-     * @return true if the seek is complete; otherwise, false.
+     * @return true if not enough data was available in the stream; otherwise, false.
      */
     private boolean slowSeek(long numberOfBytes) {
         long size = availableAt(offset);
@@ -666,7 +678,7 @@ private boolean slowSeek(long numberOfBytes) {
             offset += numberOfBytes;
             refillableState.bytesRequested = 0;
             refillableState.state = State.READY;
-            return true;
+            return false;
         }
         offset = limit;
         long skipped = 0;
@@ -683,11 +695,11 @@ private boolean slowSeek(long numberOfBytes) {
         if (shortfall <= 0) {
             refillableState.bytesRequested = 0;
             refillableState.state = State.READY;
-            return true;
+            return false;
         }
         refillableState.bytesRequested = shortfall;
         refillableState.state = State.SEEK;
-        return false;
+        return true;
     }
 
     /* ---- End: internal buffer manipulation methods ---- */
@@ -968,7 +980,7 @@ private boolean slowMakeBufferReady() {
         boolean isReady;
         switch (refillableState.state) {
             case SEEK:
-                isReady = slowSeek(refillableState.bytesRequested);
+                isReady = !slowSeek(refillableState.bytesRequested);
                 break;
             case FILL:
                 isReady = fillAt(offset, refillableState.bytesRequested);
@@ -1112,7 +1124,7 @@ private boolean slowSeekPastNopPad(long valueLength, boolean isAnnotated) {
                 "Invalid annotation wrapper: NOP pad may not occur inside an annotation wrapper."
             );
         }
-        if (!slowSeek(peekIndex + valueLength - offset)) {
+        if (slowSeek(peekIndex + valueLength - offset)) {
             event = Event.NEEDS_DATA;
             return true;
         }
@@ -1213,15 +1225,13 @@ private boolean slowReadHeader(final int typeIdByte, final boolean isAnnotated,
                 return true;
             }
             setCheckpoint(CheckpointLocation.BEFORE_ANNOTATED_TYPE_ID);
-        } else {
-            if (slowReadValueHeader(valueTid, isAnnotated, markerToSet)) {
-                if (refillableState.isSkippingCurrentValue) {
-                    // If the value will be skipped, its type ID must be set so that the core reader can determine
-                    // whether it represents a symbol table.
-                    markerToSet.typeId = valueTid;
-                }
-                return true;
+        } else if (slowReadValueHeader(valueTid, isAnnotated, markerToSet)) {
+            if (refillableState.isSkippingCurrentValue) {
+                // If the value will be skipped, its type ID must be set so that the core reader can determine
+                // whether it represents a symbol table.
+                markerToSet.typeId = valueTid;
             }
+            return true;
         }
         markerToSet.typeId = valueTid;
         if (checkpointLocation == CheckpointLocation.AFTER_SCALAR_HEADER) {
@@ -1445,7 +1455,7 @@ private Event slowStepOutOfContainer() {
                 return event;
             }
         } else {
-            if (!slowSeek(parent.endIndex - offset)) {
+            if (slowSeek(parent.endIndex - offset)) {
                 return event;
             }
             peekIndex = parent.endIndex;
@@ -1623,7 +1633,7 @@ private boolean slowSkipRemainingValueBytes() {
             }
         } else if (limit >= valueMarker.endIndex) {
             offset = valueMarker.endIndex;
-        } else if (!slowSeek(valueMarker.endIndex - offset)) {
+        } else if (slowSeek(valueMarker.endIndex - offset)) {
             return true;
         }
         peekIndex = offset;
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 7364ed9cff..7967969c6f 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -63,8 +63,8 @@ class IonReaderContinuableApplicationBinary extends IonReaderContinuableCoreBina
     // a particular index is null, that symbol has unknown text.
     private String[] symbols;
 
-    // The max ID of the local symbol table.
-    private int localSymbolMaxId = -1;
+    // The maximum offset into the 'symbols' array that points to a valid local symbol.
+    private int localSymbolMaxOffset = -1;
 
     // The catalog used by the reader to resolve shared symbol table imports.
     private final IonCatalog catalog;
@@ -235,14 +235,15 @@ private class LocalSymbolTableSnapshot implements SymbolTable, SymbolTableAsStru
 
         LocalSymbolTableSnapshot() {
             int importsMaxId = imports.getMaxId();
-            int numberOfLocalSymbols = localSymbolMaxId + 1;
+            int numberOfLocalSymbols = localSymbolMaxOffset + 1;
             // Note: 'imports' is immutable, so a clone is not needed.
             importedTables = imports;
             maxId = importsMaxId + numberOfLocalSymbols;
-            // Map with initial size the number of symbols and load factor 1, meaning it must be full before growing.
-            // It is not expected to grow.
             idToText = new String[numberOfLocalSymbols];
             System.arraycopy(symbols, 0, idToText, 0, numberOfLocalSymbols);
+            // Map with initial size and load factor set so that it will not grow unconditionally when it is filled.
+            // Note: using the default load factor of 0.75 results in better lookup performance than using 1.0 and
+            // filling the map to capacity.
             textToId = new HashMap<>((int) Math.ceil(numberOfLocalSymbols / 0.75), 0.75f);
             for (int i = 0; i < numberOfLocalSymbols; i++) {
                 String symbol = idToText[i];
@@ -428,8 +429,8 @@ public IonStruct getIonRepresentation(ValueFactory valueFactory) {
     private void resetSymbolTable() {
         // The following line is not required for correctness, but it frees the references to the old symbols,
         // potentially allowing them to be garbage collected.
-        Arrays.fill(symbols, 0, localSymbolMaxId + 1, null);
-        localSymbolMaxId = -1;
+        Arrays.fill(symbols, 0, localSymbolMaxOffset + 1, null);
+        localSymbolMaxOffset = -1;
         cachedReadOnlySymbolTable = null;
         if (symbolTokensById != null) {
             symbolTokensById.clear();
@@ -459,7 +460,7 @@ protected void restoreSymbolTable(SymbolTable symbolTable) {
             cachedReadOnlySymbolTable = snapshot;
             imports = snapshot.importedTables;
             firstLocalSymbolId = imports.getMaxId() + 1;
-            localSymbolMaxId = snapshot.maxId - firstLocalSymbolId;
+            localSymbolMaxOffset = snapshot.maxId - firstLocalSymbolId;
             // Note: because `symbols` only grows, `snapshot.listView` will always fit within `symbols`.
             System.arraycopy(snapshot.idToText, 0, symbols, 0, snapshot.idToText.length);
             if (symbolTokensById != null) {
@@ -470,7 +471,7 @@ protected void restoreSymbolTable(SymbolTable symbolTable) {
             resetSymbolTable();
             cachedReadOnlySymbolTable = symbolTable;
             resetImports();
-            localSymbolMaxId = -1;
+            localSymbolMaxOffset = -1;
         }
     }
 
@@ -537,11 +538,11 @@ String getSymbol(int sid) {
         if (sid < firstLocalSymbolId) {
             return imports.findKnownSymbol(sid);
         }
-        int localSid = sid - firstLocalSymbolId;
-        if (localSid > localSymbolMaxId) {
+        int localSymbolOffset = sid - firstLocalSymbolId;
+        if (localSymbolOffset > localSymbolMaxOffset) {
             throw new IonException("Symbol ID exceeds the max ID of the symbol table.");
         }
-        return symbols[localSid];
+        return symbols[localSymbolOffset];
     }
 
     /**
@@ -550,7 +551,7 @@ String getSymbol(int sid) {
      * @return a SymbolToken.
      */
     private SymbolToken getSymbolToken(int sid) {
-        int symbolTableSize = localSymbolMaxId + firstLocalSymbolId + 1; // +1 because the max ID is 0-indexed.
+        int symbolTableSize = localSymbolMaxOffset + firstLocalSymbolId + 1; // +1 because the max ID is 0-indexed.
         if (symbolTokensById == null) {
             symbolTokensById = new ArrayList<>(symbolTableSize);
         }
@@ -607,7 +608,7 @@ private boolean valueUnavailable() {
         private void growSymbolsArray(int shortfall) {
             int newSize = nextPowerOfTwo(symbols.length + shortfall);
             String[] resized = new String[newSize];
-            System.arraycopy(symbols, 0, resized, 0, localSymbolMaxId + 1);
+            System.arraycopy(symbols, 0, resized, 0, localSymbolMaxOffset + 1);
             symbols = resized;
         }
 
@@ -619,16 +620,16 @@ private void finishReadingSymbolTableStruct() {
             }
             if (newSymbols != null) {
                 int numberOfNewSymbols = newSymbols.size();
-                int numberOfAvailableSlots = symbols.length - (localSymbolMaxId + 1);
+                int numberOfAvailableSlots = symbols.length - (localSymbolMaxOffset + 1);
                 int shortfall = numberOfNewSymbols - numberOfAvailableSlots;
                 if (shortfall > 0) {
                     growSymbolsArray(shortfall);
                 }
-                int i = localSymbolMaxId;
+                int i = localSymbolMaxOffset;
                 for (String newSymbol : newSymbols) {
                     symbols[++i] = newSymbol;
                 }
-                localSymbolMaxId += newSymbols.size();
+                localSymbolMaxOffset += newSymbols.size();
             }
             state = State.READING_VALUE;
         }
@@ -929,7 +930,7 @@ public Event nextValue() {
     @Override
     public SymbolTable getSymbolTable() {
         if (cachedReadOnlySymbolTable == null) {
-            if (localSymbolMaxId < 0 && imports == ION_1_0_IMPORTS) {
+            if (localSymbolMaxOffset < 0 && imports == ION_1_0_IMPORTS) {
                 cachedReadOnlySymbolTable = imports.getSystemSymbolTable();
             } else {
                 cachedReadOnlySymbolTable = new LocalSymbolTableSnapshot();
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
index cbb5f2a272..862520d14f 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -171,7 +171,7 @@ int readVarUInt_1_0() {
     int readVarUInt_1_0(byte currentByte) {
         int result = currentByte & LOWER_SEVEN_BITS_BITMASK;
         do {
-            // Note: if the varUInt  is malformed such that it extends beyond the declared length of the value *and*
+            // Note: if the varUInt is malformed such that it extends beyond the declared length of the value *and*
             // beyond the end of the buffer, this will result in IndexOutOfBoundsException because only the declared
             // value length has been filled. Preventing this is simple: if (peekIndex >= valueMarker.endIndex) throw
             // new IonException(); However, we choose not to perform that check here because it is not worth sacrificing

From 49328aa5b73e2f5a1e8b14aec4b81ce56c7509fc Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 21 Sep 2023 17:07:17 -0700
Subject: [PATCH 286/490] Renames unprefixed 'quick' methods in IonCursorBinary
 with the 'unchecked' prefix.

---
 src/com/amazon/ion/impl/IonCursorBinary.java | 75 ++++++++++----------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index bbe9dc6faf..5308dffc7e 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -15,7 +15,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
-import java.util.Arrays;
 
 import static com.amazon.ion.util.IonStreamUtils.throwAsIonException;
 
@@ -368,7 +367,6 @@ static int nextPowerOfTwo(int value) {
     /**
      * Validates the given configuration.
      * @param configuration the configuration to validate.
-     * @return the validated configuration.
      */
     private static void validate(IonBufferConfiguration configuration) {
         if (configuration.getInitialBufferSize() < 1) {
@@ -453,19 +451,20 @@ private static IonBufferConfiguration getFixedSizeConfigurationFor(
     }
 
     /*
-     * This class contains methods with the prefix 'slow'. These methods often
-     * have prefix-free 'quick' variants that are faster because they are always
-     * called from contexts where the buffer is already known to hold all bytes
-     * that will be required or available to complete the call, and therefore no
-     * filling is required. Sometimes a 'slow' method does not have a 'quick'
-     * variant. This is typically because the 'quick' variant is simple enough
-     * to be written inline at the call site. Public API methods will delegate
-     * to either the 'slow' or 'quick' variant depending on whether 'isSlowMode'
-     * is true. In general, 'isSlowMode' may be disabled whenever the input source
-     * is a byte array (and therefore cannot grow and does not need to be filled),
+     * This class contains methods with the prefix 'slow', which usually have
+     * counterparts with the prefix 'unchecked'. The 'unchecked' variants are
+     * faster because they are always called from contexts where the buffer is
+     * already known to hold all bytes that will be required or available to
+     * complete the call, and therefore no filling or bounds checking is required.
+     * Sometimes a 'slow' method does not have an 'unchecked' variant. This is
+     * typically because the 'unchecked' variant is simple enough to be written
+     * inline at the call site. Public API methods will delegate to either the
+     * 'slow' or 'unchecked' variant depending on whether 'isSlowMode' is true.
+     * In general, 'isSlowMode' may be disabled whenever the input source is a
+     * byte array (and therefore cannot grow and does not need to be filled),
      * or whenever the current value's parent container has already been filled.
      * Where a choice exists, 'slow' methods must call other 'slow' methods, and
-     * 'quick' methods must call other 'quick' methods.
+     * 'unchecked' methods must call other 'unchecked' methods.
      */
 
     /* ---- Begin: internal buffer manipulation methods ---- */
@@ -712,7 +711,7 @@ private boolean slowSeek(long numberOfBytes) {
      * called when it is known that the buffer already contains all the bytes in the VarUInt.
      * @return the value.
      */
-    private long readVarUInt_1_0(byte currentByte) {
+    private long uncheckedReadVarUInt_1_0(byte currentByte) {
         long result = currentByte & LOWER_SEVEN_BITS_BITMASK;
         do {
             // Note: if the varUInt  is malformed such that it extends beyond the declared length of the value *and*
@@ -757,14 +756,14 @@ private long slowReadVarUInt_1_0() {
      * @param valueTid the type ID of the annotation wrapper.
      * @return true if the length of the wrapped value extends beyond the bytes currently buffered; otherwise, false.
      */
-    private boolean readAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
+    private boolean uncheckedReadAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
         long endIndex;
         if (valueTid.variableLength) {
             byte b = buffer[(int) peekIndex++];
             if (b < 0) {
                 endIndex = (b & LOWER_SEVEN_BITS_BITMASK);
             } else {
-                endIndex = readVarUInt_1_0(b);
+                endIndex = uncheckedReadVarUInt_1_0(b);
             }
         } else {
             endIndex = valueTid.length;
@@ -779,7 +778,7 @@ private boolean readAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
         if (b < 0) {
             annotationsLength = (b & LOWER_SEVEN_BITS_BITMASK);
         } else {
-            annotationsLength = (int) readVarUInt_1_0(b);
+            annotationsLength = (int) uncheckedReadVarUInt_1_0(b);
         }
         annotationSequenceMarker.startIndex = peekIndex;
         annotationSequenceMarker.endIndex = annotationSequenceMarker.startIndex + annotationsLength;
@@ -872,7 +871,7 @@ private long calculateEndIndex_1_0(IonTypeID valueTid, boolean isAnnotated) {
             if (b < 0) {
                 endIndex = (b & LOWER_SEVEN_BITS_BITMASK);
             } else {
-                endIndex = readVarUInt_1_0(b);
+                endIndex = uncheckedReadVarUInt_1_0(b);
                 if (endIndex < 0) {
                     throw new IonException("Unsupported value: declared length is too long.");
                 }
@@ -884,7 +883,7 @@ private long calculateEndIndex_1_0(IonTypeID valueTid, boolean isAnnotated) {
         if (valueTid.type != null && valueTid.type.ordinal() >= LIST_TYPE_ORDINAL) {
             event = Event.START_CONTAINER;
         } else if (valueTid.isNopPad) {
-            seekPastNopPad(endIndex, isAnnotated);
+            uncheckedSeekPastNopPad(endIndex, isAnnotated);
         } else {
             event = Event.START_SCALAR;
         }
@@ -907,7 +906,7 @@ private boolean slowReadFieldName_1_0() {
 
     /* ---- Ion 1.1 ---- */
 
-    private long readVarUInt_1_1() {
+    private long uncheckedReadVarUInt_1_1() {
         throw new UnsupportedOperationException();
     }
 
@@ -915,7 +914,7 @@ private long slowReadVarUInt_1_1() {
         throw new UnsupportedOperationException();
     }
 
-    private boolean readAnnotationWrapperHeader_1_1(IonTypeID valueTid) {
+    private boolean uncheckedReadAnnotationWrapperHeader_1_1(IonTypeID valueTid) {
         throw new UnsupportedOperationException();
     }
 
@@ -927,7 +926,7 @@ private long calculateEndIndex_1_1(IonTypeID valueTid, boolean isAnnotated) {
         throw new UnsupportedOperationException();
     }
 
-    private void readFieldName_1_1() {
+    private void uncheckedReadFieldName_1_1() {
         throw new UnsupportedOperationException();
     }
 
@@ -935,7 +934,7 @@ private boolean slowReadFieldName_1_1() {
         throw new UnsupportedOperationException();
     }
 
-    private boolean isDelimitedEnd_1_1() {
+    private boolean uncheckedIsDelimitedEnd_1_1() {
         throw new UnsupportedOperationException();
     }
 
@@ -1049,7 +1048,7 @@ private boolean checkContainerEnd() {
             return false;
         }
         if (parent.endIndex == DELIMITED_MARKER) {
-            return isSlowMode ? slowIsDelimitedEnd_1_1() : isDelimitedEnd_1_1();
+            return isSlowMode ? slowIsDelimitedEnd_1_1() : uncheckedIsDelimitedEnd_1_1();
         }
         if (parent.endIndex == peekIndex) {
             event = Event.END_CONTAINER;
@@ -1097,7 +1096,7 @@ private void readIvm() {
      * @param endIndex the endIndex of the NOP pad.
      * @param isAnnotated true if the NOP pad occurs within an annotation wrapper (which is illegal); otherwise, false.
      */
-    private void seekPastNopPad(long endIndex, boolean isAnnotated) {
+    private void uncheckedSeekPastNopPad(long endIndex, boolean isAnnotated) {
         if (isAnnotated) {
             throw new IonException(
                 "Invalid annotation wrapper: NOP pad may not occur inside an annotation wrapper."
@@ -1165,7 +1164,7 @@ private void validateAnnotationWrapperEndIndex(long endIndex) {
      * @return false if the header belonged to NOP pad; otherwise, true. When false, the caller should call the method
      *  again to read the header for the value that follows.
      */
-    private boolean readHeader(final int typeIdByte, final boolean isAnnotated, final Marker markerToSet) {
+    private boolean uncheckedReadHeader(final int typeIdByte, final boolean isAnnotated, final Marker markerToSet) {
         IonTypeID valueTid = typeIds[typeIdByte];
         if (!valueTid.isValid) {
             throw new IonException("Invalid type ID.");
@@ -1173,11 +1172,11 @@ private boolean readHeader(final int typeIdByte, final boolean isAnnotated, fina
             if (isAnnotated) {
                 throw new IonException("Nested annotation wrappers are invalid.");
             }
-            if (minorVersion == 0 ? readAnnotationWrapperHeader_1_0(valueTid) : readAnnotationWrapperHeader_1_1(valueTid)) {
+            if (minorVersion == 0 ? uncheckedReadAnnotationWrapperHeader_1_0(valueTid) : uncheckedReadAnnotationWrapperHeader_1_1(valueTid)) {
                 return true;
             }
             hasAnnotations = true;
-            return readHeader(buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK, true, valueMarker);
+            return uncheckedReadHeader(buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK, true, valueMarker);
         } else {
             long endIndex = minorVersion == 0
                 ? calculateEndIndex_1_0(valueTid, isAnnotated)
@@ -1328,7 +1327,7 @@ private void pushContainer() {
     /**
      * Step into the current container.
      */
-    private void quickStepIntoContainer() {
+    private void uncheckedStepIntoContainer() {
         if (valueTid == null || valueTid.type.ordinal() < LIST_TYPE_ORDINAL) {
             // Note: this is IllegalStateException for consistency with the legacy binary IonReader implementation.
             // Ideally it would be IonException and IllegalStateException would be reserved for indicating bugs in
@@ -1381,7 +1380,7 @@ public Event stepIntoContainer() {
             }
             isSlowMode = false;
         }
-        quickStepIntoContainer();
+        uncheckedStepIntoContainer();
         return event;
     }
 
@@ -1477,9 +1476,9 @@ private Event slowStepOutOfContainer() {
      * Advances to the next value within a container, checking for container end and consuming the field name, if any.
      * @return true if the end of the container has been reached; otherwise, false.
      */
-    private boolean nextContainedToken() {
+    private boolean uncheckedNextContainedToken() {
         if (parent.endIndex == DELIMITED_MARKER) {
-            return isDelimitedEnd_1_1();
+            return uncheckedIsDelimitedEnd_1_1();
         } else if (parent.endIndex == peekIndex) {
             event = Event.END_CONTAINER;
             return true;
@@ -1491,10 +1490,10 @@ private boolean nextContainedToken() {
                 if (b < 0) {
                     fieldSid = (b & LOWER_SEVEN_BITS_BITMASK);
                 } else {
-                    fieldSid = (int) readVarUInt_1_0(b);
+                    fieldSid = (int) uncheckedReadVarUInt_1_0(b);
                 }
             } else {
-                readFieldName_1_1();
+                uncheckedReadFieldName_1_1();
             }
         }
         valuePreHeaderIndex = peekIndex;
@@ -1516,7 +1515,7 @@ private void reportConsumedData() {
      * @return true if the next token was an Ion version marker or NOP pad; otherwise, false. If true, this method
      *  should be called again to advance to the following value.
      */
-    private boolean nextToken() {
+    private boolean uncheckedNextToken() {
         if (peekIndex < valueMarker.endIndex) {
             peekIndex = valueMarker.endIndex;
         } else if (valueTid != null && valueTid.isDelimited) {
@@ -1543,12 +1542,12 @@ private boolean nextToken() {
                 return true;
             }
         } else {
-            if (nextContainedToken()) {
+            if (uncheckedNextContainedToken()) {
                 return false;
             }
             b = buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK;
         }
-        if (readHeader(b, false, valueMarker)) {
+        if (uncheckedReadHeader(b, false, valueMarker)) {
             valueTid = valueMarker.typeId;
             return false;
         }
@@ -1692,7 +1691,7 @@ public Event nextValue() {
             return slowNextValue();
         }
         event = Event.NEEDS_DATA;
-        while (nextToken());
+        while (uncheckedNextToken());
         return event;
     }
 

From 5670432069619c2730e4a143a084c758eac59f4f Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 21 Sep 2023 18:54:18 -0700
Subject: [PATCH 287/490] Incorporates feedback from PRs #511, #512, #522, and
 #539.

---
 .../ion/impl/IonReaderContinuableApplicationBinary.java  | 2 +-
 .../ion/impl/IonReaderContinuableTopLevelBinary.java     | 4 ++--
 .../ion/impl/IonReaderContinuableTopLevelBinaryTest.java | 9 ++-------
 test/com/amazon/ion/streaming/ReaderTest.java            | 4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 7967969c6f..6e8e510c51 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -497,7 +497,7 @@ private SymbolTable createImport(String name, int version, int maxId) {
                 throw new IonException(message);
             }
 
-            // Exact match is found, but max_id is undefined in import declaration. Set max_id to tge largest SID of
+            // Exact match is found, but max_id is undefined in import declaration. Set max_id to the largest SID of
             // the matching symbol table.
             maxId = shared.getMaxId();
         }
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index 318e1c8c22..dcce7d6a23 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -28,7 +28,7 @@
  * the stream to complete a top-level value. The user may wait for more data to become available in the stream and
  * call {@link IonReader#next()} again to continue reading. Unlike the non-incremental reader, the continuable reader
  * will never throw an exception due to unexpected EOF during {@code next()}. If, however, {@link IonReader#close()} is
- * called when an incomplete value is buffered, an {@link IonException} will be raised.
+ * called when an incomplete value is buffered, the reader will raise an {@link IonException}.
  * </p>
  * <p>
  * There is one caveat with the continuable reader implementation: it must be able to buffer an entire top-level value
@@ -36,7 +36,7 @@
  * and preceding system values must be no larger than any of the following:
  * <ul>
  * <li>The configured maximum buffer size of the {@link IonBufferConfiguration}.</li>
- * <li>The memory available to the JVM.</li>
+ * <li>The heap memory available in the JVM.</li>
  * <li>2GB, because the buffer is held in a Java {@code byte[]}, which is indexed by an {@code int}.</li>
  * </ul>
  * This will not be a problem for the vast majority of Ion streams, as it is
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 1e1ac3fc14..b9da9b1aeb 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -2000,14 +2000,10 @@ public void oversizeValueDetectedDuringScalarFillIncremental() throws Exception
 
     @Test
     public void oversizeValueDetectedDuringFillOfOnlyScalarInStream() throws Exception {
-        // Unlike the previous test, where excessive size is detected when trying to skip past the value portion,
-        // this test verifies that excessive size can be detected while reading a value header, which happens
-        // byte-by-byte.
         byte[] bytes = toBinary("\"abcdefghijklmnopqrstuvwxyz\""); // Requires a 2-byte header.
         reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
 
-        // The maximum buffer size is 5, which will be exceeded after the IVM (4 bytes), the type ID (1 byte), and
-        // the length byte (1 byte).
+        // The maximum buffer size is 5, which will be exceeded when attempting to fill the value with length 26.
         nextExpect(null);
         reader.close();
         expectOversized(1);
@@ -2022,8 +2018,7 @@ public void oversizeValueDetectedDuringFillOfOnlyScalarInStreamIncremental() thr
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
         reader = boundedReaderFor(pipe, 5, 5, byteAndOversizedValueCountingHandler);
         feedBytesOneByOne(bytes, pipe, reader);
-        // The maximum buffer size is 5, which will be exceeded after the IVM (4 bytes), the type ID (1 byte), and
-        // the length byte (1 byte).
+        // The maximum buffer size is 5, which will be exceeded when attempting to fill the value with length 26.
         nextExpect(null);
         reader.close();
         expectOversized(1);
diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/test/com/amazon/ion/streaming/ReaderTest.java
index 363b91aa5d..26608e6272 100644
--- a/test/com/amazon/ion/streaming/ReaderTest.java
+++ b/test/com/amazon/ion/streaming/ReaderTest.java
@@ -286,10 +286,10 @@ public void testReadingDecimalAsLong()
         assertEquals(readLong("9223372036854775807."), readLong("9223372036854775807")); // Max long
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testReadingDecimalAsBigInteger()
     {
-        readBigInteger("0.");
+        assertThrows(IllegalStateException.class, () -> readBigInteger("0."));
     }
 
     @Test

From 00286d5812ff061ea112ae4e2efb86736bf9e8c7 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 22 Sep 2023 15:29:22 -0700
Subject: [PATCH 288/490] Incorporates feedback on PR #550.

---
 ...IonReaderContinuableApplicationBinary.java |  2 +-
 test/com/amazon/ion/TestUtils.java            | 16 +++++
 ...onReaderContinuableTopLevelBinaryTest.java | 62 ++++++-------------
 .../ion/system/IonReaderBuilderTest.java      | 33 +++-------
 4 files changed, 46 insertions(+), 67 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 6e8e510c51..5844bc7136 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -137,7 +137,7 @@ class IonReaderContinuableApplicationBinary extends IonReaderContinuableCoreBina
                 if (state == State.READING_VALUE) {
                     // The reader is not currently processing a symbol table.
                     if (parent != null || !hasAnnotations) {
-                        // The value is either not at the top level, or is unannotated, so it cannot be a symbol table.
+                        // Only top-level annotated values can be symbol tables.
                         mightBeSymbolTable = false;
                     } else if (annotationSequenceMarker.startIndex >= 0 && annotationSequenceMarker.endIndex <= limit) {
                         // The annotations on the value are available.
diff --git a/test/com/amazon/ion/TestUtils.java b/test/com/amazon/ion/TestUtils.java
index a1fb71c414..81e8b8c536 100644
--- a/test/com/amazon/ion/TestUtils.java
+++ b/test/com/amazon/ion/TestUtils.java
@@ -25,6 +25,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;
+import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.charset.Charset;
@@ -32,6 +33,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.zip.GZIPOutputStream;
 
 
 public class TestUtils
@@ -582,4 +584,18 @@ public byte[] toByteArray() {
             return out.toByteArray();
         }
     }
+
+    /**
+     * Compresses the given bytes using GZIP.
+     * @param bytes the bytes to compress.
+     * @return a new byte array containing the GZIP payload.
+     * @throws Exception if thrown during compression.
+     */
+    public static byte[] gzippedBytes(int... bytes) throws Exception {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try (OutputStream gzip = new GZIPOutputStream(out)) {
+            gzip.write(bytes(bytes)); // IVM
+        }
+        return out.toByteArray();
+    }
 }
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index b9da9b1aeb..54e7586ee4 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -42,7 +42,6 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
@@ -53,9 +52,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
 
 import static com.amazon.ion.BitUtils.bytes;
+import static com.amazon.ion.TestUtils.gzippedBytes;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -3019,29 +3018,19 @@ public void concatenatedAfterGZIPHeader() throws Exception {
         // Tests that a stream that initially contains only a GZIP header can be read successfully if more data
         // is later made available.
         final int gzipHeaderLength = 10; // Length of the GZIP header, as defined by the GZIP spec.
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        try (OutputStream gzip = new GZIPOutputStream(out)) {
-            gzip.write(bytes(0xE0, 0x01, 0x00, 0xEA)); // IVM
-        }
+        byte[] gzIVM = gzippedBytes(0xE0, 0x01, 0x00, 0xEA);  // IVM
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-
-        // First, feed just the GZIP header bytes. On next(), the GZIPInputStream will throw EOFException, which is
-        // handled by the reader.
-        pipe.receive(out.toByteArray(), 0, gzipHeaderLength);
+        // First, feed just the GZIP header bytes.
+        pipe.receive(gzIVM, 0, gzipHeaderLength); // Just the GZIP header
+        // We must build the reader after the input stream has some content
         reader = readerFor(new GZIPInputStream(pipe));
+        //  On next(), the GZIPInputStream will throw EOFException, which is handled by the reader.
         nextExpect(null);
-
+        // Finish feeding the gzipped IVM payload
+        pipe.receive(gzIVM, gzipHeaderLength, gzIVM.length - gzipHeaderLength);
         // Now feed the bytes for an Ion value, spanning the value across two GZIP payloads.
-        try (OutputStream gzip = new GZIPOutputStream(out)) {
-            gzip.write(bytes(0x2E)); // Positive int with length subfield
-        }
-        try (OutputStream gzip = new GZIPOutputStream(out)) {
-            gzip.write(bytes(0x81, 0x01)); // Length 1, value 1
-        }
-        byte[] bytes = out.toByteArray();
-        byte[] withoutGzipHeader = new byte[bytes.length - gzipHeaderLength];
-        System.arraycopy(bytes, gzipHeaderLength, withoutGzipHeader, 0, withoutGzipHeader.length);
-        pipe.receive(withoutGzipHeader);
+        pipe.receive(gzippedBytes(0x2E)); // Positive int with length subfield
+        pipe.receive(gzippedBytes(0x81, 0x01)); // Length 1, value 1
         nextExpect(IonType.INT);
         expectInt(1);
         nextExpect(null);
@@ -3056,22 +3045,15 @@ public void concatenatedAfterMissingGZIPTrailer() throws Exception {
         // which only occurs after a value is determined to be oversized, but still needs to be partially processed
         // to determine whether it might be a symbol table.
         final int maxBufferSize = 6;
-        ByteArrayOutputStream out1 = new ByteArrayOutputStream();
-        try (OutputStream gzip = new GZIPOutputStream(out1)) {
-            // IVM followed by an annotation wrapper that declares length 7, then three overpadded VarUInt bytes that
-            // indicate two bytes of annotations follow, followed by two overpadded VarUInt bytes that indicate that
-            // the value's only annotation has SID 4 ('name').
-            gzip.write(bytes(0xE0, 0x01, 0x00, 0xEA, 0xE7, 0x00, 0x00, 0x82, 0x00, 0x84));
-        }
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-
+        // IVM followed by an annotation wrapper that declares length 7, then three overpadded VarUInt bytes that
+        // indicate two bytes of annotations follow, followed by two overpadded VarUInt bytes that indicate that
+        // the value's only annotation has SID 4 ('name').
+        byte[] gzChunk = gzippedBytes(0xE0, 0x01, 0x00, 0xEA, 0xE7, 0x00, 0x00, 0x82, 0x00, 0x84);
         // First, feed the bytes (representing an incomplete Ion value) to the reader, but without a GZIP trailer.
-        byte[] out1Bytes = out1.toByteArray();
-        byte[] withoutTrailer = new byte[out1Bytes.length - gzipTrailerLength];
-        System.arraycopy(out1Bytes, 0, withoutTrailer, 0, withoutTrailer.length);
-        pipe.receive(withoutTrailer);
+        pipe.receive(gzChunk, 0, gzChunk.length - gzipTrailerLength);
+        // We must build the reader after the input stream has some content
         reader = boundedReaderFor(new GZIPInputStream(pipe), maxBufferSize, maxBufferSize, byteAndOversizedValueCountingHandler);
-
         // During this next(), the reader will read and discard
         // the IVM, then hold all the rest of these bytes in its buffer, which is then at its maximum size. At that
         // point, the reader will attempt to read another byte (expecting a type ID byte), and determine that the
@@ -3079,17 +3061,11 @@ public void concatenatedAfterMissingGZIPTrailer() throws Exception {
         // the reader consumes it directly from the underlying InputStream using a single-byte read, which causes
         // GZIPInputStream to throw EOFException because the GZIP trailer is missing.
         nextExpect(null);
-
         // Now, finish the previous GZIP payload by appending the trailer, then append a concatenated GZIP payload
         // that contains the rest of the Ion value.
-        pipe.receive(out1Bytes, out1Bytes.length - gzipTrailerLength, gzipTrailerLength);
-        ByteArrayOutputStream out2 = new ByteArrayOutputStream();
-        try (OutputStream gzip = new GZIPOutputStream(out2)) {
-            // Positive integer length 1, with value 1 (the rest of the annotated value), then integer 0.
-            gzip.write(bytes(0x21, 0x01, 0x20));
-        }
-        pipe.receive(out2.toByteArray());
-
+        pipe.receive(gzChunk, gzChunk.length - gzipTrailerLength, gzipTrailerLength);
+        // Positive integer length 1, with value 1 (the rest of the annotated value), then integer 0.
+        pipe.receive(gzippedBytes(0x21, 0x01, 0x20));
         // On this next, the reader will finish skipping the oversized value by calling skip() on the underlying
         // GZIPInputStream, which is able to complete the request successfully now that the GZIP trailer is available.
         // The following value (integer 0) is then read successfully.
diff --git a/test/com/amazon/ion/system/IonReaderBuilderTest.java b/test/com/amazon/ion/system/IonReaderBuilderTest.java
index a58928cd71..36454e3346 100644
--- a/test/com/amazon/ion/system/IonReaderBuilderTest.java
+++ b/test/com/amazon/ion/system/IonReaderBuilderTest.java
@@ -15,7 +15,7 @@
 
 package com.amazon.ion.system;
 
-import static com.amazon.ion.BitUtils.bytes;
+import static com.amazon.ion.TestUtils.gzippedBytes;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotSame;
@@ -36,8 +36,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.OutputStream;
-import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 import com.amazon.ion.impl._Private_IonConstants;
@@ -198,30 +196,19 @@ public void concatenatedAfterGZIPHeader() throws Exception {
         IonReaderBuilder builder = IonReaderBuilder.standard();
         builder.withIncrementalReadingEnabled(true);
         final int gzipHeaderLength = 10; // Length of the GZIP header, as defined by the GZIP spec.
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        try (OutputStream gzip = new GZIPOutputStream(out)) {
-            gzip.write(bytes(0xE0, 0x01, 0x00, 0xEA)); // IVM
-        }
+        byte[] gzIVM = gzippedBytes(0xE0, 0x01, 0x00, 0xEA);  // IVM
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
-
-        // First, feed just the GZIP header bytes. On next(), the GZIPInputStream will throw EOFException, which is
-        // handled by the reader.
-        pipe.receive(out.toByteArray(), 0, gzipHeaderLength);
-
+        // First, feed just the GZIP header bytes.
+        pipe.receive(gzIVM, 0, gzipHeaderLength); // Just the GZIP header
+        // We must build the reader after the input stream has some content
         IonReader reader = builder.build(pipe);
+        //  On next(), the GZIPInputStream will throw EOFException, which is handled by the reader.
         assertNull(reader.next());
-
+        // Finish feeding the gzipped IVM payload
+        pipe.receive(gzIVM, gzipHeaderLength, gzIVM.length - gzipHeaderLength);
         // Now feed the bytes for an Ion value, spanning the value across two GZIP payloads.
-        try (OutputStream gzip = new GZIPOutputStream(out)) {
-            gzip.write(bytes(0x2E)); // Positive int with length subfield
-        }
-        try (OutputStream gzip = new GZIPOutputStream(out)) {
-            gzip.write(bytes(0x81, 0x01)); // Length 1, value 1
-        }
-        byte[] bytes = out.toByteArray();
-        byte[] withoutGzipHeader = new byte[bytes.length - gzipHeaderLength];
-        System.arraycopy(bytes, gzipHeaderLength, withoutGzipHeader, 0, withoutGzipHeader.length);
-        pipe.receive(withoutGzipHeader);
+        pipe.receive(gzippedBytes(0x2E)); // Positive int with length subfield
+        pipe.receive(gzippedBytes(0x81, 0x01)); // Length 1, value 1
         assertEquals(IonType.INT, reader.next());
         assertEquals(1, reader.intValue());
         assertNull(reader.next());

From 47974dd93d0893cd08aee6810d1c208f05146bef Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 11 Oct 2023 16:42:12 -0700
Subject: [PATCH 289/490] Improves the factoring of IonCursorBinaryTest,
 IonReaderContinuableCoreBinaryTest, and
 IonReaderContinuableApplicationBinaryTest.

---
 .../amazon/ion/impl/IonCursorBinaryTest.java  | 340 ++++++++++--------
 .../ion/impl/IonCursorTestUtilities.java      | 248 +++++++++++++
 ...eaderContinuableApplicationBinaryTest.java | 206 +++++------
 .../IonReaderContinuableCoreBinaryTest.java   | 339 ++++++++---------
 4 files changed, 696 insertions(+), 437 deletions(-)
 create mode 100644 test/com/amazon/ion/impl/IonCursorTestUtilities.java

diff --git a/test/com/amazon/ion/impl/IonCursorBinaryTest.java b/test/com/amazon/ion/impl/IonCursorBinaryTest.java
index 098845e830..e0b80fb23b 100644
--- a/test/com/amazon/ion/impl/IonCursorBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonCursorBinaryTest.java
@@ -3,59 +3,34 @@
 
 package com.amazon.ion.impl;
 
-import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCursor;
-import com.amazon.ion.IvmNotificationConsumer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.ByteArrayInputStream;
+import java.util.function.Consumer;
 
 import static com.amazon.ion.BitUtils.bytes;
-import static com.amazon.ion.IonCursor.Event.END_CONTAINER;
-import static com.amazon.ion.IonCursor.Event.NEEDS_DATA;
-import static com.amazon.ion.IonCursor.Event.NEEDS_INSTRUCTION;
 import static com.amazon.ion.IonCursor.Event.VALUE_READY;
 import static com.amazon.ion.IonCursor.Event.START_CONTAINER;
 import static com.amazon.ion.IonCursor.Event.START_SCALAR;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static com.amazon.ion.impl.IonCursorTestUtilities.STANDARD_BUFFER_CONFIGURATION;
+import static com.amazon.ion.impl.IonCursorTestUtilities.Expectation;
+import static com.amazon.ion.impl.IonCursorTestUtilities.ExpectationProvider;
+import static com.amazon.ion.impl.IonCursorTestUtilities.STEP_IN;
+import static com.amazon.ion.impl.IonCursorTestUtilities.STEP_OUT;
+import static com.amazon.ion.impl.IonCursorTestUtilities.assertSequence;
+import static com.amazon.ion.impl.IonCursorTestUtilities.container;
+import static com.amazon.ion.impl.IonCursorTestUtilities.endContainer;
+import static com.amazon.ion.impl.IonCursorTestUtilities.endStream;
+import static com.amazon.ion.impl.IonCursorTestUtilities.scalar;
+import static com.amazon.ion.impl.IonCursorTestUtilities.startContainer;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@RunWith(Parameterized.class)
 public class IonCursorBinaryTest {
 
-    private static final IonBufferConfiguration STANDARD_BUFFER_CONFIGURATION = IonBufferConfiguration.Builder.standard().build();
-
-    private static Marker loadScalar(IonCursorBinary cursor) {
-        IonCursor.Event event = cursor.fillValue();
-        assertEquals(VALUE_READY, event);
-        Marker marker = cursor.getValueMarker();
-        assertNotNull(marker);
-        return marker;
-    }
-
-    @Parameterized.Parameters(name = "constructWithBytes={0}")
-    public static Object[] parameters() {
-        return new Object[]{true, false};
-    }
-
-    @Parameterized.Parameter
-    public boolean constructFromBytes;
-
-    private IonCursorBinary cursor = null;
-    private int numberOfIvmsEncountered = 0;
-
-    private final IvmNotificationConsumer countingIvmConsumer = (majorVersion, minorVersion) -> numberOfIvmsEncountered++;
-
-    @Before
-    public void setup() {
-        cursor = null;
-        numberOfIvmsEncountered = 0;
-    }
-
-    private void initializeCursor(int... data) {
+    private static IonCursorBinary initializeCursor(boolean constructFromBytes, int... data) {
+        IonCursorBinary cursor;
         if (constructFromBytes) {
             cursor = new IonCursorBinary(STANDARD_BUFFER_CONFIGURATION, bytes(data), 0, data.length);
         } else {
@@ -67,124 +42,169 @@ private void initializeCursor(int... data) {
                 0
             );
         }
-        cursor.registerIvmNotificationConsumer(countingIvmConsumer);
         cursor.registerOversizedValueHandler(STANDARD_BUFFER_CONFIGURATION.getOversizedValueHandler());
+        return cursor;
     }
 
-    private void nextExpect(IonCursor.Event expected) {
-        assertEquals(expected, cursor.nextValue());
-    }
-
-    private void fillExpect(IonCursor.Event expected) {
-        assertEquals(expected, cursor.fillValue());
+    /**
+     * Provides Expectations that verify that advancing the cursor to the next value results in the given event, and
+     * filling that value results in a Marker with the given start and end indices.
+     */
+    private static ExpectationProvider<IonCursorBinary> fill(IonCursor.Event expectedEvent, int expectedStart, int expectedEnd) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("fill(%s, %d, %d)", expectedEvent, expectedStart, expectedEnd),
+            cursor -> {
+                assertEquals(expectedEvent, cursor.nextValue());
+                assertEquals(VALUE_READY, cursor.fillValue());
+                Marker marker = cursor.getValueMarker();
+                assertEquals(expectedStart, marker.startIndex);
+                assertEquals(expectedEnd, marker.endIndex);
+            }
+        ));
     }
 
-    private void stepIn() {
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+    /**
+     * Provides Expectations that verify that advancing the cursor positions it on a scalar, and filling that scalar
+     * results in a Marker with the given start and end indices.
+     */
+    private static ExpectationProvider<IonCursorBinary> fillScalar(int expectedStart, int expectedEnd) {
+        return fill(START_SCALAR, expectedStart, expectedEnd);
     }
 
-    private void stepOut() {
-        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+    /**
+     * Provides Expectations that verify 1) that advancing the cursor positions it on a container, 2) filling that
+     * container results in a Marker with the given start and end indices, and 3) the container's child values match
+     * the given expectations.
+     */
+    @SafeVarargs
+    @SuppressWarnings("unchecked")
+    private static ExpectationProvider<IonCursorBinary> fillContainer(int expectedStart, int expectedEnd, ExpectationProvider<IonCursorBinary>... expectations) {
+        return consumer -> {
+            fill(START_CONTAINER, expectedStart, expectedEnd).accept(consumer);
+            consumer.accept((Expectation<IonCursorBinary>) STEP_IN);
+            for (Consumer<Consumer<Expectation<IonCursorBinary>>> expectation : expectations) {
+                expectation.accept(consumer);
+            }
+            consumer.accept((Expectation<IonCursorBinary>) STEP_OUT);
+        };
     }
 
-    private void expectMarker(int expectedStart, int expectedEnd) {
-        Marker marker = loadScalar(cursor);
-        assertEquals(expectedStart, marker.startIndex);
-        assertEquals(expectedEnd, marker.endIndex);
-    }
-
-    @Test
-    public void basicContainer() {
-        initializeCursor(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicContainer(boolean constructFromBytes) {
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 7
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        expectMarker(7, 8);
-        nextExpect(END_CONTAINER);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            cursor,
+            container(
+                fillScalar(7, 8)
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicStrings() {
-        initializeCursor(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicStrings(boolean constructFromBytes) {
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0x83, 'f', 'o', 'o', // String length 3, starting at byte index 5
             0x83, 'b', 'a', 'r' // String length 3, starting at byte index 9
         );
-        nextExpect(START_SCALAR);
-        expectMarker(5, 8);
-        nextExpect(START_SCALAR);
-        expectMarker(9, 12);
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            cursor,
+            fillScalar(5, 8),
+            fillScalar(9, 12),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicNoFill() {
-        initializeCursor(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicNoFill(boolean constructFromBytes) {
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 7
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        nextExpect(END_CONTAINER);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            cursor,
+            container(
+                scalar(),
+                endContainer()
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicStepOutEarly() {
-        initializeCursor(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicStepOutEarly(boolean constructFromBytes) {
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 7
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            cursor,
+            container(
+                scalar()
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicTopLevelSkip() {
-        initializeCursor(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicTopLevelSkip(boolean constructFromBytes) {
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 7
         );
-        nextExpect(START_CONTAINER);
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            cursor,
+            startContainer(),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicTopLevelSkipThenConsume() {
-        initializeCursor(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicTopLevelSkipThenConsume(boolean constructFromBytes) {
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4
             0x21, 0x01, // Int length 1, starting at byte index 7
             0x21, 0x03 // Int length 1, starting at byte index 9
         );
-        nextExpect(START_CONTAINER);
-        nextExpect(START_SCALAR);
-        expectMarker(9, 10);
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            cursor,
+            startContainer(),
+            fillScalar(9, 10),
+            endStream()
+        );
     }
 
-    @Test
-    public void nestedContainers() {
-        initializeCursor(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nestedContainers(boolean constructFromBytes) {
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD6, // Struct length 6
             0x83, // Field SID 3
@@ -193,21 +213,23 @@ public void nestedContainers() {
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 10
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        stepOut();
-        nextExpect(START_SCALAR);
-        expectMarker(10, 11);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            cursor,
+            container(
+                container(
+                    scalar()
+                ),
+                fillScalar(10, 11)
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void fillContainerAtDepth0() {
-        initializeCursor(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void fillContainerAtDepth0(boolean constructFromBytes) {
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD6, // Struct length 6, contents start at index 5
             0x83, // Field SID 3
@@ -216,23 +238,23 @@ public void fillContainerAtDepth0() {
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 10
         );
-        nextExpect(START_CONTAINER);
-        fillExpect(VALUE_READY);
-        expectMarker(5, 11);
-        stepIn();
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        stepOut();
-        nextExpect(START_SCALAR);
-        expectMarker(10, 11);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            cursor,
+            fillContainer(5, 11,
+                container(
+                    scalar()
+                ),
+                fillScalar(10, 11)
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void fillContainerAtDepth1() {
-        initializeCursor(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void fillContainerAtDepth1(boolean constructFromBytes) {
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD6, // Struct length 6
             0x83, // Field SID 3
@@ -241,20 +263,22 @@ public void fillContainerAtDepth1() {
             0x84, // Field SID 4
             0x21, 0x01 // Int length 1, starting at byte index 10
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_CONTAINER);
-        fillExpect(VALUE_READY);
-        expectMarker(7, 8);
-        stepIn();
-        nextExpect(START_SCALAR);
-        nextExpect(END_CONTAINER);
-        stepOut();
+        assertSequence(
+            cursor,
+            container(
+                fillContainer(7, 8,
+                    scalar(),
+                    endContainer()
+                )
+            )
+        );
     }
 
-    @Test
-    public void fillContainerThenSkip() {
-        initializeCursor(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void fillContainerThenSkip(boolean constructFromBytes) {
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD6, // Struct length 6
             0x83, // Field SID 3
@@ -266,15 +290,13 @@ public void fillContainerThenSkip() {
             0x84, // Field SID 4
             0x20 // Int length 0, at byte index 14
         );
-        nextExpect(START_CONTAINER);
-        fillExpect(VALUE_READY);
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        fillExpect(VALUE_READY);
-        expectMarker(14, 14);
-        nextExpect(END_CONTAINER);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            cursor,
+            fill(START_CONTAINER, 5, 11),
+            container(
+                fillScalar(14, 14)
+            ),
+            endStream()
+        );
     }
 }
diff --git a/test/com/amazon/ion/impl/IonCursorTestUtilities.java b/test/com/amazon/ion/impl/IonCursorTestUtilities.java
new file mode 100644
index 0000000000..bb298e652e
--- /dev/null
+++ b/test/com/amazon/ion/impl/IonCursorTestUtilities.java
@@ -0,0 +1,248 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package com.amazon.ion.impl;
+
+import com.amazon.ion.IonBufferConfiguration;
+import com.amazon.ion.IonType;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import static com.amazon.ion.IonCursor.Event.END_CONTAINER;
+import static com.amazon.ion.IonCursor.Event.NEEDS_DATA;
+import static com.amazon.ion.IonCursor.Event.NEEDS_INSTRUCTION;
+import static com.amazon.ion.IonCursor.Event.START_CONTAINER;
+import static com.amazon.ion.IonCursor.Event.START_SCALAR;
+import static com.amazon.ion.IonCursor.Event.VALUE_READY;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class IonCursorTestUtilities {
+
+    static final IonBufferConfiguration STANDARD_BUFFER_CONFIGURATION = IonBufferConfiguration.Builder.standard().build();
+
+    /**
+     * Contains the logic to assert that the given Cursor meets a particular expectation. This is an abstract class
+     * rather than a Consumer for two reasons, both related to debuggability: 1) the custom toString method makes it
+     * much easier to identify the expectations that will be tested during debugging, and 2) certain IDE configurations
+     * seem to have trouble stepping into the 'accept' method of java.util.function.Consumer.
+     */
+    static class Expectation<T extends IonCursorBinary> {
+
+        private final String description;
+        private final Consumer<T> test;
+
+        Expectation(String description, Consumer<T> test) {
+            this.description = description;
+            this.test = test;
+        }
+
+        public void test(T cursor) {
+            test.accept(cursor);
+        }
+
+        @Override
+        public String toString() {
+            return description;
+        }
+    }
+
+    static final Expectation<? extends IonCursorBinary> SCALAR = new Expectation<>("scalar", cursor -> {
+        assertEquals(START_SCALAR, cursor.nextValue());
+    });
+    static final Expectation<? extends IonCursorBinary> CONTAINER_START = new Expectation<>("container_start", cursor -> {
+        assertEquals(START_CONTAINER, cursor.nextValue());
+    });
+    static final Expectation<? extends IonCursorBinary> STEP_IN = new Expectation<>("step_in", cursor -> {
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepIntoContainer());
+    });
+    static final Expectation<? extends IonCursorBinary> STEP_OUT = new Expectation<>("step_out", cursor -> {
+        assertEquals(NEEDS_INSTRUCTION, cursor.stepOutOfContainer());
+    });
+    static final Expectation<? extends IonCursorBinary> CONTAINER_END = new Expectation<>("container_end", cursor -> {
+        assertEquals(END_CONTAINER, cursor.nextValue());
+    });
+    static final Expectation<? extends IonCursorBinary> STREAM_END = new Expectation<>("stream_end", cursor -> {
+        assertEquals(NEEDS_DATA, cursor.nextValue());
+    });
+    static final Expectation<? extends IonCursorBinary> NO_EXPECTATION = new Expectation<>("no_op", cursor -> {});
+
+    /**
+     * Feeds Expectations to a given Consumer, allowing for deferred collection and execution of expectations.
+     */
+    @FunctionalInterface
+    interface ExpectationProvider<T extends IonCursorBinary> extends Consumer<Consumer<Expectation<T>>> {}
+
+    /**
+     * Collects the Expectations from all providers into a flat List.
+     */
+    @SafeVarargs
+    static <T extends IonCursorBinary> List<Expectation<T>> collectExpectations(ExpectationProvider<T>... providers) {
+        List<Expectation<T>> expectations = new ArrayList<>();
+        for (Consumer<Consumer<Expectation<T>>> provider : providers) {
+            provider.accept(expectations::add);
+        }
+        return expectations;
+    }
+
+    /**
+     * Tests the given cursor against all expectations, in order. This provides the easiest debugging entrypoint.
+     * Set a breakpoint on the invocation of this method in the test of interest, then step through the expectation
+     * evaluations, stepping into the cursor when desired.
+     */
+    @SafeVarargs
+    static <T extends IonCursorBinary> void assertSequence(T cursor, ExpectationProvider<T>... providers) {
+        List<Expectation<T>> expectations = collectExpectations(providers);
+        for (Expectation<T> expectation : expectations) {
+            expectation.test(cursor);
+        }
+    }
+
+    /**
+     * Provides Expectations that verify that advancing the cursor positions it on a container value with a field name
+     * that matches the given expectation, and that the container's child values match the given expectations, without
+     * filling the container up-front.
+     */
+    @SafeVarargs
+    @SuppressWarnings("unchecked")
+    static <T extends IonCursorBinary> ExpectationProvider<T> containerField(Expectation<T> expectedField, ExpectationProvider<T>... expectations) {
+        return consumer -> {
+            consumer.accept((Expectation<T>) CONTAINER_START);
+            consumer.accept(expectedField);
+            consumer.accept((Expectation<T>) STEP_IN);
+            for (Consumer<Consumer<Expectation<T>>> expectation : expectations) {
+                expectation.accept(consumer);
+            }
+            consumer.accept((Expectation<T>) STEP_OUT);
+        };
+    }
+
+    /**
+     * Provides Expectations that verify that advancing the cursor positions it on a container value, and that the
+     * container's child values match the given expectations, without filling the container up-front.
+     */
+    @SafeVarargs
+    @SuppressWarnings("unchecked")
+    static <T extends IonCursorBinary> ExpectationProvider<T> container(ExpectationProvider<T>... expectations) {
+        return containerField((Expectation<T>) NO_EXPECTATION, expectations);
+    }
+
+    /**
+     * Provides an Expectation that verifies that advancing the cursor positions it on a scalar value with a field name
+     * that matches the given expectation, without filling that scalar.
+     */
+    @SuppressWarnings("unchecked")
+    static <T extends IonCursorBinary> ExpectationProvider<T> scalarField(Expectation<T> expectedField) {
+        return consumer -> {
+            consumer.accept((Expectation<T>) SCALAR);
+            consumer.accept(expectedField);
+        };
+    }
+
+    /**
+     * Provides an Expectation that verifies that advancing the cursor positions it on a scalar value, without filling
+     * that scalar.
+     */
+    @SuppressWarnings("unchecked")
+    static <T extends IonCursorBinary> ExpectationProvider<T> scalar() {
+        return scalarField((Expectation<T>) NO_EXPECTATION);
+    }
+
+    /**
+     * Provides Expectations that verify that advancing the cursor to the next value positions the cursor on a scalar
+     * with type int and the given expected value.
+     */
+    static <T extends IonReaderContinuableCoreBinary> ExpectationProvider<T> intValue(int expectedValue) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("int(%d)", expectedValue),
+            reader -> {
+                assertEquals(VALUE_READY, reader.fillValue());
+                assertEquals(IonType.INT, reader.getType());
+                assertEquals(expectedValue, reader.intValue());
+            }
+        ));
+    }
+
+    /**
+     * Provides Expectations that verify that advancing the cursor to the next value positions the cursor on a scalar
+     * with type string and the given expected value.
+     */
+    static <T extends IonReaderContinuableCoreBinary> ExpectationProvider<T> stringValue(String expectedValue) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("string(%s)", expectedValue),
+            reader -> {
+                assertEquals(VALUE_READY, reader.fillValue());
+                assertEquals(IonType.STRING, reader.getType());
+                assertEquals(expectedValue, reader.stringValue());
+            }
+        ));
+    }
+
+    /**
+     * Provides Expectations that verify that advancing the cursor to the next value positions the cursor on a scalar
+     * with type symbol and the given expected value.
+     */
+    static <T extends IonReaderContinuableApplicationBinary> ExpectationProvider<T> symbolValue(String expectedValue) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("symbol(%s)", expectedValue),
+            reader -> {
+                assertEquals(VALUE_READY, reader.fillValue());
+                assertEquals(IonType.SYMBOL, reader.getType());
+                assertEquals(expectedValue, reader.stringValue());
+            }
+        ));
+    }
+
+    /**
+     * Provides an Expectation that verifies that advancing the cursor positions it on a container value, without
+     * filling that container.
+     */
+    @SuppressWarnings("unchecked")
+    static <T extends IonCursorBinary> ExpectationProvider<T> startContainer() {
+        return consumer -> consumer.accept((Expectation<T>) CONTAINER_START);
+    }
+
+    /**
+     * Provides an Expectation that verifies that advancing the cursor results in the end of the current container.
+     */
+    @SuppressWarnings("unchecked")
+    static <T extends IonCursorBinary> ExpectationProvider<T> endContainer() {
+        return consumer -> consumer.accept((Expectation<T>) CONTAINER_END);
+    }
+
+    /**
+     * Provides Expectations that verify that advancing the cursor to the next value positions the cursor on a
+     * container with the given type, that filling the value succeeds, and that the container's child values match the
+     * given expectations.
+     */
+    @SafeVarargs
+    @SuppressWarnings("unchecked")
+    static ExpectationProvider<IonReaderContinuableCoreBinary> fillContainer(IonType expectedType, ExpectationProvider<IonReaderContinuableCoreBinary>... expectations) {
+        return consumer -> {
+            consumer.accept(new Expectation<>(
+                String.format("fill(%s)", expectedType),
+                cursor -> {
+                    assertEquals(START_CONTAINER, cursor.nextValue());
+                    assertEquals(VALUE_READY, cursor.fillValue());
+                    assertEquals(expectedType, cursor.getType());
+                }
+            ));
+            if (expectations.length > 0) {
+                consumer.accept((Expectation<IonReaderContinuableCoreBinary>) STEP_IN);
+                for (Consumer<Consumer<Expectation<IonReaderContinuableCoreBinary>>> expectation : expectations) {
+                    expectation.accept(consumer);
+                }
+                consumer.accept((Expectation<IonReaderContinuableCoreBinary>) STEP_OUT);
+            }
+        };
+    }
+
+    /**
+     * Provides an Expectation that verifies that advancing the cursor positions it at the current end of the stream.
+     */
+    @SuppressWarnings("unchecked")
+    static <T extends IonCursorBinary> ExpectationProvider<T> endStream() {
+        return consumer -> consumer.accept((Expectation<T>) STREAM_END);
+    }
+}
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
index d9c97adb5b..cc4d0f59a7 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
@@ -3,53 +3,33 @@
 
 package com.amazon.ion.impl;
 
-import com.amazon.ion.IonBufferConfiguration;
-import com.amazon.ion.IonCursor;
-import com.amazon.ion.IvmNotificationConsumer;
 import com.amazon.ion.system.IonReaderBuilder;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.ByteArrayInputStream;
 
 import static com.amazon.ion.BitUtils.bytes;
-import static com.amazon.ion.IonCursor.Event.END_CONTAINER;
-import static com.amazon.ion.IonCursor.Event.NEEDS_DATA;
-import static com.amazon.ion.IonCursor.Event.NEEDS_INSTRUCTION;
-import static com.amazon.ion.IonCursor.Event.START_CONTAINER;
-import static com.amazon.ion.IonCursor.Event.START_SCALAR;
-import static com.amazon.ion.IonCursor.Event.VALUE_READY;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static com.amazon.ion.impl.IonCursorTestUtilities.STANDARD_BUFFER_CONFIGURATION;
+import static com.amazon.ion.impl.IonCursorTestUtilities.Expectation;
+import static com.amazon.ion.impl.IonCursorTestUtilities.ExpectationProvider;
+import static com.amazon.ion.impl.IonCursorTestUtilities.assertSequence;
+import static com.amazon.ion.impl.IonCursorTestUtilities.container;
+import static com.amazon.ion.impl.IonCursorTestUtilities.endContainer;
+import static com.amazon.ion.impl.IonCursorTestUtilities.endStream;
+import static com.amazon.ion.impl.IonCursorTestUtilities.intValue;
+import static com.amazon.ion.impl.IonCursorTestUtilities.scalar;
+import static com.amazon.ion.impl.IonCursorTestUtilities.scalarField;
+import static com.amazon.ion.impl.IonCursorTestUtilities.symbolValue;
 
-@RunWith(Parameterized.class)
 public class IonReaderContinuableApplicationBinaryTest {
 
     private static final IonReaderBuilder STANDARD_READER_BUILDER = IonReaderBuilder.standard()
-        .withBufferConfiguration(IonBufferConfiguration.Builder.standard().build());
+        .withBufferConfiguration(STANDARD_BUFFER_CONFIGURATION);
 
-    @Parameterized.Parameters(name = "constructWithBytes={0}")
-    public static Object[] parameters() {
-        return new Object[]{true, false};
-    }
-
-    @Parameterized.Parameter
-    public boolean constructFromBytes;
-
-    IonReaderContinuableApplicationBinary reader = null;
-    int numberOfIvmsEncountered = 0;
-
-    private final IvmNotificationConsumer countingIvmConsumer = (majorVersion, minorVersion) -> numberOfIvmsEncountered++;
-
-    @Before
-    public void setup() {
-        reader = null;
-        numberOfIvmsEncountered = 0;
-    }
-
-    private void initializeReader(int... data) {
+    private IonReaderContinuableApplicationBinary initializeReader(boolean constructFromBytes, int... data) {
+        IonReaderContinuableApplicationBinary reader;
         if (constructFromBytes) {
             reader = new IonReaderContinuableApplicationBinary(STANDARD_READER_BUILDER, bytes(data), 0, data.length);
         } else {
@@ -61,78 +41,72 @@ private void initializeReader(int... data) {
                 0
             );
         }
-        reader.registerIvmNotificationConsumer(countingIvmConsumer);
         reader.registerOversizedValueHandler(
             STANDARD_READER_BUILDER.getBufferConfiguration().getOversizedValueHandler()
         );
+        return reader;
     }
 
-    private void nextExpect(IonCursor.Event expected) {
-        assertEquals(expected, reader.nextValue());
-    }
-
-    private void fillExpect(IonCursor.Event expected) {
-        assertEquals(expected, reader.fillValue());
-    }
-
-    private void stepIn() {
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-    }
-
-    private void stepOut() {
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
-    }
-
-    private void expectField(String name) {
-        assertEquals(name, reader.getFieldName());
-    }
-
-    private void expectInt(int value) {
-        assertEquals(value, reader.intValue());
+    /**
+     * Provides an Expectation that verifies that the value on which the cursor is currently positioned has the given
+     * field name.
+     */
+    private static Expectation<IonReaderContinuableApplicationBinary> fieldName(String expectedFieldName) {
+        return new Expectation<>(
+            String.format("fieldName(%s)", expectedFieldName),
+            reader -> Assertions.assertEquals(expectedFieldName, reader.getFieldName())
+        );
     }
 
-    private void expectString(String value) {
-        assertEquals(value, reader.stringValue());
+    /**
+     * Provides Expectations that verify that advancing the cursor positions it on a scalar value with the given field
+     * name, without filling the scalar.
+     */
+    private static ExpectationProvider<IonReaderContinuableApplicationBinary> scalarFieldName(String expectedFieldName) {
+        return scalarField(fieldName(expectedFieldName));
     }
 
-    @Test
-    public void basicContainer() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicContainer(boolean constructFromBytes) {
+        IonReaderContinuableApplicationBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4 ("name")
             0x21, 0x01 // Int 1
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        expectField("name");
-        fillExpect(VALUE_READY);
-        expectInt(1);
-        nextExpect(END_CONTAINER);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            container(
+                scalarFieldName("name"), intValue(1),
+                endContainer()
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicSystemSymbols() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicSystemSymbols(boolean constructFromBytes) {
+        IonReaderContinuableApplicationBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0x71, 0x04, // Symbol value SID 4 ("name")
             0x71, 0x05 // Symbol value SID 5 ("version")
         );
-        nextExpect(START_SCALAR);
-        fillExpect(VALUE_READY);
-        expectString("name");
-        nextExpect(START_SCALAR);
-        fillExpect(VALUE_READY);
-        expectString("version");
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            scalar(), symbolValue("name"),
+            scalar(), symbolValue("version")
+        );
     }
 
-    @Test
-    public void basicLocalSymbols() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicLocalSymbols(boolean constructFromBytes) {
+        IonReaderContinuableApplicationBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xE9, // Annotation wrapper length 9
             0x81, // 1 byte of annotations
@@ -145,47 +119,49 @@ public void basicLocalSymbols() {
             0x71, 0x0A, // Symbol value SID 10 ("A")
             0x71, 0x0B // Symbol value SID 11 ("B")
         );
-        nextExpect(START_SCALAR);
-        fillExpect(VALUE_READY);
-        expectString("A");
-        nextExpect(START_SCALAR);
-        fillExpect(VALUE_READY);
-        expectString("B");
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            scalar(), symbolValue("A"),
+            scalar(), symbolValue("B")
+        );
     }
 
-    @Test
-    public void basicNoFill() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicNoFill(boolean constructFromBytes) {
+        IonReaderContinuableApplicationBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4 ("name")
             0x21, 0x01 // Int 1
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        expectField("name");
-        nextExpect(END_CONTAINER);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            container(
+                scalarFieldName("name"), // Do not fill or consume the associated value
+                endContainer()
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicStepOutEarly() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicStepOutEarly(boolean constructFromBytes) {
+        IonReaderContinuableApplicationBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4 ("name")
             0x21, 0x01 // Int 1
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        stepOut();
-        assertNull(reader.getFieldName());
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            container(
+                scalar()
+            ),
+            endStream()
+        );
     }
-
-
 }
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
index b148a4bf70..1181460a1f 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
@@ -3,49 +3,38 @@
 
 package com.amazon.ion.impl;
 
-import com.amazon.ion.IonBufferConfiguration;
-import com.amazon.ion.IonCursor;
-import com.amazon.ion.IvmNotificationConsumer;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import com.amazon.ion.IonType;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.ByteArrayInputStream;
+import java.util.function.Consumer;
 
 import static com.amazon.ion.BitUtils.bytes;
-import static com.amazon.ion.IonCursor.Event.END_CONTAINER;
-import static com.amazon.ion.IonCursor.Event.NEEDS_DATA;
-import static com.amazon.ion.IonCursor.Event.NEEDS_INSTRUCTION;
 import static com.amazon.ion.IonCursor.Event.START_CONTAINER;
-import static com.amazon.ion.IonCursor.Event.START_SCALAR;
 import static com.amazon.ion.IonCursor.Event.VALUE_READY;
-import static org.junit.Assert.assertEquals;
+import static com.amazon.ion.impl.IonCursorTestUtilities.STANDARD_BUFFER_CONFIGURATION;
+import static com.amazon.ion.impl.IonCursorTestUtilities.Expectation;
+import static com.amazon.ion.impl.IonCursorTestUtilities.ExpectationProvider;
+import static com.amazon.ion.impl.IonCursorTestUtilities.STEP_IN;
+import static com.amazon.ion.impl.IonCursorTestUtilities.STEP_OUT;
+import static com.amazon.ion.impl.IonCursorTestUtilities.assertSequence;
+import static com.amazon.ion.impl.IonCursorTestUtilities.container;
+import static com.amazon.ion.impl.IonCursorTestUtilities.containerField;
+import static com.amazon.ion.impl.IonCursorTestUtilities.endContainer;
+import static com.amazon.ion.impl.IonCursorTestUtilities.endStream;
+import static com.amazon.ion.impl.IonCursorTestUtilities.fillContainer;
+import static com.amazon.ion.impl.IonCursorTestUtilities.intValue;
+import static com.amazon.ion.impl.IonCursorTestUtilities.scalar;
+import static com.amazon.ion.impl.IonCursorTestUtilities.scalarField;
+import static com.amazon.ion.impl.IonCursorTestUtilities.startContainer;
+import static com.amazon.ion.impl.IonCursorTestUtilities.stringValue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
-@RunWith(Parameterized.class)
 public class IonReaderContinuableCoreBinaryTest {
-    private static final IonBufferConfiguration STANDARD_BUFFER_CONFIGURATION = IonBufferConfiguration.Builder.standard().build();
 
-    @Parameterized.Parameters(name = "constructWithBytes={0}")
-    public static Object[] parameters() {
-        return new Object[]{true, false};
-    }
-
-    @Parameterized.Parameter
-    public boolean constructFromBytes;
-
-    IonReaderContinuableCoreBinary reader = null;
-    int numberOfIvmsEncountered = 0;
-
-    private final IvmNotificationConsumer countingIvmConsumer = (majorVersion, minorVersion) -> numberOfIvmsEncountered++;
-
-    @Before
-    public void setup() {
-        reader = null;
-        numberOfIvmsEncountered = 0;
-    }
-
-    private void initializeReader(int... data) {
+    private IonReaderContinuableCoreBinary initializeReader(boolean constructFromBytes, int... data) {
+        IonReaderContinuableCoreBinary reader;
         if (constructFromBytes) {
             reader = new IonReaderContinuableCoreBinary(STANDARD_BUFFER_CONFIGURATION, bytes(data), 0, data.length);
         } else {
@@ -57,139 +46,160 @@ private void initializeReader(int... data) {
                 0
             );
         }
-        reader.registerIvmNotificationConsumer(countingIvmConsumer);
         reader.registerOversizedValueHandler(
             STANDARD_BUFFER_CONFIGURATION.getOversizedValueHandler()
         );
+        return reader;
     }
 
-    private void nextExpect(IonCursor.Event expected) {
-        assertEquals(expected, reader.nextValue());
-    }
-
-    private void fillExpect(IonCursor.Event expected) {
-        assertEquals(expected, reader.fillValue());
-    }
-
-    private void stepIn() {
-        assertEquals(NEEDS_INSTRUCTION, reader.stepIntoContainer());
-    }
-
-    private void stepOut() {
-        assertEquals(NEEDS_INSTRUCTION, reader.stepOutOfContainer());
+    /**
+     * Provides an Expectation that verifies that the value on which the cursor is currently positioned has the given
+     * field name SID.
+     */
+    private static Expectation<IonReaderContinuableCoreBinary> fieldSid(int expectedFieldSid) {
+        return new Expectation<>(
+            String.format("fieldSid(%d)", expectedFieldSid),
+            reader -> assertEquals(expectedFieldSid, reader.getFieldId())
+        );
     }
 
-    private void expectField(int sid) {
-        assertEquals(sid, reader.getFieldId());
+    /**
+     * Provides Expectations that verify that advancing the cursor positions it on a scalar value with the given field
+     * SID, without filling the scalar.
+     */
+    private static ExpectationProvider<IonReaderContinuableCoreBinary> scalarFieldSid(int expectedFieldSid) {
+        return scalarField(fieldSid(expectedFieldSid));
     }
 
-    private void expectInt(int value) {
-        assertEquals(value, reader.intValue());
-    }
 
-    private void expectString(String value) {
-        assertEquals(value, reader.stringValue());
+    /**
+     * Provides Expectations that verify that advancing the cursor positions it on a container value with the given
+     * field sid, and that the container's child values match the given expectations, without filling the container
+     * up-front.
+     */
+    @SafeVarargs
+    private static ExpectationProvider<IonReaderContinuableCoreBinary> containerFieldSid(int expectedFieldSid, ExpectationProvider<IonReaderContinuableCoreBinary>... expectations) {
+        return containerField(fieldSid(expectedFieldSid), expectations);
     }
 
-    @Test
-    public void basicContainer() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicContainer(boolean constructFromBytes) {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        expectField(4);
-        fillExpect(VALUE_READY);
-        expectInt(1);
-        nextExpect(END_CONTAINER);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            container(
+                scalarFieldSid(4), intValue(1),
+                endContainer()
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicStrings() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicStrings(boolean constructFromBytes) {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0x83, 'f', 'o', 'o', // String length 3
             0x83, 'b', 'a', 'r' // String length 3
         );
-        nextExpect(START_SCALAR);
-        fillExpect(VALUE_READY);
-        expectString("foo");
-        nextExpect(START_SCALAR);
-        fillExpect(VALUE_READY);
-        expectString("bar");
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            scalar(), stringValue("foo"),
+            scalar(), stringValue("bar"),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicNoFill() {
-        initializeReader(
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicNoFill(boolean constructFromBytes) {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        expectField(4);
-        nextExpect(END_CONTAINER);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            container(
+                scalarFieldSid(4), // Do not fill or consume the associated value
+                endContainer()
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicStepOutEarly() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicStepOutEarly(boolean constructFromBytes) {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        stepOut();
-        expectField(-1);
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            container(
+                scalar()
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicTopLevelSkip() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicTopLevelSkip(boolean constructFromBytes) {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        nextExpect(START_CONTAINER);
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            startContainer(),
+            endStream()
+        );
     }
 
-    @Test
-    public void basicTopLevelSkipThenConsume() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void basicTopLevelSkipThenConsume(boolean constructFromBytes) {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD3, // Struct length 3
             0x84, // Field SID 4
             0x21, 0x01, // Int 1
             0x21, 0x03 // Int 3
         );
-        nextExpect(START_CONTAINER);
-        nextExpect(START_SCALAR);
-        fillExpect(VALUE_READY);
-        expectInt(3);
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            startContainer(),
+            scalar(), intValue(3),
+            endStream()
+        );
     }
 
-    @Test
-    public void nestedContainers() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nestedContainers(boolean constructFromBytes) {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD6, // Struct length 6
             0x83, // Field SID 3
@@ -198,22 +208,23 @@ public void nestedContainers() {
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        stepOut();
-        nextExpect(START_SCALAR);
-        fillExpect(VALUE_READY);
-        expectInt(1);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            container(
+                containerFieldSid(3,
+                    scalar()
+                ),
+                scalar(), intValue(1)
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void fillContainerAtDepth0() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void fillContainerAtDepth0(boolean constructFromBytes) {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD6, // Struct length 6
             0x83, // Field SID 3
@@ -222,23 +233,23 @@ public void fillContainerAtDepth0() {
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        nextExpect(START_CONTAINER);
-        fillExpect(VALUE_READY);
-        stepIn();
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        stepOut();
-        nextExpect(START_SCALAR);
-        fillExpect(VALUE_READY);
-        expectInt(1);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            fillContainer(IonType.STRUCT,
+                containerFieldSid(3,
+                    scalar()
+                ),
+                scalar(), intValue(1)
+            ),
+            endStream()
+        );
     }
 
-    @Test
-    public void fillContainerAtDepth1() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void fillContainerAtDepth1(boolean constructFromBytes) {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD6, // Struct length 6
             0x83, // Field SID 3
@@ -247,19 +258,22 @@ public void fillContainerAtDepth1() {
             0x84, // Field SID 4
             0x21, 0x01 // Int 1
         );
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_CONTAINER);
-        fillExpect(VALUE_READY);
-        stepIn();
-        nextExpect(START_SCALAR);
-        nextExpect(END_CONTAINER);
-        stepOut();
+        assertSequence(
+            reader,
+            container(
+                fillContainer(IonType.LIST,
+                    scalar(),
+                    endContainer()
+                )
+            )
+        );
     }
 
-    @Test
-    public void fillContainerThenSkip() {
-        initializeReader(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void fillContainerThenSkip(boolean constructFromBytes) {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
             0xE0, 0x01, 0x00, 0xEA,
             0xD6, // Struct length 6
             0x83, // Field SID 3
@@ -271,15 +285,14 @@ public void fillContainerThenSkip() {
             0x84, // Field SID 4
             0x20 // Int 0
         );
-        nextExpect(START_CONTAINER);
-        fillExpect(VALUE_READY);
-        nextExpect(START_CONTAINER);
-        stepIn();
-        nextExpect(START_SCALAR);
-        fillExpect(VALUE_READY);
-        expectInt(0);
-        nextExpect(END_CONTAINER);
-        stepOut();
-        nextExpect(NEEDS_DATA);
+        assertSequence(
+            reader,
+            fillContainer(IonType.STRUCT),
+            container(
+                scalar(), intValue(0),
+                endContainer()
+            ),
+            endStream()
+        );
     }
 }

From cf07f074d72231fe17723e4dc983b895bed0d3df Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 11 Oct 2023 18:21:31 -0700
Subject: [PATCH 290/490] Migrates IonReaderContinuableTopLevelBinaryTest.java
 to JUnit 5.

---
 ...onReaderContinuableTopLevelBinaryTest.java | 1686 +++++++++--------
 1 file changed, 900 insertions(+), 786 deletions(-)

diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 54e7586ee4..33d8c17ad1 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -30,13 +30,10 @@
 import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.system.IonSystemBuilder;
 import com.amazon.ion.system.SimpleCatalog;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -55,31 +52,20 @@
 
 import static com.amazon.ion.BitUtils.bytes;
 import static com.amazon.ion.TestUtils.gzippedBytes;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-@RunWith(Parameterized.class)
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
 public class IonReaderContinuableTopLevelBinaryTest {
 
     private static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
-    @Parameterized.Parameters(name = "constructWithBytes={0}")
-    public static Object[] parameters() {
-        return new Object[]{true, false};
-    }
-
-    @Parameterized.Parameter
-    public boolean constructFromBytes;
-
     // Builds the incremental reader. May be overwritten by individual tests.
     private IonReaderBuilder readerBuilder;
     // Builds binary writers for constructing test data. May be overwritten by individual tests.
@@ -109,12 +95,12 @@ private interface UnifiedTestHandler extends
     private final UnifiedTestHandler byteCountingHandler = new UnifiedTestHandler() {
         @Override
         public void onOversizedSymbolTable() {
-            Assert.fail("Oversized symbol table not expected.");
+            fail("Oversized symbol table not expected.");
         }
 
         @Override
         public void onOversizedValue() {
-            Assert.fail("Oversized value not expected.");
+            fail("Oversized value not expected.");
         }
 
         @Override
@@ -172,7 +158,7 @@ public void onData(int numberOfBytes) {
         .onData(byteCountingHandler)
         .build();
     
-    @Before
+    @BeforeEach
     public void setup() {
         byteCounter = new AtomicLong();
         oversizedCounter = new AtomicInteger();
@@ -234,10 +220,11 @@ private static byte[] toBinary(String ion) {
      * Creates an incremental reader over the given binary Ion, constructing a reader either from byte array or
      * from InputStream depending on the value of the parameter 'constructFromBytes'.
      * @param builder the reader builder.
+     * @param constructFromBytes whether to construct the reader from bytes or an InputStream.
      * @param bytes the binary Ion data.
      * @return a new reader.
      */
-    private IonReader readerFor(IonReaderBuilder builder, byte[] bytes) {
+    private IonReader readerFor(IonReaderBuilder builder, boolean constructFromBytes, byte[] bytes) {
         totalBytesInStream = bytes.length;
         if (constructFromBytes) {
             return new IonReaderContinuableTopLevelBinary(builder, bytes, 0, bytes.length);
@@ -248,51 +235,55 @@ private IonReader readerFor(IonReaderBuilder builder, byte[] bytes) {
     /**
      * Creates an incremental reader over the binary equivalent of the given text Ion.
      * @param ion text Ion data.
+     * @param constructFromBytes whether to construct the reader from bytes or an InputStream.
      * @return a new reader.
      */
-    private IonReader readerFor(String ion) {
+    private IonReader readerFor(String ion, boolean constructFromBytes) {
         byte[] binary = toBinary(ion);
         totalBytesInStream = binary.length;
-        return readerFor(readerBuilder, binary);
+        return readerFor(readerBuilder, constructFromBytes, binary);
     }
 
     /**
      * Creates an incremental reader over the binary Ion data created by invoking the given RawWriterFunction.
      * @param writerFunction the function used to generate the data.
+     * @param constructFromBytes whether to construct the reader from bytes or an InputStream.
      * @return a new reader.
      * @throws Exception if an exception is raised while writing the Ion data.
      */
-    private IonReader readerFor(RawWriterFunction writerFunction) throws Exception {
+    private IonReader readerFor(RawWriterFunction writerFunction, boolean constructFromBytes) throws Exception {
         byte[] binary = writeRaw(writerFunction, true);
         totalBytesInStream = binary.length;
-        return readerFor(readerBuilder, binary);
+        return readerFor(readerBuilder, constructFromBytes, binary);
     }
 
     /**
      * Creates an incremental reader over the binary Ion data created by invoking the given WriterFunction.
      * @param writerFunction the function used to generate the data.
+     * @param constructFromBytes whether to construct the reader from bytes or an InputStream.
      * @return a new reader.
      * @throws Exception if an exception is raised while writing the Ion data.
      */
-    private IonReader readerFor(WriterFunction writerFunction) throws Exception {
+    private IonReader readerFor(WriterFunction writerFunction, boolean constructFromBytes) throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         IonWriter writer = writerBuilder.build(out);
         writerFunction.write(writer);
         writer.close();
         byte[] binary = out.toByteArray();
         totalBytesInStream = binary.length;
-        return readerFor(readerBuilder, binary);
+        return readerFor(readerBuilder, constructFromBytes, binary);
     }
 
     /**
      * Creates an incremental reader over the given bytes, prepended with the IVM.
+     * @param constructFromBytes whether to construct the reader from bytes or an InputStream.
      * @param ion binary Ion bytes without an IVM.
      * @return a new reader.
      */
-    private IonReader readerFor(int... ion) throws Exception {
+    private IonReader readerFor(boolean constructFromBytes, int... ion) throws Exception {
         byte[] binary = new TestUtils.BinaryIonAppender().append(ion).toByteArray();
         totalBytesInStream = binary.length;
-        return readerFor(readerBuilder, binary);
+        return readerFor(readerBuilder, constructFromBytes, binary);
     }
 
     /**
@@ -344,10 +335,12 @@ private void closeAndCount() throws IOException {
         assertBytesConsumed();
     }
 
-    @Test
-    public void skipContainers() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void skipContainers(boolean constructFromBytes) throws Exception {
         reader = readerFor(
-            "[123] 456 {abc: foo::bar::123, def: baz::456} [123] 789 [foo::bar::123, baz::456] [123]"
+            "[123] 456 {abc: foo::bar::123, def: baz::456} [123] 789 [foo::bar::123, baz::456] [123]",
+            constructFromBytes
         );
         nextExpect(IonType.LIST);
         typeExpect(IonType.LIST);
@@ -376,9 +369,10 @@ public void skipContainers() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void skipContainerAfterSteppingIn() throws Exception {
-        reader = readerFor("{abc: foo::bar::123, def: baz::456} 789");
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void skipContainerAfterSteppingIn(boolean constructFromBytes) throws Exception {
+        reader = readerFor("{abc: foo::bar::123, def: baz::456} 789", constructFromBytes);
         nextExpect(IonType.STRUCT);
         typeExpect(IonType.STRUCT);
         stepIn();
@@ -399,9 +393,10 @@ public void skipContainerAfterSteppingIn() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void skipValueInContainer() throws Exception {
-        reader = readerFor("{foo: \"bar\", abc: 123, baz: a}");
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void skipValueInContainer(boolean constructFromBytes) throws Exception {
+        reader = readerFor("{foo: \"bar\", abc: 123, baz: a}", constructFromBytes);
         nextExpect(IonType.STRUCT);
         stepIn();
         nextExpect(IonType.STRING);
@@ -415,9 +410,10 @@ public void skipValueInContainer() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void symbolsAsStrings() throws Exception {
-        reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void symbolsAsStrings(boolean constructFromBytes) throws Exception {
+        reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}", constructFromBytes);
         nextExpect(IonType.STRUCT);
         stepIn();
         nextExpect(IonType.SYMBOL);
@@ -433,21 +429,25 @@ public void symbolsAsStrings() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void lstAppend() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void lstAppend(boolean constructFromBytes) throws Exception {
         writerBuilder = writerBuilder.withLocalSymbolTableAppendEnabled();
-        reader = readerFor(writer -> {
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("foo");
-            writer.addTypeAnnotation("uvw");
-            writer.writeSymbol("abc");
-            writer.setFieldName("bar");
-            writer.setTypeAnnotations("qrs", "xyz");
-            writer.writeSymbol("def");
-            writer.stepOut();
-            writer.flush();
-            writer.writeSymbol("orange");
-        });
+        reader = readerFor(
+            writer -> {
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("foo");
+                writer.addTypeAnnotation("uvw");
+                writer.writeSymbol("abc");
+                writer.setFieldName("bar");
+                writer.setTypeAnnotations("qrs", "xyz");
+                writer.writeSymbol("def");
+                writer.stepOut();
+                writer.flush();
+                writer.writeSymbol("orange");
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.STRUCT);
         stepIn();
@@ -470,27 +470,31 @@ public void lstAppend() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void lstNonAppend() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void lstNonAppend(boolean constructFromBytes) throws Exception {
         writerBuilder = writerBuilder.withLocalSymbolTableAppendDisabled();
-        reader = readerFor(writer -> {
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("foo");
-            writer.addTypeAnnotation("uvw");
-            writer.writeSymbol("abc");
-            writer.setFieldName("bar");
-            writer.setTypeAnnotations("qrs", "xyz");
-            writer.writeSymbol("def");
-            writer.stepOut();
-            writer.setTypeAnnotations("$ion_symbol_table");
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("symbols");
-            writer.stepIn(IonType.LIST);
-            writer.writeString("orange");
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbol("orange");
-        });
+        reader = readerFor(
+            writer -> {
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("foo");
+                writer.addTypeAnnotation("uvw");
+                writer.writeSymbol("abc");
+                writer.setFieldName("bar");
+                writer.setTypeAnnotations("qrs", "xyz");
+                writer.writeSymbol("def");
+                writer.stepOut();
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("orange");
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbol("orange");
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.STRUCT);
         stepIn();
@@ -509,21 +513,25 @@ public void lstNonAppend() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void ivmBetweenValues() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void ivmBetweenValues(boolean constructFromBytes) throws Exception {
         writerBuilder = writerBuilder.withLocalSymbolTableAppendDisabled();
-        reader = readerFor(writer -> {
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("foo");
-            writer.addTypeAnnotation("uvw");
-            writer.writeSymbol("abc");
-            writer.setFieldName("bar");
-            writer.setTypeAnnotations("qrs", "xyz");
-            writer.writeSymbol("def");
-            writer.stepOut();
-            writer.finish();
-            writer.writeSymbol("orange");
-        });
+        reader = readerFor(
+            writer -> {
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("foo");
+                writer.addTypeAnnotation("uvw");
+                writer.writeSymbol("abc");
+                writer.setFieldName("bar");
+                writer.setTypeAnnotations("qrs", "xyz");
+                writer.writeSymbol("def");
+                writer.stepOut();
+                writer.finish();
+                writer.writeSymbol("orange");
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.STRUCT);
         stepIn();
@@ -542,57 +550,63 @@ public void ivmBetweenValues() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void ivmOnly() throws Exception {
-        reader = readerFor();
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void ivmOnly(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes);
         nextExpect(null);
         closeAndCount();
     }
 
-    @Test
-    public void twoIvmsOnly() throws Exception {
-        reader = readerFor(0xE0, 0x01, 0x00, 0xEA);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void twoIvmsOnly(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0xE0, 0x01, 0x00, 0xEA);
         nextExpect(null);
         closeAndCount();
     }
 
-    @Test
-    public void multipleSymbolTablesBetweenValues() throws Exception {
-        reader = readerFor(writer -> {
-            writer.setTypeAnnotations("$ion_symbol_table");
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("symbols");
-            writer.stepIn(IonType.LIST);
-            writer.writeString("abc");
-            writer.stepOut();
-            writer.stepOut();
-            writer.setTypeAnnotations("$ion_symbol_table");
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("symbols");
-            writer.stepIn(IonType.LIST);
-            writer.writeString("def");
-            writer.stepOut();
-            writer.setFieldName("imports");
-            writer.writeSymbol("$ion_symbol_table");
-            writer.stepOut();
-            writer.writeSymbol("abc");
-            writer.writeSymbol("def");
-            writer.setTypeAnnotations("$ion_symbol_table");
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("symbols");
-            writer.stepIn(IonType.LIST);
-            writer.writeString("orange");
-            writer.stepOut();
-            writer.stepOut();
-            writer.setTypeAnnotations("$ion_symbol_table");
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("symbols");
-            writer.stepIn(IonType.LIST);
-            writer.writeString("purple");
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbol("purple");
-        });
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void multipleSymbolTablesBetweenValues(boolean constructFromBytes) throws Exception {
+        reader = readerFor(
+            writer -> {
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("abc");
+                writer.stepOut();
+                writer.stepOut();
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("def");
+                writer.stepOut();
+                writer.setFieldName("imports");
+                writer.writeSymbol("$ion_symbol_table");
+                writer.stepOut();
+                writer.writeSymbol("abc");
+                writer.writeSymbol("def");
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("orange");
+                writer.stepOut();
+                writer.stepOut();
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("purple");
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbol("purple");
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.SYMBOL);
         expectString("abc");
@@ -604,31 +618,35 @@ public void multipleSymbolTablesBetweenValues() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void multipleIvmsBetweenValues() throws Exception  {
-        reader = readerFor((writer, out) -> {
-            writer.setTypeAnnotationSymbols(3);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(7);
-            writer.stepIn(IonType.LIST);
-            writer.writeString("abc");
-            writer.stepOut();
-            writer.stepOut();
-            writer.finish();
-            out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
-            writer.setTypeAnnotationSymbols(3);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(7);
-            writer.stepIn(IonType.LIST);
-            writer.writeString("def");
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbolToken(10);
-            writer.finish();
-            out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
-            out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
-            writer.writeSymbolToken(4);
-        });
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void multipleIvmsBetweenValues(boolean constructFromBytes) throws Exception  {
+        reader = readerFor(
+            (writer, out) -> {
+                writer.setTypeAnnotationSymbols(3);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(7);
+                writer.stepIn(IonType.LIST);
+                writer.writeString("abc");
+                writer.stepOut();
+                writer.stepOut();
+                writer.finish();
+                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+                writer.setTypeAnnotationSymbols(3);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(7);
+                writer.stepIn(IonType.LIST);
+                writer.writeString("def");
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.finish();
+                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+                writer.writeSymbolToken(4);
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.SYMBOL);
         expectString("def");
@@ -638,24 +656,28 @@ public void multipleIvmsBetweenValues() throws Exception  {
         closeAndCount();
     }
 
-    @Test
-    public void invalidVersion() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void invalidVersion(boolean constructFromBytes) throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         out.write(bytes(0xE0, 0x01, 0x74, 0xEA, 0x20));
-        reader = readerFor(readerBuilder, out.toByteArray());
-        thrown.expect(IonException.class);
-        reader.next();
-        reader.close();
+        reader = readerFor(readerBuilder, constructFromBytes, out.toByteArray());
+        assertThrows(IonException.class, () -> {
+            reader.next();
+            reader.close();
+        });
     }
 
-    @Test
-    public void invalidVersionMarker() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void invalidVersionMarker(boolean constructFromBytes) throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         out.write(bytes(0xE0, 0x01, 0x00, 0xEB, 0x20));
-        reader = readerFor(readerBuilder, out.toByteArray());
-        thrown.expect(IonException.class);
-        reader.next();
-        reader.close();
+        reader = readerFor(readerBuilder, constructFromBytes, out.toByteArray());
+        assertThrows(IonException.class, () -> {
+            reader.next();
+            reader.close();
+        });
     }
 
     /**
@@ -758,8 +780,7 @@ public void incrementalMultipleValuesLoadFromInputStreamFails() throws Exception
         pipe.receive(_Private_IonConstants.BINARY_VERSION_MARKER_1_0[0]);
         // Because reader does not persist across load invocations, the loader must throw an exception if the reader
         // had an incomplete value buffered.
-        thrown.expect(IonException.class);
-        loader.load(pipe);
+        assertThrows(IonException.class, () -> loader.load(pipe));
     }
 
     private void incrementalMultipleValuesIterate(Iterator<IonValue> iterator, ResizingPipedInputStream pipe) {
@@ -817,8 +838,7 @@ public void incrementalReadInitiallyEmptyStreamThatTurnsOutToBeText() {
         // Valid text Ion. Also hex 0x20, which is binary int 0. However, it is not preceded by the IVM, so it must be
         // interpreted as text. The binary reader must fail.
         pipe.receive(' ');
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
     }
 
     @Test
@@ -891,20 +911,24 @@ public void incrementalSymbolTables() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void lobsNewBytes() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void lobsNewBytes(boolean constructFromBytes) throws Exception {
         final byte[] blobBytes = "abcdef".getBytes(StandardCharsets.UTF_8);
         final byte[] clobBytes = "ghijklmnopqrstuv".getBytes(StandardCharsets.UTF_8);
-        reader = readerFor(writer -> {
-            writer.writeBlob(blobBytes);
-            writer.writeClob(clobBytes);
-            writer.setTypeAnnotations("foo");
-            writer.writeBlob(blobBytes);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("bar");
-            writer.writeClob(clobBytes);
-            writer.stepOut();
-        });
+        reader = readerFor(
+            writer -> {
+                writer.writeBlob(blobBytes);
+                writer.writeClob(clobBytes);
+                writer.setTypeAnnotations("foo");
+                writer.writeBlob(blobBytes);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("bar");
+                writer.writeClob(clobBytes);
+                writer.stepOut();
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.BLOB);
         assertArrayEquals(blobBytes, reader.newBytes());
@@ -924,20 +948,24 @@ public void lobsNewBytes() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void lobsGetBytes() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void lobsGetBytes(boolean constructFromBytes) throws Exception {
         final byte[] blobBytes = "abcdef".getBytes(StandardCharsets.UTF_8);
         final byte[] clobBytes = "ghijklmnopqrstuv".getBytes(StandardCharsets.UTF_8);
-        reader = readerFor(writer -> {
-            writer.writeBlob(blobBytes);
-            writer.writeClob(clobBytes);
-            writer.setTypeAnnotations("foo");
-            writer.writeBlob(blobBytes);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("bar");
-            writer.writeClob(clobBytes);
-            writer.stepOut();
-        });
+        reader = readerFor(
+            writer -> {
+                writer.writeBlob(blobBytes);
+                writer.writeClob(clobBytes);
+                writer.setTypeAnnotations("foo");
+                writer.writeBlob(blobBytes);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("bar");
+                writer.writeClob(clobBytes);
+                writer.stepOut();
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.BLOB);
         byte[] fullBlob = new byte[blobBytes.length];
@@ -965,9 +993,11 @@ public void lobsGetBytes() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void nopPad() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nopPad(boolean constructFromBytes) throws Exception {
         reader = readerFor(
+            constructFromBytes,
             // One byte no-op pad.
             0x00,
             // Two byte no-op pad.
@@ -1028,36 +1058,40 @@ public void nopPad() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void symbolTableWithImportsThenSymbols() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void symbolTableWithImportsThenSymbols(boolean constructFromBytes) throws Exception {
         SimpleCatalog catalog = new SimpleCatalog();
         catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
         readerBuilder = readerBuilder.withCatalog(catalog);
         writerBuilder = writerBuilder.withCatalog(catalog);
 
-        reader = readerFor(writer -> {
-            writer.setTypeAnnotations("$ion_symbol_table");
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("imports");
-            writer.stepIn(IonType.LIST);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldName("name");
-            writer.writeString("foo");
-            writer.setFieldName("version");
-            writer.writeInt(1);
-            writer.setFieldName("max_id");
-            writer.writeInt(2);
-            writer.stepOut();
-            writer.stepOut();
-            writer.setFieldName("symbols");
-            writer.stepIn(IonType.LIST);
-            writer.writeString("ghi");
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbol("abc");
-            writer.writeSymbol("def");
-            writer.writeSymbol("ghi");
-        });
+        reader = readerFor(
+            writer -> {
+                writer.setTypeAnnotations("$ion_symbol_table");
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("imports");
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldName("name");
+                writer.writeString("foo");
+                writer.setFieldName("version");
+                writer.writeInt(1);
+                writer.setFieldName("max_id");
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.setFieldName("symbols");
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbol("abc");
+                writer.writeSymbol("def");
+                writer.writeSymbol("ghi");
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.SYMBOL);
         expectString("abc");
@@ -1069,36 +1103,40 @@ public void symbolTableWithImportsThenSymbols() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void symbolTableWithSymbolsThenImports() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void symbolTableWithSymbolsThenImports(boolean constructFromBytes) throws Exception {
         SimpleCatalog catalog = new SimpleCatalog();
         catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
         readerBuilder = readerBuilder.withCatalog(catalog);
 
-        reader = readerFor((writer, out) -> {
-            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-            writer.stepIn(IonType.LIST);
-            writer.writeString("ghi");
-            writer.stepOut();
-            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-            writer.stepIn(IonType.LIST);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-            writer.writeString("foo");
-            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-            writer.writeInt(1);
-            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-            writer.writeInt(2);
-            writer.stepOut();
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbolToken(10);
-            writer.writeSymbolToken(11);
-            writer.writeSymbolToken(12);
-        });
+        reader = readerFor(
+            (writer, out) -> {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.SYMBOL);
         expectString("abc");
@@ -1110,42 +1148,46 @@ public void symbolTableWithSymbolsThenImports() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void symbolTableWithManySymbolsThenImports() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void symbolTableWithManySymbolsThenImports(boolean constructFromBytes) throws Exception {
         SimpleCatalog catalog = new SimpleCatalog();
         catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
         readerBuilder = readerBuilder.withCatalog(catalog);
 
-        reader = readerFor((writer, out) -> {
-            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-            writer.stepIn(IonType.LIST);
-            writer.writeString("ghi");
-            writer.writeString("jkl");
-            writer.writeString("mno");
-            writer.writeString("pqr");
-            writer.stepOut();
-            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-            writer.stepIn(IonType.LIST);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-            writer.writeString("foo");
-            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-            writer.writeInt(1);
-            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-            writer.writeInt(2);
-            writer.stepOut();
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbolToken(10);
-            writer.writeSymbolToken(11);
-            writer.writeSymbolToken(12);
-            writer.writeSymbolToken(13);
-            writer.writeSymbolToken(14);
-            writer.writeSymbolToken(15);
-        });
+        reader = readerFor(
+            (writer, out) -> {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.writeString("jkl");
+                writer.writeString("mno");
+                writer.writeString("pqr");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+                writer.writeSymbolToken(13);
+                writer.writeSymbolToken(14);
+                writer.writeSymbolToken(15);
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.SYMBOL);
         expectString("abc");
@@ -1163,61 +1205,65 @@ public void symbolTableWithManySymbolsThenImports() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void multipleSymbolTablesWithSymbolsThenImports() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void multipleSymbolTablesWithSymbolsThenImports(boolean constructFromBytes) throws Exception {
         SimpleCatalog catalog = new SimpleCatalog();
         catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
         catalog.putTable(SYSTEM.newSharedSymbolTable("bar", 1, Collections.singletonList("baz").iterator()));
         readerBuilder = readerBuilder.withCatalog(catalog);
 
-        reader = readerFor((writer, out) -> {
-            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-            writer.stepIn(IonType.LIST);
-            writer.writeString("ghi");
-            writer.stepOut();
-            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-            writer.stepIn(IonType.LIST);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-            writer.writeString("foo");
-            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-            writer.writeInt(1);
-            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-            writer.writeInt(2);
-            writer.stepOut();
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbolToken(10);
-            writer.writeSymbolToken(11);
-            writer.writeSymbolToken(12);
-            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-            writer.stepIn(IonType.LIST);
-            writer.writeString("xyz");
-            writer.writeString("uvw");
-            writer.writeString("rst");
-            writer.stepOut();
-            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-            writer.stepIn(IonType.LIST);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-            writer.writeString("bar");
-            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-            writer.writeInt(1);
-            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-            writer.writeInt(1);
-            writer.stepOut();
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbolToken(10);
-            writer.writeSymbolToken(11);
-            writer.writeSymbolToken(12);
-            writer.writeSymbolToken(13);
-        });
+        reader = readerFor(
+            (writer, out) -> {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("xyz");
+                writer.writeString("uvw");
+                writer.writeString("rst");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("bar");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(1);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+                writer.writeSymbolToken(13);
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.SYMBOL);
         expectString("abc");
@@ -1243,39 +1289,43 @@ public void multipleSymbolTablesWithSymbolsThenImports() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void ivmResetsImports() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void ivmResetsImports(boolean constructFromBytes) throws Exception {
         SimpleCatalog catalog = new SimpleCatalog();
         catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
         readerBuilder = readerBuilder.withCatalog(catalog);
 
-        reader = readerFor((writer, out) -> {
-            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-            writer.stepIn(IonType.LIST);
-            writer.writeString("ghi");
-            writer.stepOut();
-            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-            writer.stepIn(IonType.LIST);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-            writer.writeString("foo");
-            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-            writer.writeInt(1);
-            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-            writer.writeInt(2);
-            writer.stepOut();
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbolToken(10);
-            writer.writeSymbolToken(11);
-            writer.writeSymbolToken(12);
-            writer.close();
-            out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
-            out.write(0x20);
-        });
+        reader = readerFor(
+            (writer, out) -> {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+                writer.close();
+                out.write(_Private_IonConstants.BINARY_VERSION_MARKER_1_0);
+                out.write(0x20);
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.SYMBOL);
         expectString("abc");
@@ -1300,9 +1350,10 @@ private static void assertSymbolEquals(
         assertEquals(expectedText, actual.getText());
     }
 
-    @Test
-    public void symbolsAsTokens() throws Exception {
-        reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}");
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void symbolsAsTokens(boolean constructFromBytes) throws Exception {
+        reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}", constructFromBytes);
         nextExpect(IonType.STRUCT);
         stepIn();
         nextExpect(IonType.SYMBOL);
@@ -1323,100 +1374,110 @@ public void symbolsAsTokens() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void intNegativeZeroFails() throws Exception {
-        reader = readerFor(0x31, 0x00);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void intNegativeZeroFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0x31, 0x00);
         reader.next();
-        thrown.expect(IonException.class);
-        reader.longValue();
+        assertThrows(IonException.class, () -> reader.longValue());
         reader.close();
     }
 
-    @Test
-    public void bigIntNegativeZeroFails() throws Exception {
-        reader = readerFor(0x31, 0x00);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void bigIntNegativeZeroFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0x31, 0x00);
         reader.next();
-        thrown.expect(IonException.class);
-        reader.bigIntegerValue();
+        assertThrows(IonException.class, () -> reader.bigIntegerValue());
         reader.close();
     }
 
-    @Test
-    public void listWithLengthTooShortFails() throws Exception {
-        reader = readerFor(0xB1, 0x21, 0x01);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void listWithLengthTooShortFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0xB1, 0x21, 0x01);
         nextExpect(IonType.LIST);
         stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
-    @Test
-    public void listWithContainerValueLengthTooShortFails() throws Exception {
-        reader = readerFor(0xB2, 0xB2, 0x21, 0x01);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void listWithContainerValueLengthTooShortFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0xB2, 0xB2, 0x21, 0x01);
         nextExpect(IonType.LIST);
         stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
-    @Test
-    public void listWithVariableLengthTooShortFails() throws Exception {
-        reader = readerFor(0xBE, 0x81, 0x21, 0x01);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void listWithVariableLengthTooShortFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0xBE, 0x81, 0x21, 0x01);
         nextExpect(IonType.LIST);
         stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
-    @Test(expected = IonException.class)
-    public void noOpPadTooShort1() throws Exception {
-        reader = readerFor(0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void noOpPadTooShort1(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0x37, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01);
         nextExpect(IonType.INT);
-        nextExpect(null);
-        reader.close();
+        assertThrows(IonException.class, () -> {
+            reader.next();
+            reader.close();
+        });
     }
 
-    @Test(expected = IonException.class)
-    public void noOpPadTooShort2() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void noOpPadTooShort2(boolean constructFromBytes) throws Exception {
         reader = readerFor(
+            constructFromBytes,
             0x0e, 0x90, 0x00, 0xde, 0xad, 0xbe, 0xef, 0xca, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         );
-        nextExpect(null);
-        reader.close();
+        assertThrows(IonException.class, () -> {
+            reader.next();
+            reader.close();
+        });
     }
 
-    @Test
-    public void nopPadOneByte() throws Exception {
-        reader = readerFor(0);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nopPadOneByte(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0);
         nextExpect(null);
         closeAndCount();
         reader.close();
     }
 
-    @Test
-    public void localSidOutOfRangeStringValue() throws Exception {
-        reader = readerFor(0x71, 0x0A); // SID 10
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void localSidOutOfRangeStringValue(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0x71, 0x0A); // SID 10
         nextExpect(IonType.SYMBOL);
-        thrown.expect(IonException.class);
-        reader.stringValue();
+        assertThrows(IonException.class, () -> reader.stringValue());
         reader.close();
     }
 
-    @Test
-    public void localSidOutOfRangeSymbolValue() throws Exception {
-        reader = readerFor(0x71, 0x0A); // SID 10
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void localSidOutOfRangeSymbolValue(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0x71, 0x0A); // SID 10
         nextExpect(IonType.SYMBOL);
-        thrown.expect(IonException.class);
-        reader.symbolValue();
+        assertThrows(IonException.class, () -> reader.symbolValue());
         reader.close();
     }
 
-    @Test
-    public void localSidOutOfRangeFieldName() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void localSidOutOfRangeFieldName(boolean constructFromBytes) throws Exception {
         reader = readerFor(
+            constructFromBytes,
             0xD2, // Struct, length 2
             0x8A, // SID 10
             0x20 // int 0
@@ -1424,14 +1485,15 @@ public void localSidOutOfRangeFieldName() throws Exception {
         nextExpect(IonType.STRUCT);
         stepIn();
         nextExpect(IonType.INT);
-        thrown.expect(IonException.class);
-        reader.getFieldName();
+        assertThrows(IonException.class, () -> reader.getFieldName());
         reader.close();
     }
 
-    @Test
-    public void localSidOutOfRangeFieldNameSymbol() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void localSidOutOfRangeFieldNameSymbol(boolean constructFromBytes) throws Exception {
         reader = readerFor(
+            constructFromBytes,
             0xD2, // Struct, length 2
             0x8A, // SID 10
             0x20 // int 0
@@ -1439,42 +1501,45 @@ public void localSidOutOfRangeFieldNameSymbol() throws Exception {
         nextExpect(IonType.STRUCT);
         stepIn();
         nextExpect(IonType.INT);
-        thrown.expect(IonException.class);
-        reader.getFieldNameSymbol();
+        assertThrows(IonException.class, () -> reader.getFieldNameSymbol());
         reader.close();
     }
 
-    @Test
-    public void localSidOutOfRangeAnnotation() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void localSidOutOfRangeAnnotation(boolean constructFromBytes) throws Exception {
         reader = readerFor(
+            constructFromBytes,
             0xE3, // Annotation wrapper, length 3
             0x81, // annotation SID length 1
             0x8A, // SID 10
             0x20 // int 0
         );
         nextExpect(IonType.INT);
-        thrown.expect(IonException.class);
-        reader.getTypeAnnotations();
+        assertThrows(IonException.class, () -> reader.getTypeAnnotations());
         reader.close();
     }
 
-    @Test
-    public void localSidOutOfRangeAnnotationSymbol() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void localSidOutOfRangeAnnotationSymbol(boolean constructFromBytes) throws Exception {
         reader = readerFor(
+            constructFromBytes,
             0xE3, // Annotation wrapper, length 3
             0x81, // annotation SID length 1
             0x8A, // SID 10
             0x20 // int 0
         );
         nextExpect(IonType.INT);
-        thrown.expect(IonException.class);
-        reader.getTypeAnnotationSymbols();
+        assertThrows(IonException.class, () -> reader.getTypeAnnotationSymbols());
         reader.close();
     }
 
-    @Test
-    public void localSidOutOfRangeIterateAnnotations() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void localSidOutOfRangeIterateAnnotations(boolean constructFromBytes) throws Exception {
         reader = readerFor(
+            constructFromBytes,
             0xE3, // Annotation wrapper, length 3
             0x81, // annotation SID length 1
             0x8A, // SID 10
@@ -1482,85 +1547,89 @@ public void localSidOutOfRangeIterateAnnotations() throws Exception {
         );
         nextExpect(IonType.INT);
         Iterator<String> annotationIterator = reader.iterateTypeAnnotations();
-        thrown.expect(IonException.class);
-        annotationIterator.next();
+        assertThrows(IonException.class, annotationIterator::next);
         reader.close();
     }
 
-    @Test
-    public void stepInOnScalarFails() throws Exception {
-        reader = readerFor(0x20);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void stepInOnScalarFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0x20);
         nextExpect(IonType.INT);
-        thrown.expect(IllegalStateException.class);
-        stepIn();
+        assertThrows(IllegalStateException.class, reader::stepIn);
         reader.close();
     }
 
-    @Test
-    public void stepInBeforeNextFails() throws Exception {
-        reader = readerFor(0xD2, 0x84, 0xD0);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void stepInBeforeNextFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0xD2, 0x84, 0xD0);
         reader.next();
         stepIn();
-        thrown.expect(IllegalStateException.class);
-        stepIn();
+        assertThrows(IllegalStateException.class, reader::stepIn);
         reader.close();
     }
 
-    @Test
-    public void stepOutAtDepthZeroFails() throws Exception {
-        reader = readerFor(0x20);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void stepOutAtDepthZeroFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0x20);
         reader.next();
-        thrown.expect(IllegalStateException.class);
-        stepOut();
+        assertThrows(IllegalStateException.class, reader::stepOut);
         reader.close();
     }
 
-    @Test
-    public void byteSizeNotOnLobFails() throws Exception {
-        reader = readerFor(0x20);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void byteSizeNotOnLobFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0x20);
         reader.next();
-        thrown.expect(IonException.class);
-        reader.byteSize();
+        assertThrows(IonException.class, () -> reader.byteSize());
         reader.close();
     }
 
-    @Test
-    public void doubleValueOnIntFails() throws Exception {
-        reader = readerFor(0x20);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void doubleValueOnIntFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0x20);
         reader.next();
-        thrown.expect(IllegalStateException.class);
-        reader.doubleValue();
+        assertThrows(IllegalStateException.class, () -> reader.doubleValue());
         reader.close();
     }
 
-    @Test
-    public void floatWithInvalidLengthFails() throws Exception {
-        reader = readerFor(0x43, 0x01, 0x02, 0x03);
-        thrown.expect(IonException.class);
-        reader.next();
-        reader.close();
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void floatWithInvalidLengthFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0x43, 0x01, 0x02, 0x03);
+        assertThrows(IonException.class, () -> {
+            reader.next();
+            reader.close();
+        });
     }
 
-    @Test
-    public void invalidTypeIdFFailsAtTopLevel() throws Exception {
-        reader = readerFor(0xF0);
-        thrown.expect(IonException.class);
-        reader.next();
-        reader.close();
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void invalidTypeIdFFailsAtTopLevel(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0xF0);
+        assertThrows(IonException.class, () -> {
+            reader.next();
+            reader.close();
+        });
     }
 
-    @Test
-    public void invalidTypeIdFFailsBelowTopLevel() throws Exception {
-        reader = readerFor(0xB1, 0xF0);
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void invalidTypeIdFFailsBelowTopLevel(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0xB1, 0xF0);
         reader.next();
         stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
-    @Test
-    public void reallyLargeString() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void reallyLargeString(boolean constructFromBytes) throws Exception {
         StringBuilder sb = new StringBuilder();
         // 8192 is a arbitrarily large; it requires a couple bytes of length, and it doesn't fit in the preallocated
         // string decoding buffer of size 4096.
@@ -1568,16 +1637,18 @@ public void reallyLargeString() throws Exception {
             sb.append('a');
         }
         String string = sb.toString();
-        reader = readerFor("\"" + string + "\"");
+        reader = readerFor("\"" + string + "\"", constructFromBytes);
         nextExpect(IonType.STRING);
         expectString(string);
         nextExpect(null);
         closeAndCount();
     }
 
-    @Test
-    public void nopPadInAnnotationWrapperFails() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nopPadInAnnotationWrapperFails(boolean constructFromBytes) throws Exception {
         reader = readerFor(
+            constructFromBytes,
             0xB5, // list
             0xE4, // annotation wrapper
             0x81, // 1 byte of annotations
@@ -1587,14 +1658,15 @@ public void nopPadInAnnotationWrapperFails() throws Exception {
         );
         reader.next();
         stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
-    @Test
-    public void nestedAnnotationWrapperFails() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nestedAnnotationWrapperFails(boolean constructFromBytes) throws Exception {
         reader = readerFor(
+            constructFromBytes,
             0xB5, // list
             0xE4, // annotation wrapper
             0x81, // 1 byte of annotations
@@ -1606,14 +1678,15 @@ public void nestedAnnotationWrapperFails() throws Exception {
         );
         reader.next();
         stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
-    @Test
-    public void annotationWrapperLengthMismatchFails() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void annotationWrapperLengthMismatchFails(boolean constructFromBytes) throws Exception {
         reader = readerFor(
+            constructFromBytes,
             0xB5, // list
             0xE4, // annotation wrapper
             0x81, // 1 byte of annotations
@@ -1623,14 +1696,15 @@ public void annotationWrapperLengthMismatchFails() throws Exception {
         );
         reader.next();
         stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
-    @Test
-    public void annotationWrapperVariableLengthMismatchFails() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void annotationWrapperVariableLengthMismatchFails(boolean constructFromBytes) throws Exception {
         reader = readerFor(
+            constructFromBytes,
             0xBE, // list
             0x90, // Length 16
             0xEE, // annotation wrapper
@@ -1644,103 +1718,112 @@ public void annotationWrapperVariableLengthMismatchFails() throws Exception {
         );
         reader.next();
         stepIn();
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
-    @Test
-    public void multipleSymbolTableImportsFieldsFails() throws Exception {
-        reader = readerFor((writer, out) -> {
-            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-            writer.stepIn(IonType.LIST);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-            writer.writeString("bar");
-            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-            writer.writeInt(1);
-            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-            writer.writeInt(1);
-            writer.stepOut();
-            writer.stepOut();
-            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-            writer.stepIn(IonType.LIST);
-            writer.writeString("ghi");
-            writer.stepOut();
-            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-            writer.stepIn(IonType.LIST);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-            writer.writeString("foo");
-            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-            writer.writeInt(1);
-            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-            writer.writeInt(2);
-            writer.stepOut();
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbolToken(10);
-        });
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void multipleSymbolTableImportsFieldsFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(
+            (writer, out) -> {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("bar");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(1);
+                writer.stepOut();
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+            },
+            constructFromBytes
+        );
 
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
-    @Test
-    public void multipleSymbolTableSymbolsFieldsFails() throws Exception {
-        reader = readerFor((writer, out) -> {
-            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-            writer.stepIn(IonType.LIST);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-            writer.writeString("bar");
-            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-            writer.writeInt(1);
-            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-            writer.writeInt(1);
-            writer.stepOut();
-            writer.stepOut();
-            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-            writer.stepIn(IonType.LIST);
-            writer.writeString("ghi");
-            writer.stepOut();
-            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-            writer.stepIn(IonType.LIST);
-            writer.writeString("abc");
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbolToken(10);
-        });
-
-        thrown.expect(IonException.class);
-        reader.next();
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void multipleSymbolTableSymbolsFieldsFails(boolean constructFromBytes) throws Exception {
+        reader = readerFor(
+            (writer, out) -> {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("bar");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(1);
+                writer.stepOut();
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("ghi");
+                writer.stepOut();
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString("abc");
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+            },
+            constructFromBytes
+        );
+        
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
-    @Test
-    public void nonStringInSymbolsListCreatesNullSlot() throws Exception {
-        reader = readerFor((writer, out) -> {
-            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
-            writer.stepIn(IonType.LIST);
-            writer.writeString(null);
-            writer.writeString("abc");
-            writer.writeInt(123);
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbolToken(10);
-            writer.writeSymbolToken(11);
-            writer.writeSymbolToken(12);
-        });
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nonStringInSymbolsListCreatesNullSlot(boolean constructFromBytes) throws Exception {
+        reader = readerFor((
+            writer, out) -> {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("symbols"));
+                writer.stepIn(IonType.LIST);
+                writer.writeString(null);
+                writer.writeString("abc");
+                writer.writeInt(123);
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10);
+                writer.writeSymbolToken(11);
+                writer.writeSymbolToken(12);
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.SYMBOL);
         SymbolToken symbolValue = reader.symbolValue();
@@ -1757,54 +1840,58 @@ public void nonStringInSymbolsListCreatesNullSlot() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations(boolean constructFromBytes) throws Exception {
         SimpleCatalog catalog = new SimpleCatalog();
         catalog.putTable(SYSTEM.newSharedSymbolTable("foo", 1, Arrays.asList("abc", "def").iterator()));
         catalog.putTable(SYSTEM.newSharedSymbolTable("bar", 1, Arrays.asList("123", "456").iterator()));
         readerBuilder = readerBuilder.withCatalog(catalog);
 
-        reader = readerFor((writer, out) -> {
-            SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
-            writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
-            writer.stepIn(IonType.LIST);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-            writer.writeString("foo");
-            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-            writer.writeInt(1);
-            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-            writer.writeInt(4); // The matching shared symbol table in the catalog only declares two symbols.
-            writer.stepOut();
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-            writer.writeString("bar");
-            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-            writer.writeInt(1);
-            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-            // The matching shared symbol table in the catalog declares two symbols, but only one is used.
-            writer.writeInt(1);
-            writer.stepOut();
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(systemTable.findSymbol("name"));
-            writer.writeString("baz"); // There is no match in the catalog; all symbols have unknown text.
-            writer.setFieldNameSymbol(systemTable.findSymbol("version"));
-            writer.writeInt(1);
-            writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
-            writer.writeInt(2);
-            writer.stepOut();
-            writer.stepOut();
-            writer.stepOut();
-            writer.writeSymbolToken(10); // abc
-            writer.writeSymbolToken(11); // def
-            writer.writeSymbolToken(12); // unknown text, import SID 3 (from foo)
-            writer.writeSymbolToken(13); // unknown text, import SID 4 (from foo)
-            writer.writeSymbolToken(14); // 123
-            writer.writeSymbolToken(15); // unknown text, import SID 1 (from baz)
-            writer.writeSymbolToken(16); // unknown text, import SID 2 (from baz)
-        });
+        reader = readerFor(
+            (writer, out) -> {
+                SymbolTable systemTable = SharedSymbolTable.getSystemSymbolTable(1);
+                writer.addTypeAnnotationSymbol(systemTable.findSymbol("$ion_symbol_table"));
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("imports"));
+                writer.stepIn(IonType.LIST);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(4); // The matching shared symbol table in the catalog only declares two symbols.
+                writer.stepOut();
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("bar");
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                // The matching shared symbol table in the catalog declares two symbols, but only one is used.
+                writer.writeInt(1);
+                writer.stepOut();
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(systemTable.findSymbol("name"));
+                writer.writeString("baz"); // There is no match in the catalog; all symbols have unknown text.
+                writer.setFieldNameSymbol(systemTable.findSymbol("version"));
+                writer.writeInt(1);
+                writer.setFieldNameSymbol(systemTable.findSymbol("max_id"));
+                writer.writeInt(2);
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepOut();
+                writer.writeSymbolToken(10); // abc
+                writer.writeSymbolToken(11); // def
+                writer.writeSymbolToken(12); // unknown text, import SID 3 (from foo)
+                writer.writeSymbolToken(13); // unknown text, import SID 4 (from foo)
+                writer.writeSymbolToken(14); // 123
+                writer.writeSymbolToken(15); // unknown text, import SID 1 (from baz)
+                writer.writeSymbolToken(16); // unknown text, import SID 2 (from baz)
+            },
+            constructFromBytes
+        );
 
         nextExpect(IonType.SYMBOL);
         expectString("abc");
@@ -1828,9 +1915,10 @@ public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations() thro
         closeAndCount();
     }
 
-    @Test
-    public void symbolTableSnapshotImplementsBasicMethods() throws Exception {
-        reader = readerFor("'abc'");
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void symbolTableSnapshotImplementsBasicMethods(boolean constructFromBytes) throws Exception {
+        reader = readerFor("'abc'", constructFromBytes);
         reader.next();
         SymbolTable symbolTable = reader.getSymbolTable();
         assertNull(symbolTable.getName());
@@ -1844,8 +1932,7 @@ public void symbolTableSnapshotImplementsBasicMethods() throws Exception {
         assertEquals(10, symbolTable.getMaxId());
         assertEquals("abc", symbolTable.findKnownSymbol(10));
         assertNull(symbolTable.findKnownSymbol(symbolTable.getMaxId() + 1));
-        thrown.expect(IllegalArgumentException.class);
-        symbolTable.findKnownSymbol(-1);
+        assertThrows(IllegalArgumentException.class, () -> symbolTable.findKnownSymbol(-1));
         reader.close();
     }
 
@@ -1870,14 +1957,15 @@ private void setBufferBounds(int initialSize, int maximumSize, UnifiedTestHandle
     /**
      * Creates a bounded incremental reader over the given binary Ion, constructing a reader either from byte array or
      * from InputStream depending on the value of the parameter 'constructFromBytes'.
+     * @param constructFromBytes whether to construct the reader from bytes or InputStream.
      * @param initialBufferSize the initial buffer size.
      * @param maximumBufferSize the maximum size to which the buffer may grow.
      * @param handler the unified handler for byte counting and oversized value handling.
      */
-    private IonReader boundedReaderFor(byte[] bytes, int initialBufferSize, int maximumBufferSize, UnifiedTestHandler handler) {
+    private IonReader boundedReaderFor(boolean constructFromBytes, byte[] bytes, int initialBufferSize, int maximumBufferSize, UnifiedTestHandler handler) {
         byteCounter.set(0);
         setBufferBounds(initialBufferSize, maximumBufferSize, handler);
-        return readerFor(readerBuilder, bytes);
+        return readerFor(readerBuilder, constructFromBytes, bytes);
     }
 
     /**
@@ -1895,9 +1983,10 @@ private IonReader boundedReaderFor(InputStream stream, int initialBufferSize, in
         return readerFor(stream);
     }
 
-    @Test
-    public void singleValueExceedsInitialBufferSize() throws Exception {
-        reader = boundedReaderFor(
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void singleValueExceedsInitialBufferSize(boolean constructFromBytes) throws Exception {
+        reader = boundedReaderFor(constructFromBytes, 
             toBinary("\"abcdefghijklmnopqrstuvwxyz\""),
             8,
             Integer.MAX_VALUE,
@@ -1918,8 +2007,7 @@ public void maximumBufferSizeTooSmallFails() {
             .onOversizedValue(builder.getNoOpOversizedValueHandler())
             .onOversizedSymbolTable(builder.getNoOpOversizedSymbolTableHandler())
             .onData(builder.getNoOpDataHandler());
-        thrown.expect(IllegalArgumentException.class);
-        builder.build();
+        assertThrows(IllegalArgumentException.class, builder::build);
     }
 
     @Test
@@ -1928,8 +2016,7 @@ public void maximumBufferSizeWithoutHandlerFails() {
         builder
             .withMaximumBufferSize(9)
             .withInitialBufferSize(9);
-        thrown.expect(IllegalArgumentException.class);
-        builder.build();
+        assertThrows(IllegalArgumentException.class, builder::build);
     }
     
     private void expectOversized(int numberOfValues) {
@@ -2036,7 +2123,7 @@ public void oversizeValueDetectedDuringReadOfTypeIdOfSymbolTableAnnotatedValue()
             0x21, 0x7B, // int 123
             0x81, 'a' // String "a"
         );
-        reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);;
+        reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
 
         // The maximum buffer size is 5, which will be exceeded after the annotation wrapper type ID
         // (1 byte), the annotations length (1 byte), and the annotation SID 3 (3 bytes). The next byte is the wrapped
@@ -2573,8 +2660,9 @@ private void assertSecondStruct(IonReader reader) {
         nextExpect(null);
     }
 
-    @Test
-    public void flushBetweenStructs() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void flushBetweenStructs(boolean constructFromBytes) throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         IonWriter writer = _Private_IonManagedBinaryWriterBuilder
             .create(_Private_IonManagedBinaryWriterBuilder.AllocatorMode.BASIC)
@@ -2585,14 +2673,15 @@ public void flushBetweenStructs() throws Exception {
         writeSecondStruct(writer);
         writer.close();
 
-        reader = boundedReaderFor(out.toByteArray(), 64, 64, byteCountingHandler);
+        reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 64, 64, byteCountingHandler);
         assertFirstStruct(reader);
         assertSecondStruct(reader);
         closeAndCount();
     }
 
-    @Test
-    public void structsWithFloat32AndPreallocatedLength() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void structsWithFloat32AndPreallocatedLength(boolean constructFromBytes) throws Exception {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         IonWriter writer = _Private_IonManagedBinaryWriterBuilder
             .create(_Private_IonManagedBinaryWriterBuilder.AllocatorMode.BASIC)
@@ -2603,29 +2692,31 @@ public void structsWithFloat32AndPreallocatedLength() throws Exception {
         writeSecondStruct(writer);
         writer.close();
 
-        reader = boundedReaderFor(out.toByteArray(), 64, 64, byteCountingHandler);
+        reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 64, 64, byteCountingHandler);
         assertFirstStruct(reader);
         assertSecondStruct(reader);
         assertBytesConsumed();
     }
 
-    @Test
-    public void nopPadThatFillsBufferFollowedByValueNotOversized() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nopPadThatFillsBufferFollowedByValueNotOversized(boolean constructFromBytes) throws Exception {
         TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
             0x03, 0x00, 0x00, 0x00, // 4 byte NOP pad.
             0x20 // Int 0.
         );
         // The IVM is 4 bytes and the NOP pad is 4 bytes. The first value is the 9th byte and should not be considered
         // oversize because the NOP pad can be discarded.
-        reader = boundedReaderFor(out.toByteArray(), 8, 8, byteCountingHandler);
+        reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 8, 8, byteCountingHandler);
         nextExpect(IonType.INT);
         expectInt(0);
         nextExpect(null);
         closeAndCount();
     }
 
-    @Test
-    public void nopPadFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nopPadFollowedByValueThatOverflowsBufferNotOversized(boolean constructFromBytes) throws Exception {
         TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
             0x03, 0x00, 0x00, 0x00, // 4 byte NOP pad.
             0x21, 0x01 // Int 1.
@@ -2633,15 +2724,16 @@ public void nopPadFollowedByValueThatOverflowsBufferNotOversized() throws Except
         // The IVM is 4 bytes and the NOP pad is 4 bytes. The first byte of the value is the 9th byte and fits in the
         // buffer. Even though there is a 10th byte, the value should not be considered oversize because the NOP pad
         // can be discarded.
-        reader = boundedReaderFor(out.toByteArray(), 9, 9, byteCountingHandler);
+        reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 9, 9, byteCountingHandler);
         nextExpect(IonType.INT);
         expectInt(1);
         nextExpect(null);
         closeAndCount();
     }
 
-    @Test
-    public void symbolTableFollowedByNopPadFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void symbolTableFollowedByNopPadFollowedByValueThatOverflowsBufferNotOversized(boolean constructFromBytes) throws Exception {
         TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
             // Symbol table with the symbol 'hello'.
             0xEB, 0x81, 0x83, 0xD8, 0x87, 0xB6, 0x85, 'h', 'e', 'l', 'l', 'o',
@@ -2650,15 +2742,16 @@ public void symbolTableFollowedByNopPadFollowedByValueThatOverflowsBufferNotOver
         );
         // The IVM is 4 bytes, the symbol table is 12 bytes, and the symbol value is 2 bytes (total 18). The 1-byte NOP
         // pad needs to be reclaimed to make space for the value. Once that is done, the value will fit.
-        reader = boundedReaderFor(out.toByteArray(), 18, 18, byteCountingHandler);
+        reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 18, 18, byteCountingHandler);
         nextExpect(IonType.SYMBOL);
         expectString("hello");
         nextExpect(null);
         closeAndCount();
     }
 
-    @Test
-    public void multipleNopPadsFollowedByValueThatOverflowsBufferNotOversized() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void multipleNopPadsFollowedByValueThatOverflowsBufferNotOversized(boolean constructFromBytes) throws Exception {
         TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
             // One byte no-op pad.
             0x00,
@@ -2683,7 +2776,7 @@ public void multipleNopPadsFollowedByValueThatOverflowsBufferNotOversized() thro
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         );
 
-        reader = boundedReaderFor(out.toByteArray(), 11, 11, byteCountingHandler);
+        reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 11, 11, byteCountingHandler);
         nextExpect(IonType.INT);
         expectInt(1);
         nextExpect(IonType.INT);
@@ -2692,8 +2785,9 @@ public void multipleNopPadsFollowedByValueThatOverflowsBufferNotOversized() thro
         closeAndCount();
     }
 
-    @Test
-    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors(boolean constructFromBytes) throws Exception {
         TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
             // One byte no-op pad.
             0x00,
@@ -2715,15 +2809,16 @@ public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors() throw
         );
 
         // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
-        reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
+        reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 22, 22, byteCountingHandler);
         nextExpect(IonType.SYMBOL);
         expectString("hello");
         nextExpect(null);
         closeAndCount();
     }
 
-    @Test
-    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors2() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors2(boolean constructFromBytes) throws Exception {
         TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
             // One byte no-op pad.
             0x00,
@@ -2745,15 +2840,16 @@ public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors2() thro
         );
 
         // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
-        reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
+        reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 22, 22, byteCountingHandler);
         nextExpect(IonType.SYMBOL);
         expectString("hello");
         nextExpect(null);
         closeAndCount();
     }
 
-    @Test
-    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors3() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors3(boolean constructFromBytes) throws Exception {
         TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
             // One byte no-op pad.
             0x00,
@@ -2775,15 +2871,16 @@ public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors3() thro
         );
 
         // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
-        reader = boundedReaderFor(out.toByteArray(), 22, 22, byteCountingHandler);
+        reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 22, 22, byteCountingHandler);
         nextExpect(IonType.SYMBOL);
         expectString("hello");
         nextExpect(null);
         closeAndCount();
     }
 
-    @Test
-    public void nopPadSurroundingSymbolTableThatFitsInBuffer() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nopPadSurroundingSymbolTableThatFitsInBuffer(boolean constructFromBytes) throws Exception {
         TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
             // 14-byte no-op pad.
             0x0E, 0x8C,
@@ -2800,7 +2897,7 @@ public void nopPadSurroundingSymbolTableThatFitsInBuffer() throws Exception {
         );
 
         // Set the maximum size at IVM (4 bytes) + 14-byte NOP pad + the symbol table (12 bytes) + 2 value bytes.
-        reader = boundedReaderFor(out.toByteArray(), 32, 32, byteCountingHandler);
+        reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 32, 32, byteCountingHandler);
         nextExpect(IonType.STRING);
         expectString("abcdefg");
         nextExpect(IonType.SYMBOL);
@@ -2809,15 +2906,16 @@ public void nopPadSurroundingSymbolTableThatFitsInBuffer() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void nopPadInStructNonIncremental() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void nopPadInStructNonIncremental(boolean constructFromBytes) throws Exception {
         TestUtils.BinaryIonAppender out = new TestUtils.BinaryIonAppender().append(
             0xD6, // Struct length 6
             0x80, // Field name SID 0
             0x04, 0x00, 0x00, 0x00, 0x00 // 5-byte NOP pad.
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
-        reader = boundedReaderFor(out.toByteArray(), 5, Integer.MAX_VALUE, byteCountingHandler);
+        reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 5, Integer.MAX_VALUE, byteCountingHandler);
         nextExpect(IonType.STRUCT);
         stepIn();
         nextExpect(null);
@@ -2845,9 +2943,10 @@ private static void compareIterator(List<String> expected, Iterator<String> actu
         assertEquals(expected.size(), numberOfElements);
     }
 
-    @Test
-    public void annotationIteratorReuse() throws Exception {
-        reader = readerFor("foo::bar::123 baz::456");
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void annotationIteratorReuse(boolean constructFromBytes) throws Exception {
+        reader = readerFor("foo::bar::123 baz::456", constructFromBytes);
         nextExpect(IonType.INT);
         Iterator<String> firstValueAnnotationIterator = reader.iterateTypeAnnotations();
         expectInt(123);
@@ -2860,8 +2959,9 @@ public void annotationIteratorReuse() throws Exception {
         closeAndCount();
     }
 
-    @Test(expected = IonException.class)
-    public void failsOnMalformedSymbolTable() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void failsOnMalformedSymbolTable(boolean constructFromBytes) throws Exception {
         byte[] data = bytes(
             0xE0, 0x01, 0x00, 0xEA, // Binary IVM
             0xE6, // 6-byte annotation wrapper
@@ -2873,33 +2973,36 @@ public void failsOnMalformedSymbolTable() throws Exception {
             0x81, // Junk byte to fill the 6 bytes of the annotation wrapper and 3 bytes of the struct.
             0x20  // Next top-level value (int 0).
         );
-        reader = boundedReaderFor(data, 1024, 1024, byteCountingHandler);
-        nextExpect(null);
-        nextExpect(null);
+        reader = boundedReaderFor(constructFromBytes, data, 1024, 1024, byteCountingHandler);
+        assertThrows(IonException.class, () -> nextExpect(null));
         reader.close();
     }
 
-    @Test
-    public void multiByteSymbolTokens() throws Exception {
-        reader = readerFor((writer, out) -> {
-            writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
-            writer.stepIn(IonType.LIST);
-            for (int i = SystemSymbols.ION_1_0_MAX_ID ; i < 332; i++) {
-                writer.writeNull(IonType.STRING);
-            }
-            writer.writeString("a");
-            writer.writeString("b");
-            writer.writeString("c");
-            writer.stepOut();
-            writer.stepOut();
-            writer.stepIn(IonType.STRUCT);
-            writer.addTypeAnnotationSymbol(333);
-            writer.setFieldNameSymbol(334);
-            writer.writeSymbolToken(335);
-            writer.stepOut();
-        });
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void multiByteSymbolTokens(boolean constructFromBytes) throws Exception {
+        reader = readerFor(
+            (writer, out) -> {
+                writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
+                writer.stepIn(IonType.LIST);
+                for (int i = SystemSymbols.ION_1_0_MAX_ID ; i < 332; i++) {
+                    writer.writeNull(IonType.STRING);
+                }
+                writer.writeString("a");
+                writer.writeString("b");
+                writer.writeString("c");
+                writer.stepOut();
+                writer.stepOut();
+                writer.stepIn(IonType.STRUCT);
+                writer.addTypeAnnotationSymbol(333);
+                writer.setFieldNameSymbol(334);
+                writer.writeSymbolToken(335);
+                writer.stepOut();
+            },
+            constructFromBytes
+        );
         nextExpect(IonType.STRUCT);
         stepIn();
         nextExpect(IonType.SYMBOL);
@@ -2917,60 +3020,72 @@ public void multiByteSymbolTokens() throws Exception {
         closeAndCount();
     }
 
-    @Test
-    public void symbolTableWithOpenContentImportsListField() throws Exception {
-        reader = readerFor((writer, out) -> {
-            writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(SystemSymbols.NAME_SID);
-            writer.writeInt(123);
-            writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
-            writer.stepIn(IonType.LIST);
-            writer.writeString("a");
-            writer.stepOut();
-            writer.setFieldNameSymbol(SystemSymbols.IMPORTS_SID);
-            writer.writeString("foo");
-            writer.stepOut();
-            writer.writeSymbolToken(SystemSymbols.ION_1_0_MAX_ID + 1);
-        });
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void symbolTableWithOpenContentImportsListField(boolean constructFromBytes) throws Exception {
+        reader = readerFor(
+            (writer, out) -> {
+                writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(SystemSymbols.NAME_SID);
+                writer.writeInt(123);
+                writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
+                writer.stepIn(IonType.LIST);
+                writer.writeString("a");
+                writer.stepOut();
+                writer.setFieldNameSymbol(SystemSymbols.IMPORTS_SID);
+                writer.writeString("foo");
+                writer.stepOut();
+                writer.writeSymbolToken(SystemSymbols.ION_1_0_MAX_ID + 1);
+            },
+            constructFromBytes
+        );
         nextExpect(IonType.SYMBOL);
         expectString("a");
         nextExpect(null);
         closeAndCount();
     }
 
-    @Test
-    public void symbolTableWithOpenContentImportsSymbolField() throws Exception {
-        reader = readerFor((writer, out) -> {
-            writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
-            writer.stepIn(IonType.LIST);
-            writer.writeString("a");
-            writer.stepOut();
-            writer.setFieldNameSymbol(SystemSymbols.IMPORTS_SID);
-            writer.writeSymbolToken(SystemSymbols.NAME_SID);
-            writer.stepOut();
-            writer.writeSymbolToken(SystemSymbols.ION_1_0_MAX_ID + 1);
-        });
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void symbolTableWithOpenContentImportsSymbolField(boolean constructFromBytes) throws Exception {
+        reader = readerFor(
+            (writer, out) -> {
+                writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
+                writer.stepIn(IonType.LIST);
+                writer.writeString("a");
+                writer.stepOut();
+                writer.setFieldNameSymbol(SystemSymbols.IMPORTS_SID);
+                writer.writeSymbolToken(SystemSymbols.NAME_SID);
+                writer.stepOut();
+                writer.writeSymbolToken(SystemSymbols.ION_1_0_MAX_ID + 1);
+            },
+            constructFromBytes
+        );
         nextExpect(IonType.SYMBOL);
         expectString("a");
         nextExpect(null);
         closeAndCount();
     }
 
-    @Test
-    public void symbolTableWithOpenContentSymbolField() throws Exception {
-        reader = readerFor((writer, out) -> {
-            writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
-            writer.stepIn(IonType.STRUCT);
-            writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
-            writer.writeString("foo");
-            writer.setFieldNameSymbol(SystemSymbols.IMPORTS_SID);
-            writer.writeSymbolToken(SystemSymbols.NAME_SID);
-            writer.stepOut();
-            writer.writeSymbolToken(SystemSymbols.VERSION_SID);
-        });
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void symbolTableWithOpenContentSymbolField(boolean constructFromBytes) throws Exception {
+        reader = readerFor(
+            (writer, out) -> {
+                writer.addTypeAnnotationSymbol(SystemSymbols.ION_SYMBOL_TABLE_SID);
+                writer.stepIn(IonType.STRUCT);
+                writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
+                writer.writeString("foo");
+                writer.setFieldNameSymbol(SystemSymbols.IMPORTS_SID);
+                writer.writeSymbolToken(SystemSymbols.NAME_SID);
+                writer.stepOut();
+                writer.writeSymbolToken(SystemSymbols.VERSION_SID);
+            },
+            constructFromBytes
+        );
         nextExpect(IonType.SYMBOL);
         expectString(SystemSymbols.VERSION);
         nextExpect(null);
@@ -2994,8 +3109,7 @@ public void stepOutWithoutEnoughDataNonIncrementalFails() throws Exception {
         // Early step out. Not enough bytes to complete the value. Throw if the reader attempts
         // to advance the cursor.
         stepOut();
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
@@ -3008,8 +3122,7 @@ public void skipWithoutEnoughDataNonIncrementalFails() throws Exception {
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
         reader = readerFor(new ByteArrayInputStream(bytes));
         nextExpect(IonType.STRING);
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
@@ -3075,10 +3188,11 @@ public void concatenatedAfterMissingGZIPTrailer() throws Exception {
         nextExpect(null);
     }
 
-    @Test
-    public void incompleteContainerNonContinuable() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void incompleteContainerNonContinuable(boolean constructFromBytes) throws Exception {
         readerBuilder.withIncrementalReadingEnabled(false);
-        reader = readerFor(0xB6, 0x20);
+        reader = readerFor(constructFromBytes, 0xB6, 0x20);
         // Because the reader is non-continuable, it can safely convey the incomplete value's type without making any
         // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
         // read incomplete values. If the user attempts to consume or skip past the value, the reader will raise an
@@ -3088,37 +3202,38 @@ public void incompleteContainerNonContinuable() throws Exception {
         reader.close();
     }
 
-    @Test
-    public void incompleteContainerContinuable() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void incompleteContainerContinuable(boolean constructFromBytes) throws Exception {
         readerBuilder.withIncrementalReadingEnabled(true);
-        reader = readerFor(0xB6, 0x20);
+        reader = readerFor(constructFromBytes, 0xB6, 0x20);
         // Unlike the non-continuable case, the continuable reader cannot return LIST in this case because the
         // value is not yet complete. If it returned LIST, it would indicate to the user that it is safe to consume
         // or skip the value with the guarantee that no unexpected EOF exception can occur.
         nextExpect(null);
         // When closed, the reader must throw an exception for unexpected EOF to disambiguate clean stream end from
         // incomplete value.
-        thrown.expect(IonException.class);
-        reader.close();
+        assertThrows(IonException.class, () -> reader.close());
     }
 
-    @Test
-    public void skipIncompleteContainerNonContinuable() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void skipIncompleteContainerNonContinuable(boolean constructFromBytes) throws Exception {
         readerBuilder.withIncrementalReadingEnabled(false);
-        reader = readerFor(0xB6, 0x20);
+        reader = readerFor(constructFromBytes, 0xB6, 0x20);
         // Because the reader is non-continuable, it can safely convey the incomplete value's type without making any
         // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
         // read incomplete values.
         nextExpect(IonType.LIST);
         // Attempting to skip past the value, results in an unexpected EOF exception.
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
     }
 
-    @Test
-    public void skipIncompleteContainerContinuable() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void skipIncompleteContainerContinuable(boolean constructFromBytes) throws Exception {
         readerBuilder.withIncrementalReadingEnabled(true);
-        reader = readerFor(0xB6, 0x20);
+        reader = readerFor(constructFromBytes, 0xB6, 0x20);
         // Unlike the non-continuable case, the continuable reader cannot return LIST in this case because the
         // value is not yet complete. If it returned LIST, it would indicate to the user that it is safe to consume
         // or skip the value with the guarantee that no unexpected EOF exception can occur.
@@ -3127,14 +3242,14 @@ public void skipIncompleteContainerContinuable() throws Exception {
         nextExpect(null);
         // When closed, the reader must throw an exception for unexpected EOF to disambiguate clean stream end from
         // incomplete value.
-        thrown.expect(IonException.class);
-        reader.close();
+        assertThrows(IonException.class, () -> reader.close());
     }
 
-    @Test
-    public void completeValueInIncompleteContainerNonContinuable() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void completeValueInIncompleteContainerNonContinuable(boolean constructFromBytes) throws Exception {
         readerBuilder.withIncrementalReadingEnabled(false);
-        reader = readerFor(0xB6, 0x20);
+        reader = readerFor(constructFromBytes, 0xB6, 0x20);
         // Because the reader is non-continuable, it can safely convey the incomplete value's type without making any
         // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
         // read incomplete values. If the user attempts to consume or skip past the value, the reader will raise an
@@ -3149,10 +3264,11 @@ public void completeValueInIncompleteContainerNonContinuable() throws Exception
         reader.close();
     }
 
-    @Test
-    public void incompleteValueInIncompleteContainerNonContinuable() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void incompleteValueInIncompleteContainerNonContinuable(boolean constructFromBytes) throws Exception {
         readerBuilder.withIncrementalReadingEnabled(false);
-        reader = readerFor(0xB6, 0x21);
+        reader = readerFor(constructFromBytes, 0xB6, 0x21);
         // Because the reader is non-continuable, it can safely convey the incomplete value's type without making any
         // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
         // read incomplete values. If the user attempts to consume or skip past the value, the reader will raise an
@@ -3161,21 +3277,19 @@ public void incompleteValueInIncompleteContainerNonContinuable() throws Exceptio
         stepIn();
         nextExpect(IonType.INT);
         // Attempting to skip past the incomplete value results in an error.
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, () -> reader.next());
     }
 
-    @Test
-    public void earlyStepOutNonIncremental() throws Exception {
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void earlyStepOutNonIncremental(boolean constructFromBytes) throws Exception {
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
-        reader = readerFor(0xB4, 0x20); // List length 4 followed by a single byte
+        reader = readerFor(constructFromBytes, 0xB4, 0x20); // List length 4 followed by a single byte
         nextExpect(IonType.LIST);
         stepIn();
         // Early step-out. The reader could choose to fail here, but it is expensive to check for EOF on every stepOut.
         stepOut();
         // However, the reader *must* fail if the user requests the next value, because the stream is incomplete.
-        thrown.expect(IonException.class); // Unexpected EOF
-        nextExpect(null);
+        assertThrows(IonException.class, () -> reader.next()); // Unexpected EOF
     }
-
 }

From ea5c106acc8289f219a9a7a8c8caea61e61f73ec Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 12 Oct 2023 19:22:47 -0700
Subject: [PATCH 291/490] Improves the factoring of
 IonReaderContinuableTopLevelBinaryTest.java.

---
 .../ion/impl/IonCursorTestUtilities.java      |   43 +-
 ...eaderContinuableApplicationBinaryTest.java |   18 +-
 .../IonReaderContinuableCoreBinaryTest.java   |   31 +-
 ...onReaderContinuableTopLevelBinaryTest.java | 1163 +++++++++--------
 4 files changed, 655 insertions(+), 600 deletions(-)

diff --git a/test/com/amazon/ion/impl/IonCursorTestUtilities.java b/test/com/amazon/ion/impl/IonCursorTestUtilities.java
index bb298e652e..69c009b913 100644
--- a/test/com/amazon/ion/impl/IonCursorTestUtilities.java
+++ b/test/com/amazon/ion/impl/IonCursorTestUtilities.java
@@ -100,16 +100,18 @@ static <T extends IonCursorBinary> void assertSequence(T cursor, ExpectationProv
     }
 
     /**
-     * Provides Expectations that verify that advancing the cursor positions it on a container value with a field name
-     * that matches the given expectation, and that the container's child values match the given expectations, without
-     * filling the container up-front.
+     * Provides Expectations that verify that advancing the cursor positions it on a container value that matches the
+     * given expectation, and that the container's child values match the given expectations, without filling the
+     * container up-front.
      */
     @SafeVarargs
     @SuppressWarnings("unchecked")
-    static <T extends IonCursorBinary> ExpectationProvider<T> containerField(Expectation<T> expectedField, ExpectationProvider<T>... expectations) {
+    static <T extends IonCursorBinary> ExpectationProvider<T> container(Expectation<T> expectedOnContainer, ExpectationProvider<T>... expectations) {
         return consumer -> {
             consumer.accept((Expectation<T>) CONTAINER_START);
-            consumer.accept(expectedField);
+            if (expectedOnContainer != NO_EXPECTATION) {
+                consumer.accept(expectedOnContainer);
+            }
             consumer.accept((Expectation<T>) STEP_IN);
             for (Consumer<Consumer<Expectation<T>>> expectation : expectations) {
                 expectation.accept(consumer);
@@ -125,18 +127,20 @@ static <T extends IonCursorBinary> ExpectationProvider<T> containerField(Expecta
     @SafeVarargs
     @SuppressWarnings("unchecked")
     static <T extends IonCursorBinary> ExpectationProvider<T> container(ExpectationProvider<T>... expectations) {
-        return containerField((Expectation<T>) NO_EXPECTATION, expectations);
+        return container((Expectation<T>) NO_EXPECTATION, expectations);
     }
 
     /**
-     * Provides an Expectation that verifies that advancing the cursor positions it on a scalar value with a field name
-     * that matches the given expectation, without filling that scalar.
+     * Provides an Expectation that verifies that advancing the cursor positions it on a scalar value that matches the
+     * given expectation, without filling that scalar.
      */
     @SuppressWarnings("unchecked")
-    static <T extends IonCursorBinary> ExpectationProvider<T> scalarField(Expectation<T> expectedField) {
+    static <T extends IonCursorBinary> ExpectationProvider<T> scalar(Expectation<T> expectedOnScalar) {
         return consumer -> {
             consumer.accept((Expectation<T>) SCALAR);
-            consumer.accept(expectedField);
+            if (expectedOnScalar != NO_EXPECTATION) {
+                consumer.accept(expectedOnScalar);
+            }
         };
     }
 
@@ -146,14 +150,25 @@ static <T extends IonCursorBinary> ExpectationProvider<T> scalarField(Expectatio
      */
     @SuppressWarnings("unchecked")
     static <T extends IonCursorBinary> ExpectationProvider<T> scalar() {
-        return scalarField((Expectation<T>) NO_EXPECTATION);
+        return scalar((Expectation<T>) NO_EXPECTATION);
+    }
+
+    /**
+     * Provides an Expectation that verifies that the value on which the cursor is currently positioned has the given
+     * type.
+     */
+    static <T extends IonReaderContinuableCoreBinary> ExpectationProvider<T> type(IonType expectedType) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("type(%s)", expectedType),
+            cursor -> assertEquals(expectedType, cursor.getType()))
+        );
     }
 
     /**
      * Provides Expectations that verify that advancing the cursor to the next value positions the cursor on a scalar
      * with type int and the given expected value.
      */
-    static <T extends IonReaderContinuableCoreBinary> ExpectationProvider<T> intValue(int expectedValue) {
+    static <T extends IonReaderContinuableCoreBinary> ExpectationProvider<T> fillIntValue(int expectedValue) {
         return consumer -> consumer.accept(new Expectation<>(
             String.format("int(%d)", expectedValue),
             reader -> {
@@ -168,7 +183,7 @@ static <T extends IonReaderContinuableCoreBinary> ExpectationProvider<T> intValu
      * Provides Expectations that verify that advancing the cursor to the next value positions the cursor on a scalar
      * with type string and the given expected value.
      */
-    static <T extends IonReaderContinuableCoreBinary> ExpectationProvider<T> stringValue(String expectedValue) {
+    static <T extends IonReaderContinuableCoreBinary> ExpectationProvider<T> fillStringValue(String expectedValue) {
         return consumer -> consumer.accept(new Expectation<>(
             String.format("string(%s)", expectedValue),
             reader -> {
@@ -183,7 +198,7 @@ static <T extends IonReaderContinuableCoreBinary> ExpectationProvider<T> stringV
      * Provides Expectations that verify that advancing the cursor to the next value positions the cursor on a scalar
      * with type symbol and the given expected value.
      */
-    static <T extends IonReaderContinuableApplicationBinary> ExpectationProvider<T> symbolValue(String expectedValue) {
+    static <T extends IonReaderContinuableApplicationBinary> ExpectationProvider<T> fillSymbolValue(String expectedValue) {
         return consumer -> consumer.accept(new Expectation<>(
             String.format("symbol(%s)", expectedValue),
             reader -> {
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
index cc4d0f59a7..efaf7a1586 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
@@ -18,10 +18,10 @@
 import static com.amazon.ion.impl.IonCursorTestUtilities.container;
 import static com.amazon.ion.impl.IonCursorTestUtilities.endContainer;
 import static com.amazon.ion.impl.IonCursorTestUtilities.endStream;
-import static com.amazon.ion.impl.IonCursorTestUtilities.intValue;
+import static com.amazon.ion.impl.IonCursorTestUtilities.fillIntValue;
 import static com.amazon.ion.impl.IonCursorTestUtilities.scalar;
-import static com.amazon.ion.impl.IonCursorTestUtilities.scalarField;
-import static com.amazon.ion.impl.IonCursorTestUtilities.symbolValue;
+import static com.amazon.ion.impl.IonCursorTestUtilities.scalar;
+import static com.amazon.ion.impl.IonCursorTestUtilities.fillSymbolValue;
 
 public class IonReaderContinuableApplicationBinaryTest {
 
@@ -63,7 +63,7 @@ private static Expectation<IonReaderContinuableApplicationBinary> fieldName(Stri
      * name, without filling the scalar.
      */
     private static ExpectationProvider<IonReaderContinuableApplicationBinary> scalarFieldName(String expectedFieldName) {
-        return scalarField(fieldName(expectedFieldName));
+        return IonCursorTestUtilities.scalar(fieldName(expectedFieldName));
     }
 
     @ParameterizedTest(name = "constructFromBytes={0}")
@@ -79,7 +79,7 @@ public void basicContainer(boolean constructFromBytes) {
         assertSequence(
             reader,
             container(
-                scalarFieldName("name"), intValue(1),
+                scalarFieldName("name"), fillIntValue(1),
                 endContainer()
             ),
             endStream()
@@ -97,8 +97,8 @@ public void basicSystemSymbols(boolean constructFromBytes) {
         );
         assertSequence(
             reader,
-            scalar(), symbolValue("name"),
-            scalar(), symbolValue("version")
+            scalar(), fillSymbolValue("name"),
+            scalar(), fillSymbolValue("version")
         );
     }
 
@@ -121,8 +121,8 @@ public void basicLocalSymbols(boolean constructFromBytes) {
         );
         assertSequence(
             reader,
-            scalar(), symbolValue("A"),
-            scalar(), symbolValue("B")
+            scalar(), fillSymbolValue("A"),
+            scalar(), fillSymbolValue("B")
         );
     }
 
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
index 1181460a1f..cbc0c9a74b 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
@@ -8,27 +8,22 @@
 import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.ByteArrayInputStream;
-import java.util.function.Consumer;
 
 import static com.amazon.ion.BitUtils.bytes;
-import static com.amazon.ion.IonCursor.Event.START_CONTAINER;
-import static com.amazon.ion.IonCursor.Event.VALUE_READY;
 import static com.amazon.ion.impl.IonCursorTestUtilities.STANDARD_BUFFER_CONFIGURATION;
 import static com.amazon.ion.impl.IonCursorTestUtilities.Expectation;
 import static com.amazon.ion.impl.IonCursorTestUtilities.ExpectationProvider;
-import static com.amazon.ion.impl.IonCursorTestUtilities.STEP_IN;
-import static com.amazon.ion.impl.IonCursorTestUtilities.STEP_OUT;
 import static com.amazon.ion.impl.IonCursorTestUtilities.assertSequence;
 import static com.amazon.ion.impl.IonCursorTestUtilities.container;
-import static com.amazon.ion.impl.IonCursorTestUtilities.containerField;
+import static com.amazon.ion.impl.IonCursorTestUtilities.container;
 import static com.amazon.ion.impl.IonCursorTestUtilities.endContainer;
 import static com.amazon.ion.impl.IonCursorTestUtilities.endStream;
 import static com.amazon.ion.impl.IonCursorTestUtilities.fillContainer;
-import static com.amazon.ion.impl.IonCursorTestUtilities.intValue;
+import static com.amazon.ion.impl.IonCursorTestUtilities.fillIntValue;
+import static com.amazon.ion.impl.IonCursorTestUtilities.scalar;
 import static com.amazon.ion.impl.IonCursorTestUtilities.scalar;
-import static com.amazon.ion.impl.IonCursorTestUtilities.scalarField;
 import static com.amazon.ion.impl.IonCursorTestUtilities.startContainer;
-import static com.amazon.ion.impl.IonCursorTestUtilities.stringValue;
+import static com.amazon.ion.impl.IonCursorTestUtilities.fillStringValue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class IonReaderContinuableCoreBinaryTest {
@@ -68,7 +63,7 @@ private static Expectation<IonReaderContinuableCoreBinary> fieldSid(int expected
      * SID, without filling the scalar.
      */
     private static ExpectationProvider<IonReaderContinuableCoreBinary> scalarFieldSid(int expectedFieldSid) {
-        return scalarField(fieldSid(expectedFieldSid));
+        return IonCursorTestUtilities.scalar(fieldSid(expectedFieldSid));
     }
 
 
@@ -79,7 +74,7 @@ private static ExpectationProvider<IonReaderContinuableCoreBinary> scalarFieldSi
      */
     @SafeVarargs
     private static ExpectationProvider<IonReaderContinuableCoreBinary> containerFieldSid(int expectedFieldSid, ExpectationProvider<IonReaderContinuableCoreBinary>... expectations) {
-        return containerField(fieldSid(expectedFieldSid), expectations);
+        return IonCursorTestUtilities.container(fieldSid(expectedFieldSid), expectations);
     }
 
     @ParameterizedTest(name = "constructFromBytes={0}")
@@ -95,7 +90,7 @@ public void basicContainer(boolean constructFromBytes) {
         assertSequence(
             reader,
             container(
-                scalarFieldSid(4), intValue(1),
+                scalarFieldSid(4), fillIntValue(1),
                 endContainer()
             ),
             endStream()
@@ -113,8 +108,8 @@ public void basicStrings(boolean constructFromBytes) {
         );
         assertSequence(
             reader,
-            scalar(), stringValue("foo"),
-            scalar(), stringValue("bar"),
+            scalar(), fillStringValue("foo"),
+            scalar(), fillStringValue("bar"),
             endStream()
         );
     }
@@ -190,7 +185,7 @@ public void basicTopLevelSkipThenConsume(boolean constructFromBytes) {
         assertSequence(
             reader,
             startContainer(),
-            scalar(), intValue(3),
+            scalar(), fillIntValue(3),
             endStream()
         );
     }
@@ -214,7 +209,7 @@ public void nestedContainers(boolean constructFromBytes) {
                 containerFieldSid(3,
                     scalar()
                 ),
-                scalar(), intValue(1)
+                scalar(), fillIntValue(1)
             ),
             endStream()
         );
@@ -239,7 +234,7 @@ public void fillContainerAtDepth0(boolean constructFromBytes) {
                 containerFieldSid(3,
                     scalar()
                 ),
-                scalar(), intValue(1)
+                scalar(), fillIntValue(1)
             ),
             endStream()
         );
@@ -289,7 +284,7 @@ public void fillContainerThenSkip(boolean constructFromBytes) {
             reader,
             fillContainer(IonType.STRUCT),
             container(
-                scalar(), intValue(0),
+                scalar(), fillIntValue(0),
                 endContainer()
             ),
             endStream()
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 33d8c17ad1..b7422c473d 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -48,10 +48,14 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Consumer;
 import java.util.zip.GZIPInputStream;
 
 import static com.amazon.ion.BitUtils.bytes;
 import static com.amazon.ion.TestUtils.gzippedBytes;
+import static com.amazon.ion.impl.IonCursorTestUtilities.Expectation;
+import static com.amazon.ion.impl.IonCursorTestUtilities.ExpectationProvider;
+import static com.amazon.ion.impl.IonCursorTestUtilities.type;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -298,36 +302,161 @@ private IonReader readerFor(InputStream input) {
         return new IonReaderContinuableTopLevelBinary(readerBuilder, input, null, 0, 0);
     }
 
-    private void nextExpect(IonType type) {
-        assertEquals(type, reader.next());
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> next(IonType expectedType) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("next(%s)", expectedType),
+            reader -> {
+                assertEquals(expectedType, reader.next());
+                assertEquals(expectedType, reader.getType());
+            })
+        );
     }
 
-    private void typeExpect(IonType type) {
-        assertEquals(type, reader.getType());
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> next(String expectedFieldName, IonType expectedType) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("next(%s: %s)", expectedFieldName, expectedType),
+            reader -> {
+                assertEquals(expectedType, reader.next());
+                assertEquals(expectedType, reader.getType());
+                assertEquals(expectedFieldName, reader.getFieldName());
+            })
+        );
     }
 
-    private void stepIn() {
-        reader.stepIn();
+    static final Expectation<IonReaderContinuableTopLevelBinary> STEP_IN_EXPECTATION = new Expectation<>("step_in", IonReader::stepIn);
+    static final Expectation<IonReaderContinuableTopLevelBinary> STEP_OUT_EXPECTATION = new Expectation<>("step_out", IonReader::stepOut);
+
+    static final ExpectationProvider<IonReaderContinuableTopLevelBinary> STEP_IN = consumer -> consumer.accept(STEP_IN_EXPECTATION);
+    static final ExpectationProvider<IonReaderContinuableTopLevelBinary> STEP_OUT = consumer -> consumer.accept(STEP_OUT_EXPECTATION);
+
+    @SafeVarargs
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> container(IonType expectedType, ExpectationProvider<IonReaderContinuableTopLevelBinary>... expectations) {
+        return consumer -> {
+            next(expectedType).accept(consumer);
+            STEP_IN.accept(consumer);
+            for (Consumer<Consumer<Expectation<IonReaderContinuableTopLevelBinary>>> expectation : expectations) {
+                expectation.accept(consumer);
+            }
+            STEP_OUT.accept(consumer);
+        };
     }
 
-    private void stepOut() {
-        reader.stepOut();
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> intValue(int expectedValue) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("int(%d)", expectedValue),
+            reader -> assertEquals(expectedValue, reader.intValue())
+        ));
+    }
+
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> doubleValue(double expectedValue) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("double(%f)", expectedValue),
+            reader -> assertEquals(expectedValue, reader.doubleValue(), 1e-9)
+        ));
+    }
+
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> decimalValue(BigDecimal expectedValue) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("decimal(%s)", expectedValue),
+            reader -> assertEquals(expectedValue, reader.decimalValue())
+        ));
     }
 
-    private void expectAnnotations(String... annotations) {
-        assertEquals(Arrays.asList(annotations), Arrays.asList(reader.getTypeAnnotations()));
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> stringValue(String expectedValue) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("string(%s)", expectedValue),
+            reader -> assertEquals(expectedValue, reader.stringValue())
+        ));
+    }
+
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> symbolValue(String expectedValue) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("symbol(%s)", expectedValue),
+            reader -> assertSymbolEquals(expectedValue, reader.symbolValue())
+        ));
+    }
+
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> symbolValue(int expectedSid) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("symbol(%d)", expectedSid),
+            reader -> {
+                SymbolToken symbolValue = reader.symbolValue();
+                assertNull(symbolValue.getText());
+                assertEquals(expectedSid, symbolValue.getSid());
+            }
+        ));
     }
 
-    private void expectField(String name) {
-        assertEquals(name, reader.getFieldName());
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> newBytesValue(byte[] expectedValue) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("bytes(%s)", Arrays.toString(expectedValue)),
+            reader -> assertArrayEquals(expectedValue, reader.newBytes())
+        ));
     }
 
-    private void expectInt(int value) {
-        assertEquals(value, reader.intValue());
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> getBytesValue(byte[] destination, int offset, int requestedLength, int expectedLength) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("getBytes(%d, %d)", offset, expectedLength),
+            reader -> assertEquals(expectedLength, reader.getBytes(destination, offset, requestedLength))
+        ));
     }
 
-    private void expectString(String value) {
-        assertEquals(value, reader.stringValue());
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> annotations(String... annotations) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("annotations(%s)", Arrays.toString(annotations)),
+            reader -> assertEquals(Arrays.asList(annotations), Arrays.asList(reader.getTypeAnnotations()))
+        ));
+    }
+
+    private static void assertSymbolEquals(
+        String expectedText,
+        SymbolToken actual
+    ) {
+        assertEquals(expectedText, actual.getText());
+    }
+
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> annotationSymbols(String... annotations) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("annotations(%s)", Arrays.toString(annotations)),
+            reader -> {
+                SymbolToken[] actualAnnotations = reader.getTypeAnnotationSymbols();
+                assertEquals(annotations.length, actualAnnotations.length);
+                for (int i = 0; i < annotations.length; i++) {
+                    assertSymbolEquals(annotations[i], actualAnnotations[i]);
+                }
+            }
+        ));
+    }
+
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> fieldName(String fieldName) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("field(%s)", fieldName),
+            reader -> assertEquals(fieldName, reader.getFieldName())
+        ));
+    }
+
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> fieldNameSymbol(String fieldName) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("field(%s)", fieldName),
+            reader -> assertSymbolEquals(fieldName, reader.getFieldNameSymbol())
+        ));
+    }
+
+    @SafeVarargs
+    private final void assertSequence(ExpectationProvider<IonReaderContinuableTopLevelBinary>... providers) {
+        IonCursorTestUtilities.assertSequence((IonReaderContinuableTopLevelBinary) reader, providers);
+    }
+
+    private void nextExpect(IonType type) {
+        assertEquals(type, reader.next());
+    }
+
+    private void stepIn() {
+        reader.stepIn();
+    }
+
+    private void stepOut() {
+        reader.stepOut();
     }
 
     private void closeAndCount() throws IOException {
@@ -342,30 +471,20 @@ public void skipContainers(boolean constructFromBytes) throws Exception {
             "[123] 456 {abc: foo::bar::123, def: baz::456} [123] 789 [foo::bar::123, baz::456] [123]",
             constructFromBytes
         );
-        nextExpect(IonType.LIST);
-        typeExpect(IonType.LIST);
-        nextExpect(IonType.INT);
-        typeExpect(IonType.INT);
-        nextExpect(IonType.STRUCT);
-        typeExpect(IonType.STRUCT);
-        nextExpect(IonType.LIST);
-        typeExpect(IonType.LIST);
-        stepIn();
-        typeExpect(null);
-        nextExpect(IonType.INT);
-        typeExpect(IonType.INT);
-        expectInt(123);
-        stepOut();
-        typeExpect(null);
-        nextExpect(IonType.INT);
-        typeExpect(IonType.INT);
-        expectInt(789);
-        nextExpect(IonType.LIST);
-        typeExpect(IonType.LIST);
-        nextExpect(IonType.LIST);
-        typeExpect(IonType.LIST);
-        nextExpect(null);
-        typeExpect(null);
+        assertSequence(
+            next(IonType.LIST),
+            next(IonType.INT),
+            next(IonType.STRUCT),
+            container(IonType.LIST,
+                type(null),
+                next(IonType.INT), intValue(123)
+            ),
+            type(null),
+            next(IonType.INT), intValue(789),
+            next(IonType.LIST),
+            next(IonType.LIST),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -373,23 +492,16 @@ public void skipContainers(boolean constructFromBytes) throws Exception {
     @ValueSource(booleans = {true, false})
     public void skipContainerAfterSteppingIn(boolean constructFromBytes) throws Exception {
         reader = readerFor("{abc: foo::bar::123, def: baz::456} 789", constructFromBytes);
-        nextExpect(IonType.STRUCT);
-        typeExpect(IonType.STRUCT);
-        stepIn();
-        typeExpect(null);
-        nextExpect(IonType.INT);
-        typeExpect(IonType.INT);
-        expectAnnotations("foo", "bar");
-        expectInt(123);
-        typeExpect(IonType.INT);
-        // Step out before completing the value.
-        stepOut();
-        typeExpect(null);
-        nextExpect(IonType.INT);
-        typeExpect(IonType.INT);
-        expectInt(789);
-        nextExpect(null);
-        typeExpect(null);
+        assertSequence(
+            container(IonType.STRUCT,
+                type(null),
+                next(IonType.INT), annotations("foo", "bar"), intValue(123), type(IonType.INT)
+                // Step out before completing the value
+            ),
+            type(null),
+            next(IonType.INT), intValue(789),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -397,16 +509,15 @@ public void skipContainerAfterSteppingIn(boolean constructFromBytes) throws Exce
     @ValueSource(booleans = {true, false})
     public void skipValueInContainer(boolean constructFromBytes) throws Exception {
         reader = readerFor("{foo: \"bar\", abc: 123, baz: a}", constructFromBytes);
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.STRING);
-        nextExpect(IonType.INT);
-        expectField("abc");
-        nextExpect(IonType.SYMBOL);
-        expectField("baz");
-        nextExpect(null);
-        stepOut();
-        nextExpect(null);
+        assertSequence(
+            container(IonType.STRUCT,
+                next(IonType.STRING),
+                next("abc", IonType.INT),
+                next("baz", IonType.SYMBOL),
+                next(null)
+            ),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -414,18 +525,13 @@ public void skipValueInContainer(boolean constructFromBytes) throws Exception {
     @ValueSource(booleans = {true, false})
     public void symbolsAsStrings(boolean constructFromBytes) throws Exception {
         reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}", constructFromBytes);
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.SYMBOL);
-        expectField("foo");
-        expectAnnotations("uvw");
-        expectString("abc");
-        nextExpect(IonType.SYMBOL);
-        expectField("bar");
-        expectAnnotations("qrs", "xyz");
-        expectString("def");
-        stepOut();
-        nextExpect(null);
+        assertSequence(
+            container(IonType.STRUCT,
+                next("foo", IonType.SYMBOL), annotations("uvw"), stringValue("abc"),
+                next("bar", IonType.SYMBOL), annotations("qrs", "xyz"), stringValue("def")
+            ),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -448,25 +554,23 @@ public void lstAppend(boolean constructFromBytes) throws Exception {
             },
             constructFromBytes
         );
-
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.SYMBOL);
-        expectField("foo");
-        expectAnnotations("uvw");
-        expectString("abc");
-        nextExpect(IonType.SYMBOL);
-        expectField("bar");
-        expectAnnotations("qrs", "xyz");
-        expectString("def");
-        stepOut();
+        assertSequence(
+            container(IonType.STRUCT,
+                next("foo", IonType.SYMBOL), annotations("uvw"), stringValue("abc"),
+                next("bar", IonType.SYMBOL), annotations("qrs", "xyz"), stringValue("def")
+            )
+        );
         SymbolTable preAppend = reader.getSymbolTable();
-        nextExpect(IonType.SYMBOL);
+        assertSequence(
+            next(IonType.SYMBOL)
+        );
         SymbolTable postAppend = reader.getSymbolTable();
-        expectString("orange");
+        assertSequence(
+            stringValue("orange"),
+            next(null)
+        );
         assertNull(preAppend.find("orange"));
         assertNotNull(postAppend.find("orange"));
-        nextExpect(null);
         closeAndCount();
     }
 
@@ -495,21 +599,14 @@ public void lstNonAppend(boolean constructFromBytes) throws Exception {
             },
             constructFromBytes
         );
-
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.SYMBOL);
-        expectField("foo");
-        expectAnnotations("uvw");
-        expectString("abc");
-        nextExpect(IonType.SYMBOL);
-        expectField("bar");
-        expectAnnotations("qrs", "xyz");
-        expectString("def");
-        stepOut();
-        nextExpect(IonType.SYMBOL);
-        expectString("orange");
-        nextExpect(null);
+        assertSequence(
+            container(IonType.STRUCT,
+                next("foo", IonType.SYMBOL), annotations("uvw"), stringValue("abc"),
+                next("bar", IonType.SYMBOL), annotations("qrs", "xyz"), stringValue("def")
+            ),
+            next(IonType.SYMBOL), stringValue("orange"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -532,21 +629,14 @@ public void ivmBetweenValues(boolean constructFromBytes) throws Exception {
             },
             constructFromBytes
         );
-
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.SYMBOL);
-        expectField("foo");
-        expectAnnotations("uvw");
-        expectString("abc");
-        nextExpect(IonType.SYMBOL);
-        expectField("bar");
-        expectAnnotations("qrs", "xyz");
-        expectString("def");
-        stepOut();
-        nextExpect(IonType.SYMBOL);
-        expectString("orange");
-        nextExpect(null);
+        assertSequence(
+            container(IonType.STRUCT,
+                next("foo", IonType.SYMBOL), annotations("uvw"), stringValue("abc"),
+                next("bar", IonType.SYMBOL), annotations("qrs", "xyz"), stringValue("def")
+            ),
+            next(IonType.SYMBOL), stringValue("orange"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -554,7 +644,7 @@ public void ivmBetweenValues(boolean constructFromBytes) throws Exception {
     @ValueSource(booleans = {true, false})
     public void ivmOnly(boolean constructFromBytes) throws Exception {
         reader = readerFor(constructFromBytes);
-        nextExpect(null);
+        assertSequence(next(null));
         closeAndCount();
     }
 
@@ -562,7 +652,7 @@ public void ivmOnly(boolean constructFromBytes) throws Exception {
     @ValueSource(booleans = {true, false})
     public void twoIvmsOnly(boolean constructFromBytes) throws Exception {
         reader = readerFor(constructFromBytes, 0xE0, 0x01, 0x00, 0xEA);
-        nextExpect(null);
+        assertSequence(next(null));
         closeAndCount();
     }
 
@@ -608,13 +698,12 @@ public void multipleSymbolTablesBetweenValues(boolean constructFromBytes) throws
             constructFromBytes
         );
 
-        nextExpect(IonType.SYMBOL);
-        expectString("abc");
-        nextExpect(IonType.SYMBOL);
-        expectString("def");
-        nextExpect(IonType.SYMBOL);
-        expectString("purple");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("abc"),
+            next(IonType.SYMBOL), stringValue("def"),
+            next(IonType.SYMBOL), stringValue("purple"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -648,11 +737,11 @@ public void multipleIvmsBetweenValues(boolean constructFromBytes) throws Excepti
             constructFromBytes
         );
 
-        nextExpect(IonType.SYMBOL);
-        expectString("def");
-        nextExpect(IonType.SYMBOL);
-        expectString("name");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("def"),
+            next(IonType.SYMBOL), stringValue("name"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -701,9 +790,10 @@ public void incrementalValue() throws Exception {
         byte[] bytes = toBinary("\"StringValueLong\"");
         totalBytesInStream = bytes.length;
         feedBytesOneByOne(bytes, pipe, reader);
-        nextExpect(IonType.STRING);
-        expectString("StringValueLong");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.STRING), stringValue("StringValueLong"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -714,22 +804,21 @@ public void incrementalMultipleValues() throws Exception {
         byte[] bytes = toBinary("value_type::\"StringValueLong\"");
         totalBytesInStream = bytes.length;
         feedBytesOneByOne(bytes, pipe, reader);
-        nextExpect(IonType.STRING);
-        expectString("StringValueLong");
-        expectAnnotations("value_type");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.STRING), annotations("value_type"), stringValue("StringValueLong"),
+            next(null)
+        );
         assertBytesConsumed();
         bytes = toBinary("{foobar: \"StringValueLong\"}");
         totalBytesInStream += bytes.length;
         feedBytesOneByOne(bytes, pipe, reader);
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.STRING);
-        expectField("foobar");
-        expectString("StringValueLong");
-        nextExpect(null);
-        stepOut();
-        nextExpect(null);
+        assertSequence(
+            container(IonType.STRUCT,
+                next("foobar", IonType.STRING), stringValue("StringValueLong"),
+                next(null)
+            ),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -834,7 +923,7 @@ public void incrementalReadInitiallyEmptyStreamThatTurnsOutToBeText() {
         // we ensure that this fails quickly.
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(1);
         reader = readerBuilder.build(pipe);
-        nextExpect(null);
+        assertSequence(next(null));
         // Valid text Ion. Also hex 0x20, which is binary int 0. However, it is not preceded by the IVM, so it must be
         // interpreted as text. The binary reader must fail.
         pipe.receive(' ');
@@ -888,26 +977,22 @@ public void incrementalSymbolTables() throws Exception {
         reader = readerFor(pipe);
         feedBytesOneByOne(firstValue, pipe, reader);
         totalBytesInStream = firstValue.length;
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.STRING);
-        expectAnnotations("def");
-        expectField("abcdefghijklmnopqrstuvwxyz");
-        expectString("foo");
-        nextExpect(null);
-        stepOut();
+        assertSequence(
+            container(IonType.STRUCT,
+                next("abcdefghijklmnopqrstuvwxyz", IonType.STRING), annotations("def"), stringValue("foo"),
+                next(null)
+            )
+        );
         assertBytesConsumed();
         feedBytesOneByOne(secondValue, pipe, reader);
         totalBytesInStream += secondValue.length;
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.STRING);
-        expectString("fairlyLongString");
-        expectField("abcdefghijklmnopqrstuvwxyz");
-        expectAnnotations("foo", "bar");
-        nextExpect(null);
-        stepOut();
-        nextExpect(null);
+        assertSequence(
+            container(IonType.STRUCT,
+                next("abcdefghijklmnopqrstuvwxyz", IonType.STRING), annotations("foo", "bar"), stringValue("fairlyLongString")    ,
+                next(null)
+            ),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -929,22 +1014,16 @@ public void lobsNewBytes(boolean constructFromBytes) throws Exception {
             },
             constructFromBytes
         );
-
-        nextExpect(IonType.BLOB);
-        assertArrayEquals(blobBytes, reader.newBytes());
-        nextExpect(IonType.CLOB);
-        assertArrayEquals(clobBytes, reader.newBytes());
-        nextExpect(IonType.BLOB);
-        expectAnnotations("foo");
-        assertArrayEquals(blobBytes, reader.newBytes());
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.CLOB);
-        expectField("bar");
-        assertArrayEquals(clobBytes, reader.newBytes());
-        nextExpect(null);
-        stepOut();
-        nextExpect(null);
+        assertSequence(
+            next(IonType.BLOB), newBytesValue(blobBytes),
+            next(IonType.CLOB), newBytesValue(clobBytes),
+            next(IonType.BLOB), annotations("foo"), newBytesValue(blobBytes),
+            container(IonType.STRUCT,
+                next("bar", IonType.CLOB), newBytesValue(clobBytes),
+                next(null)
+            ),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -967,29 +1046,27 @@ public void lobsGetBytes(boolean constructFromBytes) throws Exception {
             constructFromBytes
         );
 
-        nextExpect(IonType.BLOB);
         byte[] fullBlob = new byte[blobBytes.length];
-        assertEquals(fullBlob.length, reader.getBytes(fullBlob, 0, fullBlob.length));
-        assertArrayEquals(blobBytes, fullBlob);
-        nextExpect(IonType.CLOB);
         byte[] partialClob = new byte[clobBytes.length];
-        assertEquals(3, reader.getBytes(partialClob, 0, 3));
-        assertEquals(clobBytes.length - 3, reader.getBytes(partialClob, 3, clobBytes.length - 3));
+        assertSequence(
+            next(IonType.BLOB), getBytesValue(fullBlob, 0, fullBlob.length, fullBlob.length)
+        );
+        assertArrayEquals(blobBytes, fullBlob);
+        assertSequence(
+            next(IonType.CLOB), getBytesValue(partialClob, 0, 3, 3), getBytesValue(partialClob, 3, clobBytes.length - 3, clobBytes.length - 3)
+        );
         assertArrayEquals(clobBytes, partialClob);
         Arrays.fill(fullBlob, (byte) 0);
-        nextExpect(IonType.BLOB);
-        assertEquals(fullBlob.length, reader.getBytes(fullBlob, 0, 100000));
-        expectAnnotations("foo");
-        nextExpect(IonType.STRUCT);
-        stepIn();
         Arrays.fill(partialClob, (byte) 0);
-        nextExpect(IonType.CLOB);
-        assertEquals(5, reader.getBytes(partialClob, 0, 5));
-        assertEquals(clobBytes.length - 5, reader.getBytes(partialClob, 5, 100000));
+        assertSequence(
+            next(IonType.BLOB), annotations("foo"), getBytesValue(fullBlob, 0, 100000, fullBlob.length),
+            container(IonType.STRUCT,
+                next(IonType.CLOB), getBytesValue(partialClob, 0, 5, 5), getBytesValue(partialClob, 5, 100000, clobBytes.length - 5),
+                next(null)
+            ),
+            next(null)
+        );
         assertArrayEquals(clobBytes, partialClob);
-        nextExpect(null);
-        stepOut();
-        nextExpect(null);
         closeAndCount();
     }
 
@@ -1035,26 +1112,21 @@ public void nopPad(boolean constructFromBytes) throws Exception {
             0x0E, 0x8E,
             0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         );
-
-        nextExpect(IonType.INT);
-        expectInt(0);
-        nextExpect(IonType.INT);
-        expectInt(1);
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.INT);
-        expectInt(-1);
-        nextExpect(null);
-        stepOut();
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(null);
-        stepOut();
-        nextExpect(IonType.LIST);
-        stepIn();
-        nextExpect(null);
-        stepOut();
-        nextExpect(null);
+        assertSequence(
+            next(IonType.INT), intValue(0),
+            next(IonType.INT), intValue(1),
+            container(IonType.STRUCT,
+                next(IonType.INT), intValue(-1),
+                next(null)
+            ),
+            container(IonType.STRUCT,
+                next(null)
+            ),
+            container(IonType.LIST,
+                next(null)
+            ),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -1092,14 +1164,12 @@ public void symbolTableWithImportsThenSymbols(boolean constructFromBytes) throws
             },
             constructFromBytes
         );
-
-        nextExpect(IonType.SYMBOL);
-        expectString("abc");
-        nextExpect(IonType.SYMBOL);
-        expectString("def");
-        nextExpect(IonType.SYMBOL);
-        expectString("ghi");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("abc"),
+            next(IonType.SYMBOL), stringValue("def"),
+            next(IonType.SYMBOL), stringValue("ghi"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -1137,14 +1207,12 @@ public void symbolTableWithSymbolsThenImports(boolean constructFromBytes) throws
             },
             constructFromBytes
         );
-
-        nextExpect(IonType.SYMBOL);
-        expectString("abc");
-        nextExpect(IonType.SYMBOL);
-        expectString("def");
-        nextExpect(IonType.SYMBOL);
-        expectString("ghi");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("abc"),
+            next(IonType.SYMBOL), stringValue("def"),
+            next(IonType.SYMBOL), stringValue("ghi"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -1188,20 +1256,15 @@ public void symbolTableWithManySymbolsThenImports(boolean constructFromBytes) th
             },
             constructFromBytes
         );
-
-        nextExpect(IonType.SYMBOL);
-        expectString("abc");
-        nextExpect(IonType.SYMBOL);
-        expectString("def");
-        nextExpect(IonType.SYMBOL);
-        expectString("ghi");
-        nextExpect(IonType.SYMBOL);
-        expectString("jkl");
-        nextExpect(IonType.SYMBOL);
-        expectString("mno");
-        nextExpect(IonType.SYMBOL);
-        expectString("pqr");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("abc"),
+            next(IonType.SYMBOL), stringValue("def"),
+            next(IonType.SYMBOL), stringValue("ghi"),
+            next(IonType.SYMBOL), stringValue("jkl"),
+            next(IonType.SYMBOL), stringValue("mno"),
+            next(IonType.SYMBOL), stringValue("pqr"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -1264,28 +1327,27 @@ public void multipleSymbolTablesWithSymbolsThenImports(boolean constructFromByte
             },
             constructFromBytes
         );
-
-        nextExpect(IonType.SYMBOL);
-        expectString("abc");
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("abc")
+        );
         SymbolTable[] imports = reader.getSymbolTable().getImportedTables();
         assertEquals(1, imports.length);
         assertEquals("foo", imports[0].getName());
-        nextExpect(IonType.SYMBOL);
-        expectString("def");
-        nextExpect(IonType.SYMBOL);
-        expectString("ghi");
-        nextExpect(IonType.SYMBOL);
-        expectString("baz");
-        nextExpect(IonType.SYMBOL);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("def"),
+            next(IonType.SYMBOL), stringValue("ghi"),
+            next(IonType.SYMBOL), stringValue("baz"),
+            next(IonType.SYMBOL)
+        );
         imports = reader.getSymbolTable().getImportedTables();
         assertEquals(1, imports.length);
         assertEquals("bar", imports[0].getName());
-        expectString("xyz");
-        nextExpect(IonType.SYMBOL);
-        expectString("uvw");
-        nextExpect(IonType.SYMBOL);
-        expectString("rst");
-        nextExpect(null);
+        assertSequence(
+            stringValue("xyz"),
+            next(IonType.SYMBOL), stringValue("uvw"),
+            next(IonType.SYMBOL), stringValue("rst"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -1326,51 +1388,36 @@ public void ivmResetsImports(boolean constructFromBytes) throws Exception {
             },
             constructFromBytes
         );
-
-        nextExpect(IonType.SYMBOL);
-        expectString("abc");
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("abc")
+        );
         SymbolTable[] imports = reader.getSymbolTable().getImportedTables();
         assertEquals(1, imports.length);
         assertEquals("foo", imports[0].getName());
-        nextExpect(IonType.SYMBOL);
-        expectString("def");
-        nextExpect(IonType.SYMBOL);
-        expectString("ghi");
-        nextExpect(IonType.INT);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("def"),
+            next(IonType.SYMBOL), stringValue("ghi"),
+            next(IonType.INT)
+        );
         assertTrue(reader.getSymbolTable().isSystemTable());
-        expectInt(0);
-        nextExpect(null);
+        assertSequence(
+            intValue(0),
+            next(null)
+        );
         closeAndCount();
     }
 
-    private static void assertSymbolEquals(
-        String expectedText,
-        SymbolToken actual
-    ) {
-        assertEquals(expectedText, actual.getText());
-    }
-
     @ParameterizedTest(name = "constructFromBytes={0}")
     @ValueSource(booleans = {true, false})
     public void symbolsAsTokens(boolean constructFromBytes) throws Exception {
         reader = readerFor("{foo: uvw::abc, bar: qrs::xyz::def}", constructFromBytes);
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.SYMBOL);
-        assertSymbolEquals("foo", reader.getFieldNameSymbol());
-        SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
-        assertEquals(1, annotations.length);
-        assertSymbolEquals("uvw", annotations[0]);
-        assertSymbolEquals("abc", reader.symbolValue());
-        nextExpect(IonType.SYMBOL);
-        assertSymbolEquals("bar", reader.getFieldNameSymbol());
-        annotations = reader.getTypeAnnotationSymbols();
-        assertEquals(2, annotations.length);
-        assertSymbolEquals("qrs", annotations[0]);
-        assertSymbolEquals("xyz", annotations[1]);
-        assertSymbolEquals("def", reader.symbolValue());
-        stepOut();
-        nextExpect(null);
+        assertSequence(
+            container(IonType.STRUCT,
+                next(IonType.SYMBOL), fieldNameSymbol("foo"), annotationSymbols("uvw"), symbolValue("abc"),
+                next(IonType.SYMBOL), fieldNameSymbol("bar"), annotationSymbols("qrs", "xyz"), symbolValue("def")
+            ),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -1450,7 +1497,7 @@ public void noOpPadTooShort2(boolean constructFromBytes) throws Exception {
     @ValueSource(booleans = {true, false})
     public void nopPadOneByte(boolean constructFromBytes) throws Exception {
         reader = readerFor(constructFromBytes, 0);
-        nextExpect(null);
+        assertSequence(next(null));
         closeAndCount();
         reader.close();
     }
@@ -1638,9 +1685,10 @@ public void reallyLargeString(boolean constructFromBytes) throws Exception {
         }
         String string = sb.toString();
         reader = readerFor("\"" + string + "\"", constructFromBytes);
-        nextExpect(IonType.STRING);
-        expectString(string);
-        nextExpect(null);
+        assertSequence(
+            next(IonType.STRING), stringValue(string),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -1824,19 +1872,12 @@ public void nonStringInSymbolsListCreatesNullSlot(boolean constructFromBytes) th
             },
             constructFromBytes
         );
-
-        nextExpect(IonType.SYMBOL);
-        SymbolToken symbolValue = reader.symbolValue();
-        assertNull(symbolValue.getText());
-        assertEquals(0, symbolValue.getSid());
-        nextExpect(IonType.SYMBOL);
-        symbolValue = reader.symbolValue();
-        assertEquals("abc", symbolValue.getText());
-        nextExpect(IonType.SYMBOL);
-        symbolValue = reader.symbolValue();
-        assertNull(symbolValue.getText());
-        assertEquals(0, symbolValue.getSid());
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), symbolValue(0),
+            next(IonType.SYMBOL), symbolValue("abc"),
+            next(IonType.SYMBOL), symbolValue(0),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -1893,25 +1934,16 @@ public void symbolTableWithMultipleImportsCorrectlyAssignsImportLocations(boolea
             constructFromBytes
         );
 
-        nextExpect(IonType.SYMBOL);
-        expectString("abc");
-        nextExpect(IonType.SYMBOL);
-        expectString("def");
-        nextExpect(IonType.SYMBOL);
-        SymbolToken symbolValue = reader.symbolValue();
-        assertNull(symbolValue.getText());
-        nextExpect(IonType.SYMBOL);
-        symbolValue = reader.symbolValue();
-        assertNull(symbolValue.getText());
-        nextExpect(IonType.SYMBOL);
-        assertEquals("123", reader.stringValue());
-        nextExpect(IonType.SYMBOL);
-        symbolValue = reader.symbolValue();
-        assertEquals(new SymbolTokenImpl(null, 15), symbolValue);
-        nextExpect(IonType.SYMBOL);
-        symbolValue = reader.symbolValue();
-        assertEquals(new SymbolTokenImpl(null, 16), symbolValue);
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("abc"),
+            next(IonType.SYMBOL), stringValue("def"),
+            next(IonType.SYMBOL), symbolValue(null),
+            next(IonType.SYMBOL), symbolValue(null),
+            next(IonType.SYMBOL), stringValue("123"),
+            next(IonType.SYMBOL), symbolValue(15),
+            next(IonType.SYMBOL), symbolValue(16),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -1992,9 +2024,10 @@ public void singleValueExceedsInitialBufferSize(boolean constructFromBytes) thro
             Integer.MAX_VALUE,
             byteCountingHandler
         );
-        nextExpect(IonType.STRING);
-        expectString("abcdefghijklmnopqrstuvwxyz");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.STRING), stringValue("abcdefghijklmnopqrstuvwxyz"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -2033,13 +2066,14 @@ public void oversizeValueDetectedDuringScalarFill() throws Exception {
         );
 
         reader = boundedReaderFor(new ByteArrayInputStream(bytes), 8, 16, byteAndOversizedValueCountingHandler);
-
-        nextExpect(IonType.STRING);
-        expectString("abc");
+        assertSequence(
+            next(IonType.STRING), stringValue("abc")
+        );
         expectOversized(1);
-        nextExpect(IonType.STRING);
-        expectString("def");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.STRING), stringValue("def"),
+            next(null)
+        );
         reader.close();
         expectOversized(2);
         totalBytesInStream = bytes.length;
@@ -2065,19 +2099,17 @@ public void oversizeValueDetectedDuringScalarFillIncremental() throws Exception
                 valueCounter++;
                 assertTrue(valueCounter < 3);
                 if (valueCounter == 1) {
-                    assertEquals(IonType.STRING, type);
-                    expectString("abc");
+                    assertSequence(type(IonType.STRING), stringValue("abc"));
                     expectOversized(1);
                 } else {
                     assertEquals(2, valueCounter);
-                    assertEquals(IonType.STRING, type);
-                    expectString("def");
+                    assertSequence(type(IonType.STRING), stringValue("def"));
                     expectOversized(2);
                 }
             }
         }
         assertEquals(2, valueCounter);
-        nextExpect(null);
+        assertSequence(next(null));
         reader.close();
         expectOversized(2);
         totalBytesInStream = bytes.length;
@@ -2090,7 +2122,7 @@ public void oversizeValueDetectedDuringFillOfOnlyScalarInStream() throws Excepti
         reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
 
         // The maximum buffer size is 5, which will be exceeded when attempting to fill the value with length 26.
-        nextExpect(null);
+        assertSequence(next(null));
         reader.close();
         expectOversized(1);
         totalBytesInStream = bytes.length;
@@ -2105,7 +2137,7 @@ public void oversizeValueDetectedDuringFillOfOnlyScalarInStreamIncremental() thr
         reader = boundedReaderFor(pipe, 5, 5, byteAndOversizedValueCountingHandler);
         feedBytesOneByOne(bytes, pipe, reader);
         // The maximum buffer size is 5, which will be exceeded when attempting to fill the value with length 26.
-        nextExpect(null);
+        assertSequence(next(null));
         reader.close();
         expectOversized(1);
         totalBytesInStream = bytes.length;
@@ -2128,10 +2160,11 @@ public void oversizeValueDetectedDuringReadOfTypeIdOfSymbolTableAnnotatedValue()
         // The maximum buffer size is 5, which will be exceeded after the annotation wrapper type ID
         // (1 byte), the annotations length (1 byte), and the annotation SID 3 (3 bytes). The next byte is the wrapped
         // value type ID byte.
-        nextExpect(IonType.STRING);
-        expectString("a");
+        assertSequence(
+            next(IonType.STRING), stringValue("a")
+        );
         expectOversized(1);
-        nextExpect(null);
+        assertSequence(next(null));
         reader.close();
         totalBytesInStream = bytes.length;
         assertBytesConsumed();
@@ -2161,8 +2194,10 @@ public void oversizeValueDetectedDuringReadOfTypeIdOfSymbolTableAnnotatedValueIn
         // value type ID byte.
         feedBytesOneByOne(bytes, pipe, reader);
         expectOversized(1);
-        nextExpect(null);
-        nextExpect(null);
+        assertSequence(
+            next(null),
+            next(null)
+        );
         reader.close();
     }
 
@@ -2180,13 +2215,19 @@ public void valueAfterLargeSymbolTableNotOversized() throws Exception {
         // The string "12345678" requires 9 bytes, bringing the total to ~49, above the max of 48.
 
         reader = boundedReaderFor(new ByteArrayInputStream(out.toByteArray()), 8, 48, byteAndOversizedValueCountingHandler);
-        nextExpect(IonType.STRING);
+        assertSequence(
+            next(IonType.STRING)
+        );
         expectOversized(0);
-        expectString("12345678");
-        nextExpect(IonType.SYMBOL);
+        assertSequence(
+            stringValue("12345678"),
+            next(IonType.SYMBOL)
+        );
         expectOversized(0);
-        expectString("abcdefghijklmnopqrstuvwxyz");
-        nextExpect(null);
+        assertSequence(
+            stringValue("abcdefghijklmnopqrstuvwxyz"),
+            next(null)
+        );
         reader.close();
         expectOversized(0);
         totalBytesInStream = out.size();
@@ -2216,18 +2257,16 @@ public void valueAfterLargeSymbolTableNotOversizedIncremental() throws Exception
             if (type != null) {
                 valueCounter++;
                 if (valueCounter == 1) {
-                    assertEquals(IonType.STRING, type);
-                    expectString("12345678");
+                    assertSequence(type(IonType.STRING), stringValue("12345678"));
                     expectOversized(0);
                 } else if (valueCounter == 2) {
-                    assertEquals(IonType.SYMBOL, type);
-                    expectString("abcdefghijklmnopqrstuvwxyz");
+                    assertSequence(type(IonType.SYMBOL), stringValue("abcdefghijklmnopqrstuvwxyz"));
                     expectOversized(0);
                 }
             }
         }
         assertEquals(2, valueCounter);
-        nextExpect(null);
+        assertSequence(next(null));
         reader.close();
         expectOversized(0);
         totalBytesInStream = out.size();
@@ -2344,7 +2383,7 @@ private void oversizeSymbolTableDetectedInHeader(int maximumBufferSize) throws E
         );
         oversizedCounter.set(0);
         reader = boundedReaderFor(new ByteArrayInputStream(bytes), maximumBufferSize, maximumBufferSize, byteAndOversizedSymbolTableCountingHandler);
-        nextExpect(null);
+        assertSequence(next(null));
         expectOversized(1);
         reader.close();
     }
@@ -2376,7 +2415,7 @@ private void oversizeSymbolTableDetectedInHeaderIncremental(int maximumBufferSiz
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(bytes.length);
         reader = boundedReaderFor(pipe, maximumBufferSize, maximumBufferSize, byteAndOversizedSymbolTableCountingHandler);
         feedBytesOneByOne(bytes, pipe, reader);
-        nextExpect(null);
+        assertSequence(next(null));
         expectOversized(1);
         reader.close();
     }
@@ -2406,9 +2445,10 @@ public void oversizeSymbolTableDetectedInTheMiddle() throws Exception {
         // The system values require ~40 bytes (4 IVM, 5 symtab struct header, 1 'symbols' sid, 2 list header, 2 + 26
         // for symbol 10.
         reader = boundedReaderFor(new ByteArrayInputStream(out.toByteArray()), 8, 25, byteAndOversizedSymbolTableCountingHandler);
-        nextExpect(IonType.STRING);
-        expectString("12345678");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.STRING), stringValue("12345678"),
+            next(null)
+        );
         expectOversized(1);
         reader.close();
     }
@@ -2432,14 +2472,13 @@ public void oversizeSymbolTableDetectedInTheMiddleIncremental() throws Exception
             IonType type = reader.next();
             if (type != null) {
                 assertFalse(foundValue);
-                assertEquals(IonType.STRING, type);
-                expectString("12345678");
+                assertSequence(type(IonType.STRING), stringValue("12345678"));
                 foundValue = true;
             }
             pipe.receive(b);
         }
         assertTrue(foundValue);
-        nextExpect(null);
+        assertSequence(next(null));
         expectOversized(1);
         reader.close();
     }
@@ -2449,18 +2488,19 @@ public void skipOversizeScalarBelowTopLevelNonIncremental() throws Exception {
         byte[] bytes = toBinary("[\"abcdefg\", 123]");
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
         reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
-        nextExpect(IonType.LIST);
-        stepIn();
+        assertSequence(next(IonType.LIST), STEP_IN);
         expectOversized(0);
         // This value is oversized, but since it is not filled, `onOversizedValue` does not need to be called.
-        nextExpect(IonType.STRING);
+        assertSequence(next(IonType.STRING));
         expectOversized(0);
-        nextExpect(IonType.INT);
+        assertSequence(next(IonType.INT));
         expectOversized(0);
-        expectInt(123);
-        nextExpect(null);
-        stepOut();
-        nextExpect(null);
+        assertSequence(
+                intValue(123),
+                next(null),
+            STEP_OUT,
+            next(null)
+        );
         reader.close();
         expectOversized(0);
         totalBytesInStream = bytes.length;
@@ -2472,10 +2512,9 @@ public void fillOversizeScalarBelowTopLevelNonIncremental() throws Exception {
         byte[] bytes = toBinary("[\"abcdefg\", 123]");
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
         reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
-        nextExpect(IonType.LIST);
-        stepIn();
+        assertSequence(next(IonType.LIST), STEP_IN);
         expectOversized(0);
-        nextExpect(IonType.STRING);
+        assertSequence(next(IonType.STRING));
         // This value is oversized. Since the user attempts to consume it, `onOversizedValue` is called. An
         // OversizedValueException is called because the user attempted to force parsing of an oversized scalar
         // via an IonReader method that has no other way of conveying the failure.
@@ -2486,12 +2525,14 @@ public void fillOversizeScalarBelowTopLevelNonIncremental() throws Exception {
             // Continue
         }
         expectOversized(1);
-        nextExpect(IonType.INT);
+        assertSequence(next(IonType.INT));
         expectOversized(1);
-        expectInt(123);
-        nextExpect(null);
-        stepOut();
-        nextExpect(null);
+        assertSequence(
+                intValue(123),
+                next(null),
+            STEP_OUT,
+            next(null)
+        );
         reader.close();
         expectOversized(1);
         totalBytesInStream = bytes.length;
@@ -2509,15 +2550,15 @@ public void oversizedValueBelowTopLevelDetectedInHeaderNonIncremental() throws E
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
         reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
-        nextExpect(IonType.SEXP);
-        stepIn();
+        assertSequence(next(IonType.SEXP), STEP_IN);
         expectOversized(0);
-        nextExpect(null);
+        assertSequence(next(null));
         expectOversized(1);
-        stepOut();
-        nextExpect(IonType.STRING);
-        expectString("a");
-        nextExpect(null);
+        assertSequence(
+            STEP_OUT,
+            next(IonType.STRING), stringValue("a"),
+            next(null)
+        );
         reader.close();
         expectOversized(1);
         totalBytesInStream = bytes.length;
@@ -2538,15 +2579,15 @@ public void oversizedAnnotatedValueBelowTopLevelDetectedInHeaderNonIncremental()
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
         reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
-        nextExpect(IonType.SEXP);
-        stepIn();
+        assertSequence(next(IonType.SEXP), STEP_IN);
         expectOversized(0);
-        nextExpect(null);
+        assertSequence(next(null));
         expectOversized(1);
-        stepOut();
-        nextExpect(IonType.STRING);
-        expectString("a");
-        nextExpect(null);
+        assertSequence(
+            STEP_OUT,
+            next(IonType.STRING), stringValue("a"),
+            next(null)
+        );
         reader.close();
         expectOversized(1);
         totalBytesInStream = bytes.length;
@@ -2568,25 +2609,19 @@ public void deeplyNestedValueNotOversizedDueToContainerHeaderLengthsNonIncrement
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
         reader = boundedReaderFor(new ByteArrayInputStream(bytes), 5, 5, byteAndOversizedValueCountingHandler);
-        nextExpect(IonType.STRING);
-        expectString("12");
-        nextExpect(IonType.SEXP);
-        stepIn();
-        nextExpect(IonType.SEXP);
-        stepIn();
-        nextExpect(IonType.SEXP);
-        stepIn();
-        expectOversized(0);
-        nextExpect(IonType.STRING);
-        expectOversized(0);
-        expectString("1234");
-        nextExpect(null);
-        stepOut();
-        stepOut();
-        stepOut();
-        nextExpect(IonType.INT);
-        expectInt(0);
-        nextExpect(null);
+        assertSequence(
+            next(IonType.STRING), stringValue("12"),
+            container(IonType.SEXP,
+                container(IonType.SEXP,
+                    container(IonType.SEXP,
+                        next(IonType.STRING), stringValue("1234"),
+                        next(null)
+                    )
+                )
+            ),
+            next(IonType.INT), intValue(0),
+            next(null)
+        );
         reader.close();
         expectOversized(0);
         totalBytesInStream = bytes.length;
@@ -2609,21 +2644,16 @@ private static void writeFirstStruct(IonWriter writer) throws IOException {
         writer.stepOut();
     }
 
-    private void assertFirstStruct(IonReader reader) {
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.SYMBOL);
-        expectField("foo");
-        expectString("bar");
-        nextExpect(IonType.LIST);
-        expectField("abc");
-        stepIn();
-        nextExpect(IonType.INT);
-        expectInt(123);
-        nextExpect(IonType.INT);
-        expectInt(456);
-        stepOut();
-        stepOut();
+    private void assertFirstStruct() {
+        assertSequence(
+            container(IonType.STRUCT,
+                next("foo", IonType.SYMBOL), stringValue("bar"),
+                next(IonType.LIST), fieldName("abc"), STEP_IN,
+                    next(IonType.INT), intValue(123),
+                    next(IonType.INT), intValue(456),
+                STEP_OUT
+            )
+        );
     }
 
     private static void writeSecondStruct(IonWriter writer) throws IOException {
@@ -2642,22 +2672,17 @@ private static void writeSecondStruct(IonWriter writer) throws IOException {
         writer.stepOut();
     }
 
-    private void assertSecondStruct(IonReader reader) {
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.SYMBOL);
-        expectField("foo");
-        expectString("baz");
-        nextExpect(IonType.LIST);
-        expectField("abc");
-        stepIn();
-        assertEquals(IonType.DECIMAL, reader.next());
-        assertEquals(new BigDecimal("42.0"), reader.decimalValue());
-        assertEquals(IonType.FLOAT, reader.next());
-        assertEquals(43., reader.doubleValue(), 1e-9);
-        stepOut();
-        stepOut();
-        nextExpect(null);
+    private void assertSecondStruct() {
+        assertSequence(
+            container(IonType.STRUCT,
+                next("foo", IonType.SYMBOL), stringValue("baz"),
+                next(IonType.LIST), fieldName("abc"), STEP_IN,
+                    next(IonType.DECIMAL), decimalValue(new BigDecimal("42.0")),
+                    next(IonType.FLOAT), doubleValue(43.),
+                STEP_OUT
+            ),
+            next(null)
+        );
     }
 
     @ParameterizedTest(name = "constructFromBytes={0}")
@@ -2674,8 +2699,8 @@ public void flushBetweenStructs(boolean constructFromBytes) throws Exception {
         writer.close();
 
         reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 64, 64, byteCountingHandler);
-        assertFirstStruct(reader);
-        assertSecondStruct(reader);
+        assertFirstStruct();
+        assertSecondStruct();
         closeAndCount();
     }
 
@@ -2693,8 +2718,8 @@ public void structsWithFloat32AndPreallocatedLength(boolean constructFromBytes)
         writer.close();
 
         reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 64, 64, byteCountingHandler);
-        assertFirstStruct(reader);
-        assertSecondStruct(reader);
+        assertFirstStruct();
+        assertSecondStruct();
         assertBytesConsumed();
     }
 
@@ -2708,9 +2733,10 @@ public void nopPadThatFillsBufferFollowedByValueNotOversized(boolean constructFr
         // The IVM is 4 bytes and the NOP pad is 4 bytes. The first value is the 9th byte and should not be considered
         // oversize because the NOP pad can be discarded.
         reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 8, 8, byteCountingHandler);
-        nextExpect(IonType.INT);
-        expectInt(0);
-        nextExpect(null);
+        assertSequence(
+            next(IonType.INT), intValue(0),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -2725,9 +2751,10 @@ public void nopPadFollowedByValueThatOverflowsBufferNotOversized(boolean constru
         // buffer. Even though there is a 10th byte, the value should not be considered oversize because the NOP pad
         // can be discarded.
         reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 9, 9, byteCountingHandler);
-        nextExpect(IonType.INT);
-        expectInt(1);
-        nextExpect(null);
+        assertSequence(
+            next(IonType.INT), intValue(1),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -2743,9 +2770,10 @@ public void symbolTableFollowedByNopPadFollowedByValueThatOverflowsBufferNotOver
         // The IVM is 4 bytes, the symbol table is 12 bytes, and the symbol value is 2 bytes (total 18). The 1-byte NOP
         // pad needs to be reclaimed to make space for the value. Once that is done, the value will fit.
         reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 18, 18, byteCountingHandler);
-        nextExpect(IonType.SYMBOL);
-        expectString("hello");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("hello"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -2777,11 +2805,11 @@ public void multipleNopPadsFollowedByValueThatOverflowsBufferNotOversized(boolea
         );
 
         reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 11, 11, byteCountingHandler);
-        nextExpect(IonType.INT);
-        expectInt(1);
-        nextExpect(IonType.INT);
-        expectInt(2);
-        nextExpect(null);
+        assertSequence(
+            next(IonType.INT), intValue(1),
+            next(IonType.INT), intValue(2),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -2810,9 +2838,10 @@ public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors(boolean
 
         // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
         reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 22, 22, byteCountingHandler);
-        nextExpect(IonType.SYMBOL);
-        expectString("hello");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("hello"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -2841,9 +2870,10 @@ public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors2(boolea
 
         // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
         reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 22, 22, byteCountingHandler);
-        nextExpect(IonType.SYMBOL);
-        expectString("hello");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("hello"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -2872,9 +2902,10 @@ public void nopPadsInterspersedWithSystemValuesDoNotCauseOversizedErrors3(boolea
 
         // Set the maximum size at 2 IVMs (8 bytes) + the symbol table (12 bytes) + the value (2 bytes).
         reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 22, 22, byteCountingHandler);
-        nextExpect(IonType.SYMBOL);
-        expectString("hello");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("hello"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -2898,11 +2929,11 @@ public void nopPadSurroundingSymbolTableThatFitsInBuffer(boolean constructFromBy
 
         // Set the maximum size at IVM (4 bytes) + 14-byte NOP pad + the symbol table (12 bytes) + 2 value bytes.
         reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 32, 32, byteCountingHandler);
-        nextExpect(IonType.STRING);
-        expectString("abcdefg");
-        nextExpect(IonType.SYMBOL);
-        expectString("hello");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.STRING), stringValue("abcdefg"),
+            next(IonType.SYMBOL), stringValue("hello"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -2916,11 +2947,12 @@ public void nopPadInStructNonIncremental(boolean constructFromBytes) throws Exce
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
         reader = boundedReaderFor(constructFromBytes, out.toByteArray(), 5, Integer.MAX_VALUE, byteCountingHandler);
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(null);
-        stepOut();
-        nextExpect(null);
+        assertSequence(
+            container(IonType.STRUCT,
+                next(null)
+            ),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -2947,14 +2979,19 @@ private static void compareIterator(List<String> expected, Iterator<String> actu
     @ValueSource(booleans = {true, false})
     public void annotationIteratorReuse(boolean constructFromBytes) throws Exception {
         reader = readerFor("foo::bar::123 baz::456", constructFromBytes);
-        nextExpect(IonType.INT);
+
+        assertSequence(next(IonType.INT));
         Iterator<String> firstValueAnnotationIterator = reader.iterateTypeAnnotations();
-        expectInt(123);
-        nextExpect(IonType.INT);
+        assertSequence(
+            intValue(123),
+            next(IonType.INT)
+        );
         compareIterator(Arrays.asList("foo", "bar"), firstValueAnnotationIterator);
         Iterator<String> secondValueAnnotationIterator = reader.iterateTypeAnnotations();
-        expectInt(456);
-        nextExpect(null);
+        assertSequence(
+            intValue(456),
+            next(null)
+        );
         compareIterator(Collections.singletonList("baz"), secondValueAnnotationIterator);
         closeAndCount();
     }
@@ -2974,7 +3011,7 @@ public void failsOnMalformedSymbolTable(boolean constructFromBytes) throws Excep
             0x20  // Next top-level value (int 0).
         );
         reader = boundedReaderFor(constructFromBytes, data, 1024, 1024, byteCountingHandler);
-        assertThrows(IonException.class, () -> nextExpect(null));
+        assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
 
@@ -3003,20 +3040,19 @@ public void multiByteSymbolTokens(boolean constructFromBytes) throws Exception {
             },
             constructFromBytes
         );
-        nextExpect(IonType.STRUCT);
-        stepIn();
-        nextExpect(IonType.SYMBOL);
-        SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
-        assertEquals(1, annotations.length);
-        assertEquals("a", annotations[0].assumeText());
+        assertSequence(
+            next(IonType.STRUCT), STEP_IN,
+                next(IonType.SYMBOL), annotationSymbols("a")
+        );
         Iterator<String> annotationsIterator = reader.iterateTypeAnnotations();
         assertTrue(annotationsIterator.hasNext());
         assertEquals("a", annotationsIterator.next());
         assertFalse(annotationsIterator.hasNext());
-        assertEquals("b", reader.getFieldNameSymbol().assumeText());
-        assertEquals("c", reader.symbolValue().assumeText());
-        stepOut();
-        nextExpect(null);
+        assertSequence(
+                fieldNameSymbol("b"), symbolValue("c"),
+            STEP_OUT,
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -3040,9 +3076,10 @@ public void symbolTableWithOpenContentImportsListField(boolean constructFromByte
             },
             constructFromBytes
         );
-        nextExpect(IonType.SYMBOL);
-        expectString("a");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("a"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -3064,9 +3101,10 @@ public void symbolTableWithOpenContentImportsSymbolField(boolean constructFromBy
             },
             constructFromBytes
         );
-        nextExpect(IonType.SYMBOL);
-        expectString("a");
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue("a"),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -3086,9 +3124,10 @@ public void symbolTableWithOpenContentSymbolField(boolean constructFromBytes) th
             },
             constructFromBytes
         );
-        nextExpect(IonType.SYMBOL);
-        expectString(SystemSymbols.VERSION);
-        nextExpect(null);
+        assertSequence(
+            next(IonType.SYMBOL), stringValue(SystemSymbols.VERSION),
+            next(null)
+        );
         closeAndCount();
     }
 
@@ -3102,13 +3141,13 @@ public void stepOutWithoutEnoughDataNonIncrementalFails() throws Exception {
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
         reader = readerFor(new ByteArrayInputStream(bytes));
-        nextExpect(IonType.LIST);
-        stepIn();
-        nextExpect(IonType.INT);
-        expectInt(1);
-        // Early step out. Not enough bytes to complete the value. Throw if the reader attempts
-        // to advance the cursor.
-        stepOut();
+        assertSequence(
+            container(IonType.LIST,
+                next(IonType.INT), intValue(1)
+                // Early step out. Not enough bytes to complete the value. Throw if the reader attempts
+                // to advance the cursor.
+            )
+        );
         assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
@@ -3121,7 +3160,7 @@ public void skipWithoutEnoughDataNonIncrementalFails() throws Exception {
         );
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
         reader = readerFor(new ByteArrayInputStream(bytes));
-        nextExpect(IonType.STRING);
+        assertSequence(next(IonType.STRING));
         assertThrows(IonException.class, () -> reader.next());
         reader.close();
     }
@@ -3138,15 +3177,16 @@ public void concatenatedAfterGZIPHeader() throws Exception {
         // We must build the reader after the input stream has some content
         reader = readerFor(new GZIPInputStream(pipe));
         //  On next(), the GZIPInputStream will throw EOFException, which is handled by the reader.
-        nextExpect(null);
+        assertSequence(next(null));
         // Finish feeding the gzipped IVM payload
         pipe.receive(gzIVM, gzipHeaderLength, gzIVM.length - gzipHeaderLength);
         // Now feed the bytes for an Ion value, spanning the value across two GZIP payloads.
         pipe.receive(gzippedBytes(0x2E)); // Positive int with length subfield
         pipe.receive(gzippedBytes(0x81, 0x01)); // Length 1, value 1
-        nextExpect(IonType.INT);
-        expectInt(1);
-        nextExpect(null);
+        assertSequence(
+            next(IonType.INT), intValue(1),
+            next(null)
+        );
     }
 
     @Test
@@ -3173,7 +3213,7 @@ public void concatenatedAfterMissingGZIPTrailer() throws Exception {
         // value is oversized because the buffer is already at its maximum size. Since the byte cannot be buffered,
         // the reader consumes it directly from the underlying InputStream using a single-byte read, which causes
         // GZIPInputStream to throw EOFException because the GZIP trailer is missing.
-        nextExpect(null);
+        assertSequence(next(null));
         // Now, finish the previous GZIP payload by appending the trailer, then append a concatenated GZIP payload
         // that contains the rest of the Ion value.
         pipe.receive(gzChunk, gzChunk.length - gzipTrailerLength, gzipTrailerLength);
@@ -3182,10 +3222,11 @@ public void concatenatedAfterMissingGZIPTrailer() throws Exception {
         // On this next, the reader will finish skipping the oversized value by calling skip() on the underlying
         // GZIPInputStream, which is able to complete the request successfully now that the GZIP trailer is available.
         // The following value (integer 0) is then read successfully.
-        nextExpect(IonType.INT);
-        expectInt(0);
+        assertSequence(
+            next(IonType.INT), intValue(0),
+            next(null)
+        );
         assertEquals(1, oversizedCounter.get());
-        nextExpect(null);
     }
 
     @ParameterizedTest(name = "constructFromBytes={0}")
@@ -3197,7 +3238,7 @@ public void incompleteContainerNonContinuable(boolean constructFromBytes) throws
         // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
         // read incomplete values. If the user attempts to consume or skip past the value, the reader will raise an
         // unexpected EOF exception.
-        nextExpect(IonType.LIST);
+        assertSequence(next(IonType.LIST));
         // Note: the legacy binary reader implementation did not throw in this case; that behavior remains.
         reader.close();
     }
@@ -3210,7 +3251,7 @@ public void incompleteContainerContinuable(boolean constructFromBytes) throws Ex
         // Unlike the non-continuable case, the continuable reader cannot return LIST in this case because the
         // value is not yet complete. If it returned LIST, it would indicate to the user that it is safe to consume
         // or skip the value with the guarantee that no unexpected EOF exception can occur.
-        nextExpect(null);
+        assertSequence(next(null));
         // When closed, the reader must throw an exception for unexpected EOF to disambiguate clean stream end from
         // incomplete value.
         assertThrows(IonException.class, () -> reader.close());
@@ -3224,7 +3265,7 @@ public void skipIncompleteContainerNonContinuable(boolean constructFromBytes) th
         // Because the reader is non-continuable, it can safely convey the incomplete value's type without making any
         // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
         // read incomplete values.
-        nextExpect(IonType.LIST);
+        assertSequence(next(IonType.LIST));
         // Attempting to skip past the value, results in an unexpected EOF exception.
         assertThrows(IonException.class, () -> reader.next());
     }
@@ -3234,12 +3275,14 @@ public void skipIncompleteContainerNonContinuable(boolean constructFromBytes) th
     public void skipIncompleteContainerContinuable(boolean constructFromBytes) throws Exception {
         readerBuilder.withIncrementalReadingEnabled(true);
         reader = readerFor(constructFromBytes, 0xB6, 0x20);
-        // Unlike the non-continuable case, the continuable reader cannot return LIST in this case because the
-        // value is not yet complete. If it returned LIST, it would indicate to the user that it is safe to consume
-        // or skip the value with the guarantee that no unexpected EOF exception can occur.
-        nextExpect(null);
-        // Attempting to skip past the incomplete value should still not raise an exception in continuable mode.
-        nextExpect(null);
+        assertSequence(
+            // Unlike the non-continuable case, the continuable reader cannot return LIST in this case because the
+            // value is not yet complete. If it returned LIST, it would indicate to the user that it is safe to consume
+            // or skip the value with the guarantee that no unexpected EOF exception can occur.
+            next(null),
+            // Attempting to skip past the incomplete value should still not raise an exception in continuable mode.
+            next(null)
+        );
         // When closed, the reader must throw an exception for unexpected EOF to disambiguate clean stream end from
         // incomplete value.
         assertThrows(IonException.class, () -> reader.close());
@@ -3254,12 +3297,12 @@ public void completeValueInIncompleteContainerNonContinuable(boolean constructFr
         // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
         // read incomplete values. If the user attempts to consume or skip past the value, the reader will raise an
         // unexpected EOF exception.
-        nextExpect(IonType.LIST);
-        // The incomplete container can be partially read until the bytes run out.
-        stepIn();
-        nextExpect(IonType.INT);
-        expectInt(0);
-        nextExpect(null);
+        assertSequence(
+            next(IonType.LIST), STEP_IN,
+                // The incomplete container can be partially read until the bytes run out.
+                next(IonType.INT), intValue(0),
+                next(null)
+        );
         // Note: the legacy binary reader implementation did not throw in this case; that behavior remains.
         reader.close();
     }
@@ -3273,9 +3316,10 @@ public void incompleteValueInIncompleteContainerNonContinuable(boolean construct
         // guarantees about the completeness of the value. This allows users of the non-continuable reader to partially
         // read incomplete values. If the user attempts to consume or skip past the value, the reader will raise an
         // unexpected EOF exception.
-        nextExpect(IonType.LIST);
-        stepIn();
-        nextExpect(IonType.INT);
+        assertSequence(
+            next(IonType.LIST), STEP_IN,
+            next(IonType.INT)
+        );
         // Attempting to skip past the incomplete value results in an error.
         assertThrows(IonException.class, () -> reader.next());
     }
@@ -3285,10 +3329,11 @@ public void incompleteValueInIncompleteContainerNonContinuable(boolean construct
     public void earlyStepOutNonIncremental(boolean constructFromBytes) throws Exception {
         readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
         reader = readerFor(constructFromBytes, 0xB4, 0x20); // List length 4 followed by a single byte
-        nextExpect(IonType.LIST);
-        stepIn();
-        // Early step-out. The reader could choose to fail here, but it is expensive to check for EOF on every stepOut.
-        stepOut();
+        assertSequence(
+            next(IonType.LIST), STEP_IN,
+            // Early step-out. The reader could choose to fail here, but it is expensive to check for EOF on every stepOut.
+            STEP_OUT
+        );
         // However, the reader *must* fail if the user requests the next value, because the stream is incomplete.
         assertThrows(IonException.class, () -> reader.next()); // Unexpected EOF
     }

From 07d42a80b39c06da98a68dc6e8deed420d143b9d Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 18 Oct 2023 13:09:40 -0700
Subject: [PATCH 292/490] Minor changes to satisfy SpotBugs and JavaDoc.

---
 .../ion/impl/IonReaderContinuableApplicationBinary.java    | 7 ++++++-
 src/com/amazon/ion/impl/_Private_IonConstants.java         | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 5844bc7136..f9d2489bd0 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -28,6 +28,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.NoSuchElementException;
 
 import static com.amazon.ion.SystemSymbols.IMPORTS_SID;
 import static com.amazon.ion.SystemSymbols.ION;
@@ -367,6 +368,9 @@ public boolean hasNext() {
 
                 @Override
                 public String next() {
+                    if (index >= idToText.length) {
+                        throw new NoSuchElementException();
+                    }
                     String symbol = idToText[index];
                     index++;
                     return symbol;
@@ -852,6 +856,7 @@ void readSymbolTable() {
                         }
                         readImportMaxId();
                         break;
+                    default: throw new IllegalStateException();
                 }
             }
         }
@@ -1010,7 +1015,7 @@ public boolean hasNext() {
 
         @Override
         public String next() {
-            return null;
+            throw new NoSuchElementException();
         }
 
         @Override
diff --git a/src/com/amazon/ion/impl/_Private_IonConstants.java b/src/com/amazon/ion/impl/_Private_IonConstants.java
index 156e8600e6..dc25adbb1f 100644
--- a/src/com/amazon/ion/impl/_Private_IonConstants.java
+++ b/src/com/amazon/ion/impl/_Private_IonConstants.java
@@ -106,8 +106,7 @@ public static final boolean isSurrogate(int c) {
                                                              (byte) 0xEA };
 
     /**
-     * The number of bytes in {@link #BINARY_VERSION_MARKER_1_0}
-     * ({@value #BINARY_VERSION_MARKER_SIZE}).
+     * The number of bytes in {@link #BINARY_VERSION_MARKER_1_0}.
      */
     public static final int BINARY_VERSION_MARKER_SIZE =
         BINARY_VERSION_MARKER_1_0.length;

From c1d6ce5242a21658f4a968d5976c247d5cb4d63e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Oct 2023 16:53:42 +0000
Subject: [PATCH 293/490] Bump github/codeql-action from 2.22.1 to 2.22.3

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.1 to 2.22.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/fdcae64e1484d349b3366718cdfef3d404390e85...0116bc2df50751f9724a2e35ef1f24d22f90e4e1)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index d9d6e7a1c8..9d950c3958 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1
+        uses: github/codeql-action/init@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1
+        uses: github/codeql-action/autobuild@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1
+        uses: github/codeql-action/analyze@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 759b57a9d7..22ea53b6f3 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@fdcae64e1484d349b3366718cdfef3d404390e85 # v2.22.1
+        uses: github/codeql-action/upload-sarif@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
         with:
           sarif_file: results.sarif

From e92b644d096c016fc515778d6fa220c32ca83d4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Oct 2023 16:48:09 +0000
Subject: [PATCH 294/490] Bump actions/checkout from 4.1.0 to 4.1.1

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/8ade135a41bc03ea155e62e844d188df1ea18608...b4ffde65f46336ab88eb53be808477a3936bae11)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml                     | 2 +-
 .../ion-java-performance-regression-detector.yml          | 8 ++++----
 .github/workflows/ion-test-driver.yml                     | 6 +++---
 .github/workflows/main.yml                                | 4 ++--
 .github/workflows/prepare-release.yml                     | 4 ++--
 .github/workflows/publish-release-artifacts.yml           | 4 ++--
 .github/workflows/scorecard.yml                           | 2 +-
 .github/workflows/test-inspect-version-action.yml         | 2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9d950c3958..ce7a17ec02 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,7 +37,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index be2b035c18..bea37b9f39 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -64,20 +64,20 @@ jobs:
           java-version: 11
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           ref: ${{ github.base_ref }}
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           ref: ${{ github.head_ref }}
           path: new
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index df720c4bfa..d5155ad9eb 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # master
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # master
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -80,7 +80,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # master
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 733a270afd..ac5a9f39d9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
             upload_reports: true
           - java: 17
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           submodules: recursive
       - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
@@ -47,7 +47,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 7fef0afc87..49669c486e 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 8c7ca63daa..376de1cd49 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -29,7 +29,7 @@ jobs:
     # First, a sanity check to ensure that the library version matches the release version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
       - name: Validate project version matches tag
         shell: bash
         run: |
@@ -48,7 +48,7 @@ jobs:
     steps:
         # TODO: replace with artifact upload/download -- make sure there's no race condition with other builds also
         # uploading an artifact.
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
         with:
           submodules: recursive
       - uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 22ea53b6f3..05b5bcc9e0 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.1.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.1.0
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index 666238ed02..2eb8532430 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v3.6.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From f3cf42b619c5e80384f10c02d56ba7947bc29760 Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Wed, 18 Oct 2023 16:04:38 -0700
Subject: [PATCH 295/490] Update workflow trigger events. (#617)

Co-authored-by: Tyler Gregg <tgregg@users.noreply.github.com>
---
 .github/workflows/ion-java-performance-regression-detector.yml | 2 +-
 .github/workflows/ion-test-driver.yml                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index bea37b9f39..ae35956dfe 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -6,7 +6,7 @@ name: Ion Java performance regression detector
 on:
   pull_request:
     paths:
-      - 'src/*'
+      - 'src/**'
 
 permissions:
   contents: read
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index d5155ad9eb..19e793306a 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -3,7 +3,7 @@ name: ion-test-driver
 on:
   pull_request:
     paths:
-      - 'src/*'
+      - 'src/**'
 
 permissions:
   contents: read

From 43296c7a33ea63fd7cc1cc071f19e46958bb531b Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Fri, 20 Oct 2023 11:49:16 -0700
Subject: [PATCH 296/490] Fix checkout step in regression workflow (#621)

---
 .../workflows/ion-java-performance-regression-detector.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index ae35956dfe..e361fadc87 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -74,12 +74,15 @@ jobs:
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           ref: ${{ github.base_ref }}
+          submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
+          repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
+          submodules: recursive
           path: new
 
       - name: Download test Ion Data from artifacts
@@ -92,7 +95,7 @@ jobs:
       - name: Build ion-java from the base commit
         working-directory: baseline
         run: |
-          git submodule init && git submodule update && ./gradlew clean publishToMavenLocal
+          ./gradlew clean publishToMavenLocal
 
       - name: Benchmark ion-java from the base commit
         working-directory: ion-java-benchmark-cli
@@ -104,7 +107,7 @@ jobs:
       - name: Build ion-java from the new commit
         working-directory: new
         run: |
-          git submodule init && git submodule update && ./gradlew clean publishToMavenLocal
+          ./gradlew clean publishToMavenLocal
 
       - name: Benchmark ion-java from the new commit
         working-directory: ion-java-benchmark-cli

From 9a74c6ab100153fe02c5eb94ffeb293a85ad532c Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 19 Oct 2023 17:10:44 -0700
Subject: [PATCH 297/490] Restores the previous binary reader implementation's
 local symbol table handling behavior for several edge cases.

---
 ...IonReaderContinuableApplicationBinary.java | 17 ++++++--
 .../IonReaderContinuableTopLevelBinary.java   |  5 +++
 src/com/amazon/ion/impl/LocalSymbolTable.java | 20 +++-------
 .../impl/_Private_IonBinaryWriterBuilder.java |  4 +-
 .../ion/impl/_Private_LocalSymbolTable.java   | 25 ++++++++++++
 src/com/amazon/ion/impl/_Private_Utils.java   |  4 +-
 test/com/amazon/ion/DatagramTest.java         | 24 ++++++++++++
 ...onReaderContinuableTopLevelBinaryTest.java | 31 +++++++++++++++
 .../system/IonBinaryWriterBuilderTest.java    | 39 +++++++++++++++++++
 9 files changed, 147 insertions(+), 22 deletions(-)
 create mode 100644 src/com/amazon/ion/impl/_Private_LocalSymbolTable.java

diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index f9d2489bd0..9fe4e334b8 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -214,7 +214,7 @@ private SymbolTable getSystemSymbolTable() {
     /**
      * Read-only snapshot of the local symbol table at the reader's current position.
      */
-    private class LocalSymbolTableSnapshot implements SymbolTable, SymbolTableAsStruct {
+    private class LocalSymbolTableSnapshot implements _Private_LocalSymbolTable, SymbolTableAsStruct {
 
         // The system symbol table.
         private final SymbolTable system = IonReaderContinuableApplicationBinary.this.getSystemSymbolTable();
@@ -425,6 +425,17 @@ public IonStruct getIonRepresentation(ValueFactory valueFactory) {
             }
             return structCache.getIonRepresentation(valueFactory);
         }
+
+        @Override
+        public _Private_LocalSymbolTable makeCopy() {
+            // This is a mutable copy. LocalSymbolTable handles the mutability concerns.
+            return new LocalSymbolTable(importedTables, Arrays.asList(idToText));
+        }
+
+        @Override
+        public SymbolTable[] getImportedTablesNoCopy() {
+            return importedTables.getImportedTablesNoCopy();
+        }
     }
 
     /**
@@ -544,7 +555,7 @@ String getSymbol(int sid) {
         }
         int localSymbolOffset = sid - firstLocalSymbolId;
         if (localSymbolOffset > localSymbolMaxOffset) {
-            throw new IonException("Symbol ID exceeds the max ID of the symbol table.");
+            throw new UnknownSymbolException(sid);
         }
         return symbols[localSymbolOffset];
     }
@@ -565,7 +576,7 @@ private SymbolToken getSymbolToken(int sid) {
             }
         }
         if (sid >= symbolTableSize) {
-            throw new IonException("Symbol ID exceeds the max ID of the symbol table.");
+            throw new UnknownSymbolException(sid);
         }
         SymbolToken token = symbolTokensById.get(sid);
         if (token == null) {
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index dcce7d6a23..8e06fafe14 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -97,6 +97,11 @@ public SymbolTable pop_passed_symbol_table() {
             return null;
         }
         symbolTableLastTransferred = currentSymbolTable;
+        if (symbolTableLastTransferred.isLocalTable()) {
+            // This method is called when transferring the reader's symbol table to either a writer or an IonDatagram.
+            // Those cases require a mutable copy of the reader's symbol table.
+            return ((_Private_LocalSymbolTable) symbolTableLastTransferred).makeCopy();
+        }
         return symbolTableLastTransferred;
     }
 
diff --git a/src/com/amazon/ion/impl/LocalSymbolTable.java b/src/com/amazon/ion/impl/LocalSymbolTable.java
index 56198844c1..cc6ca89497 100644
--- a/src/com/amazon/ion/impl/LocalSymbolTable.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTable.java
@@ -51,7 +51,7 @@
  * Instances of this class are safe for use by multiple threads.
  */
 class LocalSymbolTable
-    implements SymbolTable
+    implements _Private_LocalSymbolTable
 {
 
     static class Factory implements _Private_LocalSymbolTableFactory
@@ -329,7 +329,8 @@ else if (fieldType == IonType.SYMBOL && ION_SYMBOL_TABLE.equals(reader.stringVal
         return new LocalSymbolTableImports(importsList);
     }
 
-    synchronized LocalSymbolTable makeCopy()
+    @Override
+    public synchronized _Private_LocalSymbolTable makeCopy()
     {
         return new LocalSymbolTable(this, getMaxId());
     }
@@ -604,19 +605,8 @@ public SymbolTable[] getImportedTables()
         return myImportsList.getImportedTables();
     }
 
-    /**
-     * Returns the imported symbol tables without making a copy.
-     * <p>
-     * <b>Note:</b> Callers must not modify the resulting SymbolTable array!
-     * This will violate the immutability property of this class.
-     *
-     * @return
-     *          the imported symtabs, as-is; the first element is a system
-     *          symtab, the rest are non-system shared symtabs
-     *
-     * @see #getImportedTables()
-     */
-    SymbolTable[] getImportedTablesNoCopy()
+    @Override
+    public SymbolTable[] getImportedTablesNoCopy()
     {
         return myImportsList.getImportedTablesNoCopy();
     }
diff --git a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
index 80f9d8d1dd..367f37a068 100644
--- a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
+++ b/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
@@ -157,7 +157,7 @@ public void setInitialSymbolTable(SymbolTable symtab)
             if (symtab.isLocalTable())
             {
                 SymbolTable[] imports =
-                    ((LocalSymbolTable) symtab).getImportedTablesNoCopy();
+                    ((_Private_LocalSymbolTable) symtab).getImportedTablesNoCopy();
                 for (SymbolTable imported : imports)
                 {
                     if (imported.isSubstitute())
@@ -353,7 +353,7 @@ SymbolTable buildContextSymbolTable()
             return myInitialSymbolTable;
         }
 
-        return ((LocalSymbolTable) myInitialSymbolTable).makeCopy();
+        return ((_Private_LocalSymbolTable) myInitialSymbolTable).makeCopy();
     }
 
 
diff --git a/src/com/amazon/ion/impl/_Private_LocalSymbolTable.java b/src/com/amazon/ion/impl/_Private_LocalSymbolTable.java
new file mode 100644
index 0000000000..f900fd0c83
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_LocalSymbolTable.java
@@ -0,0 +1,25 @@
+package com.amazon.ion.impl;
+
+import com.amazon.ion.SymbolTable;
+
+interface _Private_LocalSymbolTable extends SymbolTable {
+
+    /**
+     * @return a mutable copy of the symbol table.
+     */
+    _Private_LocalSymbolTable makeCopy();
+
+    /**
+     * Returns the imported symbol tables without making a copy.
+     * <p>
+     * <b>Note:</b> Callers must not modify the resulting SymbolTable array!
+     * This will violate the immutability property of this class.
+     *
+     * @return
+     *          the imported symtabs, as-is; the first element is a system
+     *          symtab, the rest are non-system shared symtabs
+     *
+     * @see SymbolTable#getImportedTables()
+     */
+    SymbolTable[] getImportedTablesNoCopy();
+}
diff --git a/src/com/amazon/ion/impl/_Private_Utils.java b/src/com/amazon/ion/impl/_Private_Utils.java
index be806aeb72..ce68c35a19 100644
--- a/src/com/amazon/ion/impl/_Private_Utils.java
+++ b/src/com/amazon/ion/impl/_Private_Utils.java
@@ -800,7 +800,7 @@ public static SymbolTable copyLocalSymbolTable(SymbolTable symtab)
         }
 
         SymbolTable[] imports =
-            ((LocalSymbolTable) symtab).getImportedTablesNoCopy();
+            ((_Private_LocalSymbolTable) symtab).getImportedTablesNoCopy();
 
         // Iterate over each import, we assume that the list of imports
         // rarely exceeds 5.
@@ -816,7 +816,7 @@ public static SymbolTable copyLocalSymbolTable(SymbolTable symtab)
             }
         }
 
-        return ((LocalSymbolTable) symtab).makeCopy();
+        return ((_Private_LocalSymbolTable) symtab).makeCopy();
     }
 
     /**
diff --git a/test/com/amazon/ion/DatagramTest.java b/test/com/amazon/ion/DatagramTest.java
index 493efb7eda..831ccfd036 100644
--- a/test/com/amazon/ion/DatagramTest.java
+++ b/test/com/amazon/ion/DatagramTest.java
@@ -28,8 +28,11 @@
 import com.amazon.ion.impl._Private_IonValue;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.Iterator;
+
+import com.amazon.ion.system.IonReaderBuilder;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -720,4 +723,25 @@ public void testSetWithSymbolTable()
         assertEquals(yID + 1, v1.symbolValue().getSid()); //now x has a mapping in the existing symbol table
 
     }
+
+    @Test
+    public void modifySymbolsAfterLoadThenSerialize()
+        throws Exception
+    {
+        IonDatagram dg = system().getLoader().load(TestUtils.ensureBinary(system(), "{foo: bar::baz}".getBytes(StandardCharsets.UTF_8)));
+        IonStruct struct = (IonStruct) dg.get(0);
+        IonSymbol baz = (IonSymbol) struct.get("foo");
+        baz.setTypeAnnotations("bar", "abc");
+        byte[] serialized = dg.getBytes();
+        try (IonReader reader = IonReaderBuilder.standard().build(serialized)) {
+            assertEquals(IonType.STRUCT, reader.next());
+            reader.stepIn();
+            assertEquals(IonType.SYMBOL, reader.next());
+            assertEquals("foo", reader.getFieldName());
+            String[] annotations = reader.getTypeAnnotations();
+            assertEquals(2, annotations.length);
+            assertEquals("bar", annotations[0]);
+            assertEquals("abc", annotations[1]);
+        }
+    }
 }
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index b7422c473d..ff41c7a785 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -23,6 +23,7 @@
 import com.amazon.ion.SystemSymbols;
 import com.amazon.ion.TestUtils;
 import com.amazon.ion.Timestamp;
+import com.amazon.ion.UnknownSymbolException;
 import com.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder;
 import com.amazon.ion.impl.bin._Private_IonManagedWriter;
 import com.amazon.ion.impl.bin._Private_IonRawWriter;
@@ -769,6 +770,36 @@ public void invalidVersionMarker(boolean constructFromBytes) throws Exception {
         });
     }
 
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void unknownSymbolInFieldName(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0xD3, 0x8A, 0x21, 0x01);
+        assertSequence(next(IonType.STRUCT), STEP_IN, next(IonType.INT));
+        assertThrows(UnknownSymbolException.class, reader::getFieldNameSymbol);
+        assertThrows(UnknownSymbolException.class, reader::getFieldName);
+        reader.close();
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void unknownSymbolInAnnotation(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0xE4, 0x81, 0x8A, 0x21, 0x01);
+        assertSequence(next(IonType.INT));
+        assertThrows(UnknownSymbolException.class, reader::getTypeAnnotationSymbols);
+        assertThrows(UnknownSymbolException.class, reader::getTypeAnnotations);
+        reader.close();
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void unknownSymbolInValue(boolean constructFromBytes) throws Exception {
+        reader = readerFor(constructFromBytes, 0x71, 0x0A);
+        assertSequence(next(IonType.SYMBOL));
+        assertThrows(UnknownSymbolException.class, reader::symbolValue);
+        assertThrows(UnknownSymbolException.class, reader::stringValue);
+        reader.close();
+    }
+
     /**
      * Feeds all bytes from the given array into the pipe one-by-one, asserting before each byte that the reader
      * is not positioned on a value.
diff --git a/test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java b/test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java
index 410ac4509e..f27c6eb381 100644
--- a/test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java
+++ b/test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java
@@ -24,9 +24,12 @@
 import static org.junit.Assert.fail;
 
 import com.amazon.ion.IonCatalog;
+import com.amazon.ion.IonReader;
 import com.amazon.ion.IonSystem;
+import com.amazon.ion.IonType;
 import com.amazon.ion.IonWriter;
 import com.amazon.ion.SymbolTable;
+import com.amazon.ion.TestUtils;
 import com.amazon.ion.impl.Symtabs;
 import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
 import com.amazon.ion.impl._Private_IonWriter;
@@ -34,6 +37,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -299,6 +304,40 @@ public void testImmutableInitialSymtab()
         assertTrue(symbolTableEquals(lst, writer.getSymbolTable()));
     }
 
+    @Test
+    public void testInitialSymtabFromReader()
+        throws Exception
+    {
+        SymbolTable lst;
+        try (IonReader reader = IonReaderBuilder.standard().build(TestUtils.ensureBinary(IonSystemBuilder.standard().build(), "foo".getBytes(StandardCharsets.UTF_8)))) {
+            assertEquals(IonType.SYMBOL, reader.next());
+            lst = reader.getSymbolTable();
+        }
+
+        _Private_IonBinaryWriterBuilder b =
+            _Private_IonBinaryWriterBuilder.standard();
+        b.setInitialSymbolTable(lst);
+        assertSame(lst, b.getInitialSymbolTable());
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonWriter writer = b.build(out);
+        assertTrue(symbolTableEquals(lst, writer.getSymbolTable()));
+
+        writer = b.build(out);
+        assertTrue(symbolTableEquals(lst, writer.getSymbolTable()));
+
+        writer.writeSymbol("bar");
+        writer.writeSymbol("foo");
+        writer.close();
+
+        try (IonReader reader = IonReaderBuilder.standard().build(out.toByteArray())) {
+            assertEquals(IonType.SYMBOL, reader.next());
+            assertEquals("bar", reader.stringValue());
+            assertEquals(IonType.SYMBOL, reader.next());
+            assertEquals("foo", reader.stringValue());
+        }
+    }
+
     @Test(expected = UnsupportedOperationException.class)
     public void testInitialSymtabImmutability()
     {

From 2963d4b34825d9f140c78e3634bfad02c1b17cbe Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Wed, 1 Nov 2023 15:34:01 -0700
Subject: [PATCH 298/490] Fixes a bug that caused concurrent field access of
 cloned, read-only structs with more than 5 members to be non-deterministic.
 (#630)

---
 .../amazon/ion/impl/lite/IonStructLite.java   |  8 +++++
 test/com/amazon/ion/CloneTest.java            | 29 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/com/amazon/ion/impl/lite/IonStructLite.java
index ed32ef6a45..c6ea1fca9a 100644
--- a/src/com/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStructLite.java
@@ -101,6 +101,14 @@ private void build_field_map()
             _field_map.put(v._fieldName, ii); // this causes the map to have the largest index value stored
         }
     }
+
+    @Override
+    public void makeReadOnly() {
+        // Eagerly initialize the fields map to prevent potential data races https://github.com/amazon-ion/ion-java/issues/629
+        fieldMapIsActive(_child_count);
+        super.makeReadOnly();
+    }
+
     private void add_field(String fieldName, int newFieldIdx)
     {
         Integer idx = _field_map.get(fieldName);
diff --git a/test/com/amazon/ion/CloneTest.java b/test/com/amazon/ion/CloneTest.java
index 7dfe5df275..9950de5a7e 100644
--- a/test/com/amazon/ion/CloneTest.java
+++ b/test/com/amazon/ion/CloneTest.java
@@ -20,6 +20,10 @@
 import com.amazon.ion.system.IonSystemBuilder;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -28,6 +32,7 @@
 import static org.hamcrest.Matchers.sameInstance;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class CloneTest
@@ -261,6 +266,30 @@ public void modifyAfterCloneDoesNotChangeOriginal() {
         assertNotEquals(original, clone);
     }
 
+    @Test
+    public void readOnlyIonStructMultithreadedTest() {
+        // See: https://github.com/amazon-ion/ion-java/issues/629
+        String ionStr = "{a:1,b:2,c:3,d:4,e:5,f:6}";
+
+        IonStruct ionValue = (IonStruct)system().singleValue(ionStr);
+        ionValue.makeReadOnly();
+
+        for (int i=0; i<100; i++) {
+            IonStruct clone = ionValue.clone();
+            clone.makeReadOnly();
+
+            List<CompletableFuture<Void>> waiting = new ArrayList<>();
+            for (int j = 0; j < 4; j++) {
+                waiting.add(CompletableFuture.runAsync(() -> {
+                    for (int k = 0; k <= 100; k++) {
+                        assertNotNull(clone.get("a"));
+                    }
+                }));
+            }
+            waiting.forEach(CompletableFuture::join);
+        }
+    }
+
     /**
      * @return the singleton IonSystem
      */

From ab84b08f4617f402ce74cb2727058eee74239dcb Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:15:09 -0700
Subject: [PATCH 299/490] Makes the binary reader set the encoding version when
 seeked to a span. (#622)

---
 src/com/amazon/ion/impl/IonCursorBinary.java    | 12 +++++++++++-
 .../IonReaderContinuableTopLevelBinary.java     |  2 +-
 .../ion/streaming/SeekableReaderTest.java       | 17 +++++++++++++++++
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index 5308dffc7e..ed1d9defe7 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -9,6 +9,7 @@
 import com.amazon.ion.IonCursor;
 import com.amazon.ion.IonType;
 import com.amazon.ion.IvmNotificationConsumer;
+import com.amazon.ion.SystemSymbols;
 
 import java.io.ByteArrayInputStream;
 import java.io.EOFException;
@@ -1786,8 +1787,9 @@ Marker getValueMarker() {
      * can be used to seek the reader to a "span" of bytes that represent a value in the stream.
      * @param offset the offset at which the slice will begin.
      * @param limit the slice's limit.
+     * @param ionVersionId the Ion version ID for the slice, e.g. $ion_1_0 for Ion 1.0.
      */
-    void slice(long offset, long limit) {
+    void slice(long offset, long limit, String ionVersionId) {
         peekIndex = offset;
         this.limit = limit;
         setCheckpointBeforeUnannotatedTypeId();
@@ -1795,6 +1797,14 @@ void slice(long offset, long limit) {
         event = Event.NEEDS_DATA;
         valueTid = null;
         containerIndex = -1; // Slices are treated as if they were at the top level.
+        if (SystemSymbols.ION_1_0.equals(ionVersionId)) {
+            typeIds = IonTypeID.TYPE_IDS_1_0;
+            majorVersion = 1;
+            minorVersion = 0;
+        } else {
+            // TODO changes are needed here to support Ion 1.1.
+            throw new IonException(String.format("Attempted to seek using an unsupported Ion version %s.", ionVersionId));
+        }
     }
 
     /**
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index 8e06fafe14..25a9383f8e 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -308,8 +308,8 @@ public void hoist(Span span) {
             // of the value to be the end of the stream, in order to comply with the SeekableReader contract. From
             // an implementation perspective, this is not necessary; if we leave the buffer's limit unchanged, the
             // reader can continue after processing the hoisted value.
-            slice(binarySpan.bufferOffset, binarySpan.bufferLimit);
             restoreSymbolTable(binarySpan.symbolTable);
+            slice(binarySpan.bufferOffset, binarySpan.bufferLimit, binarySpan.symbolTable.getIonVersionId());
             type = null;
         }
     }
diff --git a/test/com/amazon/ion/streaming/SeekableReaderTest.java b/test/com/amazon/ion/streaming/SeekableReaderTest.java
index 5510068edc..066249d386 100644
--- a/test/com/amazon/ion/streaming/SeekableReaderTest.java
+++ b/test/com/amazon/ion/streaming/SeekableReaderTest.java
@@ -19,6 +19,7 @@
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonWriter;
 import com.amazon.ion.ReaderMaker;
+import com.amazon.ion.SeekableReader;
 import com.amazon.ion.Span;
 import com.amazon.ion.TestUtils;
 import com.amazon.ion.impl._Private_Utils;
@@ -327,6 +328,22 @@ public void testHoistingAcrossSymbolTableBoundary()
         expectTopEof();
     }
 
+    @Test
+    public void testHoistingFromSpanCreatedByDifferentReaderBeforeNext()
+    {
+        read("foo bar");
+        in.next();
+        in.next();
+        Span barSpan = sr.currentSpan();
+
+        read("foo bar"); // Creates a new reader
+        initFacets();
+
+        hoist(barSpan);
+        assertSame(IonType.SYMBOL, in.next());
+        assertEquals("bar", in.stringValue());
+    }
+
 
     //========================================================================
     // Failure cases

From 61d76e076c1ea4d476fd2362e83272f961e39665 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:23:24 -0700
Subject: [PATCH 300/490] Handles the case where the binary cursor's
 InputStream provides fewer bytes than requested before reaching EOF. (#623)

---
 src/com/amazon/ion/impl/IonCursorBinary.java  |  45 +++++---
 ...onReaderContinuableTopLevelBinaryTest.java | 108 ++++++++++++++++++
 2 files changed, 135 insertions(+), 18 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index ed1d9defe7..f657c634fe 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -524,8 +524,7 @@ private boolean fillAt(long index, long numberOfBytes) {
             refillableState.bytesRequested = numberOfBytes + (index - offset);
             if (ensureCapacity(refillableState.bytesRequested)) {
                 // Fill all the free space, not just the shortfall; this reduces I/O.
-                refill(freeSpaceAt(limit));
-                shortfall = refillableState.bytesRequested - availableAt(offset);
+                shortfall = refill(refillableState.bytesRequested);
             } else {
                 // The request cannot be satisfied, but not because data was unavailable. Return normally; it is the
                 // caller's responsibility to recover.
@@ -646,24 +645,34 @@ private void shiftIndicesLeft(int shiftAmount) {
     }
 
     /**
-     * Fills the buffer with up to the requested number of additional bytes. It is the caller's responsibility to
-     * ensure that there is space in the buffer.
-     * @param numberOfBytesToFill the number of additional bytes to attempt to add to the buffer.
+     * Attempts to fill the buffer with up to the requested number of additional bytes. It is the caller's
+     * responsibility to ensure that there is space in the buffer.
+     * @param minimumNumberOfBytesRequired the minimum number of bytes requested to fill the current value.
+     * @return the shortfall between the number of bytes that were filled and the minimum number requested. If less than
+     *  1, then at least `minimumNumberOfBytesRequired` were filled.
      */
-    private void refill(long numberOfBytesToFill) {
+    private long refill(long minimumNumberOfBytesRequired) {
         int numberOfBytesFilled = -1;
-        try {
-            numberOfBytesFilled = refillableState.inputStream.read(buffer, (int) limit, (int) numberOfBytesToFill);
-        } catch (EOFException e) {
-            // Certain InputStream implementations (e.g. GZIPInputStream) throw EOFException if more bytes are requested
-            // to read than are currently available (e.g. if a header or trailer is incomplete).
-        } catch (IOException e) {
-            throwAsIonException(e);
-        }
-        if (numberOfBytesFilled < 0) {
-            return;
-        }
-        limit += numberOfBytesFilled;
+        long shortfall;
+        // Sometimes an InputStream implementation will return fewer than the number of bytes requested even
+        // if the stream is not at EOF. If this happens and there is still a shortfall, keep requesting bytes
+        // until either the shortfall is filled or EOF is reached.
+        do {
+            try {
+                numberOfBytesFilled = refillableState.inputStream.read(buffer, (int) limit, (int) freeSpaceAt(limit));
+            } catch (EOFException e) {
+                // Certain InputStream implementations (e.g. GZIPInputStream) throw EOFException if more bytes are requested
+                // to read than are currently available (e.g. if a header or trailer is incomplete).
+                numberOfBytesFilled = -1;
+            } catch (IOException e) {
+                throwAsIonException(e);
+            }
+            if (numberOfBytesFilled > 0) {
+                limit += numberOfBytesFilled;
+            }
+            shortfall = minimumNumberOfBytesRequired - availableAt(offset);
+        } while (shortfall > 0 && numberOfBytesFilled >= 0);
+        return shortfall;
     }
 
     /**
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index ff41c7a785..679286d7bf 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -34,10 +34,12 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
 import org.junit.jupiter.params.provider.ValueSource;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -3196,6 +3198,112 @@ public void skipWithoutEnoughDataNonIncrementalFails() throws Exception {
         reader.close();
     }
 
+    /**
+     * An InputStream that returns less than the number of bytes requested from bulk reads.
+     */
+    private static class ThrottlingInputStream extends InputStream {
+
+        private final byte[] data;
+        private final boolean throwFromReadOnEof;
+        private int offset = 0;
+
+        /**
+         * @param data the data for the InputStream to provide.
+         * @param throwFromReadOnEof true if the stream should throw {@link java.io.EOFException} when read() is called
+         *                           at EOF. If false, simply returns -1.
+         */
+        protected ThrottlingInputStream(byte[] data, boolean throwFromReadOnEof) {
+            this.data = data;
+            this.throwFromReadOnEof = throwFromReadOnEof;
+        }
+
+        @Override
+        public int read() {
+            return data[offset++] & 0xFF;
+        }
+
+        private int calculateNumberOfBytesToReturn(int numberOfBytesRequested) {
+            int available = data.length - offset;
+            int numberOfBytesToReturn;
+            if (available > 1 && numberOfBytesRequested > 1) {
+                // Return fewer bytes than requested and fewer than are available, avoiding EOF.
+                numberOfBytesToReturn = Math.min(available - 1, numberOfBytesRequested - 1);
+            } else if (available <= 0) {
+                return -1; // EOF
+            } else {
+                // Only 1 byte is available, so return it as long as at least 1 byte was requested.
+                numberOfBytesToReturn = Math.min(numberOfBytesRequested, available);
+            }
+            return numberOfBytesToReturn;
+        }
+
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            if (off + len > b.length) {
+                throw new IndexOutOfBoundsException();
+            }
+            int numberOfBytesToReturn = calculateNumberOfBytesToReturn(len);
+            if (numberOfBytesToReturn < 0) {
+                if (throwFromReadOnEof) {
+                    throw new EOFException();
+                }
+                return -1;
+            }
+            System.arraycopy(data, offset, b, off, numberOfBytesToReturn);
+            offset += numberOfBytesToReturn;
+            return numberOfBytesToReturn;
+        }
+
+        @Override
+        public long skip(long len) {
+            int numberOfBytesToSkip = calculateNumberOfBytesToReturn((int) len);
+            offset += numberOfBytesToSkip;
+            return numberOfBytesToSkip;
+        }
+    }
+
+    @ParameterizedTest(name = "incrementalReadingEnabled={0},throwOnEof={1}")
+    @CsvSource({
+        "true, true",
+        "true, false",
+        "false, true",
+        "false, false"
+    })
+    public void shouldNotFailWhenAnInputStreamProvidesFewerBytesThanRequestedWithoutReachingEof(boolean incrementalReadingEnabled, boolean throwOnEof) throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(incrementalReadingEnabled)
+            .withBufferConfiguration(IonBufferConfiguration.Builder.standard().withInitialBufferSize(8).build());
+        reader = readerFor(new ThrottlingInputStream(bytes(0xE0, 0x01, 0x00, 0xEA, 0x89, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i'), throwOnEof));
+        assertSequence(
+            next(IonType.STRING), stringValue("abcdefghi"),
+            next(null)
+        );
+        reader.close();
+    }
+
+    @Test
+    public void shouldNotFailWhenAnInputStreamProvidesFewerBytesThanRequestedWithoutReachingEofAndTheReaderSkipsTheValue() throws Exception {
+        reader = boundedReaderFor(new ThrottlingInputStream(bytes(0xE0, 0x01, 0x00, 0xEA, 0x89, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 0x20), false), 8, 8, byteAndOversizedValueCountingHandler);
+        assertSequence(
+            next(IonType.INT), intValue(0),
+            next(null)
+        );
+        reader.close();
+        assertEquals(1, oversizedCounter.get());
+    }
+
+    @Test
+    public void shouldNotFailWhenGZIPBoundaryIsEncounteredInStringValue() throws Exception {
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        // The following lines create a GZIP payload boundary (trailer/header) in the middle of an Ion string value.
+        pipe.receive(gzippedBytes(0xE0, 0x01, 0x00, 0xEA, 0x89, 'a', 'b'));
+        pipe.receive(gzippedBytes('c', 'd', 'e', 'f', 'g', 'h', 'i'));
+        reader = readerFor(new GZIPInputStream(pipe));
+        assertSequence(
+            next(IonType.STRING), stringValue("abcdefghi"),
+            next(null)
+        );
+    }
+
     @Test
     public void concatenatedAfterGZIPHeader() throws Exception {
         // Tests that a stream that initially contains only a GZIP header can be read successfully if more data

From 8df9b7d9029e16373268e3ca42bfe858034d0d18 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:38:39 -0700
Subject: [PATCH 301/490] Ensures that the binary reader can handle a
 ByteArrayInputStream that returns a negative number from available(). (#625)

---
 src/com/amazon/ion/impl/IonCursorBinary.java  |  5 +-
 .../impl/IonReaderContinuableCoreBinary.java  | 49 +++++++++----------
 ...onReaderContinuableTopLevelBinaryTest.java | 11 +++++
 .../ion/streaming/ReaderIntegerSizeTest.java  | 10 ++--
 4 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index f657c634fe..c7929e58e8 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -389,7 +389,10 @@ private static IonBufferConfiguration getFixedSizeConfigurationFor(
         ByteArrayInputStream inputStream,
         int alreadyReadLen
     ) {
-        int fixedBufferSize = inputStream.available();
+        // Note: ByteArrayInputStream.available() can return a negative number because its constructor does
+        // not validate that the offset and length provided are actually within range of the provided byte array.
+        // Setting the result to 0 in this case avoids an error when looking up the fixed sized configuration.
+        int fixedBufferSize = Math.max(0, inputStream.available());
         if (alreadyReadLen > 0) {
             fixedBufferSize += alreadyReadLen;
         }
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
index 862520d14f..811281e64c 100644
--- a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
+++ b/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -51,11 +51,13 @@ class IonReaderContinuableCoreBinary extends IonCursorBinary implements IonReade
     // The number of bytes occupied by a Java long.
     private static final int LONG_SIZE_IN_BYTES = 8;
 
-    // The smallest negative 8-byte integer that can fit in a long is -0x80_00_00_00_00_00_00_00.
-    private static final int MOST_SIGNIFICANT_BYTE_OF_MIN_LONG = 0x80;
+    // The smallest negative 8-byte integer that can fit in a long is 0x80_00_00_00_00_00_00_00 and the smallest
+    // negative 4-byte integer that can fit in an int is 0x80_00_00_00.
+    private static final int MOST_SIGNIFICANT_BYTE_OF_MIN_INTEGER = 0x80;
 
-    // The largest positive 8-byte integer that can fit in a long is 0x7F_FF_FF_FF_FF_FF_FF_FF.
-    private static final int MOST_SIGNIFICANT_BYTE_OF_MAX_LONG = 0x7F;
+    // The largest positive 8-byte integer that can fit in a long is 0x7F_FF_FF_FF_FF_FF_FF_FF and the largest positive
+    // 4-byte integer that can fit in an int is 0x7F_FF_FF_FF.
+    private static final int MOST_SIGNIFICANT_BYTE_OF_MAX_INTEGER = 0x7F;
 
     // The second-most significant bit in the most significant byte of a VarInt is the sign.
     private static final int VAR_INT_SIGN_BITMASK = 0x40;
@@ -418,34 +420,30 @@ private boolean readBoolean_1_0() {
     }
 
     /**
-     * Determines whether the 8-byte integer starting at `valueMarker.startIndex` and ending at `valueMarker.endIndex`
-     * fits in a long, or requires a BigInteger.
-     * @return either `IntegerSize.LONG` or `IntegerSize.BIG_INTEGER`.
+     * Determines whether the integer starting at `valueMarker.startIndex` and ending at `valueMarker.endIndex`
+     * crosses a type boundary. Callers must only invoke this method when the integer's size is known to be either
+     * 4 or 8 bytes.
+     * @return true if the value fits in the Java integer type that matches its Ion serialized size; false if it
+     *  requires the next larger size.
      */
-    private IntegerSize classifyEightByteInt_1_0() {
+    private boolean classifyInteger_1_0() {
         if (valueTid.isNegativeInt) {
-            // The smallest negative 8-byte integer that can fit in a long is -0x80_00_00_00_00_00_00_00.
             int firstByte = buffer[(int)(valueMarker.startIndex)] & SINGLE_BYTE_MASK;
-            if (firstByte < MOST_SIGNIFICANT_BYTE_OF_MIN_LONG) {
-                return IntegerSize.LONG;
-            } else if (firstByte > MOST_SIGNIFICANT_BYTE_OF_MIN_LONG) {
-                return IntegerSize.BIG_INTEGER;
+            if (firstByte < MOST_SIGNIFICANT_BYTE_OF_MIN_INTEGER) {
+                return true;
+            } else if (firstByte > MOST_SIGNIFICANT_BYTE_OF_MIN_INTEGER) {
+                return false;
             }
             for (long i = valueMarker.startIndex + 1; i < valueMarker.endIndex; i++) {
                 if (0x00 != buffer[(int)(i)]) {
-                    return IntegerSize.BIG_INTEGER;
+                    return false;
                 }
             }
-        } else {
-            // The largest positive 8-byte integer that can fit in a long is 0x7F_FF_FF_FF_FF_FF_FF_FF.
-            if ((buffer[(int)(valueMarker.startIndex)] & SINGLE_BYTE_MASK) > MOST_SIGNIFICANT_BYTE_OF_MAX_LONG) {
-                return IntegerSize.BIG_INTEGER;
-            }
+            return true;
         }
-        return IntegerSize.LONG;
+        return (buffer[(int) (valueMarker.startIndex)] & SINGLE_BYTE_MASK) <= MOST_SIGNIFICANT_BYTE_OF_MAX_INTEGER;
     }
 
-
     int readVarUInt_1_1() {
         throw new UnsupportedOperationException();
     }
@@ -536,16 +534,13 @@ public IntegerSize getIntegerSize() {
         if (valueTid.length < 0) {
             return IntegerSize.BIG_INTEGER;
         } else if (valueTid.length < INT_SIZE_IN_BYTES) {
-            // Note: this is conservative. Most integers of size 4 also fit in an int, but since exactly the
-            // same parsing code is used for ints and longs, there is no point wasting the time to determine the
-            // smallest possible type.
             return IntegerSize.INT;
+        } else if (valueTid.length == INT_SIZE_IN_BYTES) {
+            return (minorVersion != 0 || classifyInteger_1_0()) ? IntegerSize.INT : IntegerSize.LONG;
         } else if (valueTid.length < LONG_SIZE_IN_BYTES) {
             return IntegerSize.LONG;
         } else if (valueTid.length == LONG_SIZE_IN_BYTES) {
-            // Because creating BigIntegers is so expensive, it is worth it to look ahead and determine exactly
-            // which 8-byte integers can fit in a long.
-            return minorVersion == 0 ? classifyEightByteInt_1_0() : IntegerSize.LONG;
+            return (minorVersion != 0 || classifyInteger_1_0()) ? IntegerSize.LONG : IntegerSize.BIG_INTEGER;
         }
         return IntegerSize.BIG_INTEGER;
     }
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 679286d7bf..5542076e2a 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -3368,6 +3368,17 @@ public void concatenatedAfterMissingGZIPTrailer() throws Exception {
         assertEquals(1, oversizedCounter.get());
     }
 
+    @Test
+    public void shouldNotFailWhenProvidedWithAnEmptyByteArrayInputStream() throws Exception {
+        reader = IonReaderBuilder.standard().build(new ByteArrayInputStream(new byte[]{}));
+        assertSequence(next(null));
+        reader.close();
+        // The following ByteArrayInputStream is weird, but not disallowed. Its available() method will return -1.
+        reader = IonReaderBuilder.standard().build(new ByteArrayInputStream(new byte[]{}, 1, 1));
+        assertSequence(next(null));
+        reader.close();
+    }
+
     @ParameterizedTest(name = "constructFromBytes={0}")
     @ValueSource(booleans = {true, false})
     public void incompleteContainerNonContinuable(boolean constructFromBytes) throws Exception {
diff --git a/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java b/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
index 73fcb7193b..cc31a06cb3 100644
--- a/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
+++ b/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
@@ -142,11 +142,10 @@ public void testGetIntegerSizeNegativeIntBoundary()
     private void testGetIntegerSizeIntBoundary(int boundaryValue, long pastBoundary)
     {
         in.next();
-        // It's fine if IntegerSize recommends a larger-than-necessary type, just not a smaller one.
-        assertTrue(IntegerSize.INT == in.getIntegerSize() || IntegerSize.LONG == in.getIntegerSize());
+        assertEquals(IntegerSize.INT, in.getIntegerSize());
         assertEquals(boundaryValue, in.intValue());
         // assert nothing changes until next()
-        assertTrue(IntegerSize.INT == in.getIntegerSize() || IntegerSize.LONG == in.getIntegerSize());
+        assertEquals(IntegerSize.INT, in.getIntegerSize());
         in.next();
         assertEquals(IntegerSize.LONG, in.getIntegerSize());
         assertEquals(pastBoundary, in.longValue());
@@ -156,10 +155,9 @@ private void testGetIntegerSizeIntBoundary(int boundaryValue, long pastBoundary)
     private void testGetIntegerSizeLongBoundary(long boundaryValue, BigInteger pastBoundary)
     {
         in.next();
-        // It's fine if IntegerSize recommends a larger-than-necessary type, just not a smaller one.
-        assertTrue(IntegerSize.LONG == in.getIntegerSize() || IntegerSize.BIG_INTEGER == in.getIntegerSize());
+        assertEquals(IntegerSize.LONG, in.getIntegerSize());
         assertEquals(boundaryValue, in.longValue());
-        assertTrue(IntegerSize.LONG == in.getIntegerSize() || IntegerSize.BIG_INTEGER == in.getIntegerSize());
+        assertEquals(IntegerSize.LONG, in.getIntegerSize());
         in.next();
         assertEquals(IntegerSize.BIG_INTEGER, in.getIntegerSize());
         assertEquals(pastBoundary, in.bigIntegerValue());

From b0313763c84572c9e8010e0893ee9a493b41f6e0 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Thu, 2 Nov 2023 17:48:39 -0700
Subject: [PATCH 302/490] Fixes a bug that prevented early step-out of a
 container when positioned on a large scalar value in certain cases. (#628)

* Makes the binary reader set the encoding version when seeked to a span.

* Handles the case where the binary cursor's InputStream provides fewer bytes than requested before reaching EOF.

* Ensures that the binary reader can handle a ByteArrayInputStream that returns a negative number from available().

* Accurately classifies all int values by size, rather than conservatively classifying all 4-byte ints as Java longs.

* Fixes a bug that prevented early step-out of a container when positioned on a large scalar value in certain cases.

* Ensures that spans are treated as if they are at the top level even when hoisted from below the top level.
---
 src/com/amazon/ion/impl/IonCursorBinary.java  |  6 +++--
 ...onReaderContinuableTopLevelBinaryTest.java | 27 +++++++++++++++++++
 .../ion/streaming/SeekableReaderTest.java     | 23 ++++++++++++++++
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/com/amazon/ion/impl/IonCursorBinary.java
index c7929e58e8..0d39112378 100644
--- a/src/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/com/amazon/ion/impl/IonCursorBinary.java
@@ -1470,7 +1470,7 @@ private Event slowStepOutOfContainer() {
             if (slowSeek(parent.endIndex - offset)) {
                 return event;
             }
-            peekIndex = parent.endIndex;
+            peekIndex = offset;
         }
         setCheckpointBeforeUnannotatedTypeId();
         if (--containerIndex >= 0) {
@@ -1808,7 +1808,9 @@ void slice(long offset, long limit, String ionVersionId) {
         valueMarker.endIndex = -1;
         event = Event.NEEDS_DATA;
         valueTid = null;
-        containerIndex = -1; // Slices are treated as if they were at the top level.
+        // Slices are treated as if they were at the top level.
+        parent = null;
+        containerIndex = -1;
         if (SystemSymbols.ION_1_0.equals(ionVersionId)) {
             typeIds = IonTypeID.TYPE_IDS_1_0;
             majorVersion = 1;
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 5542076e2a..695cd86d72 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -1725,6 +1725,33 @@ public void reallyLargeString(boolean constructFromBytes) throws Exception {
         closeAndCount();
     }
 
+    @ParameterizedTest
+    @CsvSource({
+        "true, true",
+        "true, false",
+        "false, true",
+        "false, false"
+    })
+    public void skipReallyLargeStringInContainer(boolean constructFromBytes, boolean incremental) throws Exception {
+        StringBuilder sb = new StringBuilder();
+        // 70000 is greater than twice the default buffer size of 32768. This ensures that the string, when skipped,
+        // will not be fully contained in the buffer.
+        for (int i = 0; i < 70000; i++) {
+            sb.append('a');
+        }
+        String string = sb.toString();
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(incremental);
+        reader = readerFor("{foo: \"" + string + "\"}", constructFromBytes);
+        assertSequence(
+            container(IonType.STRUCT,
+                next(IonType.STRING)
+                // This is an early-step out that causes the string value to be skipped.
+            ),
+            next(null)
+        );
+        closeAndCount();
+    }
+
     @ParameterizedTest(name = "constructFromBytes={0}")
     @ValueSource(booleans = {true, false})
     public void nopPadInAnnotationWrapperFails(boolean constructFromBytes) throws Exception {
diff --git a/test/com/amazon/ion/streaming/SeekableReaderTest.java b/test/com/amazon/ion/streaming/SeekableReaderTest.java
index 066249d386..95992ac0f9 100644
--- a/test/com/amazon/ion/streaming/SeekableReaderTest.java
+++ b/test/com/amazon/ion/streaming/SeekableReaderTest.java
@@ -263,6 +263,29 @@ public void testHoistingAnnotatedContainedValue()
         expectTopEof();
     }
 
+    @Test
+    public void testHoistingNestedContainerWithoutSteppingOutOfParent()
+    {
+        read("{first: {foo: bar}, second: a::{baz: zar}, third: 123}");
+        in.next();
+        in.stepIn();
+        in.next();
+        in.next();
+        Span span = sr.currentSpan();
+        in.next();
+        // Note: we do not step out of the struct.
+
+        hoist(span);
+        assertSame(IonType.STRUCT, in.next());
+        expectTopLevel();
+        Assert.assertArrayEquals(new String[]{"a"}, in.getTypeAnnotations());
+        in.stepIn();
+        in.next();
+        assertEquals("zar", in.stringValue());
+        in.stepOut();
+        expectTopEof();
+    }
+
     @Test
     public void testHoistingAcrossSymbolTableBoundary()
         throws IOException

From aae4100e7665c6f44e0e034cc222c490a93891fb Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Fri, 3 Nov 2023 10:35:34 -0700
Subject: [PATCH 303/490] Prepares v1.11.0 release (#616)

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 9615c5d05b..1cac385c6c 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.10.6-SNAPSHOT
+1.11.0

From bf2aad24397c4e8416e53142ee231582d115a308 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Fri, 3 Nov 2023 12:28:36 -0700
Subject: [PATCH 304/490] Bumps version to 1.11.1-SNAPSHOT

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 1cac385c6c..b9d91e9005 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.0
+1.11.1-SNAPSHOT

From 296919a412cfde3074e4936e94045e04191a1d83 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 14:52:10 -0800
Subject: [PATCH 305/490] Bump ossf/scorecard-action from 2.3.0 to 2.3.1 (#624)

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/483ef80eb98fb506c348f7d62e28055e49fe2398...0864cf19026789058feabb7e87baa5f140aac736)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tyler Gregg <tgregg@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 05b5bcc9e0..1985bf1f41 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -37,7 +37,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
         with:
           results_file: results.sarif
           results_format: sarif

From 7bdbbef9d7f5bec128a6629f381fe7eef7f4a275 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Nov 2023 15:04:57 -0800
Subject: [PATCH 306/490] Bump github/codeql-action from 2.22.3 to 2.22.5
 (#626)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.3 to 2.22.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/0116bc2df50751f9724a2e35ef1f24d22f90e4e1...74483a38d39275f33fcff5f35b679b5ca4a26a99)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ce7a17ec02..3cfc22f09c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
+        uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
+        uses: github/codeql-action/autobuild@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
+        uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 1985bf1f41..a894ddce1c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
+        uses: github/codeql-action/upload-sarif@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
         with:
           sarif_file: results.sarif

From 67e38c4cf652927fd3b1e99897a4da0c3c0fe804 Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Tue, 7 Nov 2023 15:09:10 -0800
Subject: [PATCH 307/490] Implements patch list as a single contiguous array of
 reusable PatchPoint instances. (#521)

---
 .../ion/impl/_Private_RecyclingQueue.java     | 122 +++++++
 .../ion/impl/_Private_RecyclingStack.java     |  87 ++++-
 .../ion/impl/bin/IonRawBinaryWriter.java      | 300 +++++-------------
 3 files changed, 292 insertions(+), 217 deletions(-)
 create mode 100644 src/com/amazon/ion/impl/_Private_RecyclingQueue.java

diff --git a/src/com/amazon/ion/impl/_Private_RecyclingQueue.java b/src/com/amazon/ion/impl/_Private_RecyclingQueue.java
new file mode 100644
index 0000000000..a52ccd7a35
--- /dev/null
+++ b/src/com/amazon/ion/impl/_Private_RecyclingQueue.java
@@ -0,0 +1,122 @@
+package com.amazon.ion.impl;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+/**
+ * A queue whose elements are recycled. This queue will be extended and iterated frequently.
+ * @param <T> the type of elements stored.
+ */
+public class _Private_RecyclingQueue<T> {
+
+    /**
+     * Factory for new queue elements.
+     * @param <T> the type of element.
+     */
+    public interface ElementFactory<T> {
+        /**
+         * @return a new instance.
+         */
+        T newElement();
+    }
+
+    @FunctionalInterface
+    public interface Recycler<T> {
+        /**
+         * Re-initialize an element
+         */
+        void recycle(T t);
+    }
+
+    /**
+     * Iterator for the queue.
+     */
+    private class ElementIterator implements Iterator<T> {
+        int i = 0;
+        @Override
+        public boolean hasNext() {
+            return i <= currentIndex;
+        }
+
+        @Override
+        public T next() {
+            return elements.get(i++);
+        }
+    }
+
+    private final ElementIterator iterator;
+    private final List<T> elements;
+    private final ElementFactory<T> elementFactory;
+    private int currentIndex;
+    private T top;
+
+    /**
+     * @param initialCapacity the initial capacity of the underlying collection.
+     * @param elementFactory the factory used to create a new element on {@link #push()} when the queue has
+     *                       not previously grown to the new depth.
+     */
+    public _Private_RecyclingQueue(int initialCapacity, ElementFactory<T> elementFactory) {
+        elements = new ArrayList<T>(initialCapacity);
+        this.elementFactory = elementFactory;
+        currentIndex = -1;
+        iterator = new ElementIterator();
+    }
+
+    public void truncate(int index) {
+        currentIndex = index;
+    }
+
+    public T get(int index) {
+        return elements.get(index);
+    }
+
+    /**
+     * Pushes an element onto the top of the queue, instantiating a new element only if the queue has not
+     * previously grown to the new depth.
+     * @return the element at the top of the queue after the push. This element must be initialized by the caller.
+     */
+    public int push(Recycler<T> recycler) {
+        currentIndex++;
+        if (currentIndex >= elements.size()) {
+            top = elementFactory.newElement();
+            elements.add(top);
+        }  else {
+            top = elements.get(currentIndex);
+        }
+        recycler.recycle(top);
+        return currentIndex;
+    }
+
+    /**
+     * Reclaim the current element.
+     */
+    public void remove() {
+        currentIndex = Math.max(-1, currentIndex - 1);
+    }
+
+    public Iterator<T> iterate() {
+        iterator.i = 0;
+        return iterator;
+    }
+
+    /**
+     * @return true if the queue is empty; otherwise, false.
+     */
+    public boolean isEmpty() {
+        return currentIndex < 0;
+    }
+
+    /**
+     * Reset the index and make the queue reusable.
+     */
+    public void clear() {
+        currentIndex = -1;
+    }
+
+    /**
+     * @return the number of elements within the queue.
+     */
+    public int size() {
+        return currentIndex + 1;
+    }
+}
\ No newline at end of file
diff --git a/src/com/amazon/ion/impl/_Private_RecyclingStack.java b/src/com/amazon/ion/impl/_Private_RecyclingStack.java
index a98e09d410..d88ac040ff 100644
--- a/src/com/amazon/ion/impl/_Private_RecyclingStack.java
+++ b/src/com/amazon/ion/impl/_Private_RecyclingStack.java
@@ -2,13 +2,25 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.ListIterator;
+import java.util.NoSuchElementException;
 
 /**
  * A stack whose elements are recycled. This can be useful when the stack needs to grow and shrink
  * frequently and has a predictable maximum depth.
  * @param <T> the type of elements stored.
  */
-public final class _Private_RecyclingStack<T> {
+public final class _Private_RecyclingStack<T> implements Iterable<T> {
+    public  $Iterator stackIterator;
+    @Override
+    public ListIterator<T> iterator() {
+        if (stackIterator != null) {
+            stackIterator.cursor = _Private_RecyclingStack.this.currentIndex;
+        } else {
+            stackIterator = new $Iterator();
+        }
+        return stackIterator;
+    }
 
     /**
      * Factory for new stack elements.
@@ -22,6 +34,14 @@ public interface ElementFactory<T> {
         T newElement();
     }
 
+    @FunctionalInterface
+    public interface Recycler<T> {
+        /**
+         * Re-initialize an element
+         */
+        void recycle(T t);
+    }
+
     private final List<T> elements;
     private final ElementFactory<T> elementFactory;
     private int currentIndex;
@@ -29,11 +49,11 @@ public interface ElementFactory<T> {
 
     /**
      * @param initialCapacity the initial capacity of the underlying collection.
-     * @param elementFactory the factory used to create a new element on {@link #push()} when the stack has
+     * @param elementFactory the factory used to create a new element on {@link #push(Recycler)} when the stack has
      *                       not previously grown to the new depth.
      */
     public _Private_RecyclingStack(int initialCapacity, ElementFactory<T> elementFactory) {
-        elements = new ArrayList<T>(initialCapacity);
+        elements = new ArrayList<>(initialCapacity);
         this.elementFactory = elementFactory;
         currentIndex = -1;
         top = null;
@@ -44,7 +64,7 @@ public _Private_RecyclingStack(int initialCapacity, ElementFactory<T> elementFac
      * previously grown to the new depth.
      * @return the element at the top of the stack after the push. This element must be initialized by the caller.
      */
-    public T push() {
+    public T push(Recycler<T> recycler) {
         currentIndex++;
         if (currentIndex >= elements.size()) {
             top = elementFactory.newElement();
@@ -52,6 +72,7 @@ public T push() {
         }  else {
             top = elements.get(currentIndex);
         }
+        recycler.recycle(top);
         return top;
     }
 
@@ -92,4 +113,62 @@ public boolean isEmpty() {
     public int size() {
         return currentIndex + 1;
     }
+
+    private class $Iterator implements ListIterator<T> {
+        private int cursor;
+
+        @Override
+        public boolean hasNext() {
+            return cursor >= 0;
+        }
+
+        @Override
+        public T next() {
+            if (!hasNext()) {
+                throw new NoSuchElementException();
+            }
+            // post-decrement because "next" is where the cursor is
+            return _Private_RecyclingStack.this.elements.get(cursor--);
+        }
+
+        @Override
+        public boolean hasPrevious() {
+            return cursor + 1 <= _Private_RecyclingStack.this.currentIndex;
+        }
+
+        @Override
+        public T previous() {
+            if (!hasPrevious()) {
+                throw new NoSuchElementException();
+            }
+            // pre-increment: "next" is where the cursor is, so "previous" is upward in stack
+            return _Private_RecyclingStack.this.elements.get(++cursor);
+        }
+
+        @Override
+        public int nextIndex() {
+            return cursor;
+        }
+
+        @Override
+        public int previousIndex() {
+            return cursor + 1;
+        }
+
+        @Override
+        public void remove() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void set(T t) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void add(T t) {
+            throw new UnsupportedOperationException();
+        }
+    }
+
 }
diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index e5bda78333..ab493ab5d4 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -46,6 +46,7 @@
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl._Private_RecyclingQueue;
 import com.amazon.ion.impl._Private_RecyclingStack;
 import com.amazon.ion.impl.bin.utf8.Utf8StringEncoder;
 import com.amazon.ion.impl.bin.utf8.Utf8StringEncoderPool;
@@ -54,10 +55,8 @@
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
+import java.util.ListIterator;
 
 /**
  * Low-level binary {@link IonWriter} that understands encoding concerns but doesn't operate with any sense of symbol table management.
@@ -248,74 +247,67 @@ private ContainerType(final boolean allowedInStepOut)
         }
     }
 
-    private static class ContainerInfo
+    private class ContainerInfo
     {
-        /** Whether or not the container is a struct */
+        /** Whether the container is a struct */
         public ContainerType type;
         /** The location of the pre-allocated size descriptor in the buffer. */
         public long position;
         /** The size of the current value. */
         public long length;
-        /** The patchlist for this container. */
-        public PatchList patches;
+        /**
+         * The index of the patch point if present, <tt>-1</tt> otherwise.
+         */
+        public int patchIndex;
 
         public ContainerInfo()
         {
             type = null;
             position = -1;
             length = -1;
-            patches = null;
+            patchIndex = -1;
         }
 
-        public void appendPatch(final PatchPoint patch)
+        public void appendPatch(final long oldPosition, final int oldLength, final long length)
         {
-            if (patches == null)
-            {
-                patches = new PatchList();
+            if (patchIndex == -1) {
+                // We have no assigned patch point, we need to make our own
+                patchIndex = patchPoints.push(p -> p.initialize(oldPosition, oldLength, length));
+            } else {
+                // We have an assigned patch point already, but we need to overwrite it with the correct data
+                patchPoints.get(patchIndex).initialize(oldPosition, oldLength, length);
             }
-            patches.append(patch);
         }
 
-        public void extendPatches(final PatchList newPatches)
-        {
-            if (patches == null)
-            {
-                patches = newPatches;
-            }
-            else
-            {
-                patches.extend(newPatches);
-            }
-        }
-
-        public void initialize(final ContainerType type, final long offset) {
+        public ContainerInfo initialize(final ContainerType type, final long offset) {
             this.type = type;
             this.position = offset;
-            this.patches = null;
             this.length = 0;
+            this.patchIndex = -1;
+
+            return this;
         }
 
         @Override
         public String toString()
         {
-            return "(CI " + type + " pos:" + position + " len:" + length + ")";
+            return "(CI " + type + " pos:" + position + " len:" + length + " patch:"+patchIndex+")";
         }
     }
 
     private static class PatchPoint
     {
         /** position of the data being patched out. */
-        public final long oldPosition;
+        public long oldPosition;
         /** length of the data being patched out.*/
-        public final int oldLength;
+        public int oldLength;
         /** size of the container data or annotations.*/
-        public final long length;
-
-        public PatchPoint(final long oldPosition, final int oldLength, final long patchLength)
+        public long length;
+        public PatchPoint()
         {
-            this.oldPosition = oldPosition;
-            this.oldLength = oldLength;
-            this.length = patchLength;
+            oldPosition = -1;
+            oldLength = -1;
+            length = -1;
         }
 
         @Override
@@ -323,146 +315,16 @@ public String toString()
         {
             return "(PP old::(" + oldPosition + " " + oldLength + ") patch::(" + length + ")";
         }
-    }
-
-    /**
-     * Simple singly linked list node that we can use to construct the patch list in the
-     * right order incrementally in recursive segments.
-     */
-    private static class PatchList implements Iterable<PatchPoint>
-    {
-        private static class Node {
-            public final PatchPoint value;
-            public Node next;
-
-            public Node(final PatchPoint value)
-            {
-                this.value = value;
-            }
-        }
-        private Node head;
-        private Node tail;
-
-        public PatchList()
-        {
-            head = null;
-            tail = null;
-        }
-
-        public boolean isEmpty()
-        {
-            return head == null && tail == null;
-        }
-
-        public void clear()
-        {
-            head = null;
-            tail = null;
-        }
-
-        public void append(final PatchPoint patch)
-        {
-            final Node node = new Node(patch);
-            if (head == null)
-            {
-                head = node;
-                tail = node;
-            }
-            else
-            {
-                tail.next = node;
-                tail = node;
-            }
-        }
-
-        public void extend(final PatchList end)
-        {
-            if (end != null)
-            {
-                if (head == null)
-                {
-                    if (end.head != null)
-                    {
-                        head = end.head;
-                        tail = end.tail;
-                    }
-                }
-                else
-                {
-                    tail.next = end.head;
-                    tail = end.tail;
-                }
-            }
-        }
-
-        public PatchPoint truncate(final long oldPosition)
-        {
-            Node prev = null;
-            Node curr = head;
-            while (curr != null)
-            {
-                final PatchPoint patch = curr.value;
-                if (patch.oldPosition >= oldPosition)
-                {
-                    tail = prev;
-                    if (tail == null)
-                    {
-                        head = null;
-                    }
-                    else
-                    {
-                        tail.next = null;
-                    }
-                    return patch;
-                }
-
-                prev = curr;
-                curr = curr.next;
-            }
-            return null;
-        }
-
-        public Iterator<PatchPoint> iterator()
-        {
-            return new Iterator<PatchPoint>()
-            {
-                Node curr = head;
-
-                public boolean hasNext()
-                {
-                    return curr != null;
-                }
 
-                public PatchPoint next()
-                {
-                    if (!hasNext())
-                    {
-                        throw new NoSuchElementException();
-                    }
-                    final PatchPoint value = curr.value;
-                    curr = curr.next;
-                    return value;
-                }
-
-                public void remove()
-                {
-                    throw new UnsupportedOperationException();
-                }
-            };
+        public PatchPoint initialize(final long oldPosition, final int oldLength, final long length) {
+            this.oldPosition = oldPosition;
+            this.oldLength = oldLength;
+            this.length = length;
+            return this;
         }
 
-        @Override
-        public String toString()
-        {
-            final StringBuilder buf = new StringBuilder();
-            buf.append("(PATCHES");
-            for (final PatchPoint patch : this)
-            {
-                buf.append(" ");
-                buf.append(patch);
-            }
-            buf.append(")");
-            return buf.toString();
+        public PatchPoint clear() {
+            return initialize(-1, -1, -1);
         }
     }
 
@@ -487,7 +349,7 @@ public String toString()
     private final PreallocationMode             preallocationMode;
     private final boolean                       isFloatBinary32Enabled;
     private final WriteBuffer                   buffer;
-    private final PatchList                     patchPoints;
+    private final _Private_RecyclingQueue<PatchPoint> patchPoints;
     private final _Private_RecyclingStack<ContainerInfo> containers;
     private int                                 depth;
     private boolean                             hasWrittenValuesSinceFinished;
@@ -521,7 +383,7 @@ public String toString()
         this.preallocationMode = preallocationMode;
         this.isFloatBinary32Enabled = isFloatBinary32Enabled;
         this.buffer            = new WriteBuffer(allocator);
-        this.patchPoints       = new PatchList();
+        this.patchPoints       = new _Private_RecyclingQueue<>(512, PatchPoint::new);
         this.containers        = new _Private_RecyclingStack<ContainerInfo>(
             10,
             new _Private_RecyclingStack.ElementFactory<ContainerInfo>() {
@@ -537,7 +399,6 @@ public ContainerInfo newElement() {
         this.currentFieldSid                  = SID_UNASSIGNED;
         this.currentAnnotationSids            = new IntList();
         this.hasTopLevelSymbolTableAnnotation = false;
-
         this.closed = false;
     }
 
@@ -690,38 +551,40 @@ private void updateLength(long length)
     private void pushContainer(final ContainerType type)
     {
         // XXX we push before writing the type of container
-        containers.push().initialize(type, buffer.position() + 1);
+        containers.push(c -> c.initialize(type, buffer.position() + 1));
     }
 
-    private void addPatchPoint(final long position, final int oldLength, final long value)
+    private void addPatchPoint(final ContainerInfo container, final long position, final int oldLength, final long value)
     {
-        // record the length of the patch
-        final int patchLength = WriteBuffer.varUIntLength(value);
-        final PatchPoint patch = new PatchPoint(position, oldLength, value);
-        if (containers.isEmpty())
-        {
-            // not nested, just append to the root list
-            patchPoints.append(patch);
-        }
-        else
-        {
-            // nested, apply it to the current container
-            containers.peek().appendPatch(patch);
+        // If we're adding a patch point we first need to ensure that all of our ancestors (containing values) already
+        // have a patch point. No container can be smaller than the contents, so all outer layers also require patches.
+        // Instead of allocating iterator, we share one iterator instance within the scope of the container stack and reset the cursor every time we track back to the ancestors.
+        ListIterator<ContainerInfo> stackIterator = containers.iterator();
+        // Walk down the stack until we find an ancestor which already has a patch point
+        while (stackIterator.hasNext() && stackIterator.next().patchIndex == -1);
+
+        // The iterator cursor is now positioned on an ancestor container that has a patch point
+        // Ascend back up the stack, fixing the ancestors which need a patch point assigned before us
+        while (stackIterator.hasPrevious()) {
+            ContainerInfo ancestor = stackIterator.previous();
+            if (ancestor.patchIndex == -1) {
+                ancestor.patchIndex = patchPoints.push(PatchPoint::clear);
+            }
         }
+
+        // record the size of the length data.
+        final int patchLength = WriteBuffer.varUIntLength(value);
+        container.appendPatch(position, oldLength, value);
         updateLength(patchLength - oldLength);
     }
 
-    private void extendPatchPoints(final PatchList patches)
-    {
-        if (containers.isEmpty())
-        {
-            // not nested, extend root list
-            patchPoints.extend(patches);
-        }
-        else
-        {
-            // nested, apply it to the current container
-            containers.peek().extendPatches(patches);
+    /**
+     * This is used to reclaim the placeholder patch point after scan the current container.
+     * @param placeholderPatchIndex represents the index of the placeholder patch point.
+     */
+    private void reclaimPlaceholderPatchPoint(int placeholderPatchIndex) {
+        if (placeholderPatchIndex >= patchPoints.size() - 1) {
+            patchPoints.remove();
         }
     }
 
@@ -776,17 +639,11 @@ else if (currentContainer.length <= preallocationMode.contentMaxLength)
             else
             {
                 // The container's encoded body is too long to fit in the length bytes that were preallocated.
-                // Write the VarUInt encoding of the length in a secondary buffer and make a note to include that
-                // when we go to flush the primary buffer to the output stream.
-                addPatchPoint(positionOfFirstLengthByte, preallocationMode.numberOfLengthBytes(), length);
+                // Write the length in the patch point list, making a note to include the VarUInt encoding of the length
+                // at the right point when we go to flush the primary buffer to the output stream.
+                addPatchPoint(currentContainer, positionOfFirstLengthByte, preallocationMode.numberOfLengthBytes(), length);
             }
         }
-        if (currentContainer.patches != null)
-        {
-            // at this point, we've appended our patch points upward, lets make sure we get
-            // our child patch points in
-            extendPatchPoints(currentContainer.patches);
-        }
 
         // make sure to record length upward
         updateLength(length);
@@ -1230,7 +1087,7 @@ private void patchSingleByteTypedOptimisticValue(final byte type, final Containe
         {
             // side patch
             buffer.writeUInt8At(info.position - 1, type | 0xE);
-            addPatchPoint(info.position, 0, info.length);
+            addPatchPoint(info, info.position, 0, info.length);
         }
     }
 
@@ -1484,7 +1341,19 @@ public void writeBytes(byte[] data, int offset, int length) throws IOException
     /*package*/ void truncate(long position)
     {
         buffer.truncate(position);
-        patchPoints.truncate(position);
+        // TODO decide if it is worth making this faster than O(N)
+        Iterator<PatchPoint> patchIterator = patchPoints.iterate();
+        int i = 0;
+        while (patchIterator.hasNext()) {
+            PatchPoint patchPoint = patchIterator.next();
+            if (patchPoint.length > -1) {
+                if (patchPoint.oldPosition >= position) {
+                    patchPoints.truncate(i - 1);
+                    break;
+                }
+            }
+            i++;
+        }
     }
 
     public void flush() throws IOException {}
@@ -1508,8 +1377,13 @@ public void finish() throws IOException
         else
         {
             long bufferPosition = 0;
-            for (final PatchPoint patch : patchPoints)
+            Iterator<PatchPoint> iterator = patchPoints.iterate();
+            while (iterator.hasNext())
             {
+                PatchPoint patch = iterator.next();
+                if (patch.length < 0) {
+                    continue;
+                }
                 // write up to the thing to be patched
                 final long bufferLength = patch.oldPosition - bufferPosition;
                 buffer.writeTo(out, bufferPosition, bufferLength);

From 2f48f49deadd1d4a3f21614df5f1cb5ee1792dde Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Tue, 7 Nov 2023 15:30:01 -0800
Subject: [PATCH 308/490] Remove the repeated logic of the method that
 overwrites the lower nibble of container type descriptor. (#548)

---
 .../ion/impl/bin/IonRawBinaryWriter.java      | 14 ++++-------
 src/com/amazon/ion/impl/bin/WriteBuffer.java  | 25 ++++++++++---------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index ab493ab5d4..216b139e33 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -610,22 +610,18 @@ private ContainerInfo popContainer()
                 // The number of bytes we need to shift by is determined by the writer's preallocation mode.
                 final int numberOfBytesToShiftBy = preallocationMode.numberOfLengthBytes();
 
-                // `length` is the encoded length of the container/wrapper we're stepping out of. It does not
-                // include any header bytes. In this `if` branch, we've confirmed that `length` is <= 0xD,
-                // so this downcast from `long` to `int` is safe.
-                final int lengthOfSliceToShift = (int) length;
-
                 // Shift the container/wrapper body backwards in the buffer. Because this only happens when
                 // `lengthOfSliceToShift` is 13 or fewer bytes, this will usually be a very fast memcpy.
                 // It's slightly more work if the slice we're shifting happens to straddle two memory blocks
                 // inside the buffer.
-                buffer.shiftBytesLeft(lengthOfSliceToShift, numberOfBytesToShiftBy);
+                // `length` is the encoded length of the container/wrapper we're stepping out of. It does not
+                // include any header bytes. In this `if` branch, we've confirmed that `length` is <= 0xD,
+                // so this downcast from `long` to `int` is safe.
+                buffer.shiftBytesLeft((int)length, numberOfBytesToShiftBy);
 
                 // Overwrite the lower nibble of the original type descriptor byte with the body's encoded length.
                 final long typeDescriptorPosition = positionOfFirstLengthByte - 1;
-                final long type = (buffer.getUInt8At(typeDescriptorPosition) & 0xF0) | length;
-                buffer.writeUInt8At(typeDescriptorPosition, type);
-
+                buffer.writeLowerNibbleAt(typeDescriptorPosition, length);
                 // We've reclaimed some number of bytes; adjust the container length as appropriate.
                 length -= numberOfBytesToShiftBy;
             }
diff --git a/src/com/amazon/ion/impl/bin/WriteBuffer.java b/src/com/amazon/ion/impl/bin/WriteBuffer.java
index fba4c60d48..7e67af00bd 100644
--- a/src/com/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/com/amazon/ion/impl/bin/WriteBuffer.java
@@ -104,17 +104,6 @@ public long position()
         return (((long) index) * allocator.getBlockSize()) + current.limit;
     }
 
-    private static final int OCTET_MASK = 0xFF;
-
-    /** Returns the octet at the logical position given. */
-    public int getUInt8At(final long position)
-    {
-        final int index = index(position);
-        final int offset = offset(position);
-        final Block block = blocks.get(index);
-        return block.data[offset] & OCTET_MASK;
-    }
-
     /** Writes a single octet to the buffer, expanding if necessary. */
     public void writeByte(final byte octet)
     {
@@ -1266,12 +1255,24 @@ public void writeUInt8At(final long position, final long value)
     {
         final int index = index(position);
         final int offset = offset(position);
-
         // XXX we'll never overrun a block unless we're given a position past our block array
         final Block block = blocks.get(index);
         block.data[offset] = (byte) value;
     }
 
+    /**
+     * Overwrite the lower nibble of the specified type descriptor byte with the length information.
+     * @param position represents the position of the byte that will be overwritten.
+     * @param value represents the length value of the container.
+     */
+    public void writeLowerNibbleAt(final long position, final long value) {
+        final int index = index(position);
+        final int offset = offset(position);
+        final Block block = blocks.get(index);
+        long bitValue = block.data[offset];
+        block.data[offset] = (byte) (bitValue & 0xF0 | value) ;
+    }
+
     /** Get the length of FlexInt for the provided value. */
     public static int flexIntLength(final long value) {
         int numMagnitudeBitsRequired;

From 0d0258cc546dab0277cbd4be09e0c0f52e724e4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Nov 2023 09:34:54 -0800
Subject: [PATCH 309/490] Bump github/codeql-action from 2.22.5 to 2.22.6
 (#638)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.5 to 2.22.6.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/74483a38d39275f33fcff5f35b679b5ca4a26a99...689fdc5193eeb735ecb2e52e819e3382876f93f4)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3cfc22f09c..ad6258db61 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/init@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/autobuild@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/analyze@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a894ddce1c..a9832c88c7 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/upload-sarif@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6
         with:
           sarif_file: results.sarif

From 437f51b828bea189cff0cdce0d2ff01f96ef15db Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Wed, 25 Oct 2023 11:41:52 -0700
Subject: [PATCH 310/490] Adds support for writing Ion 1.1 null, bool, int, and
 float binary encoding (#612)

---
 .../amazon/ion/impl/bin/IonEncoder_1_1.java   | 161 +++++++++++++
 src/com/amazon/ion/impl/bin/OpCodes.java      |  28 +++
 src/com/amazon/ion/impl/bin/WriteBuffer.java  |  59 +++++
 .../ion/impl/bin/IonEncoder_1_1Test.java      | 225 ++++++++++++++++++
 .../amazon/ion/impl/bin/WriteBufferTest.java  | 112 +++++++++
 5 files changed, 585 insertions(+)
 create mode 100644 src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
 create mode 100644 src/com/amazon/ion/impl/bin/OpCodes.java
 create mode 100644 test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java

diff --git a/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java b/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
new file mode 100644
index 0000000000..cca35421f7
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
@@ -0,0 +1,161 @@
+package com.amazon.ion.impl.bin;
+
+import com.amazon.ion.Decimal;
+import com.amazon.ion.IonType;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl.bin.utf8.Utf8StringEncoder;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static java.lang.Double.doubleToRawLongBits;
+import static java.lang.Float.floatToIntBits;
+
+/**
+ * Provides functions for writing various Ion values to a WriteBuffer.
+ *
+ * This class can be subsumed by IonRawBinaryWriter_1_1, when it is created.
+ */
+public class IonEncoder_1_1 {
+
+    /**
+     * Writes an Ion Null value to the given WriteBuffer.
+     * @return the number of bytes written
+     */
+    public static int writeNullValue(WriteBuffer buffer, final IonType ionType) {
+        if (ionType == IonType.NULL) {
+            buffer.writeByte(OpCodes.NULL_UNTYPED);
+            return 1;
+        }
+
+        buffer.writeByte(OpCodes.NULL_TYPED);
+        switch (ionType) {
+            case BOOL:
+                buffer.writeByte((byte) 0x00);
+                break;
+            case INT:
+                buffer.writeByte((byte) 0x01);
+                break;
+            case FLOAT:
+                buffer.writeByte((byte) 0x02);
+                break;
+            case DECIMAL:
+                buffer.writeByte((byte) 0x03);
+                break;
+            case TIMESTAMP:
+                buffer.writeByte((byte) 0x04);
+                break;
+            case STRING:
+                buffer.writeByte((byte) 0x05);
+                break;
+            case SYMBOL:
+                buffer.writeByte((byte) 0x06);
+                break;
+            case BLOB:
+                buffer.writeByte((byte) 0x07);
+                break;
+            case CLOB:
+                buffer.writeByte((byte) 0x08);
+                break;
+            case LIST:
+                buffer.writeByte((byte) 0x09);
+                break;
+            case SEXP:
+                buffer.writeByte((byte) 0x0A);
+                break;
+            case STRUCT:
+                buffer.writeByte((byte) 0x0B);
+                break;
+            case DATAGRAM:
+                throw new IllegalArgumentException("Cannot write a null datagram");
+        }
+        return 2;
+    }
+
+    /**
+     * Writes an Ion Bool value to the given WriteBuffer.
+     * @return the number of bytes written
+     */
+    public static int writeBoolValue(WriteBuffer buffer, final boolean value) {
+        if (value) {
+            buffer.writeByte(OpCodes.BOOLEAN_TRUE);
+        } else {
+            buffer.writeByte(OpCodes.BOOLEAN_FALSE);
+        }
+        return 1;
+    }
+
+    /**
+     * Writes an Ion Integer value to the given WriteBuffer.
+     * @return the number of bytes written
+     */
+    public static int writeIntValue(WriteBuffer buffer, final long value) {
+        if (value == 0) {
+            buffer.writeByte(OpCodes.INTEGER_ZERO_LENGTH);
+            return 1;
+        }
+        int length = WriteBuffer.fixedIntLength(value);
+        buffer.writeByte((byte) (OpCodes.INTEGER_ZERO_LENGTH + length));
+        buffer.writeFixedInt(value);
+        return 1 + length;
+    }
+
+    private static final BigInteger BIG_INT_LONG_MAX_VALUE = BigInteger.valueOf(Long.MAX_VALUE);
+    private static final BigInteger BIG_INT_LONG_MIN_VALUE = BigInteger.valueOf(Long.MIN_VALUE);
+
+    /**
+     * Writes an Ion Integer value to the given WriteBuffer.
+     * @return the number of bytes written
+     */
+    public static int writeIntValue(WriteBuffer buffer, final BigInteger value) {
+        if (value == null) {
+            return writeNullValue(buffer, IonType.INT);
+        }
+        if (value.compareTo(BIG_INT_LONG_MIN_VALUE) >= 0 && value.compareTo(BIG_INT_LONG_MAX_VALUE) <= 0) {
+            return writeIntValue(buffer, value.longValue());
+        }
+        buffer.writeByte(OpCodes.VARIABLE_LENGTH_INTEGER);
+        byte[] intBytes = value.toByteArray();
+        int totalBytes = 1 + intBytes.length + buffer.writeFlexUInt(intBytes.length);
+        for (int i = intBytes.length; i > 0; i--) {
+            buffer.writeByte(intBytes[i-1]);
+        }
+        return totalBytes;
+    }
+
+    /**
+     * Writes a float to the given WriteBuffer using the Ion 1.1 encoding for Ion Floats.
+     * @return the number of bytes written
+     */
+    public static int writeFloat(WriteBuffer buffer, final float value) {
+        // TODO: Optimization to write a 16 bit float for non-finite and possibly other values
+        if (value == 0.0) {
+            buffer.writeByte(OpCodes.FLOAT_ZERO_LENGTH);
+            return 1;
+        } else {
+            buffer.writeByte(OpCodes.FLOAT_32);
+            buffer.writeUInt32(floatToIntBits(value));
+            return 5;
+        }
+    }
+
+    /**
+     * Writes a double to the given WriteBuffer using the Ion 1.1 encoding for Ion Floats.
+     * @return the number of bytes written
+     */
+    public static int writeFloat(WriteBuffer buffer, final double value) {
+        // TODO: Optimization to write a 16 bit float for non-finite and possibly other values
+        if (value == 0.0) {
+            buffer.writeByte(OpCodes.FLOAT_ZERO_LENGTH);
+            return 1;
+        } else if (!Double.isFinite(value) || value == (float) value) {
+            buffer.writeByte(OpCodes.FLOAT_32);
+            buffer.writeUInt32(floatToIntBits((float) value));
+            return 5;
+        } else {
+            buffer.writeByte(OpCodes.FLOAT_64);
+            buffer.writeUInt64(doubleToRawLongBits(value));
+            return 9;
+        }
+    }
+}
diff --git a/src/com/amazon/ion/impl/bin/OpCodes.java b/src/com/amazon/ion/impl/bin/OpCodes.java
new file mode 100644
index 0000000000..0ea5bf843d
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/OpCodes.java
@@ -0,0 +1,28 @@
+package com.amazon.ion.impl.bin;
+
+/**
+ * Utility class holding Ion 1.1 Op Codes.
+ */
+public class OpCodes {
+    private OpCodes() {}
+
+    public static final byte INTEGER_ZERO_LENGTH = 0x50;
+    // 0x51-0x58 are additional lengths of integers.
+    // 0x59 Reserved
+    public static final byte FLOAT_ZERO_LENGTH = 0x5A;
+    public static final byte FLOAT_16 = 0x5B;
+    public static final byte FLOAT_32 = 0x5C;
+    public static final byte FLOAT_64 = 0x5D;
+    public static final byte BOOLEAN_TRUE = 0x5E;
+    public static final byte BOOLEAN_FALSE = 0x5F;
+
+    public static final byte DECIMAL_ZERO_LENGTH = 0x60;
+    // 0x61-0x6E are additional lengths of decimals.
+    public static final byte NEGATIVE_ZERO_DECIMAL = 0x6F;
+
+
+    public static final byte NULL_UNTYPED = (byte) 0xEA;
+    public static final byte NULL_TYPED = (byte) 0xEB;
+
+    public static final byte VARIABLE_LENGTH_INTEGER = (byte) 0xF5;
+}
diff --git a/src/com/amazon/ion/impl/bin/WriteBuffer.java b/src/com/amazon/ion/impl/bin/WriteBuffer.java
index 7e67af00bd..7bf7410275 100644
--- a/src/com/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/com/amazon/ion/impl/bin/WriteBuffer.java
@@ -18,6 +18,7 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -1360,6 +1361,64 @@ private int writeFlexIntOrUInt(final long value, final int numBytes) {
         return numBytes;
     }
 
+    public static int flexIntLength(final BigInteger value) {
+        return value.bitLength() / 7 + 1;
+    }
+
+    public static int flexUIntLength(final BigInteger value) {
+        return (value.bitLength() - 1) / 7 + 1;
+    }
+
+    public int writeFlexInt(final BigInteger value) {
+        int numBytes = flexIntLength(value);
+        return writeFlexIntOrUIntForBigInteger(value, numBytes);
+    }
+
+    public int writeFlexUInt(final BigInteger value) {
+        if (value.signum() < 0) {
+            throw new IllegalArgumentException("Attempted to write a FlexUInt for " + value);
+        }
+        int numBytes = flexUIntLength(value);
+        return writeFlexIntOrUIntForBigInteger(value, numBytes);
+    }
+
+    private int writeFlexIntOrUIntForBigInteger(final BigInteger value, final int numBytes) {
+        // TODO: Should we branch to the implementation for long if the number is small enough?
+        // https://github.com/amazon-ion/ion-java/issues/614
+        byte[] valueBytes = value.toByteArray();
+
+        int i = 0; // `i` gets incremented for every byte written.
+
+        // Start with leading zero bytes.
+        // If there's 1-8 total bytes, we need no leading zero-bytes.
+        // If there's 9-16 total bytes, we need one zero-byte
+        // If there's 17-24 total bytes, we need two zero-bytes, etc.
+        for (; i < (numBytes - 1)/8; i++) {
+            writeByte((byte) 0);
+        }
+
+        // Write the last length bits, possibly also containing some value bits.
+        int remainingLengthBits = (numBytes - 1) % 8;
+        byte lengthPart = (byte) (0x01 << remainingLengthBits);
+        int valueBitOffset = remainingLengthBits + 1;
+        byte valuePart = (byte) (valueBytes[valueBytes.length - 1] << valueBitOffset);
+        writeByte((byte) (valuePart | lengthPart));
+        i++;
+
+        for (int valueByteOffset = valueBytes.length - 1; valueByteOffset > 0; valueByteOffset--) {
+            // Technically it's only a nibble if the bitOffset is 4, so we call it nibble-ish
+            byte highNibbleIsh = (byte) (valueBytes[valueByteOffset - 1] << (valueBitOffset));
+            byte lowNibbleIsh = (byte) ((valueBytes[valueByteOffset] & 0xFF) >> (8 - valueBitOffset));
+            writeByte((byte) (highNibbleIsh | lowNibbleIsh));
+            i++;
+        }
+        if (i < numBytes) {
+            writeByte((byte) ((valueBytes[0]) >> (8 - valueBitOffset)));
+        }
+
+        return numBytes;
+    }
+
     /** Get the length of FixedInt for the provided value. */
     public static int fixedIntLength(final long value) {
         int numMagnitudeBitsRequired;
diff --git a/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java b/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
new file mode 100644
index 0000000000..4d26345d77
--- /dev/null
+++ b/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
@@ -0,0 +1,225 @@
+package com.amazon.ion.impl.bin;
+
+import com.amazon.ion.IonType;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.function.BiFunction;
+
+public class IonEncoder_1_1Test {
+
+    private static BlockAllocator ALLOCATOR = BlockAllocatorProviders.basicProvider().vendAllocator(11);
+    private WriteBuffer buf;
+
+    @BeforeEach
+    public void setup() {
+        buf = new WriteBuffer(ALLOCATOR);
+    }
+
+    private byte[] bytes() {
+        final ByteArrayOutputStream out = new ByteArrayOutputStream();
+        try {
+            buf.writeTo(out);
+        } catch (final IOException e) {
+            throw new IllegalStateException(e);
+        }
+        return out.toByteArray();
+    }
+
+    /**
+     * Checks that the function writes the expected bytes and returns the expected
+     * count of written bytes for the given input value.
+     */
+    private <T> void assertWritingValue(String expectedBytes, T value, BiFunction<WriteBuffer, T, Integer> writeOperation) {
+        int numBytes = writeOperation.apply(buf, value);
+        Assertions.assertEquals(expectedBytes, byteArrayToHex(bytes()));
+        Assertions.assertEquals(byteLengthFromHexString(expectedBytes), numBytes);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "     NULL, EA",
+            "     BOOL, EB 00",
+            "      INT, EB 01",
+            "    FLOAT, EB 02",
+            "  DECIMAL, EB 03",
+            "TIMESTAMP, EB 04",
+            "   STRING, EB 05",
+            "   SYMBOL, EB 06",
+            "     BLOB, EB 07",
+            "     CLOB, EB 08",
+            "     LIST, EB 09",
+            "     SEXP, EB 0A",
+            "   STRUCT, EB 0B",
+    })
+    public void testWriteNullValue(IonType value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeNullValue);
+    }
+
+    @Test
+    public void testWriteNullValueForDatagram() {
+        Assertions.assertThrows(IllegalArgumentException.class, () -> IonEncoder_1_1.writeNullValue(buf, IonType.DATAGRAM));
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "true, 5E",
+            "false, 5F",
+    })
+    public void testWriteBooleanValue(Boolean value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeBoolValue);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "                   0, 50",
+            "                   1, 51 01",
+            "                  17, 51 11",
+            "                 127, 51 7F",
+            "                 128, 52 80 00",
+            "                5555, 52 B3 15",
+            "               32767, 52 FF 7F",
+            "               32768, 53 00 80 00",
+            "              292037, 53 C5 74 04",
+            "           321672342, 54 96 54 2C 13",
+            "         64121672342, 55 96 12 F3 ED 0E",
+            "       1274120283167, 56 1F A4 7C A7 28 01",
+            "     851274120283167, 57 1F C4 8B B3 3A 06 03",
+            "   72624976668147840, 58 80 40 20 10 08 04 02 01",
+            " 9223372036854775807, 58 FF FF FF FF FF FF FF 7F", // Long.MAX_VALUE
+            "                  -1, 51 FF",
+            "                  -2, 51 FE",
+            "                 -14, 51 F2",
+            "                -128, 51 80",
+            "                -129, 52 7F FF",
+            "                -944, 52 50 FC",
+            "              -32768, 52 00 80",
+            "              -32769, 53 FF 7F FF",
+            "            -8388608, 53 00 00 80",
+            "            -8388609, 54 FF FF 7F FF",
+            "  -72624976668147841, 58 7F BF DF EF F7 FB FD FE",
+            "-9223372036854775808, 58 00 00 00 00 00 00 00 80", // Long.MIN_VALUE
+    })
+    public void testWriteIntegerValue(long value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeIntValue);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "                             0, 50",
+            "                             1, 51 01",
+            "                            17, 51 11",
+            "                           127, 51 7F",
+            "                           128, 52 80 00",
+            "                          5555, 52 B3 15",
+            "                         32767, 52 FF 7F",
+            "                         32768, 53 00 80 00",
+            "                        292037, 53 C5 74 04",
+            "                     321672342, 54 96 54 2C 13",
+            "                   64121672342, 55 96 12 F3 ED 0E",
+            "                 1274120283167, 56 1F A4 7C A7 28 01",
+            "               851274120283167, 57 1F C4 8B B3 3A 06 03",
+            "             72624976668147840, 58 80 40 20 10 08 04 02 01",
+            "           9223372036854775807, 58 FF FF FF FF FF FF FF 7F", // Long.MAX_VALUE
+            "           9223372036854775808, F5 13 00 00 00 00 00 00 00 80 00",
+            "999999999999999999999999999999, F5 1B FF FF FF 3F EA ED 74 46 D0 9C 2C 9F 0C",
+            "                            -1, 51 FF",
+            "                            -2, 51 FE",
+            "                           -14, 51 F2",
+            "                          -128, 51 80",
+            "                          -129, 52 7F FF",
+            "                          -944, 52 50 FC",
+            "                        -32768, 52 00 80",
+            "                        -32769, 53 FF 7F FF",
+            "                      -8388608, 53 00 00 80",
+            "                      -8388609, 54 FF FF 7F FF",
+            "            -72624976668147841, 58 7F BF DF EF F7 FB FD FE",
+            "          -9223372036854775808, 58 00 00 00 00 00 00 00 80", // Long.MIN_VALUE
+            "          -9223372036854775809, F5 13 FF FF FF FF FF FF FF 7F FF",
+            "-99999999999999999999999999999, F5 1B 01 00 00 60 35 E8 8D 92 51 F0 E1 BC FE",
+    })
+    public void testWriteIntegerValueForBigInteger(String value, String expectedBytes) {
+        assertWritingValue(expectedBytes, new BigInteger(value), IonEncoder_1_1::writeIntValue);
+    }
+
+    @Test
+    public void testWriteIntegerValueForNullBigInteger() {
+        int numBytes = IonEncoder_1_1.writeIntValue(buf, null);
+        Assertions.assertEquals("EB 01", byteArrayToHex(bytes()));
+        Assertions.assertEquals(2, numBytes);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "            0.0, 5A",
+            "            1.0, 5C 3F 80 00 00",
+            "            1.5, 5C 3F C0 00 00",
+            "      3.1415927, 5C 40 49 0F DB",
+            "  4.00537109375, 5C 40 80 2C 00",
+            "   423542.09375, 5C 48 CE CE C3",
+            " 3.40282347E+38, 5C 7F 7F FF FF", // Float.MAX_VALUE
+            "           -1.0, 5C BF 80 00 00",
+            "           -1.5, 5C BF C0 00 00",
+            "     -3.1415927, 5C C0 49 0F DB",
+            " -4.00537109375, 5C C0 80 2C 00",
+            "  -423542.09375, 5C C8 CE CE C3",
+            "-3.40282347E+38, 5C FF 7F FF FF", // Float.MIN_VALUE
+            "            NaN, 5C 7F C0 00 00",
+            "       Infinity, 5C 7F 80 00 00",
+            "      -Infinity, 5C FF 80 00 00",
+    })
+    public void testWriteFloatValue(float value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeFloat);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "                      0.0, 5A",
+            "                      1.0, 5C 3F 80 00 00",
+            "                      1.5, 5C 3F C0 00 00",
+            "        3.141592653589793, 5D 40 09 21 FB 54 44 2D 18",
+            "            4.00537109375, 5C 40 80 2C 00",
+            "            4.11111111111, 5D 40 10 71 C7 1C 71 C2 39",
+            "             423542.09375, 5C 48 CE CE C3",
+            "         8236423542.09375, 5D 41 FE AE DD 97 61 80 00",
+            " 1.79769313486231570e+308, 5D 7F EF FF FF FF FF FF FF", // Double.MAX_VALUE
+            "                     -1.0, 5C BF 80 00 00",
+            "                     -1.5, 5C BF C0 00 00",
+            "       -3.141592653589793, 5D C0 09 21 FB 54 44 2D 18",
+            "           -4.00537109375, 5C C0 80 2C 00",
+            "           -4.11111111111, 5D C0 10 71 C7 1C 71 C2 39",
+            "            -423542.09375, 5C C8 CE CE C3",
+            "        -8236423542.09375, 5D C1 FE AE DD 97 61 80 00",
+            "-1.79769313486231570e+308, 5D FF EF FF FF FF FF FF FF", // Double.MIN_VALUE
+            "                      NaN, 5C 7F C0 00 00",
+            "                 Infinity, 5C 7F 80 00 00",
+            "                -Infinity, 5C FF 80 00 00",
+    })
+    public void testWriteFloatValueForDouble(double value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeFloat);
+    }
+
+    /**
+     * Utility method to make it easier to write test cases that assert specific sequences of bytes.
+     */
+    private static String byteArrayToHex(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bytes) {
+            sb.append(String.format("%02X ", b));
+        }
+        return sb.toString().trim();
+    }
+
+    /**
+     * Determines the number of bytes needed to represent a series of hexadecimal digits.
+     */
+    private static int byteLengthFromHexString(String hexString) {
+        return (hexString.replaceAll("[^\\dA-F]", "").length() - 1) / 2 + 1;
+    }
+}
diff --git a/test/com/amazon/ion/impl/bin/WriteBufferTest.java b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
index 10d49f7b14..a46e4c2c75 100644
--- a/test/com/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
@@ -24,6 +24,8 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.Arrays;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
@@ -1411,6 +1413,116 @@ public void testWriteFlexUIntForNegativeNumber() {
         Assertions.assertThrows(IllegalArgumentException.class, () -> buf.writeFlexUInt(-1));
     }
 
+    @ParameterizedTest
+    @CsvSource({
+            "                   0, 00000001",
+            "                   1, 00000011",
+            "                   2, 00000101",
+            "                   3, 00000111",
+            "                   4, 00001001",
+            "                   5, 00001011",
+            "                  14, 00011101",
+            "                  63, 01111111",
+            "                  64, 00000010 00000001",
+            "                 729, 01100110 00001011",
+            "                8191, 11111110 01111111",
+            "                8192, 00000100 00000000 00000001",
+            "             1048575, 11111100 11111111 01111111",
+            "             1048576, 00001000 00000000 00000000 00000001",
+            "           134217727, 11111000 11111111 11111111 01111111",
+            "           134217728, 00010000 00000000 00000000 00000000 00000001",
+            "         17179869184, 00100000 00000000 00000000 00000000 00000000 00000001",
+            "       2199023255552, 01000000 00000000 00000000 00000000 00000000 00000000 00000001",
+            "     281474976710655, 11000000 11111111 11111111 11111111 11111111 11111111 01111111",
+            "     281474976710656, 10000000 00000000 00000000 00000000 00000000 00000000 00000000 00000001",
+            "   36028797018963967, 10000000 11111111 11111111 11111111 11111111 11111111 11111111 01111111",
+            "   36028797018963968, 00000000 00000001 00000000 00000000 00000000 00000000 00000000 00000000 00000001",
+            // Different one-bits in every byte, making it easy to see if any bytes are out of order
+            "   72624976668147840, 00000000 00000001 10000001 01000000 00100000 00010000 00001000 00000100 00000010",
+            " 4611686018427387903, 00000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111 01111111",
+            " 4611686018427387904, 00000000 00000010 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000001",
+            // Long.MAX_VALUE
+            " 9223372036854775807, 00000000 11111110 11111111 11111111 11111111 11111111 11111111 11111111 11111111 00000001",
+            " 9223372036854775808, 00000000 00000010 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000010",
+            "                  -1, 11111111",
+            "                  -2, 11111101",
+            "                  -3, 11111011",
+            "                 -14, 11100101",
+            "                 -64, 10000001",
+            "                 -65, 11111110 11111110",
+            "                -729, 10011110 11110100",
+            "               -8192, 00000010 10000000",
+            "               -8193, 11111100 11111111 11111110",
+            "            -1048576, 00000100 00000000 10000000",
+            "            -1048577, 11111000 11111111 11111111 11111110",
+            "          -134217728, 00001000 00000000 00000000 10000000",
+            "          -134217729, 11110000 11111111 11111111 11111111 11111110",
+            "        -17179869184, 00010000 00000000 00000000 00000000 10000000",
+            "        -17179869185, 11100000 11111111 11111111 11111111 11111111 11111110",
+            "    -281474976710656, 01000000 00000000 00000000 00000000 00000000 00000000 10000000",
+            "    -281474976710657, 10000000 11111111 11111111 11111111 11111111 11111111 11111111 11111110",
+            "  -36028797018963968, 10000000 00000000 00000000 00000000 00000000 00000000 00000000 10000000",
+            "  -36028797018963969, 00000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111110",
+            // Different zero-bits in every byte, making it easy to see if any bytes are out of order
+            "  -72624976668147841, 00000000 11111111 01111110 10111111 11011111 11101111 11110111 11111011 11111101",
+            "-4611686018427387904, 00000000 00000001 00000000 00000000 00000000 00000000 00000000 00000000 10000000",
+            "-4611686018427387905, 00000000 11111110 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111110",
+            // Long.MIN_VALUE
+            "-9223372036854775808, 00000000 00000010 00000000 00000000 00000000 00000000 00000000 00000000 00000000 11111110",
+            "-9223372036854775809, 00000000 11111110 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111101",
+
+    })
+    public void testWriteFlexIntForBigInteger(String value, String expectedBits) {
+        int numBytes = buf.writeFlexInt(new BigInteger(value));
+        String actualBits = byteArrayToBitString(bytes());
+        Assertions.assertEquals(expectedBits, actualBits);
+        Assertions.assertEquals((expectedBits.length() + 1)/9, numBytes);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "                 0, 00000001",
+            "                 1, 00000011",
+            "                 2, 00000101",
+            "                 3, 00000111",
+            "                 4, 00001001",
+            "                 5, 00001011",
+            "                14, 00011101",
+            "                63, 01111111",
+            "                64, 10000001",
+            "               127, 11111111",
+            "               128, 00000010 00000010",
+            "               729, 01100110 00001011",
+            "             16383, 11111110 11111111",
+            "             16384, 00000100 00000000 00000010",
+            "           2097151, 11111100 11111111 11111111",
+            "           2097152, 00001000 00000000 00000000 00000010",
+            "         268435455, 11111000 11111111 11111111 11111111",
+            "         268435456, 00010000 00000000 00000000 00000000 00000010",
+            "       34359738368, 00100000 00000000 00000000 00000000 00000000 00000010",
+            "     4398046511104, 01000000 00000000 00000000 00000000 00000000 00000000 00000010",
+            "   562949953421311, 11000000 11111111 11111111 11111111 11111111 11111111 11111111",
+            "   562949953421312, 10000000 00000000 00000000 00000000 00000000 00000000 00000000 00000010",
+            " 72057594037927935, 10000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111",
+            " 72057594037927936, 00000000 00000001 00000000 00000000 00000000 00000000 00000000 00000000 00000010",
+            // Different one-bits in every byte, making it easy to see if any bytes are out of order
+            " 72624976668147840, 00000000 00000001 10000001 01000000 00100000 00010000 00001000 00000100 00000010",
+            // Long.MAX_VALUE
+            "9223372036854775807, 00000000 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111",
+            "9223372036854775808, 00000000 00000010 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000010",
+    })
+    public void testWriteFlexUIntForBigInteger(String value, String expectedBits) {
+        int numBytes = buf.writeFlexUInt(new BigInteger(value));
+        String actualBits = byteArrayToBitString(bytes());
+        Assertions.assertEquals(expectedBits, actualBits);
+        Assertions.assertEquals((expectedBits.length() + 1)/9, numBytes);
+    }
+
+    @Test
+    public void testWriteFlexUIntForNegativeBigInteger() {
+        Assertions.assertThrows(IllegalArgumentException.class, () -> buf.writeFlexUInt(BigInteger.ONE.negate()));
+    }
+
     @ParameterizedTest
     @CsvSource({
             "                   0, 00000000",

From 0a9ad1f7b9791720692b86219870b4b4d1ec00ae Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Wed, 18 Oct 2023 14:07:58 -0700
Subject: [PATCH 311/490] Adds support for writing binary Ion 1.1 timestamps
 (#618)

---
 .../amazon/ion/impl/bin/IonEncoder_1_1.java   | 229 +++++++++++++++-
 .../ion/impl/bin/Ion_1_1_Constants.java       |  36 +++
 src/com/amazon/ion/impl/bin/OpCodes.java      |  15 ++
 src/com/amazon/ion/impl/bin/WriteBuffer.java  |  35 ++-
 .../ion/impl/bin/IonEncoder_1_1Test.java      | 245 +++++++++++++++++-
 .../amazon/ion/impl/bin/WriteBufferTest.java  |  32 ++-
 6 files changed, 578 insertions(+), 14 deletions(-)
 create mode 100644 src/com/amazon/ion/impl/bin/Ion_1_1_Constants.java

diff --git a/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java b/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
index cca35421f7..fe379df851 100644
--- a/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
+++ b/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
@@ -1,13 +1,12 @@
 package com.amazon.ion.impl.bin;
 
-import com.amazon.ion.Decimal;
 import com.amazon.ion.IonType;
 import com.amazon.ion.Timestamp;
-import com.amazon.ion.impl.bin.utf8.Utf8StringEncoder;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 
+import static com.amazon.ion.impl.bin.Ion_1_1_Constants.*;
 import static java.lang.Double.doubleToRawLongBits;
 import static java.lang.Float.floatToIntBits;
 
@@ -158,4 +157,230 @@ public static int writeFloat(WriteBuffer buffer, final double value) {
             return 9;
         }
     }
+
+    /**
+     * Writes a Timestamp to the given WriteBuffer using the Ion 1.1 encoding for Ion Timestamps.
+     * @return the number of bytes written
+     */
+    public static int writeTimestampValue(WriteBuffer buffer, Timestamp value) {
+        if (value == null) {
+            return writeNullValue(buffer, IonType.TIMESTAMP);
+        }
+        // Timestamps may be encoded using the short form if they meet certain conditions.
+        // Condition 1: The year is between 1970 and 2097.
+        if (value.getYear() < 1970 || value.getYear() > 2097) {
+            return writeLongFormTimestampValue(buffer, value);
+        }
+
+        // If the precision is year, month, or day, we can skip the remaining checks.
+        if (!value.getPrecision().includes(Timestamp.Precision.MINUTE)) {
+            return writeShortFormTimestampValue(buffer, value);
+        }
+
+        // Condition 2: The fractional seconds are a common precision.
+        if (value.getZFractionalSecond() != null) {
+            int secondsScale = value.getZFractionalSecond().scale();
+            if (secondsScale != 0 && secondsScale != 3 && secondsScale != 6 && secondsScale != 9) {
+                return writeLongFormTimestampValue(buffer, value);
+            }
+        }
+        // Condition 3: The local offset is either UTC, unknown, or falls between -14:00 to +14:00 and is divisible by 15 minutes.
+        Integer offset = value.getLocalOffset();
+        if (offset != null && (offset < -14 * 60 || offset > 14 * 60 || offset % 15 != 0)) {
+            return writeLongFormTimestampValue(buffer, value);
+        }
+        return writeShortFormTimestampValue(buffer, value);
+    }
+
+    /**
+     * Writes a short-form timestamp.
+     * Value cannot be null.
+     * If calling from outside this class, use writeTimestampValue instead.
+     */
+    private static int writeShortFormTimestampValue(WriteBuffer buffer, Timestamp value) {
+        long bits = (value.getYear() - 1970L);
+        if (value.getPrecision() == Timestamp.Precision.YEAR) {
+            buffer.writeByte(OpCodes.TIMESTAMP_YEAR_PRECISION);
+            buffer.writeFixedIntOrUInt(bits, 1);
+            return 2;
+        }
+
+        bits |= ((long) value.getMonth()) << S_TIMESTAMP_MONTH_BIT_OFFSET;
+        if (value.getPrecision() == Timestamp.Precision.MONTH) {
+            buffer.writeByte(OpCodes.TIMESTAMP_MONTH_PRECISION);
+            buffer.writeFixedIntOrUInt(bits, 2);
+            return 3;
+        }
+
+        bits |= ((long) value.getDay()) << S_TIMESTAMP_DAY_BIT_OFFSET;
+        if (value.getPrecision() == Timestamp.Precision.DAY) {
+            buffer.writeByte(OpCodes.TIMESTAMP_DAY_PRECISION);
+            buffer.writeFixedIntOrUInt(bits, 2);
+            return 3;
+        }
+
+        bits |= ((long) value.getHour()) << S_TIMESTAMP_HOUR_BIT_OFFSET;
+        bits |= ((long) value.getMinute()) << S_TIMESTAMP_MINUTE_BIT_OFFSET;
+        if (value.getLocalOffset() == null || value.getLocalOffset() == 0) {
+            if (value.getLocalOffset() != null) {
+                bits |= S_U_TIMESTAMP_UTC_FLAG;
+            }
+
+            if (value.getPrecision() == Timestamp.Precision.MINUTE) {
+                buffer.writeByte(OpCodes.TIMESTAMP_MINUTE_PRECISION);
+                buffer.writeFixedIntOrUInt(bits, 4);
+                return 5;
+            }
+
+            bits |= ((long) value.getSecond()) << S_U_TIMESTAMP_SECOND_BIT_OFFSET;
+
+            int secondsScale = 0;
+            if (value.getZFractionalSecond() != null) {
+                secondsScale = value.getZFractionalSecond().scale();
+            }
+            if (secondsScale != 0) {
+                long fractionalSeconds = value.getZFractionalSecond().unscaledValue().longValue();
+                bits |= fractionalSeconds << S_U_TIMESTAMP_FRACTION_BIT_OFFSET;
+            }
+            switch (secondsScale) {
+                case 0:
+                    buffer.writeByte(OpCodes.TIMESTAMP_SECOND_PRECISION);
+                    buffer.writeFixedIntOrUInt(bits, 5);
+                    return 6;
+                case 3:
+                    buffer.writeByte(OpCodes.TIMESTAMP_MILLIS_PRECISION);
+                    buffer.writeFixedIntOrUInt(bits, 6);
+                    return 7;
+                case 6:
+                    buffer.writeByte(OpCodes.TIMESTAMP_MICROS_PRECISION);
+                    buffer.writeFixedIntOrUInt(bits, 7);
+                    return 8;
+                case 9:
+                    buffer.writeByte(OpCodes.TIMESTAMP_NANOS_PRECISION);
+                    buffer.writeFixedIntOrUInt(bits, 8);
+                    return 9;
+                default:
+                    throw new IllegalStateException("This is unreachable!");
+            }
+        } else {
+            long localOffset = (value.getLocalOffset().longValue() / 15) + (14 * 4);
+            bits |= (localOffset & LEAST_SIGNIFICANT_7_BITS) << S_O_TIMESTAMP_OFFSET_BIT_OFFSET;
+
+            if (value.getPrecision() == Timestamp.Precision.MINUTE) {
+                buffer.writeByte(OpCodes.TIMESTAMP_MINUTE_PRECISION_WITH_OFFSET);
+                buffer.writeFixedIntOrUInt(bits, 5);
+                return 6;
+            }
+
+            bits |= ((long) value.getSecond()) << S_O_TIMESTAMP_SECOND_BIT_OFFSET;
+
+            // The fractional seconds bits will be put into a separate long because we need nine bytes total
+            // if there are nanoseconds (which is too much for one long) and the boundary between the seconds
+            // and fractional seconds subfields conveniently aligns with a byte boundary.
+            long fractionBits = 0;
+            int secondsScale = 0;
+            if (value.getZFractionalSecond() != null) {
+                secondsScale = value.getZFractionalSecond().scale();
+            }
+            if (secondsScale != 0) {
+                fractionBits = value.getZFractionalSecond().unscaledValue().longValue();
+            }
+            switch (secondsScale) {
+                case 0:
+                    buffer.writeByte(OpCodes.TIMESTAMP_SECOND_PRECISION_WITH_OFFSET);
+                    buffer.writeFixedIntOrUInt(bits, 5);
+                    return 6;
+                case 3:
+                    buffer.writeByte(OpCodes.TIMESTAMP_MILLIS_PRECISION_WITH_OFFSET);
+                    buffer.writeFixedIntOrUInt(bits, 5);
+                    buffer.writeFixedIntOrUInt(fractionBits, 2);
+                    return 8;
+                case 6:
+                    buffer.writeByte(OpCodes.TIMESTAMP_MICROS_PRECISION_WITH_OFFSET);
+                    buffer.writeFixedIntOrUInt(bits, 5);
+                    buffer.writeFixedIntOrUInt(fractionBits, 3);
+                    return 9;
+                case 9:
+                    buffer.writeByte(OpCodes.TIMESTAMP_NANOS_PRECISION_WITH_OFFSET);
+                    buffer.writeFixedIntOrUInt(bits, 5);
+                    buffer.writeFixedIntOrUInt(fractionBits, 4);
+                    return 10;
+                default:
+                    throw new IllegalStateException("This is unreachable!");
+            }
+        }
+    }
+
+    /**
+     * Writes a long-form timestamp.
+     * Value may not be null.
+     * Only visible for testing. If calling from outside this class, use writeTimestampValue instead.
+     */
+    static int writeLongFormTimestampValue(WriteBuffer buffer, Timestamp value) {
+        buffer.writeByte(OpCodes.VARIABLE_LENGTH_TIMESTAMP);
+
+        long bits = value.getYear();
+        if (value.getPrecision() == Timestamp.Precision.YEAR) {
+            buffer.writeFlexUInt(2);
+            buffer.writeFixedIntOrUInt(bits, 2);
+            return 4; // OpCode + FlexUInt + 2 bytes data
+        }
+
+        bits |= ((long) value.getMonth()) << L_TIMESTAMP_MONTH_BIT_OFFSET;
+        if (value.getPrecision() == Timestamp.Precision.MONTH) {
+            buffer.writeFlexUInt(3);
+            buffer.writeFixedIntOrUInt(bits, 3);
+            return 5; // OpCode + FlexUInt + 3 bytes data
+        }
+
+        bits |= ((long) value.getDay()) << L_TIMESTAMP_DAY_BIT_OFFSET;
+        if (value.getPrecision() == Timestamp.Precision.DAY) {
+            buffer.writeFlexUInt(3);
+            buffer.writeFixedIntOrUInt(bits, 3);
+            return 5; // OpCode + FlexUInt + 3 bytes data
+        }
+
+        bits |= ((long) value.getHour()) << L_TIMESTAMP_HOUR_BIT_OFFSET;
+        bits |= ((long) value.getMinute()) << L_TIMESTAMP_MINUTE_BIT_OFFSET;
+        long localOffsetValue = L_TIMESTAMP_UNKNOWN_OFFSET_VALUE;
+        if (value.getLocalOffset() != null) {
+            localOffsetValue = value.getLocalOffset() + (24 * 60);
+        }
+        bits |= localOffsetValue << L_TIMESTAMP_OFFSET_BIT_OFFSET;
+
+        if (value.getPrecision() == Timestamp.Precision.MINUTE) {
+            buffer.writeFlexUInt(6);
+            buffer.writeFixedIntOrUInt(bits, 6);
+            return 8; // OpCode + FlexUInt + 6 bytes data
+        }
+
+
+        bits |= ((long) value.getSecond()) << L_TIMESTAMP_SECOND_BIT_OFFSET;
+        int secondsScale = 0;
+        if (value.getZFractionalSecond() != null) {
+            secondsScale = value.getZFractionalSecond().scale();
+        }
+        if (secondsScale == 0) {
+            buffer.writeFlexUInt(7);
+            buffer.writeFixedIntOrUInt(bits, 7);
+            return 9; // OpCode + FlexUInt + 7 bytes data
+        }
+
+        BigDecimal fractionalSeconds = value.getZFractionalSecond();
+        BigInteger coefficient = fractionalSeconds.unscaledValue();
+        long exponent = fractionalSeconds.scale();
+        int numCoefficientBytes = WriteBuffer.flexUIntLength(coefficient);
+        int numExponentBytes = WriteBuffer.fixedUIntLength(exponent);
+        // Years-seconds data (7 bytes) + fraction coefficient + fraction exponent
+        int dataLength = 7 + numCoefficientBytes + numExponentBytes;
+
+        buffer.writeFlexUInt(dataLength);
+        buffer.writeFixedIntOrUInt(bits, 7);
+        buffer.writeFlexUInt(coefficient);
+        buffer.writeFixedUInt(exponent);
+
+        // OpCode + FlexUInt length + dataLength
+        return 1 + WriteBuffer.flexUIntLength(dataLength) + dataLength;
+    }
+
 }
diff --git a/src/com/amazon/ion/impl/bin/Ion_1_1_Constants.java b/src/com/amazon/ion/impl/bin/Ion_1_1_Constants.java
new file mode 100644
index 0000000000..91a7647042
--- /dev/null
+++ b/src/com/amazon/ion/impl/bin/Ion_1_1_Constants.java
@@ -0,0 +1,36 @@
+package com.amazon.ion.impl.bin;
+
+/**
+ * Contains constants (other than OpCodes) which are generally applicable to both reading and writing binary Ion 1.1
+ */
+public class Ion_1_1_Constants {
+    private Ion_1_1_Constants() {}
+
+    //////// Timestamp Field Constants ////////
+
+    // S_TIMESTAMP_* is applicable to all short-form timestamps
+    static final int S_TIMESTAMP_MONTH_BIT_OFFSET = 7;
+    static final int S_TIMESTAMP_DAY_BIT_OFFSET = 11;
+    static final int S_TIMESTAMP_HOUR_BIT_OFFSET = 16;
+    static final int S_TIMESTAMP_MINUTE_BIT_OFFSET = 21;
+    // S_U_TIMESTAMP_* is applicable to all short-form timestamps with a `U` bit
+    static final int S_U_TIMESTAMP_UTC_FLAG = 1 << 27;
+    static final int S_U_TIMESTAMP_SECOND_BIT_OFFSET = 28;
+    static final int S_U_TIMESTAMP_FRACTION_BIT_OFFSET = 34;
+    // S_O_TIMESTAMP_* is applicable to all short-form timestamps with `o` (offset) bits
+    static final int S_O_TIMESTAMP_OFFSET_BIT_OFFSET = 27;
+    static final int S_O_TIMESTAMP_SECOND_BIT_OFFSET = 34;
+
+    // L_TIMESTAMP_* is applicable to all long-form timestamps
+    static final int L_TIMESTAMP_MONTH_BIT_OFFSET = 14;
+    static final int L_TIMESTAMP_DAY_BIT_OFFSET = 18;
+    static final int L_TIMESTAMP_HOUR_BIT_OFFSET = 23;
+    static final int L_TIMESTAMP_MINUTE_BIT_OFFSET = 28;
+    static final int L_TIMESTAMP_OFFSET_BIT_OFFSET = 34;
+    static final int L_TIMESTAMP_SECOND_BIT_OFFSET = 46;
+    static final int L_TIMESTAMP_UNKNOWN_OFFSET_VALUE = 0b111111111111;
+
+    //////// Bit masks ////////
+
+    static final long LEAST_SIGNIFICANT_7_BITS = 0b01111111L;
+}
diff --git a/src/com/amazon/ion/impl/bin/OpCodes.java b/src/com/amazon/ion/impl/bin/OpCodes.java
index 0ea5bf843d..4e3f3c6468 100644
--- a/src/com/amazon/ion/impl/bin/OpCodes.java
+++ b/src/com/amazon/ion/impl/bin/OpCodes.java
@@ -20,9 +20,24 @@ private OpCodes() {}
     // 0x61-0x6E are additional lengths of decimals.
     public static final byte NEGATIVE_ZERO_DECIMAL = 0x6F;
 
+    public static final byte TIMESTAMP_YEAR_PRECISION = 0x70;
+    public static final byte TIMESTAMP_MONTH_PRECISION = 0x71;
+    public static final byte TIMESTAMP_DAY_PRECISION = 0x72;
+    public static final byte TIMESTAMP_MINUTE_PRECISION = 0x73;
+    public static final byte TIMESTAMP_SECOND_PRECISION = 0x74;
+    public static final byte TIMESTAMP_MILLIS_PRECISION = 0x75;
+    public static final byte TIMESTAMP_MICROS_PRECISION = 0x76;
+    public static final byte TIMESTAMP_NANOS_PRECISION = 0x77;
+    public static final byte TIMESTAMP_MINUTE_PRECISION_WITH_OFFSET = 0x78;
+    public static final byte TIMESTAMP_SECOND_PRECISION_WITH_OFFSET = 0x79;
+    public static final byte TIMESTAMP_MILLIS_PRECISION_WITH_OFFSET = 0x7A;
+    public static final byte TIMESTAMP_MICROS_PRECISION_WITH_OFFSET = 0x7B;
+    public static final byte TIMESTAMP_NANOS_PRECISION_WITH_OFFSET = 0x7C;
+    // 0x7D-0x7F Reserved
 
     public static final byte NULL_UNTYPED = (byte) 0xEA;
     public static final byte NULL_TYPED = (byte) 0xEB;
 
     public static final byte VARIABLE_LENGTH_INTEGER = (byte) 0xF5;
+    public static final byte VARIABLE_LENGTH_TIMESTAMP = (byte) 0xF7;
 }
diff --git a/src/com/amazon/ion/impl/bin/WriteBuffer.java b/src/com/amazon/ion/impl/bin/WriteBuffer.java
index 7bf7410275..d8bf4162fc 100644
--- a/src/com/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/com/amazon/ion/impl/bin/WriteBuffer.java
@@ -1438,7 +1438,7 @@ public static int fixedIntLength(final long value) {
      */
     public int writeFixedInt(final long value) {
         int numBytes = fixedIntLength(value);
-        return writeFixedIntOrUInt(value, numBytes);
+        return _writeFixedIntOrUInt(value, numBytes);
     }
 
     /** Get the length of FixedUInt for the provided value. */
@@ -1454,17 +1454,40 @@ public static int fixedUIntLength(final long value) {
      */
     public int writeFixedUInt(final long value) {
         if (value < 0) {
-            throw new IllegalArgumentException("Attempted to write a FlexUInt for " + value);
+            throw new IllegalArgumentException("Attempted to write a FixedUInt for " + value);
         }
         int numBytes = fixedUIntLength(value);
-        return writeFixedIntOrUInt(value, numBytes);
+        return _writeFixedIntOrUInt(value, numBytes);
     }
 
     /**
-     * Because the fixed int and fixed uint encodings are so similar, we can use this method to write either one as long
-     * as we provide the correct number of bytes needed to encode the value.
+     * Writes the bytes of a {@code long} as a {@code FixedInt} or {@code FixedUInt} using {@code numBytes} bytes.
+     * <p>
+     * {@code numBytes} should be an integer from 1 to 8 inclusive. If {@code numBytes} is out of bounds, that is a
+     * programmer error and will result in an IllegalArgumentException.
+     * <p>
+     * Because the {@code FixedInt} and {@code FixedUInt} encodings are so similar, we can use this method to write
+     * either one as long as we provide the correct number of bytes needed to encode the value.
+     * <p>
+     * Most of the time, you should not use this method. Instead, use {@link WriteBuffer#writeFixedInt} or
+     * {@link WriteBuffer#writeFixedUInt}, which calculate the minimum number of required bytes to represent the value.
+     * <p>
+     * You <i>should</i> use this method when the spec requires a {@code FixedInt} or {@code FixedUInt} of a specific
+     * size when it's possible that the value could fit in a smaller FixedInt or FixedUInt than the size required in
+     * the spec.
+     */
+    public int writeFixedIntOrUInt(final long value, final int numBytes) {
+        if (0 > numBytes || numBytes > 8) {
+            throw new IllegalArgumentException("numBytes is out of bounds; was " + numBytes);
+        }
+        return _writeFixedIntOrUInt(value, numBytes);
+    }
+
+    /**
+     * Because the {@code FixedInt} and {@code FixedUInt} encodings are so similar, we can use this method to write
+     * either one as long as we provide the correct number of bytes needed to encode the value.
      */
-    private int writeFixedIntOrUInt(final long value, final int numBytes) {
+    private int _writeFixedIntOrUInt(final long value, final int numBytes) {
         writeByte((byte) value);
         if (numBytes > 1) {
             writeByte((byte) (value >> 8));
diff --git a/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java b/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
index 4d26345d77..fd756db309 100644
--- a/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
+++ b/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
@@ -1,10 +1,14 @@
 package com.amazon.ion.impl.bin;
 
 import com.amazon.ion.IonType;
+import com.amazon.ion.Timestamp;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.converter.ArgumentConversionException;
+import org.junit.jupiter.params.converter.ConvertWith;
+import org.junit.jupiter.params.converter.TypedArgumentConverter;
 import org.junit.jupiter.params.provider.CsvSource;
 
 import java.io.ByteArrayOutputStream;
@@ -33,8 +37,8 @@ private byte[] bytes() {
     }
 
     /**
-     * Checks that the function writes the expected bytes and returns the expected
-     * count of written bytes for the given input value.
+     * Checks that the function writes the expected bytes and returns the expected count of written bytes for the
+     * given input value. The expected bytes should be a string of space-separated hexadecimal pairs.
      */
     private <T> void assertWritingValue(String expectedBytes, T value, BiFunction<WriteBuffer, T, Integer> writeOperation) {
         int numBytes = writeOperation.apply(buf, value);
@@ -42,6 +46,16 @@ private <T> void assertWritingValue(String expectedBytes, T value, BiFunction<Wr
         Assertions.assertEquals(byteLengthFromHexString(expectedBytes), numBytes);
     }
 
+    /**
+     * Checks that the function writes the expected bytes and returns the expected count of written bytes for the
+     * given input value. The expectedBytes should be a string of space-separated binary octets.
+     */
+    private <T> void assertWritingValueWithBinary(String expectedBytes, T value, BiFunction<WriteBuffer, T, Integer> writeOperation) {
+        int numBytes = writeOperation.apply(buf, value);
+        Assertions.assertEquals(expectedBytes, byteArrayToBitString(bytes()));
+        Assertions.assertEquals(byteLengthFromBitString(expectedBytes), numBytes);
+    }
+
     @ParameterizedTest
     @CsvSource({
             "     NULL, EA",
@@ -72,7 +86,7 @@ public void testWriteNullValueForDatagram() {
             "true, 5E",
             "false, 5F",
     })
-    public void testWriteBooleanValue(Boolean value, String expectedBytes) {
+    public void testWriteBooleanValue(boolean value, String expectedBytes) {
         assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeBoolValue);
     }
 
@@ -144,8 +158,8 @@ public void testWriteIntegerValue(long value, String expectedBytes) {
             "          -9223372036854775809, F5 13 FF FF FF FF FF FF FF 7F FF",
             "-99999999999999999999999999999, F5 1B 01 00 00 60 35 E8 8D 92 51 F0 E1 BC FE",
     })
-    public void testWriteIntegerValueForBigInteger(String value, String expectedBytes) {
-        assertWritingValue(expectedBytes, new BigInteger(value), IonEncoder_1_1::writeIntValue);
+    public void testWriteIntegerValueForBigInteger(BigInteger value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeIntValue);
     }
 
     @Test
@@ -205,6 +219,186 @@ public void testWriteFloatValueForDouble(double value, String expectedBytes) {
         assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeFloat);
     }
 
+    // Because timestamp subfields are smeared across bytes, it's easier to reason about them in 1s and 0s
+    // instead of hex digits
+    @ParameterizedTest
+    @CsvSource({
+            //                               OpCode   MYYYYYYY DDDDDMMM mmmHHHHH ssssUmmm ffffffss ffffffff ffffffff ffffffff
+            "2023-10-15T01:00Z,              01110011 00110101 01111101 00000001 00001000",
+            "2023-10-15T01:59Z,              01110011 00110101 01111101 01100001 00001111",
+            "2023-10-15T11:22Z,              01110011 00110101 01111101 11001011 00001010",
+            "2023-10-15T23:00Z,              01110011 00110101 01111101 00010111 00001000",
+            "2023-10-15T23:59Z,              01110011 00110101 01111101 01110111 00001111",
+            "2023-10-15T11:22:00Z,           01110100 00110101 01111101 11001011 00001010 00000000",
+            "2023-10-15T11:22:33Z,           01110100 00110101 01111101 11001011 00011010 00000010",
+            "2023-10-15T11:22:59Z,           01110100 00110101 01111101 11001011 10111010 00000011",
+            "2023-10-15T11:22:33.000Z,       01110101 00110101 01111101 11001011 00011010 00000010 00000000",
+            "2023-10-15T11:22:33.444Z,       01110101 00110101 01111101 11001011 00011010 11110010 00000110",
+            "2023-10-15T11:22:33.999Z,       01110101 00110101 01111101 11001011 00011010 10011110 00001111",
+            "2023-10-15T11:22:33.000000Z,    01110110 00110101 01111101 11001011 00011010 00000010 00000000 00000000",
+            "2023-10-15T11:22:33.444555Z,    01110110 00110101 01111101 11001011 00011010 00101110 00100010 00011011",
+            "2023-10-15T11:22:33.999999Z,    01110110 00110101 01111101 11001011 00011010 11111110 00001000 00111101",
+            "2023-10-15T11:22:33.000000000Z, 01110111 00110101 01111101 11001011 00011010 00000010 00000000 00000000 00000000",
+            "2023-10-15T11:22:33.444555666Z, 01110111 00110101 01111101 11001011 00011010 01001010 10000110 11111101 01101001",
+            "2023-10-15T11:22:33.999999999Z, 01110111 00110101 01111101 11001011 00011010 11111110 00100111 01101011 11101110",
+    })
+    public void testWriteTimestampValueWithUtcShortForm(@ConvertWith(StringToTimestamp.class) Timestamp value, String expectedBytes) {
+        assertWritingValueWithBinary(expectedBytes, value, IonEncoder_1_1::writeTimestampValue);
+    }
+
+
+    @ParameterizedTest
+    @CsvSource({
+            //                                    OpCode   MYYYYYYY DDDDDMMM mmmHHHHH ssssUmmm ffffffss ffffffff ffffffff ffffffff
+            "1970T,                               01110000 00000000",
+            "2023T,                               01110000 00110101",
+            "2097T,                               01110000 01111111",
+            "2023-01T,                            01110001 10110101 00000000",
+            "2023-10T,                            01110001 00110101 00000101",
+            "2023-12T,                            01110001 00110101 00000110",
+            "2023-10-01T,                         01110010 00110101 00001101",
+            "2023-10-15T,                         01110010 00110101 01111101",
+            "2023-10-31T,                         01110010 00110101 11111101",
+            "2023-10-15T01:00-00:00,              01110011 00110101 01111101 00000001 00000000",
+            "2023-10-15T01:59-00:00,              01110011 00110101 01111101 01100001 00000111",
+            "2023-10-15T11:22-00:00,              01110011 00110101 01111101 11001011 00000010",
+            "2023-10-15T23:00-00:00,              01110011 00110101 01111101 00010111 00000000",
+            "2023-10-15T23:59-00:00,              01110011 00110101 01111101 01110111 00000111",
+            "2023-10-15T11:22:00-00:00,           01110100 00110101 01111101 11001011 00000010 00000000",
+            "2023-10-15T11:22:33-00:00,           01110100 00110101 01111101 11001011 00010010 00000010",
+            "2023-10-15T11:22:59-00:00,           01110100 00110101 01111101 11001011 10110010 00000011",
+            "2023-10-15T11:22:33.000-00:00,       01110101 00110101 01111101 11001011 00010010 00000010 00000000",
+            "2023-10-15T11:22:33.444-00:00,       01110101 00110101 01111101 11001011 00010010 11110010 00000110",
+            "2023-10-15T11:22:33.999-00:00,       01110101 00110101 01111101 11001011 00010010 10011110 00001111",
+            "2023-10-15T11:22:33.000000-00:00,    01110110 00110101 01111101 11001011 00010010 00000010 00000000 00000000",
+            "2023-10-15T11:22:33.444555-00:00,    01110110 00110101 01111101 11001011 00010010 00101110 00100010 00011011",
+            "2023-10-15T11:22:33.999999-00:00,    01110110 00110101 01111101 11001011 00010010 11111110 00001000 00111101",
+            "2023-10-15T11:22:33.000000000-00:00, 01110111 00110101 01111101 11001011 00010010 00000010 00000000 00000000 00000000",
+            "2023-10-15T11:22:33.444555666-00:00, 01110111 00110101 01111101 11001011 00010010 01001010 10000110 11111101 01101001",
+            "2023-10-15T11:22:33.999999999-00:00, 01110111 00110101 01111101 11001011 00010010 11111110 00100111 01101011 11101110",
+    })
+    public void testWriteTimestampValueWithUnknownOffsetShortForm(@ConvertWith(StringToTimestamp.class) Timestamp value, String expectedBytes) {
+        assertWritingValueWithBinary(expectedBytes, value, IonEncoder_1_1::writeTimestampValue);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            //                                    OpCode   MYYYYYYY DDDDDMMM mmmHHHHH ooooommm ssssssoo ffffffff ffffffff ffffffff ..ffffff
+            "2023-10-15T01:00-14:00,              01111000 00110101 01111101 00000001 00000000 00000000",
+            "2023-10-15T01:00+14:00,              01111000 00110101 01111101 00000001 10000000 00000011",
+            "2023-10-15T01:00-01:15,              01111000 00110101 01111101 00000001 10011000 00000001",
+            "2023-10-15T01:00+01:15,              01111000 00110101 01111101 00000001 11101000 00000001",
+            "2023-10-15T01:59+01:15,              01111000 00110101 01111101 01100001 11101111 00000001",
+            "2023-10-15T11:22+01:15,              01111000 00110101 01111101 11001011 11101010 00000001",
+            "2023-10-15T23:00+01:15,              01111000 00110101 01111101 00010111 11101000 00000001",
+            "2023-10-15T23:59+01:15,              01111000 00110101 01111101 01110111 11101111 00000001",
+            "2023-10-15T11:22:00+01:15,           01111001 00110101 01111101 11001011 11101010 00000001",
+            "2023-10-15T11:22:33+01:15,           01111001 00110101 01111101 11001011 11101010 10000101",
+            "2023-10-15T11:22:59+01:15,           01111001 00110101 01111101 11001011 11101010 11101101",
+            "2023-10-15T11:22:33.000+01:15,       01111010 00110101 01111101 11001011 11101010 10000101 00000000 00000000",
+            "2023-10-15T11:22:33.444+01:15,       01111010 00110101 01111101 11001011 11101010 10000101 10111100 00000001",
+            "2023-10-15T11:22:33.999+01:15,       01111010 00110101 01111101 11001011 11101010 10000101 11100111 00000011",
+            "2023-10-15T11:22:33.000000+01:15,    01111011 00110101 01111101 11001011 11101010 10000101 00000000 00000000 00000000",
+            "2023-10-15T11:22:33.444555+01:15,    01111011 00110101 01111101 11001011 11101010 10000101 10001011 11001000 00000110",
+            "2023-10-15T11:22:33.999999+01:15,    01111011 00110101 01111101 11001011 11101010 10000101 00111111 01000010 00001111",
+            "2023-10-15T11:22:33.000000000+01:15, 01111100 00110101 01111101 11001011 11101010 10000101 00000000 00000000 00000000 00000000",
+            "2023-10-15T11:22:33.444555666+01:15, 01111100 00110101 01111101 11001011 11101010 10000101 10010010 01100001 01111111 00011010",
+            "2023-10-15T11:22:33.999999999+01:15, 01111100 00110101 01111101 11001011 11101010 10000101 11111111 11001001 10011010 00111011",
+
+    })
+    public void testWriteTimestampValueWithKnownOffsetShortForm(@ConvertWith(StringToTimestamp.class) Timestamp value, String expectedBytes) {
+        assertWritingValueWithBinary(expectedBytes, value, IonEncoder_1_1::writeTimestampValue);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            //                                    OpCode   Length   YYYYYYYY MMYYYYYY HDDDDDMM mmmmHHHH oooooomm ssoooooo ....ssss Coefficient+ Scale
+            "0001T,                               11110111 00000101 00000001 00000000",
+            "1947T,                               11110111 00000101 10011011 00000111",
+            "9999T,                               11110111 00000101 00001111 00100111",
+            "1947-01T,                            11110111 00000111 10011011 01000111 00000000",
+            "1947-12T,                            11110111 00000111 10011011 00000111 00000011",
+            "1947-01-01T,                         11110111 00000111 10011011 01000111 00000100",
+            "1947-12-23T,                         11110111 00000111 10011011 00000111 01011111",
+            "1947-12-31T,                         11110111 00000111 10011011 00000111 01111111",
+            "1947-12-23T00:00Z,                   11110111 00001101 10011011 00000111 01011111 00000000 10000000 00010110",
+            "1947-12-23T23:59Z,                   11110111 00001101 10011011 00000111 11011111 10111011 10000011 00010110",
+            "1947-12-23T23:59:00Z,                11110111 00001111 10011011 00000111 11011111 10111011 10000011 00010110 00000000",
+            "1947-12-23T23:59:59Z,                11110111 00001111 10011011 00000111 11011111 10111011 10000011 11010110 00001110",
+            "1947-12-23T23:59:00.0Z,              11110111 00010011 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00000001 00000001",
+            "1947-12-23T23:59:00.00Z,             11110111 00010011 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00000001 00000010",
+            "1947-12-23T23:59:00.000Z,            11110111 00010011 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00000001 00000011",
+            "1947-12-23T23:59:00.0000Z,           11110111 00010011 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00000001 00000100",
+            "1947-12-23T23:59:00.00000Z,          11110111 00010011 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00000001 00000101",
+            "1947-12-23T23:59:00.000000Z,         11110111 00010011 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00000001 00000110",
+            "1947-12-23T23:59:00.0000000Z,        11110111 00010011 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00000001 00000111",
+            "1947-12-23T23:59:00.00000000Z,       11110111 00010011 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00000001 00001000",
+            "1947-12-23T23:59:00.9Z,              11110111 00010011 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00010011 00000001",
+            "1947-12-23T23:59:00.99Z,             11110111 00010011 10011011 00000111 11011111 10111011 10000011 00010110 00000000 11000111 00000010",
+            "1947-12-23T23:59:00.999Z,            11110111 00010101 10011011 00000111 11011111 10111011 10000011 00010110 00000000 10011110 00001111 00000011",
+            "1947-12-23T23:59:00.9999Z,           11110111 00010101 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00111110 10011100 00000100",
+            "1947-12-23T23:59:00.99999Z,          11110111 00010111 10011011 00000111 11011111 10111011 10000011 00010110 00000000 11111100 00110100 00001100 00000101",
+            "1947-12-23T23:59:00.999999Z,         11110111 00010111 10011011 00000111 11011111 10111011 10000011 00010110 00000000 11111100 00010001 01111010 00000110",
+            "1947-12-23T23:59:00.9999999Z,        11110111 00011001 10011011 00000111 11011111 10111011 10000011 00010110 00000000 11111000 01100111 10001001 00001001 00000111",
+            "1947-12-23T23:59:00.99999999Z,       11110111 00011001 10011011 00000111 11011111 10111011 10000011 00010110 00000000 11111000 00001111 01011110 01011111 00001000",
+
+            "1947-12-23T23:59:00.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000Z, " +
+                    "11110111 00010011 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00000001 10001101",
+
+            "1947-12-23T23:59:00.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" +
+                    "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" +
+                    "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000Z, " +
+                    "11110111 00010101 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00000001 01101000 00000001",
+
+            "1947-12-23T23:59:00.999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999Z, " +
+                    "11110111 10010111 10011011 00000111 11011111 10111011 10000011 00010110 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 " +
+                    "11111100 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111 " +
+                    "11111111 10010100 10001001 01111001 01101100 11001110 01111000 11110010 01000000 01111101 10100110 11000111 10101000 01000110 01011001 01110001 01001101 " +
+                    "00100000 11110101 01101110 01111010 00001100 00001001 11101111 01111111 11110011 00011110 00010100 11010111 01101000 01110111 10101100 01101100 10001110 " +
+                    "00110010 10110111 10000010 11110010 00110110 01101000 11110010 10100111 10001101",
+
+
+            // Offsets
+            "2048-01-01T01:01-23:59,              11110111 00001101 00000000 01001000 10000100 00010000 00000100 00000000",
+            "2048-01-01T01:01-00:02,              11110111 00001101 00000000 01001000 10000100 00010000 01111000 00010110",
+            "2048-01-01T01:01-00:01,              11110111 00001101 00000000 01001000 10000100 00010000 01111100 00010110",
+            "2048-01-01T01:01-00:00,              11110111 00001101 00000000 01001000 10000100 00010000 11111100 00111111",
+            "2048-01-01T01:01+00:00,              11110111 00001101 00000000 01001000 10000100 00010000 10000000 00010110",
+            "2048-01-01T01:01+00:01,              11110111 00001101 00000000 01001000 10000100 00010000 10000100 00010110",
+            "2048-01-01T01:01+00:02,              11110111 00001101 00000000 01001000 10000100 00010000 10001000 00010110",
+            "2048-01-01T01:01+23:59,              11110111 00001101 00000000 01001000 10000100 00010000 11111100 00101100",
+    })
+    public void testWriteTimestampValueLongForm(@ConvertWith(StringToTimestamp.class) Timestamp value, String expectedBytes) {
+        assertWritingValueWithBinary(expectedBytes, value, IonEncoder_1_1::writeLongFormTimestampValue);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            // Long form because it's out of the year range
+            "0001T,                               11110111 00000101 00000001 00000000",
+            "9999T,                               11110111 00000101 00001111 00100111",
+
+            // Long form because the offset is too high/low
+            "2048-01-01T01:01+14:15,              11110111 00001101 00000000 01001000 10000100 00010000 11011100 00100011",
+            "2048-01-01T01:01-14:15,              11110111 00001101 00000000 01001000 10000100 00010000 00100100 00001001",
+
+            // Long form because the offset is not a multiple of 15
+            "2048-01-01T01:01+00:01,              11110111 00001101 00000000 01001000 10000100 00010000 10000100 00010110",
+
+            // Long form because the fractional seconds are millis, micros, or nanos
+            "2023-12-31T23:59:00.0Z,              11110111 00010011 11100111 00000111 11111111 10111011 10000011 00010110 00000000 00000001 00000001",
+    })
+    public void testWriteTimestampDelegatesCorrectlyToLongForm(@ConvertWith(StringToTimestamp.class) Timestamp value, String expectedBytes) {
+        assertWritingValueWithBinary(expectedBytes, value, IonEncoder_1_1::writeTimestampValue);
+    }
+
+    @Test
+    public void testWriteTimestampValueForNullTimestamp() {
+        int numBytes = IonEncoder_1_1.writeTimestampValue(buf, null);
+        Assertions.assertEquals("EB 04", byteArrayToHex(bytes()));
+        Assertions.assertEquals(2, numBytes);
+    }
+
     /**
      * Utility method to make it easier to write test cases that assert specific sequences of bytes.
      */
@@ -222,4 +416,45 @@ private static String byteArrayToHex(byte[] bytes) {
     private static int byteLengthFromHexString(String hexString) {
         return (hexString.replaceAll("[^\\dA-F]", "").length() - 1) / 2 + 1;
     }
+
+    /**
+     * Converts a byte array to a string of bits, such as "00110110 10001001".
+     * The purpose of this method is to make it easier to read and write test assertions.
+     */
+    private static String byteArrayToBitString(byte[] bytes) {
+        StringBuilder s = new StringBuilder();
+        for (byte aByte : bytes) {
+            for (int bit = 7; bit >= 0; bit--) {
+                if (((0x01 << bit) & aByte) != 0) {
+                    s.append("1");
+                } else {
+                    s.append("0");
+                }
+            }
+            s.append(" ");
+        }
+        return s.toString().trim();
+    }
+
+    /**
+     * Determines the number of bytes needed to represent a series of hexadecimal digits.
+     */
+    private static int byteLengthFromBitString(String bitString) {
+        return (bitString.replaceAll("[^01]", "").length() - 1) / 8 + 1;
+    }
+
+    /**
+     * Converts a String to a Timestamp for a @Parameterized test
+     */
+    static class StringToTimestamp extends TypedArgumentConverter<String, Timestamp> {
+        protected StringToTimestamp() {
+            super(String.class, Timestamp.class);
+        }
+
+        @Override
+        protected Timestamp convert(String source) throws ArgumentConversionException {
+            if (source == null) return null;
+            return Timestamp.valueOf(source);
+        }
+    }
 }
diff --git a/test/com/amazon/ion/impl/bin/WriteBufferTest.java b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
index a46e4c2c75..1a8e83b80f 100644
--- a/test/com/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/test/com/amazon/ion/impl/bin/WriteBufferTest.java
@@ -24,7 +24,6 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Arrays;
 import org.junit.jupiter.api.Test;
@@ -1620,6 +1619,37 @@ public void testWriteFixedUIntForNegativeNumber() {
         Assertions.assertThrows(IllegalArgumentException.class, () -> buf.writeFixedUInt(-1));
     }
 
+    @ParameterizedTest
+    @CsvSource({
+            "                   0, 1, 00000000",
+            "                   0, 2, 00000000 00000000",
+            "                   0, 8, 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000",
+            "                   1, 1, 00000001",
+            "                   1, 2, 00000001 00000000",
+            "                   1, 8, 00000001 00000000 00000000 00000000 00000000 00000000 00000000 00000000",
+            "                 255, 1, 11111111",
+            "                 255, 2, 11111111 00000000",
+            "                 255, 3, 11111111 00000000 00000000",
+            "                  -1, 1, 11111111",
+            "                  -1, 2, 11111111 11111111",
+            "                  -1, 8, 11111111 11111111 11111111 11111111 11111111 11111111 11111111 11111111",
+            // Long.MIN_VALUE and Long.MAX_VALUE
+            " 9223372036854775807, 8, 11111111 11111111 11111111 11111111 11111111 11111111 11111111 01111111",
+            "-9223372036854775808, 8, 00000000 00000000 00000000 00000000 00000000 00000000 00000000 10000000",
+    })
+    public void testWriteFixedIntOrUInt(long value, int numBytes, String expectedBits) {
+        int actualNumBytes = buf.writeFixedIntOrUInt(value, numBytes);
+        String actualBits = byteArrayToBitString(bytes());
+        Assertions.assertEquals(expectedBits, actualBits);
+        Assertions.assertEquals(numBytes, actualNumBytes);
+    }
+
+    @Test
+    public void testWriteFixedIntOrUIntThrowsExceptionWhenNumBytesIsOutOfBounds() {
+        Assertions.assertThrows(IllegalArgumentException.class, () -> buf.writeFixedIntOrUInt(0, -1));
+        Assertions.assertThrows(IllegalArgumentException.class, () -> buf.writeFixedIntOrUInt(0, 9));
+    }
+
     /**
      * Converts a byte array to a string of bits, such as "00110110 10001001".
      * The purpose of this method is to make it easier to read and write test assertions.

From 4bebe46e1fd4a06229126b5684fdfab1b49db014 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Tue, 14 Nov 2023 09:09:57 -0800
Subject: [PATCH 312/490] Adds support for writing Ion 1.1 decimal binary
 encoding (#636)

---
 .../amazon/ion/impl/bin/IonEncoder_1_1.java   | 45 ++++++++++++
 src/com/amazon/ion/impl/bin/OpCodes.java      |  3 +-
 .../ion/impl/bin/IonEncoder_1_1Test.java      | 71 +++++++++++++++++++
 3 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java b/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
index fe379df851..11218dc8cd 100644
--- a/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
+++ b/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
@@ -1,5 +1,6 @@
 package com.amazon.ion.impl.bin;
 
+import com.amazon.ion.Decimal;
 import com.amazon.ion.IonType;
 import com.amazon.ion.Timestamp;
 
@@ -158,6 +159,50 @@ public static int writeFloat(WriteBuffer buffer, final double value) {
         }
     }
 
+    public static int writeDecimalValue(WriteBuffer buffer, final BigDecimal value) {
+        if (value == null) {
+            return writeNullValue(buffer, IonType.DECIMAL);
+        }
+
+        int exponent = -value.scale();
+
+        if (BigDecimal.ZERO.compareTo(value) == 0 && !Decimal.isNegativeZero(value)) {
+            if (exponent == 0) {
+                buffer.writeByte(OpCodes.DECIMAL_ZERO_LENGTH);
+                return 1;
+            } else {
+                // A decimal with a coefficient of +0 is encoded using opcode 6F.
+                // The opcode is followed by a FlexInt representing the exponent.
+                buffer.writeByte(OpCodes.POSITIVE_ZERO_DECIMAL);
+                return 1 + buffer.writeFlexInt(exponent);
+            }
+        }
+
+        BigInteger coefficient = value.unscaledValue();
+        int numCoefficientBytes = WriteBuffer.flexIntLength(coefficient);
+
+        int numExponentBytes = 0;
+        if (exponent != 0) {
+            numExponentBytes = WriteBuffer.fixedIntLength(exponent);
+        }
+
+        int opCodeAndLengthBytes = 1;
+        if (numExponentBytes + numCoefficientBytes < 15) {
+            int opCode = OpCodes.DECIMAL_ZERO_LENGTH + numExponentBytes + numCoefficientBytes;
+            buffer.writeByte((byte) opCode);
+        } else {
+            // Decimal values that require more than 14 bytes can be encoded using the variable-length decimal opcode: 0xF6.
+            buffer.writeByte(OpCodes.VARIABLE_LENGTH_DECIMAL);
+            opCodeAndLengthBytes += buffer.writeFlexUInt(numExponentBytes + numCoefficientBytes);
+        }
+        buffer.writeFlexInt(coefficient);
+        if (exponent != 0) {
+            buffer.writeFixedInt(exponent);
+        }
+
+        return opCodeAndLengthBytes + numCoefficientBytes + numExponentBytes;
+    }
+
     /**
      * Writes a Timestamp to the given WriteBuffer using the Ion 1.1 encoding for Ion Timestamps.
      * @return the number of bytes written
diff --git a/src/com/amazon/ion/impl/bin/OpCodes.java b/src/com/amazon/ion/impl/bin/OpCodes.java
index 4e3f3c6468..ecfc14e8b0 100644
--- a/src/com/amazon/ion/impl/bin/OpCodes.java
+++ b/src/com/amazon/ion/impl/bin/OpCodes.java
@@ -18,7 +18,7 @@ private OpCodes() {}
 
     public static final byte DECIMAL_ZERO_LENGTH = 0x60;
     // 0x61-0x6E are additional lengths of decimals.
-    public static final byte NEGATIVE_ZERO_DECIMAL = 0x6F;
+    public static final byte POSITIVE_ZERO_DECIMAL = 0x6F;
 
     public static final byte TIMESTAMP_YEAR_PRECISION = 0x70;
     public static final byte TIMESTAMP_MONTH_PRECISION = 0x71;
@@ -39,5 +39,6 @@ private OpCodes() {}
     public static final byte NULL_TYPED = (byte) 0xEB;
 
     public static final byte VARIABLE_LENGTH_INTEGER = (byte) 0xF5;
+    public static final byte VARIABLE_LENGTH_DECIMAL = (byte) 0xF6;
     public static final byte VARIABLE_LENGTH_TIMESTAMP = (byte) 0xF7;
 }
diff --git a/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java b/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
index fd756db309..2f25adb22b 100644
--- a/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
+++ b/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
@@ -1,5 +1,6 @@
 package com.amazon.ion.impl.bin;
 
+import com.amazon.ion.Decimal;
 import com.amazon.ion.IonType;
 import com.amazon.ion.Timestamp;
 import org.junit.jupiter.api.Assertions;
@@ -219,6 +220,61 @@ public void testWriteFloatValueForDouble(double value, String expectedBytes) {
         assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeFloat);
     }
 
+    @ParameterizedTest
+    @CsvSource({
+            "                           0., 60",
+            "                          0e1, 6F 03",
+            "                         0e63, 6F 7F",
+            "                         0e99, 6F 8E 01",
+            "                          0.0, 6F FF",
+            "                         0.00, 6F FD",
+            "                        0.000, 6F FB",
+            "                        0e-64, 6F 81",
+            "                        0e-99, 6F 76 FE",
+            "                          -0., 61 01",
+            "                         -0e1, 62 01 01",
+            "                         -0e3, 62 01 03",
+            "                       -0e127, 62 01 7F",
+            "                       -0e199, 63 01 C7 00",
+            "                        -0e-1, 62 01 FF",
+            "                        -0e-2, 62 01 FE",
+            "                        -0e-3, 62 01 FD",
+            "                      -0e-127, 62 01 81",
+            "                      -0e-199, 63 01 39 FF",
+            "                         0.01, 62 03 FE",
+            "                          0.1, 62 03 FF",
+            "                            1, 61 03",
+            "                          1e1, 62 03 01",
+            "                          1e2, 62 03 02",
+            "                        1e127, 62 03 7F",
+            "                        1e128, 63 03 80 00",
+            "                      1e65536, 64 03 00 00 01",
+            "                            2, 61 05",
+            "                            7, 61 0F",
+            "                           14, 61 1D",
+            "                          1.0, 62 15 FF",
+            "                         1.00, 63 92 01 FE",
+            "                         1.27, 63 FE 01 FE",
+            "                        3.142, 63 1A 31 FD",
+            "                      3.14159, 64 7C 59 26 FB",
+            "                     3.141593, 65 98 FD FE 02 FA",
+            "                  3.141592653, 66 B0 C9 1C 68 17 F7",
+            "                3.14159265359, 67 E0 93 7D 56 49 12 F5",
+            "           3.1415926535897932, 69 80 4C 43 76 65 9E 9C 6F F0",
+            "  3.1415926535897932384626434, 6E 00 50 E0 DC F7 CC D6 08 48 99 92 3F 03 E7",
+            "3.141592653589793238462643383, F6 1F 00 E0 2D 8F A4 21 D0 E7 46 C0 87 AA 89 02 E5",
+    })
+    public void testWriteDecimalValue(@ConvertWith(StringToDecimal.class) Decimal value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeDecimalValue);
+    }
+
+    @Test
+    public void testWriteDecimalValueForNull() {
+        int numBytes = IonEncoder_1_1.writeDecimalValue(buf, null);
+        Assertions.assertEquals("EB 03", byteArrayToHex(bytes()));
+        Assertions.assertEquals(2, numBytes);
+    }
+
     // Because timestamp subfields are smeared across bytes, it's easier to reason about them in 1s and 0s
     // instead of hex digits
     @ParameterizedTest
@@ -457,4 +513,19 @@ protected Timestamp convert(String source) throws ArgumentConversionException {
             return Timestamp.valueOf(source);
         }
     }
+
+    /**
+     * Converts a String to a Decimal for a @Parameterized test
+     */
+    static class StringToDecimal extends TypedArgumentConverter<String, Decimal> {
+        protected StringToDecimal() {
+            super(String.class, Decimal.class);
+        }
+
+        @Override
+        protected Decimal convert(String source) throws ArgumentConversionException {
+            if (source == null) return null;
+            return Decimal.valueOf(source);
+        }
+    }
 }

From b08cbc415fb3f0f57d2ecf6e193b655a0937eb68 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Tue, 14 Nov 2023 13:45:44 -0800
Subject: [PATCH 313/490] Adds support for text and lob types and some
 annotations (#637)

---
 .../amazon/ion/impl/bin/IonEncoder_1_1.java   | 128 ++++++++++++
 .../ion/impl/bin/Ion_1_1_Constants.java       |   3 +
 src/com/amazon/ion/impl/bin/OpCodes.java      |  20 ++
 .../ion/impl/bin/IonEncoder_1_1Test.java      | 196 +++++++++++++++++-
 4 files changed, 345 insertions(+), 2 deletions(-)

diff --git a/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java b/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
index 11218dc8cd..7b1ca9d4b2 100644
--- a/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
+++ b/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
@@ -1,11 +1,15 @@
 package com.amazon.ion.impl.bin;
 
 import com.amazon.ion.Decimal;
+import com.amazon.ion.IonText;
 import com.amazon.ion.IonType;
 import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl.bin.utf8.Utf8StringEncoder;
+import com.amazon.ion.impl.bin.utf8.Utf8StringEncoderPool;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
 
 import static com.amazon.ion.impl.bin.Ion_1_1_Constants.*;
 import static java.lang.Double.doubleToRawLongBits;
@@ -428,4 +432,128 @@ static int writeLongFormTimestampValue(WriteBuffer buffer, Timestamp value) {
         return 1 + WriteBuffer.flexUIntLength(dataLength) + dataLength;
     }
 
+    /**
+     * Writes a String to the given WriteBuffer using the Ion 1.1 encoding for Ion Strings.
+     * @return the number of bytes written
+     */
+    public static int writeStringValue(WriteBuffer buffer, String value) {
+        return writeInlineText(buffer, value, IonType.STRING, OpCodes.STRING_ZERO_LENGTH, OpCodes.VARIABLE_LENGTH_STRING);
+    }
+
+    /**
+     * Writes an inline Symbol to the given WriteBuffer using the Ion 1.1 encoding for Ion Symbols.
+     * @return the number of bytes written
+     */
+    public static int writeSymbolValue(WriteBuffer buffer, String value) {
+        return writeInlineText(buffer, value, IonType.SYMBOL, OpCodes.INLINE_SYMBOL_ZERO_LENGTH, OpCodes.VARIABLE_LENGTH_INLINE_SYMBOL);
+    }
+
+    private static int writeInlineText(WriteBuffer buffer, String value, IonType type, byte zeroLengthOpCode, byte variableLengthOpCode) {
+        if (value == null) {
+            return writeNullValue(buffer, type);
+        }
+
+        // TODO: When merging into the Ion 1.1 raw writer, keep a single instance of the Utf8StringEncoder
+        //       instead of fetching one on every call.
+        Utf8StringEncoder.Result encoderResult = Utf8StringEncoderPool.getInstance().getOrCreate().encode(value);
+
+        byte[] utf8Buffer = encoderResult.getBuffer();
+        int numValueBytes = encoderResult.getEncodedLength();
+        int numLengthBytes = 0;
+
+        if (numValueBytes <= 0xF) {
+            buffer.writeByte((byte)(zeroLengthOpCode | numValueBytes));
+        } else {
+            buffer.writeByte(variableLengthOpCode);
+            numLengthBytes = buffer.writeFlexUInt(numValueBytes);
+        }
+        buffer.writeBytes(utf8Buffer, 0, numValueBytes);
+        return 1 + numLengthBytes + numValueBytes;
+    }
+
+    /**
+     * Writes an interned Symbol's address to the given WriteBuffer using the Ion 1.1 encoding for Ion Symbols.
+     * @return the number of bytes written
+     *
+     * TODO: Do we need to support Symbol Addresses greater than Long.MAX_VALUE?
+     */
+    public static int writeSymbolValue(WriteBuffer buffer, long value) {
+        if (value < 0) {
+            throw new IllegalArgumentException("Symbol Address cannot be negative; was: " + value);
+        } else if (value < FIRST_2_BYTE_SYMBOL_ADDRESS) {
+            buffer.writeByte(OpCodes.SYMBOL_ADDRESS_1_BYTE);
+            buffer.writeFixedUInt(value);
+            return 2;
+        } else if (value < FIRST_MANY_BYTE_SYMBOL_ADDRESS) {
+            buffer.writeByte(OpCodes.SYMBOL_ADDRESS_2_BYTES);
+            buffer.writeFixedIntOrUInt(value - FIRST_2_BYTE_SYMBOL_ADDRESS, 2);
+            return 3;
+        } else {
+            buffer.writeByte(OpCodes.SYMBOL_ADDRESS_MANY_BYTES);
+            int addressBytes = buffer.writeFlexUInt(value - FIRST_MANY_BYTE_SYMBOL_ADDRESS);
+            return 1 + addressBytes;
+        }
+    }
+
+    /**
+     * Writes a Blob to the given WriteBuffer using the Ion 1.1 encoding for Ion Blobs.
+     * @return the number of bytes written
+     */
+    public static int writeBlobValue(WriteBuffer buffer, byte[] value) {
+        if (value == null) {
+            return writeNullValue(buffer, IonType.BLOB);
+        }
+
+        buffer.writeByte(OpCodes.VARIABLE_LENGTH_BLOB);
+        int numLengthBytes = buffer.writeFlexUInt(value.length);
+        buffer.writeBytes(value);
+        return 1 + numLengthBytes + value.length;
+    }
+
+    /**
+     * Writes a Clob to the given WriteBuffer using the Ion 1.1 encoding for Ion Clobs.
+     * @return the number of bytes written
+     */
+    public static int writeClobValue(WriteBuffer buffer, byte[] value) {
+        if (value == null) {
+            return writeNullValue(buffer, IonType.CLOB);
+        }
+
+        buffer.writeByte(OpCodes.VARIABLE_LENGTH_CLOB);
+        int numLengthBytes = buffer.writeFlexUInt(value.length);
+        buffer.writeBytes(value);
+        return 1 + numLengthBytes + value.length;
+    }
+
+    // TODO: Implement FlexSym Annotations
+
+    /**
+     * Writes annotations using the given symbol addresses.
+     */
+    public static int writeAnnotations(WriteBuffer buffer, long[] annotations) {
+        if (annotations == null || annotations.length == 0) {
+            return 0;
+        }
+        if (annotations.length == 1) {
+            buffer.writeByte(OpCodes.ANNOTATIONS_1_SYMBOL_ADDRESS);
+            int numAddressBytes = buffer.writeFlexUInt(annotations[0]);
+            return 1 + numAddressBytes;
+        } else if (annotations.length == 2) {
+            buffer.writeByte(OpCodes.ANNOTATIONS_2_SYMBOL_ADDRESS);
+            int numAddressBytes = buffer.writeFlexUInt(annotations[0]);
+            numAddressBytes += buffer.writeFlexUInt(annotations[1]);
+            return 1 + numAddressBytes;
+        } else {
+            int numAddressBytes = 0;
+            for (long ann : annotations) {
+                numAddressBytes += WriteBuffer.flexUIntLength(ann);
+            }
+            buffer.writeByte(OpCodes.ANNOTATIONS_MANY_SYMBOL_ADDRESS);
+            int numLengthBytes = buffer.writeFlexUInt(numAddressBytes);
+            for (long ann : annotations) {
+                buffer.writeFlexUInt(ann);
+            }
+            return 1 + numLengthBytes + numAddressBytes;
+        }
+    }
 }
diff --git a/src/com/amazon/ion/impl/bin/Ion_1_1_Constants.java b/src/com/amazon/ion/impl/bin/Ion_1_1_Constants.java
index 91a7647042..8df501b349 100644
--- a/src/com/amazon/ion/impl/bin/Ion_1_1_Constants.java
+++ b/src/com/amazon/ion/impl/bin/Ion_1_1_Constants.java
@@ -6,6 +6,9 @@
 public class Ion_1_1_Constants {
     private Ion_1_1_Constants() {}
 
+    static final int FIRST_2_BYTE_SYMBOL_ADDRESS = 256;
+    static final int FIRST_MANY_BYTE_SYMBOL_ADDRESS = 65792;
+
     //////// Timestamp Field Constants ////////
 
     // S_TIMESTAMP_* is applicable to all short-form timestamps
diff --git a/src/com/amazon/ion/impl/bin/OpCodes.java b/src/com/amazon/ion/impl/bin/OpCodes.java
index ecfc14e8b0..a84c4bc853 100644
--- a/src/com/amazon/ion/impl/bin/OpCodes.java
+++ b/src/com/amazon/ion/impl/bin/OpCodes.java
@@ -35,10 +35,30 @@ private OpCodes() {}
     public static final byte TIMESTAMP_NANOS_PRECISION_WITH_OFFSET = 0x7C;
     // 0x7D-0x7F Reserved
 
+    public static final byte STRING_ZERO_LENGTH = (byte) 0x80;
+
+    public static final byte INLINE_SYMBOL_ZERO_LENGTH = (byte) 0x90;
+
+    public static final byte SYMBOL_ADDRESS_1_BYTE = (byte) 0xE1;
+    public static final byte SYMBOL_ADDRESS_2_BYTES = (byte) 0xE2;
+    public static final byte SYMBOL_ADDRESS_MANY_BYTES = (byte) 0xE3;
+    public static final byte ANNOTATIONS_1_SYMBOL_ADDRESS = (byte) 0xE4;
+    public static final byte ANNOTATIONS_2_SYMBOL_ADDRESS = (byte) 0xE5;
+    public static final byte ANNOTATIONS_MANY_SYMBOL_ADDRESS = (byte) 0xE6;
+    public static final byte ANNOTATIONS_1_FLEX_SYM = (byte) 0xE7;
+    public static final byte ANNOTATIONS_2_FLEX_SYM = (byte) 0xE8;
+    public static final byte ANNOTATIONS_MANY_FLEX_SYM = (byte) 0xE9;
     public static final byte NULL_UNTYPED = (byte) 0xEA;
     public static final byte NULL_TYPED = (byte) 0xEB;
+    // 0xEC, 0xED NOP
+    // 0xEE Reserved
+    // 0xEF System Macro Invocation
 
     public static final byte VARIABLE_LENGTH_INTEGER = (byte) 0xF5;
     public static final byte VARIABLE_LENGTH_DECIMAL = (byte) 0xF6;
     public static final byte VARIABLE_LENGTH_TIMESTAMP = (byte) 0xF7;
+    public static final byte VARIABLE_LENGTH_STRING = (byte) 0xF8;
+    public static final byte VARIABLE_LENGTH_INLINE_SYMBOL = (byte) 0xF9;
+    public static final byte VARIABLE_LENGTH_BLOB = (byte) 0xFE;
+    public static final byte VARIABLE_LENGTH_CLOB = (byte) 0xFF;
 }
diff --git a/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java b/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
index 2f25adb22b..478433660c 100644
--- a/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
+++ b/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
@@ -1,5 +1,6 @@
 package com.amazon.ion.impl.bin;
 
+import com.amazon.ion.BitUtils;
 import com.amazon.ion.Decimal;
 import com.amazon.ion.IonType;
 import com.amazon.ion.Timestamp;
@@ -15,6 +16,10 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.math.BigInteger;
+import java.nio.charset.CharsetEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.function.BiFunction;
 
 public class IonEncoder_1_1Test {
@@ -47,6 +52,16 @@ private <T> void assertWritingValue(String expectedBytes, T value, BiFunction<Wr
         Assertions.assertEquals(byteLengthFromHexString(expectedBytes), numBytes);
     }
 
+    /**
+     * Checks that the function writes the expected bytes and returns the expected count of written bytes for the
+     * given input value. The expected bytes should be a string of space-separated hexadecimal pairs.
+     */
+    private <T> void assertWritingValue(byte[] expectedBytes, T value, BiFunction<WriteBuffer, T, Integer> writeOperation) {
+        int numBytes = writeOperation.apply(buf, value);
+        Assertions.assertEquals(expectedBytes, bytes());
+        Assertions.assertEquals(expectedBytes.length, numBytes);
+    }
+
     /**
      * Checks that the function writes the expected bytes and returns the expected count of written bytes for the
      * given input value. The expectedBytes should be a string of space-separated binary octets.
@@ -455,6 +470,127 @@ public void testWriteTimestampValueForNullTimestamp() {
         Assertions.assertEquals(2, numBytes);
     }
 
+    @ParameterizedTest
+    @CsvSource({
+            "'', 80",
+            "'a', 81 61",
+            "'ab', 82 61 62",
+            "'abc', 83 61 62 63",
+            "'fourteen bytes', 8E 66 6F 75 72 74 65 65 6E 20 62 79 74 65 73",
+            "'this has sixteen', F8 21 74 68 69 73 20 68 61 73 20 73 69 78 74 65 65 6E",
+            "'variable length encoding', F8 31 76 61 72 69 61 62 6C 65 20 6C 65 6E 67 74 68 20 65 6E 63 6F 64 69 6E 67",
+    })
+    public void testWriteStringValue(String value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeStringValue);
+    }
+
+    @Test
+    public void testWriteStringValueForNull() {
+        int numBytes = IonEncoder_1_1.writeStringValue(buf, null);
+        Assertions.assertEquals("EB 05", byteArrayToHex(bytes()));
+        Assertions.assertEquals(2, numBytes);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "'', 90",
+            "'a', 91 61",
+            "'ab', 92 61 62",
+            "'abc', 93 61 62 63",
+            "'fourteen bytes', 9E 66 6F 75 72 74 65 65 6E 20 62 79 74 65 73",
+            "'this has sixteen', F9 21 74 68 69 73 20 68 61 73 20 73 69 78 74 65 65 6E",
+            "'variable length encoding', F9 31 76 61 72 69 61 62 6C 65 20 6C 65 6E 67 74 68 20 65 6E 63 6F 64 69 6E 67",
+    })
+    public void testWriteSymbolValue(String value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeSymbolValue);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "0,                   E1 00",
+            "1,                   E1 01",
+            "255,                 E1 FF",
+            "256,                 E2 00 00",
+            "257,                 E2 01 00",
+            "512,                 E2 00 01",
+            "513,                 E2 01 01",
+            "65535,               E2 FF FE",
+            "65791,               E2 FF FF",
+            "65792,               E3 01",
+            "65793,               E3 03",
+            "65919,               E3 FF",
+            "65920,               E3 02 02",
+            "9223372036854775807, E3 00 FF FD FD FF FF FF FF FF"
+    })
+    public void testWriteSymbolValue(long value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeSymbolValue);
+    }
+
+    @Test
+    public void testWriteSymbolValueForNull() {
+        int numBytes = IonEncoder_1_1.writeSymbolValue(buf, null);
+        Assertions.assertEquals("EB 06", byteArrayToHex(bytes()));
+        Assertions.assertEquals(2, numBytes);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "'', FE 01", //
+            "20, FE 03 20",
+            "49 20 61 70 70 6C 61 75 64 20 79 6F 75 72 20 63 75 72 69 6F 73 69 74 79, " +
+                    "FE 31 49 20 61 70 70 6C 61 75 64 20 79 6F 75 72 20 63 75 72 69 6F 73 69 74 79"
+    })
+    public void testWriteBlobValue(@ConvertWith(HexStringToByteArray.class) byte[] value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeBlobValue);
+    }
+
+    @Test
+    public void testWriteBlobValueForNull() {
+        int numBytes = IonEncoder_1_1.writeBlobValue(buf, null);
+        Assertions.assertEquals("EB 07", byteArrayToHex(bytes()));
+        Assertions.assertEquals(2, numBytes);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "'', FF 01",
+            "20, FF 03 20",
+            "49 20 61 70 70 6C 61 75 64 20 79 6F 75 72 20 63 75 72 69 6F 73 69 74 79, " +
+                    "FF 31 49 20 61 70 70 6C 61 75 64 20 79 6F 75 72 20 63 75 72 69 6F 73 69 74 79"
+    })
+    public void testWriteClobValue(@ConvertWith(HexStringToByteArray.class) byte[] value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeClobValue);
+    }
+
+    @Test
+    public void testWriteClobValueForNull() {
+        int numBytes = IonEncoder_1_1.writeClobValue(buf, null);
+        Assertions.assertEquals("EB 08", byteArrayToHex(bytes()));
+        Assertions.assertEquals(2, numBytes);
+    }
+
+    @ParameterizedTest
+    @CsvSource({
+            "            '', ''", // Empty array of annotations
+            "            $0, E4 01",
+            "           $10, E4 15",
+            "          $256, E4 02 04",
+            "       $10 $11, E5 15 17",
+            "     $256 $257, E5 02 04 06 04",
+            "   $10 $11 $12, E6 07 15 17 19",
+            "$256 $257 $258, E6 0D 02 04 06 04 0A 04",
+    })
+    public void testWriteAnnotations(@ConvertWith(SymbolIdsToLongArray.class) long[] value, String expectedBytes) {
+        assertWritingValue(expectedBytes, value, IonEncoder_1_1::writeAnnotations);
+    }
+
+    @Test
+    public void testWriteAnnotationsForNull() {
+        int numBytes = IonEncoder_1_1.writeAnnotations(buf, null);
+        Assertions.assertEquals("", byteArrayToHex(bytes()));
+        Assertions.assertEquals(0, numBytes);
+    }
+
     /**
      * Utility method to make it easier to write test cases that assert specific sequences of bytes.
      */
@@ -470,7 +606,7 @@ private static String byteArrayToHex(byte[] bytes) {
      * Determines the number of bytes needed to represent a series of hexadecimal digits.
      */
     private static int byteLengthFromHexString(String hexString) {
-        return (hexString.replaceAll("[^\\dA-F]", "").length() - 1) / 2 + 1;
+        return (hexString.replaceAll("[^\\dA-F]", "").length()) / 2;
     }
 
     /**
@@ -496,7 +632,7 @@ private static String byteArrayToBitString(byte[] bytes) {
      * Determines the number of bytes needed to represent a series of hexadecimal digits.
      */
     private static int byteLengthFromBitString(String bitString) {
-        return (bitString.replaceAll("[^01]", "").length() - 1) / 8 + 1;
+        return (bitString.replaceAll("[^01]", "").length()) / 8;
     }
 
     /**
@@ -528,4 +664,60 @@ protected Decimal convert(String source) throws ArgumentConversionException {
             return Decimal.valueOf(source);
         }
     }
+
+    /**
+     * Converts a Hex String to a Byte Array for a @Parameterized test
+     */
+    static class HexStringToByteArray extends TypedArgumentConverter<String, byte[]> {
+
+        private static final CharsetEncoder ASCII_ENCODER =  StandardCharsets.US_ASCII.newEncoder();
+
+        protected HexStringToByteArray() {
+            super(String.class, byte[].class);
+        }
+
+        @Override
+        protected byte[] convert(String source) throws ArgumentConversionException {
+            if (source == null) return null;
+            if (source.trim().isEmpty()) return new byte[0];
+            String[] octets = source.split(" ");
+            byte[] result = new byte[octets.length];
+            for (int i = 0; i < octets.length; i++) {
+                if (octets[i].length() == 1) {
+                    char c = octets[i].charAt(0);
+                    if (!ASCII_ENCODER.canEncode(c)) {
+                        throw new IllegalArgumentException("Cannot convert non-ascii character: " + c);
+                    }
+                    result[i] = (byte) c;
+                } else {
+                    result[i] = (byte) Integer.parseInt(octets[i], 16);
+                }
+            }
+            return result;
+        }
+    }
+
+    /**
+     * Converts a String of symbol ids to a long[] for a @Parameterized test
+     */
+    static class SymbolIdsToLongArray extends TypedArgumentConverter<String, long[]> {
+        protected SymbolIdsToLongArray() {
+            super(String.class, long[].class);
+        }
+
+        @Override
+        protected long[] convert(String source) throws ArgumentConversionException {
+            if (source == null) return null;
+            int size = (int) source.chars().filter(i -> i == '$').count();
+            String[] sids = source.split("\\$");
+            long[] result = new long[size];
+            int i = 0;
+            for (String sid : sids) {
+                if (sid.isEmpty()) continue;
+                result[i] = Long.parseLong(sid.trim());
+                i++;
+            }
+            return result;
+        }
+    }
 }

From 7fe1fd83922f7b7e8140b594779683350c9d589b Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Thu, 16 Nov 2023 12:49:29 -0800
Subject: [PATCH 314/490] Enable using Kotlin in Ion Java (#488)

---
 .github/workflows/main.yml                    |   5 +
 THIRD_PARTY_LICENSES.md                       |  17 ++
 build.gradle.kts                              | 188 ++++++++++++++-
 config/proguard/rules.pro                     |   6 +
 src/com/amazon/ion/impl/IonIteratorImpl.java  | 219 ------------------
 src/com/amazon/ion/impl/IonIteratorImpl.kt    |  99 ++++++++
 .../amazon/ion/impl/IonReaderTreeUserX.java   |   1 -
 src/com/amazon/ion/impl/IonWriterUser.java    |   1 -
 src/com/amazon/ion/impl/LocalSymbolTable.java |   1 -
 .../ion/impl/_Private_IonReaderBuilder.java   |   1 -
 .../ion/impl/bin/IonRawBinaryWriter.java      |   1 +
 .../amazon/ion/impl/lite/IonSequenceLite.java |   4 +-
 .../amazon/ion/impl/lite/IonStructLite.java   |   5 +-
 src/com/amazon/ion/util/JarInfo.java          |   7 +-
 .../ion/BinaryReaderSystemProcessingTest.java |   1 -
 test/com/amazon/ion/BinaryTest.java           |   2 -
 test/com/amazon/ion/BlobTest.java             |   2 +-
 test/com/amazon/ion/IonTestCase.java          |   1 -
 test/com/amazon/ion/IonValueTest.java         |   2 -
 test/com/amazon/ion/StructTest.java           |   1 -
 .../com/amazon/ion/impl/BinaryWriterTest.java |   1 -
 .../impl/IonReaderBinaryRawStringTest.java    |   8 -
 ...onReaderContinuableTopLevelBinaryTest.java |   4 -
 .../amazon/ion/impl/IonWriterTestCase.java    |   4 +-
 .../impl/_Private_ScalarConversionsTest.java  |   2 -
 .../impl/lite/IonListSexpLiteSublistTest.java |   3 +-
 test/com/amazon/ion/junit/IonAssert.java      |   1 -
 .../ion/streaming/BadIonStreamingTest.java    |   3 +-
 test/com/amazon/ion/streaming/ReaderTest.java |   1 -
 29 files changed, 317 insertions(+), 274 deletions(-)
 create mode 100644 THIRD_PARTY_LICENSES.md
 create mode 100644 config/proguard/rules.pro
 delete mode 100644 src/com/amazon/ion/impl/IonIteratorImpl.java
 create mode 100644 src/com/amazon/ion/impl/IonIteratorImpl.kt

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ac5a9f39d9..ecbcc2710b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,6 +17,7 @@ jobs:
           - java: 11
             upload_reports: true
           - java: 17
+      fail-fast: false
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
@@ -30,6 +31,10 @@ jobs:
       - uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
         with:
           arguments: build
+      - name: Test minified JAR
+        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
+        with:
+          arguments: minifyTest
       - run: ./ion-test-driver-run version
       - if: ${{ matrix.upload_reports }}
         uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
diff --git a/THIRD_PARTY_LICENSES.md b/THIRD_PARTY_LICENSES.md
new file mode 100644
index 0000000000..73629fbdc9
--- /dev/null
+++ b/THIRD_PARTY_LICENSES.md
@@ -0,0 +1,17 @@
+
+# ion-java
+## Dependency License Report
+
+## Apache License, Version 2.0
+
+**1** **Group:** `org.jetbrains` **Name:** `annotations` **Version:** `13.0`
+> - **POM Project URL**: [http://www.jetbrains.org](http://www.jetbrains.org)
+> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
+
+**2** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib` **Version:** `1.9.0`
+> - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/)
+> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
+
+**3** **Group:** `org.jetbrains.kotlin` **Name:** `kotlin-stdlib-common` **Version:** `1.9.0`
+> - **POM Project URL**: [https://kotlinlang.org/](https://kotlinlang.org/)
+> - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
diff --git a/build.gradle.kts b/build.gradle.kts
index ec8459fdbf..026e0840de 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,17 +1,38 @@
+import com.github.jk1.license.filter.LicenseBundleNormalizer
+import com.github.jk1.license.render.InventoryMarkdownReportRenderer
+import com.github.jk1.license.render.TextReportRenderer
+import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
+import proguard.gradle.ProGuardTask
 import java.net.URI
 import java.time.Instant
 import java.util.Properties
 
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.guardsquare:proguard-gradle:7.4.0")
+    }
+}
 
 plugins {
+    kotlin("jvm") version "1.9.0"
     java
     `maven-publish`
     jacoco
     signing
+    id("com.github.johnrengelman.shadow") version "8.1.1"
+
     id("org.cyclonedx.bom") version "1.7.2"
     id("com.github.spotbugs") version "5.0.13"
+    id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
     // TODO: more static analysis. E.g.:
     // id("com.diffplug.spotless") version "6.11.0"
+
+    // Used for generating the third party attribution document
+    id("com.github.jk1.dependency-license-report") version "2.5"
 }
 
 jacoco {
@@ -20,9 +41,12 @@ jacoco {
 
 repositories {
     mavenCentral()
+    google()
 }
 
 dependencies {
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.0")
+
     testImplementation("org.junit.jupiter:junit-jupiter:5.7.1")
     testCompileOnly("junit:junit:4.13")
     testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
@@ -38,20 +62,38 @@ version = File(project.rootDir.path + "/project.version").readLines().single()
 description = "A Java implementation of the Amazon Ion data notation."
 
 val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
-val generatedJarInfoDir = "${buildDir}/generated/jar-info"
+val generatedResourcesDir = "$buildDir/generated/main/resources"
 lateinit var sourcesArtifact: PublishArtifact
 lateinit var javadocArtifact: PublishArtifact
 
 sourceSets {
     main {
         java.srcDir("src")
-        resources.srcDir(generatedJarInfoDir)
+        resources.srcDir(generatedResourcesDir)
     }
     test {
         java.srcDir("test")
     }
 }
 
+licenseReport {
+    // Because of the current gradle project structure, we must explicitly exclude ion-java-cli, even
+    // though ion-java does not depend on ion-java-cli. By default, the license report generator includes
+    // the current project (ion-java) and all its subprojects.
+    projects = arrayOf(project)
+    outputDir = "$buildDir/reports/licenses"
+    renderers = arrayOf(InventoryMarkdownReportRenderer(), TextReportRenderer())
+    // Dependencies use inconsistent titles for Apache-2.0, so we need to specify mappings
+    filters = arrayOf(
+        LicenseBundleNormalizer(
+            mapOf(
+                "The Apache License, Version 2.0" to "Apache-2.0",
+                "The Apache Software License, Version 2.0" to "Apache-2.0",
+            )
+        )
+    )
+}
+
 tasks {
     withType<JavaCompile> {
         options.encoding = "UTF-8"
@@ -59,6 +101,116 @@ tasks {
         // emit JDK 8 compatible classes due to widespread use of this library with JDK 8.
         options.release.set(8)
     }
+    withType<KotlinCompile<KotlinJvmOptions>> {
+        kotlinOptions {
+            // Kotlin jvmTarget must match the JavaCompile release version
+            jvmTarget = "1.8"
+        }
+    }
+
+    jar {
+        archiveClassifier.set("original")
+    }
+
+    // Creates a super jar of ion-java and its dependencies where all dependencies are shaded (moved)
+    // to com.amazon.ion_.shaded.are_you_sure_you_want_to_use_this
+    shadowJar {
+        val newLocation = "com.amazon.ion.shaded_.do_not_use"
+        archiveClassifier.set("shaded")
+        dependsOn(generateLicenseReport)
+        from(generateLicenseReport.get().outputFolder)
+        relocate("kotlin", "$newLocation.kotlin")
+        relocate("org.jetbrains", "$newLocation.org.jetbrains")
+        relocate("org.intellij", "$newLocation.org.intellij")
+        dependencies {
+            // Remove all Kotlin metadata so that it looks like an ordinary Java Jar
+            exclude("**/*.kotlin_metadata")
+            exclude("**/*.kotlin_module")
+            exclude("**/*.kotlin_builtins")
+            // Eliminate dependencies' pom files
+            exclude("**/pom.*")
+        }
+    }
+
+    /**
+     * The `minifyJar` task uses Proguard to create a JAR that is smaller than the combined size of ion-java
+     * and its dependencies. This is the final JAR that is published to maven central.
+     */
+    val minifyJar by register<ProGuardTask>("minifyJar") {
+        group = "build"
+        val rulesPath = file("config/proguard/rules.pro")
+        val inputJarPath = shadowJar.get().outputs.files.singleFile
+        val outputJarPath = "build/libs/ion-java-$version.jar"
+
+        inputs.file(rulesPath)
+        inputs.file(inputJarPath)
+        outputs.file(outputJarPath)
+        dependsOn(shadowJar)
+        dependsOn(configurations.runtimeClasspath)
+
+        injars(inputJarPath)
+        outjars(outputJarPath)
+        configuration(rulesPath)
+
+        val javaHome = System.getProperty("java.home")
+        // Automatically handle the Java version of this build, but we don't support lower than JDK 11
+        // See https://github.com/Guardsquare/proguard/blob/e76e47953f6f295350a3bb7eeb801b33aac34eae/examples/gradle-kotlin-dsl/build.gradle.kts#L48-L60
+        libraryjars(
+            mapOf("jarfilter" to "!**.jar", "filter" to "!module-info.class"),
+            "$javaHome/jmods/java.base.jmod"
+        )
+    }
+
+    build {
+        dependsOn(minifyJar)
+    }
+
+    generateLicenseReport {
+        doLast {
+            // We don't want the time in the generated markdown report because that makes it unstable for
+            // our verification of the THIRD_PARTY_LICENSES file.
+            val markdownReport = outputs.files.single().walk().single { it.path.endsWith(".md") }
+            val dateRegex = Regex("^_\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2} \\w+_$")
+            // Reads the content of the markdown report, replacing the date line with an empty line, and
+            // trimming extra whitespace from the end of all other lines.
+            val newMarkdownContent = markdownReport.readLines()
+                .joinToString("\n") { if (it.matches(dateRegex)) "" else it.trimEnd() }
+            markdownReport.writeText(newMarkdownContent)
+        }
+    }
+
+    // Task to check whether the THIRD_PARTY_LICENSES file is still up-to-date.
+    val checkThirdPartyLicensesFile by register("checkThirdPartyLicensesFile") {
+        val thirdPartyLicensesFileName = "THIRD_PARTY_LICENSES.md"
+        val thirdPartyLicensesPath = "$rootDir/$thirdPartyLicensesFileName"
+        dependsOn(generateLicenseReport)
+        inputs.file(thirdPartyLicensesPath)
+        group = "verification"
+        description = "Verifies that $thirdPartyLicensesFileName is up-to-date."
+        doLast {
+            val generatedMarkdownReport = generateLicenseReport.get().outputs.files.single()
+                .walk().single { it.path.endsWith(".md") }
+            val generatedMarkdownReportContent = generatedMarkdownReport.readLines()
+                .filter { it.isNotBlank() }
+                .joinToString("\n")
+
+            val sourceControlledMarkdownReport = File(thirdPartyLicensesPath)
+            val sourceControlledMarkdownReportContent = sourceControlledMarkdownReport.readLines()
+                .filter { it.isNotBlank() }
+                .joinToString("\n")
+
+            if (sourceControlledMarkdownReportContent != generatedMarkdownReportContent) {
+                throw IllegalStateException(
+                    "$thirdPartyLicensesPath is out of date.\n" +
+                        "Please replace the file content with the content of $generatedMarkdownReport."
+                )
+            }
+        }
+    }
+
+    check {
+        dependsOn(checkThirdPartyLicensesFile)
+    }
 
     javadoc {
         // Suppressing Javadoc warnings is clunky, but there doesn't seem to be any nicer way to do it.
@@ -72,6 +224,11 @@ tasks {
         }
     }
 
+    ktlint {
+        version.set("0.40.0")
+        outputToConsole.set(true)
+    }
+
     // spotbugs-gradle-plugin creates a :spotbugsTest task by default, but we don't want it
     // see: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/391
     project.gradle.startParameter.excludedTaskNames.add(":spotbugsTest")
@@ -110,7 +267,7 @@ tasks {
                             "xsltproc",
                             "--output", spotbugsBaselineFile,
                             "$rootDir/config/spotbugs/baseline.xslt",
-                            outputLocation.get().toString()
+                            "${outputLocation.get()}/spotBugs"
                         )
                     }
                 }
@@ -136,15 +293,15 @@ tasks {
      * for why this is done with a properties file rather than the Jar manifest.
      */
     val generateJarInfo by creating<Task> {
+        val propertiesFile = File("$generatedResourcesDir/${project.name}.properties")
         doLast {
-            val propertiesFile = File("$generatedJarInfoDir/${project.name}.properties")
             propertiesFile.parentFile.mkdirs()
             val properties = Properties()
             properties.setProperty("build.version", version.toString())
             properties.setProperty("build.time", Instant.now().toString())
             properties.store(propertiesFile.writer(), null)
         }
-        outputs.dir(generatedJarInfoDir)
+        outputs.file(propertiesFile)
     }
 
     processResources { dependsOn(generateJarInfo) }
@@ -160,7 +317,8 @@ tasks {
         }
     }
 
-    test {
+    fun Test.applyCommonTestConfig() {
+        group = "verification"
         maxHeapSize = "1g" // When this line was added Xmx 512m was the default, and we saw OOMs
         maxParallelForks = Math.max(1, Runtime.getRuntime().availableProcessors() / 2)
         useJUnitPlatform()
@@ -168,6 +326,24 @@ tasks {
         finalizedBy(jacocoTestReport)
     }
 
+    test {
+        applyCommonTestConfig()
+    }
+
+    /** Runs the JUnit test on the minified jar. */
+    register<Test>("minifyTest") {
+        applyCommonTestConfig()
+        classpath = project.configurations.testRuntimeClasspath.get() + project.sourceSets.test.get().output + minifyJar.outputs.files
+        dependsOn(minifyJar)
+    }
+
+    /** Runs the JUnit test on the shadow jar. */
+    register<Test>("shadowTest") {
+        applyCommonTestConfig()
+        classpath = project.configurations.testRuntimeClasspath.get() + project.sourceSets.test.get().output + shadowJar.get().outputs.files
+        dependsOn(minifyJar)
+    }
+
     withType<Sign> {
         setOnlyIf { isReleaseVersion && gradle.taskGraph.hasTask(":publish") }
     }
diff --git a/config/proguard/rules.pro b/config/proguard/rules.pro
new file mode 100644
index 0000000000..e8657b4dc5
--- /dev/null
+++ b/config/proguard/rules.pro
@@ -0,0 +1,6 @@
+# See https://www.guardsquare.com/manual/configuration/usage
+-keep class !com.amazon.ion.shaded_.** { *; }
+-keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
+-dontoptimize
+-dontobfuscate
+-dontwarn java.sql.Timestamp
diff --git a/src/com/amazon/ion/impl/IonIteratorImpl.java b/src/com/amazon/ion/impl/IonIteratorImpl.java
deleted file mode 100644
index 2083575f07..0000000000
--- a/src/com/amazon/ion/impl/IonIteratorImpl.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.amazon.ion.impl;
-
-import com.amazon.ion.IonLob;
-import com.amazon.ion.IonReader;
-import com.amazon.ion.IonSequence;
-import com.amazon.ion.IonStruct;
-import com.amazon.ion.IonType;
-import com.amazon.ion.IonValue;
-import com.amazon.ion.SymbolTable;
-import com.amazon.ion.SymbolToken;
-import com.amazon.ion.ValueFactory;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-
-
-final class IonIteratorImpl
-    implements Iterator<IonValue>
-{
-    private final ValueFactory _valueFactory;
-    private final IonReader _reader;
-    private boolean  _at_eof;
-    private IonValue _curr;
-    private IonValue _next;
-
-
-
-    /**
-     * @throws NullPointerException if any parameter is null.
-     */
-    public IonIteratorImpl(ValueFactory valueFactory,
-                           IonReader input)
-    {
-        if (valueFactory == null || input == null)
-        {
-            throw new NullPointerException();
-        }
-
-        _valueFactory = valueFactory;
-        _reader = input;
-    }
-
-
-    /**
-     * Returns true if the iteration has more elements.
-     * here we actually walk ahead and get the next value (it's
-     * the only way we know if there are more and clear out the
-     * various $ion noise out of the way
-     */
-    public boolean hasNext() {
-        if (_at_eof) return false;
-        if (_next != null) return true;
-        return (prefetch() != null);
-    }
-
-    private IonValue prefetch()
-    {
-        assert !_at_eof && _next == null;
-
-        IonType type = _reader.next();
-        if (type == null)
-        {
-            _at_eof = true;
-        }
-        else
-        {
-            _next = readValue();
-        }
-
-        return _next;
-    }
-
-
-    private IonValue readValue()
-    {
-        IonType type = _reader.getType();
-
-        SymbolToken[] annotations = _reader.getTypeAnnotationSymbols();
-
-        IonValue v;
-
-        if (_reader.isNullValue())
-        {
-            v = _valueFactory.newNull(type);
-        }
-        else
-        {
-            switch (type) {
-                case NULL:
-                    // Handled above
-                    throw new IllegalStateException();
-                case BOOL:
-                    v = _valueFactory.newBool(_reader.booleanValue());
-                    break;
-                case INT:
-                    v = _valueFactory.newInt(_reader.bigIntegerValue());
-                    break;
-                case FLOAT:
-                    v = _valueFactory.newFloat(_reader.doubleValue());
-                    break;
-                case DECIMAL:
-                    v = _valueFactory.newDecimal(_reader.decimalValue());
-                    break;
-                case TIMESTAMP:
-                    v = _valueFactory.newTimestamp(_reader.timestampValue());
-                    break;
-                case STRING:
-                    v = _valueFactory.newString(_reader.stringValue());
-                    break;
-                case SYMBOL:
-                    // TODO always pass the SID?  Is it correct?
-                    v = _valueFactory.newSymbol(_reader.symbolValue());
-                    break;
-                case BLOB:
-                {
-                    IonLob lob = _valueFactory.newNullBlob();
-                    lob.setBytes(_reader.newBytes());
-                    v = lob;
-                    break;
-                }
-                case CLOB:
-                {
-                    IonLob lob = _valueFactory.newNullClob();
-                    lob.setBytes(_reader.newBytes());
-                    v = lob;
-                    break;
-                }
-                case STRUCT:
-                {
-                    IonStruct struct = _valueFactory.newEmptyStruct();
-                    _reader.stepIn();
-                    while (_reader.next() != null)
-                    {
-                        SymbolToken name = _reader.getFieldNameSymbol();
-                        IonValue child = readValue();
-                        struct.add(name, child);
-                    }
-                    _reader.stepOut();
-                    v = struct;
-                    break;
-                }
-                case LIST:
-                {
-                    IonSequence seq = _valueFactory.newEmptyList();
-                    _reader.stepIn();
-                    while (_reader.next() != null)
-                    {
-                        IonValue child = readValue();
-                        seq.add(child);
-                    }
-                    _reader.stepOut();
-                    v = seq;
-                    break;
-                }
-                case SEXP:
-                {
-                    IonSequence seq = _valueFactory.newEmptySexp();
-                    _reader.stepIn();
-                    while (_reader.next() != null)
-                    {
-                        IonValue child = readValue();
-                        seq.add(child);
-                    }
-                    _reader.stepOut();
-                    v = seq;
-                    break;
-                }
-                default:
-                    throw new IllegalStateException();
-            }
-        }
-
-        // TODO this is too late in the case of system reading
-        // when v is a local symtab (it will get itself, not the prior symtab)
-        SymbolTable symtab = _reader.getSymbolTable();
-        ((_Private_IonValue)v).setSymbolTable(symtab);
-
-        if (annotations.length != 0) {
-            ((_Private_IonValue)v).setTypeAnnotationSymbols(annotations);
-        }
-
-        return v;
-    }
-
-
-    public IonValue next() {
-        if (! _at_eof) {
-            _curr = null;
-            if (_next == null) {
-                prefetch();
-            }
-            if (_next != null) {
-                _curr = _next;
-                _next = null;
-                return _curr;
-            }
-        }
-        throw new NoSuchElementException();
-    }
-
-
-    public void remove() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/src/com/amazon/ion/impl/IonIteratorImpl.kt b/src/com/amazon/ion/impl/IonIteratorImpl.kt
new file mode 100644
index 0000000000..33ec4c6793
--- /dev/null
+++ b/src/com/amazon/ion/impl/IonIteratorImpl.kt
@@ -0,0 +1,99 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package com.amazon.ion.impl
+
+import com.amazon.ion.IonReader
+import com.amazon.ion.IonType
+import com.amazon.ion.IonValue
+import com.amazon.ion.ValueFactory
+
+/**
+ * An [Iterator] that wraps an [IonReader] and emits [IonValue]s.
+ */
+internal class IonIteratorImpl(private val _valueFactory: ValueFactory, private val _reader: IonReader) : MutableIterator<IonValue> {
+
+    private var _at_eof = false
+    private var _next: IonValue? = null
+
+    /**
+     * Returns true if the iteration has more elements.
+     * here we actually walk ahead and get the next value (it's
+     * the only way we know if there are more and clear out the
+     * various $ion noise out of the way
+     */
+    override fun hasNext(): Boolean {
+        if (_at_eof) return false
+        return if (_next != null) true else prefetch() != null
+    }
+
+    private fun prefetch(): IonValue? {
+        assert(!_at_eof && _next == null)
+        val type = _reader.next()
+        if (type == null) {
+            _at_eof = true
+        } else {
+            _next = readValue()
+        }
+        return _next
+    }
+
+    private fun readValue(): IonValue {
+        val annotations = _reader.typeAnnotationSymbols
+        val v = if (_reader.isNullValue) {
+            _valueFactory.newNull(_reader.type)
+        } else {
+            when (_reader.type) {
+                IonType.NULL -> throw IllegalStateException()
+                IonType.BOOL -> _valueFactory.newBool(_reader.booleanValue())
+                IonType.INT -> _valueFactory.newInt(_reader.bigIntegerValue())
+                IonType.FLOAT -> _valueFactory.newFloat(_reader.doubleValue())
+                IonType.DECIMAL -> _valueFactory.newDecimal(_reader.decimalValue())
+                IonType.TIMESTAMP -> _valueFactory.newTimestamp(_reader.timestampValue())
+                IonType.STRING -> _valueFactory.newString(_reader.stringValue())
+                // TODO always pass the SID?  Is it correct?
+                IonType.SYMBOL -> _valueFactory.newSymbol(_reader.symbolValue())
+                IonType.BLOB -> _valueFactory.newNullBlob().apply { bytes = _reader.newBytes() }
+                IonType.CLOB -> _valueFactory.newNullClob().apply { bytes = _reader.newBytes() }
+                IonType.STRUCT -> _valueFactory.newEmptyStruct().apply { _reader.forEachInContainer { add(fieldNameSymbol, readValue()) } }
+                IonType.LIST -> _valueFactory.newEmptyList().apply { _reader.forEachInContainer { add(readValue()) } }
+                IonType.SEXP -> _valueFactory.newEmptySexp().apply { _reader.forEachInContainer { add(readValue()) } }
+                else -> throw IllegalStateException()
+            }
+        }
+
+        // TODO this is too late in the case of system reading
+        // when v is a local symtab (it will get itself, not the prior symtab)
+        (v as _Private_IonValue).symbolTable = _reader.symbolTable
+        if (annotations.isNotEmpty()) v.setTypeAnnotationSymbols(*annotations)
+        return v
+    }
+
+    override fun next(): IonValue {
+        if (_at_eof) throw NoSuchElementException()
+        val value = _next ?: prefetch()
+        _next = null
+        return value ?: throw NoSuchElementException()
+    }
+
+    override fun remove() {
+        throw UnsupportedOperationException()
+    }
+
+    private inline fun IonReader.forEachInContainer(block: IonReader.() -> Unit) {
+        stepIn()
+        while (next() != null) { block() }
+        stepOut()
+    }
+}
diff --git a/src/com/amazon/ion/impl/IonReaderTreeUserX.java b/src/com/amazon/ion/impl/IonReaderTreeUserX.java
index be70bc2d09..6977da27a6 100644
--- a/src/com/amazon/ion/impl/IonReaderTreeUserX.java
+++ b/src/com/amazon/ion/impl/IonReaderTreeUserX.java
@@ -21,7 +21,6 @@
 
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonDatagram;
-import com.amazon.ion.IonReader;
 import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonSymbol;
 import com.amazon.ion.IonType;
diff --git a/src/com/amazon/ion/impl/IonWriterUser.java b/src/com/amazon/ion/impl/IonWriterUser.java
index 60270d510c..b620821fb3 100644
--- a/src/com/amazon/ion/impl/IonWriterUser.java
+++ b/src/com/amazon/ion/impl/IonWriterUser.java
@@ -16,7 +16,6 @@
 package com.amazon.ion.impl;
 
 import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE;
-import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
 
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
diff --git a/src/com/amazon/ion/impl/LocalSymbolTable.java b/src/com/amazon/ion/impl/LocalSymbolTable.java
index cc6ca89497..713d8998ae 100644
--- a/src/com/amazon/ion/impl/LocalSymbolTable.java
+++ b/src/com/amazon/ion/impl/LocalSymbolTable.java
@@ -38,7 +38,6 @@
 import com.amazon.ion.util.IonTextUtils;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
diff --git a/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java b/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
index 17834a0bc0..c7e56f8abd 100644
--- a/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
+++ b/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
@@ -16,7 +16,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import java.io.SequenceInputStream;
 import java.util.zip.GZIPInputStream;
 
 import static com.amazon.ion.impl.LocalSymbolTable.DEFAULT_LST_FACTORY;
diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 216b139e33..31f06b3b2c 100644
--- a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -57,6 +57,7 @@
 import java.math.BigInteger;
 import java.util.Iterator;
 import java.util.ListIterator;
+import java.util.NoSuchElementException;
 
 /**
  * Low-level binary {@link IonWriter} that understands encoding concerns but doesn't operate with any sense of symbol table management.
diff --git a/src/com/amazon/ion/impl/lite/IonSequenceLite.java b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
index 33070838ab..5f58355a36 100644
--- a/src/com/amazon/ion/impl/lite/IonSequenceLite.java
+++ b/src/com/amazon/ion/impl/lite/IonSequenceLite.java
@@ -17,13 +17,11 @@
 
 import com.amazon.ion.ContainedValueException;
 import com.amazon.ion.IonSequence;
-import com.amazon.ion.IonType;
 import com.amazon.ion.IonValue;
-import com.amazon.ion.IonWriter;
 import com.amazon.ion.ValueFactory;
 import com.amazon.ion.impl._Private_CurriedValueFactory;
 import com.amazon.ion.impl._Private_IonValue;
-import java.io.IOException;
+
 import java.lang.reflect.Array;
 import java.util.AbstractList;
 import java.util.ArrayList;
diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/com/amazon/ion/impl/lite/IonStructLite.java
index c6ea1fca9a..23344a7497 100644
--- a/src/com/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/com/amazon/ion/impl/lite/IonStructLite.java
@@ -19,20 +19,17 @@
 import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonValue;
-import com.amazon.ion.IonWriter;
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.ValueFactory;
 import com.amazon.ion.ValueVisitor;
 import com.amazon.ion.impl._Private_CurriedValueFactory;
-import com.amazon.ion.util.Equivalence;
 import com.amazon.ion.UnknownSymbolException;
-import java.io.IOException;
+
 import java.io.PrintWriter;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
-import java.util.ListIterator;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
diff --git a/src/com/amazon/ion/util/JarInfo.java b/src/com/amazon/ion/util/JarInfo.java
index d7e0f3abea..2e00b58162 100644
--- a/src/com/amazon/ion/util/JarInfo.java
+++ b/src/com/amazon/ion/util/JarInfo.java
@@ -17,13 +17,8 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
 import java.util.Properties;
-import java.util.jar.Attributes;
-import java.util.jar.Manifest;
+
 import com.amazon.ion.IonException;
 import com.amazon.ion.Timestamp;
 
diff --git a/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java b/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
index a332d0462b..c9798c5a57 100644
--- a/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
+++ b/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
@@ -20,7 +20,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Date;
 
 import static com.amazon.ion.SystemSymbols.ION_1_0;
 import static com.amazon.ion.SystemSymbols.ION_1_0_SID;
diff --git a/test/com/amazon/ion/BinaryTest.java b/test/com/amazon/ion/BinaryTest.java
index 5cfe3d6995..4df0e6534f 100644
--- a/test/com/amazon/ion/BinaryTest.java
+++ b/test/com/amazon/ion/BinaryTest.java
@@ -17,9 +17,7 @@
 
 import static com.amazon.ion.SystemSymbols.ION_SYMBOL_TABLE_SID;
 
-import java.io.IOException;
 import java.util.Arrays;
-import java.util.Iterator;
 
 import org.junit.Test;
 
diff --git a/test/com/amazon/ion/BlobTest.java b/test/com/amazon/ion/BlobTest.java
index f39fcc210b..035c9160aa 100644
--- a/test/com/amazon/ion/BlobTest.java
+++ b/test/com/amazon/ion/BlobTest.java
@@ -16,7 +16,7 @@
 package com.amazon.ion;
 
 import static com.amazon.ion.TestUtils.US_ASCII_CHARSET;
-import static com.amazon.ion.impl._Private_Utils.encode;
+
 import com.amazon.ion.impl._Private_Utils;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/test/com/amazon/ion/IonTestCase.java b/test/com/amazon/ion/IonTestCase.java
index 7158341d59..9b3d915092 100644
--- a/test/com/amazon/ion/IonTestCase.java
+++ b/test/com/amazon/ion/IonTestCase.java
@@ -26,7 +26,6 @@
 import com.amazon.ion.system.IonSystemBuilder;
 import com.amazon.ion.system.SimpleCatalog;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/test/com/amazon/ion/IonValueTest.java b/test/com/amazon/ion/IonValueTest.java
index 38fdb7f0fe..0cac74c1cd 100644
--- a/test/com/amazon/ion/IonValueTest.java
+++ b/test/com/amazon/ion/IonValueTest.java
@@ -28,8 +28,6 @@
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 
 
diff --git a/test/com/amazon/ion/StructTest.java b/test/com/amazon/ion/StructTest.java
index 6fa84f7773..15cd31fb54 100644
--- a/test/com/amazon/ion/StructTest.java
+++ b/test/com/amazon/ion/StructTest.java
@@ -28,7 +28,6 @@
 import java.util.ListIterator;
 import java.util.Random;
 
-import com.amazon.ion.system.IonSystemBuilder;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
diff --git a/test/com/amazon/ion/impl/BinaryWriterTest.java b/test/com/amazon/ion/impl/BinaryWriterTest.java
index cf4b910bf1..d5ecdc034a 100644
--- a/test/com/amazon/ion/impl/BinaryWriterTest.java
+++ b/test/com/amazon/ion/impl/BinaryWriterTest.java
@@ -15,7 +15,6 @@
 
 package com.amazon.ion.impl;
 
-import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonType;
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java b/test/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java
index 3ad6e86938..30ba4cfe8e 100644
--- a/test/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java
+++ b/test/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java
@@ -1,21 +1,13 @@
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonReader;
-import com.amazon.ion.IonType;
 import com.amazon.ion.IonWriter;
-import com.amazon.ion.Timestamp;
 import com.amazon.ion.system.IonBinaryWriterBuilder;
 import com.amazon.ion.system.IonReaderBuilder;
-import com.amazon.ion.util.RepeatInputStream;
 import org.junit.Test;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.SequenceInputStream;
-import java.math.BigDecimal;
 
-import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
 import static org.junit.Assert.assertEquals;
 
 public class IonReaderBinaryRawStringTest {
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 695cd86d72..57a9d8c2ff 100644
--- a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -4,8 +4,6 @@
 package com.amazon.ion.impl;
 
 import com.amazon.ion.BufferConfiguration;
-import com.amazon.ion.Decimal;
-import com.amazon.ion.IntegerSize;
 import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonException;
@@ -22,7 +20,6 @@
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.SystemSymbols;
 import com.amazon.ion.TestUtils;
-import com.amazon.ion.Timestamp;
 import com.amazon.ion.UnknownSymbolException;
 import com.amazon.ion.impl.bin._Private_IonManagedBinaryWriterBuilder;
 import com.amazon.ion.impl.bin._Private_IonManagedWriter;
@@ -43,7 +40,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/test/com/amazon/ion/impl/IonWriterTestCase.java b/test/com/amazon/ion/impl/IonWriterTestCase.java
index fdfd52d15b..522b5e59c3 100644
--- a/test/com/amazon/ion/impl/IonWriterTestCase.java
+++ b/test/com/amazon/ion/impl/IonWriterTestCase.java
@@ -48,10 +48,8 @@
 import com.amazon.ion.SystemSymbols;
 import com.amazon.ion.TestUtils;
 import com.amazon.ion.UnknownSymbolException;
-import com.amazon.ion.impl.bin._Private_IonManagedWriter;
 import com.amazon.ion.junit.IonAssert;
-import com.amazon.ion.system.IonSystemBuilder;
-import java.io.ByteArrayInputStream;
+
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
diff --git a/test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java b/test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java
index c607cbb891..93b9ab350c 100644
--- a/test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java
+++ b/test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java
@@ -17,10 +17,8 @@
 
 import static org.junit.Assert.*;
 
-import org.junit.Assert;
 import org.junit.Test;
 import com.amazon.ion.Decimal;
-import static org.junit.Assert.*;
 
 public class _Private_ScalarConversionsTest {
     private long decimalToLong(final Decimal d) {
diff --git a/test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java b/test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
index bd607af587..d6fd716404 100644
--- a/test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
+++ b/test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
@@ -19,13 +19,12 @@
 
 import java.util.List;
 import java.util.ListIterator;
-import org.junit.Assert;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import com.amazon.ion.IonInt;
 import com.amazon.ion.IonSequence;
 import com.amazon.ion.IonValue;
-import com.amazon.ion.impl.lite.BaseIonSequenceLiteSublistTestCase;
 import com.amazon.ion.junit.Injected;
 import com.amazon.ion.junit.Injected.Inject;
 
diff --git a/test/com/amazon/ion/junit/IonAssert.java b/test/com/amazon/ion/junit/IonAssert.java
index ca824ff8fa..a91f1f3d02 100644
--- a/test/com/amazon/ion/junit/IonAssert.java
+++ b/test/com/amazon/ion/junit/IonAssert.java
@@ -35,7 +35,6 @@
 import java.util.Map.Entry;
 
 import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static com.amazon.ion.impl._Private_IonConstants.UNKNOWN_SYMBOL_TEXT_PREFIX;
 import static com.amazon.ion.util.IonTextUtils.printSymbol;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
diff --git a/test/com/amazon/ion/streaming/BadIonStreamingTest.java b/test/com/amazon/ion/streaming/BadIonStreamingTest.java
index b847fd79e0..7e48f05de0 100644
--- a/test/com/amazon/ion/streaming/BadIonStreamingTest.java
+++ b/test/com/amazon/ion/streaming/BadIonStreamingTest.java
@@ -26,8 +26,7 @@
 import com.amazon.ion.impl._Private_Utils;
 import com.amazon.ion.junit.Injected.Inject;
 import java.io.File;
-import java.io.IOException;
-import org.junit.Ignore;
+
 import org.junit.Test;
 
 public class BadIonStreamingTest
diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/test/com/amazon/ion/streaming/ReaderTest.java
index 26608e6272..65eebcf87b 100644
--- a/test/com/amazon/ion/streaming/ReaderTest.java
+++ b/test/com/amazon/ion/streaming/ReaderTest.java
@@ -32,7 +32,6 @@
 import java.math.BigInteger;
 import java.util.Arrays;
 
-import org.junit.Assert;
 import org.junit.Ignore;
 import org.junit.Test;
 

From 5daea99f598570c7854f178f3f76dca4bd9ef98b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= <gliptak@gmail.com>
Date: Thu, 16 Nov 2023 16:35:41 -0500
Subject: [PATCH 315/490] Refactor to standard layout (#555)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Gábor Lipták <gliptak@gmail.com>
---
 build.gradle.kts                                              | 4 ----
 src/{ => main/java}/com/amazon/ion/BufferConfiguration.java   | 0
 .../java}/com/amazon/ion/ContainedValueException.java         | 0
 src/{ => main/java}/com/amazon/ion/Decimal.java               | 0
 src/{ => main/java}/com/amazon/ion/EmptySymbolException.java  | 0
 src/{ => main/java}/com/amazon/ion/IntegerSize.java           | 0
 .../java}/com/amazon/ion/InvalidSystemSymbolException.java    | 0
 src/{ => main/java}/com/amazon/ion/IonBinaryWriter.java       | 0
 src/{ => main/java}/com/amazon/ion/IonBlob.java               | 0
 src/{ => main/java}/com/amazon/ion/IonBool.java               | 0
 .../java}/com/amazon/ion/IonBufferConfiguration.java          | 0
 src/{ => main/java}/com/amazon/ion/IonCatalog.java            | 0
 src/{ => main/java}/com/amazon/ion/IonClob.java               | 0
 src/{ => main/java}/com/amazon/ion/IonContainer.java          | 0
 src/{ => main/java}/com/amazon/ion/IonCursor.java             | 0
 src/{ => main/java}/com/amazon/ion/IonDatagram.java           | 0
 src/{ => main/java}/com/amazon/ion/IonDecimal.java            | 0
 src/{ => main/java}/com/amazon/ion/IonException.java          | 0
 src/{ => main/java}/com/amazon/ion/IonFloat.java              | 0
 src/{ => main/java}/com/amazon/ion/IonInt.java                | 0
 src/{ => main/java}/com/amazon/ion/IonList.java               | 0
 src/{ => main/java}/com/amazon/ion/IonLoader.java             | 0
 src/{ => main/java}/com/amazon/ion/IonLob.java                | 0
 src/{ => main/java}/com/amazon/ion/IonMutableCatalog.java     | 0
 src/{ => main/java}/com/amazon/ion/IonNull.java               | 0
 src/{ => main/java}/com/amazon/ion/IonNumber.java             | 0
 src/{ => main/java}/com/amazon/ion/IonReader.java             | 0
 src/{ => main/java}/com/amazon/ion/IonSequence.java           | 0
 src/{ => main/java}/com/amazon/ion/IonSexp.java               | 0
 src/{ => main/java}/com/amazon/ion/IonString.java             | 0
 src/{ => main/java}/com/amazon/ion/IonStruct.java             | 0
 src/{ => main/java}/com/amazon/ion/IonSymbol.java             | 0
 src/{ => main/java}/com/amazon/ion/IonSystem.java             | 0
 src/{ => main/java}/com/amazon/ion/IonText.java               | 0
 src/{ => main/java}/com/amazon/ion/IonTextReader.java         | 0
 src/{ => main/java}/com/amazon/ion/IonTimestamp.java          | 0
 src/{ => main/java}/com/amazon/ion/IonType.java               | 0
 src/{ => main/java}/com/amazon/ion/IonValue.java              | 0
 src/{ => main/java}/com/amazon/ion/IonWriter.java             | 0
 .../java}/com/amazon/ion/IvmNotificationConsumer.java         | 0
 src/{ => main/java}/com/amazon/ion/NullValueException.java    | 0
 src/{ => main/java}/com/amazon/ion/OffsetSpan.java            | 0
 .../java}/com/amazon/ion/OversizedValueException.java         | 0
 src/{ => main/java}/com/amazon/ion/RawValueSpanProvider.java  | 0
 .../java}/com/amazon/ion/ReadOnlyValueException.java          | 0
 src/{ => main/java}/com/amazon/ion/SeekableReader.java        | 0
 src/{ => main/java}/com/amazon/ion/Span.java                  | 0
 src/{ => main/java}/com/amazon/ion/SpanProvider.java          | 0
 .../java}/com/amazon/ion/SubstituteSymbolTableException.java  | 0
 src/{ => main/java}/com/amazon/ion/SymbolTable.java           | 0
 src/{ => main/java}/com/amazon/ion/SymbolToken.java           | 0
 src/{ => main/java}/com/amazon/ion/SystemSymbols.java         | 0
 src/{ => main/java}/com/amazon/ion/TextSpan.java              | 0
 src/{ => main/java}/com/amazon/ion/Timestamp.java             | 0
 .../java}/com/amazon/ion/UnexpectedEofException.java          | 0
 .../java}/com/amazon/ion/UnknownSymbolException.java          | 0
 .../java}/com/amazon/ion/UnsupportedIonVersionException.java  | 0
 src/{ => main/java}/com/amazon/ion/ValueFactory.java          | 0
 src/{ => main/java}/com/amazon/ion/ValueVisitor.java          | 0
 src/{ => main/java}/com/amazon/ion/apps/BaseApp.java          | 0
 src/{ => main/java}/com/amazon/ion/apps/EncodeApp.java        | 0
 src/{ => main/java}/com/amazon/ion/apps/PrintApp.java         | 0
 src/{ => main/java}/com/amazon/ion/apps/SymtabApp.java        | 0
 src/{ => main/java}/com/amazon/ion/facet/Faceted.java         | 0
 src/{ => main/java}/com/amazon/ion/facet/Facets.java          | 0
 .../java}/com/amazon/ion/facet/UnsupportedFacetException.java | 0
 src/{ => main/java}/com/amazon/ion/facet/package-info.java    | 0
 .../java}/com/amazon/ion/impl/AppendableFastAppendable.java   | 0
 src/{ => main/java}/com/amazon/ion/impl/Base64Encoder.java    | 0
 src/{ => main/java}/com/amazon/ion/impl/BlockedBuffer.java    | 0
 src/{ => main/java}/com/amazon/ion/impl/ByteBuffer.java       | 0
 src/{ => main/java}/com/amazon/ion/impl/ByteReader.java       | 0
 src/{ => main/java}/com/amazon/ion/impl/ByteWriter.java       | 0
 .../java}/com/amazon/ion/impl/DowncastingFaceted.java         | 0
 src/{ => main/java}/com/amazon/ion/impl/IonBinary.java        | 0
 .../java}/com/amazon/ion/impl/IonCharacterReader.java         | 0
 src/{ => main/java}/com/amazon/ion/impl/IonCursorBinary.java  | 0
 src/{ => main/java}/com/amazon/ion/impl/IonIteratorImpl.kt    | 0
 src/{ => main/java}/com/amazon/ion/impl/IonMessages.java      | 0
 .../com/amazon/ion/impl/IonReaderContinuableApplication.java  | 0
 .../ion/impl/IonReaderContinuableApplicationBinary.java       | 0
 .../java}/com/amazon/ion/impl/IonReaderContinuableCore.java   | 0
 .../com/amazon/ion/impl/IonReaderContinuableCoreBinary.java   | 0
 .../amazon/ion/impl/IonReaderContinuableTopLevelBinary.java   | 0
 .../com/amazon/ion/impl/IonReaderNonContinuableSystem.java    | 0
 .../java}/com/amazon/ion/impl/IonReaderTextRawTokensX.java    | 0
 .../java}/com/amazon/ion/impl/IonReaderTextRawX.java          | 0
 .../java}/com/amazon/ion/impl/IonReaderTextSystemX.java       | 0
 .../java}/com/amazon/ion/impl/IonReaderTextUserX.java         | 0
 .../java}/com/amazon/ion/impl/IonReaderTreeSystem.java        | 0
 .../java}/com/amazon/ion/impl/IonReaderTreeUserX.java         | 0
 .../java}/com/amazon/ion/impl/IonTextBufferedStream.java      | 0
 src/{ => main/java}/com/amazon/ion/impl/IonTokenConstsX.java  | 0
 src/{ => main/java}/com/amazon/ion/impl/IonTokenReader.java   | 0
 src/{ => main/java}/com/amazon/ion/impl/IonTypeID.java        | 0
 src/{ => main/java}/com/amazon/ion/impl/IonUTF8.java          | 0
 src/{ => main/java}/com/amazon/ion/impl/IonWriterSystem.java  | 0
 .../java}/com/amazon/ion/impl/IonWriterSystemBinary.java      | 0
 .../java}/com/amazon/ion/impl/IonWriterSystemText.java        | 0
 .../java}/com/amazon/ion/impl/IonWriterSystemTextMarkup.java  | 0
 .../java}/com/amazon/ion/impl/IonWriterSystemTree.java        | 0
 src/{ => main/java}/com/amazon/ion/impl/IonWriterUser.java    | 0
 .../java}/com/amazon/ion/impl/IonWriterUserBinary.java        | 0
 src/{ => main/java}/com/amazon/ion/impl/LocalSymbolTable.java | 0
 .../java}/com/amazon/ion/impl/LocalSymbolTableAsStruct.java   | 0
 .../java}/com/amazon/ion/impl/LocalSymbolTableImports.java    | 0
 src/{ => main/java}/com/amazon/ion/impl/Marker.java           | 0
 .../java}/com/amazon/ion/impl/OutputStreamFastAppendable.java | 0
 .../java}/com/amazon/ion/impl/ResizingPipedInputStream.java   | 0
 .../java}/com/amazon/ion/impl/SharedSymbolTable.java          | 0
 src/{ => main/java}/com/amazon/ion/impl/SimpleByteBuffer.java | 0
 .../java}/com/amazon/ion/impl/SubstituteSymbolTable.java      | 0
 .../java}/com/amazon/ion/impl/SymbolTableAsStruct.java        | 0
 .../java}/com/amazon/ion/impl/SymbolTableReader.java          | 0
 .../java}/com/amazon/ion/impl/SymbolTableStructCache.java     | 0
 src/{ => main/java}/com/amazon/ion/impl/SymbolTokenImpl.java  | 0
 .../java}/com/amazon/ion/impl/SystemValueIterator.java        | 0
 src/{ => main/java}/com/amazon/ion/impl/UnifiedDataPageX.java | 0
 .../java}/com/amazon/ion/impl/UnifiedInputBufferX.java        | 0
 .../java}/com/amazon/ion/impl/UnifiedInputStreamX.java        | 0
 .../java}/com/amazon/ion/impl/UnifiedSavePointManagerX.java   | 0
 .../com/amazon/ion/impl/_Private_ByteTransferReader.java      | 0
 .../java}/com/amazon/ion/impl/_Private_ByteTransferSink.java  | 0
 .../java}/com/amazon/ion/impl/_Private_CallbackBuilder.java   | 0
 .../java}/com/amazon/ion/impl/_Private_CommandLine.java       | 0
 .../com/amazon/ion/impl/_Private_CurriedValueFactory.java     | 0
 .../com/amazon/ion/impl/_Private_FastAppendableDecorator.java | 0
 .../amazon/ion/impl/_Private_FastAppendableTrampoline.java    | 0
 .../java}/com/amazon/ion/impl/_Private_IncrementalReader.java | 0
 .../com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java  | 0
 .../com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java     | 0
 .../java}/com/amazon/ion/impl/_Private_IonConstants.java      | 0
 .../java}/com/amazon/ion/impl/_Private_IonContainer.java      | 0
 .../java}/com/amazon/ion/impl/_Private_IonDatagram.java       | 0
 .../java}/com/amazon/ion/impl/_Private_IonReaderBuilder.java  | 0
 .../java}/com/amazon/ion/impl/_Private_IonReaderFactory.java  | 0
 .../java}/com/amazon/ion/impl/_Private_IonSymbol.java         | 0
 .../java}/com/amazon/ion/impl/_Private_IonSystem.java         | 0
 .../java}/com/amazon/ion/impl/_Private_IonTextAppender.java   | 0
 .../com/amazon/ion/impl/_Private_IonTextWriterBuilder.java    | 0
 .../java}/com/amazon/ion/impl/_Private_IonValue.java          | 0
 .../java}/com/amazon/ion/impl/_Private_IonWriter.java         | 0
 .../java}/com/amazon/ion/impl/_Private_IonWriterBase.java     | 0
 .../java}/com/amazon/ion/impl/_Private_IonWriterFactory.java  | 0
 .../java}/com/amazon/ion/impl/_Private_ListWriter.java        | 0
 .../java}/com/amazon/ion/impl/_Private_LocalSymbolTable.java  | 0
 .../com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java | 0
 .../java}/com/amazon/ion/impl/_Private_MarkupCallback.java    | 0
 .../java}/com/amazon/ion/impl/_Private_ReaderWriter.java      | 0
 .../java}/com/amazon/ion/impl/_Private_RecyclingQueue.java    | 0
 .../java}/com/amazon/ion/impl/_Private_RecyclingStack.java    | 0
 .../java}/com/amazon/ion/impl/_Private_ScalarConversions.java | 0
 .../java}/com/amazon/ion/impl/_Private_SymbolToken.java       | 0
 .../com/amazon/ion/impl/_Private_SymtabExtendsCache.java      | 0
 src/{ => main/java}/com/amazon/ion/impl/_Private_Utils.java   | 0
 .../java}/com/amazon/ion/impl/_Private_ValueFactory.java      | 0
 .../java}/com/amazon/ion/impl/bin/AbstractIonWriter.java      | 0
 .../java}/com/amazon/ion/impl/bin/AbstractSymbolTable.java    | 0
 src/{ => main/java}/com/amazon/ion/impl/bin/Block.java        | 0
 .../java}/com/amazon/ion/impl/bin/BlockAllocator.java         | 0
 .../java}/com/amazon/ion/impl/bin/BlockAllocatorProvider.java | 0
 .../com/amazon/ion/impl/bin/BlockAllocatorProviders.java      | 0
 src/{ => main/java}/com/amazon/ion/impl/bin/IntList.java      | 0
 .../java}/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java | 0
 .../java}/com/amazon/ion/impl/bin/IonEncoder_1_1.java         | 0
 .../java}/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java | 0
 .../java}/com/amazon/ion/impl/bin/IonRawBinaryWriter.java     | 0
 .../java}/com/amazon/ion/impl/bin/Ion_1_1_Constants.java      | 0
 src/{ => main/java}/com/amazon/ion/impl/bin/OpCodes.java      | 0
 .../com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java | 0
 src/{ => main/java}/com/amazon/ion/impl/bin/Symbols.java      | 0
 src/{ => main/java}/com/amazon/ion/impl/bin/WriteBuffer.java  | 0
 .../com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java   | 0
 .../ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java  | 0
 .../com/amazon/ion/impl/bin/_Private_IonManagedWriter.java    | 0
 .../java}/com/amazon/ion/impl/bin/_Private_IonRawWriter.java  | 0
 src/{ => main/java}/com/amazon/ion/impl/bin/package-info.java | 0
 .../java}/com/amazon/ion/impl/bin/utf8/ByteBufferPool.java    | 0
 src/{ => main/java}/com/amazon/ion/impl/bin/utf8/Pool.java    | 0
 .../java}/com/amazon/ion/impl/bin/utf8/Poolable.java          | 0
 .../com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java      | 0
 .../java}/com/amazon/ion/impl/bin/utf8/Utf8StringDecoder.java | 0
 .../com/amazon/ion/impl/bin/utf8/Utf8StringDecoderPool.java   | 0
 .../java}/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java | 0
 .../com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java   | 0
 .../java}/com/amazon/ion/impl/lite/ContainerlessContext.java  | 0
 src/{ => main/java}/com/amazon/ion/impl/lite/IonBlobLite.java | 0
 src/{ => main/java}/com/amazon/ion/impl/lite/IonBoolLite.java | 0
 src/{ => main/java}/com/amazon/ion/impl/lite/IonClobLite.java | 0
 .../java}/com/amazon/ion/impl/lite/IonContainerLite.java      | 0
 src/{ => main/java}/com/amazon/ion/impl/lite/IonContext.java  | 0
 .../java}/com/amazon/ion/impl/lite/IonDatagramLite.java       | 0
 .../java}/com/amazon/ion/impl/lite/IonDecimalLite.java        | 0
 .../java}/com/amazon/ion/impl/lite/IonFloatLite.java          | 0
 src/{ => main/java}/com/amazon/ion/impl/lite/IonIntLite.java  | 0
 src/{ => main/java}/com/amazon/ion/impl/lite/IonListLite.java | 0
 .../java}/com/amazon/ion/impl/lite/IonLoaderLite.java         | 0
 src/{ => main/java}/com/amazon/ion/impl/lite/IonLobLite.java  | 0
 src/{ => main/java}/com/amazon/ion/impl/lite/IonNullLite.java | 0
 .../java}/com/amazon/ion/impl/lite/IonSequenceLite.java       | 0
 src/{ => main/java}/com/amazon/ion/impl/lite/IonSexpLite.java | 0
 .../java}/com/amazon/ion/impl/lite/IonStringLite.java         | 0
 .../java}/com/amazon/ion/impl/lite/IonStructLite.java         | 0
 .../java}/com/amazon/ion/impl/lite/IonSymbolLite.java         | 0
 .../java}/com/amazon/ion/impl/lite/IonSystemLite.java         | 0
 src/{ => main/java}/com/amazon/ion/impl/lite/IonTextLite.java | 0
 .../java}/com/amazon/ion/impl/lite/IonTimestampLite.java      | 0
 .../java}/com/amazon/ion/impl/lite/IonValueLite.java          | 0
 .../java}/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java  | 0
 .../java}/com/amazon/ion/impl/lite/TopLevelContext.java       | 0
 .../java}/com/amazon/ion/impl/lite/ValueFactoryLite.java      | 0
 .../com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java  | 0
 src/{ => main/java}/com/amazon/ion/overview.html              | 0
 src/{ => main/java}/com/amazon/ion/package-info.java          | 0
 .../java}/com/amazon/ion/system/IonBinaryWriterBuilder.java   | 0
 .../java}/com/amazon/ion/system/IonReaderBuilder.java         | 0
 .../java}/com/amazon/ion/system/IonSystemBuilder.java         | 0
 .../java}/com/amazon/ion/system/IonTextWriterBuilder.java     | 0
 .../java}/com/amazon/ion/system/IonWriterBuilder.java         | 0
 .../java}/com/amazon/ion/system/IonWriterBuilderBase.java     | 0
 src/{ => main/java}/com/amazon/ion/system/SimpleCatalog.java  | 0
 src/{ => main/java}/com/amazon/ion/system/SystemFactory.java  | 0
 src/{ => main/java}/com/amazon/ion/system/package-info.java   | 0
 .../java}/com/amazon/ion/util/AbstractValueVisitor.java       | 0
 src/{ => main/java}/com/amazon/ion/util/Equivalence.java      | 0
 .../java}/com/amazon/ion/util/GzipOrRawInputStream.java       | 0
 src/{ => main/java}/com/amazon/ion/util/IonStreamUtils.java   | 0
 src/{ => main/java}/com/amazon/ion/util/IonTextUtils.java     | 0
 src/{ => main/java}/com/amazon/ion/util/IonValueUtils.java    | 0
 src/{ => main/java}/com/amazon/ion/util/JarInfo.java          | 0
 src/{ => main/java}/com/amazon/ion/util/Printer.java          | 0
 src/{ => main/java}/com/amazon/ion/util/Spans.java            | 0
 .../java}/com/amazon/ion/util/_Private_FastAppendable.java    | 0
 src/{ => main/java}/com/amazon/ion/util/package-info.java     | 0
 .../test/java}/com/amazon/ion/AnnotationEscapesTest.java      | 0
 .../test/java}/com/amazon/ion/AssertionsEnabledTest.java      | 0
 {test => src/test/java}/com/amazon/ion/BadIonTest.java        | 0
 .../ion/BinaryByteArrayIteratorSystemProcessingTest.java      | 0
 .../ion/BinaryIonReaderIteratorSystemProcessingTest.java      | 0
 .../com/amazon/ion/BinaryReaderSystemProcessingTest.java      | 0
 .../com/amazon/ion/BinaryReaderWrappedValueLengthTest.java    | 0
 .../amazon/ion/BinaryStreamIteratorSystemProcessingTest.java  | 0
 {test => src/test/java}/com/amazon/ion/BinaryTest.java        | 0
 {test => src/test/java}/com/amazon/ion/BitUtils.java          | 0
 {test => src/test/java}/com/amazon/ion/BlobTest.java          | 0
 {test => src/test/java}/com/amazon/ion/BoolTest.java          | 0
 {test => src/test/java}/com/amazon/ion/Checker.java           | 0
 {test => src/test/java}/com/amazon/ion/ClobTest.java          | 0
 {test => src/test/java}/com/amazon/ion/CloneTest.java         | 0
 {test => src/test/java}/com/amazon/ion/ContainerTestCase.java | 0
 .../com/amazon/ion/DatagramIteratorSystemProcessingTest.java  | 0
 {test => src/test/java}/com/amazon/ion/DatagramMaker.java     | 0
 {test => src/test/java}/com/amazon/ion/DatagramTest.java      | 0
 .../amazon/ion/DatagramTreeReaderSystemProcessingTest.java    | 0
 {test => src/test/java}/com/amazon/ion/DecimalTest.java       | 0
 {test => src/test/java}/com/amazon/ion/EquivTimelineTest.java | 0
 {test => src/test/java}/com/amazon/ion/EquivsTest.java        | 0
 {test => src/test/java}/com/amazon/ion/EquivsTestCase.java    | 0
 .../test/java}/com/amazon/ion/ExtendedDecimalTest.java        | 0
 {test => src/test/java}/com/amazon/ion/FakeSymbolToken.java   | 0
 .../test/java}/com/amazon/ion/FieldNameEscapesTest.java       | 0
 {test => src/test/java}/com/amazon/ion/FloatTest.java         | 0
 {test => src/test/java}/com/amazon/ion/GoodIonTest.java       | 0
 .../test/java}/com/amazon/ion/HashCodeCorrectnessTest.java    | 0
 .../test/java}/com/amazon/ion/HashCodeDeltaCollisionTest.java | 0
 .../test/java}/com/amazon/ion/HashCodeDistributionTest.java   | 0
 .../test/java}/com/amazon/ion/InputStreamWrapper.java         | 0
 {test => src/test/java}/com/amazon/ion/IntTest.java           | 0
 {test => src/test/java}/com/amazon/ion/IonExceptionTest.java  | 0
 .../test/java}/com/amazon/ion/IonRawWriterBasicTest.java      | 0
 .../test/java}/com/amazon/ion/IonRawWriterSymbolsTest.java    | 0
 .../test/java}/com/amazon/ion/IonReaderToIonValueTest.java    | 0
 {test => src/test/java}/com/amazon/ion/IonSystemTest.java     | 0
 {test => src/test/java}/com/amazon/ion/IonTestCase.java       | 0
 {test => src/test/java}/com/amazon/ion/IonValueChecker.java   | 0
 .../test/java}/com/amazon/ion/IonValueDeltaGenerator.java     | 0
 {test => src/test/java}/com/amazon/ion/IonValueTest.java      | 0
 .../com/amazon/ion/IteratorSystemProcessingTestCase.java      | 0
 {test => src/test/java}/com/amazon/ion/JavaNumericsTest.java  | 0
 .../amazon/ion/JavaReaderIteratorSystemProcessingTest.java    | 0
 {test => src/test/java}/com/amazon/ion/ListTest.java          | 0
 .../com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java   | 0
 .../amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java   | 0
 .../com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java  | 0
 .../com/amazon/ion/LoadTextBytesSystemProcessingTest.java     | 0
 .../com/amazon/ion/LoadTextStreamSystemProcessingTest.java    | 0
 {test => src/test/java}/com/amazon/ion/LoaderTest.java        | 0
 {test => src/test/java}/com/amazon/ion/LongStringTest.java    | 0
 .../amazon/ion/NewDatagramIteratorSystemProcessingTest.java   | 0
 {test => src/test/java}/com/amazon/ion/NonEquivsTest.java     | 0
 {test => src/test/java}/com/amazon/ion/NopPaddingTest.java    | 0
 {test => src/test/java}/com/amazon/ion/NullTest.java          | 0
 .../java}/com/amazon/ion/RawValueSpanReaderBasicTest.java     | 0
 {test => src/test/java}/com/amazon/ion/ReaderChecker.java     | 0
 {test => src/test/java}/com/amazon/ion/ReaderMaker.java       | 0
 .../java}/com/amazon/ion/ReaderSystemProcessingTestCase.java  | 0
 {test => src/test/java}/com/amazon/ion/RoundTripTest.java     | 0
 {test => src/test/java}/com/amazon/ion/SequenceTestCase.java  | 0
 {test => src/test/java}/com/amazon/ion/SexpTest.java          | 0
 {test => src/test/java}/com/amazon/ion/SharedSymtabMaker.java | 0
 .../test/java}/com/amazon/ion/StringFieldNameEscapesTest.java | 0
 {test => src/test/java}/com/amazon/ion/StringTest.java        | 0
 {test => src/test/java}/com/amazon/ion/StructTest.java        | 0
 .../test/java}/com/amazon/ion/SurrogateEscapeTest.java        | 0
 {test => src/test/java}/com/amazon/ion/SymbolTest.java        | 0
 .../test/java}/com/amazon/ion/SystemProcessingTestCase.java   | 0
 .../test/java}/com/amazon/ion/SystemProcessingTests.java      | 0
 {test => src/test/java}/com/amazon/ion/TestUtils.java         | 0
 .../amazon/ion/TextByteArrayIteratorSystemProcessingTest.java | 0
 .../com/amazon/ion/TextIteratorSystemProcessingTest.java      | 0
 .../java}/com/amazon/ion/TextReaderSystemProcessingTest.java  | 0
 .../amazon/ion/TextStreamIteratorSystemProcessingTest.java    | 0
 {test => src/test/java}/com/amazon/ion/TextTestCase.java      | 0
 {test => src/test/java}/com/amazon/ion/TimestampBadTest.java  | 0
 {test => src/test/java}/com/amazon/ion/TimestampGoodTest.java | 0
 {test => src/test/java}/com/amazon/ion/TimestampTest.java     | 0
 .../test/java}/com/amazon/ion/TrBwBrProcessingTest.java       | 0
 .../test/java}/com/amazon/ion/TrueSequenceTestCase.java       | 0
 .../test/java}/com/amazon/ion/ValueFactorySequenceTest.java   | 0
 {test => src/test/java}/com/amazon/ion/facet/FacetsTest.java  | 0
 .../test/java}/com/amazon/ion/impl/BinaryWriterTest.java      | 0
 .../com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java | 0
 .../test/java}/com/amazon/ion/impl/ByteBufferTest.java        | 0
 .../test/java}/com/amazon/ion/impl/CharacterReaderTest.java   | 0
 .../test/java}/com/amazon/ion/impl/EscapingCallback.java      | 0
 .../test/java}/com/amazon/ion/impl/IonCursorBinaryTest.java   | 0
 .../java}/com/amazon/ion/impl/IonCursorTestUtilities.java     | 0
 .../test/java}/com/amazon/ion/impl/IonImplUtilsTest.java      | 0
 .../java}/com/amazon/ion/impl/IonMarkupWriterFilesTest.java   | 0
 .../test/java}/com/amazon/ion/impl/IonMarkupWriterTest.java   | 0
 .../com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java   | 0
 .../com/amazon/ion/impl/IonReaderBinaryRawStringTest.java     | 0
 .../ion/impl/IonReaderContinuableApplicationBinaryTest.java   | 0
 .../amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java   | 0
 .../ion/impl/IonReaderContinuableTopLevelBinaryTest.java      | 0
 .../amazon/ion/impl/IonRoundtripConcurrencyStressTest.java    | 0
 {test => src/test/java}/com/amazon/ion/impl/IonUTF8Test.java  | 0
 .../test/java}/com/amazon/ion/impl/IonWriterTestCase.java     | 0
 .../test/java}/com/amazon/ion/impl/IonWriterTests.java        | 0
 .../test/java}/com/amazon/ion/impl/IterationTest.java         | 0
 .../test/java}/com/amazon/ion/impl/LocalSymbolTableTest.java  | 0
 .../test/java}/com/amazon/ion/impl/OldBinaryWriterTest.java   | 0
 .../ion/impl/OptimizedBinaryWriterLengthPatchingTest.java     | 0
 .../amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java | 0
 .../com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java    | 0
 .../java}/com/amazon/ion/impl/OutputStreamWriterTestCase.java | 0
 .../java}/com/amazon/ion/impl/RawValueSpanReaderTest.java     | 0
 .../com/amazon/ion/impl/ResizingPipedInputStreamTest.java     | 0
 .../test/java}/com/amazon/ion/impl/SharedSymbolTableTest.java | 0
 .../test/java}/com/amazon/ion/impl/SymbolTableTest.java       | 0
 {test => src/test/java}/com/amazon/ion/impl/Symtabs.java      | 0
 .../test/java}/com/amazon/ion/impl/TestMarkupCallback.java    | 0
 .../test/java}/com/amazon/ion/impl/TextWriterTest.java        | 0
 .../test/java}/com/amazon/ion/impl/TreeReaderTest.java        | 0
 .../java}/com/amazon/ion/impl/UnifiedInputStreamXTest.java    | 0
 .../test/java}/com/amazon/ion/impl/ValueWriterTest.java       | 0
 .../com/amazon/ion/impl/_Private_ScalarConversionsTest.java   | 0
 .../test/java}/com/amazon/ion/impl/bin/IntListTest.java       | 0
 .../java}/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java     | 0
 .../amazon/ion/impl/bin/IonManagedBinaryWriterGoodTest.java   | 0
 .../com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java   | 0
 .../amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java   | 0
 .../java}/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java | 0
 .../amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java | 0
 .../ion/impl/bin/SystemSymbolResolvingIonRawBinaryWriter.java | 0
 .../test/java}/com/amazon/ion/impl/bin/WriteBufferTest.java   | 0
 .../ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java     | 0
 .../com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java | 0
 .../test/java}/com/amazon/ion/impl/lite/IonContextTest.java   | 0
 .../com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java  | 0
 .../java}/com/amazon/ion/impl/lite/IonDatagramLiteTest.java   | 0
 .../test/java}/com/amazon/ion/impl/lite/IonListLiteTest.java  | 0
 .../com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java  | 0
 .../impl/lite/IonSequenceLiteSubListViewEqualityTests.java    | 0
 .../test/java}/com/amazon/ion/impl/lite/IonSexpLiteTest.java  | 0
 .../java}/com/amazon/ion/impl/lite/IonSystemLiteTest.java     | 0
 .../com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java     | 0
 {test => src/test/java}/com/amazon/ion/junit/Injected.java    | 0
 {test => src/test/java}/com/amazon/ion/junit/IonAssert.java   | 0
 .../test/java}/com/amazon/ion/profile/IteratorTiming.java     | 0
 .../java}/com/amazon/ion/streaming/BadIonStreamingTest.java   | 0
 .../java}/com/amazon/ion/streaming/BinaryStreamingTest.java   | 0
 .../java}/com/amazon/ion/streaming/GoodIonStreamingTest.java  | 0
 .../java}/com/amazon/ion/streaming/InputStreamReaderTest.java | 0
 .../java}/com/amazon/ion/streaming/MiscStreamingTest.java     | 0
 .../com/amazon/ion/streaming/NonOffsetSpanReaderTest.java     | 0
 .../java}/com/amazon/ion/streaming/NonSeekableReaderTest.java | 0
 .../java}/com/amazon/ion/streaming/NonSpanReaderTest.java     | 0
 .../test/java}/com/amazon/ion/streaming/NonTextSpanTest.java  | 0
 .../com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java  | 0
 .../java}/com/amazon/ion/streaming/OffsetSpanReaderTest.java  | 0
 .../test/java}/com/amazon/ion/streaming/ReaderCompare.java    | 0
 .../java}/com/amazon/ion/streaming/ReaderDomCopyTest.java     | 0
 .../java}/com/amazon/ion/streaming/ReaderFacetTestCase.java   | 0
 .../java}/com/amazon/ion/streaming/ReaderIntegerSizeTest.java | 0
 .../java}/com/amazon/ion/streaming/ReaderSkippingTest.java    | 0
 .../test/java}/com/amazon/ion/streaming/ReaderTest.java       | 0
 .../test/java}/com/amazon/ion/streaming/ReaderTestCase.java   | 0
 .../com/amazon/ion/streaming/RoundTripStreamingTest.java      | 0
 .../java}/com/amazon/ion/streaming/SeekableReaderTest.java    | 0
 .../test/java}/com/amazon/ion/streaming/SpanReaderTest.java   | 0
 .../test/java}/com/amazon/ion/streaming/SpanTests.java        | 0
 .../test/java}/com/amazon/ion/streaming/TextSpanTest.java     | 0
 .../com/amazon/ion/system/IonBinaryWriterBuilderTest.java     | 0
 .../java}/com/amazon/ion/system/IonReaderBuilderTest.java     | 0
 .../java}/com/amazon/ion/system/IonSystemBuilderTest.java     | 0
 .../java}/com/amazon/ion/system/IonTextWriterBuilderTest.java | 0
 .../test/java}/com/amazon/ion/system/SimpleCatalogTest.java   | 0
 .../test/java}/com/amazon/ion/util/EquivalenceTest.java       | 0
 .../test/java}/com/amazon/ion/util/IonStreamUtilsTest.java    | 0
 {test => src/test/java}/com/amazon/ion/util/JarInfoTest.java  | 0
 .../test/java}/com/amazon/ion/util/NullOutputStream.java      | 0
 {test => src/test/java}/com/amazon/ion/util/PrinterTest.java  | 0
 .../test/java}/com/amazon/ion/util/RepeatInputStream.java     | 0
 {test => src/test/java}/com/amazon/ion/util/SpansTest.java    | 0
 {test => src/test/java}/com/amazon/ion/util/TextTest.java     | 0
 416 files changed, 4 deletions(-)
 rename src/{ => main/java}/com/amazon/ion/BufferConfiguration.java (100%)
 rename src/{ => main/java}/com/amazon/ion/ContainedValueException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/Decimal.java (100%)
 rename src/{ => main/java}/com/amazon/ion/EmptySymbolException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IntegerSize.java (100%)
 rename src/{ => main/java}/com/amazon/ion/InvalidSystemSymbolException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonBinaryWriter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonBlob.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonBool.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonBufferConfiguration.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonCatalog.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonClob.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonContainer.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonCursor.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonDatagram.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonDecimal.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonFloat.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonInt.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonList.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonLoader.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonLob.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonMutableCatalog.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonNull.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonNumber.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonReader.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonSequence.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonSexp.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonString.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonStruct.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonSymbol.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonSystem.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonText.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonTextReader.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonTimestamp.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonType.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonValue.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IonWriter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/IvmNotificationConsumer.java (100%)
 rename src/{ => main/java}/com/amazon/ion/NullValueException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/OffsetSpan.java (100%)
 rename src/{ => main/java}/com/amazon/ion/OversizedValueException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/RawValueSpanProvider.java (100%)
 rename src/{ => main/java}/com/amazon/ion/ReadOnlyValueException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/SeekableReader.java (100%)
 rename src/{ => main/java}/com/amazon/ion/Span.java (100%)
 rename src/{ => main/java}/com/amazon/ion/SpanProvider.java (100%)
 rename src/{ => main/java}/com/amazon/ion/SubstituteSymbolTableException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/SymbolTable.java (100%)
 rename src/{ => main/java}/com/amazon/ion/SymbolToken.java (100%)
 rename src/{ => main/java}/com/amazon/ion/SystemSymbols.java (100%)
 rename src/{ => main/java}/com/amazon/ion/TextSpan.java (100%)
 rename src/{ => main/java}/com/amazon/ion/Timestamp.java (100%)
 rename src/{ => main/java}/com/amazon/ion/UnexpectedEofException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/UnknownSymbolException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/UnsupportedIonVersionException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/ValueFactory.java (100%)
 rename src/{ => main/java}/com/amazon/ion/ValueVisitor.java (100%)
 rename src/{ => main/java}/com/amazon/ion/apps/BaseApp.java (100%)
 rename src/{ => main/java}/com/amazon/ion/apps/EncodeApp.java (100%)
 rename src/{ => main/java}/com/amazon/ion/apps/PrintApp.java (100%)
 rename src/{ => main/java}/com/amazon/ion/apps/SymtabApp.java (100%)
 rename src/{ => main/java}/com/amazon/ion/facet/Faceted.java (100%)
 rename src/{ => main/java}/com/amazon/ion/facet/Facets.java (100%)
 rename src/{ => main/java}/com/amazon/ion/facet/UnsupportedFacetException.java (100%)
 rename src/{ => main/java}/com/amazon/ion/facet/package-info.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/AppendableFastAppendable.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/Base64Encoder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/BlockedBuffer.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/ByteBuffer.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/ByteReader.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/ByteWriter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/DowncastingFaceted.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonBinary.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonCharacterReader.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonCursorBinary.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonIteratorImpl.kt (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonMessages.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderContinuableApplication.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderContinuableCore.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderNonContinuableSystem.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderTextRawTokensX.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderTextRawX.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderTextSystemX.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderTextUserX.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderTreeSystem.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonReaderTreeUserX.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonTextBufferedStream.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonTokenConstsX.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonTokenReader.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonTypeID.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonUTF8.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonWriterSystem.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonWriterSystemBinary.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonWriterSystemText.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonWriterSystemTextMarkup.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonWriterSystemTree.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonWriterUser.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/IonWriterUserBinary.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/LocalSymbolTable.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/LocalSymbolTableAsStruct.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/LocalSymbolTableImports.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/Marker.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/OutputStreamFastAppendable.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/ResizingPipedInputStream.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/SharedSymbolTable.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/SimpleByteBuffer.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/SubstituteSymbolTable.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/SymbolTableAsStruct.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/SymbolTableReader.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/SymbolTableStructCache.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/SymbolTokenImpl.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/SystemValueIterator.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/UnifiedDataPageX.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/UnifiedInputBufferX.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/UnifiedInputStreamX.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/UnifiedSavePointManagerX.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_ByteTransferReader.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_ByteTransferSink.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_CallbackBuilder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_CommandLine.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_CurriedValueFactory.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_FastAppendableDecorator.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IncrementalReader.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonConstants.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonContainer.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonDatagram.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonReaderBuilder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonReaderFactory.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonSymbol.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonSystem.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonTextAppender.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonValue.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonWriter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonWriterBase.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_IonWriterFactory.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_ListWriter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_LocalSymbolTable.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_MarkupCallback.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_ReaderWriter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_RecyclingQueue.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_RecyclingStack.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_ScalarConversions.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_SymbolToken.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_SymtabExtendsCache.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_Utils.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/_Private_ValueFactory.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/AbstractIonWriter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/AbstractSymbolTable.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/Block.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/BlockAllocator.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/BlockAllocatorProvider.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/BlockAllocatorProviders.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/IntList.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/IonEncoder_1_1.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/IonRawBinaryWriter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/Ion_1_1_Constants.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/OpCodes.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/Symbols.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/WriteBuffer.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/_Private_IonRawWriter.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/package-info.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/utf8/ByteBufferPool.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/utf8/Pool.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/utf8/Poolable.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/utf8/Utf8StringDecoder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/utf8/Utf8StringDecoderPool.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/ContainerlessContext.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonBlobLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonBoolLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonClobLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonContainerLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonContext.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonDatagramLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonDecimalLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonFloatLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonIntLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonListLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonLoaderLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonLobLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonNullLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonSequenceLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonSexpLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonStringLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonStructLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonSymbolLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonSystemLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonTextLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonTimestampLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/IonValueLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/TopLevelContext.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/ValueFactoryLite.java (100%)
 rename src/{ => main/java}/com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java (100%)
 rename src/{ => main/java}/com/amazon/ion/overview.html (100%)
 rename src/{ => main/java}/com/amazon/ion/package-info.java (100%)
 rename src/{ => main/java}/com/amazon/ion/system/IonBinaryWriterBuilder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/system/IonReaderBuilder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/system/IonSystemBuilder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/system/IonTextWriterBuilder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/system/IonWriterBuilder.java (100%)
 rename src/{ => main/java}/com/amazon/ion/system/IonWriterBuilderBase.java (100%)
 rename src/{ => main/java}/com/amazon/ion/system/SimpleCatalog.java (100%)
 rename src/{ => main/java}/com/amazon/ion/system/SystemFactory.java (100%)
 rename src/{ => main/java}/com/amazon/ion/system/package-info.java (100%)
 rename src/{ => main/java}/com/amazon/ion/util/AbstractValueVisitor.java (100%)
 rename src/{ => main/java}/com/amazon/ion/util/Equivalence.java (100%)
 rename src/{ => main/java}/com/amazon/ion/util/GzipOrRawInputStream.java (100%)
 rename src/{ => main/java}/com/amazon/ion/util/IonStreamUtils.java (100%)
 rename src/{ => main/java}/com/amazon/ion/util/IonTextUtils.java (100%)
 rename src/{ => main/java}/com/amazon/ion/util/IonValueUtils.java (100%)
 rename src/{ => main/java}/com/amazon/ion/util/JarInfo.java (100%)
 rename src/{ => main/java}/com/amazon/ion/util/Printer.java (100%)
 rename src/{ => main/java}/com/amazon/ion/util/Spans.java (100%)
 rename src/{ => main/java}/com/amazon/ion/util/_Private_FastAppendable.java (100%)
 rename src/{ => main/java}/com/amazon/ion/util/package-info.java (100%)
 rename {test => src/test/java}/com/amazon/ion/AnnotationEscapesTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/AssertionsEnabledTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/BadIonTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/BinaryReaderSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/BinaryTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/BitUtils.java (100%)
 rename {test => src/test/java}/com/amazon/ion/BlobTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/BoolTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/Checker.java (100%)
 rename {test => src/test/java}/com/amazon/ion/ClobTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/CloneTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/ContainerTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/DatagramIteratorSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/DatagramMaker.java (100%)
 rename {test => src/test/java}/com/amazon/ion/DatagramTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/DecimalTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/EquivTimelineTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/EquivsTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/EquivsTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/ExtendedDecimalTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/FakeSymbolToken.java (100%)
 rename {test => src/test/java}/com/amazon/ion/FieldNameEscapesTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/FloatTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/GoodIonTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/HashCodeCorrectnessTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/HashCodeDeltaCollisionTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/HashCodeDistributionTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/InputStreamWrapper.java (100%)
 rename {test => src/test/java}/com/amazon/ion/IntTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/IonExceptionTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/IonRawWriterBasicTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/IonRawWriterSymbolsTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/IonReaderToIonValueTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/IonSystemTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/IonTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/IonValueChecker.java (100%)
 rename {test => src/test/java}/com/amazon/ion/IonValueDeltaGenerator.java (100%)
 rename {test => src/test/java}/com/amazon/ion/IonValueTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/IteratorSystemProcessingTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/JavaNumericsTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/JavaReaderIteratorSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/ListTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/LoadTextBytesSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/LoadTextStreamSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/LoaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/LongStringTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/NewDatagramIteratorSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/NonEquivsTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/NopPaddingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/NullTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/RawValueSpanReaderBasicTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/ReaderChecker.java (100%)
 rename {test => src/test/java}/com/amazon/ion/ReaderMaker.java (100%)
 rename {test => src/test/java}/com/amazon/ion/ReaderSystemProcessingTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/RoundTripTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/SequenceTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/SexpTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/SharedSymtabMaker.java (100%)
 rename {test => src/test/java}/com/amazon/ion/StringFieldNameEscapesTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/StringTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/StructTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/SurrogateEscapeTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/SymbolTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/SystemProcessingTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/SystemProcessingTests.java (100%)
 rename {test => src/test/java}/com/amazon/ion/TestUtils.java (100%)
 rename {test => src/test/java}/com/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/TextIteratorSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/TextReaderSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/TextStreamIteratorSystemProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/TextTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/TimestampBadTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/TimestampGoodTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/TimestampTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/TrBwBrProcessingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/TrueSequenceTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/ValueFactorySequenceTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/facet/FacetsTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/BinaryWriterTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/ByteBufferTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/CharacterReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/EscapingCallback.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonCursorBinaryTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonCursorTestUtilities.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonImplUtilsTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonMarkupWriterFilesTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonMarkupWriterTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonUTF8Test.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonWriterTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IonWriterTests.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/IterationTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/LocalSymbolTableTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/OldBinaryWriterTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/OutputStreamWriterTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/RawValueSpanReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/ResizingPipedInputStreamTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/SharedSymbolTableTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/SymbolTableTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/Symtabs.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/TestMarkupCallback.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/TextWriterTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/TreeReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/UnifiedInputStreamXTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/ValueWriterTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/_Private_ScalarConversionsTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/bin/IntListTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/bin/IonManagedBinaryWriterGoodTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/bin/SystemSymbolResolvingIonRawBinaryWriter.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/bin/WriteBufferTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/lite/IonContextTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/lite/IonDatagramLiteTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/lite/IonListLiteTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/lite/IonSequenceLiteSubListViewEqualityTests.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/lite/IonSexpLiteTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/lite/IonSystemLiteTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/junit/Injected.java (100%)
 rename {test => src/test/java}/com/amazon/ion/junit/IonAssert.java (100%)
 rename {test => src/test/java}/com/amazon/ion/profile/IteratorTiming.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/BadIonStreamingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/BinaryStreamingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/GoodIonStreamingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/InputStreamReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/MiscStreamingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/NonOffsetSpanReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/NonSeekableReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/NonSpanReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/NonTextSpanTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/OffsetSpanReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/ReaderCompare.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/ReaderDomCopyTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/ReaderFacetTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/ReaderIntegerSizeTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/ReaderSkippingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/ReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/ReaderTestCase.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/RoundTripStreamingTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/SeekableReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/SpanReaderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/SpanTests.java (100%)
 rename {test => src/test/java}/com/amazon/ion/streaming/TextSpanTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/system/IonBinaryWriterBuilderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/system/IonReaderBuilderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/system/IonSystemBuilderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/system/IonTextWriterBuilderTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/system/SimpleCatalogTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/util/EquivalenceTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/util/IonStreamUtilsTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/util/JarInfoTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/util/NullOutputStream.java (100%)
 rename {test => src/test/java}/com/amazon/ion/util/PrinterTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/util/RepeatInputStream.java (100%)
 rename {test => src/test/java}/com/amazon/ion/util/SpansTest.java (100%)
 rename {test => src/test/java}/com/amazon/ion/util/TextTest.java (100%)

diff --git a/build.gradle.kts b/build.gradle.kts
index 026e0840de..b52819b33c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -68,12 +68,8 @@ lateinit var javadocArtifact: PublishArtifact
 
 sourceSets {
     main {
-        java.srcDir("src")
         resources.srcDir(generatedResourcesDir)
     }
-    test {
-        java.srcDir("test")
-    }
 }
 
 licenseReport {
diff --git a/src/com/amazon/ion/BufferConfiguration.java b/src/main/java/com/amazon/ion/BufferConfiguration.java
similarity index 100%
rename from src/com/amazon/ion/BufferConfiguration.java
rename to src/main/java/com/amazon/ion/BufferConfiguration.java
diff --git a/src/com/amazon/ion/ContainedValueException.java b/src/main/java/com/amazon/ion/ContainedValueException.java
similarity index 100%
rename from src/com/amazon/ion/ContainedValueException.java
rename to src/main/java/com/amazon/ion/ContainedValueException.java
diff --git a/src/com/amazon/ion/Decimal.java b/src/main/java/com/amazon/ion/Decimal.java
similarity index 100%
rename from src/com/amazon/ion/Decimal.java
rename to src/main/java/com/amazon/ion/Decimal.java
diff --git a/src/com/amazon/ion/EmptySymbolException.java b/src/main/java/com/amazon/ion/EmptySymbolException.java
similarity index 100%
rename from src/com/amazon/ion/EmptySymbolException.java
rename to src/main/java/com/amazon/ion/EmptySymbolException.java
diff --git a/src/com/amazon/ion/IntegerSize.java b/src/main/java/com/amazon/ion/IntegerSize.java
similarity index 100%
rename from src/com/amazon/ion/IntegerSize.java
rename to src/main/java/com/amazon/ion/IntegerSize.java
diff --git a/src/com/amazon/ion/InvalidSystemSymbolException.java b/src/main/java/com/amazon/ion/InvalidSystemSymbolException.java
similarity index 100%
rename from src/com/amazon/ion/InvalidSystemSymbolException.java
rename to src/main/java/com/amazon/ion/InvalidSystemSymbolException.java
diff --git a/src/com/amazon/ion/IonBinaryWriter.java b/src/main/java/com/amazon/ion/IonBinaryWriter.java
similarity index 100%
rename from src/com/amazon/ion/IonBinaryWriter.java
rename to src/main/java/com/amazon/ion/IonBinaryWriter.java
diff --git a/src/com/amazon/ion/IonBlob.java b/src/main/java/com/amazon/ion/IonBlob.java
similarity index 100%
rename from src/com/amazon/ion/IonBlob.java
rename to src/main/java/com/amazon/ion/IonBlob.java
diff --git a/src/com/amazon/ion/IonBool.java b/src/main/java/com/amazon/ion/IonBool.java
similarity index 100%
rename from src/com/amazon/ion/IonBool.java
rename to src/main/java/com/amazon/ion/IonBool.java
diff --git a/src/com/amazon/ion/IonBufferConfiguration.java b/src/main/java/com/amazon/ion/IonBufferConfiguration.java
similarity index 100%
rename from src/com/amazon/ion/IonBufferConfiguration.java
rename to src/main/java/com/amazon/ion/IonBufferConfiguration.java
diff --git a/src/com/amazon/ion/IonCatalog.java b/src/main/java/com/amazon/ion/IonCatalog.java
similarity index 100%
rename from src/com/amazon/ion/IonCatalog.java
rename to src/main/java/com/amazon/ion/IonCatalog.java
diff --git a/src/com/amazon/ion/IonClob.java b/src/main/java/com/amazon/ion/IonClob.java
similarity index 100%
rename from src/com/amazon/ion/IonClob.java
rename to src/main/java/com/amazon/ion/IonClob.java
diff --git a/src/com/amazon/ion/IonContainer.java b/src/main/java/com/amazon/ion/IonContainer.java
similarity index 100%
rename from src/com/amazon/ion/IonContainer.java
rename to src/main/java/com/amazon/ion/IonContainer.java
diff --git a/src/com/amazon/ion/IonCursor.java b/src/main/java/com/amazon/ion/IonCursor.java
similarity index 100%
rename from src/com/amazon/ion/IonCursor.java
rename to src/main/java/com/amazon/ion/IonCursor.java
diff --git a/src/com/amazon/ion/IonDatagram.java b/src/main/java/com/amazon/ion/IonDatagram.java
similarity index 100%
rename from src/com/amazon/ion/IonDatagram.java
rename to src/main/java/com/amazon/ion/IonDatagram.java
diff --git a/src/com/amazon/ion/IonDecimal.java b/src/main/java/com/amazon/ion/IonDecimal.java
similarity index 100%
rename from src/com/amazon/ion/IonDecimal.java
rename to src/main/java/com/amazon/ion/IonDecimal.java
diff --git a/src/com/amazon/ion/IonException.java b/src/main/java/com/amazon/ion/IonException.java
similarity index 100%
rename from src/com/amazon/ion/IonException.java
rename to src/main/java/com/amazon/ion/IonException.java
diff --git a/src/com/amazon/ion/IonFloat.java b/src/main/java/com/amazon/ion/IonFloat.java
similarity index 100%
rename from src/com/amazon/ion/IonFloat.java
rename to src/main/java/com/amazon/ion/IonFloat.java
diff --git a/src/com/amazon/ion/IonInt.java b/src/main/java/com/amazon/ion/IonInt.java
similarity index 100%
rename from src/com/amazon/ion/IonInt.java
rename to src/main/java/com/amazon/ion/IonInt.java
diff --git a/src/com/amazon/ion/IonList.java b/src/main/java/com/amazon/ion/IonList.java
similarity index 100%
rename from src/com/amazon/ion/IonList.java
rename to src/main/java/com/amazon/ion/IonList.java
diff --git a/src/com/amazon/ion/IonLoader.java b/src/main/java/com/amazon/ion/IonLoader.java
similarity index 100%
rename from src/com/amazon/ion/IonLoader.java
rename to src/main/java/com/amazon/ion/IonLoader.java
diff --git a/src/com/amazon/ion/IonLob.java b/src/main/java/com/amazon/ion/IonLob.java
similarity index 100%
rename from src/com/amazon/ion/IonLob.java
rename to src/main/java/com/amazon/ion/IonLob.java
diff --git a/src/com/amazon/ion/IonMutableCatalog.java b/src/main/java/com/amazon/ion/IonMutableCatalog.java
similarity index 100%
rename from src/com/amazon/ion/IonMutableCatalog.java
rename to src/main/java/com/amazon/ion/IonMutableCatalog.java
diff --git a/src/com/amazon/ion/IonNull.java b/src/main/java/com/amazon/ion/IonNull.java
similarity index 100%
rename from src/com/amazon/ion/IonNull.java
rename to src/main/java/com/amazon/ion/IonNull.java
diff --git a/src/com/amazon/ion/IonNumber.java b/src/main/java/com/amazon/ion/IonNumber.java
similarity index 100%
rename from src/com/amazon/ion/IonNumber.java
rename to src/main/java/com/amazon/ion/IonNumber.java
diff --git a/src/com/amazon/ion/IonReader.java b/src/main/java/com/amazon/ion/IonReader.java
similarity index 100%
rename from src/com/amazon/ion/IonReader.java
rename to src/main/java/com/amazon/ion/IonReader.java
diff --git a/src/com/amazon/ion/IonSequence.java b/src/main/java/com/amazon/ion/IonSequence.java
similarity index 100%
rename from src/com/amazon/ion/IonSequence.java
rename to src/main/java/com/amazon/ion/IonSequence.java
diff --git a/src/com/amazon/ion/IonSexp.java b/src/main/java/com/amazon/ion/IonSexp.java
similarity index 100%
rename from src/com/amazon/ion/IonSexp.java
rename to src/main/java/com/amazon/ion/IonSexp.java
diff --git a/src/com/amazon/ion/IonString.java b/src/main/java/com/amazon/ion/IonString.java
similarity index 100%
rename from src/com/amazon/ion/IonString.java
rename to src/main/java/com/amazon/ion/IonString.java
diff --git a/src/com/amazon/ion/IonStruct.java b/src/main/java/com/amazon/ion/IonStruct.java
similarity index 100%
rename from src/com/amazon/ion/IonStruct.java
rename to src/main/java/com/amazon/ion/IonStruct.java
diff --git a/src/com/amazon/ion/IonSymbol.java b/src/main/java/com/amazon/ion/IonSymbol.java
similarity index 100%
rename from src/com/amazon/ion/IonSymbol.java
rename to src/main/java/com/amazon/ion/IonSymbol.java
diff --git a/src/com/amazon/ion/IonSystem.java b/src/main/java/com/amazon/ion/IonSystem.java
similarity index 100%
rename from src/com/amazon/ion/IonSystem.java
rename to src/main/java/com/amazon/ion/IonSystem.java
diff --git a/src/com/amazon/ion/IonText.java b/src/main/java/com/amazon/ion/IonText.java
similarity index 100%
rename from src/com/amazon/ion/IonText.java
rename to src/main/java/com/amazon/ion/IonText.java
diff --git a/src/com/amazon/ion/IonTextReader.java b/src/main/java/com/amazon/ion/IonTextReader.java
similarity index 100%
rename from src/com/amazon/ion/IonTextReader.java
rename to src/main/java/com/amazon/ion/IonTextReader.java
diff --git a/src/com/amazon/ion/IonTimestamp.java b/src/main/java/com/amazon/ion/IonTimestamp.java
similarity index 100%
rename from src/com/amazon/ion/IonTimestamp.java
rename to src/main/java/com/amazon/ion/IonTimestamp.java
diff --git a/src/com/amazon/ion/IonType.java b/src/main/java/com/amazon/ion/IonType.java
similarity index 100%
rename from src/com/amazon/ion/IonType.java
rename to src/main/java/com/amazon/ion/IonType.java
diff --git a/src/com/amazon/ion/IonValue.java b/src/main/java/com/amazon/ion/IonValue.java
similarity index 100%
rename from src/com/amazon/ion/IonValue.java
rename to src/main/java/com/amazon/ion/IonValue.java
diff --git a/src/com/amazon/ion/IonWriter.java b/src/main/java/com/amazon/ion/IonWriter.java
similarity index 100%
rename from src/com/amazon/ion/IonWriter.java
rename to src/main/java/com/amazon/ion/IonWriter.java
diff --git a/src/com/amazon/ion/IvmNotificationConsumer.java b/src/main/java/com/amazon/ion/IvmNotificationConsumer.java
similarity index 100%
rename from src/com/amazon/ion/IvmNotificationConsumer.java
rename to src/main/java/com/amazon/ion/IvmNotificationConsumer.java
diff --git a/src/com/amazon/ion/NullValueException.java b/src/main/java/com/amazon/ion/NullValueException.java
similarity index 100%
rename from src/com/amazon/ion/NullValueException.java
rename to src/main/java/com/amazon/ion/NullValueException.java
diff --git a/src/com/amazon/ion/OffsetSpan.java b/src/main/java/com/amazon/ion/OffsetSpan.java
similarity index 100%
rename from src/com/amazon/ion/OffsetSpan.java
rename to src/main/java/com/amazon/ion/OffsetSpan.java
diff --git a/src/com/amazon/ion/OversizedValueException.java b/src/main/java/com/amazon/ion/OversizedValueException.java
similarity index 100%
rename from src/com/amazon/ion/OversizedValueException.java
rename to src/main/java/com/amazon/ion/OversizedValueException.java
diff --git a/src/com/amazon/ion/RawValueSpanProvider.java b/src/main/java/com/amazon/ion/RawValueSpanProvider.java
similarity index 100%
rename from src/com/amazon/ion/RawValueSpanProvider.java
rename to src/main/java/com/amazon/ion/RawValueSpanProvider.java
diff --git a/src/com/amazon/ion/ReadOnlyValueException.java b/src/main/java/com/amazon/ion/ReadOnlyValueException.java
similarity index 100%
rename from src/com/amazon/ion/ReadOnlyValueException.java
rename to src/main/java/com/amazon/ion/ReadOnlyValueException.java
diff --git a/src/com/amazon/ion/SeekableReader.java b/src/main/java/com/amazon/ion/SeekableReader.java
similarity index 100%
rename from src/com/amazon/ion/SeekableReader.java
rename to src/main/java/com/amazon/ion/SeekableReader.java
diff --git a/src/com/amazon/ion/Span.java b/src/main/java/com/amazon/ion/Span.java
similarity index 100%
rename from src/com/amazon/ion/Span.java
rename to src/main/java/com/amazon/ion/Span.java
diff --git a/src/com/amazon/ion/SpanProvider.java b/src/main/java/com/amazon/ion/SpanProvider.java
similarity index 100%
rename from src/com/amazon/ion/SpanProvider.java
rename to src/main/java/com/amazon/ion/SpanProvider.java
diff --git a/src/com/amazon/ion/SubstituteSymbolTableException.java b/src/main/java/com/amazon/ion/SubstituteSymbolTableException.java
similarity index 100%
rename from src/com/amazon/ion/SubstituteSymbolTableException.java
rename to src/main/java/com/amazon/ion/SubstituteSymbolTableException.java
diff --git a/src/com/amazon/ion/SymbolTable.java b/src/main/java/com/amazon/ion/SymbolTable.java
similarity index 100%
rename from src/com/amazon/ion/SymbolTable.java
rename to src/main/java/com/amazon/ion/SymbolTable.java
diff --git a/src/com/amazon/ion/SymbolToken.java b/src/main/java/com/amazon/ion/SymbolToken.java
similarity index 100%
rename from src/com/amazon/ion/SymbolToken.java
rename to src/main/java/com/amazon/ion/SymbolToken.java
diff --git a/src/com/amazon/ion/SystemSymbols.java b/src/main/java/com/amazon/ion/SystemSymbols.java
similarity index 100%
rename from src/com/amazon/ion/SystemSymbols.java
rename to src/main/java/com/amazon/ion/SystemSymbols.java
diff --git a/src/com/amazon/ion/TextSpan.java b/src/main/java/com/amazon/ion/TextSpan.java
similarity index 100%
rename from src/com/amazon/ion/TextSpan.java
rename to src/main/java/com/amazon/ion/TextSpan.java
diff --git a/src/com/amazon/ion/Timestamp.java b/src/main/java/com/amazon/ion/Timestamp.java
similarity index 100%
rename from src/com/amazon/ion/Timestamp.java
rename to src/main/java/com/amazon/ion/Timestamp.java
diff --git a/src/com/amazon/ion/UnexpectedEofException.java b/src/main/java/com/amazon/ion/UnexpectedEofException.java
similarity index 100%
rename from src/com/amazon/ion/UnexpectedEofException.java
rename to src/main/java/com/amazon/ion/UnexpectedEofException.java
diff --git a/src/com/amazon/ion/UnknownSymbolException.java b/src/main/java/com/amazon/ion/UnknownSymbolException.java
similarity index 100%
rename from src/com/amazon/ion/UnknownSymbolException.java
rename to src/main/java/com/amazon/ion/UnknownSymbolException.java
diff --git a/src/com/amazon/ion/UnsupportedIonVersionException.java b/src/main/java/com/amazon/ion/UnsupportedIonVersionException.java
similarity index 100%
rename from src/com/amazon/ion/UnsupportedIonVersionException.java
rename to src/main/java/com/amazon/ion/UnsupportedIonVersionException.java
diff --git a/src/com/amazon/ion/ValueFactory.java b/src/main/java/com/amazon/ion/ValueFactory.java
similarity index 100%
rename from src/com/amazon/ion/ValueFactory.java
rename to src/main/java/com/amazon/ion/ValueFactory.java
diff --git a/src/com/amazon/ion/ValueVisitor.java b/src/main/java/com/amazon/ion/ValueVisitor.java
similarity index 100%
rename from src/com/amazon/ion/ValueVisitor.java
rename to src/main/java/com/amazon/ion/ValueVisitor.java
diff --git a/src/com/amazon/ion/apps/BaseApp.java b/src/main/java/com/amazon/ion/apps/BaseApp.java
similarity index 100%
rename from src/com/amazon/ion/apps/BaseApp.java
rename to src/main/java/com/amazon/ion/apps/BaseApp.java
diff --git a/src/com/amazon/ion/apps/EncodeApp.java b/src/main/java/com/amazon/ion/apps/EncodeApp.java
similarity index 100%
rename from src/com/amazon/ion/apps/EncodeApp.java
rename to src/main/java/com/amazon/ion/apps/EncodeApp.java
diff --git a/src/com/amazon/ion/apps/PrintApp.java b/src/main/java/com/amazon/ion/apps/PrintApp.java
similarity index 100%
rename from src/com/amazon/ion/apps/PrintApp.java
rename to src/main/java/com/amazon/ion/apps/PrintApp.java
diff --git a/src/com/amazon/ion/apps/SymtabApp.java b/src/main/java/com/amazon/ion/apps/SymtabApp.java
similarity index 100%
rename from src/com/amazon/ion/apps/SymtabApp.java
rename to src/main/java/com/amazon/ion/apps/SymtabApp.java
diff --git a/src/com/amazon/ion/facet/Faceted.java b/src/main/java/com/amazon/ion/facet/Faceted.java
similarity index 100%
rename from src/com/amazon/ion/facet/Faceted.java
rename to src/main/java/com/amazon/ion/facet/Faceted.java
diff --git a/src/com/amazon/ion/facet/Facets.java b/src/main/java/com/amazon/ion/facet/Facets.java
similarity index 100%
rename from src/com/amazon/ion/facet/Facets.java
rename to src/main/java/com/amazon/ion/facet/Facets.java
diff --git a/src/com/amazon/ion/facet/UnsupportedFacetException.java b/src/main/java/com/amazon/ion/facet/UnsupportedFacetException.java
similarity index 100%
rename from src/com/amazon/ion/facet/UnsupportedFacetException.java
rename to src/main/java/com/amazon/ion/facet/UnsupportedFacetException.java
diff --git a/src/com/amazon/ion/facet/package-info.java b/src/main/java/com/amazon/ion/facet/package-info.java
similarity index 100%
rename from src/com/amazon/ion/facet/package-info.java
rename to src/main/java/com/amazon/ion/facet/package-info.java
diff --git a/src/com/amazon/ion/impl/AppendableFastAppendable.java b/src/main/java/com/amazon/ion/impl/AppendableFastAppendable.java
similarity index 100%
rename from src/com/amazon/ion/impl/AppendableFastAppendable.java
rename to src/main/java/com/amazon/ion/impl/AppendableFastAppendable.java
diff --git a/src/com/amazon/ion/impl/Base64Encoder.java b/src/main/java/com/amazon/ion/impl/Base64Encoder.java
similarity index 100%
rename from src/com/amazon/ion/impl/Base64Encoder.java
rename to src/main/java/com/amazon/ion/impl/Base64Encoder.java
diff --git a/src/com/amazon/ion/impl/BlockedBuffer.java b/src/main/java/com/amazon/ion/impl/BlockedBuffer.java
similarity index 100%
rename from src/com/amazon/ion/impl/BlockedBuffer.java
rename to src/main/java/com/amazon/ion/impl/BlockedBuffer.java
diff --git a/src/com/amazon/ion/impl/ByteBuffer.java b/src/main/java/com/amazon/ion/impl/ByteBuffer.java
similarity index 100%
rename from src/com/amazon/ion/impl/ByteBuffer.java
rename to src/main/java/com/amazon/ion/impl/ByteBuffer.java
diff --git a/src/com/amazon/ion/impl/ByteReader.java b/src/main/java/com/amazon/ion/impl/ByteReader.java
similarity index 100%
rename from src/com/amazon/ion/impl/ByteReader.java
rename to src/main/java/com/amazon/ion/impl/ByteReader.java
diff --git a/src/com/amazon/ion/impl/ByteWriter.java b/src/main/java/com/amazon/ion/impl/ByteWriter.java
similarity index 100%
rename from src/com/amazon/ion/impl/ByteWriter.java
rename to src/main/java/com/amazon/ion/impl/ByteWriter.java
diff --git a/src/com/amazon/ion/impl/DowncastingFaceted.java b/src/main/java/com/amazon/ion/impl/DowncastingFaceted.java
similarity index 100%
rename from src/com/amazon/ion/impl/DowncastingFaceted.java
rename to src/main/java/com/amazon/ion/impl/DowncastingFaceted.java
diff --git a/src/com/amazon/ion/impl/IonBinary.java b/src/main/java/com/amazon/ion/impl/IonBinary.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonBinary.java
rename to src/main/java/com/amazon/ion/impl/IonBinary.java
diff --git a/src/com/amazon/ion/impl/IonCharacterReader.java b/src/main/java/com/amazon/ion/impl/IonCharacterReader.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonCharacterReader.java
rename to src/main/java/com/amazon/ion/impl/IonCharacterReader.java
diff --git a/src/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonCursorBinary.java
rename to src/main/java/com/amazon/ion/impl/IonCursorBinary.java
diff --git a/src/com/amazon/ion/impl/IonIteratorImpl.kt b/src/main/java/com/amazon/ion/impl/IonIteratorImpl.kt
similarity index 100%
rename from src/com/amazon/ion/impl/IonIteratorImpl.kt
rename to src/main/java/com/amazon/ion/impl/IonIteratorImpl.kt
diff --git a/src/com/amazon/ion/impl/IonMessages.java b/src/main/java/com/amazon/ion/impl/IonMessages.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonMessages.java
rename to src/main/java/com/amazon/ion/impl/IonMessages.java
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplication.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplication.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderContinuableApplication.java
rename to src/main/java/com/amazon/ion/impl/IonReaderContinuableApplication.java
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
rename to src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableCore.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCore.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderContinuableCore.java
rename to src/main/java/com/amazon/ion/impl/IonReaderContinuableCore.java
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
rename to src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
diff --git a/src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
rename to src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
diff --git a/src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java b/src/main/java/com/amazon/ion/impl/IonReaderNonContinuableSystem.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderNonContinuableSystem.java
rename to src/main/java/com/amazon/ion/impl/IonReaderNonContinuableSystem.java
diff --git a/src/com/amazon/ion/impl/IonReaderTextRawTokensX.java b/src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderTextRawTokensX.java
rename to src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java
diff --git a/src/com/amazon/ion/impl/IonReaderTextRawX.java b/src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderTextRawX.java
rename to src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java
diff --git a/src/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderTextSystemX.java
rename to src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
diff --git a/src/com/amazon/ion/impl/IonReaderTextUserX.java b/src/main/java/com/amazon/ion/impl/IonReaderTextUserX.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderTextUserX.java
rename to src/main/java/com/amazon/ion/impl/IonReaderTextUserX.java
diff --git a/src/com/amazon/ion/impl/IonReaderTreeSystem.java b/src/main/java/com/amazon/ion/impl/IonReaderTreeSystem.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderTreeSystem.java
rename to src/main/java/com/amazon/ion/impl/IonReaderTreeSystem.java
diff --git a/src/com/amazon/ion/impl/IonReaderTreeUserX.java b/src/main/java/com/amazon/ion/impl/IonReaderTreeUserX.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonReaderTreeUserX.java
rename to src/main/java/com/amazon/ion/impl/IonReaderTreeUserX.java
diff --git a/src/com/amazon/ion/impl/IonTextBufferedStream.java b/src/main/java/com/amazon/ion/impl/IonTextBufferedStream.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonTextBufferedStream.java
rename to src/main/java/com/amazon/ion/impl/IonTextBufferedStream.java
diff --git a/src/com/amazon/ion/impl/IonTokenConstsX.java b/src/main/java/com/amazon/ion/impl/IonTokenConstsX.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonTokenConstsX.java
rename to src/main/java/com/amazon/ion/impl/IonTokenConstsX.java
diff --git a/src/com/amazon/ion/impl/IonTokenReader.java b/src/main/java/com/amazon/ion/impl/IonTokenReader.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonTokenReader.java
rename to src/main/java/com/amazon/ion/impl/IonTokenReader.java
diff --git a/src/com/amazon/ion/impl/IonTypeID.java b/src/main/java/com/amazon/ion/impl/IonTypeID.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonTypeID.java
rename to src/main/java/com/amazon/ion/impl/IonTypeID.java
diff --git a/src/com/amazon/ion/impl/IonUTF8.java b/src/main/java/com/amazon/ion/impl/IonUTF8.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonUTF8.java
rename to src/main/java/com/amazon/ion/impl/IonUTF8.java
diff --git a/src/com/amazon/ion/impl/IonWriterSystem.java b/src/main/java/com/amazon/ion/impl/IonWriterSystem.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonWriterSystem.java
rename to src/main/java/com/amazon/ion/impl/IonWriterSystem.java
diff --git a/src/com/amazon/ion/impl/IonWriterSystemBinary.java b/src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonWriterSystemBinary.java
rename to src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java
diff --git a/src/com/amazon/ion/impl/IonWriterSystemText.java b/src/main/java/com/amazon/ion/impl/IonWriterSystemText.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonWriterSystemText.java
rename to src/main/java/com/amazon/ion/impl/IonWriterSystemText.java
diff --git a/src/com/amazon/ion/impl/IonWriterSystemTextMarkup.java b/src/main/java/com/amazon/ion/impl/IonWriterSystemTextMarkup.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonWriterSystemTextMarkup.java
rename to src/main/java/com/amazon/ion/impl/IonWriterSystemTextMarkup.java
diff --git a/src/com/amazon/ion/impl/IonWriterSystemTree.java b/src/main/java/com/amazon/ion/impl/IonWriterSystemTree.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonWriterSystemTree.java
rename to src/main/java/com/amazon/ion/impl/IonWriterSystemTree.java
diff --git a/src/com/amazon/ion/impl/IonWriterUser.java b/src/main/java/com/amazon/ion/impl/IonWriterUser.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonWriterUser.java
rename to src/main/java/com/amazon/ion/impl/IonWriterUser.java
diff --git a/src/com/amazon/ion/impl/IonWriterUserBinary.java b/src/main/java/com/amazon/ion/impl/IonWriterUserBinary.java
similarity index 100%
rename from src/com/amazon/ion/impl/IonWriterUserBinary.java
rename to src/main/java/com/amazon/ion/impl/IonWriterUserBinary.java
diff --git a/src/com/amazon/ion/impl/LocalSymbolTable.java b/src/main/java/com/amazon/ion/impl/LocalSymbolTable.java
similarity index 100%
rename from src/com/amazon/ion/impl/LocalSymbolTable.java
rename to src/main/java/com/amazon/ion/impl/LocalSymbolTable.java
diff --git a/src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java b/src/main/java/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
similarity index 100%
rename from src/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
rename to src/main/java/com/amazon/ion/impl/LocalSymbolTableAsStruct.java
diff --git a/src/com/amazon/ion/impl/LocalSymbolTableImports.java b/src/main/java/com/amazon/ion/impl/LocalSymbolTableImports.java
similarity index 100%
rename from src/com/amazon/ion/impl/LocalSymbolTableImports.java
rename to src/main/java/com/amazon/ion/impl/LocalSymbolTableImports.java
diff --git a/src/com/amazon/ion/impl/Marker.java b/src/main/java/com/amazon/ion/impl/Marker.java
similarity index 100%
rename from src/com/amazon/ion/impl/Marker.java
rename to src/main/java/com/amazon/ion/impl/Marker.java
diff --git a/src/com/amazon/ion/impl/OutputStreamFastAppendable.java b/src/main/java/com/amazon/ion/impl/OutputStreamFastAppendable.java
similarity index 100%
rename from src/com/amazon/ion/impl/OutputStreamFastAppendable.java
rename to src/main/java/com/amazon/ion/impl/OutputStreamFastAppendable.java
diff --git a/src/com/amazon/ion/impl/ResizingPipedInputStream.java b/src/main/java/com/amazon/ion/impl/ResizingPipedInputStream.java
similarity index 100%
rename from src/com/amazon/ion/impl/ResizingPipedInputStream.java
rename to src/main/java/com/amazon/ion/impl/ResizingPipedInputStream.java
diff --git a/src/com/amazon/ion/impl/SharedSymbolTable.java b/src/main/java/com/amazon/ion/impl/SharedSymbolTable.java
similarity index 100%
rename from src/com/amazon/ion/impl/SharedSymbolTable.java
rename to src/main/java/com/amazon/ion/impl/SharedSymbolTable.java
diff --git a/src/com/amazon/ion/impl/SimpleByteBuffer.java b/src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java
similarity index 100%
rename from src/com/amazon/ion/impl/SimpleByteBuffer.java
rename to src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java
diff --git a/src/com/amazon/ion/impl/SubstituteSymbolTable.java b/src/main/java/com/amazon/ion/impl/SubstituteSymbolTable.java
similarity index 100%
rename from src/com/amazon/ion/impl/SubstituteSymbolTable.java
rename to src/main/java/com/amazon/ion/impl/SubstituteSymbolTable.java
diff --git a/src/com/amazon/ion/impl/SymbolTableAsStruct.java b/src/main/java/com/amazon/ion/impl/SymbolTableAsStruct.java
similarity index 100%
rename from src/com/amazon/ion/impl/SymbolTableAsStruct.java
rename to src/main/java/com/amazon/ion/impl/SymbolTableAsStruct.java
diff --git a/src/com/amazon/ion/impl/SymbolTableReader.java b/src/main/java/com/amazon/ion/impl/SymbolTableReader.java
similarity index 100%
rename from src/com/amazon/ion/impl/SymbolTableReader.java
rename to src/main/java/com/amazon/ion/impl/SymbolTableReader.java
diff --git a/src/com/amazon/ion/impl/SymbolTableStructCache.java b/src/main/java/com/amazon/ion/impl/SymbolTableStructCache.java
similarity index 100%
rename from src/com/amazon/ion/impl/SymbolTableStructCache.java
rename to src/main/java/com/amazon/ion/impl/SymbolTableStructCache.java
diff --git a/src/com/amazon/ion/impl/SymbolTokenImpl.java b/src/main/java/com/amazon/ion/impl/SymbolTokenImpl.java
similarity index 100%
rename from src/com/amazon/ion/impl/SymbolTokenImpl.java
rename to src/main/java/com/amazon/ion/impl/SymbolTokenImpl.java
diff --git a/src/com/amazon/ion/impl/SystemValueIterator.java b/src/main/java/com/amazon/ion/impl/SystemValueIterator.java
similarity index 100%
rename from src/com/amazon/ion/impl/SystemValueIterator.java
rename to src/main/java/com/amazon/ion/impl/SystemValueIterator.java
diff --git a/src/com/amazon/ion/impl/UnifiedDataPageX.java b/src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java
similarity index 100%
rename from src/com/amazon/ion/impl/UnifiedDataPageX.java
rename to src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java
diff --git a/src/com/amazon/ion/impl/UnifiedInputBufferX.java b/src/main/java/com/amazon/ion/impl/UnifiedInputBufferX.java
similarity index 100%
rename from src/com/amazon/ion/impl/UnifiedInputBufferX.java
rename to src/main/java/com/amazon/ion/impl/UnifiedInputBufferX.java
diff --git a/src/com/amazon/ion/impl/UnifiedInputStreamX.java b/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java
similarity index 100%
rename from src/com/amazon/ion/impl/UnifiedInputStreamX.java
rename to src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java
diff --git a/src/com/amazon/ion/impl/UnifiedSavePointManagerX.java b/src/main/java/com/amazon/ion/impl/UnifiedSavePointManagerX.java
similarity index 100%
rename from src/com/amazon/ion/impl/UnifiedSavePointManagerX.java
rename to src/main/java/com/amazon/ion/impl/UnifiedSavePointManagerX.java
diff --git a/src/com/amazon/ion/impl/_Private_ByteTransferReader.java b/src/main/java/com/amazon/ion/impl/_Private_ByteTransferReader.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_ByteTransferReader.java
rename to src/main/java/com/amazon/ion/impl/_Private_ByteTransferReader.java
diff --git a/src/com/amazon/ion/impl/_Private_ByteTransferSink.java b/src/main/java/com/amazon/ion/impl/_Private_ByteTransferSink.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_ByteTransferSink.java
rename to src/main/java/com/amazon/ion/impl/_Private_ByteTransferSink.java
diff --git a/src/com/amazon/ion/impl/_Private_CallbackBuilder.java b/src/main/java/com/amazon/ion/impl/_Private_CallbackBuilder.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_CallbackBuilder.java
rename to src/main/java/com/amazon/ion/impl/_Private_CallbackBuilder.java
diff --git a/src/com/amazon/ion/impl/_Private_CommandLine.java b/src/main/java/com/amazon/ion/impl/_Private_CommandLine.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_CommandLine.java
rename to src/main/java/com/amazon/ion/impl/_Private_CommandLine.java
diff --git a/src/com/amazon/ion/impl/_Private_CurriedValueFactory.java b/src/main/java/com/amazon/ion/impl/_Private_CurriedValueFactory.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_CurriedValueFactory.java
rename to src/main/java/com/amazon/ion/impl/_Private_CurriedValueFactory.java
diff --git a/src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java b/src/main/java/com/amazon/ion/impl/_Private_FastAppendableDecorator.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java
rename to src/main/java/com/amazon/ion/impl/_Private_FastAppendableDecorator.java
diff --git a/src/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java b/src/main/java/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java
rename to src/main/java/com/amazon/ion/impl/_Private_FastAppendableTrampoline.java
diff --git a/src/com/amazon/ion/impl/_Private_IncrementalReader.java b/src/main/java/com/amazon/ion/impl/_Private_IncrementalReader.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IncrementalReader.java
rename to src/main/java/com/amazon/ion/impl/_Private_IncrementalReader.java
diff --git a/src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java b/src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
diff --git a/src/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java b/src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterImpl.java
diff --git a/src/com/amazon/ion/impl/_Private_IonConstants.java b/src/main/java/com/amazon/ion/impl/_Private_IonConstants.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonConstants.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonConstants.java
diff --git a/src/com/amazon/ion/impl/_Private_IonContainer.java b/src/main/java/com/amazon/ion/impl/_Private_IonContainer.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonContainer.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonContainer.java
diff --git a/src/com/amazon/ion/impl/_Private_IonDatagram.java b/src/main/java/com/amazon/ion/impl/_Private_IonDatagram.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonDatagram.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonDatagram.java
diff --git a/src/com/amazon/ion/impl/_Private_IonReaderBuilder.java b/src/main/java/com/amazon/ion/impl/_Private_IonReaderBuilder.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonReaderBuilder.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonReaderBuilder.java
diff --git a/src/com/amazon/ion/impl/_Private_IonReaderFactory.java b/src/main/java/com/amazon/ion/impl/_Private_IonReaderFactory.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonReaderFactory.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonReaderFactory.java
diff --git a/src/com/amazon/ion/impl/_Private_IonSymbol.java b/src/main/java/com/amazon/ion/impl/_Private_IonSymbol.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonSymbol.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonSymbol.java
diff --git a/src/com/amazon/ion/impl/_Private_IonSystem.java b/src/main/java/com/amazon/ion/impl/_Private_IonSystem.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonSystem.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonSystem.java
diff --git a/src/com/amazon/ion/impl/_Private_IonTextAppender.java b/src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonTextAppender.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java
diff --git a/src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java b/src/main/java/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
diff --git a/src/com/amazon/ion/impl/_Private_IonValue.java b/src/main/java/com/amazon/ion/impl/_Private_IonValue.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonValue.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonValue.java
diff --git a/src/com/amazon/ion/impl/_Private_IonWriter.java b/src/main/java/com/amazon/ion/impl/_Private_IonWriter.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonWriter.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonWriter.java
diff --git a/src/com/amazon/ion/impl/_Private_IonWriterBase.java b/src/main/java/com/amazon/ion/impl/_Private_IonWriterBase.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonWriterBase.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonWriterBase.java
diff --git a/src/com/amazon/ion/impl/_Private_IonWriterFactory.java b/src/main/java/com/amazon/ion/impl/_Private_IonWriterFactory.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_IonWriterFactory.java
rename to src/main/java/com/amazon/ion/impl/_Private_IonWriterFactory.java
diff --git a/src/com/amazon/ion/impl/_Private_ListWriter.java b/src/main/java/com/amazon/ion/impl/_Private_ListWriter.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_ListWriter.java
rename to src/main/java/com/amazon/ion/impl/_Private_ListWriter.java
diff --git a/src/com/amazon/ion/impl/_Private_LocalSymbolTable.java b/src/main/java/com/amazon/ion/impl/_Private_LocalSymbolTable.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_LocalSymbolTable.java
rename to src/main/java/com/amazon/ion/impl/_Private_LocalSymbolTable.java
diff --git a/src/com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java b/src/main/java/com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java
rename to src/main/java/com/amazon/ion/impl/_Private_LocalSymbolTableFactory.java
diff --git a/src/com/amazon/ion/impl/_Private_MarkupCallback.java b/src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_MarkupCallback.java
rename to src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java
diff --git a/src/com/amazon/ion/impl/_Private_ReaderWriter.java b/src/main/java/com/amazon/ion/impl/_Private_ReaderWriter.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_ReaderWriter.java
rename to src/main/java/com/amazon/ion/impl/_Private_ReaderWriter.java
diff --git a/src/com/amazon/ion/impl/_Private_RecyclingQueue.java b/src/main/java/com/amazon/ion/impl/_Private_RecyclingQueue.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_RecyclingQueue.java
rename to src/main/java/com/amazon/ion/impl/_Private_RecyclingQueue.java
diff --git a/src/com/amazon/ion/impl/_Private_RecyclingStack.java b/src/main/java/com/amazon/ion/impl/_Private_RecyclingStack.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_RecyclingStack.java
rename to src/main/java/com/amazon/ion/impl/_Private_RecyclingStack.java
diff --git a/src/com/amazon/ion/impl/_Private_ScalarConversions.java b/src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_ScalarConversions.java
rename to src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java
diff --git a/src/com/amazon/ion/impl/_Private_SymbolToken.java b/src/main/java/com/amazon/ion/impl/_Private_SymbolToken.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_SymbolToken.java
rename to src/main/java/com/amazon/ion/impl/_Private_SymbolToken.java
diff --git a/src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java b/src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java
rename to src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java
diff --git a/src/com/amazon/ion/impl/_Private_Utils.java b/src/main/java/com/amazon/ion/impl/_Private_Utils.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_Utils.java
rename to src/main/java/com/amazon/ion/impl/_Private_Utils.java
diff --git a/src/com/amazon/ion/impl/_Private_ValueFactory.java b/src/main/java/com/amazon/ion/impl/_Private_ValueFactory.java
similarity index 100%
rename from src/com/amazon/ion/impl/_Private_ValueFactory.java
rename to src/main/java/com/amazon/ion/impl/_Private_ValueFactory.java
diff --git a/src/com/amazon/ion/impl/bin/AbstractIonWriter.java b/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/AbstractIonWriter.java
rename to src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
diff --git a/src/com/amazon/ion/impl/bin/AbstractSymbolTable.java b/src/main/java/com/amazon/ion/impl/bin/AbstractSymbolTable.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/AbstractSymbolTable.java
rename to src/main/java/com/amazon/ion/impl/bin/AbstractSymbolTable.java
diff --git a/src/com/amazon/ion/impl/bin/Block.java b/src/main/java/com/amazon/ion/impl/bin/Block.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/Block.java
rename to src/main/java/com/amazon/ion/impl/bin/Block.java
diff --git a/src/com/amazon/ion/impl/bin/BlockAllocator.java b/src/main/java/com/amazon/ion/impl/bin/BlockAllocator.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/BlockAllocator.java
rename to src/main/java/com/amazon/ion/impl/bin/BlockAllocator.java
diff --git a/src/com/amazon/ion/impl/bin/BlockAllocatorProvider.java b/src/main/java/com/amazon/ion/impl/bin/BlockAllocatorProvider.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/BlockAllocatorProvider.java
rename to src/main/java/com/amazon/ion/impl/bin/BlockAllocatorProvider.java
diff --git a/src/com/amazon/ion/impl/bin/BlockAllocatorProviders.java b/src/main/java/com/amazon/ion/impl/bin/BlockAllocatorProviders.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/BlockAllocatorProviders.java
rename to src/main/java/com/amazon/ion/impl/bin/BlockAllocatorProviders.java
diff --git a/src/com/amazon/ion/impl/bin/IntList.java b/src/main/java/com/amazon/ion/impl/bin/IntList.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/IntList.java
rename to src/main/java/com/amazon/ion/impl/bin/IntList.java
diff --git a/src/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java b/src/main/java/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java
rename to src/main/java/com/amazon/ion/impl/bin/IonBinaryWriterAdapter.java
diff --git a/src/com/amazon/ion/impl/bin/IonEncoder_1_1.java b/src/main/java/com/amazon/ion/impl/bin/IonEncoder_1_1.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/IonEncoder_1_1.java
rename to src/main/java/com/amazon/ion/impl/bin/IonEncoder_1_1.java
diff --git a/src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java b/src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
rename to src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
diff --git a/src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
rename to src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
diff --git a/src/com/amazon/ion/impl/bin/Ion_1_1_Constants.java b/src/main/java/com/amazon/ion/impl/bin/Ion_1_1_Constants.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/Ion_1_1_Constants.java
rename to src/main/java/com/amazon/ion/impl/bin/Ion_1_1_Constants.java
diff --git a/src/com/amazon/ion/impl/bin/OpCodes.java b/src/main/java/com/amazon/ion/impl/bin/OpCodes.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/OpCodes.java
rename to src/main/java/com/amazon/ion/impl/bin/OpCodes.java
diff --git a/src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java b/src/main/java/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
rename to src/main/java/com/amazon/ion/impl/bin/PooledBlockAllocatorProvider.java
diff --git a/src/com/amazon/ion/impl/bin/Symbols.java b/src/main/java/com/amazon/ion/impl/bin/Symbols.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/Symbols.java
rename to src/main/java/com/amazon/ion/impl/bin/Symbols.java
diff --git a/src/com/amazon/ion/impl/bin/WriteBuffer.java b/src/main/java/com/amazon/ion/impl/bin/WriteBuffer.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/WriteBuffer.java
rename to src/main/java/com/amazon/ion/impl/bin/WriteBuffer.java
diff --git a/src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java b/src/main/java/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
rename to src/main/java/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
diff --git a/src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java b/src/main/java/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
rename to src/main/java/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
diff --git a/src/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java b/src/main/java/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java
rename to src/main/java/com/amazon/ion/impl/bin/_Private_IonManagedWriter.java
diff --git a/src/com/amazon/ion/impl/bin/_Private_IonRawWriter.java b/src/main/java/com/amazon/ion/impl/bin/_Private_IonRawWriter.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/_Private_IonRawWriter.java
rename to src/main/java/com/amazon/ion/impl/bin/_Private_IonRawWriter.java
diff --git a/src/com/amazon/ion/impl/bin/package-info.java b/src/main/java/com/amazon/ion/impl/bin/package-info.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/package-info.java
rename to src/main/java/com/amazon/ion/impl/bin/package-info.java
diff --git a/src/com/amazon/ion/impl/bin/utf8/ByteBufferPool.java b/src/main/java/com/amazon/ion/impl/bin/utf8/ByteBufferPool.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/utf8/ByteBufferPool.java
rename to src/main/java/com/amazon/ion/impl/bin/utf8/ByteBufferPool.java
diff --git a/src/com/amazon/ion/impl/bin/utf8/Pool.java b/src/main/java/com/amazon/ion/impl/bin/utf8/Pool.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/utf8/Pool.java
rename to src/main/java/com/amazon/ion/impl/bin/utf8/Pool.java
diff --git a/src/com/amazon/ion/impl/bin/utf8/Poolable.java b/src/main/java/com/amazon/ion/impl/bin/utf8/Poolable.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/utf8/Poolable.java
rename to src/main/java/com/amazon/ion/impl/bin/utf8/Poolable.java
diff --git a/src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java b/src/main/java/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java
rename to src/main/java/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java
diff --git a/src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoder.java b/src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringDecoder.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoder.java
rename to src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringDecoder.java
diff --git a/src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoderPool.java b/src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringDecoderPool.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/utf8/Utf8StringDecoderPool.java
rename to src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringDecoderPool.java
diff --git a/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java b/src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java
rename to src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java
diff --git a/src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java b/src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java
similarity index 100%
rename from src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java
rename to src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoderPool.java
diff --git a/src/com/amazon/ion/impl/lite/ContainerlessContext.java b/src/main/java/com/amazon/ion/impl/lite/ContainerlessContext.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/ContainerlessContext.java
rename to src/main/java/com/amazon/ion/impl/lite/ContainerlessContext.java
diff --git a/src/com/amazon/ion/impl/lite/IonBlobLite.java b/src/main/java/com/amazon/ion/impl/lite/IonBlobLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonBlobLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonBlobLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonBoolLite.java b/src/main/java/com/amazon/ion/impl/lite/IonBoolLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonBoolLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonBoolLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonClobLite.java b/src/main/java/com/amazon/ion/impl/lite/IonClobLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonClobLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonClobLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonContainerLite.java b/src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonContainerLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonContext.java b/src/main/java/com/amazon/ion/impl/lite/IonContext.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonContext.java
rename to src/main/java/com/amazon/ion/impl/lite/IonContext.java
diff --git a/src/com/amazon/ion/impl/lite/IonDatagramLite.java b/src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonDatagramLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonDecimalLite.java b/src/main/java/com/amazon/ion/impl/lite/IonDecimalLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonDecimalLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonDecimalLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonFloatLite.java b/src/main/java/com/amazon/ion/impl/lite/IonFloatLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonFloatLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonFloatLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonIntLite.java b/src/main/java/com/amazon/ion/impl/lite/IonIntLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonIntLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonIntLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonListLite.java b/src/main/java/com/amazon/ion/impl/lite/IonListLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonListLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonListLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonLoaderLite.java b/src/main/java/com/amazon/ion/impl/lite/IonLoaderLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonLoaderLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonLoaderLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonLobLite.java b/src/main/java/com/amazon/ion/impl/lite/IonLobLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonLobLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonLobLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonNullLite.java b/src/main/java/com/amazon/ion/impl/lite/IonNullLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonNullLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonNullLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonSequenceLite.java b/src/main/java/com/amazon/ion/impl/lite/IonSequenceLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonSequenceLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonSequenceLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonSexpLite.java b/src/main/java/com/amazon/ion/impl/lite/IonSexpLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonSexpLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonSexpLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonStringLite.java b/src/main/java/com/amazon/ion/impl/lite/IonStringLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonStringLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonStringLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonStructLite.java b/src/main/java/com/amazon/ion/impl/lite/IonStructLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonStructLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonStructLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonSymbolLite.java b/src/main/java/com/amazon/ion/impl/lite/IonSymbolLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonSymbolLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonSymbolLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonSystemLite.java b/src/main/java/com/amazon/ion/impl/lite/IonSystemLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonSystemLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonSystemLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonTextLite.java b/src/main/java/com/amazon/ion/impl/lite/IonTextLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonTextLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonTextLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonTimestampLite.java b/src/main/java/com/amazon/ion/impl/lite/IonTimestampLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonTimestampLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonTimestampLite.java
diff --git a/src/com/amazon/ion/impl/lite/IonValueLite.java b/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/IonValueLite.java
rename to src/main/java/com/amazon/ion/impl/lite/IonValueLite.java
diff --git a/src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java b/src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java
rename to src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java
diff --git a/src/com/amazon/ion/impl/lite/TopLevelContext.java b/src/main/java/com/amazon/ion/impl/lite/TopLevelContext.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/TopLevelContext.java
rename to src/main/java/com/amazon/ion/impl/lite/TopLevelContext.java
diff --git a/src/com/amazon/ion/impl/lite/ValueFactoryLite.java b/src/main/java/com/amazon/ion/impl/lite/ValueFactoryLite.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/ValueFactoryLite.java
rename to src/main/java/com/amazon/ion/impl/lite/ValueFactoryLite.java
diff --git a/src/com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java b/src/main/java/com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java
similarity index 100%
rename from src/com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java
rename to src/main/java/com/amazon/ion/impl/lite/_Private_LiteDomTrampoline.java
diff --git a/src/com/amazon/ion/overview.html b/src/main/java/com/amazon/ion/overview.html
similarity index 100%
rename from src/com/amazon/ion/overview.html
rename to src/main/java/com/amazon/ion/overview.html
diff --git a/src/com/amazon/ion/package-info.java b/src/main/java/com/amazon/ion/package-info.java
similarity index 100%
rename from src/com/amazon/ion/package-info.java
rename to src/main/java/com/amazon/ion/package-info.java
diff --git a/src/com/amazon/ion/system/IonBinaryWriterBuilder.java b/src/main/java/com/amazon/ion/system/IonBinaryWriterBuilder.java
similarity index 100%
rename from src/com/amazon/ion/system/IonBinaryWriterBuilder.java
rename to src/main/java/com/amazon/ion/system/IonBinaryWriterBuilder.java
diff --git a/src/com/amazon/ion/system/IonReaderBuilder.java b/src/main/java/com/amazon/ion/system/IonReaderBuilder.java
similarity index 100%
rename from src/com/amazon/ion/system/IonReaderBuilder.java
rename to src/main/java/com/amazon/ion/system/IonReaderBuilder.java
diff --git a/src/com/amazon/ion/system/IonSystemBuilder.java b/src/main/java/com/amazon/ion/system/IonSystemBuilder.java
similarity index 100%
rename from src/com/amazon/ion/system/IonSystemBuilder.java
rename to src/main/java/com/amazon/ion/system/IonSystemBuilder.java
diff --git a/src/com/amazon/ion/system/IonTextWriterBuilder.java b/src/main/java/com/amazon/ion/system/IonTextWriterBuilder.java
similarity index 100%
rename from src/com/amazon/ion/system/IonTextWriterBuilder.java
rename to src/main/java/com/amazon/ion/system/IonTextWriterBuilder.java
diff --git a/src/com/amazon/ion/system/IonWriterBuilder.java b/src/main/java/com/amazon/ion/system/IonWriterBuilder.java
similarity index 100%
rename from src/com/amazon/ion/system/IonWriterBuilder.java
rename to src/main/java/com/amazon/ion/system/IonWriterBuilder.java
diff --git a/src/com/amazon/ion/system/IonWriterBuilderBase.java b/src/main/java/com/amazon/ion/system/IonWriterBuilderBase.java
similarity index 100%
rename from src/com/amazon/ion/system/IonWriterBuilderBase.java
rename to src/main/java/com/amazon/ion/system/IonWriterBuilderBase.java
diff --git a/src/com/amazon/ion/system/SimpleCatalog.java b/src/main/java/com/amazon/ion/system/SimpleCatalog.java
similarity index 100%
rename from src/com/amazon/ion/system/SimpleCatalog.java
rename to src/main/java/com/amazon/ion/system/SimpleCatalog.java
diff --git a/src/com/amazon/ion/system/SystemFactory.java b/src/main/java/com/amazon/ion/system/SystemFactory.java
similarity index 100%
rename from src/com/amazon/ion/system/SystemFactory.java
rename to src/main/java/com/amazon/ion/system/SystemFactory.java
diff --git a/src/com/amazon/ion/system/package-info.java b/src/main/java/com/amazon/ion/system/package-info.java
similarity index 100%
rename from src/com/amazon/ion/system/package-info.java
rename to src/main/java/com/amazon/ion/system/package-info.java
diff --git a/src/com/amazon/ion/util/AbstractValueVisitor.java b/src/main/java/com/amazon/ion/util/AbstractValueVisitor.java
similarity index 100%
rename from src/com/amazon/ion/util/AbstractValueVisitor.java
rename to src/main/java/com/amazon/ion/util/AbstractValueVisitor.java
diff --git a/src/com/amazon/ion/util/Equivalence.java b/src/main/java/com/amazon/ion/util/Equivalence.java
similarity index 100%
rename from src/com/amazon/ion/util/Equivalence.java
rename to src/main/java/com/amazon/ion/util/Equivalence.java
diff --git a/src/com/amazon/ion/util/GzipOrRawInputStream.java b/src/main/java/com/amazon/ion/util/GzipOrRawInputStream.java
similarity index 100%
rename from src/com/amazon/ion/util/GzipOrRawInputStream.java
rename to src/main/java/com/amazon/ion/util/GzipOrRawInputStream.java
diff --git a/src/com/amazon/ion/util/IonStreamUtils.java b/src/main/java/com/amazon/ion/util/IonStreamUtils.java
similarity index 100%
rename from src/com/amazon/ion/util/IonStreamUtils.java
rename to src/main/java/com/amazon/ion/util/IonStreamUtils.java
diff --git a/src/com/amazon/ion/util/IonTextUtils.java b/src/main/java/com/amazon/ion/util/IonTextUtils.java
similarity index 100%
rename from src/com/amazon/ion/util/IonTextUtils.java
rename to src/main/java/com/amazon/ion/util/IonTextUtils.java
diff --git a/src/com/amazon/ion/util/IonValueUtils.java b/src/main/java/com/amazon/ion/util/IonValueUtils.java
similarity index 100%
rename from src/com/amazon/ion/util/IonValueUtils.java
rename to src/main/java/com/amazon/ion/util/IonValueUtils.java
diff --git a/src/com/amazon/ion/util/JarInfo.java b/src/main/java/com/amazon/ion/util/JarInfo.java
similarity index 100%
rename from src/com/amazon/ion/util/JarInfo.java
rename to src/main/java/com/amazon/ion/util/JarInfo.java
diff --git a/src/com/amazon/ion/util/Printer.java b/src/main/java/com/amazon/ion/util/Printer.java
similarity index 100%
rename from src/com/amazon/ion/util/Printer.java
rename to src/main/java/com/amazon/ion/util/Printer.java
diff --git a/src/com/amazon/ion/util/Spans.java b/src/main/java/com/amazon/ion/util/Spans.java
similarity index 100%
rename from src/com/amazon/ion/util/Spans.java
rename to src/main/java/com/amazon/ion/util/Spans.java
diff --git a/src/com/amazon/ion/util/_Private_FastAppendable.java b/src/main/java/com/amazon/ion/util/_Private_FastAppendable.java
similarity index 100%
rename from src/com/amazon/ion/util/_Private_FastAppendable.java
rename to src/main/java/com/amazon/ion/util/_Private_FastAppendable.java
diff --git a/src/com/amazon/ion/util/package-info.java b/src/main/java/com/amazon/ion/util/package-info.java
similarity index 100%
rename from src/com/amazon/ion/util/package-info.java
rename to src/main/java/com/amazon/ion/util/package-info.java
diff --git a/test/com/amazon/ion/AnnotationEscapesTest.java b/src/test/java/com/amazon/ion/AnnotationEscapesTest.java
similarity index 100%
rename from test/com/amazon/ion/AnnotationEscapesTest.java
rename to src/test/java/com/amazon/ion/AnnotationEscapesTest.java
diff --git a/test/com/amazon/ion/AssertionsEnabledTest.java b/src/test/java/com/amazon/ion/AssertionsEnabledTest.java
similarity index 100%
rename from test/com/amazon/ion/AssertionsEnabledTest.java
rename to src/test/java/com/amazon/ion/AssertionsEnabledTest.java
diff --git a/test/com/amazon/ion/BadIonTest.java b/src/test/java/com/amazon/ion/BadIonTest.java
similarity index 100%
rename from test/com/amazon/ion/BadIonTest.java
rename to src/test/java/com/amazon/ion/BadIonTest.java
diff --git a/test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java b/src/test/java/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/BinaryByteArrayIteratorSystemProcessingTest.java
diff --git a/test/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java b/src/test/java/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/BinaryIonReaderIteratorSystemProcessingTest.java
diff --git a/test/com/amazon/ion/BinaryReaderSystemProcessingTest.java b/src/test/java/com/amazon/ion/BinaryReaderSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/BinaryReaderSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/BinaryReaderSystemProcessingTest.java
diff --git a/test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java b/src/test/java/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java
similarity index 100%
rename from test/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java
rename to src/test/java/com/amazon/ion/BinaryReaderWrappedValueLengthTest.java
diff --git a/test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java b/src/test/java/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/BinaryStreamIteratorSystemProcessingTest.java
diff --git a/test/com/amazon/ion/BinaryTest.java b/src/test/java/com/amazon/ion/BinaryTest.java
similarity index 100%
rename from test/com/amazon/ion/BinaryTest.java
rename to src/test/java/com/amazon/ion/BinaryTest.java
diff --git a/test/com/amazon/ion/BitUtils.java b/src/test/java/com/amazon/ion/BitUtils.java
similarity index 100%
rename from test/com/amazon/ion/BitUtils.java
rename to src/test/java/com/amazon/ion/BitUtils.java
diff --git a/test/com/amazon/ion/BlobTest.java b/src/test/java/com/amazon/ion/BlobTest.java
similarity index 100%
rename from test/com/amazon/ion/BlobTest.java
rename to src/test/java/com/amazon/ion/BlobTest.java
diff --git a/test/com/amazon/ion/BoolTest.java b/src/test/java/com/amazon/ion/BoolTest.java
similarity index 100%
rename from test/com/amazon/ion/BoolTest.java
rename to src/test/java/com/amazon/ion/BoolTest.java
diff --git a/test/com/amazon/ion/Checker.java b/src/test/java/com/amazon/ion/Checker.java
similarity index 100%
rename from test/com/amazon/ion/Checker.java
rename to src/test/java/com/amazon/ion/Checker.java
diff --git a/test/com/amazon/ion/ClobTest.java b/src/test/java/com/amazon/ion/ClobTest.java
similarity index 100%
rename from test/com/amazon/ion/ClobTest.java
rename to src/test/java/com/amazon/ion/ClobTest.java
diff --git a/test/com/amazon/ion/CloneTest.java b/src/test/java/com/amazon/ion/CloneTest.java
similarity index 100%
rename from test/com/amazon/ion/CloneTest.java
rename to src/test/java/com/amazon/ion/CloneTest.java
diff --git a/test/com/amazon/ion/ContainerTestCase.java b/src/test/java/com/amazon/ion/ContainerTestCase.java
similarity index 100%
rename from test/com/amazon/ion/ContainerTestCase.java
rename to src/test/java/com/amazon/ion/ContainerTestCase.java
diff --git a/test/com/amazon/ion/DatagramIteratorSystemProcessingTest.java b/src/test/java/com/amazon/ion/DatagramIteratorSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/DatagramIteratorSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/DatagramIteratorSystemProcessingTest.java
diff --git a/test/com/amazon/ion/DatagramMaker.java b/src/test/java/com/amazon/ion/DatagramMaker.java
similarity index 100%
rename from test/com/amazon/ion/DatagramMaker.java
rename to src/test/java/com/amazon/ion/DatagramMaker.java
diff --git a/test/com/amazon/ion/DatagramTest.java b/src/test/java/com/amazon/ion/DatagramTest.java
similarity index 100%
rename from test/com/amazon/ion/DatagramTest.java
rename to src/test/java/com/amazon/ion/DatagramTest.java
diff --git a/test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java b/src/test/java/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/DatagramTreeReaderSystemProcessingTest.java
diff --git a/test/com/amazon/ion/DecimalTest.java b/src/test/java/com/amazon/ion/DecimalTest.java
similarity index 100%
rename from test/com/amazon/ion/DecimalTest.java
rename to src/test/java/com/amazon/ion/DecimalTest.java
diff --git a/test/com/amazon/ion/EquivTimelineTest.java b/src/test/java/com/amazon/ion/EquivTimelineTest.java
similarity index 100%
rename from test/com/amazon/ion/EquivTimelineTest.java
rename to src/test/java/com/amazon/ion/EquivTimelineTest.java
diff --git a/test/com/amazon/ion/EquivsTest.java b/src/test/java/com/amazon/ion/EquivsTest.java
similarity index 100%
rename from test/com/amazon/ion/EquivsTest.java
rename to src/test/java/com/amazon/ion/EquivsTest.java
diff --git a/test/com/amazon/ion/EquivsTestCase.java b/src/test/java/com/amazon/ion/EquivsTestCase.java
similarity index 100%
rename from test/com/amazon/ion/EquivsTestCase.java
rename to src/test/java/com/amazon/ion/EquivsTestCase.java
diff --git a/test/com/amazon/ion/ExtendedDecimalTest.java b/src/test/java/com/amazon/ion/ExtendedDecimalTest.java
similarity index 100%
rename from test/com/amazon/ion/ExtendedDecimalTest.java
rename to src/test/java/com/amazon/ion/ExtendedDecimalTest.java
diff --git a/test/com/amazon/ion/FakeSymbolToken.java b/src/test/java/com/amazon/ion/FakeSymbolToken.java
similarity index 100%
rename from test/com/amazon/ion/FakeSymbolToken.java
rename to src/test/java/com/amazon/ion/FakeSymbolToken.java
diff --git a/test/com/amazon/ion/FieldNameEscapesTest.java b/src/test/java/com/amazon/ion/FieldNameEscapesTest.java
similarity index 100%
rename from test/com/amazon/ion/FieldNameEscapesTest.java
rename to src/test/java/com/amazon/ion/FieldNameEscapesTest.java
diff --git a/test/com/amazon/ion/FloatTest.java b/src/test/java/com/amazon/ion/FloatTest.java
similarity index 100%
rename from test/com/amazon/ion/FloatTest.java
rename to src/test/java/com/amazon/ion/FloatTest.java
diff --git a/test/com/amazon/ion/GoodIonTest.java b/src/test/java/com/amazon/ion/GoodIonTest.java
similarity index 100%
rename from test/com/amazon/ion/GoodIonTest.java
rename to src/test/java/com/amazon/ion/GoodIonTest.java
diff --git a/test/com/amazon/ion/HashCodeCorrectnessTest.java b/src/test/java/com/amazon/ion/HashCodeCorrectnessTest.java
similarity index 100%
rename from test/com/amazon/ion/HashCodeCorrectnessTest.java
rename to src/test/java/com/amazon/ion/HashCodeCorrectnessTest.java
diff --git a/test/com/amazon/ion/HashCodeDeltaCollisionTest.java b/src/test/java/com/amazon/ion/HashCodeDeltaCollisionTest.java
similarity index 100%
rename from test/com/amazon/ion/HashCodeDeltaCollisionTest.java
rename to src/test/java/com/amazon/ion/HashCodeDeltaCollisionTest.java
diff --git a/test/com/amazon/ion/HashCodeDistributionTest.java b/src/test/java/com/amazon/ion/HashCodeDistributionTest.java
similarity index 100%
rename from test/com/amazon/ion/HashCodeDistributionTest.java
rename to src/test/java/com/amazon/ion/HashCodeDistributionTest.java
diff --git a/test/com/amazon/ion/InputStreamWrapper.java b/src/test/java/com/amazon/ion/InputStreamWrapper.java
similarity index 100%
rename from test/com/amazon/ion/InputStreamWrapper.java
rename to src/test/java/com/amazon/ion/InputStreamWrapper.java
diff --git a/test/com/amazon/ion/IntTest.java b/src/test/java/com/amazon/ion/IntTest.java
similarity index 100%
rename from test/com/amazon/ion/IntTest.java
rename to src/test/java/com/amazon/ion/IntTest.java
diff --git a/test/com/amazon/ion/IonExceptionTest.java b/src/test/java/com/amazon/ion/IonExceptionTest.java
similarity index 100%
rename from test/com/amazon/ion/IonExceptionTest.java
rename to src/test/java/com/amazon/ion/IonExceptionTest.java
diff --git a/test/com/amazon/ion/IonRawWriterBasicTest.java b/src/test/java/com/amazon/ion/IonRawWriterBasicTest.java
similarity index 100%
rename from test/com/amazon/ion/IonRawWriterBasicTest.java
rename to src/test/java/com/amazon/ion/IonRawWriterBasicTest.java
diff --git a/test/com/amazon/ion/IonRawWriterSymbolsTest.java b/src/test/java/com/amazon/ion/IonRawWriterSymbolsTest.java
similarity index 100%
rename from test/com/amazon/ion/IonRawWriterSymbolsTest.java
rename to src/test/java/com/amazon/ion/IonRawWriterSymbolsTest.java
diff --git a/test/com/amazon/ion/IonReaderToIonValueTest.java b/src/test/java/com/amazon/ion/IonReaderToIonValueTest.java
similarity index 100%
rename from test/com/amazon/ion/IonReaderToIonValueTest.java
rename to src/test/java/com/amazon/ion/IonReaderToIonValueTest.java
diff --git a/test/com/amazon/ion/IonSystemTest.java b/src/test/java/com/amazon/ion/IonSystemTest.java
similarity index 100%
rename from test/com/amazon/ion/IonSystemTest.java
rename to src/test/java/com/amazon/ion/IonSystemTest.java
diff --git a/test/com/amazon/ion/IonTestCase.java b/src/test/java/com/amazon/ion/IonTestCase.java
similarity index 100%
rename from test/com/amazon/ion/IonTestCase.java
rename to src/test/java/com/amazon/ion/IonTestCase.java
diff --git a/test/com/amazon/ion/IonValueChecker.java b/src/test/java/com/amazon/ion/IonValueChecker.java
similarity index 100%
rename from test/com/amazon/ion/IonValueChecker.java
rename to src/test/java/com/amazon/ion/IonValueChecker.java
diff --git a/test/com/amazon/ion/IonValueDeltaGenerator.java b/src/test/java/com/amazon/ion/IonValueDeltaGenerator.java
similarity index 100%
rename from test/com/amazon/ion/IonValueDeltaGenerator.java
rename to src/test/java/com/amazon/ion/IonValueDeltaGenerator.java
diff --git a/test/com/amazon/ion/IonValueTest.java b/src/test/java/com/amazon/ion/IonValueTest.java
similarity index 100%
rename from test/com/amazon/ion/IonValueTest.java
rename to src/test/java/com/amazon/ion/IonValueTest.java
diff --git a/test/com/amazon/ion/IteratorSystemProcessingTestCase.java b/src/test/java/com/amazon/ion/IteratorSystemProcessingTestCase.java
similarity index 100%
rename from test/com/amazon/ion/IteratorSystemProcessingTestCase.java
rename to src/test/java/com/amazon/ion/IteratorSystemProcessingTestCase.java
diff --git a/test/com/amazon/ion/JavaNumericsTest.java b/src/test/java/com/amazon/ion/JavaNumericsTest.java
similarity index 100%
rename from test/com/amazon/ion/JavaNumericsTest.java
rename to src/test/java/com/amazon/ion/JavaNumericsTest.java
diff --git a/test/com/amazon/ion/JavaReaderIteratorSystemProcessingTest.java b/src/test/java/com/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/JavaReaderIteratorSystemProcessingTest.java
diff --git a/test/com/amazon/ion/ListTest.java b/src/test/java/com/amazon/ion/ListTest.java
similarity index 100%
rename from test/com/amazon/ion/ListTest.java
rename to src/test/java/com/amazon/ion/ListTest.java
diff --git a/test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java b/src/test/java/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/LoadBinaryBytesSystemProcessingTest.java
diff --git a/test/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java b/src/test/java/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/LoadBinaryIonReaderSystemProcessingTest.java
diff --git a/test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java b/src/test/java/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/LoadBinaryStreamSystemProcessingTest.java
diff --git a/test/com/amazon/ion/LoadTextBytesSystemProcessingTest.java b/src/test/java/com/amazon/ion/LoadTextBytesSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/LoadTextBytesSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/LoadTextBytesSystemProcessingTest.java
diff --git a/test/com/amazon/ion/LoadTextStreamSystemProcessingTest.java b/src/test/java/com/amazon/ion/LoadTextStreamSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/LoadTextStreamSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/LoadTextStreamSystemProcessingTest.java
diff --git a/test/com/amazon/ion/LoaderTest.java b/src/test/java/com/amazon/ion/LoaderTest.java
similarity index 100%
rename from test/com/amazon/ion/LoaderTest.java
rename to src/test/java/com/amazon/ion/LoaderTest.java
diff --git a/test/com/amazon/ion/LongStringTest.java b/src/test/java/com/amazon/ion/LongStringTest.java
similarity index 100%
rename from test/com/amazon/ion/LongStringTest.java
rename to src/test/java/com/amazon/ion/LongStringTest.java
diff --git a/test/com/amazon/ion/NewDatagramIteratorSystemProcessingTest.java b/src/test/java/com/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/NewDatagramIteratorSystemProcessingTest.java
diff --git a/test/com/amazon/ion/NonEquivsTest.java b/src/test/java/com/amazon/ion/NonEquivsTest.java
similarity index 100%
rename from test/com/amazon/ion/NonEquivsTest.java
rename to src/test/java/com/amazon/ion/NonEquivsTest.java
diff --git a/test/com/amazon/ion/NopPaddingTest.java b/src/test/java/com/amazon/ion/NopPaddingTest.java
similarity index 100%
rename from test/com/amazon/ion/NopPaddingTest.java
rename to src/test/java/com/amazon/ion/NopPaddingTest.java
diff --git a/test/com/amazon/ion/NullTest.java b/src/test/java/com/amazon/ion/NullTest.java
similarity index 100%
rename from test/com/amazon/ion/NullTest.java
rename to src/test/java/com/amazon/ion/NullTest.java
diff --git a/test/com/amazon/ion/RawValueSpanReaderBasicTest.java b/src/test/java/com/amazon/ion/RawValueSpanReaderBasicTest.java
similarity index 100%
rename from test/com/amazon/ion/RawValueSpanReaderBasicTest.java
rename to src/test/java/com/amazon/ion/RawValueSpanReaderBasicTest.java
diff --git a/test/com/amazon/ion/ReaderChecker.java b/src/test/java/com/amazon/ion/ReaderChecker.java
similarity index 100%
rename from test/com/amazon/ion/ReaderChecker.java
rename to src/test/java/com/amazon/ion/ReaderChecker.java
diff --git a/test/com/amazon/ion/ReaderMaker.java b/src/test/java/com/amazon/ion/ReaderMaker.java
similarity index 100%
rename from test/com/amazon/ion/ReaderMaker.java
rename to src/test/java/com/amazon/ion/ReaderMaker.java
diff --git a/test/com/amazon/ion/ReaderSystemProcessingTestCase.java b/src/test/java/com/amazon/ion/ReaderSystemProcessingTestCase.java
similarity index 100%
rename from test/com/amazon/ion/ReaderSystemProcessingTestCase.java
rename to src/test/java/com/amazon/ion/ReaderSystemProcessingTestCase.java
diff --git a/test/com/amazon/ion/RoundTripTest.java b/src/test/java/com/amazon/ion/RoundTripTest.java
similarity index 100%
rename from test/com/amazon/ion/RoundTripTest.java
rename to src/test/java/com/amazon/ion/RoundTripTest.java
diff --git a/test/com/amazon/ion/SequenceTestCase.java b/src/test/java/com/amazon/ion/SequenceTestCase.java
similarity index 100%
rename from test/com/amazon/ion/SequenceTestCase.java
rename to src/test/java/com/amazon/ion/SequenceTestCase.java
diff --git a/test/com/amazon/ion/SexpTest.java b/src/test/java/com/amazon/ion/SexpTest.java
similarity index 100%
rename from test/com/amazon/ion/SexpTest.java
rename to src/test/java/com/amazon/ion/SexpTest.java
diff --git a/test/com/amazon/ion/SharedSymtabMaker.java b/src/test/java/com/amazon/ion/SharedSymtabMaker.java
similarity index 100%
rename from test/com/amazon/ion/SharedSymtabMaker.java
rename to src/test/java/com/amazon/ion/SharedSymtabMaker.java
diff --git a/test/com/amazon/ion/StringFieldNameEscapesTest.java b/src/test/java/com/amazon/ion/StringFieldNameEscapesTest.java
similarity index 100%
rename from test/com/amazon/ion/StringFieldNameEscapesTest.java
rename to src/test/java/com/amazon/ion/StringFieldNameEscapesTest.java
diff --git a/test/com/amazon/ion/StringTest.java b/src/test/java/com/amazon/ion/StringTest.java
similarity index 100%
rename from test/com/amazon/ion/StringTest.java
rename to src/test/java/com/amazon/ion/StringTest.java
diff --git a/test/com/amazon/ion/StructTest.java b/src/test/java/com/amazon/ion/StructTest.java
similarity index 100%
rename from test/com/amazon/ion/StructTest.java
rename to src/test/java/com/amazon/ion/StructTest.java
diff --git a/test/com/amazon/ion/SurrogateEscapeTest.java b/src/test/java/com/amazon/ion/SurrogateEscapeTest.java
similarity index 100%
rename from test/com/amazon/ion/SurrogateEscapeTest.java
rename to src/test/java/com/amazon/ion/SurrogateEscapeTest.java
diff --git a/test/com/amazon/ion/SymbolTest.java b/src/test/java/com/amazon/ion/SymbolTest.java
similarity index 100%
rename from test/com/amazon/ion/SymbolTest.java
rename to src/test/java/com/amazon/ion/SymbolTest.java
diff --git a/test/com/amazon/ion/SystemProcessingTestCase.java b/src/test/java/com/amazon/ion/SystemProcessingTestCase.java
similarity index 100%
rename from test/com/amazon/ion/SystemProcessingTestCase.java
rename to src/test/java/com/amazon/ion/SystemProcessingTestCase.java
diff --git a/test/com/amazon/ion/SystemProcessingTests.java b/src/test/java/com/amazon/ion/SystemProcessingTests.java
similarity index 100%
rename from test/com/amazon/ion/SystemProcessingTests.java
rename to src/test/java/com/amazon/ion/SystemProcessingTests.java
diff --git a/test/com/amazon/ion/TestUtils.java b/src/test/java/com/amazon/ion/TestUtils.java
similarity index 100%
rename from test/com/amazon/ion/TestUtils.java
rename to src/test/java/com/amazon/ion/TestUtils.java
diff --git a/test/com/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java b/src/test/java/com/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/TextByteArrayIteratorSystemProcessingTest.java
diff --git a/test/com/amazon/ion/TextIteratorSystemProcessingTest.java b/src/test/java/com/amazon/ion/TextIteratorSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/TextIteratorSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/TextIteratorSystemProcessingTest.java
diff --git a/test/com/amazon/ion/TextReaderSystemProcessingTest.java b/src/test/java/com/amazon/ion/TextReaderSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/TextReaderSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/TextReaderSystemProcessingTest.java
diff --git a/test/com/amazon/ion/TextStreamIteratorSystemProcessingTest.java b/src/test/java/com/amazon/ion/TextStreamIteratorSystemProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/TextStreamIteratorSystemProcessingTest.java
rename to src/test/java/com/amazon/ion/TextStreamIteratorSystemProcessingTest.java
diff --git a/test/com/amazon/ion/TextTestCase.java b/src/test/java/com/amazon/ion/TextTestCase.java
similarity index 100%
rename from test/com/amazon/ion/TextTestCase.java
rename to src/test/java/com/amazon/ion/TextTestCase.java
diff --git a/test/com/amazon/ion/TimestampBadTest.java b/src/test/java/com/amazon/ion/TimestampBadTest.java
similarity index 100%
rename from test/com/amazon/ion/TimestampBadTest.java
rename to src/test/java/com/amazon/ion/TimestampBadTest.java
diff --git a/test/com/amazon/ion/TimestampGoodTest.java b/src/test/java/com/amazon/ion/TimestampGoodTest.java
similarity index 100%
rename from test/com/amazon/ion/TimestampGoodTest.java
rename to src/test/java/com/amazon/ion/TimestampGoodTest.java
diff --git a/test/com/amazon/ion/TimestampTest.java b/src/test/java/com/amazon/ion/TimestampTest.java
similarity index 100%
rename from test/com/amazon/ion/TimestampTest.java
rename to src/test/java/com/amazon/ion/TimestampTest.java
diff --git a/test/com/amazon/ion/TrBwBrProcessingTest.java b/src/test/java/com/amazon/ion/TrBwBrProcessingTest.java
similarity index 100%
rename from test/com/amazon/ion/TrBwBrProcessingTest.java
rename to src/test/java/com/amazon/ion/TrBwBrProcessingTest.java
diff --git a/test/com/amazon/ion/TrueSequenceTestCase.java b/src/test/java/com/amazon/ion/TrueSequenceTestCase.java
similarity index 100%
rename from test/com/amazon/ion/TrueSequenceTestCase.java
rename to src/test/java/com/amazon/ion/TrueSequenceTestCase.java
diff --git a/test/com/amazon/ion/ValueFactorySequenceTest.java b/src/test/java/com/amazon/ion/ValueFactorySequenceTest.java
similarity index 100%
rename from test/com/amazon/ion/ValueFactorySequenceTest.java
rename to src/test/java/com/amazon/ion/ValueFactorySequenceTest.java
diff --git a/test/com/amazon/ion/facet/FacetsTest.java b/src/test/java/com/amazon/ion/facet/FacetsTest.java
similarity index 100%
rename from test/com/amazon/ion/facet/FacetsTest.java
rename to src/test/java/com/amazon/ion/facet/FacetsTest.java
diff --git a/test/com/amazon/ion/impl/BinaryWriterTest.java b/src/test/java/com/amazon/ion/impl/BinaryWriterTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/BinaryWriterTest.java
rename to src/test/java/com/amazon/ion/impl/BinaryWriterTest.java
diff --git a/test/com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java b/src/test/java/com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
rename to src/test/java/com/amazon/ion/impl/BinaryWriterWithLocalSymtabsTest.java
diff --git a/test/com/amazon/ion/impl/ByteBufferTest.java b/src/test/java/com/amazon/ion/impl/ByteBufferTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/ByteBufferTest.java
rename to src/test/java/com/amazon/ion/impl/ByteBufferTest.java
diff --git a/test/com/amazon/ion/impl/CharacterReaderTest.java b/src/test/java/com/amazon/ion/impl/CharacterReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/CharacterReaderTest.java
rename to src/test/java/com/amazon/ion/impl/CharacterReaderTest.java
diff --git a/test/com/amazon/ion/impl/EscapingCallback.java b/src/test/java/com/amazon/ion/impl/EscapingCallback.java
similarity index 100%
rename from test/com/amazon/ion/impl/EscapingCallback.java
rename to src/test/java/com/amazon/ion/impl/EscapingCallback.java
diff --git a/test/com/amazon/ion/impl/IonCursorBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonCursorBinaryTest.java
rename to src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
diff --git a/test/com/amazon/ion/impl/IonCursorTestUtilities.java b/src/test/java/com/amazon/ion/impl/IonCursorTestUtilities.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonCursorTestUtilities.java
rename to src/test/java/com/amazon/ion/impl/IonCursorTestUtilities.java
diff --git a/test/com/amazon/ion/impl/IonImplUtilsTest.java b/src/test/java/com/amazon/ion/impl/IonImplUtilsTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonImplUtilsTest.java
rename to src/test/java/com/amazon/ion/impl/IonImplUtilsTest.java
diff --git a/test/com/amazon/ion/impl/IonMarkupWriterFilesTest.java b/src/test/java/com/amazon/ion/impl/IonMarkupWriterFilesTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonMarkupWriterFilesTest.java
rename to src/test/java/com/amazon/ion/impl/IonMarkupWriterFilesTest.java
diff --git a/test/com/amazon/ion/impl/IonMarkupWriterTest.java b/src/test/java/com/amazon/ion/impl/IonMarkupWriterTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonMarkupWriterTest.java
rename to src/test/java/com/amazon/ion/impl/IonMarkupWriterTest.java
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java b/src/test/java/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java
rename to src/test/java/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java
diff --git a/test/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java b/src/test/java/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java
rename to src/test/java/com/amazon/ion/impl/IonReaderBinaryRawStringTest.java
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
rename to src/test/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinaryTest.java
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
rename to src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
diff --git a/test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
rename to src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
diff --git a/test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java b/src/test/java/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java
rename to src/test/java/com/amazon/ion/impl/IonRoundtripConcurrencyStressTest.java
diff --git a/test/com/amazon/ion/impl/IonUTF8Test.java b/src/test/java/com/amazon/ion/impl/IonUTF8Test.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonUTF8Test.java
rename to src/test/java/com/amazon/ion/impl/IonUTF8Test.java
diff --git a/test/com/amazon/ion/impl/IonWriterTestCase.java b/src/test/java/com/amazon/ion/impl/IonWriterTestCase.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonWriterTestCase.java
rename to src/test/java/com/amazon/ion/impl/IonWriterTestCase.java
diff --git a/test/com/amazon/ion/impl/IonWriterTests.java b/src/test/java/com/amazon/ion/impl/IonWriterTests.java
similarity index 100%
rename from test/com/amazon/ion/impl/IonWriterTests.java
rename to src/test/java/com/amazon/ion/impl/IonWriterTests.java
diff --git a/test/com/amazon/ion/impl/IterationTest.java b/src/test/java/com/amazon/ion/impl/IterationTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/IterationTest.java
rename to src/test/java/com/amazon/ion/impl/IterationTest.java
diff --git a/test/com/amazon/ion/impl/LocalSymbolTableTest.java b/src/test/java/com/amazon/ion/impl/LocalSymbolTableTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/LocalSymbolTableTest.java
rename to src/test/java/com/amazon/ion/impl/LocalSymbolTableTest.java
diff --git a/test/com/amazon/ion/impl/OldBinaryWriterTest.java b/src/test/java/com/amazon/ion/impl/OldBinaryWriterTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/OldBinaryWriterTest.java
rename to src/test/java/com/amazon/ion/impl/OldBinaryWriterTest.java
diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java b/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
rename to src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterLengthPatchingTest.java
diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java b/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
rename to src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
diff --git a/test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java b/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
similarity index 100%
rename from test/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
rename to src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
diff --git a/test/com/amazon/ion/impl/OutputStreamWriterTestCase.java b/src/test/java/com/amazon/ion/impl/OutputStreamWriterTestCase.java
similarity index 100%
rename from test/com/amazon/ion/impl/OutputStreamWriterTestCase.java
rename to src/test/java/com/amazon/ion/impl/OutputStreamWriterTestCase.java
diff --git a/test/com/amazon/ion/impl/RawValueSpanReaderTest.java b/src/test/java/com/amazon/ion/impl/RawValueSpanReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/RawValueSpanReaderTest.java
rename to src/test/java/com/amazon/ion/impl/RawValueSpanReaderTest.java
diff --git a/test/com/amazon/ion/impl/ResizingPipedInputStreamTest.java b/src/test/java/com/amazon/ion/impl/ResizingPipedInputStreamTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/ResizingPipedInputStreamTest.java
rename to src/test/java/com/amazon/ion/impl/ResizingPipedInputStreamTest.java
diff --git a/test/com/amazon/ion/impl/SharedSymbolTableTest.java b/src/test/java/com/amazon/ion/impl/SharedSymbolTableTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/SharedSymbolTableTest.java
rename to src/test/java/com/amazon/ion/impl/SharedSymbolTableTest.java
diff --git a/test/com/amazon/ion/impl/SymbolTableTest.java b/src/test/java/com/amazon/ion/impl/SymbolTableTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/SymbolTableTest.java
rename to src/test/java/com/amazon/ion/impl/SymbolTableTest.java
diff --git a/test/com/amazon/ion/impl/Symtabs.java b/src/test/java/com/amazon/ion/impl/Symtabs.java
similarity index 100%
rename from test/com/amazon/ion/impl/Symtabs.java
rename to src/test/java/com/amazon/ion/impl/Symtabs.java
diff --git a/test/com/amazon/ion/impl/TestMarkupCallback.java b/src/test/java/com/amazon/ion/impl/TestMarkupCallback.java
similarity index 100%
rename from test/com/amazon/ion/impl/TestMarkupCallback.java
rename to src/test/java/com/amazon/ion/impl/TestMarkupCallback.java
diff --git a/test/com/amazon/ion/impl/TextWriterTest.java b/src/test/java/com/amazon/ion/impl/TextWriterTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/TextWriterTest.java
rename to src/test/java/com/amazon/ion/impl/TextWriterTest.java
diff --git a/test/com/amazon/ion/impl/TreeReaderTest.java b/src/test/java/com/amazon/ion/impl/TreeReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/TreeReaderTest.java
rename to src/test/java/com/amazon/ion/impl/TreeReaderTest.java
diff --git a/test/com/amazon/ion/impl/UnifiedInputStreamXTest.java b/src/test/java/com/amazon/ion/impl/UnifiedInputStreamXTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/UnifiedInputStreamXTest.java
rename to src/test/java/com/amazon/ion/impl/UnifiedInputStreamXTest.java
diff --git a/test/com/amazon/ion/impl/ValueWriterTest.java b/src/test/java/com/amazon/ion/impl/ValueWriterTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/ValueWriterTest.java
rename to src/test/java/com/amazon/ion/impl/ValueWriterTest.java
diff --git a/test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java b/src/test/java/com/amazon/ion/impl/_Private_ScalarConversionsTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/_Private_ScalarConversionsTest.java
rename to src/test/java/com/amazon/ion/impl/_Private_ScalarConversionsTest.java
diff --git a/test/com/amazon/ion/impl/bin/IntListTest.java b/src/test/java/com/amazon/ion/impl/bin/IntListTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/bin/IntListTest.java
rename to src/test/java/com/amazon/ion/impl/bin/IntListTest.java
diff --git a/test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java b/src/test/java/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
similarity index 100%
rename from test/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
rename to src/test/java/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
diff --git a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterGoodTest.java b/src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterGoodTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/bin/IonManagedBinaryWriterGoodTest.java
rename to src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterGoodTest.java
diff --git a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java b/src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
rename to src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
diff --git a/test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java b/src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java
similarity index 100%
rename from test/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java
rename to src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java
diff --git a/test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java b/src/test/java/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
rename to src/test/java/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
diff --git a/test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java b/src/test/java/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
rename to src/test/java/com/amazon/ion/impl/bin/PooledBlockAllocatorProviderTest.java
diff --git a/test/com/amazon/ion/impl/bin/SystemSymbolResolvingIonRawBinaryWriter.java b/src/test/java/com/amazon/ion/impl/bin/SystemSymbolResolvingIonRawBinaryWriter.java
similarity index 100%
rename from test/com/amazon/ion/impl/bin/SystemSymbolResolvingIonRawBinaryWriter.java
rename to src/test/java/com/amazon/ion/impl/bin/SystemSymbolResolvingIonRawBinaryWriter.java
diff --git a/test/com/amazon/ion/impl/bin/WriteBufferTest.java b/src/test/java/com/amazon/ion/impl/bin/WriteBufferTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/bin/WriteBufferTest.java
rename to src/test/java/com/amazon/ion/impl/bin/WriteBufferTest.java
diff --git a/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java b/src/test/java/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
similarity index 100%
rename from test/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
rename to src/test/java/com/amazon/ion/impl/lite/BaseIonSequenceLiteSublistTestCase.java
diff --git a/test/com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java b/src/test/java/com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
similarity index 100%
rename from test/com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
rename to src/test/java/com/amazon/ion/impl/lite/BaseIonSequenceLiteTestCase.java
diff --git a/test/com/amazon/ion/impl/lite/IonContextTest.java b/src/test/java/com/amazon/ion/impl/lite/IonContextTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/lite/IonContextTest.java
rename to src/test/java/com/amazon/ion/impl/lite/IonContextTest.java
diff --git a/test/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java b/src/test/java/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
rename to src/test/java/com/amazon/ion/impl/lite/IonDatagramLiteSublistTest.java
diff --git a/test/com/amazon/ion/impl/lite/IonDatagramLiteTest.java b/src/test/java/com/amazon/ion/impl/lite/IonDatagramLiteTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/lite/IonDatagramLiteTest.java
rename to src/test/java/com/amazon/ion/impl/lite/IonDatagramLiteTest.java
diff --git a/test/com/amazon/ion/impl/lite/IonListLiteTest.java b/src/test/java/com/amazon/ion/impl/lite/IonListLiteTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/lite/IonListLiteTest.java
rename to src/test/java/com/amazon/ion/impl/lite/IonListLiteTest.java
diff --git a/test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java b/src/test/java/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
rename to src/test/java/com/amazon/ion/impl/lite/IonListSexpLiteSublistTest.java
diff --git a/test/com/amazon/ion/impl/lite/IonSequenceLiteSubListViewEqualityTests.java b/src/test/java/com/amazon/ion/impl/lite/IonSequenceLiteSubListViewEqualityTests.java
similarity index 100%
rename from test/com/amazon/ion/impl/lite/IonSequenceLiteSubListViewEqualityTests.java
rename to src/test/java/com/amazon/ion/impl/lite/IonSequenceLiteSubListViewEqualityTests.java
diff --git a/test/com/amazon/ion/impl/lite/IonSexpLiteTest.java b/src/test/java/com/amazon/ion/impl/lite/IonSexpLiteTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/lite/IonSexpLiteTest.java
rename to src/test/java/com/amazon/ion/impl/lite/IonSexpLiteTest.java
diff --git a/test/com/amazon/ion/impl/lite/IonSystemLiteTest.java b/src/test/java/com/amazon/ion/impl/lite/IonSystemLiteTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/lite/IonSystemLiteTest.java
rename to src/test/java/com/amazon/ion/impl/lite/IonSystemLiteTest.java
diff --git a/test/com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java b/src/test/java/com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
similarity index 100%
rename from test/com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
rename to src/test/java/com/amazon/ion/impl/lite/SIDPresentLifecycleTest.java
diff --git a/test/com/amazon/ion/junit/Injected.java b/src/test/java/com/amazon/ion/junit/Injected.java
similarity index 100%
rename from test/com/amazon/ion/junit/Injected.java
rename to src/test/java/com/amazon/ion/junit/Injected.java
diff --git a/test/com/amazon/ion/junit/IonAssert.java b/src/test/java/com/amazon/ion/junit/IonAssert.java
similarity index 100%
rename from test/com/amazon/ion/junit/IonAssert.java
rename to src/test/java/com/amazon/ion/junit/IonAssert.java
diff --git a/test/com/amazon/ion/profile/IteratorTiming.java b/src/test/java/com/amazon/ion/profile/IteratorTiming.java
similarity index 100%
rename from test/com/amazon/ion/profile/IteratorTiming.java
rename to src/test/java/com/amazon/ion/profile/IteratorTiming.java
diff --git a/test/com/amazon/ion/streaming/BadIonStreamingTest.java b/src/test/java/com/amazon/ion/streaming/BadIonStreamingTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/BadIonStreamingTest.java
rename to src/test/java/com/amazon/ion/streaming/BadIonStreamingTest.java
diff --git a/test/com/amazon/ion/streaming/BinaryStreamingTest.java b/src/test/java/com/amazon/ion/streaming/BinaryStreamingTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/BinaryStreamingTest.java
rename to src/test/java/com/amazon/ion/streaming/BinaryStreamingTest.java
diff --git a/test/com/amazon/ion/streaming/GoodIonStreamingTest.java b/src/test/java/com/amazon/ion/streaming/GoodIonStreamingTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/GoodIonStreamingTest.java
rename to src/test/java/com/amazon/ion/streaming/GoodIonStreamingTest.java
diff --git a/test/com/amazon/ion/streaming/InputStreamReaderTest.java b/src/test/java/com/amazon/ion/streaming/InputStreamReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/InputStreamReaderTest.java
rename to src/test/java/com/amazon/ion/streaming/InputStreamReaderTest.java
diff --git a/test/com/amazon/ion/streaming/MiscStreamingTest.java b/src/test/java/com/amazon/ion/streaming/MiscStreamingTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/MiscStreamingTest.java
rename to src/test/java/com/amazon/ion/streaming/MiscStreamingTest.java
diff --git a/test/com/amazon/ion/streaming/NonOffsetSpanReaderTest.java b/src/test/java/com/amazon/ion/streaming/NonOffsetSpanReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/NonOffsetSpanReaderTest.java
rename to src/test/java/com/amazon/ion/streaming/NonOffsetSpanReaderTest.java
diff --git a/test/com/amazon/ion/streaming/NonSeekableReaderTest.java b/src/test/java/com/amazon/ion/streaming/NonSeekableReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/NonSeekableReaderTest.java
rename to src/test/java/com/amazon/ion/streaming/NonSeekableReaderTest.java
diff --git a/test/com/amazon/ion/streaming/NonSpanReaderTest.java b/src/test/java/com/amazon/ion/streaming/NonSpanReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/NonSpanReaderTest.java
rename to src/test/java/com/amazon/ion/streaming/NonSpanReaderTest.java
diff --git a/test/com/amazon/ion/streaming/NonTextSpanTest.java b/src/test/java/com/amazon/ion/streaming/NonTextSpanTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/NonTextSpanTest.java
rename to src/test/java/com/amazon/ion/streaming/NonTextSpanTest.java
diff --git a/test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java b/src/test/java/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
rename to src/test/java/com/amazon/ion/streaming/OffsetSpanBinaryReaderTest.java
diff --git a/test/com/amazon/ion/streaming/OffsetSpanReaderTest.java b/src/test/java/com/amazon/ion/streaming/OffsetSpanReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/OffsetSpanReaderTest.java
rename to src/test/java/com/amazon/ion/streaming/OffsetSpanReaderTest.java
diff --git a/test/com/amazon/ion/streaming/ReaderCompare.java b/src/test/java/com/amazon/ion/streaming/ReaderCompare.java
similarity index 100%
rename from test/com/amazon/ion/streaming/ReaderCompare.java
rename to src/test/java/com/amazon/ion/streaming/ReaderCompare.java
diff --git a/test/com/amazon/ion/streaming/ReaderDomCopyTest.java b/src/test/java/com/amazon/ion/streaming/ReaderDomCopyTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/ReaderDomCopyTest.java
rename to src/test/java/com/amazon/ion/streaming/ReaderDomCopyTest.java
diff --git a/test/com/amazon/ion/streaming/ReaderFacetTestCase.java b/src/test/java/com/amazon/ion/streaming/ReaderFacetTestCase.java
similarity index 100%
rename from test/com/amazon/ion/streaming/ReaderFacetTestCase.java
rename to src/test/java/com/amazon/ion/streaming/ReaderFacetTestCase.java
diff --git a/test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java b/src/test/java/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
rename to src/test/java/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
diff --git a/test/com/amazon/ion/streaming/ReaderSkippingTest.java b/src/test/java/com/amazon/ion/streaming/ReaderSkippingTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/ReaderSkippingTest.java
rename to src/test/java/com/amazon/ion/streaming/ReaderSkippingTest.java
diff --git a/test/com/amazon/ion/streaming/ReaderTest.java b/src/test/java/com/amazon/ion/streaming/ReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/ReaderTest.java
rename to src/test/java/com/amazon/ion/streaming/ReaderTest.java
diff --git a/test/com/amazon/ion/streaming/ReaderTestCase.java b/src/test/java/com/amazon/ion/streaming/ReaderTestCase.java
similarity index 100%
rename from test/com/amazon/ion/streaming/ReaderTestCase.java
rename to src/test/java/com/amazon/ion/streaming/ReaderTestCase.java
diff --git a/test/com/amazon/ion/streaming/RoundTripStreamingTest.java b/src/test/java/com/amazon/ion/streaming/RoundTripStreamingTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/RoundTripStreamingTest.java
rename to src/test/java/com/amazon/ion/streaming/RoundTripStreamingTest.java
diff --git a/test/com/amazon/ion/streaming/SeekableReaderTest.java b/src/test/java/com/amazon/ion/streaming/SeekableReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/SeekableReaderTest.java
rename to src/test/java/com/amazon/ion/streaming/SeekableReaderTest.java
diff --git a/test/com/amazon/ion/streaming/SpanReaderTest.java b/src/test/java/com/amazon/ion/streaming/SpanReaderTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/SpanReaderTest.java
rename to src/test/java/com/amazon/ion/streaming/SpanReaderTest.java
diff --git a/test/com/amazon/ion/streaming/SpanTests.java b/src/test/java/com/amazon/ion/streaming/SpanTests.java
similarity index 100%
rename from test/com/amazon/ion/streaming/SpanTests.java
rename to src/test/java/com/amazon/ion/streaming/SpanTests.java
diff --git a/test/com/amazon/ion/streaming/TextSpanTest.java b/src/test/java/com/amazon/ion/streaming/TextSpanTest.java
similarity index 100%
rename from test/com/amazon/ion/streaming/TextSpanTest.java
rename to src/test/java/com/amazon/ion/streaming/TextSpanTest.java
diff --git a/test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java b/src/test/java/com/amazon/ion/system/IonBinaryWriterBuilderTest.java
similarity index 100%
rename from test/com/amazon/ion/system/IonBinaryWriterBuilderTest.java
rename to src/test/java/com/amazon/ion/system/IonBinaryWriterBuilderTest.java
diff --git a/test/com/amazon/ion/system/IonReaderBuilderTest.java b/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java
similarity index 100%
rename from test/com/amazon/ion/system/IonReaderBuilderTest.java
rename to src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java
diff --git a/test/com/amazon/ion/system/IonSystemBuilderTest.java b/src/test/java/com/amazon/ion/system/IonSystemBuilderTest.java
similarity index 100%
rename from test/com/amazon/ion/system/IonSystemBuilderTest.java
rename to src/test/java/com/amazon/ion/system/IonSystemBuilderTest.java
diff --git a/test/com/amazon/ion/system/IonTextWriterBuilderTest.java b/src/test/java/com/amazon/ion/system/IonTextWriterBuilderTest.java
similarity index 100%
rename from test/com/amazon/ion/system/IonTextWriterBuilderTest.java
rename to src/test/java/com/amazon/ion/system/IonTextWriterBuilderTest.java
diff --git a/test/com/amazon/ion/system/SimpleCatalogTest.java b/src/test/java/com/amazon/ion/system/SimpleCatalogTest.java
similarity index 100%
rename from test/com/amazon/ion/system/SimpleCatalogTest.java
rename to src/test/java/com/amazon/ion/system/SimpleCatalogTest.java
diff --git a/test/com/amazon/ion/util/EquivalenceTest.java b/src/test/java/com/amazon/ion/util/EquivalenceTest.java
similarity index 100%
rename from test/com/amazon/ion/util/EquivalenceTest.java
rename to src/test/java/com/amazon/ion/util/EquivalenceTest.java
diff --git a/test/com/amazon/ion/util/IonStreamUtilsTest.java b/src/test/java/com/amazon/ion/util/IonStreamUtilsTest.java
similarity index 100%
rename from test/com/amazon/ion/util/IonStreamUtilsTest.java
rename to src/test/java/com/amazon/ion/util/IonStreamUtilsTest.java
diff --git a/test/com/amazon/ion/util/JarInfoTest.java b/src/test/java/com/amazon/ion/util/JarInfoTest.java
similarity index 100%
rename from test/com/amazon/ion/util/JarInfoTest.java
rename to src/test/java/com/amazon/ion/util/JarInfoTest.java
diff --git a/test/com/amazon/ion/util/NullOutputStream.java b/src/test/java/com/amazon/ion/util/NullOutputStream.java
similarity index 100%
rename from test/com/amazon/ion/util/NullOutputStream.java
rename to src/test/java/com/amazon/ion/util/NullOutputStream.java
diff --git a/test/com/amazon/ion/util/PrinterTest.java b/src/test/java/com/amazon/ion/util/PrinterTest.java
similarity index 100%
rename from test/com/amazon/ion/util/PrinterTest.java
rename to src/test/java/com/amazon/ion/util/PrinterTest.java
diff --git a/test/com/amazon/ion/util/RepeatInputStream.java b/src/test/java/com/amazon/ion/util/RepeatInputStream.java
similarity index 100%
rename from test/com/amazon/ion/util/RepeatInputStream.java
rename to src/test/java/com/amazon/ion/util/RepeatInputStream.java
diff --git a/test/com/amazon/ion/util/SpansTest.java b/src/test/java/com/amazon/ion/util/SpansTest.java
similarity index 100%
rename from test/com/amazon/ion/util/SpansTest.java
rename to src/test/java/com/amazon/ion/util/SpansTest.java
diff --git a/test/com/amazon/ion/util/TextTest.java b/src/test/java/com/amazon/ion/util/TextTest.java
similarity index 100%
rename from test/com/amazon/ion/util/TextTest.java
rename to src/test/java/com/amazon/ion/util/TextTest.java

From baa2d61c40ab105273d5f378cc9d92a02d59cc11 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Fri, 17 Nov 2023 09:43:01 -0800
Subject: [PATCH 316/490] Fix publish artifacts (#647)

---
 build.gradle.kts | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index b52819b33c..6cd7277cf2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -63,8 +63,9 @@ description = "A Java implementation of the Amazon Ion data notation."
 
 val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
 val generatedResourcesDir = "$buildDir/generated/main/resources"
-lateinit var sourcesArtifact: PublishArtifact
-lateinit var javadocArtifact: PublishArtifact
+lateinit var sourcesJar: AbstractArchiveTask
+lateinit var javadocJar: AbstractArchiveTask
+lateinit var minifyJar: ProGuardTask
 
 sourceSets {
     main {
@@ -132,7 +133,7 @@ tasks {
      * The `minifyJar` task uses Proguard to create a JAR that is smaller than the combined size of ion-java
      * and its dependencies. This is the final JAR that is published to maven central.
      */
-    val minifyJar by register<ProGuardTask>("minifyJar") {
+    minifyJar = create<ProGuardTask>("minifyJar") proguardTask@{
         group = "build"
         val rulesPath = file("config/proguard/rules.pro")
         val inputJarPath = shadowJar.get().outputs.files.singleFile
@@ -271,16 +272,14 @@ tasks {
         }
     }
 
-    create<Jar>("sourcesJar") sourcesJar@{
+    sourcesJar = create<Jar>("sourcesJar") sourcesJar@{
         archiveClassifier.set("sources")
         from(sourceSets["main"].java.srcDirs)
-        artifacts { sourcesArtifact = archives(this@sourcesJar) }
     }
 
-    create<Jar>("javadocJar") javadocJar@{
+    javadocJar = create<Jar>("javadocJar") javadocJar@{
         archiveClassifier.set("javadoc")
         from(javadoc)
-        artifacts { javadocArtifact = archives(this@javadocJar) }
     }
 
     /**
@@ -352,9 +351,11 @@ tasks {
 
 publishing {
     publications.create<MavenPublication>("IonJava") {
-        from(components["java"])
-        artifact(sourcesArtifact)
-        artifact(javadocArtifact)
+        artifact(sourcesJar)
+        artifact(javadocJar)
+        artifact(minifyJar.outJarFiles.single()) {
+            builtBy(minifyJar)
+        }
 
         pom {
             name.set("Ion Java")

From c6ae9f9c9926ccf81798d90f7f66e3f43d5f0c72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Nov 2023 20:50:09 +0000
Subject: [PATCH 317/490] Bump github/codeql-action from 2.22.6 to 2.22.7

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.6 to 2.22.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/689fdc5193eeb735ecb2e52e819e3382876f93f4...66b90a5db151a8042fa97405c6cf843bbe433f7b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ad6258db61..9120961fd0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6
+        uses: github/codeql-action/init@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6
+        uses: github/codeql-action/autobuild@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6
+        uses: github/codeql-action/analyze@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a9832c88c7..37a96a27fb 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@689fdc5193eeb735ecb2e52e819e3382876f93f4 # v2.22.6
+        uses: github/codeql-action/upload-sarif@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
         with:
           sarif_file: results.sarif

From c6acba4eb6a412d642e6db33fce27ec284408fc8 Mon Sep 17 00:00:00 2001
From: linlin-s <linls@amazon.com>
Date: Tue, 5 Dec 2023 16:47:02 -0800
Subject: [PATCH 318/490] Enable  auto-flush and configurable write buffer
 block size. (#650)

---
 src/main/java/com/amazon/ion/IonWriter.java   |   1 -
 .../impl/_Private_IonBinaryWriterBuilder.java |  30 +++
 .../ion/impl/bin/IonManagedBinaryWriter.java  |  14 +-
 .../ion/impl/bin/IonRawBinaryWriter.java      |  35 ++-
 .../com/amazon/ion/impl/bin/WriteBuffer.java  |   7 +-
 .../impl/bin/_PrivateIon_HashTrampoline.java  |   4 +-
 ...Private_IonManagedBinaryWriterBuilder.java |  15 ++
 .../ion/system/IonBinaryWriterBuilder.java    |  18 +-
 .../ion/impl/bin/IonEncoder_1_1Test.java      |   2 +-
 .../impl/bin/IonManagedBinaryWriterTest.java  | 224 ++++++++++++++++++
 .../bin/IonManagedBinaryWriterTestCase.java   |  21 ++
 .../ion/impl/bin/IonRawBinaryWriterTest.java  |   4 +-
 .../amazon/ion/impl/bin/WriteBufferTest.java  |  27 ++-
 13 files changed, 379 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/amazon/ion/IonWriter.java b/src/main/java/com/amazon/ion/IonWriter.java
index 2f0f100247..4efc70e0c4 100644
--- a/src/main/java/com/amazon/ion/IonWriter.java
+++ b/src/main/java/com/amazon/ion/IonWriter.java
@@ -126,7 +126,6 @@ public interface IonWriter
      */
     public void flush() throws IOException;
 
-
     /**
      * Indicates that writing is completed and all buffered data should be
      * written and flushed as if this were the end of the Ion data stream.
diff --git a/src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java b/src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
index 367f37a068..2b008b9349 100644
--- a/src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
+++ b/src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java
@@ -193,6 +193,22 @@ _Private_IonBinaryWriterBuilder withInitialSymbolTable(SymbolTable symtab)
         return b;
     }
 
+    @Override
+    public _Private_IonBinaryWriterBuilder withAutoFlushEnabled(boolean autoFlushEnabled) {
+        _Private_IonBinaryWriterBuilder b = mutable();
+        b.setAutoFlushEnabled(autoFlushEnabled);
+        return b;
+    }
+
+    public void setAutoFlushEnabled(boolean autoFlushEnabled) {
+        mutationCheck();
+        if (autoFlushEnabled) {
+            myBinaryWriterBuilder.withAutoFlushEnabled();
+            myBinaryWriterBuilder.withLocalSymbolTableAppendEnabled();
+        } else {
+            myBinaryWriterBuilder.withAutoFlushDisabled();
+        }
+    }
     @Override
     public void setLocalSymbolTableAppendEnabled(boolean enabled)
     {
@@ -223,6 +239,13 @@ public _Private_IonBinaryWriterBuilder withLocalSymbolTableAppendDisabled()
         return b;
     }
 
+    @Override
+    public _Private_IonBinaryWriterBuilder withBlockSize(int size) {
+        _Private_IonBinaryWriterBuilder b = mutable();
+        b.setBlockSize(size);
+        return b;
+    }
+
     @Override
     public void setIsFloatBinary32Enabled(boolean enabled) {
         mutationCheck();
@@ -275,6 +298,13 @@ public void setStreamCopyOptimized(final boolean optimized)
 
     //=========================================================================
 
+    public void setBlockSize(int size) {
+        myBinaryWriterBuilder.withUserBlockSize(size);
+        // Adjust the symbol table block size when the user block size is smaller than the default, because in most cases, the symbol table is smaller than the data.
+        if (size < myBinaryWriterBuilder.DEFAULT_BLOCK_SIZE) {
+            myBinaryWriterBuilder.withSymbolsBlockSize(size);
+        }
+    }
 
     /**
      * Fills all properties and returns an immutable builder.
diff --git a/src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java b/src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
index 75ca54c574..61f5cbc170 100644
--- a/src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
+++ b/src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
@@ -51,7 +51,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-
 /** Wraps {@link IonRawBinaryWriter} with symbol table management. */
 @SuppressWarnings("deprecation")
 /*package*/ final class IonManagedBinaryWriter extends AbstractIonWriter implements _Private_IonManagedWriter
@@ -677,7 +676,9 @@ public void makeReadOnly()
             StreamCloseMode.NO_CLOSE,
             StreamFlushMode.NO_FLUSH,
             builder.preallocationMode,
-            builder.isFloatBinary32Enabled
+            builder.isFloatBinary32Enabled,
+            false,
+            this::flush
         );
         this.user = new IonRawBinaryWriter(
             builder.provider,
@@ -687,7 +688,9 @@ public void makeReadOnly()
             StreamCloseMode.CLOSE,
             StreamFlushMode.FLUSH,
             builder.preallocationMode,
-            builder.isFloatBinary32Enabled
+            builder.isFloatBinary32Enabled,
+            builder.isAutoFlushEnabled,
+            this::flush
         );
 
         this.catalog = builder.catalog;
@@ -1101,11 +1104,10 @@ public void writeBytes(byte[] data, int off, int len) throws IOException
 
     // Stream Terminators
 
-    public void flush() throws IOException
-    {
+    public void flush() throws IOException {
         if (getDepth() == 0 && !user.hasAnnotations() && (localsLocked || lstAppendEnabled))
         {
-            unsafeFlush();
+           unsafeFlush();
         }
     }
 
diff --git a/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 31f06b3b2c..315d4bf204 100644
--- a/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -98,7 +98,6 @@ private static byte[] bytes(int... vals) {
         NULLS[STRUCT.ordinal()]         = (byte) 0xDF;
     }
     private static final byte NULL_NULL = NULLS[NULL.ordinal()];
-
     private static final byte BOOL_FALSE        = (byte) 0x10;
     private static final byte BOOL_TRUE         = (byte) 0x11;
 
@@ -124,6 +123,7 @@ private static byte[] bytes(int... vals) {
 
     private static final byte VARINT_NEG_ZERO   = (byte) 0xC0;
 
+
     final Utf8StringEncoder utf8StringEncoder = Utf8StringEncoderPool
             .getInstance()
             .getOrCreate();
@@ -362,6 +362,18 @@ public PatchPoint clear() {
     private boolean                     hasTopLevelSymbolTableAnnotation;
 
     private boolean                     closed;
+    boolean autoFlushEnabled;
+    boolean flushAfterCurrentValue;
+    ThrowingRunnable autoFlush;
+
+    public void endOfBlockSizeReached() {
+        flushAfterCurrentValue = autoFlushEnabled;
+    }
+
+    @FunctionalInterface
+    interface ThrowingRunnable {
+        void run() throws IOException;
+    }
 
     /*package*/ IonRawBinaryWriter(final BlockAllocatorProvider provider,
                                    final int blockSize,
@@ -370,7 +382,9 @@ public PatchPoint clear() {
                                    final StreamCloseMode streamCloseMode,
                                    final StreamFlushMode streamFlushMode,
                                    final PreallocationMode preallocationMode,
-                                   final boolean isFloatBinary32Enabled)
+                                   final boolean isFloatBinary32Enabled,
+                                   final boolean isAutoFlushEnabled,
+                                   ThrowingRunnable autoFlush)
                                    throws IOException
     {
         super(optimization);
@@ -383,7 +397,7 @@ public PatchPoint clear() {
         this.streamFlushMode   = streamFlushMode;
         this.preallocationMode = preallocationMode;
         this.isFloatBinary32Enabled = isFloatBinary32Enabled;
-        this.buffer            = new WriteBuffer(allocator);
+        this.buffer            = new WriteBuffer(allocator, this::endOfBlockSizeReached);
         this.patchPoints       = new _Private_RecyclingQueue<>(512, PatchPoint::new);
         this.containers        = new _Private_RecyclingStack<ContainerInfo>(
             10,
@@ -401,8 +415,12 @@ public ContainerInfo newElement() {
         this.currentAnnotationSids            = new IntList();
         this.hasTopLevelSymbolTableAnnotation = false;
         this.closed = false;
+        this.autoFlushEnabled = isAutoFlushEnabled;
+        this.autoFlush = autoFlush;
     }
 
+
+
     /** Always returns {@link Symbols#systemSymbolTable()}. */
     public SymbolTable getSymbolTable()
     {
@@ -421,6 +439,10 @@ public void setFieldNameSymbol(final SymbolToken name)
         setFieldNameSymbol(name.getSid());
     }
 
+    WriteBuffer getCurrentBuffer() {
+        return buffer;
+    }
+
     public void setFieldNameSymbol(int sid)
     {
         if (!isInStruct())
@@ -722,7 +744,7 @@ private void prepareValue()
     }
 
     /** Closes out annotations. */
-    private void finishValue()
+    private void finishValue() throws IOException
     {
         if (!containers.isEmpty() && containers.peek().type == ContainerType.ANNOTATION)
         {
@@ -731,6 +753,10 @@ private void finishValue()
         }
         hasWrittenValuesSinceFinished = true;
         hasWrittenValuesSinceConstructed = true;
+        if (this.flushAfterCurrentValue && depth == 0) {
+            autoFlush.run();
+            this.flushAfterCurrentValue = false;
+        }
     }
 
     // Container Manipulation
@@ -1365,7 +1391,6 @@ public void finish() throws IOException
         {
             throw new IllegalStateException("Cannot finish within container: " + containers);
         }
-
         if (patchPoints.isEmpty())
         {
             // nothing to patch--write 'em out!
diff --git a/src/main/java/com/amazon/ion/impl/bin/WriteBuffer.java b/src/main/java/com/amazon/ion/impl/bin/WriteBuffer.java
index d8bf4162fc..2955147be7 100644
--- a/src/main/java/com/amazon/ion/impl/bin/WriteBuffer.java
+++ b/src/main/java/com/amazon/ion/impl/bin/WriteBuffer.java
@@ -31,8 +31,10 @@
     private final List<Block> blocks;
     private Block current;
     private int index;
+    private Runnable endOfBlockCallBack;
 
-    public WriteBuffer(final BlockAllocator allocator)
+
+    public WriteBuffer(final BlockAllocator allocator, Runnable endOfBlockCallBack)
     {
         this.allocator = allocator;
         this.blocks = new ArrayList<Block>();
@@ -42,6 +44,7 @@ public WriteBuffer(final BlockAllocator allocator)
 
         this.index = 0;
         this.current = blocks.get(0);
+        this.endOfBlockCallBack = endOfBlockCallBack;
     }
 
     private void allocateNewBlock()
@@ -138,12 +141,12 @@ private void writeBytesSlow(final byte[] bytes, int off, int len)
                 if (index == blocks.size() - 1)
                 {
                     allocateNewBlock();
+                    endOfBlockCallBack.run();
                 }
                 index++;
                 current = blocks.get(index);
             }
         }
-
     }
 
     /** Writes an array of bytes to the buffer expanding if necessary. */
diff --git a/src/main/java/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java b/src/main/java/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
index 6d3537c1f6..197160b35e 100644
--- a/src/main/java/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
+++ b/src/main/java/com/amazon/ion/impl/bin/_PrivateIon_HashTrampoline.java
@@ -40,7 +40,9 @@ public static IonWriter newIonWriter(ByteArrayOutputStream baos) throws IOExcept
                 IonRawBinaryWriter.StreamCloseMode.CLOSE,
                 IonRawBinaryWriter.StreamFlushMode.FLUSH,
                 IonRawBinaryWriter.PreallocationMode.PREALLOCATE_0,
-                false     // force floats to be encoded as binary64
+                false,    // force floats to be encoded as binary64
+                false,
+                null
         );
     }
 }
diff --git a/src/main/java/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java b/src/main/java/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
index 35d87e118a..12d4c2b460 100644
--- a/src/main/java/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
+++ b/src/main/java/com/amazon/ion/impl/bin/_Private_IonManagedBinaryWriterBuilder.java
@@ -79,6 +79,7 @@ BlockAllocatorProvider createAllocatorProvider()
     /*package*/ volatile SymbolTable            initialSymbolTable;
     /*package*/ volatile boolean                isLocalSymbolTableAppendEnabled;
     /*package*/ volatile boolean                isFloatBinary32Enabled;
+     volatile boolean                           isAutoFlushEnabled;
 
     private _Private_IonManagedBinaryWriterBuilder(final BlockAllocatorProvider provider)
     {
@@ -91,6 +92,7 @@ private _Private_IonManagedBinaryWriterBuilder(final BlockAllocatorProvider prov
         this.optimization = WriteValueOptimization.NONE;
         this.isLocalSymbolTableAppendEnabled = false;
         this.isFloatBinary32Enabled = false;
+        this.isAutoFlushEnabled = false;
     }
 
     private _Private_IonManagedBinaryWriterBuilder(final _Private_IonManagedBinaryWriterBuilder other)
@@ -105,6 +107,7 @@ private _Private_IonManagedBinaryWriterBuilder(final _Private_IonManagedBinaryWr
         this.initialSymbolTable = other.initialSymbolTable;
         this.isLocalSymbolTableAppendEnabled = other.isLocalSymbolTableAppendEnabled;
         this.isFloatBinary32Enabled = other.isFloatBinary32Enabled;
+        this.isAutoFlushEnabled = other.isAutoFlushEnabled;
     }
 
     public _Private_IonManagedBinaryWriterBuilder copy()
@@ -167,6 +170,18 @@ public _Private_IonManagedBinaryWriterBuilder withFlatImports(final List<SymbolT
         return withImports(ImportedSymbolResolverMode.FLAT, tables);
     }
 
+    public _Private_IonManagedBinaryWriterBuilder withAutoFlushEnabled()
+    {
+        this.isAutoFlushEnabled = true;
+        return this;
+    }
+
+    public _Private_IonManagedBinaryWriterBuilder withAutoFlushDisabled()
+    {
+        this.isAutoFlushEnabled = false;
+        return this;
+    }
+
     /*package*/ _Private_IonManagedBinaryWriterBuilder withImports(final ImportedSymbolResolverMode mode, final List<SymbolTable> tables) {
         imports = new ImportedSymbolContext(mode, tables);
         return this;
diff --git a/src/main/java/com/amazon/ion/system/IonBinaryWriterBuilder.java b/src/main/java/com/amazon/ion/system/IonBinaryWriterBuilder.java
index b6b40257e3..a4d9f85e0d 100644
--- a/src/main/java/com/amazon/ion/system/IonBinaryWriterBuilder.java
+++ b/src/main/java/com/amazon/ion/system/IonBinaryWriterBuilder.java
@@ -139,12 +139,22 @@ public IvmMinimizing getIvmMinimizing()
      */
     public abstract SymbolTable getInitialSymbolTable();
 
+    /**
+     * Auto-flush enables automatic execution of flush operations during the write process. When auto-flush is enabled and a new block allocation becomes necessary while writing the top-level value, a new block will be allocated.
+     * The data writing process will then continue uninterrupted until the top-level value is complete. After completing the top-level value that crosses the block boundary, the flush operation will be executed.
+     * This feature optimizes performance of the writing of long data streams by reducing block allocations.
+     * Additionally, setting a larger block size can further tune performance when auto-flush is enabled.
+     * A larger block size leads to fewer block allocations and reduces the frequency of flush operations when auto-flush is enabled. {@link #withBlockSize(int) Here} is where you can set up the
+     * block size of write buffer.
+     * Auto-flush is disabled by default and the default block size is 32K.
+     * @param autoFlushEnabled A boolean parameter indicating whether this functionality is enabled or not.
+     */
+    public abstract IonBinaryWriterBuilder withAutoFlushEnabled(boolean autoFlushEnabled);
 
     /**
      * Declares the symbol table to use for encoded data.
      * To avoid conflicts between different data streams, if the given instance
      * is mutable, it will be copied when {@code build()} is called.
-     *
      * @param symtab must be a local or system symbol table.
      * May be null, in which case the initial symbol table is that of
      * {@code $ion_1_0}.
@@ -194,6 +204,12 @@ public IvmMinimizing getIvmMinimizing()
      */
     public abstract IonBinaryWriterBuilder withLocalSymbolTableAppendDisabled();
 
+    /**
+     * Specify the block size for write buffer.
+     * @param size represent the specified block size in bytes.
+     * If this functionality is not set, the default block size is 32768 bytes.
+     */
+    public abstract IonBinaryWriterBuilder withBlockSize(int size);
 
     /**
      * Enables or disables writing Binary32 (4-byte, single precision,
diff --git a/src/test/java/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java b/src/test/java/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
index 478433660c..0e316447e7 100644
--- a/src/test/java/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
+++ b/src/test/java/com/amazon/ion/impl/bin/IonEncoder_1_1Test.java
@@ -29,7 +29,7 @@ public class IonEncoder_1_1Test {
 
     @BeforeEach
     public void setup() {
-        buf = new WriteBuffer(ALLOCATOR);
+        buf = new WriteBuffer(ALLOCATOR, () -> {});
     }
 
     private byte[] bytes() {
diff --git a/src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java b/src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
index c808a8458a..bfa1e196d2 100644
--- a/src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
+++ b/src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTest.java
@@ -17,6 +17,7 @@
 
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonInt;
+import com.amazon.ion.IonLoader;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonStruct;
 import com.amazon.ion.IonSymbol;
@@ -24,12 +25,140 @@
 import com.amazon.ion.IonWriter;
 
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
+import org.junit.Before;
 import org.junit.Test;
 
 @SuppressWarnings("deprecation")
 public class IonManagedBinaryWriterTest extends IonManagedBinaryWriterTestCase
 {
+    private ByteArrayOutputStream source = new ByteArrayOutputStream();
+    private ByteArrayOutputStream expectedOut = new ByteArrayOutputStream();
+    private ByteArrayOutputStream source_32K = new ByteArrayOutputStream();
+    private ByteArrayOutputStream expectedOut_32K = new ByteArrayOutputStream();
+    private ByteArrayOutputStream source_67K = new ByteArrayOutputStream();
+    private ByteArrayOutputStream expectedOut_67K = new ByteArrayOutputStream();
+    private ByteArrayOutputStream singleTopLevelValue_13B = new ByteArrayOutputStream();
+
+    /**
+     * In test data, the field names are generated by appending a continuously increasing integer to the string "taco", resulting in names like "taco0", "taco1", and so on.
+     * These field names are paired with symbol IDs and then stored in then symbol table during the writing process.
+     * The actual bytes written into the user buffer are these symbol IDs. The symbol IDs start from $10, representing "taco0", and occupy one byte in the buffer. This single-byte representation continues up to "taco117", which corresponds to symbol ID $127.
+     * Beyond "taco117", encoding symbol IDs require two bytes.
+     * Therefore, for the first 118 ion structs, each takes 10 bytes, and for ion struct from "taco118" to "taco2988", each occupies 11 bytes.
+     * Consequently, the total buffer size is calculated as 118 × 10 + (2988 − 118 + 1) × 11 = 32761 bytes, then we keep writing 2990th ion struct which is 11 bytes, which will overflow the block limit of 32768 bytes.
+     * After completing the 2990th ion struct, the flush operation will be executed if auto-flush enabled.
+     */
+    private int FLUSH_PERIOD = 2990;
+    @Before
+    public void generateTestData() throws IOException {
+        // Writing test data with continuous extending symbol table. After completing writing 3300th value, the local symbol table will stop growing.
+        IonWriter defaultWriter = IonBinaryWriterBuilder.standard().build(source);
+        int i = 0;
+        while (i < 3300) {
+            defaultWriter.stepIn(IonType.STRUCT);
+            defaultWriter.setFieldName("taco" + i);
+            defaultWriter.writeString("burrito");
+            defaultWriter.stepOut();
+            i++;
+        }
+        while (i >= 3300 && i < 3400) {
+            defaultWriter.stepIn(IonType.STRUCT);
+            defaultWriter.setFieldName("taco" + 3);
+            defaultWriter.writeString("burrito");
+            defaultWriter.stepOut();
+            i++;
+        }
+        defaultWriter.close();
+        IonReader reader = system().newReader(source.toByteArray());
+        // While writing the 2990th data structure, the cumulative size of the written data will exceed the current block size.
+        // If auto-flush enabled, the flush() operation will be executed after completing the 2990th struct. The output should be the same as manually flush after writing the 2990th data.
+        int index = 0;
+
+        IonWriter expectedWriter = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendEnabled().build(expectedOut);
+        while (reader.next() != null) {
+            expectedWriter.writeValue(reader);
+            index++;
+            if (index == FLUSH_PERIOD) {
+                expectedWriter.flush();
+                index = 0;
+            }
+        }
+        expectedWriter.finish();
+    }
+
+    @Before
+    public void generateTestData32K() throws IOException {
+        // Writing test data with continuous extending symbol table. The total data written in user's block is 32K.
+        IonWriter defaultWriter = IonBinaryWriterBuilder.standard().build(source_32K);
+        int i = 0;
+        // The total size of first 2989 ion struct will be 118 x 10 + (2988 - 118 + 1) x 11 = 32761 bytes.
+        while (i < 2989) {
+            defaultWriter.stepIn(IonType.STRUCT);
+            defaultWriter.setFieldName("taco" + i);
+            defaultWriter.writeString("burrito");
+            defaultWriter.stepOut();
+            i++;
+        }
+        // Keep writing 7 bytes to user's buffer until the total data size in the current block is 32768 bytes.
+        defaultWriter.writeString("taco__");
+        defaultWriter.close();
+        IonReader reader = system().newReader(source_32K.toByteArray());
+        // No flush should be expected since the total data size written into user's buffer can fit into one block.
+        IonWriter expectedWriter = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendEnabled().build(expectedOut_32K);
+        while (reader.next() != null) {
+            expectedWriter.writeValue(reader);
+        }
+        expectedWriter.close();
+    }
+    @Before
+    public void generateTestData67K() throws IOException {
+        // Writing test data with continuous extending symbol table. After completing writing 3200th value, the local symbol table will stop growing.
+        IonWriter defaultWriter = IonBinaryWriterBuilder.standard().build(source_67K);
+        int i = 0;
+        //  The total size of first 3200 ion structs is 118 x 10 + (3199 - 118 + 1) x 11 = 35082 bytes.
+        while (i < 3200) {
+            defaultWriter.stepIn(IonType.STRUCT);
+            defaultWriter.setFieldName("taco" + i);
+            defaultWriter.writeString("burrito");
+            defaultWriter.stepOut();
+            i++;
+        }
+        // Since we already have symbol token appended in the symbol table for field name "taco3", the size of ion struct after number 3200 to 6399 will be the same, which is 10 bytes.
+        // The total size of this part is (6399 - 3200 + 1) x 10 = 31990 bytes. The size of test data would be 35082 + 31990 = 67062 bytes.
+        while (i >= 3200 && i < 6400) {
+            defaultWriter.stepIn(IonType.STRUCT);
+            defaultWriter.setFieldName("taco" + 3);
+            defaultWriter.writeString("burrito");
+            defaultWriter.stepOut();
+            i++;
+        }
+        defaultWriter.close();
+        IonReader reader = system().newReader(source_67K.toByteArray());
+        // After writing the 2990th data, the cumulative size of the written data in user's buffer will exceed the current block size.
+        // If auto-flush enabled, the flush() operation will be executed after completing the 2990th data. The output should be the same as manually flush after writing the 2990th data.
+        int index = 0;
+        IonWriter expectedWriter = IonBinaryWriterBuilder.standard().withLocalSymbolTableAppendEnabled().build(expectedOut_67K);
+        while (reader.next() != null) {
+            expectedWriter.writeValue(reader);
+            index++;
+            // There is only one flush operation should be expected. After the first flush operation, there will be two blocks allocated in the write buffer which is big enough to fit the rest of data streams.
+            if (index == FLUSH_PERIOD) {
+                expectedWriter.flush();
+            }
+        }
+        expectedWriter.close();
+    }
+
+    @Before
+    public void generateSingleTopLevelValue() throws IOException {
+        IonWriter defaultWriter = IonBinaryWriterBuilder.standard().build(singleTopLevelValue_13B);
+        defaultWriter.writeString("taco_burrito"); // Write a 13-byte IonString.
+        defaultWriter.close();
+    }
 
     @Test
     public void testSetStringAnnotations() throws Exception
@@ -104,6 +233,89 @@ public void testFlushImmediatelyAfterIVM() throws Exception
         assertEquals("burrito", ((IonSymbol) dg.systemGet(2)).stringValue());
     }
 
+    @Test
+    public void testAutoFlush() throws Exception{
+        IonReader reader = system().newReader(source.toByteArray());
+        ByteArrayOutputStream actual = new ByteArrayOutputStream();
+        IonWriter actualWriter = IonBinaryWriterBuilder.standard().withAutoFlushEnabled(autoFlushMode.isEnabled()).build(actual);
+        while (reader.next() != null) {
+            actualWriter.writeValue(reader);
+        }
+        actualWriter.close();
+        if (lstAppendMode.isEnabled() && autoFlushMode.isEnabled()) {
+            assertArrayEquals(actual.toByteArray(), expectedOut.toByteArray());
+        }
+        // When auto-flush mode is disabled, the serialized data should be equivalent to the source data without flush operation.
+        assertEquivalentDataModel(actual, source);
+    }
+
+    @Test
+    public void testAutoFlush_32K() throws Exception{
+        IonReader reader = system().newReader(source_32K.toByteArray());
+        ByteArrayOutputStream actual = new ByteArrayOutputStream();
+        IonWriter actualWriter = IonBinaryWriterBuilder.standard().withAutoFlushEnabled(autoFlushMode.isEnabled()).build(actual);
+        while (reader.next() != null) {
+            actualWriter.writeValue(reader);
+        }
+        actualWriter.close();
+        if (lstAppendMode.isEnabled() && autoFlushMode.isEnabled()) {
+            assertArrayEquals(actual.toByteArray(), expectedOut_32K.toByteArray());
+        }
+        // When auto-flush mode is disabled, the serialized data should be equivalent to the source data without flush operation.
+        assertEquivalentDataModel(actual, source_32K);
+    }
+
+    @Test
+    public void testAutoFlush_67K() throws Exception{
+        IonReader reader = system().newReader(source_67K.toByteArray());
+        ByteArrayOutputStream actual = new ByteArrayOutputStream();
+        IonWriter actualWriter = IonBinaryWriterBuilder.standard().withAutoFlushEnabled(autoFlushMode.isEnabled()).build(actual);
+        while (reader.next() != null) {
+            actualWriter.writeValue(reader);
+        }
+        actualWriter.close();
+        if (lstAppendMode.isEnabled() && autoFlushMode.isEnabled()) {
+            assertArrayEquals(actual.toByteArray(), expectedOut_67K.toByteArray());
+        }
+        assertEquivalentDataModel(actual, source_67K);
+    }
+
+    @Test
+    public void testAutoFlush_twiceBlockSize() throws IOException {
+        IonReader reader = system().newReader(singleTopLevelValue_13B.toByteArray());
+        ByteArrayOutputStream actual = new ByteArrayOutputStream();
+        // Set the actual writer block size as 5 bytes. The test data is a 13-byte IonString "taco_burrito".
+        IonBinaryWriterBuilder builder = IonBinaryWriterBuilder.standard().withAutoFlushEnabled(autoFlushMode.isEnabled()).withBlockSize(5);
+        IonWriter actualWriter = builder.build(actual);
+        while (reader.next() != null) {
+            actualWriter.writeValue(reader);
+        }
+        actualWriter.close();
+        if (lstAppendMode.isEnabled() && autoFlushMode.isEnabled()) {
+            // When auto-flush is enabled, no flush is expected since this is a single top-level value and should continue encoding until this value is completed.
+            assertArrayEquals(actual.toByteArray(), singleTopLevelValue_13B.toByteArray());
+        }
+        assertEquivalentDataModel(actual, singleTopLevelValue_13B);
+    }
+
+    @Test
+    public void testAutoFlush_oneBlockSize() throws IOException {
+        IonReader reader = system().newReader(singleTopLevelValue_13B.toByteArray());
+        ByteArrayOutputStream actual = new ByteArrayOutputStream();
+        // Set the actual writer block size as 13 bytes. The test data is a 13-byte IonString "taco_burrito".
+        IonBinaryWriterBuilder builder = IonBinaryWriterBuilder.standard().withAutoFlushEnabled(autoFlushMode.isEnabled()).withBlockSize(13);
+        IonWriter actualWriter = builder.build(actual);
+        while (reader.next() != null) {
+            actualWriter.writeValue(reader);
+        }
+        actualWriter.close();
+        if (lstAppendMode.isEnabled() && autoFlushMode.isEnabled()) {
+            // When auto-flush is enabled, no flush is expected since this is a single top-level value and should continue encoding until this value is completed.
+            assertArrayEquals(actual.toByteArray(), singleTopLevelValue_13B.toByteArray());
+        }
+        assertEquivalentDataModel(actual, singleTopLevelValue_13B);
+    }
+
     @Test
     public void testNoNewSymbolsAfterFlush() throws Exception
     {
@@ -253,4 +465,16 @@ public void testNestedEmptyAnnotatedContainer() throws Exception
         writer.stepOut();
         assertValue("{bar: foo::[]}");
     }
+
+    /**
+     * Asserts equivalence of ion data model between two provided data streams.
+     * @param actual represents the serialized data streams when auto-flush is enabled.
+     * @param expected represents the expected data streams.
+     */
+    private void assertEquivalentDataModel(ByteArrayOutputStream actual, ByteArrayOutputStream expected) {
+        IonLoader loader = IonSystemBuilder.standard().build().newLoader();
+        IonDatagram actualDatagram = loader.load(actual.toByteArray());
+        IonDatagram expectedDatagram = loader.load(expected.toByteArray());
+        assertEquals(expectedDatagram, actualDatagram);
+    }
 }
diff --git a/src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java b/src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java
index fcc28498a8..78ab82ca74 100644
--- a/src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java
+++ b/src/test/java/com/amazon/ion/impl/bin/IonManagedBinaryWriterTestCase.java
@@ -64,14 +64,29 @@ protected enum LSTAppendMode
         public boolean isEnabled() { return this == LST_APPEND_ENABLED; }
     }
 
+    protected enum AutoFlushMode
+    {
+        AUTO_FLUSH_ENABLED,
+        AUTO_FLUSH_DISABLED;
+        public boolean isEnabled() { return this == AUTO_FLUSH_ENABLED; }
+    }
+
     @Injected.Inject("lstAppendMode")
     public static final LSTAppendMode[] LST_APPEND_ENABLED_DIMENSIONS = LSTAppendMode.values();
     protected LSTAppendMode lstAppendMode;
+    @Injected.Inject("autoFlushMode")
+    public static final AutoFlushMode[] AUTO_FLUSH_MODES = AutoFlushMode.values();
+    protected AutoFlushMode autoFlushMode;
     public void setLstAppendMode(final LSTAppendMode mode)
     {
         this.lstAppendMode = mode;
     }
 
+    public void setAutoFlushMode(final AutoFlushMode mode)
+    {
+        this.autoFlushMode = mode;
+    }
+
     private void checkSymbolTokenAgainstImport(final SymbolToken token)
     {
         final Integer sid = SHARED_SYMBOL_LOCAL_SIDS.get(token.getText());
@@ -142,6 +157,12 @@ protected IonWriter createWriter(final OutputStream out) throws IOException
             builder.withLocalSymbolTableAppendDisabled();
         }
 
+        if (autoFlushMode.isEnabled()) {
+            builder.withAutoFlushEnabled();
+        } else {
+            builder.withAutoFlushDisabled();
+        }
+
         final IonWriter writer = builder.newWriter(out);
 
         final SymbolTable locals = writer.getSymbolTable();
diff --git a/src/test/java/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java b/src/test/java/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
index ddf49e9969..f13a61d520 100644
--- a/src/test/java/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
+++ b/src/test/java/com/amazon/ion/impl/bin/IonRawBinaryWriterTest.java
@@ -123,7 +123,9 @@ protected IonWriter createWriter(final OutputStream out) throws IOException
             StreamCloseMode.NO_CLOSE,
             StreamFlushMode.NO_FLUSH,
             preallocationMode,
-            true
+            true,
+            false,
+            null
         );
     }
 
diff --git a/src/test/java/com/amazon/ion/impl/bin/WriteBufferTest.java b/src/test/java/com/amazon/ion/impl/bin/WriteBufferTest.java
index 1a8e83b80f..e71c4fb7c4 100644
--- a/src/test/java/com/amazon/ion/impl/bin/WriteBufferTest.java
+++ b/src/test/java/com/amazon/ion/impl/bin/WriteBufferTest.java
@@ -20,12 +20,17 @@
 import static com.amazon.ion.impl.bin.WriteBuffer.writeVarUIntTo;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -37,15 +42,14 @@ public class WriteBufferTest
 {
     // XXX make this a prime to make it more likely that we collide on the edges of the buffer
     private static BlockAllocator ALLOCATOR = BlockAllocatorProviders.basicProvider().vendAllocator(11);
-
-    private WriteBuffer buf;
-
     private ByteArrayOutputStream out;
+    private WriteBuffer buf;
+    private AtomicBoolean endOfBufferReached = new AtomicBoolean(false);
 
     @BeforeEach
-    public void setup()
+    public void setup() throws IOException
     {
-        buf = new WriteBuffer(ALLOCATOR);
+        buf = new WriteBuffer(ALLOCATOR, () -> endOfBufferReached.set(true));
         out = new ByteArrayOutputStream();
     }
 
@@ -260,6 +264,19 @@ public void testInt56Negative()
         assertBuffer(bytes);
     }
 
+    /**
+     * Test if the method endOfBufferReached is invoked appropriately, the size of bytes written into the buffer overflow the current block size.
+     * @throws UnsupportedEncodingException
+     */
+    @Test
+    public void testEndOfBufferReachedInvoked() throws UnsupportedEncodingException {
+        buf.writeBytes("taco".getBytes("UTF-8"));
+        buf.writeBytes("burrito".getBytes("UTF-8"));
+        assertFalse(endOfBufferReached.get());
+        buf.writeBytes("_".getBytes("UTF-8"));
+        assertTrue(endOfBufferReached.get());
+    }
+
     @Test
     public void testInt64Negative()
     {

From f5d59d0213fa7a6e51bb47eb301c616430e27806 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 17:00:07 +0000
Subject: [PATCH 319/490] Bump gradle/gradle-build-action from 2.9.0 to 2.10.0

Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/842c587ad8aa4c68eeba24c396e15af4c2e9f30a...87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/main.yml                      | 4 ++--
 .github/workflows/publish-release-artifacts.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ecbcc2710b..d7a9bbdb79 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,11 +28,11 @@ jobs:
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
-      - uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
+      - uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # v2.10.0
         with:
           arguments: build
       - name: Test minified JAR
-        uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
+        uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # v2.10.0
         with:
           arguments: minifyTest
       - run: ./ion-test-driver-run version
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 376de1cd49..048899fe8c 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
         with:
           submodules: recursive
-      - uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
+      - uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # v2.10.0
         with:
           arguments: build cyclonedxBom
       - name: Upload Jar to GitHub release

From f3b69963b58dc8e919082a6cc5654847101b5478 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Nov 2023 16:35:30 +0000
Subject: [PATCH 320/490] Bump actions/setup-java from 3 to 4

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ion-java-performance-regression-detector.yml | 2 +-
 .github/workflows/main.yml                                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index e361fadc87..8442e11139 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -58,7 +58,7 @@ jobs:
 
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'corretto'
           java-version: 11
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d7a9bbdb79..d19e41aa2f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
           submodules: recursive
       - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
       - name: Use java ${{ matrix.java }}
-        uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}

From b0d3dcc141774a60705adc2b0bda68026987b17f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Dec 2023 19:29:39 +0000
Subject: [PATCH 321/490] Bump github/codeql-action from 2.22.7 to 2.22.9

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.7 to 2.22.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/66b90a5db151a8042fa97405c6cf843bbe433f7b...c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9120961fd0..1517320233 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
+        uses: github/codeql-action/init@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
+        uses: github/codeql-action/autobuild@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
+        uses: github/codeql-action/analyze@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 37a96a27fb..cdc9c29207 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@66b90a5db151a8042fa97405c6cf843bbe433f7b # v2.22.7
+        uses: github/codeql-action/upload-sarif@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
         with:
           sarif_file: results.sarif

From 56bada5253eb7de430315c30e77dda528f65708a Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 14 Dec 2023 18:01:44 -0800
Subject: [PATCH 322/490] Adds the ability to read an Ion int as a Java double,
 Decimal, or BigDecimal for consistency with the previous implementation.

---
 .../impl/IonReaderContinuableCoreBinary.java  |  78 +++++++++----
 ...onReaderContinuableTopLevelBinaryTest.java | 104 +++++++++++++++++-
 2 files changed, 156 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
index 811281e64c..b43bfe2071 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -579,36 +579,67 @@ public int getBytes(byte[] bytes, int offset, int len) {
         return length;
     }
 
+    /**
+     * Loads the scalar converter with an integer value that fits the Ion int on which the reader is positioned.
+     */
+    private void prepareToConvertIntValue() {
+        if (getIntegerSize() == IntegerSize.BIG_INTEGER) {
+            scalarConverter.addValue(bigIntegerValue());
+            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.bigInteger_value);
+        } else {
+            scalarConverter.addValue(longValue());
+            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.long_value);
+        }
+    }
+
     @Override
     public BigDecimal bigDecimalValue() {
-        if (valueTid == null || IonType.DECIMAL != valueTid.type) {
+        BigDecimal value = null;
+        if (valueTid.type == IonType.DECIMAL) {
+            if (valueTid.isNull) {
+                return null;
+            }
+            prepareScalar();
+            peekIndex = valueMarker.startIndex;
+            if (peekIndex >= valueMarker.endIndex) {
+                value = BigDecimal.ZERO;
+            } else {
+                value = minorVersion == 0 ? readBigDecimal_1_0() : readBigDecimal_1_1();
+            }
+        } else if (valueTid.type == IonType.INT) {
+            prepareToConvertIntValue();
+            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.decimal_value));
+            value = scalarConverter.getBigDecimal();
+            scalarConverter.clear();
+        } else {
             throwDueToInvalidType(IonType.DECIMAL);
         }
-        if (valueTid.isNull) {
-            return null;
-        }
-        prepareScalar();
-        peekIndex = valueMarker.startIndex;
-        if (peekIndex >= valueMarker.endIndex) {
-            return BigDecimal.ZERO;
-        }
-        return minorVersion == 0 ? readBigDecimal_1_0() : readBigDecimal_1_1();
+        return value;
     }
 
     @Override
     public Decimal decimalValue() {
-        if (valueTid == null || IonType.DECIMAL != valueTid.type) {
+        Decimal value = null;
+        if (valueTid.type == IonType.DECIMAL) {
+            if (valueTid.isNull) {
+                return null;
+            }
+            prepareScalar();
+            peekIndex = valueMarker.startIndex;
+            if (peekIndex >= valueMarker.endIndex) {
+                value = Decimal.ZERO;
+            } else {
+                value = minorVersion == 0 ? readDecimal_1_0() : readDecimal_1_1();
+            }
+        } else if (valueTid.type == IonType.INT) {
+            prepareToConvertIntValue();
+            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.decimal_value));
+            value = scalarConverter.getDecimal();
+            scalarConverter.clear();
+        } else {
             throwDueToInvalidType(IonType.DECIMAL);
         }
-        if (valueTid.isNull) {
-            return null;
-        }
-        prepareScalar();
-        peekIndex = valueMarker.startIndex;
-        if (peekIndex >= valueMarker.endIndex) {
-            return Decimal.ZERO;
-        }
-        return minorVersion == 0 ? readDecimal_1_0() : readDecimal_1_1();
+        return value;
     }
 
     @Override
@@ -689,12 +720,17 @@ public double doubleValue() {
                 // Note: there is no need to check for other lengths here; the type ID byte is validated during next().
                 value = bytes.getDouble();
             }
-        }  else if (valueTid.type == IonType.DECIMAL) {
+        } else if (valueTid.type == IonType.DECIMAL) {
             scalarConverter.addValue(decimalValue());
             scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.decimal_value);
             scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.double_value));
             value = scalarConverter.getDouble();
             scalarConverter.clear();
+        } else if (valueTid.type == IonType.INT) {
+            prepareToConvertIntValue();
+            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.double_value));
+            value = scalarConverter.getDouble();
+            scalarConverter.clear();
         } else {
             throw new IllegalStateException("doubleValue() may only be called on values of type float or decimal.");
         }
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 57a9d8c2ff..3d6140bc94 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -4,6 +4,7 @@
 package com.amazon.ion.impl;
 
 import com.amazon.ion.BufferConfiguration;
+import com.amazon.ion.Decimal;
 import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonException;
@@ -41,6 +42,7 @@
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
@@ -48,6 +50,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.zip.GZIPInputStream;
 
 import static com.amazon.ion.BitUtils.bytes;
@@ -361,6 +364,13 @@ static ExpectationProvider<IonReaderContinuableTopLevelBinary> decimalValue(BigD
         ));
     }
 
+    static ExpectationProvider<IonReaderContinuableTopLevelBinary> bigDecimalValue(BigDecimal expectedValue) {
+        return consumer -> consumer.accept(new Expectation<>(
+            String.format("bigDecimal(%s)", expectedValue),
+            reader -> assertEquals(expectedValue, reader.bigDecimalValue())
+        ));
+    }
+
     static ExpectationProvider<IonReaderContinuableTopLevelBinary> stringValue(String expectedValue) {
         return consumer -> consumer.accept(new Expectation<>(
             String.format("string(%s)", expectedValue),
@@ -1664,13 +1674,97 @@ public void byteSizeNotOnLobFails(boolean constructFromBytes) throws Exception {
         reader.close();
     }
 
+    /**
+     * Verifies that the reader can read Ion int values of all sizes into the Java type T.
+     */
+    @SafeVarargs
+    private final <T> void readIntsIntoOtherType(
+        boolean constructFromBytes,
+        Function<T, ExpectationProvider<IonReaderContinuableTopLevelBinary>> assertionFunction,
+        T... expectedValues
+    ) throws Exception {
+        reader = readerFor(
+        "0 " +
+            "1 " +
+            "-1 " +
+            "2147483647 " +
+            "2147483648 " +
+            "-2147483648 " +
+            "-2147483649 " +
+            "9223372036854775807 " +
+            "9223372036854775808 " +
+            "-9223372036854775808 " +
+            "-9223372036854775809",
+            constructFromBytes
+        );
+        List<ExpectationProvider<IonReaderContinuableTopLevelBinary>> assertions = new ArrayList<>();
+        for (T expectedValue : expectedValues) {
+            assertions.add(next(IonType.INT));
+            assertions.add(assertionFunction.apply(expectedValue));
+        }
+        assertions.add(next(null));
+        assertSequence(assertions.toArray(new ExpectationProvider[0]));
+        closeAndCount();
+    }
+
     @ParameterizedTest(name = "constructFromBytes={0}")
     @ValueSource(booleans = {true, false})
-    public void doubleValueOnIntFails(boolean constructFromBytes) throws Exception {
-        reader = readerFor(constructFromBytes, 0x20);
-        reader.next();
-        assertThrows(IllegalStateException.class, () -> reader.doubleValue());
-        reader.close();
+    public void doubleValueOnInt(boolean constructFromBytes) throws Exception {
+        readIntsIntoOtherType(
+            constructFromBytes,
+            IonReaderContinuableTopLevelBinaryTest::doubleValue,
+            0.0,
+            1.0,
+            -1.0,
+            (double) Integer.MAX_VALUE,
+            (double) (((long) Integer.MAX_VALUE) + 1),
+            (double) Integer.MIN_VALUE,
+            (double) (((long) Integer.MIN_VALUE) - 1),
+            (double) Long.MAX_VALUE,
+            ((double) Long.MAX_VALUE) + 1,
+            (double) Long.MIN_VALUE,
+            ((double) Long.MIN_VALUE) - 1
+        );
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void decimalValueOnInt(boolean constructFromBytes) throws Exception {
+        readIntsIntoOtherType(
+            constructFromBytes,
+            IonReaderContinuableTopLevelBinaryTest::decimalValue,
+            Decimal.ZERO,
+            Decimal.ONE,
+            Decimal.valueOf(-1),
+            Decimal.valueOf(Integer.MAX_VALUE),
+            Decimal.valueOf(((long) Integer.MAX_VALUE) + 1),
+            Decimal.valueOf(Integer.MIN_VALUE),
+            Decimal.valueOf(((long) Integer.MIN_VALUE) - 1),
+            Decimal.valueOf(Long.MAX_VALUE),
+            Decimal.valueOf(Long.MAX_VALUE).add(Decimal.ONE),
+            Decimal.valueOf(Long.MIN_VALUE),
+            Decimal.valueOf(Long.MIN_VALUE).subtract(Decimal.ONE)
+        );
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void bigDecimalValueOnInt(boolean constructFromBytes) throws Exception {
+        readIntsIntoOtherType(
+            constructFromBytes,
+            IonReaderContinuableTopLevelBinaryTest::bigDecimalValue,
+            BigDecimal.ZERO,
+            BigDecimal.ONE,
+            BigDecimal.valueOf(-1),
+            BigDecimal.valueOf(Integer.MAX_VALUE),
+            BigDecimal.valueOf(((long) Integer.MAX_VALUE) + 1),
+            BigDecimal.valueOf(Integer.MIN_VALUE),
+            BigDecimal.valueOf(((long) Integer.MIN_VALUE) - 1),
+            BigDecimal.valueOf(Long.MAX_VALUE),
+            BigDecimal.valueOf(Long.MAX_VALUE).add(BigDecimal.ONE),
+            BigDecimal.valueOf(Long.MIN_VALUE),
+            BigDecimal.valueOf(Long.MIN_VALUE).subtract(BigDecimal.ONE)
+        );
     }
 
     @ParameterizedTest(name = "constructFromBytes={0}")

From 57c6787d0da442984d441b32343f6ecb7e2325c6 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 21 Dec 2023 20:22:13 -0800
Subject: [PATCH 323/490] Handles the case where the reader unexpectedly
 encounters an oversized value, throwing IonException with a helpful message.

---
 .../com/amazon/ion/BufferConfiguration.java   |   7 +-
 .../amazon/ion/IonBufferConfiguration.java    |  30 +++-
 .../com/amazon/ion/impl/IonCursorBinary.java  |  36 +++--
 ...IonReaderContinuableApplicationBinary.java |   1 +
 .../amazon/ion/system/IonReaderBuilder.java   |   5 +-
 ...onReaderContinuableTopLevelBinaryTest.java | 142 ++++++++++++++++++
 .../ion/system/IonReaderBuilderTest.java      |  13 +-
 7 files changed, 213 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/amazon/ion/BufferConfiguration.java b/src/main/java/com/amazon/ion/BufferConfiguration.java
index d86da2c7a5..e31c657d12 100644
--- a/src/main/java/com/amazon/ion/BufferConfiguration.java
+++ b/src/main/java/com/amazon/ion/BufferConfiguration.java
@@ -161,6 +161,11 @@ public int getMaximumBufferSize() {
          */
         public abstract OversizedValueHandler getNoOpOversizedValueHandler();
 
+        /**
+         * @return an {@link OversizedValueHandler} that always throws a runtime exception.
+         */
+        public abstract OversizedValueHandler getThrowingOversizedValueHandler();
+
         /**
          * @return the no-op {@link DataHandler} for the type of BufferConfiguration that this Builder builds.
          */
@@ -210,7 +215,7 @@ protected BufferConfiguration(Builder<Configuration, ?> builder) {
         }
         if (builder.getOversizedValueHandler() == null) {
             requireUnlimitedBufferSize();
-            oversizedValueHandler = builder.getNoOpOversizedValueHandler();
+            oversizedValueHandler = builder.getThrowingOversizedValueHandler();
         } else {
             oversizedValueHandler = builder.getOversizedValueHandler();
         }
diff --git a/src/main/java/com/amazon/ion/IonBufferConfiguration.java b/src/main/java/com/amazon/ion/IonBufferConfiguration.java
index c89c3f27b0..48190854b1 100644
--- a/src/main/java/com/amazon/ion/IonBufferConfiguration.java
+++ b/src/main/java/com/amazon/ion/IonBufferConfiguration.java
@@ -8,6 +8,12 @@
  */
 public final class IonBufferConfiguration extends BufferConfiguration<IonBufferConfiguration> {
 
+    /**
+     * The standard configuration. This will be used unless the user chooses custom settings.
+     */
+    public static final IonBufferConfiguration DEFAULT =
+        IonBufferConfiguration.Builder.standard().build();
+
     /**
      * Functional interface for handling oversized symbol tables.
      */
@@ -31,6 +37,16 @@ public static final class Builder extends BufferConfiguration.Builder<IonBufferC
          */
         private static final int MINIMUM_MAX_VALUE_SIZE = 5;
 
+        private static void throwDueToUnexpectedOversizedValue() {
+            throw new IonException("An oversized value was found even though no maximum size was configured. " +
+                "This is either due to data corruption or encountering a scalar larger than 2 GB. In the latter case, " +
+                "an IonBufferConfiguration can be configured to allow the reader to skip the oversized scalar."
+            );
+        }
+
+        private static final OversizedValueHandler THROWING_OVERSIZED_VALUE_HANDLER = Builder::throwDueToUnexpectedOversizedValue;
+        private static final OversizedSymbolTableHandler THROWING_OVERSIZED_SYMBOL_TABLE_HANDLER = Builder::throwDueToUnexpectedOversizedValue;
+
         /**
          * An OversizedValueHandler that does nothing.
          */
@@ -120,6 +136,11 @@ public OversizedValueHandler getNoOpOversizedValueHandler() {
             return NO_OP_OVERSIZED_VALUE_HANDLER;
         }
 
+        @Override
+        public OversizedValueHandler getThrowingOversizedValueHandler() {
+            return THROWING_OVERSIZED_VALUE_HANDLER;
+        }
+
         @Override
         public DataHandler getNoOpDataHandler() {
             return NO_OP_DATA_HANDLER;
@@ -132,6 +153,13 @@ public OversizedSymbolTableHandler getNoOpOversizedSymbolTableHandler() {
             return NO_OP_OVERSIZED_SYMBOL_TABLE_HANDLER;
         }
 
+        /**
+         * @return an OversizedSymbolTableHandler that always throws {@link IonException}.
+         */
+        public OversizedSymbolTableHandler getThrowingOversizedSymbolTableHandler() {
+            return THROWING_OVERSIZED_SYMBOL_TABLE_HANDLER;
+        }
+
         @Override
         public IonBufferConfiguration build() {
             return new IonBufferConfiguration(this);
@@ -151,7 +179,7 @@ private IonBufferConfiguration(Builder builder) {
         super(builder);
         if (builder.getOversizedSymbolTableHandler() == null) {
             requireUnlimitedBufferSize();
-            oversizedSymbolTableHandler = builder.getNoOpOversizedSymbolTableHandler();
+            oversizedSymbolTableHandler = builder.getThrowingOversizedSymbolTableHandler();
         } else {
             oversizedSymbolTableHandler = builder.getOversizedSymbolTableHandler();
         }
diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 0d39112378..e38eb9b687 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -278,6 +278,16 @@ private static class RefillableState {
     private long lastReportedByteTotal = 0;
 
 
+    /**
+     * @return the given configuration's DataHandler, or null if that DataHandler is a no-op.
+     */
+    private static BufferConfiguration.DataHandler getDataHandler(IonBufferConfiguration configuration) {
+        // Using null instead of a no-op handler enables a quick null check to skip calculating the amount of data
+        // processed, improving performance.
+        BufferConfiguration.DataHandler dataHandler = configuration.getDataHandler();
+        return dataHandler == IonBufferConfiguration.DEFAULT.getDataHandler() ? null : dataHandler;
+    }
+
     /**
      * Constructs a new fixed (non-refillable) cursor from the given byte array.
      * @param configuration the configuration to use. The buffer size and oversized value configuration are unused, as
@@ -292,7 +302,7 @@ private static class RefillableState {
         int offset,
         int length
     ) {
-        this.dataHandler = (configuration == null) ? null : configuration.getDataHandler();
+        this.dataHandler = getDataHandler(configuration);
         peekIndex = offset;
         valuePreHeaderIndex = offset;
         checkpoint = peekIndex;
@@ -310,12 +320,6 @@ private static class RefillableState {
         refillableState = null;
     }
 
-    /**
-     * The standard {@link IonBufferConfiguration}. This will be used unless the user chooses custom settings.
-     */
-    private static final IonBufferConfiguration STANDARD_BUFFER_CONFIGURATION =
-        IonBufferConfiguration.Builder.standard().build();
-
     /**
      * @param value a non-negative number.
      * @return the exponent of the next power of two greater than or equal to the given number.
@@ -352,13 +356,13 @@ static int nextPowerOfTwo(int value) {
     private static final IonBufferConfiguration[] FIXED_SIZE_CONFIGURATIONS;
 
     static {
-        int maxBufferSizeExponent = logBase2(STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize());
+        int maxBufferSizeExponent = logBase2(IonBufferConfiguration.DEFAULT.getInitialBufferSize());
         FIXED_SIZE_CONFIGURATIONS = new IonBufferConfiguration[maxBufferSizeExponent + 1];
         for (int i = 0; i <= maxBufferSizeExponent; i++) {
             // Create a buffer configuration for buffers of size 2^i. The minimum size is 8: the smallest power of two
             // larger than the minimum buffer size allowed.
             int size = Math.max(8, (int) Math.pow(2, i));
-            FIXED_SIZE_CONFIGURATIONS[i] = IonBufferConfiguration.Builder.from(STANDARD_BUFFER_CONFIGURATION)
+            FIXED_SIZE_CONFIGURATIONS[i] = IonBufferConfiguration.Builder.from(IonBufferConfiguration.DEFAULT)
                 .withInitialBufferSize(size)
                 .withMaximumBufferSize(size)
                 .build();
@@ -370,6 +374,9 @@ static int nextPowerOfTwo(int value) {
      * @param configuration the configuration to validate.
      */
     private static void validate(IonBufferConfiguration configuration) {
+        if (configuration == null) {
+            throw new IllegalArgumentException("Buffer configuration must not be null.");
+        }
         if (configuration.getInitialBufferSize() < 1) {
             throw new IllegalArgumentException("Initial buffer size must be at least 1.");
         }
@@ -396,10 +403,10 @@ private static IonBufferConfiguration getFixedSizeConfigurationFor(
         if (alreadyReadLen > 0) {
             fixedBufferSize += alreadyReadLen;
         }
-        if (STANDARD_BUFFER_CONFIGURATION.getInitialBufferSize() > fixedBufferSize) {
+        if (IonBufferConfiguration.DEFAULT.getInitialBufferSize() > fixedBufferSize) {
             return FIXED_SIZE_CONFIGURATIONS[logBase2(fixedBufferSize)];
         }
-        return STANDARD_BUFFER_CONFIGURATION;
+        return IonBufferConfiguration.DEFAULT;
     }
 
     /**
@@ -416,19 +423,18 @@ private static IonBufferConfiguration getFixedSizeConfigurationFor(
         int alreadyReadOff,
         int alreadyReadLen
     ) {
-        this.dataHandler = (configuration == null) ? null : configuration.getDataHandler();
-        if (configuration == null) {
+        if (configuration == IonBufferConfiguration.DEFAULT) {
+            dataHandler = null;
             if (inputStream instanceof ByteArrayInputStream) {
                 // ByteArrayInputStreams are fixed-size streams. Clamp the reader's internal buffer size at the size of
                 // the stream to avoid wastefully allocating extra space that will never be needed. It is still
                 // preferable for the user to manually specify the buffer size if it's less than the default, as doing
                 // so allows this branch to be skipped.
                 configuration = getFixedSizeConfigurationFor((ByteArrayInputStream) inputStream, alreadyReadLen);
-            } else {
-                configuration = STANDARD_BUFFER_CONFIGURATION;
             }
         } else {
             validate(configuration);
+            dataHandler = getDataHandler(configuration);
         }
         peekIndex = 0;
         checkpoint = 0;
diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 9fe4e334b8..3e5a57fd1d 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -3,6 +3,7 @@
 
 package com.amazon.ion.impl;
 
+import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
diff --git a/src/main/java/com/amazon/ion/system/IonReaderBuilder.java b/src/main/java/com/amazon/ion/system/IonReaderBuilder.java
index 17c2fa9142..0c0771749b 100644
--- a/src/main/java/com/amazon/ion/system/IonReaderBuilder.java
+++ b/src/main/java/com/amazon/ion/system/IonReaderBuilder.java
@@ -44,7 +44,7 @@ public abstract class IonReaderBuilder
 
     private IonCatalog catalog = null;
     private boolean isIncrementalReadingEnabled = false;
-    private IonBufferConfiguration bufferConfiguration = null;
+    private IonBufferConfiguration bufferConfiguration = IonBufferConfiguration.DEFAULT;
 
     protected IonReaderBuilder()
     {
@@ -249,6 +249,9 @@ public IonReaderBuilder withBufferConfiguration(IonBufferConfiguration configura
      */
     public void setBufferConfiguration(IonBufferConfiguration configuration) {
         mutationCheck();
+        if (configuration == null) {
+            throw new IllegalArgumentException("Configuration must not be null. To use the default configuration, provide IonBufferConfiguration.DEFAULT.");
+        }
         bufferConfiguration = configuration;
     }
 
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 3d6140bc94..3abc60748a 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -38,6 +38,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -51,6 +52,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.zip.GZIPInputStream;
 
 import static com.amazon.ion.BitUtils.bytes;
@@ -3604,4 +3606,144 @@ public void earlyStepOutNonIncremental(boolean constructFromBytes) throws Except
         // However, the reader *must* fail if the user requests the next value, because the stream is incomplete.
         assertThrows(IonException.class, () -> reader.next()); // Unexpected EOF
     }
+
+    /**
+     * Verifies that the reader throws IonException when the provided code is executed over the given input.
+     * @param constructFromBytes whether to provide bytes (true) or an InputStream (false) to the reader.
+     * @param codeExpectedToThrow the code expected to throw IonException.
+     * @param input the input data.
+     */
+    private void expectIonException(
+        boolean constructFromBytes,
+        Consumer<IonReader> codeExpectedToThrow,
+        int... input
+    ) throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false).withBufferConfiguration(IonBufferConfiguration.DEFAULT);
+        reader = readerFor(constructFromBytes, input);
+        assertThrows(IonException.class, () -> codeExpectedToThrow.accept(reader));
+        reader.close();
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void scalarValueLargerThan2GB(boolean constructFromBytes) throws Exception {
+        expectIonException(
+            constructFromBytes,
+            reader -> {
+                reader.next();
+                reader.longValue();
+            },
+            0x2E, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF // Int with length larger than 2GB
+        );
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void scalarValueLargerThan2GBWithinSymbolTable(boolean constructFromBytes) throws Exception {
+        expectIonException(
+            constructFromBytes,
+            IonReader::next,
+            0xEB, 0x81, 0x83, // Annotation wrapper length 11 with one annotation: 3 ($ion_symbol_table)
+            0xD8, // Struct length 8
+            0x87, 0x2E, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF // Field name 7 (symbols), int with length larger than 2GB
+        );
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void possibleSymbolTableStructDeclaresLengthLargerThan2GB(boolean constructFromBytes) throws Exception {
+        expectIonException(
+            constructFromBytes,
+            IonReader::next,
+            0xEB, 0x81, 0x83, // Annotation wrapper length 11 with one annotation: 3 ($ion_symbol_table)
+            0xDE, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, // Struct with length larger than 2GB
+            0x87, 0x20 // Field name 7 (symbols), int 0
+        );
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void possibleSymbolTableAnnotationDeclaresLengthLargerThan2GB(boolean constructFromBytes) throws Exception {
+        expectIonException(
+            constructFromBytes,
+            IonReader::next,
+            0xEE, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, // Annotation wrapper with length larger than 2GB
+            0x81, 0x83, // One annotation: 3 ($ion_symbol_table)
+            0xDE, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7C, // Struct with length larger than 2GB
+            0x87, 0x20 // Field name 7 (symbols), int 0
+        );
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void annotationSequenceLengthThatOverflowsBufferThrowsIonException(boolean constructFromBytes) throws Exception {
+        // This emulates a bad byte (0x52) replacing the annotation sequence length VarUInt in a symbol table annotation
+        // wrapper. This results in a declared annotation sequence length much larger than the total length of the
+        // stream. This should be detected and raised as an IonException.
+        expectIonException(
+            constructFromBytes,
+            IonReader::next,
+            0xEE, 0x9A, 0x52, 0x83, 0xDE, 0x96, 0x87
+        );
+    }
+
+    /**
+     * Verifies that corrupting each byte in the input data results in IonException, or nothing.
+     * @param constructFromBytes whether to provide bytes (true) or an InputStream (false) to the reader.
+     * @param incrementalReadingEnabled whether to enable incremental reading.
+     * @param emptyBufferConfiguration whether to set the buffer configuration to null (true), or use the standard test configuration (false).
+     */
+    private void corruptEachByteThrowsIonException(
+        boolean constructFromBytes,
+        boolean incrementalReadingEnabled,
+        boolean emptyBufferConfiguration
+    ) {
+        IonReaderBuilder builder = readerBuilder.copy();
+        builder = builder.withIncrementalReadingEnabled(incrementalReadingEnabled);
+        if (emptyBufferConfiguration) {
+            builder = builder.withBufferConfiguration(IonBufferConfiguration.DEFAULT);
+        }
+        // The following data begins with a symbol table, contains nested containers with length subfields, and
+        // contains a string, an integer, and blobs.
+        byte[] original = toBinary(
+            "{\n" +
+            "  C:\"CRDR\",\n" +
+            "  V:3,\n" +
+            "  DR:{\n" +
+            "    P:\"dummyPartitionKey\",\n" +
+            "    D:{{ dGVzdERhdGE= }},\n" +
+            "    S:{{ AeJA }},\n" +
+            "    DC:{{ brzdAsJNBCzI3S63zno7Uw== }},\n" +
+            "    HC:{{ f5C7STBM1f2S4SFkJWgbIizTYBE= }}\n" +
+            "  }\n" +
+            "}"
+        );
+        byte[] corrupted = new byte[original.length];
+        for (int i = 0; i < corrupted.length; i++) {
+            // Fill with the original data
+            System.arraycopy(original, 0, corrupted, 0, original.length);
+            // Corrupt the byte at index i
+            corrupted[i] = 0x52;
+            // Ensure the corruption results in IonException or nothing.
+            reader = readerFor(builder, constructFromBytes, corrupted);
+            try {
+                TestUtils.deepRead(reader);
+                // Successful parsing is possible because the input contains blobs whose content is not inspected for corruption.
+                reader.close();
+            } catch (IonException e) {
+                // This is expected to be thrown when corruption is detected.
+            } catch (Exception f) {
+                fail("Expected IonException to be thrown, but was: ", f);
+            }
+        }
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void corruptEachByteThrowsIonException(boolean constructFromBytes) {
+        corruptEachByteThrowsIonException(constructFromBytes, true, true);
+        corruptEachByteThrowsIonException(constructFromBytes, true, false);
+        corruptEachByteThrowsIonException(constructFromBytes, false, true);
+        corruptEachByteThrowsIonException(constructFromBytes, false, false);
+    }
 }
diff --git a/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java b/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java
index 36454e3346..01167e8adb 100644
--- a/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java
+++ b/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java
@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -160,13 +161,19 @@ public void testBufferConfiguration()
         IonBufferConfiguration configuration1 = IonBufferConfiguration.Builder.standard().build();
         IonBufferConfiguration configuration2 = IonBufferConfiguration.Builder.standard().build();
         IonReaderBuilder builder = IonReaderBuilder.standard();
-        assertNull(builder.getBufferConfiguration());
+        assertSame(IonBufferConfiguration.DEFAULT, builder.getBufferConfiguration());
         builder.withBufferConfiguration(configuration1);
         assertSame(configuration1, builder.getBufferConfiguration());
         builder.setBufferConfiguration(configuration2);
         assertSame(configuration2, builder.getBufferConfiguration());
-        builder.withBufferConfiguration(null);
-        assertNull(builder.getBufferConfiguration());
+        builder.withBufferConfiguration(IonBufferConfiguration.DEFAULT);
+        assertSame(IonBufferConfiguration.DEFAULT, builder.getBufferConfiguration());
+    }
+
+    @Test
+    public void testNullBufferConfigurationThrows() {
+        IonReaderBuilder builder = IonReaderBuilder.standard();
+        assertThrows(IllegalArgumentException.class, () -> builder.withBufferConfiguration(null));
     }
 
     @Test

From fe8ad4ab9ac65b98c3fa54449791f9134001050c Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Thu, 21 Dec 2023 13:46:14 -0800
Subject: [PATCH 324/490] Updates proguard config to keep more of the original
 code

---
 config/proguard/rules.pro | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/proguard/rules.pro b/config/proguard/rules.pro
index e8657b4dc5..a06cdf2f31 100644
--- a/config/proguard/rules.pro
+++ b/config/proguard/rules.pro
@@ -1,6 +1,5 @@
 # See https://www.guardsquare.com/manual/configuration/usage
--keep class !com.amazon.ion.shaded_.** { *; }
--keepattributes *Annotation*,Signature,InnerClasses,EnclosingMethod
+-keep,includecode class !com.amazon.ion.shaded_.** { *; }
 -dontoptimize
 -dontobfuscate
 -dontwarn java.sql.Timestamp

From 0d98845eb48162c0a75de0a9bb332c9a26fe2adc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Dec 2023 17:29:08 -0800
Subject: [PATCH 325/490] Bump github/codeql-action from 2.22.9 to 3.22.11
 (#672)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.9 to 3.22.11.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2...b374143c1149a9115d881581d29b8390bbcbb59c)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Tyler Gregg <tgregg@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1517320233..ab2434a519 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
+        uses: github/codeql-action/init@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
+        uses: github/codeql-action/autobuild@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
+        uses: github/codeql-action/analyze@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index cdc9c29207..a4d71d4e56 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c0d1daa7f7e14667747d73a7dbbe8c074bc8bfe2 # v2.22.9
+        uses: github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
         with:
           sarif_file: results.sarif

From be0ed077fb47e23ab801b762b9ed408259fc8e0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 11:10:41 -0800
Subject: [PATCH 326/490] Bump github/codeql-action from 3.22.11 to 3.22.12
 (#683)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.22.11 to 3.22.12.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/b374143c1149a9115d881581d29b8390bbcbb59c...012739e5082ff0c22ca6d6ab32e07c36df03c4a4)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ab2434a519..63341e4423 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
+        uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
+        uses: github/codeql-action/autobuild@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
+        uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a4d71d4e56..d5453c4112 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b374143c1149a9115d881581d29b8390bbcbb59c # v3.22.11
+        uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
         with:
           sarif_file: results.sarif

From 1a09a29bdc4283dea915b9b9e847afdc541cc419 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 27 Dec 2023 12:12:46 -0800
Subject: [PATCH 327/490] Ensures NullPointerException is not thrown from
 IonReader.getIntegerSize().

---
 .../com/amazon/ion/impl/IonReaderContinuableCoreBinary.java     | 2 +-
 src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java     | 2 +-
 .../java/com/amazon/ion/streaming/ReaderIntegerSizeTest.java    | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
index b43bfe2071..71c4f9447e 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -527,7 +527,7 @@ void prepareScalar() {
 
     @Override
     public IntegerSize getIntegerSize() {
-        if (valueTid.type != IonType.INT || valueTid.isNull) {
+        if (valueTid == null || valueTid.type != IonType.INT || valueTid.isNull) {
             return null;
         }
         prepareScalar();
diff --git a/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
index 023288f03a..edf4431936 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
@@ -75,11 +75,11 @@ protected IonReaderTextSystemX(UnifiedInputStreamX iis)
     // into a base class (the *Value() methods also share a lot of similarity).
     public IntegerSize getIntegerSize()
     {
-        load_once();
         if (_value_type != IonType.INT || _v.isNull())
         {
             return null;
         }
+        load_once();
         return _Private_ScalarConversions.getIntegerSize(_v.getAuthoritativeType());
     }
 
diff --git a/src/test/java/com/amazon/ion/streaming/ReaderIntegerSizeTest.java b/src/test/java/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
index cc31a06cb3..ed5802b054 100644
--- a/src/test/java/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
+++ b/src/test/java/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
@@ -105,6 +105,7 @@ public void testGetIntegerSizeNull()
              + "[] "
              + "() "
             );
+        assertNull(in.getIntegerSize());
         while (in.next() != null)
         {
             assertNull(in.getIntegerSize());

From 90e928f48cb7c01f542ae05d265736408f172a74 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 28 Dec 2023 20:46:06 -0800
Subject: [PATCH 328/490] Adds checks for malformed data that overflows the
 buffer.

---
 .../com/amazon/ion/impl/IonCursorBinary.java  |  17 +--
 .../impl/IonReaderContinuableCoreBinary.java  |  42 ++------
 .../IonReaderContinuableTopLevelBinary.java   |   3 +-
 .../amazon/ion/impl/IonCursorBinaryTest.java  |  98 +++++++++++++++++
 .../IonReaderContinuableCoreBinaryTest.java   | 101 ++++++++++++++++++
 .../ion/system/IonReaderBuilderTest.java      |  15 ++-
 6 files changed, 236 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index e38eb9b687..813d8e0100 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -733,12 +733,9 @@ private boolean slowSeek(long numberOfBytes) {
     private long uncheckedReadVarUInt_1_0(byte currentByte) {
         long result = currentByte & LOWER_SEVEN_BITS_BITMASK;
         do {
-            // Note: if the varUInt  is malformed such that it extends beyond the declared length of the value *and*
-            // beyond the end of the buffer, this will result in IndexOutOfBoundsException because only the declared
-            // value length has been filled. Preventing this is simple: if (peekIndex >= limit) throw
-            // new IonException(); However, we choose not to perform that check here because it is not worth sacrificing
-            // performance in this inner-loop code in order to throw one type of exception over another in case of
-            // malformed data.
+            if (peekIndex >= limit) {
+                throw new IonException("Malformed data: declared length exceeds the number of bytes remaining in the stream.");
+            }
             currentByte = buffer[(int) (peekIndex++)];
             result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
         } while (currentByte >= 0);
@@ -778,6 +775,9 @@ private long slowReadVarUInt_1_0() {
     private boolean uncheckedReadAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
         long endIndex;
         if (valueTid.variableLength) {
+            if (peekIndex >= limit) {
+                throw new IonException("Malformed data: declared length exceeds the number of bytes remaining in the stream.");
+            }
             byte b = buffer[(int) peekIndex++];
             if (b < 0) {
                 endIndex = (b & LOWER_SEVEN_BITS_BITMASK);
@@ -790,7 +790,7 @@ private boolean uncheckedReadAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
         endIndex += peekIndex;
         setMarker(endIndex, valueMarker);
         if (endIndex > limit) {
-            return true;
+            throw new IonException("Malformed data: declared length exceeds the number of bytes remaining in the stream.");
         }
         byte b = buffer[(int) peekIndex++];
         int annotationsLength;
@@ -886,6 +886,9 @@ private void prohibitEmptyOrderedStruct_1_0(Marker marker) {
     private long calculateEndIndex_1_0(IonTypeID valueTid, boolean isAnnotated) {
         long endIndex;
         if (valueTid.variableLength) {
+            if (peekIndex >= limit) {
+                throw new IonException("Malformed data: declared length exceeds the number of bytes remaining in the stream.");
+            }
             byte b = buffer[(int) peekIndex++];
             if (b < 0) {
                 endIndex = (b & LOWER_SEVEN_BITS_BITMASK);
diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
index 71c4f9447e..39813ffd10 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -157,34 +157,15 @@ int readVarUInt_1_0() {
         int currentByte = 0;
         int result = 0;
         while ((currentByte & HIGHEST_BIT_BITMASK) == 0) {
+            if (peekIndex >= limit) {
+                throw new IonException("Malformed data: declared length exceeds the number of bytes remaining in the stream.");
+            }
             currentByte = buffer[(int)(peekIndex++)];
             result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
         }
         return result;
     }
 
-    /**
-     * Reads a 2+ byte VarUInt, given the first byte. When called, `peekIndex` must point at the second byte in the
-     * VarUInt. When this method returns, `peekIndex` will point at the first byte that follows the VarUInt.
-     * NOTE: the VarUInt must fit in an `int`.
-     * @param currentByte the first byte in the VarUInt.
-     * @return the value.
-     */
-    int readVarUInt_1_0(byte currentByte) {
-        int result = currentByte & LOWER_SEVEN_BITS_BITMASK;
-        do {
-            // Note: if the varUInt is malformed such that it extends beyond the declared length of the value *and*
-            // beyond the end of the buffer, this will result in IndexOutOfBoundsException because only the declared
-            // value length has been filled. Preventing this is simple: if (peekIndex >= valueMarker.endIndex) throw
-            // new IonException(); However, we choose not to perform that check here because it is not worth sacrificing
-            // performance in this inner-loop code in order to throw one type of exception over another in case of
-            // malformed data.
-            currentByte = buffer[(int) (peekIndex++)];
-            result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
-        } while (currentByte >= 0);
-        return result;
-    }
-
     /**
      * Reads a 2+ byte VarInt, given the first byte. When called, `peekIndex` must point at the second byte in the
      * VarInt. at `peekIndex`.When this method returns, `peekIndex` will point at the first byte that follows the
@@ -197,12 +178,9 @@ private int readVarInt_1_0(int firstByte) {
         int sign = (currentByte & VAR_INT_SIGN_BITMASK) == 0 ? 1 : -1;
         int result = currentByte & LOWER_SIX_BITS_BITMASK;
         while ((currentByte & HIGHEST_BIT_BITMASK) == 0) {
-            // Note: if the varInt is malformed such that it extends beyond the declared length of the value *and*
-            // beyond the end of the buffer, this will result in IndexOutOfBoundsException because only the declared
-            // value length has been filled. Preventing this is simple: if (peekIndex >= valueMarker.endIndex) throw
-            // new IonException(); However, we choose not to perform that check here because it is not worth sacrificing
-            // performance in this inner-loop code in order to throw one type of exception over another in case of
-            // malformed data.
+            if (peekIndex >= limit) {
+                throw new IonException("Malformed data: declared length exceeds the number of bytes remaining in the stream.");
+            }
             currentByte = buffer[(int)(peekIndex++)];
             result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
         }
@@ -518,11 +496,13 @@ public boolean isNullValue() {
     }
 
     /**
-     * Performs any logic necessary to prepare a scalar value for parsing. In general nothing needs to be done, but
-     * subclasses may wish to provide different behavior, such as ensuring that the value is present in the buffer.
+     * Performs any logic necessary to prepare a scalar value for parsing. Subclasses may wish to provide additional
+     * logic, such as ensuring that the value is present in the buffer.
      */
     void prepareScalar() {
-        // May be overridden.
+        if (valueMarker.endIndex > limit) {
+            throw new IonException("Malformed data: declared length exceeds the number of bytes remaining in the stream.");
+        }
     }
 
     @Override
diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index 25a9383f8e..e46118bc0f 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -208,11 +208,12 @@ public IonType getType() {
     void prepareScalar() {
         if (!isValueIncomplete) {
             if (!isSlowMode || event == IonCursor.Event.VALUE_READY) {
-                // Nothing to do.
+                super.prepareScalar();
                 return;
             }
             if (isFillRequired) {
                 if (fillValue() == Event.VALUE_READY) {
+                    super.prepareScalar();
                     return;
                 }
                 if (event == Event.NEEDS_INSTRUCTION) {
diff --git a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
index e0b80fb23b..b28e9bd5f9 100644
--- a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
@@ -4,6 +4,8 @@
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonCursor;
+import com.amazon.ion.IonException;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -26,6 +28,7 @@
 import static com.amazon.ion.impl.IonCursorTestUtilities.scalar;
 import static com.amazon.ion.impl.IonCursorTestUtilities.startContainer;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class IonCursorBinaryTest {
 
@@ -299,4 +302,99 @@ public void fillContainerThenSkip(boolean constructFromBytes) {
             endStream()
         );
     }
+
+    @Test
+    public void expectMalformedListHeaderToFailCleanly() {
+        // The following test is expected to fail because the VarUInt length would extend beyond the end of the buffer.
+        // Since a byte array is provided as the input source, no additional input can be provided, so this must be
+        // treated as an error.
+        IonCursorBinary cursor = initializeCursor(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0xBE, // List with VarUInt length
+            0x01  // Non-terminal VarUInt byte
+        );
+        assertThrows(IonException.class, cursor::nextValue);
+        cursor.close();
+    }
+
+    @Test
+    public void expectMissingListLengthToFailCleanly() {
+        // The following test is expected to fail because the VarUInt length is missing.
+        // Since a byte array is provided as the input source, no additional input can be provided, so this must be
+        // treated as an error.
+        IonCursorBinary cursor = initializeCursor(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0xBE // List with VarUInt length, no length follows
+        );
+        assertThrows(IonException.class, cursor::nextValue);
+        cursor.close();
+    }
+
+    @Test
+    public void expectMalformedStructFieldNameToFailCleanly() {
+        IonCursorBinary cursor = initializeCursor(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0xD2, // Struct length 2
+            0x01, // Non-terminal VarUInt byte
+            0x01, // Non-terminal VarUInt byte
+            0x01  // Non-terminal VarUInt byte
+        );
+        cursor.nextValue();
+        cursor.stepIntoContainer();
+        assertThrows(IonException.class, cursor::nextValue);
+        cursor.close();
+    }
+
+    @Test
+    public void expectMissingAnnotationWrapperLengthToFailCleanly() {
+        IonCursorBinary cursor = initializeCursor(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0xEE // Annotation wrapper with VarUInt length, no length follows
+        );
+        assertThrows(IonException.class, cursor::nextValue);
+        cursor.close();
+    }
+
+    @Test
+    public void expectMalformedAnnotationWrapperHeaderToFailCleanly() {
+        IonCursorBinary cursor = initializeCursor(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0xEE, // Annotation wrapper with VarUInt length
+            0x01  // Non-terminal VarUInt byte
+        );
+        assertThrows(IonException.class, cursor::nextValue);
+        cursor.close();
+    }
+
+    @Test
+    public void expectMalformedAnnotationWrapperAnnotationLengthToFailCleanly() {
+        IonCursorBinary cursor = initializeCursor(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0xEE, // Annotation wrapper with VarUInt length
+            0x83, // VarUInt length 3
+            0x01, // Non-terminal VarUInt byte
+            0x01, // Non-terminal VarUInt byte
+            0x01  // Non-terminal VarUInt byte
+        );
+        assertThrows(IonException.class, cursor::nextValue);
+        cursor.close();
+    }
+
+    @Test
+    public void expectMissingAnnotationWrapperAnnotationLengthToFailCleanly() {
+        IonCursorBinary cursor = initializeCursor(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0xEE, // Annotation wrapper with VarUInt length
+            0x83  // VarUInt length 3, no annotation length follows
+        );
+        assertThrows(IonException.class, cursor::nextValue);
+        cursor.close();
+    }
 }
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
index cbc0c9a74b..3de1ab1da0 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
@@ -3,7 +3,9 @@
 
 package com.amazon.ion.impl;
 
+import com.amazon.ion.IonException;
 import com.amazon.ion.IonType;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
@@ -25,6 +27,7 @@
 import static com.amazon.ion.impl.IonCursorTestUtilities.startContainer;
 import static com.amazon.ion.impl.IonCursorTestUtilities.fillStringValue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class IonReaderContinuableCoreBinaryTest {
 
@@ -290,4 +293,102 @@ public void fillContainerThenSkip(boolean constructFromBytes) {
             endStream()
         );
     }
+
+    @Test
+    public void expectMalformedDecimalScaleToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x51, // Decimal length 1
+            0x01  // Non-terminal VarInt byte
+        );
+        reader.nextValue();
+        assertThrows(IonException.class, reader::decimalValue);
+        assertThrows(IonException.class, reader::bigDecimalValue);
+        reader.close();
+    }
+
+    @Test
+    public void expectMissingDecimalScaleToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x51 // Decimal length 1, missing scale
+        );
+        reader.nextValue();
+        assertThrows(IonException.class, reader::decimalValue);
+        assertThrows(IonException.class, reader::bigDecimalValue);
+        reader.close();
+    }
+
+    @Test
+    public void expectMalformedDecimalHeaderToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x53, // Decimal length 3, only 2 bytes follow
+            0xC1, // VarInt -1
+            0x01  // Non-terminal VarInt byte
+        );
+        reader.nextValue();
+        assertThrows(IonException.class, reader::decimalValue);
+        assertThrows(IonException.class, reader::bigDecimalValue);
+        reader.close();
+    }
+
+    @Test
+    public void expectMalformedIntHeaderToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x21 // Int length 1
+        );
+        reader.nextValue();
+        assertThrows(IonException.class, reader::intValue);
+        assertThrows(IonException.class, reader::bigIntegerValue);
+        assertThrows(IonException.class, reader::getIntegerSize);
+        reader.close();
+    }
+
+    @Test
+    public void expectMalformedTimestampOffsetToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x63, // Timestamp length 3
+            0x01, // Non-terminal VarInt byte
+            0x01, // Non-terminal VarInt byte
+            0x01 // Non-terminal VarInt byte
+        );
+        reader.nextValue();
+        assertThrows(IonException.class, reader::timestampValue);
+        reader.close();
+    }
+
+    @Test
+    public void expectMalformedTimestampYearToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x63, // Timestamp length 3
+            0xC0, // VarInt -0 (unknown offset)
+            0x01, // Non-terminal VarUInt byte
+            0x01 // Non-terminal VarUInt byte
+        );
+        reader.nextValue();
+        assertThrows(IonException.class, reader::timestampValue);
+        reader.close();
+    }
+
+    @Test
+    public void expectMissingTimestampBodyToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x63 // Timestamp length 3, missing body
+        );
+        reader.nextValue();
+        assertThrows(IonException.class, reader::timestampValue);
+        reader.close();
+    }
 }
diff --git a/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java b/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java
index 01167e8adb..b7d379922e 100644
--- a/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java
+++ b/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java
@@ -25,6 +25,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import com.amazon.ion.BitUtils;
 import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
@@ -42,6 +43,8 @@
 import com.amazon.ion.impl._Private_IonConstants;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.rules.ExpectedException;
 
 /**
@@ -149,8 +152,10 @@ public void testEnableIncrementalReading() throws IOException
             // Expected; this is a non-incremental reader, but a complete value was not available.
         }
         builder.withIncrementalReadingEnabled(true);
+        // Even though incremental reading is enabled, when a byte array is provided an error should be raised on the
+        // incomplete input because additional data can never be provided.
         IonReader reader2 = builder.build(data.toByteArray());
-        assertNull(reader2.next());
+        assertThrows(IonException.class, reader2::next);
         IonReader reader3 = builder.build(new ByteArrayInputStream(data.toByteArray()));
         assertNull(reader3.next());
     }
@@ -221,4 +226,12 @@ public void concatenatedAfterGZIPHeader() throws Exception {
         assertNull(reader.next());
     }
 
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    public void incompleteIvmFailsCleanly(boolean isIncremental) throws Exception {
+        IonReader reader = IonReaderBuilder.standard().withIncrementalReadingEnabled(isIncremental).build(BitUtils.bytes(0xE0, 0x01, 0x00));
+        assertThrows(IonException.class, reader::next);
+        reader.close();
+    }
+
 }

From 9ffed16e43716460136152139316d4044a1944c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Dec 2023 16:21:44 +0000
Subject: [PATCH 329/490] Bump actions/download-artifact from 3 to 4

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ion-java-performance-regression-detector.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 8442e11139..f0e4a4a2fa 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -86,7 +86,7 @@ jobs:
           path: new
 
       - name: Download test Ion Data from artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: generated-test-data
           path: testData

From 9f828ec8fae6e3f6546a34cc55e6d89a4d27d226 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Dec 2023 19:11:21 +0000
Subject: [PATCH 330/490] Bump gradle/gradle-build-action from 2.10.0 to 2.11.1

Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.10.0 to 2.11.1.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6...982da8e78c05368c70dac0351bb82647a9e9a5d2)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/main.yml                      | 4 ++--
 .github/workflows/publish-release-artifacts.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d19e41aa2f..edcdfdb893 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,11 +28,11 @@ jobs:
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
-      - uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # v2.10.0
+      - uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
         with:
           arguments: build
       - name: Test minified JAR
-        uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # v2.10.0
+        uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
         with:
           arguments: minifyTest
       - run: ./ion-test-driver-run version
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 048899fe8c..77c1083be1 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
         with:
           submodules: recursive
-      - uses: gradle/gradle-build-action@87a9a15658c426a54dd469d4fc7dc1a73ca9d4a6 # v2.10.0
+      - uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
         with:
           arguments: build cyclonedxBom
       - name: Upload Jar to GitHub release

From a7e0de7ebc6d1f0868fbb443689d95b6fb0559de Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Thu, 4 Jan 2024 16:36:05 -0800
Subject: [PATCH 331/490] Adds Automatic-Module-Name and OSGi bundle attributes
 to manifest (#688)

---
 build.gradle.kts | 55 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6cd7277cf2..d657203f0b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,6 +1,8 @@
 import com.github.jk1.license.filter.LicenseBundleNormalizer
 import com.github.jk1.license.render.InventoryMarkdownReportRenderer
 import com.github.jk1.license.render.TextReportRenderer
+import org.gradle.kotlin.dsl.support.unzipTo
+import org.gradle.kotlin.dsl.support.zipTo
 import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 import proguard.gradle.ProGuardTask
@@ -33,6 +35,12 @@ plugins {
 
     // Used for generating the third party attribution document
     id("com.github.jk1.dependency-license-report") version "2.5"
+
+    // Used for generating OSGi bundle information
+    // We cannot use the latest version since it targets JDK 17, and we don't want to force building with JDK 17
+    // Without `apply false`, the plugin is automatically applied to the main "jar" task, which somehow interferes with
+    // the "spotbugsMain" task, causing it to fail. Instead, we will create a separate task to generate the bundle info.
+    id("biz.aQute.bnd.builder") version "6.4.0" apply false
 }
 
 jacoco {
@@ -109,12 +117,56 @@ tasks {
         archiveClassifier.set("original")
     }
 
+    val generateManifest = create<aQute.bnd.gradle.Bundle>("generateManifest") {
+        // Create the manifest using the same sources as the regular jar.
+        from(jar.get().source)
+        archiveClassifier.set("manifest")
+
+        manifest {
+            attributes(
+                "Automatic-Module-Name" to "com.amazon.ion",
+                "Main-Class" to "com.amazon.ion.impl._Private_CommandLine",
+                "Build-Time" to "${Instant.now()}",
+                "Build-Version" to "$version",
+            )
+        }
+        // Sets OSGi bundle attributes
+        // See https://en.wikipedia.org/wiki/OSGi#Bundles for a minimal introduction to the bundle manifest
+        // See https://enroute.osgi.org/FAQ/520-bnd.html for a high level of what is the "bnd" tool
+        // If we ever expose any shaded classes, then the bundle info will need to be added after the shadow step.
+        // For now, though, generating the bundle info here results
+        bundle {
+            bnd(
+                "Bundle-License: https://www.apache.org/licenses/LICENSE-2.0.txt",
+                // These must be specified manually to keep the values the same as the pre-v1.9.5 values.
+                // What will happen if they change? I don't know, but possibly some sort of compatibility problem.
+                "Bundle-Name: com.amazon.ion:ion-java",
+                "Bundle-SymbolicName: com.amazon.ion.java",
+                // Exclusions must come first when specifying exports.
+                // We exclude the `apps`, `impl`, and `shaded_` packages and expose everything else.
+                "Export-Package: !com.amazon.ion.apps.*,!com.amazon.ion.impl.*,!com.amazon.ion.shaded_.*,com.amazon.ion.*",
+                // Limit imports to only this package so that we don't add in any kotlin imports.
+                // This line is not necessary if we create bundle info after shading (but that is more complex).
+                "Import-Package: com.amazon.ion.*",
+                // Removing the 'Private-Package' header because it is optional and was not present prior to v1.9.5
+                "-removeheaders: Private-Package",
+            )
+        }
+        // This is not strictly necessary, but it is nice to make the output of this task into a manifest-only jar.
+        doLast {
+            val temp = temporaryDir
+            unzipTo(temp, outputs.files.singleFile)
+            delete(fileTree(temp).matching { excludes.add("META-INF/MANIFEST.MF") })
+            zipTo(outputs.files.singleFile, temp)
+        }
+    }
+
     // Creates a super jar of ion-java and its dependencies where all dependencies are shaded (moved)
     // to com.amazon.ion_.shaded.are_you_sure_you_want_to_use_this
     shadowJar {
         val newLocation = "com.amazon.ion.shaded_.do_not_use"
         archiveClassifier.set("shaded")
-        dependsOn(generateLicenseReport)
+        dependsOn(generateManifest, generateLicenseReport)
         from(generateLicenseReport.get().outputFolder)
         relocate("kotlin", "$newLocation.kotlin")
         relocate("org.jetbrains", "$newLocation.org.jetbrains")
@@ -127,6 +179,7 @@ tasks {
             // Eliminate dependencies' pom files
             exclude("**/pom.*")
         }
+        manifest.inheritFrom(generateManifest.manifest)
     }
 
     /**

From 5613357ea9da50d3afd6acb484531877c842efcd Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Fri, 5 Jan 2024 17:03:00 -0800
Subject: [PATCH 332/490] Allow building with Java 8 (#690)

---
 .github/workflows/main.yml |  1 +
 build.gradle.kts           | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index edcdfdb893..5ef8469c44 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -14,6 +14,7 @@ jobs:
     strategy:
       matrix:
         include:
+          - java: 8
           - java: 11
             upload_reports: true
           - java: 17
diff --git a/build.gradle.kts b/build.gradle.kts
index d657203f0b..773a793dd3 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -102,9 +102,11 @@ licenseReport {
 tasks {
     withType<JavaCompile> {
         options.encoding = "UTF-8"
-        // Because we set the `release` option, you can no longer build ion-java using JDK 8. However, we continue to
-        // emit JDK 8 compatible classes due to widespread use of this library with JDK 8.
-        options.release.set(8)
+        // The `release` option is not available for the Java 8 compiler, but if we're building with Java 8 we don't
+        // need it anyway.
+        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+            options.release.set(8)
+        }
     }
     withType<KotlinCompile<KotlinJvmOptions>> {
         kotlinOptions {
@@ -203,12 +205,15 @@ tasks {
         configuration(rulesPath)
 
         val javaHome = System.getProperty("java.home")
-        // Automatically handle the Java version of this build, but we don't support lower than JDK 11
-        // See https://github.com/Guardsquare/proguard/blob/e76e47953f6f295350a3bb7eeb801b33aac34eae/examples/gradle-kotlin-dsl/build.gradle.kts#L48-L60
-        libraryjars(
-            mapOf("jarfilter" to "!**.jar", "filter" to "!module-info.class"),
-            "$javaHome/jmods/java.base.jmod"
-        )
+        if (JavaVersion.current() == JavaVersion.VERSION_1_8) {
+            libraryjars("$javaHome/lib/jce.jar")
+            libraryjars("$javaHome/lib/rt.jar")
+        } else {
+            libraryjars(
+                mapOf("jarfilter" to "!**.jar", "filter" to "!module-info.class"),
+                "$javaHome/jmods/java.base.jmod"
+            )
+        }
     }
 
     build {

From 342ccd7e87c8beb7071480856184886602941551 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jan 2024 10:18:04 -0800
Subject: [PATCH 333/490] Bump github/codeql-action from 3.22.12 to 3.23.0
 (#691)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.22.12 to 3.23.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/012739e5082ff0c22ca6d6ab32e07c36df03c4a4...e5f05b81d5b6ff8cfa111c80c22c5fd02a384118)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 63341e4423..e26f05334c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
+        uses: github/codeql-action/init@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
+        uses: github/codeql-action/autobuild@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
+        uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index d5453c4112..31bed6a382 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
+        uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
         with:
           sarif_file: results.sarif

From 140761a11255bdf27411e485e724db527d64aa1f Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 4 Jan 2024 14:36:30 -0800
Subject: [PATCH 334/490] Handles the case where InputStream.skip provides
 fewer bytes than requested before reaching EOF.

---
 .../com/amazon/ion/impl/IonCursorBinary.java  | 25 +++++----
 ...onReaderContinuableTopLevelBinaryTest.java | 55 +++++++++++++++++--
 2 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 813d8e0100..c32e23bf6a 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -699,17 +699,22 @@ private boolean slowSeek(long numberOfBytes) {
             return false;
         }
         offset = limit;
+        long shortfall;
         long skipped = 0;
-        try {
-            skipped = refillableState.inputStream.skip(unbufferedBytesToSkip);
-        } catch (EOFException e) {
-            // Certain InputStream implementations (e.g. GZIPInputStream) throw EOFException if more bytes are requested
-            // to skip than are currently available (e.g. if a header or trailer is incomplete).
-        } catch (IOException e) {
-            throwAsIonException(e);
-        }
-        refillableState.totalDiscardedBytes += skipped;
-        long shortfall = numberOfBytes - (skipped + size);
+        do {
+            try {
+                skipped = refillableState.inputStream.skip(unbufferedBytesToSkip);
+            } catch (EOFException e) {
+                // Certain InputStream implementations (e.g. GZIPInputStream) throw EOFException if more bytes are requested
+                // to skip than are currently available (e.g. if a header or trailer is incomplete).
+                skipped = 0;
+            } catch (IOException e) {
+                throwAsIonException(e);
+            }
+            refillableState.totalDiscardedBytes += skipped;
+            shortfall = unbufferedBytesToSkip - skipped;
+            unbufferedBytesToSkip = shortfall;
+        } while (shortfall > 0 && skipped > 0);
         if (shortfall <= 0) {
             refillableState.bytesRequested = 0;
             refillableState.state = State.READY;
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 3abc60748a..228d26ca84 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -38,7 +38,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.EOFException;
-import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
@@ -52,7 +51,6 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.zip.GZIPInputStream;
 
 import static com.amazon.ion.BitUtils.bytes;
@@ -3376,6 +3374,11 @@ public int read(byte[] b, int off, int len) throws IOException {
         @Override
         public long skip(long len) {
             int numberOfBytesToSkip = calculateNumberOfBytesToReturn((int) len);
+            if (numberOfBytesToSkip < 0) {
+                // The contract for InputStream.skip() does not use -1 to indicate EOF. It always returns the actual
+                // number of bytes skipped.
+                return 0;
+            }
             offset += numberOfBytesToSkip;
             return numberOfBytesToSkip;
         }
@@ -3399,10 +3402,14 @@ public void shouldNotFailWhenAnInputStreamProvidesFewerBytesThanRequestedWithout
         reader.close();
     }
 
-    @Test
-    public void shouldNotFailWhenAnInputStreamProvidesFewerBytesThanRequestedWithoutReachingEofAndTheReaderSkipsTheValue() throws Exception {
-        reader = boundedReaderFor(new ThrottlingInputStream(bytes(0xE0, 0x01, 0x00, 0xEA, 0x89, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 0x20), false), 8, 8, byteAndOversizedValueCountingHandler);
+    @ParameterizedTest(name = "throwOnEof={0}")
+    @ValueSource(booleans = {true, false})
+    public void shouldNotFailWhenAnInputStreamProvidesFewerBytesThanRequestedWithoutReachingEofAndTheIncrementalReaderSkipsTheValue(boolean throwOnEof) throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(true);
+        reader = boundedReaderFor(new ThrottlingInputStream(bytes(0xE0, 0x01, 0x00, 0xEA, 0x89, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 0x20), throwOnEof), 8, 8, byteAndOversizedValueCountingHandler);
         assertSequence(
+            // The string value is oversized, and is automatically skipped to comply with the incremental reader's
+            // guarantee that next() results in a fully-buffered top-level value.
             next(IonType.INT), intValue(0),
             next(null)
         );
@@ -3410,6 +3417,44 @@ public void shouldNotFailWhenAnInputStreamProvidesFewerBytesThanRequestedWithout
         assertEquals(1, oversizedCounter.get());
     }
 
+    @ParameterizedTest(name = "throwOnEof={0}")
+    @ValueSource(booleans = {true, false})
+    public void shouldNotFailWhenAnInputStreamProvidesFewerBytesThanRequestedWithoutReachingEofAndTheNonIcrementalReaderSkipsTheValue(boolean throwOnEof) throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        reader = boundedReaderFor(new ThrottlingInputStream(bytes(0xE0, 0x01, 0x00, 0xEA, 0x89, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 0x20), throwOnEof), 8, 8, byteAndOversizedValueCountingHandler);
+        assertSequence(
+            // The string value is oversized, but since the reader is non-incremental, an error is only surfaced if the
+            // user tries to materialize it.
+            next(IonType.STRING),
+            next(IonType.INT), intValue(0),
+            next(null)
+        );
+        reader.close();
+        assertEquals(0, oversizedCounter.get());
+    }
+
+    @ParameterizedTest(name = "incrementalReadingEnabled={0},throwOnEof={1}")
+    @CsvSource({
+        "true, true",
+        "true, false",
+        "false, true",
+        "false, false"
+    })
+    public void shouldNotFailWhenAnInputStreamProvidesFewerBytesThanRequestedWithoutReachingEofWithAnUnboundedBufferAndTheReaderSkipsTheValue(boolean incrementalReadingEnabled, boolean throwOnEof) throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(incrementalReadingEnabled);
+        // The reader's buffer size is unbounded, but the string value is larger than the initial buffer size. Skipping
+        // the value therefore causes some of its bytes to be skipped without ever being buffered, by calling
+        // InputStream.skip().
+        reader = boundedReaderFor(new ThrottlingInputStream(bytes(0xE0, 0x01, 0x00, 0xEA, 0x89, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 0x20), throwOnEof), 6, Integer.MAX_VALUE, byteAndOversizedValueCountingHandler);
+        assertSequence(
+            next(IonType.STRING), // skip the string value, causing unbuffered bytes to be skipped
+            next(IonType.INT), intValue(0),
+            next(null)
+        );
+        reader.close();
+        assertEquals(0, oversizedCounter.get());
+    }
+
     @Test
     public void shouldNotFailWhenGZIPBoundaryIsEncounteredInStringValue() throws Exception {
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);

From ebf8f4d933cc85438e1b309bada90ff0d5a76102 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 9 Jan 2024 13:24:10 -0800
Subject: [PATCH 335/490] Handles the case where a partially buffered nested
 value is skipped; ensures that fully-buffered containers do not cause the
 cursor to enter unchecked mode unless stepped into.

---
 .../com/amazon/ion/impl/IonCursorBinary.java  |  27 +--
 ...onReaderContinuableTopLevelBinaryTest.java | 201 ++++++++++++++++++
 2 files changed, 211 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index c32e23bf6a..4e94b2f132 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -712,6 +712,7 @@ private boolean slowSeek(long numberOfBytes) {
                 throwAsIonException(e);
             }
             refillableState.totalDiscardedBytes += skipped;
+            shiftContainerEnds(skipped);
             shortfall = unbufferedBytesToSkip - skipped;
             unbufferedBytesToSkip = shortfall;
         } while (shortfall > 0 && skipped > 0);
@@ -1154,12 +1155,6 @@ private boolean slowSeekPastNopPad(long valueLength, boolean isAnnotated) {
             event = Event.NEEDS_DATA;
             return true;
         }
-        if (offset < (peekIndex + valueLength)) {
-            // Some of the bytes of the NOP pad had to be skipped without buffering to keep the buffer within its
-            // maximum size. Therefore, any parent container end indices need to be shifted by the number of bytes
-            // that were never buffered.
-            shiftContainerEnds(peekIndex + valueLength - offset);
-        }
         peekIndex = offset;
         setCheckpointBeforeUnannotatedTypeId();
         if (parent != null) {
@@ -1323,9 +1318,6 @@ private boolean slowReadValueHeader(IonTypeID valueTid, boolean isAnnotated, Mar
             validateAnnotationWrapperEndIndex(endIndex);
         }
         setMarker(endIndex, markerToSet);
-        if (event == Event.START_CONTAINER && endIndex > DELIMITED_MARKER && endIndex <= limit) {
-            refillableState.fillDepth = containerIndex + 1;
-        }
         return false;
     }
 
@@ -1403,7 +1395,11 @@ private Event slowStepIntoContainer() {
     public Event stepIntoContainer() {
         if (isSlowMode) {
             if (containerIndex != refillableState.fillDepth - 1) {
-                return slowStepIntoContainer();
+                if (valueMarker.endIndex > DELIMITED_MARKER && valueMarker.endIndex <= limit) {
+                    refillableState.fillDepth = containerIndex + 1;
+                } else {
+                    return slowStepIntoContainer();
+                }
             }
             isSlowMode = false;
         }
@@ -1664,9 +1660,6 @@ private boolean slowSkipRemainingValueBytes() {
         }
         peekIndex = offset;
         valuePreHeaderIndex = peekIndex;
-        if (peekIndex < valueMarker.endIndex) {
-            shiftContainerEnds(valueMarker.endIndex - peekIndex);
-        }
         if (refillableState.fillDepth > containerIndex) {
             // This value was filled, but was skipped. Reset the fillDepth so that the reader does not think the
             // next value was filled immediately upon encountering it.
@@ -1702,10 +1695,10 @@ private void seekPastOversizedValue() {
             refillableState.totalDiscardedBytes += refillableState.individualBytesSkippedWithoutBuffering;
             peekIndex = offset;
             // peekIndex now points at the first byte after the value. If any bytes were skipped directly from
-            // the input stream, peekIndex will be less than the value's pre-calculated endIndex. This requires
-            // the end indices for all parent containers to be shifted left by the number of bytes that were
-            // skipped without buffering.
-            shiftContainerEnds(valueMarker.endIndex - peekIndex);
+            // the input stream before the 'slowSeek', peekIndex will be less than the value's pre-calculated endIndex.
+            // This requires the end indices for all parent containers to be shifted left by the number of bytes that
+            // were skipped without buffering.
+            shiftContainerEnds(refillableState.individualBytesSkippedWithoutBuffering);
             setCheckpointBeforeUnannotatedTypeId();
         }
         refillableState.isSkippingCurrentValue = false;
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 228d26ca84..cb4d44ae34 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -3455,6 +3455,207 @@ public void shouldNotFailWhenAnInputStreamProvidesFewerBytesThanRequestedWithout
         assertEquals(0, oversizedCounter.get());
     }
 
+    @ParameterizedTest(name = "incrementalReadingEnabled={0},throwOnEof={1}")
+    @CsvSource({
+        "true, true",
+        "true, false",
+        "false, true",
+        "false, false"
+    })
+    public void shouldNotFailWhenAnUnbufferedNestedContainerIsSkipped(boolean incrementalReadingEnabled, boolean throwOnEof) throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(incrementalReadingEnabled);
+        // The reader's buffer size is unbounded, but the nested container value is larger than the initial buffer size.
+        // Skipping the nested container therefore causes some of its bytes to be skipped without ever being buffered,
+        // by calling InputStream.skip().
+        reader = boundedReaderFor(
+            new ThrottlingInputStream(
+                bytes(
+                    0xE0, 0x01, 0x00, 0xEA, // IVM
+                    0xB9, // List, length 9
+                    0xB7, // List, length 7
+                    0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, // 7 int 0 values
+                    0x20, // int 0 value
+                    0x20 // Int 0 value
+                ),
+                throwOnEof
+            ),
+            5,
+            Integer.MAX_VALUE,
+            byteAndOversizedValueCountingHandler
+        );
+        assertSequence(
+            container(IonType.LIST,
+                next(IonType.LIST),
+                next(IonType.INT)
+            ),
+            next(IonType.INT), intValue(0),
+            next(null)
+        );
+        reader.close();
+    }
+
+    @ParameterizedTest(name = "incrementalReadingEnabled={0},throwOnEof={1}")
+    @CsvSource({
+        "true, true",
+        "true, false",
+        "false, true",
+        "false, false"
+    })
+    public void shouldNotFailWhenAnUnbufferedNestedContainerIsSteppedOutEarly(boolean incrementalReadingEnabled, boolean throwOnEof) throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(incrementalReadingEnabled);
+        // The reader's buffer size is unbounded, but the nested container value is larger than the initial buffer size.
+        // Stepping out of the nested container early therefore causes some of its bytes to be skipped without ever
+        // being buffered, by calling InputStream.skip().
+        reader = boundedReaderFor(
+            new ThrottlingInputStream(
+                bytes(
+                    0xE0, 0x01, 0x00, 0xEA, // IVM
+                    0xB9, // List, length 9
+                        0xB7, // List, length 7
+                            0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, // 7 int 0 values
+                        0x20, // int 0 value
+                    0x20 // Int 0 value
+                ),
+                throwOnEof
+            ),
+            5,
+            Integer.MAX_VALUE,
+            byteAndOversizedValueCountingHandler
+        );
+        assertSequence(
+            container(IonType.LIST,
+                next(IonType.LIST), STEP_IN, STEP_OUT
+            ),
+            next(IonType.INT), intValue(0),
+            next(null)
+        );
+        reader.close();
+    }
+
+    @Test
+    public void nestedNullContainerIsParsedSuccessfully() throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        reader = readerFor(pipe);
+        pipe.receive(bytes(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xB5, // List, length 5
+                0xB3, // List, length 3
+                    0xBF, 0xCF // Null list, null s-exp
+        ));
+        assertSequence(
+            next(IonType.LIST), STEP_IN,
+            next(IonType.LIST), STEP_IN,
+            next(IonType.LIST),
+            next(IonType.SEXP)
+        );
+        pipe.receive(bytes(
+                    0xDF, // Null struct
+                0x20 // Int 0
+        ));
+        assertSequence(
+            next(IonType.STRUCT),
+            STEP_OUT,
+            next(IonType.INT), intValue(0),
+            STEP_OUT,
+            next(null)
+        );
+        reader.close();
+    }
+
+    @Test
+    public void nestedEmptyContainerIsParsedSuccessfully() throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        reader = readerFor(pipe);
+        pipe.receive(bytes(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xB5, // List, length 5
+                0xB3, // List, length 3
+                    0xB0, 0xC0 // Empty list, empty s-exp
+        ));
+        assertSequence(
+            next(IonType.LIST), STEP_IN,
+            next(IonType.LIST), STEP_IN,
+            next(IonType.LIST),
+            next(IonType.SEXP)
+        );
+        pipe.receive(bytes(
+                    0xD0, // empty struct
+                0x20 // Int 0
+        ));
+        assertSequence(
+            next(IonType.STRUCT),
+            STEP_OUT,
+            next(IonType.INT), intValue(0),
+            STEP_OUT,
+            next(null)
+        );
+        reader.close();
+    }
+
+    @Test
+    public void nestedContainerIsSkippedSuccessfully() throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        reader = readerFor(pipe);
+        pipe.receive(bytes(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xB5, // List, length 5
+                0xB3, // List, length 3
+                    0xB2,  // List, length 2
+                        0xC0  // Empty s-exp
+        ));
+        assertSequence(
+            next(IonType.LIST), STEP_IN,
+            next(IonType.LIST), STEP_IN,
+            next(IonType.LIST)
+        );
+        pipe.receive(bytes(
+                        0xD0, // Empty struct
+                0x20 // Int 0
+        ));
+        assertSequence(
+            next(null), // Skip the list
+            STEP_OUT,
+            next(IonType.INT), intValue(0),
+            STEP_OUT,
+            next(null)
+        );
+        reader.close();
+    }
+
+    @Test
+    public void nestedContainerIsSteppedOutEarlySuccessfully() throws Exception {
+        readerBuilder = readerBuilder.withIncrementalReadingEnabled(false);
+        ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);
+        reader = readerFor(pipe);
+        pipe.receive(bytes(
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xB5, // List, length 5
+                0xB3, // List, length 3
+                    0xB2,  // List, length 2
+                        0xC0  // Empty s-exp
+        ));
+        assertSequence(
+            next(IonType.LIST), STEP_IN,
+            next(IonType.LIST), STEP_IN,
+            next(IonType.LIST), STEP_IN
+        );
+        pipe.receive(bytes(
+                        0xD0, // Empty struct
+            0x20 // Int 0
+        ));
+        assertSequence(
+            STEP_OUT, // Step out early
+            STEP_OUT, // Step out early
+            next(IonType.INT), intValue(0),
+            STEP_OUT,
+            next(null)
+        );
+        reader.close();
+    }
+
     @Test
     public void shouldNotFailWhenGZIPBoundaryIsEncounteredInStringValue() throws Exception {
         ResizingPipedInputStream pipe = new ResizingPipedInputStream(128);

From 2ae8b74d3534db1d6bca7eaaeaefb5ed980bd767 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 10 Jan 2024 13:11:32 -0800
Subject: [PATCH 336/490] Sets binary reader buffers to null on close().

---
 src/main/java/com/amazon/ion/impl/IonCursorBinary.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 4e94b2f132..43e64748e3 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -1898,6 +1898,9 @@ public void close() {
                 throwAsIonException(e);
             }
         }
+        buffer = null;
+        containerStack = null;
+        byteBuffer = null;
     }
 
     /* ---- End: version-agnostic parsing, utility, and public API methods ---- */

From 4b3e31c64cc51f13d87ee9deae0d7613d1c66d3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:52:53 -0800
Subject: [PATCH 337/490] Bump actions/upload-artifact from 3 to 4 (#696)

* Bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Update .github/workflows/main.yml

upload-artifact v4 requires non-colliding names per workflow, see https://github.com/actions/upload-artifact/blob/main/docs/MIGRATION.md#multiple-uploads-to-the-same-named-artifact

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
---
 .../workflows/ion-java-performance-regression-detector.yml    | 2 +-
 .github/workflows/ion-test-driver.yml                         | 4 ++--
 .github/workflows/main.yml                                    | 4 ++--
 .github/workflows/scorecard.yml                               | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index f0e4a4a2fa..e6ce0aaa6a 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -41,7 +41,7 @@ jobs:
           done
 
       - name: Upload test Ion Data to artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{env.test_data_id}}
           path: testData
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 19e793306a..68ae5d0f2c 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -45,7 +45,7 @@ jobs:
           --replace ion-java,https://github.com/amazon-ion/ion-java.git,$main
 
       - name: Upload result
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
         with:
           name: ion-test-driver-result.ion
           path: output/results/ion-test-driver-results.ion
@@ -60,7 +60,7 @@ jobs:
           ion-java,$main ion-java,$cur output/results/ion-test-driver-results.ion
 
       - name: Upload analysis report
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
         with:
           name: analysis-report.ion
           path: result.ion
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5ef8469c44..36a748ca50 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -41,9 +41,9 @@ jobs:
         uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
-      - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+      - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
         with:
-          name: spotbugs-report
+          name: spotbugs-report-${{ matrix.runs-on }}-java-${{ matrix.java }}
           path: build/reports/spotbugs/
 
   check-version:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 31bed6a382..6dca5975a6 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.0
+        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v3.1.0
         with:
           name: SARIF file
           path: results.sarif

From 78537ceb87e7ff196d303c00d9d841f0ad847c1a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 09:53:31 -0800
Subject: [PATCH 338/490] Bump github/codeql-action from 3.23.0 to 3.23.1
 (#698)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.0 to 3.23.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/e5f05b81d5b6ff8cfa111c80c22c5fd02a384118...0b21cf2492b6b02c465a3e5d7c473717ad7721ba)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e26f05334c..7d4170b32e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
+        uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
+        uses: github/codeql-action/autobuild@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
+        uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6dca5975a6..d3234d7750 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
+        uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
         with:
           sarif_file: results.sarif

From b71a6e22bad2d55c88a7f0da4d3270e789055694 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 9 Jan 2024 17:01:42 -0800
Subject: [PATCH 339/490] Ensures the binary IonReader throws when a value
 method that returns a primitive type is invoked on a null value.

---
 .../impl/IonReaderContinuableCoreBinary.java  | 20 ++++-
 .../IonReaderContinuableCoreBinaryTest.java   | 89 +++++++++++++++++++
 2 files changed, 105 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
index 39813ffd10..df501feb7f 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -587,6 +587,9 @@ public BigDecimal bigDecimalValue() {
                 value = minorVersion == 0 ? readBigDecimal_1_0() : readBigDecimal_1_1();
             }
         } else if (valueTid.type == IonType.INT) {
+            if (valueTid.isNull) {
+                return null;
+            }
             prepareToConvertIntValue();
             scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.decimal_value));
             value = scalarConverter.getBigDecimal();
@@ -612,6 +615,9 @@ public Decimal decimalValue() {
                 value = minorVersion == 0 ? readDecimal_1_0() : readDecimal_1_1();
             }
         } else if (valueTid.type == IonType.INT) {
+            if (valueTid.isNull) {
+                return null;
+            }
             prepareToConvertIntValue();
             scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.decimal_value));
             value = scalarConverter.getDecimal();
@@ -625,7 +631,10 @@ public Decimal decimalValue() {
     @Override
     public long longValue() {
         long value;
-        if (valueTid.type == IonType.INT && !valueTid.isNull) {
+        if (valueTid.isNull) {
+            throwDueToInvalidType(IonType.INT);
+        }
+        if (valueTid.type == IonType.INT) {
             if (valueTid.length == 0) {
                 return 0;
             }
@@ -644,7 +653,7 @@ public long longValue() {
             value = scalarConverter.getLong();
             scalarConverter.clear();
         } else {
-            throw new IllegalStateException("longValue() may only be called on values of type int, float, or decimal.");
+            throw new IllegalStateException("longValue() may only be called on non-null values of type int, float, or decimal.");
         }
         return value;
     }
@@ -687,7 +696,10 @@ public int intValue() {
     @Override
     public double doubleValue() {
         double value;
-        if (valueTid.type == IonType.FLOAT && !valueTid.isNull) {
+        if (valueTid.isNull) {
+            throwDueToInvalidType(IonType.FLOAT);
+        }
+        if (valueTid.type == IonType.FLOAT) {
             prepareScalar();
             int length = (int) (valueMarker.endIndex - valueMarker.startIndex);
             if (length == 0) {
@@ -712,7 +724,7 @@ public double doubleValue() {
             value = scalarConverter.getDouble();
             scalarConverter.clear();
         } else {
-            throw new IllegalStateException("doubleValue() may only be called on values of type float or decimal.");
+            throw new IllegalStateException("doubleValue() may only be called on non-null values of type float or decimal.");
         }
         return value;
     }
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
index 3de1ab1da0..874747ef31 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
@@ -27,6 +27,7 @@
 import static com.amazon.ion.impl.IonCursorTestUtilities.startContainer;
 import static com.amazon.ion.impl.IonCursorTestUtilities.fillStringValue;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class IonReaderContinuableCoreBinaryTest {
@@ -391,4 +392,92 @@ public void expectMissingTimestampBodyToFailCleanly() {
         assertThrows(IonException.class, reader::timestampValue);
         reader.close();
     }
+
+    private static void assertReaderThrowsForAllPrimitives(IonReaderContinuableCoreBinary reader) {
+        // Note: ideally these would throw IonException instead of IllegalStateException, but there is long-standing
+        // precedent in IonJava for throwing IllegalStateException when these methods are used improperly. We maintain
+        // that convention for consistency.
+        assertThrows(IllegalStateException.class, reader::booleanValue);
+        assertThrows(IllegalStateException.class, reader::intValue);
+        assertThrows(IllegalStateException.class, reader::longValue);
+        assertThrows(IllegalStateException.class, reader::doubleValue);
+    }
+
+    @Test
+    public void expectAttemptToParseNullNullAsJavaPrimitiveToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x0F // null.null
+        );
+        reader.nextValue();
+        assertEquals(IonType.NULL, reader.getType());
+        assertReaderThrowsForAllPrimitives(reader);
+        reader.close();
+    }
+
+    @Test
+    public void expectAttemptToParseNullBoolAsJavaPrimitiveToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x1F // null.bool
+        );
+        reader.nextValue();
+        assertEquals(IonType.BOOL, reader.getType());
+        assertReaderThrowsForAllPrimitives(reader);
+        reader.close();
+    }
+
+    @Test
+    public void expectAttemptToParseNullIntAsJavaPrimitiveToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x2F, // null.int
+            0x3F // null.int
+        );
+        reader.nextValue();
+        assertEquals(IonType.INT, reader.getType());
+        assertReaderThrowsForAllPrimitives(reader);
+        assertNull(reader.bigIntegerValue());
+        assertNull(reader.decimalValue());
+        assertNull(reader.bigDecimalValue());
+        reader.nextValue();
+        assertEquals(IonType.INT, reader.getType());
+        assertReaderThrowsForAllPrimitives(reader);
+        assertNull(reader.bigIntegerValue());
+        assertNull(reader.decimalValue());
+        assertNull(reader.bigDecimalValue());
+        reader.close();
+    }
+
+    @Test
+    public void expectAttemptToParseNullFloatAsJavaPrimitiveToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x4F // null.float
+        );
+        reader.nextValue();
+        assertEquals(IonType.FLOAT, reader.getType());
+        assertReaderThrowsForAllPrimitives(reader);
+        assertNull(reader.bigIntegerValue());
+        reader.close();
+    }
+
+    @Test
+    public void expectAttemptToParseNullDecimalAsJavaPrimitiveToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x5F  // null.decimal
+        );
+        reader.nextValue();
+        assertEquals(IonType.DECIMAL, reader.getType());
+        assertNull(reader.decimalValue());
+        assertNull(reader.bigDecimalValue());
+        assertReaderThrowsForAllPrimitives(reader);
+        reader.close();
+    }
 }

From dd2fdbfb9405f0e6a0640aa4411f8e19e0f33b12 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Thu, 18 Jan 2024 12:52:53 -0800
Subject: [PATCH 340/490] Bumps version to 1.11.2-SNAPSHOT (#701)

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index b9d91e9005..4bc07f03ac 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.1-SNAPSHOT
+1.11.2-SNAPSHOT

From 581f8685c030bd2db31411271997375c96a5d767 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 24 Jan 2024 15:37:48 -0800
Subject: [PATCH 341/490] Removes assertions in
 IonReaderSystemTextX.stringValue().

---
 .../java/com/amazon/ion/impl/IonReaderTextSystemX.java   | 2 --
 src/test/java/com/amazon/ion/streaming/ReaderTest.java   | 9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
index edf4431936..713422d44b 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
@@ -606,9 +606,7 @@ public final String stringValue()
         load_or_cast_cached_value(AS_TYPE.string_value);
         String text = _v.getString();
         if (text == null) {
-            assert _value_type == IonType.SYMBOL;
             int sid = _v.getInt();
-            assert sid > 0;
             throw new UnknownSymbolException(sid);
         }
         return text;
diff --git a/src/test/java/com/amazon/ion/streaming/ReaderTest.java b/src/test/java/com/amazon/ion/streaming/ReaderTest.java
index 65eebcf87b..88ccc42f54 100644
--- a/src/test/java/com/amazon/ion/streaming/ReaderTest.java
+++ b/src/test/java/com/amazon/ion/streaming/ReaderTest.java
@@ -25,6 +25,7 @@
 import com.amazon.ion.ReaderMaker;
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SymbolToken;
+import com.amazon.ion.UnknownSymbolException;
 import com.amazon.ion.junit.Injected.Inject;
 import com.amazon.ion.junit.IonAssert;
 import java.io.IOException;
@@ -193,6 +194,14 @@ public void testStringValueOnNonText()
         }
     }
 
+    @Test
+    public void testStringValueOnSymbolWithUndefinedText()
+    {
+        read("$0");
+        assertEquals(IonType.SYMBOL, in.next());
+        assertThrows(UnknownSymbolException.class, () -> in.stringValue());
+    }
+
     @Test
     public void testSymbolValue()
         throws Exception

From 3c1b6b101aeee8516784d0e4ef941a7523a07087 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 08:54:31 -0800
Subject: [PATCH 342/490] Bump codecov/codecov-action from 3.1.4 to 3.1.5
 (#707)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/eaaf4bedf32dbdc6b720b63067d99c4d77d6047d...4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 36a748ca50..6db18c52f3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,7 +38,7 @@ jobs:
           arguments: minifyTest
       - run: ./ion-test-driver-run version
       - if: ${{ matrix.upload_reports }}
-        uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+        uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0

From 88035b9347819ec42440c6ca440b7f40efff1ba5 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Tue, 30 Jan 2024 09:50:52 -0800
Subject: [PATCH 343/490] Add a _Private_IonConstants.ARRAY_MAXIMUM_SIZE (#708)

* Add a _Private_IonConstants.ARRAY_MAXIMUM_SIZE

* Use the new constant where appropriate

Arrays in Java must be indexed by integers (JLS 10.4), but the true maximum
array size may be less than `Integer.MAX_VALUE`. True maximum array size is a
JVM implementation detail, and varies by type and by JVM.
We have this pinned at `Integer.MAX_VALUE - 8` because that's a fairly common
value in the JDK itself, in classes such as `ConcurrentHashMap`, `InputStream`,
`Hashtable`, `ByteArrayChannel`, etc.

In testing against a variety of JVMs and types the smallest maximum size I've
seen is `Integer.MAX_VALUE - 2`, and the smallest maximum size I've seen
reported is `Integer.MAX_VALUE - 6`

* Add test coverage for maximum buffer size

* Add more test coverage for maximum buffer size

* Ensure that a modeled exception is thrown
---
 .../com/amazon/ion/BufferConfiguration.java   | 14 ++++---
 .../amazon/ion/IonBufferConfiguration.java    |  2 +-
 .../java/com/amazon/ion/apps/BaseApp.java     |  3 +-
 .../com/amazon/ion/impl/BlockedBuffer.java    |  2 +-
 .../com/amazon/ion/impl/IonCursorBinary.java  |  1 +
 .../amazon/ion/impl/IonReaderTextSystemX.java |  2 +-
 .../ion/impl/ResizingPipedInputStream.java    |  5 ++-
 .../amazon/ion/impl/UnifiedInputBufferX.java  |  2 +
 .../amazon/ion/impl/UnifiedInputStreamX.java  |  2 +
 .../ion/impl/_Private_IonConstants.java       |  8 ++++
 .../com/amazon/ion/impl/_Private_Utils.java   |  2 +-
 .../amazon/ion/impl/IonCursorBinaryTest.java  | 30 ++++++++++++++
 .../impl/ResizingPipedInputStreamTest.java    | 21 +++++-----
 .../ion/impl/UnifiedInputBufferXTest.java     | 40 +++++++++++++++++++
 .../ion/impl/UnifiedInputStreamXTest.java     |  9 +++--
 15 files changed, 119 insertions(+), 24 deletions(-)
 create mode 100644 src/test/java/com/amazon/ion/impl/UnifiedInputBufferXTest.java

diff --git a/src/main/java/com/amazon/ion/BufferConfiguration.java b/src/main/java/com/amazon/ion/BufferConfiguration.java
index e31c657d12..69c6f795a8 100644
--- a/src/main/java/com/amazon/ion/BufferConfiguration.java
+++ b/src/main/java/com/amazon/ion/BufferConfiguration.java
@@ -3,6 +3,8 @@
 
 package com.amazon.ion;
 
+import com.amazon.ion.impl._Private_IonConstants;
+
 /**
  * Provides logic common to all BufferConfiguration implementations.
  * @param <Configuration> the type of the concrete subclass of this BufferConfiguration.
@@ -60,7 +62,7 @@ public static abstract class Builder<
         /**
          * The maximum number of bytes that will be buffered.
          */
-        private int maximumBufferSize = Integer.MAX_VALUE;
+        private int maximumBufferSize = _Private_IonConstants.ARRAY_MAXIMUM_SIZE;
 
         /**
          * The handler that will be notified when oversized values are encountered.
@@ -133,7 +135,7 @@ public final DataHandler getDataHandler() {
          * Set the maximum size of the buffer. For binary Ion, the minimum value is 5 because all valid binary Ion data
          * begins with a 4-byte Ion version marker and the smallest value is 1 byte. For text Ion, the minimum value is
          * 2 because the smallest text Ion value is 1 byte and the smallest delimiter is 1 byte.
-         * Default: Integer.MAX_VALUE.
+         * Default: Near to the maximum size of an array.
          *
          * @param maximumBufferSizeInBytes the value.
          * @return this builder.
@@ -214,7 +216,7 @@ protected BufferConfiguration(Builder<Configuration, ?> builder) {
             ));
         }
         if (builder.getOversizedValueHandler() == null) {
-            requireUnlimitedBufferSize();
+            requireMaximumBufferSize();
             oversizedValueHandler = builder.getThrowingOversizedValueHandler();
         } else {
             oversizedValueHandler = builder.getOversizedValueHandler();
@@ -229,10 +231,10 @@ protected BufferConfiguration(Builder<Configuration, ?> builder) {
     /**
      * Requires that the maximum buffer size not be limited.
      */
-    protected void requireUnlimitedBufferSize() {
-        if (maximumBufferSize < Integer.MAX_VALUE) {
+    protected void requireMaximumBufferSize() {
+        if (maximumBufferSize < _Private_IonConstants.ARRAY_MAXIMUM_SIZE) {
             throw new IllegalArgumentException(
-                "Must specify an OversizedValueHandler when a maximum buffer size is specified."
+                "Must specify an OversizedValueHandler when a custom maximum buffer size is specified."
             );
         }
     }
diff --git a/src/main/java/com/amazon/ion/IonBufferConfiguration.java b/src/main/java/com/amazon/ion/IonBufferConfiguration.java
index 48190854b1..12256bcfa8 100644
--- a/src/main/java/com/amazon/ion/IonBufferConfiguration.java
+++ b/src/main/java/com/amazon/ion/IonBufferConfiguration.java
@@ -178,7 +178,7 @@ public IonBufferConfiguration build() {
     private IonBufferConfiguration(Builder builder) {
         super(builder);
         if (builder.getOversizedSymbolTableHandler() == null) {
-            requireUnlimitedBufferSize();
+            requireMaximumBufferSize();
             oversizedSymbolTableHandler = builder.getThrowingOversizedSymbolTableHandler();
         } else {
             oversizedSymbolTableHandler = builder.getOversizedSymbolTableHandler();
diff --git a/src/main/java/com/amazon/ion/apps/BaseApp.java b/src/main/java/com/amazon/ion/apps/BaseApp.java
index d5890bb5ae..96ca1a5ea8 100644
--- a/src/main/java/com/amazon/ion/apps/BaseApp.java
+++ b/src/main/java/com/amazon/ion/apps/BaseApp.java
@@ -20,6 +20,7 @@
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.SymbolTable;
+import com.amazon.ion.impl._Private_IonConstants;
 import com.amazon.ion.system.IonSystemBuilder;
 import com.amazon.ion.system.SimpleCatalog;
 import java.io.BufferedInputStream;
@@ -65,7 +66,7 @@ protected static byte[] loadAsByteArray(File file)
         throws FileNotFoundException, IOException
     {
         long len = file.length();
-        if (len < 0 || len > Integer.MAX_VALUE)
+        if (len < 0 || len > Integer.MAX_VALUE - 8)
         {
             throw new IllegalArgumentException("File too long: " + file);
         }
diff --git a/src/main/java/com/amazon/ion/impl/BlockedBuffer.java b/src/main/java/com/amazon/ion/impl/BlockedBuffer.java
index 06bd00f4c3..4faa6c53aa 100644
--- a/src/main/java/com/amazon/ion/impl/BlockedBuffer.java
+++ b/src/main/java/com/amazon/ion/impl/BlockedBuffer.java
@@ -1282,7 +1282,7 @@ private final void fail_on_version_change() throws IOException
         @Override
         public final long skip(long n) throws IOException
         {
-            if (n < 0 || n > Integer.MAX_VALUE) throw new IllegalArgumentException("we only handle buffer less than "+Integer.MAX_VALUE+" bytes in length");
+            if (n < 0 || n > _Private_IonConstants.ARRAY_MAXIMUM_SIZE) throw new IllegalArgumentException("we only handle buffer less than "+_Private_IonConstants.ARRAY_MAXIMUM_SIZE+" bytes in length");
             if (_buf == null) throw new IOException("stream is closed");
             fail_on_version_change();
             if (_pos >= _buf.size()) return -1;
diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 43e64748e3..9cb9c91225 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -458,6 +458,7 @@ private static IonBufferConfiguration getFixedSizeConfigurationFor(
             configuration.getInitialBufferSize(),
             configuration.getMaximumBufferSize()
         );
+        registerOversizedValueHandler(configuration.getOversizedValueHandler());
     }
 
     /*
diff --git a/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
index 713422d44b..c187682d53 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
@@ -744,7 +744,7 @@ private int load_lob_contents() throws IOException
         }
         if (_lob_loaded == LOB_STATE.READ) {
             long raw_size =  _current_value_save_point.length();
-            if (raw_size < 0 || raw_size > Integer.MAX_VALUE) {
+            if (raw_size < 0 || raw_size > _Private_IonConstants.ARRAY_MAXIMUM_SIZE) {
                 load_lob_length_overflow_error(raw_size);
             }
             _lob_bytes = new byte[(int)raw_size];
diff --git a/src/main/java/com/amazon/ion/impl/ResizingPipedInputStream.java b/src/main/java/com/amazon/ion/impl/ResizingPipedInputStream.java
index 0c7f8ba26d..16826d753d 100644
--- a/src/main/java/com/amazon/ion/impl/ResizingPipedInputStream.java
+++ b/src/main/java/com/amazon/ion/impl/ResizingPipedInputStream.java
@@ -129,7 +129,7 @@ public void bytesConsolidatedToStartOfBuffer(int leftShiftAmount) {
      *                          such that growth is expected to occur rarely, if ever.
      */
     public ResizingPipedInputStream(final int initialBufferSize) {
-        this(initialBufferSize, Integer.MAX_VALUE, false);
+        this(initialBufferSize, _Private_IonConstants.ARRAY_MAXIMUM_SIZE, false);
     }
 
     /**
@@ -152,6 +152,9 @@ public ResizingPipedInputStream(final int initialBufferSize) {
         if (initialBufferSize < 1) {
             throw new IllegalArgumentException("Initial buffer size must be at least 1.");
         }
+        if (maximumBufferSize > _Private_IonConstants.ARRAY_MAXIMUM_SIZE) {
+            throw new IllegalArgumentException("Initial buffer size must be at most " + _Private_IonConstants.ARRAY_MAXIMUM_SIZE + ".");
+        }
         if (maximumBufferSize < initialBufferSize) {
             throw new IllegalArgumentException("Maximum buffer size cannot be less than the initial buffer size.");
         }
diff --git a/src/main/java/com/amazon/ion/impl/UnifiedInputBufferX.java b/src/main/java/com/amazon/ion/impl/UnifiedInputBufferX.java
index c8444883cb..021cda0324 100644
--- a/src/main/java/com/amazon/ion/impl/UnifiedInputBufferX.java
+++ b/src/main/java/com/amazon/ion/impl/UnifiedInputBufferX.java
@@ -67,6 +67,8 @@ protected static final char[] chars_make_char_array(CharSequence chars,
     private UnifiedInputBufferX(int initialPageSize) {
         if (initialPageSize < 0) {
             throw new IllegalArgumentException("page size must be > 0");
+        } else if (initialPageSize > _Private_IonConstants.ARRAY_MAXIMUM_SIZE) {
+            throw new IllegalArgumentException("page size must be < " + _Private_IonConstants.ARRAY_MAXIMUM_SIZE);
         }
         _page_size = initialPageSize;
         _buffers = new UnifiedDataPageX[10];
diff --git a/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java b/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java
index f962946191..71967f7332 100644
--- a/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java
+++ b/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java
@@ -564,6 +564,7 @@ private static class FromCharStream extends UnifiedInputStreamX
             _is_byte_data = false;
             _is_stream = true;
             _reader = reader;
+            // If this page size ever becomes configurable watch out for _Private_IonConstants.ARRAY_MAXIMUM_SIZE
             _buffer = UnifiedInputBufferX.makePageBuffer(UnifiedInputBufferX.BufferType.CHARS, DEFAULT_PAGE_SIZE);
             super.init();
             _limit = refill();
@@ -601,6 +602,7 @@ private static class FromByteStream extends UnifiedInputStreamX
             _is_byte_data = true;
             _is_stream = true;
             _stream = stream;
+            // If this page size ever becomes configurable watch out for _Private_IonConstants.ARRAY_MAXIMUM_SIZE
             _buffer = UnifiedInputBufferX.makePageBuffer(UnifiedInputBufferX.BufferType.BYTES, DEFAULT_PAGE_SIZE);
             super.init();
             _limit = refill();
diff --git a/src/main/java/com/amazon/ion/impl/_Private_IonConstants.java b/src/main/java/com/amazon/ion/impl/_Private_IonConstants.java
index dc25adbb1f..d7c706b36d 100644
--- a/src/main/java/com/amazon/ion/impl/_Private_IonConstants.java
+++ b/src/main/java/com/amazon/ion/impl/_Private_IonConstants.java
@@ -22,6 +22,14 @@
  */
 public final class _Private_IonConstants
 {
+    // Arrays in Java must be indexed by integers (JLS 10.4), but the true maximum array size may be less than
+    // Integer.MAX_VALUE. True maximum array size is a JVM implementation detail, and varies by type and by JVM.
+    // We have this pinned at Integer.MAX_VALUE - 8 because that's a fairly common value in the JDK itself, in
+    // classes such as ConcurrentHashMap, InputStream, Hashtable, ByteArrayChannel, etc.
+    // In testing against a variety of JVMs and types the smallest maximum size I've seen is Integer.MAX_VALUE - 2,
+    // and the smallest maximum size I've seen reported is Integer.MAX_VALUE - 6.
+    public static final int ARRAY_MAXIMUM_SIZE = Integer.MAX_VALUE - 8;
+
     private _Private_IonConstants() { }
 
 
diff --git a/src/main/java/com/amazon/ion/impl/_Private_Utils.java b/src/main/java/com/amazon/ion/impl/_Private_Utils.java
index ce68c35a19..751fb46489 100644
--- a/src/main/java/com/amazon/ion/impl/_Private_Utils.java
+++ b/src/main/java/com/amazon/ion/impl/_Private_Utils.java
@@ -578,7 +578,7 @@ public static byte[] loadFileBytes(File file)
         throws IOException
     {
         long len = file.length();
-        if (len < 0 || len > Integer.MAX_VALUE) {
+        if (len < 0 || len > _Private_IonConstants.ARRAY_MAXIMUM_SIZE) {
             throw new IllegalArgumentException("File too long: " + file);
         }
 
diff --git a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
index b28e9bd5f9..734d152b57 100644
--- a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
@@ -3,6 +3,7 @@
 
 package com.amazon.ion.impl;
 
+import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCursor;
 import com.amazon.ion.IonException;
 import org.junit.jupiter.api.Test;
@@ -27,6 +28,8 @@
 import static com.amazon.ion.impl.IonCursorTestUtilities.endStream;
 import static com.amazon.ion.impl.IonCursorTestUtilities.scalar;
 import static com.amazon.ion.impl.IonCursorTestUtilities.startContainer;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
@@ -397,4 +400,31 @@ public void expectMissingAnnotationWrapperAnnotationLengthToFailCleanly() {
         assertThrows(IonException.class, cursor::nextValue);
         cursor.close();
     }
+
+    @Test
+    public void expectValueLargerThanIntMaxToFailCleanly() {
+        int[] data = new int[] {
+                0xE0, 0x01, 0x00, 0xEA,
+                0x2E, // Integer with VarUInt length, because that's clearly a reasonable thing to find
+                0x07, 0x7f, 0x7f, 0x7f, 0xf9 // VarUInt length 2147483647 (Integer.MAX_LENGTH)
+        };
+        ByteArrayInputStream in = new ByteArrayInputStream(bytes(data));
+
+        // We need a custom initial buffer size so that the cursor doesn't know there are fewer bytes remaining
+        // than the value header promises
+        IonBufferConfiguration config = IonBufferConfiguration.Builder.standard()
+                .withInitialBufferSize(8)
+                .build();
+
+        IonCursorBinary cursor = new IonCursorBinary(config, in, null, 0, 0);
+
+        cursor.nextValue(); // Position cursor on unreal oversized value
+
+        // Try to get all the value bytes, and fail because arrays can't be that large
+        IonException ie = assertThrows(IonException.class, cursor::fillValue);
+        assertThat(ie.getMessage(),
+                containsString("An oversized value was found even though no maximum size was configured."));
+
+        cursor.close();
+    }
 }
diff --git a/src/test/java/com/amazon/ion/impl/ResizingPipedInputStreamTest.java b/src/test/java/com/amazon/ion/impl/ResizingPipedInputStreamTest.java
index 126476ac8b..40a48072a0 100644
--- a/src/test/java/com/amazon/ion/impl/ResizingPipedInputStreamTest.java
+++ b/src/test/java/com/amazon/ion/impl/ResizingPipedInputStreamTest.java
@@ -21,12 +21,11 @@
 import java.util.zip.GZIPOutputStream;
 
 import static com.amazon.ion.BitUtils.bytes;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 import static org.junit.runners.Parameterized.Parameter;
 import static org.junit.runners.Parameterized.Parameters;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
 
+@SuppressWarnings("resource")
 @RunWith(Parameterized.class)
 public class ResizingPipedInputStreamTest {
 
@@ -94,7 +93,7 @@ public static Iterable<Object[]> bufferSizes() {
 
     @Before
     public void setup() {
-        input = new ResizingPipedInputStream(bufferSize, Integer.MAX_VALUE, useBoundary);
+        input = new ResizingPipedInputStream(bufferSize, _Private_IonConstants.ARRAY_MAXIMUM_SIZE, useBoundary);
         knownCapacity = input.capacity();
     }
 
@@ -469,16 +468,20 @@ public void truncate() throws Exception {
         assertEquals(0, input.available());
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void errorsOnInvalidInitialBufferSize() {
-        new ResizingPipedInputStream(0);
+        assertThrows(IllegalArgumentException.class, () -> new ResizingPipedInputStream(0));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void errorsOnInvalidMaximumBufferSize() {
-        new ResizingPipedInputStream(10, 9, useBoundary);
+    @Test
+    public void errorsOnMaximumBufferSizeSmallerThanInitialSize() {
+        assertThrows(IllegalArgumentException.class, () -> new ResizingPipedInputStream(10, 9, useBoundary));
     }
 
+    @Test
+    public void errorsOnInvalidMaximumBufferSize() {
+        assertThrows(IllegalArgumentException.class, () -> new ResizingPipedInputStream(10, Integer.MAX_VALUE, useBoundary));
+    }
     @Test
     public void initialBufferSizeAndCapacity() {
         assertEquals(bufferSize, input.getInitialBufferSize());
diff --git a/src/test/java/com/amazon/ion/impl/UnifiedInputBufferXTest.java b/src/test/java/com/amazon/ion/impl/UnifiedInputBufferXTest.java
new file mode 100644
index 0000000000..af8e637702
--- /dev/null
+++ b/src/test/java/com/amazon/ion/impl/UnifiedInputBufferXTest.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion.impl;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class UnifiedInputBufferXTest {
+
+    @Test
+    public void ctorThrowsWithIllegalInitialPageSize() {
+        assertThrows(IllegalArgumentException.class,
+                () -> new UnifiedInputBufferX.Chars(-1));
+
+        assertThrows(IllegalArgumentException.class,
+                () -> new UnifiedInputBufferX.Chars(Integer.MAX_VALUE));
+    }
+
+    @Test
+    public void ctorWorksWithLegalInitialPageSize() {
+        new UnifiedInputBufferX.Chars(0);
+        new UnifiedInputBufferX.Chars(_Private_IonConstants.ARRAY_MAXIMUM_SIZE);
+    }
+
+}
diff --git a/src/test/java/com/amazon/ion/impl/UnifiedInputStreamXTest.java b/src/test/java/com/amazon/ion/impl/UnifiedInputStreamXTest.java
index e353b49e19..e92506e4ef 100644
--- a/src/test/java/com/amazon/ion/impl/UnifiedInputStreamXTest.java
+++ b/src/test/java/com/amazon/ion/impl/UnifiedInputStreamXTest.java
@@ -15,14 +15,17 @@
 
 package com.amazon.ion.impl;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 
-public class UnifiedInputStreamXTest extends Assert {
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+public class UnifiedInputStreamXTest {
+
     @Test
     public void testReadExactlyAvailable() throws Exception {
         class TestInputStream extends InputStream {

From 31fdee75f693c2bc914fdc9f309d92dc427c58a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Feb 2024 10:12:49 -0800
Subject: [PATCH 344/490] Bump codecov/codecov-action from 3.1.5 to 4.0.0
 (#713)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3.1.5 to 4.0.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0...f30e4959ba63075080d4f7f90cacc18d9f3fafd7)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6db18c52f3..388ec4bc55 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,7 +38,7 @@ jobs:
           arguments: minifyTest
       - run: ./ion-test-driver-run version
       - if: ${{ matrix.upload_reports }}
-        uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
+        uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0

From 67ade97b855a8595a20e2c7f5a24f7567d86d116 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Feb 2024 10:22:45 -0800
Subject: [PATCH 345/490] Bump github/codeql-action from 3.23.1 to 3.23.2
 (#706)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.1 to 3.23.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/0b21cf2492b6b02c465a3e5d7c473717ad7721ba...b7bf0a3ed3ecfa44160715d7c442788f65f0f923)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7d4170b32e..7b16621717 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
+        uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
+        uses: github/codeql-action/autobuild@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
+        uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index d3234d7750..070aee2618 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
+        uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
         with:
           sarif_file: results.sarif

From b338ae0a32b232f48ba52bae6813751f9f012be0 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 25 Jan 2024 14:46:17 -0800
Subject: [PATCH 346/490] Fixes a bug that allowed NegativeArraySizeException
 to be thrown from IonReader.newBytes().

---
 .../com/amazon/ion/impl/IonCursorBinary.java  | 25 +++++++++++--------
 .../IonReaderContinuableCoreBinaryTest.java   | 16 ++++++++++++
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 9cb9c91225..1bfe194c28 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -898,17 +898,16 @@ private long calculateEndIndex_1_0(IonTypeID valueTid, boolean isAnnotated) {
             }
             byte b = buffer[(int) peekIndex++];
             if (b < 0) {
-                endIndex = (b & LOWER_SEVEN_BITS_BITMASK);
+                endIndex = (b & LOWER_SEVEN_BITS_BITMASK) + peekIndex;
             } else {
-                endIndex = uncheckedReadVarUInt_1_0(b);
+                endIndex = uncheckedReadVarUInt_1_0(b) + peekIndex;
                 if (endIndex < 0) {
                     throw new IonException("Unsupported value: declared length is too long.");
                 }
             }
         } else {
-            endIndex = valueTid.length;
+            endIndex = valueTid.length + peekIndex;
         }
-        endIndex += peekIndex;
         if (valueTid.type != null && valueTid.type.ordinal() >= LIST_TYPE_ORDINAL) {
             event = Event.START_CONTAINER;
         } else if (valueTid.isNopPad) {
@@ -1308,13 +1307,19 @@ private boolean slowReadValueHeader(IonTypeID valueTid, boolean isAnnotated, Mar
             setCheckpoint(CheckpointLocation.AFTER_SCALAR_HEADER);
             event = Event.START_SCALAR;
         }
-        if (refillableState.isSkippingCurrentValue) {
-            // Any bytes that were skipped directly from the input must still be included in the logical endIndex so
-            // that the rest of the oversized value's bytes may be skipped.
-            endIndex = endIndex == DELIMITED_MARKER ? DELIMITED_MARKER : (peekIndex + valueLength + refillableState.individualBytesSkippedWithoutBuffering);
-        } else {
-            endIndex = endIndex == DELIMITED_MARKER ? DELIMITED_MARKER : (peekIndex + valueLength);
+        if (endIndex != DELIMITED_MARKER) {
+            if (refillableState.isSkippingCurrentValue) {
+                // Any bytes that were skipped directly from the input must still be included in the logical endIndex so
+                // that the rest of the oversized value's bytes may be skipped.
+                endIndex = peekIndex + valueLength + refillableState.individualBytesSkippedWithoutBuffering;
+            } else {
+                endIndex = peekIndex + valueLength;
+            }
+            if (endIndex < 0) {
+                throw new IonException("Unsupported value: declared length is too long.");
+            }
         }
+
         if (isAnnotated) {
             validateAnnotationWrapperEndIndex(endIndex);
         }
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
index 874747ef31..0fc2338b5f 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
@@ -480,4 +480,20 @@ public void expectAttemptToParseNullDecimalAsJavaPrimitiveToFailCleanly() {
         assertReaderThrowsForAllPrimitives(reader);
         reader.close();
     }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void expectLobWithOverflowingEndIndexToFailCleanly(boolean constructFromBytes) {
+        // This test exercises the case where a value's length itself does not overflow a java long, but its end index
+        // (calculated by adding the reader's current index in the buffer to the value's length) does.
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xAE, // blob with length VarUInt to follow
+            0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFE, // 9-byte VarUInt with value just below Long.MAX_VALUE
+            0xAF // The first byte of the blob
+        );
+        assertThrows(IonException.class, reader::nextValue);
+        reader.close();
+    }
 }

From 8dbd0012d06690d94f45599525378e8086b105c6 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 26 Jan 2024 12:44:20 -0800
Subject: [PATCH 347/490] Allows the text reader to fail cleanly when the user
 attempts to recover after catching IonException, but recovery is not
 possible.

---
 .../amazon/ion/impl/IonReaderTextRawX.java    | 118 +++++++++---------
 .../java/com/amazon/ion/util/TextTest.java    |  21 ++++
 2 files changed, 83 insertions(+), 56 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java b/src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java
index 4bfb34b31a..4449ef4122 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java
@@ -1113,64 +1113,70 @@ else if (_current_value_save_point_loaded) {
         }
         else {
             _scanner.save_point_start(_current_value_save_point);
-            switch (token_type) {
-            case IonTokenConstsX.TOKEN_UNKNOWN_NUMERIC:
-            case IonTokenConstsX.TOKEN_INT:
-            case IonTokenConstsX.TOKEN_BINARY:
-            case IonTokenConstsX.TOKEN_HEX:
-            case IonTokenConstsX.TOKEN_FLOAT:
-            case IonTokenConstsX.TOKEN_DECIMAL:
-            case IonTokenConstsX.TOKEN_TIMESTAMP:
-                _value_type = _scanner.load_number(sb);
-                break;
-            case IonTokenConstsX.TOKEN_SYMBOL_IDENTIFIER:
-                _scanner.load_symbol_identifier(sb);
-                _value_type = IonType.SYMBOL;
-                break;
-            case IonTokenConstsX.TOKEN_SYMBOL_OPERATOR:
-                _scanner.load_symbol_operator(sb);
-                _value_type = IonType.SYMBOL;
-                break;
-            case IonTokenConstsX.TOKEN_SYMBOL_QUOTED:
-                clob_chars_only = (IonType.CLOB == _value_type);
-                c = _scanner.load_single_quoted_string(sb, clob_chars_only);
-                if (c == UnifiedInputStreamX.EOF) {
-                    //String message = "EOF encountered before closing single quote";
-                    //parse_error(message);
-                    _scanner.unexpected_eof();
-                }
-                _value_type = IonType.SYMBOL;
-                break;
-            case IonTokenConstsX.TOKEN_STRING_DOUBLE_QUOTE:
-                clob_chars_only = (IonType.CLOB == _value_type);
-                c = _scanner.load_double_quoted_string(sb, clob_chars_only);
-                if (c == UnifiedInputStreamX.EOF) {
-                    // String message = "EOF encountered before closing single quote";
-                    // parse_error(message);
-                    _scanner.unexpected_eof();
-                }
-                _value_type = IonType.STRING;
-                break;
-            case IonTokenConstsX.TOKEN_STRING_TRIPLE_QUOTE:
-                clob_chars_only = (IonType.CLOB == _value_type);
-                c = _scanner.load_triple_quoted_string(sb, clob_chars_only);
-                if (c == UnifiedInputStreamX.EOF) {
-                    //String message = "EOF encountered before closing single quote";
-                    //parse_error(message);
-                    _scanner.unexpected_eof();
+            try {
+                switch (token_type) {
+                    case IonTokenConstsX.TOKEN_UNKNOWN_NUMERIC:
+                    case IonTokenConstsX.TOKEN_INT:
+                    case IonTokenConstsX.TOKEN_BINARY:
+                    case IonTokenConstsX.TOKEN_HEX:
+                    case IonTokenConstsX.TOKEN_FLOAT:
+                    case IonTokenConstsX.TOKEN_DECIMAL:
+                    case IonTokenConstsX.TOKEN_TIMESTAMP:
+                        _value_type = _scanner.load_number(sb);
+                        break;
+                    case IonTokenConstsX.TOKEN_SYMBOL_IDENTIFIER:
+                        _scanner.load_symbol_identifier(sb);
+                        _value_type = IonType.SYMBOL;
+                        break;
+                    case IonTokenConstsX.TOKEN_SYMBOL_OPERATOR:
+                        _scanner.load_symbol_operator(sb);
+                        _value_type = IonType.SYMBOL;
+                        break;
+                    case IonTokenConstsX.TOKEN_SYMBOL_QUOTED:
+                        clob_chars_only = (IonType.CLOB == _value_type);
+                        c = _scanner.load_single_quoted_string(sb, clob_chars_only);
+                        if (c == UnifiedInputStreamX.EOF) {
+                            //String message = "EOF encountered before closing single quote";
+                            //parse_error(message);
+                            _scanner.unexpected_eof();
+                        }
+                        _value_type = IonType.SYMBOL;
+                        break;
+                    case IonTokenConstsX.TOKEN_STRING_DOUBLE_QUOTE:
+                        clob_chars_only = (IonType.CLOB == _value_type);
+                        c = _scanner.load_double_quoted_string(sb, clob_chars_only);
+                        if (c == UnifiedInputStreamX.EOF) {
+                            // String message = "EOF encountered before closing single quote";
+                            // parse_error(message);
+                            _scanner.unexpected_eof();
+                        }
+                        _value_type = IonType.STRING;
+                        break;
+                    case IonTokenConstsX.TOKEN_STRING_TRIPLE_QUOTE:
+                        clob_chars_only = (IonType.CLOB == _value_type);
+                        c = _scanner.load_triple_quoted_string(sb, clob_chars_only);
+                        if (c == UnifiedInputStreamX.EOF) {
+                            //String message = "EOF encountered before closing single quote";
+                            //parse_error(message);
+                            _scanner.unexpected_eof();
+                        }
+                        _value_type = IonType.STRING;
+                        break;
+                    default:
+                        String message = "unexpected token "
+                            + IonTokenConstsX.getTokenName(token_type)
+                            + " encountered";
+                        throw new IonException(message);
                 }
-                _value_type = IonType.STRING;
-                break;
-            default:
-                String message = "unexpected token "
-                               + IonTokenConstsX.getTokenName(token_type)
-                               + " encountered";
-                throw new IonException(message);
+                _current_value_save_point.markEnd();
+                _current_value_save_point_loaded = true;
+                _current_value_buffer_loaded = true;
+                tokenValueIsFinished();
+            } catch (IonException e) {
+                _current_value_save_point.clear();
+                _current_value_save_point_loaded = false;
+                throw e;
             }
-            _current_value_save_point.markEnd();
-            _current_value_save_point_loaded = true;
-            _current_value_buffer_loaded = true;
-            tokenValueIsFinished();
         }
         return sb;
     }
diff --git a/src/test/java/com/amazon/ion/util/TextTest.java b/src/test/java/com/amazon/ion/util/TextTest.java
index 6011adfd7c..6f34e0f630 100644
--- a/src/test/java/com/amazon/ion/util/TextTest.java
+++ b/src/test/java/com/amazon/ion/util/TextTest.java
@@ -18,7 +18,10 @@
 import com.amazon.ion.BlobTest;
 import com.amazon.ion.BlobTest.TestData;
 import com.amazon.ion.Decimal;
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonReader;
 import com.amazon.ion.IonTestCase;
+import com.amazon.ion.IonType;
 import com.amazon.ion.impl._Private_IonTextAppender;
 import java.math.BigDecimal;
 import org.junit.Test;
@@ -248,4 +251,22 @@ public void testPrintClob()
         checkClob("{{\"\"}}", new byte[0]);
         checkClob("{{\"\\0a\\xff\"}}", new byte[]{ 0, 'a', (byte) 0xff });
     }
+
+    @Test
+    public void testAttemptedRecoveryOnMalformedDataFailsCleanly()
+        throws Exception
+    {
+        // `\0` is not a valid character in unquoted Ion text.
+        try (IonReader reader = system().newReader("0x2\0")) {
+            // Note: the reader does not fail on next() because it only needs to read `0x` to determine that the value that
+            // follows must be an int.
+            assertEquals(IonType.INT, reader.next());
+            // Now, the reader attempts to read to the end of the int in order to determine its size. This will raise an
+            // error due to the invalid character. Ignore this error and attempt to recover.
+            assertThrows(IonException.class, reader::getIntegerSize);
+            // Recovery will not be possible, but the following should throw IonException and not a different unchecked
+            // exception.
+            assertThrows(IonException.class, reader::intValue);
+        }
+    }
 }

From d0a4a4abdc0962411c5db5cdfcd5ca3cbf95cc87 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 26 Jan 2024 18:49:58 -0800
Subject: [PATCH 348/490] Fixes a bug that caused the binary reader not to fail
 cleanly when parsing incomplete containers in certain cases.

---
 .../com/amazon/ion/impl/IonCursorBinary.java  |  3 +
 .../IonReaderContinuableCoreBinaryTest.java   | 71 +++++++++++++++++++
 2 files changed, 74 insertions(+)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 1bfe194c28..3b5f94ca73 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -1574,6 +1574,9 @@ private boolean uncheckedNextToken() {
             if (uncheckedNextContainedToken()) {
                 return false;
             }
+            if (peekIndex >= limit) {
+                throw new IonException("Malformed data: declared length exceeds the number of bytes remaining in the container.");
+            }
             b = buffer[(int)(peekIndex++)] & SINGLE_BYTE_MASK;
         }
         if (uncheckedReadHeader(b, false, valueMarker)) {
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
index 0fc2338b5f..92091c599f 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
@@ -3,6 +3,7 @@
 
 package com.amazon.ion.impl;
 
+import com.amazon.ion.IonCursor;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonType;
 import org.junit.jupiter.api.Test;
@@ -496,4 +497,74 @@ public void expectLobWithOverflowingEndIndexToFailCleanly(boolean constructFromB
         assertThrows(IonException.class, reader::nextValue);
         reader.close();
     }
+
+    @Test
+    public void expectIncompleteContainerToFailCleanlyAfterFieldSid() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xDC, // Struct, length 12
+            0x9A  // Field SID 26
+            // The struct ends unexpectedly
+        );
+        assertEquals(IonCursor.Event.START_CONTAINER, reader.nextValue());
+        assertEquals(IonType.STRUCT, reader.getType());
+        reader.stepIntoContainer();
+        // This is an unexpected EOF, so the reader should fail cleanly.
+        assertThrows(IonException.class, reader::nextValue);
+        reader.close();
+    }
+
+    @Test
+    public void expectIncompleteContainerToFailCleanlyAfterTwoByteFieldSid() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xDC, // Struct, length 12
+            0x00, // First byte of overpadded 2-byte field SID
+            0x9A  // Field SID 26
+            // The struct ends unexpectedly
+        );
+        assertEquals(IonCursor.Event.START_CONTAINER, reader.nextValue());
+        assertEquals(IonType.STRUCT, reader.getType());
+        reader.stepIntoContainer();
+        // This is an unexpected EOF, so the reader should fail cleanly.
+        assertThrows(IonException.class, reader::nextValue);
+        reader.close();
+    }
+
+    @Test
+    public void expectIncompleteContainerToFailCleanlyAfterAnnotationHeader() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xDC, // Struct, length 12
+            0x9A, // Field SID 26
+            0xE4, // Annotation wrapper length 4
+            0x00, 0x81, // VarUInt length 1 (overpadded by 1 byte)
+            0x00, 0x84  // VarUInt SID 4 (overpadded by 1 byte)
+            // The value ends unexpectedly
+        );
+        assertEquals(IonCursor.Event.START_CONTAINER, reader.nextValue());
+        assertEquals(IonType.STRUCT, reader.getType());
+        reader.stepIntoContainer();
+        // This is an unexpected EOF, so the reader should fail cleanly.
+        assertThrows(IonException.class, reader::nextValue);
+        reader.close();
+    }
+
+    @Test
+    public void expectIncompleteAnnotationHeaderToFailCleanly() {
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0xE4, // Annotation wrapper length 5
+            0x81, // VarUInt length 1
+            0x84  // VarUInt SID 4
+            // The value ends unexpectedly
+        );
+        // This is an unexpected EOF, so the reader should fail cleanly.
+        assertThrows(IonException.class, reader::nextValue);
+        reader.close();
+    }
 }

From 7bafa0c4e2b90a90ee379055edda16eed9d932c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Feb 2024 12:32:14 -0800
Subject: [PATCH 349/490] Bump codecov/codecov-action from 4.0.0 to 4.0.1
 (#714)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/f30e4959ba63075080d4f7f90cacc18d9f3fafd7...e0b68c6749509c5f83f984dd99a76a1c1a231044)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 388ec4bc55..bd550c5e2c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,7 +38,7 @@ jobs:
           arguments: minifyTest
       - run: ./ion-test-driver-run version
       - if: ${{ matrix.upload_reports }}
-        uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
+        uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0

From 2ca2ea92ce5cb80f43eb2dfbba15abbf8070cdbd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Feb 2024 12:49:40 -0800
Subject: [PATCH 350/490] Bump gradle/wrapper-validation-action from 1.1.0 to
 2.0.0 (#715)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.1.0 to 2.0.0.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/56b90f209b02bf6d1deae490e9ef18b21a389cd4...27152f6fa06a6b8062ef7195c795692e51fc2c81)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bd550c5e2c..f33748d735 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           submodules: recursive
-      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
+      - uses: gradle/wrapper-validation-action@27152f6fa06a6b8062ef7195c795692e51fc2c81 # v2.0.0
       - name: Use java ${{ matrix.java }}
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:

From 0614db045cc603acd301dfc39afd8bfae9fb6898 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Feb 2024 18:13:26 +0000
Subject: [PATCH 351/490] Bump gradle/gradle-build-action from 2.11.1 to 3.0.0

Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.11.1 to 3.0.0.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/982da8e78c05368c70dac0351bb82647a9e9a5d2...3b1b3b9a2104c2b47fbae53f3938079c00c9bb87)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/main.yml                      | 4 ++--
 .github/workflows/publish-release-artifacts.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f33748d735..9ac6c84c5d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,11 +29,11 @@ jobs:
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
-      - uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
+      - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # v3.0.0
         with:
           arguments: build
       - name: Test minified JAR
-        uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
+        uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # v3.0.0
         with:
           arguments: minifyTest
       - run: ./ion-test-driver-run version
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 77c1083be1..7ec3170915 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
         with:
           submodules: recursive
-      - uses: gradle/gradle-build-action@982da8e78c05368c70dac0351bb82647a9e9a5d2 # v2.11.1
+      - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # v3.0.0
         with:
           arguments: build cyclonedxBom
       - name: Upload Jar to GitHub release

From 443326433e33ff7062f209900740c172a689c834 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Fri, 2 Feb 2024 15:21:44 -0800
Subject: [PATCH 352/490] Fix test name and doc comments (#716)

---
 .../com/amazon/ion/impl/IonCursorBinaryTest.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
index 734d152b57..581289a78e 100644
--- a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
@@ -402,12 +402,12 @@ public void expectMissingAnnotationWrapperAnnotationLengthToFailCleanly() {
     }
 
     @Test
-    public void expectValueLargerThanIntMaxToFailCleanly() {
-        int[] data = new int[] {
-                0xE0, 0x01, 0x00, 0xEA,
-                0x2E, // Integer with VarUInt length, because that's clearly a reasonable thing to find
-                0x07, 0x7f, 0x7f, 0x7f, 0xf9 // VarUInt length 2147483647 (Integer.MAX_LENGTH)
-        };
+    public void expectValueLargerThanMaxArraySizeToFailCleanly() {
+        int[] data = new int[]{
+                0xE0, 0x01, 0x00, 0xEA,      // Ion 1.0 IVM
+                0x2E,                        // Int with VarUInt length, 6 bytes total
+                0x07, 0x7f, 0x7f, 0x7f, 0xf9 // VarUInt length (Integer.MAX_LENGTH - 6)
+        };                                   // Because that's clearly a reasonable thing to find
         ByteArrayInputStream in = new ByteArrayInputStream(bytes(data));
 
         // We need a custom initial buffer size so that the cursor doesn't know there are fewer bytes remaining

From e0a31ead2abef35ae37c1f26cb9aa0a3e3a33c42 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Mon, 5 Feb 2024 15:15:50 -0800
Subject: [PATCH 353/490] Update dependabot.yml (#718)

Move dependabot from daily to weekly
---
 .github/dependabot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 253bcb76ba..ca79ca5b4d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -3,4 +3,4 @@ updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: daily
+      interval: weekly

From f4e1948df61f451c1be3f4bd10ef6aa9ccbfa0cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 16:15:27 +0000
Subject: [PATCH 354/490] Bump github/codeql-action from 3.23.2 to 3.24.0

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.2 to 3.24.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/b7bf0a3ed3ecfa44160715d7c442788f65f0f923...e8893c57a1f3a2b659b6b55564fdfdbbd2982911)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7b16621717..21b520294b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/autobuild@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 070aee2618..5d3fca9431 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
         with:
           sarif_file: results.sarif

From 4aebafdf832090d2cc7281ff6523b1807b8a2d12 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <tgregg@users.noreply.github.com>
Date: Fri, 9 Feb 2024 08:57:56 -0800
Subject: [PATCH 355/490] Bumps version to 1.11.3-SNAPSHOT (#720)

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 4bc07f03ac..5187bdb89c 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.2-SNAPSHOT
+1.11.3-SNAPSHOT

From 98866f17b2820239701b25d4781a7d3d16874f8e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 16:05:40 +0000
Subject: [PATCH 356/490] Bump gradle/wrapper-validation-action from 2.0.0 to
 2.1.1

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2.0.0 to 2.1.1.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/27152f6fa06a6b8062ef7195c795692e51fc2c81...699bb18358f12c5b78b37bb0111d3a0e2276e0e2)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9ac6c84c5d..6d50515afe 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           submodules: recursive
-      - uses: gradle/wrapper-validation-action@27152f6fa06a6b8062ef7195c795692e51fc2c81 # v2.0.0
+      - uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2.1.1
       - name: Use java ${{ matrix.java }}
         uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
         with:

From e3617e4fe2102bab2fa8c5c9e7c230c4ea16f108 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 14 Feb 2024 15:32:49 -0800
Subject: [PATCH 357/490] Fixes a bug that made concurrent access of a large
 nested IonStruct unsafe when only its parent had been made read-only.

---
 .../ion/impl/lite/IonContainerLite.java       |   9 +-
 .../amazon/ion/impl/lite/IonStructLite.java   |   5 +-
 .../amazon/ion/impl/lite/IonValueLite.java    |   1 +
 src/test/java/com/amazon/ion/CloneTest.java   | 139 ++++++++++++++++--
 4 files changed, 135 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java b/src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java
index 934a1d58b6..f51376d9b6 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java
@@ -743,7 +743,7 @@ final protected int nextSize(int current_size, boolean call_transition)
     }
 
     /**
-     * This is overriden in {@link IonStructLite} to add the {@link HashMap} of
+     * This is overridden in {@link IonStructLite} to add the {@link HashMap} of
      * field names when the struct becomes moderately large.
      *
      * @param size
@@ -753,6 +753,13 @@ void transitionToLargeSize(int size)
         return;
     }
 
+    /**
+     * Force any lazy state to be materialized (if applicable).
+     */
+    void forceMaterializationOfLazyState() {
+
+    }
+
     public final int get_child_count() {
         return _child_count;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonStructLite.java b/src/main/java/com/amazon/ion/impl/lite/IonStructLite.java
index 23344a7497..2bd4f1715a 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonStructLite.java
@@ -100,10 +100,8 @@ private void build_field_map()
     }
 
     @Override
-    public void makeReadOnly() {
-        // Eagerly initialize the fields map to prevent potential data races https://github.com/amazon-ion/ion-java/issues/629
+    void forceMaterializationOfLazyState() {
         fieldMapIsActive(_child_count);
-        super.makeReadOnly();
     }
 
     private void add_field(String fieldName, int newFieldIdx)
@@ -383,6 +381,7 @@ public IonValue get(String fieldName)
     private boolean fieldMapIsActive(int proposedSize) {
         if (_field_map != null) return true;
         if (proposedSize <= STRUCT_INITIAL_SIZE) return false;
+        if (_isLocked()) return false;
         build_field_map();
         return true;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java b/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java
index 7f28414fe5..e80b54833c 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java
@@ -677,6 +677,7 @@ private boolean clearSymbolIDsIterative(boolean readOnlyMode) {
                         holder.parent._isSymbolIdPresent(false);
                     }
                     if (readOnlyMode) {
+                        holder.parent.forceMaterializationOfLazyState();
                         holder.parent._isLocked(true);
                     }
                     // The end of the container has been reached. Pop from the stack and update the parent's flag.
diff --git a/src/test/java/com/amazon/ion/CloneTest.java b/src/test/java/com/amazon/ion/CloneTest.java
index 9950de5a7e..a9559502b8 100644
--- a/src/test/java/com/amazon/ion/CloneTest.java
+++ b/src/test/java/com/amazon/ion/CloneTest.java
@@ -18,11 +18,14 @@
 import com.amazon.ion.impl._Private_IonSystem;
 import com.amazon.ion.junit.IonAssert;
 import com.amazon.ion.system.IonSystemBuilder;
+import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Function;
 
 import static com.amazon.ion.impl._Private_Utils.newSymbolToken;
 import static org.hamcrest.CoreMatchers.containsString;
@@ -34,6 +37,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class CloneTest
 {
@@ -266,28 +270,133 @@ public void modifyAfterCloneDoesNotChangeOriginal() {
         assertNotEquals(original, clone);
     }
 
-    @Test
-    public void readOnlyIonStructMultithreadedTest() {
+    /**
+     * Verifies that a read-only struct without nested values can be accessed via multiple threads concurrently.
+     * @param beforeMakingReadOnly logic to be applied to each struct before it is made read-only.
+     */
+    private void testReadOnlyIonStructMultithreadedAccess(Function<IonStruct, IonStruct> beforeMakingReadOnly) {
         // See: https://github.com/amazon-ion/ion-java/issues/629
         String ionStr = "{a:1,b:2,c:3,d:4,e:5,f:6}";
 
-        IonStruct ionValue = (IonStruct)system().singleValue(ionStr);
-        ionValue.makeReadOnly();
+        IonStruct struct = beforeMakingReadOnly.apply((IonStruct) system().singleValue(ionStr));
+        struct.makeReadOnly();
 
-        for (int i=0; i<100; i++) {
-            IonStruct clone = ionValue.clone();
-            clone.makeReadOnly();
+        int numberOfTasks = 2;
+        List<CompletableFuture<Void>> waiting = new ArrayList<>();
+        for (int task = 0; task < numberOfTasks; task++) {
+            waiting.add(CompletableFuture.runAsync(() -> assertNotNull(struct.get("a"))));
+        }
+        waiting.forEach(CompletableFuture::join);
+    }
+
+    @RepeatedTest(20)
+    public void readOnlyIonStructMultithreadedAccessSucceeds() {
+        testReadOnlyIonStructMultithreadedAccess(s -> s);
+    }
 
-            List<CompletableFuture<Void>> waiting = new ArrayList<>();
-            for (int j = 0; j < 4; j++) {
-                waiting.add(CompletableFuture.runAsync(() -> {
-                    for (int k = 0; k <= 100; k++) {
-                        assertNotNull(clone.get("a"));
+    @RepeatedTest(20)
+    public void readOnlyClonedIonStructMultithreadedAccessSucceeds() {
+        testReadOnlyIonStructMultithreadedAccess(IonStruct::clone);
+    }
+
+    /**
+     * Creates a new IonStruct with several children, including two large nested structs. The large children will
+     * take longer to clone and sequentially access, giving more time for race conditions to surface in multithreaded
+     * contexts if the code is insufficiently protected.
+     * @return a new IonStruct.
+     */
+    private IonStruct createIonStructWithLargeChildStructs() {
+        IonSystem ionSystem = system();
+        IonStruct attribute = ionSystem.newEmptyStruct();
+        attribute.put("a", ionSystem.newSymbol("foo"));
+        attribute.put("b", ionSystem.newSymbol("foo"));
+        attribute.put("c", ionSystem.newSymbol("foo"));
+        IonStruct struct = ionSystem.newEmptyStruct();
+        struct.put("a", ionSystem.newSymbol("foo"));
+        struct.put("b", ionSystem.newSymbol("foo"));
+        struct.put("c", ionSystem.newSymbol("foo"));
+        struct.put("number", ionSystem.newDecimal(1e-2));
+        IonStruct child1 = ionSystem.newEmptyStruct();
+        for (int i = 0; i < 8; i++) {
+            child1.put("field" + i, attribute.clone());
+        }
+        struct.put("child1", child1);
+        IonStruct child2 = ionSystem.newEmptyStruct();
+        for (int i = 0; i < 1000; i++) {
+            child2.put("beforeTarget" + i, attribute.clone());
+        }
+        child2.put("target", attribute);
+        for (int i = 0; i < 400; i++) {
+            child2.put("afterTarget" + i, attribute.clone());
+        }
+        struct.put("child2", child2);
+        return struct;
+    }
+
+    /**
+     * Verifies that a read-only struct's large nested struct can be accessed via multiple threads concurrently.
+     * @param prepareStruct logic to be applied to the struct. The returned struct's "child2" struct must be read-only.
+     */
+    private void testReadOnlyIonStructMultithreadedNestedAccess(Function<IonStruct, IonStruct> prepareStruct) {
+        IonStruct struct = prepareStruct.apply(createIonStructWithLargeChildStructs());
+        int numberOfTasks = 2;
+        AtomicInteger success = new AtomicInteger();
+        AtomicInteger error = new AtomicInteger();
+        List<CompletableFuture<Void>> tasks = new ArrayList<>();
+
+        for (int task = 0; task < numberOfTasks; task++) {
+            tasks.add(CompletableFuture.runAsync(
+                () -> {
+                    IonStruct child2 = (IonStruct) struct.get("child2");
+                    String value = child2 == null || child2.get("target") == null
+                        ? null
+                        : ((IonStruct) child2.get("target")).get("a").toString();
+
+                    if (value == null) {
+                        error.getAndIncrement();
                     }
-                }));
-            }
-            waiting.forEach(CompletableFuture::join);
+                    success.getAndIncrement();
+                }
+            ));
         }
+        tasks.forEach(CompletableFuture::join);
+
+        assertTrue(success.get() > 0);
+        assertEquals(0, error.get());
+    }
+
+    @RepeatedTest(20)
+    public void readOnlyIonStructMultithreadedNestedAccessSucceeds() {
+        testReadOnlyIonStructMultithreadedNestedAccess(s -> {
+            s.makeReadOnly();
+            return s;
+        });
+    }
+
+    @RepeatedTest(20)
+    public void readOnlyClonedIonStructMultithreadedNestedAccessSucceeds() {
+        testReadOnlyIonStructMultithreadedNestedAccess(s -> {
+            IonStruct clone = s.clone();
+            clone.makeReadOnly();
+            return clone;
+        });
+    }
+
+    @RepeatedTest(20)
+    public void readOnlyNestedIonStructMultithreadedAccessSucceeds() {
+        testReadOnlyIonStructMultithreadedNestedAccess(s -> {
+            s.get("child2").makeReadOnly();
+            return s;
+        });
+    }
+
+    @RepeatedTest(20)
+    public void readOnlyClonedNestedIonStructMultithreadedAccessSucceeds() {
+        testReadOnlyIonStructMultithreadedNestedAccess(s -> {
+            IonStruct clone = s.clone();
+            clone.get("child2").makeReadOnly();
+            return clone;
+        });
     }
 
     /**

From 55565c888b65541e113a1df3acc2b909c50cb4e3 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 22 Feb 2024 13:41:12 -0800
Subject: [PATCH 358/490]  Bumps version to 1.11.4-SNAPSHOT

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 5187bdb89c..0c30d4853d 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.3-SNAPSHOT
+1.11.4-SNAPSHOT

From 3236b06bf2252475c9c2ae325e3a49ed82debb11 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Wed, 28 Feb 2024 13:24:13 -0800
Subject: [PATCH 359/490] Update dependabot.yml (#757)

---
 .github/dependabot.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index ca79ca5b4d..9add4dac83 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,3 +4,12 @@ updates:
     directory: /
     schedule:
       interval: weekly
+    # Only one PR at a time
+    open-pull-requests-limit: 1
+    # Group all updates together in one PR
+    # https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#groups
+    groups:
+      # The name of the group, it will be used in PR titles and branch
+      github-action-dependencies:
+        patterns:
+          - '*'

From a353368b5f515057d3849d5ffc6a31da75171721 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Feb 2024 21:25:33 +0000
Subject: [PATCH 360/490] Bump the github-action-dependencies group with 5
 updates

Bumps the github-action-dependencies group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [github/codeql-action](https://github.com/github/codeql-action) | `3.24.0` | `3.24.5` |
| [actions/setup-java](https://github.com/actions/setup-java) | `4.0.0` | `4.1.0` |
| [JasonEtco/create-an-issue](https://github.com/jasonetco/create-an-issue) | `2.9.1` | `2.9.2` |
| [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) | `3.0.0` | `3.1.0` |
| [codecov/codecov-action](https://github.com/codecov/codecov-action) | `4.0.1` | `4.1.0` |


Updates `github/codeql-action` from 3.24.0 to 3.24.5
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/e8893c57a1f3a2b659b6b55564fdfdbbd2982911...47b3d888fe66b639e431abf22ebca059152f1eea)

Updates `actions/setup-java` from 4.0.0 to 4.1.0
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4...v4.1.0)

Updates `JasonEtco/create-an-issue` from 2.9.1 to 2.9.2
- [Release notes](https://github.com/jasonetco/create-an-issue/releases)
- [Commits](https://github.com/jasonetco/create-an-issue/compare/e27dddc79c92bc6e4562f268fffa5ed752639abd...1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5)

Updates `gradle/gradle-build-action` from 3.0.0 to 3.1.0
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/3b1b3b9a2104c2b47fbae53f3938079c00c9bb87...29c0906b64b8fc82467890bfb7a0a7ef34bda89e)

Updates `codecov/codecov-action` from 4.0.1 to 4.1.0
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/e0b68c6749509c5f83f984dd99a76a1c1a231044...54bcd8715eee62d40e33596ef5e8f0f48dbbccab)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: JasonEtco/create-an-issue
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml                     | 6 +++---
 .../ion-java-performance-regression-detector.yml          | 2 +-
 .github/workflows/ion-test-driver.yml                     | 2 +-
 .github/workflows/main.yml                                | 8 ++++----
 .github/workflows/publish-release-artifacts.yml           | 2 +-
 .github/workflows/scorecard.yml                           | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 21b520294b..1f3daae774 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
+        uses: github/codeql-action/init@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
+        uses: github/codeql-action/autobuild@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
+        uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index e6ce0aaa6a..9608fa3491 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -58,7 +58,7 @@ jobs:
 
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v4.1.0
         with:
           distribution: 'corretto'
           java-version: 11
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 68ae5d0f2c..f2a3ece17f 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -82,7 +82,7 @@ jobs:
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # master
       - name: Open an issue
-        uses: JasonEtco/create-an-issue@e27dddc79c92bc6e4562f268fffa5ed752639abd # v2.9.1
+        uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_WORKFLOW_URL: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6d50515afe..2665f2b6ab 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,20 +25,20 @@ jobs:
           submodules: recursive
       - uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2.1.1
       - name: Use java ${{ matrix.java }}
-        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+        uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
-      - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # v3.0.0
+      - uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
         with:
           arguments: build
       - name: Test minified JAR
-        uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # v3.0.0
+        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
         with:
           arguments: minifyTest
       - run: ./ion-test-driver-run version
       - if: ${{ matrix.upload_reports }}
-        uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
+        uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 7ec3170915..a1f08dd7d3 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
         with:
           submodules: recursive
-      - uses: gradle/gradle-build-action@3b1b3b9a2104c2b47fbae53f3938079c00c9bb87 # v3.0.0
+      - uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
         with:
           arguments: build cyclonedxBom
       - name: Upload Jar to GitHub release
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 5d3fca9431..b088a60ef3 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
+        uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
         with:
           sarif_file: results.sarif

From a9ca39f6b5b30445b583a99b70270228d020b4ef Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 27 Feb 2024 17:00:11 -0800
Subject: [PATCH 361/490] Removes the binary reader's SymbolToken cache, which
 provided a minor optimization for certain cases but a major regression for
 others.

---
 ...IonReaderContinuableApplicationBinary.java | 33 +++----------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 3e5a57fd1d..6b1969c963 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -80,10 +80,6 @@ class IonReaderContinuableApplicationBinary extends IonReaderContinuableCoreBina
     // The first lowest local symbol ID in the symbol table.
     private int firstLocalSymbolId = imports.getMaxId() + 1;
 
-    // A map of symbol ID to SymbolToken representation. Because most use cases only require symbol text, this
-    // is used only if necessary to avoid imposing the extra expense on all symbol lookups.
-    private List<SymbolToken> symbolTokensById = null;
-
     // The cached SymbolTable representation of the current local symbol table. Invalidated whenever a local
     // symbol table is encountered in the stream.
     private SymbolTable cachedReadOnlySymbolTable = null;
@@ -448,9 +444,6 @@ private void resetSymbolTable() {
         Arrays.fill(symbols, 0, localSymbolMaxOffset + 1, null);
         localSymbolMaxOffset = -1;
         cachedReadOnlySymbolTable = null;
-        if (symbolTokensById != null) {
-            symbolTokensById.clear();
-        }
     }
 
     /**
@@ -479,9 +472,6 @@ protected void restoreSymbolTable(SymbolTable symbolTable) {
             localSymbolMaxOffset = snapshot.maxId - firstLocalSymbolId;
             // Note: because `symbols` only grows, `snapshot.listView` will always fit within `symbols`.
             System.arraycopy(snapshot.idToText, 0, symbols, 0, snapshot.idToText.length);
-            if (symbolTokensById != null) {
-                symbolTokensById.clear();
-            }
         } else {
             // Note: this will only happen when `symbolTable` is the system symbol table.
             resetSymbolTable();
@@ -568,28 +558,15 @@ String getSymbol(int sid) {
      */
     private SymbolToken getSymbolToken(int sid) {
         int symbolTableSize = localSymbolMaxOffset + firstLocalSymbolId + 1; // +1 because the max ID is 0-indexed.
-        if (symbolTokensById == null) {
-            symbolTokensById = new ArrayList<>(symbolTableSize);
-        }
-        if (symbolTokensById.size() < symbolTableSize) {
-            for (int i = symbolTokensById.size(); i < symbolTableSize; i++) {
-                symbolTokensById.add(null);
-            }
-        }
         if (sid >= symbolTableSize) {
             throw new UnknownSymbolException(sid);
         }
-        SymbolToken token = symbolTokensById.get(sid);
-        if (token == null) {
-            String text = getSymbolString(sid, imports, symbols);
-            if (text == null && sid >= firstLocalSymbolId) {
-                // All symbols with unknown text in the local symbol range are equivalent to symbol zero.
-                sid = 0;
-            }
-            token = new SymbolTokenImpl(text, sid);
-            symbolTokensById.set(sid, token);
+        String text = getSymbolString(sid, imports, symbols);
+        if (text == null && sid >= firstLocalSymbolId) {
+            // All symbols with unknown text in the local symbol range are equivalent to symbol zero.
+            sid = 0;
         }
-        return token;
+        return new SymbolTokenImpl(text, sid);
     }
 
     /**

From 773e12661d40cdc259a87f0e6096bd8f56a10f09 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 1 Mar 2024 13:48:17 -0800
Subject: [PATCH 362/490] Bumps version to 1.11.5-SNAPSHOT (#760)

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 0c30d4853d..4178a4832f 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.4-SNAPSHOT
+1.11.5-SNAPSHOT

From 864f351bf7a8851ff264123d59fd52cee6d05c26 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 16:21:11 +0000
Subject: [PATCH 363/490] Bump the github-action-dependencies group with 1
 update

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.24.5 to 3.24.6
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/47b3d888fe66b639e431abf22ebca059152f1eea...8a470fddafa5cbb6266ee11b37ef4d8aae19c571)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1f3daae774..2b77a3ec09 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/autobuild@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b088a60ef3..ff7e79a330 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         with:
           sarif_file: results.sarif

From 23a9346b55ecd8e8a0b9368932977947993ed5fd Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Thu, 14 Mar 2024 12:29:08 -0700
Subject: [PATCH 364/490] Adds recommendation to use IonElement (#772)

---
 README.md                                  | 15 +++++++++++++++
 src/main/java/com/amazon/ion/IonValue.java | 21 +++++++++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d6322fa5cc..de1b515882 100644
--- a/README.md
+++ b/README.md
@@ -67,3 +67,18 @@ to the official one.
 A great way to get started is to use the [Ion cookbook](https://amazon-ion.github.io/ion-docs/guides/cookbook.html).
 The [API documentation](http://www.javadoc.io/doc/com.amazon.ion/ion-java) will give a lot
 of detailed information about how to use the library.
+
+### Alternatives
+
+If you are looking for an in-memory Ion data model, this library provides `IonValue`, but you should consider 
+using `IonElement` from [`ion-element-kotlin`](https://github.com/amazon-ion/ion-element-kotlin) instead.
+
+`IonElement` is a better choice than `IonValue` as long as you can work within its limitations. `IonElement` has
+significantly less memory overhead than `IonValue`. It is immutable and does not have references to parent values, so
+it is always threadsafe, and unlike `IonValue` there is no need to make deep copies of `IonElement`.
+The limitations of `IonElement` are that it does not support symbols with unknown text, it will bring a dependency
+on the Kotlin Stdlib, and you may need to change some logic in your application if it relies on being able to access the
+parent container of an Ion value.
+
+The Ion maintainers recommend using `IonElement` instead of `IonValue` whenever possible. For more information, see 
+"[Why is IonElement needed?](https://github.com/amazon-ion/ion-element-kotlin#user-content-why-is-ionelement-needed)"
diff --git a/src/main/java/com/amazon/ion/IonValue.java b/src/main/java/com/amazon/ion/IonValue.java
index 74e8285886..db65ffd687 100644
--- a/src/main/java/com/amazon/ion/IonValue.java
+++ b/src/main/java/com/amazon/ion/IonValue.java
@@ -169,6 +169,21 @@
  * <code>latch</code> in this example provides a way to synchronize
  * when {@link #makeReadOnly()} happens in the first thread relative
  * to {@link #isNullValue()} being invoked on the second thread.
+ *
+ * <h2>Alternatives</h2>
+ *
+ * The Ion maintainers recommend using {@code IonElement} instead of {@code IonValue} whenever possible.
+ * <p>
+ * {@code IonElement} is a better choice than {@code IonValue} as long as you can work within its limitations.
+ * {@code IonElement} has significantly less memory overhead than {@code IonValue}. It is immutable and does not have a
+ * single-parent restriction, so it is always threadsafe, and unlike {@code IonValue} there is no need to make deep
+ * copies of {@code IonElement}. The limitations of {@code IonElement} are that it does not support symbols with unknown
+ * text, it will bring a dependency on the Kotlin Stdlib, and you may need to change some logic in your application if
+ * your logic relies on being able to access the parent container of an Ion value.
+ * <p>
+ * For more information, see
+ * "<a href="https://github.com/amazon-ion/ion-element-kotlin#user-content-why-is-ionelement-needed">Why is IonElement needed?</a>"
+ *
  */
 public interface IonValue
     extends Cloneable
@@ -278,7 +293,6 @@ public interface IonValue
      *
      * @throws UnsupportedOperationException if this is an {@link IonDatagram}.
      *
-
      */
     public IonValue topLevelValue();
 
@@ -300,7 +314,6 @@ public interface IonValue
      * @return the (ordered) annotations on the current value, or an empty
      * array (not {@code null}) if there are none.
      *
-
      */
     public SymbolToken[] getTypeAnnotationSymbols();
 
@@ -338,7 +351,6 @@ public interface IonValue
      * If null or empty array, then all annotations are removed.
      * Any duplicates are preserved.
      *
-
      */
     public void setTypeAnnotationSymbols(SymbolToken... annotations);
 
@@ -376,7 +388,6 @@ public interface IonValue
      * and performs a deep write, including the contents of
      * any containers encountered.
      *
-
      */
     public void writeTo(IonWriter writer);
 
@@ -479,7 +490,6 @@ public IonValue clone()
      *
      * @return Ion text data equivalent to this value.
      *
-
      */
     public String toPrettyString();
 
@@ -493,7 +503,6 @@ public IonValue clone()
      *
      * @return Ion text data equivalent to this value.
      *
-
      */
     public String toString(IonTextWriterBuilder writerBuilder);
 

From d33087d28bf3c688d29758954de1b96666d3fd86 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 14 Mar 2024 15:26:04 -0700
Subject: [PATCH 365/490] Adds a check for overflow when reading VarUInts.

---
 .../com/amazon/ion/impl/IonCursorBinary.java  |  5 +-
 .../IonReaderContinuableCoreBinaryTest.java   | 64 +++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 3b5f94ca73..7e06b6db4e 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -746,6 +746,9 @@ private long uncheckedReadVarUInt_1_0(byte currentByte) {
             currentByte = buffer[(int) (peekIndex++)];
             result = (result << VALUE_BITS_PER_VARUINT_BYTE) | (currentByte & LOWER_SEVEN_BITS_BITMASK);
         } while (currentByte >= 0);
+        if (result < 0) {
+            throw new IonException("Found a VarUInt that was too large to fit in a `long`");
+        }
         return result;
     }
 
@@ -796,7 +799,7 @@ private boolean uncheckedReadAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
         }
         endIndex += peekIndex;
         setMarker(endIndex, valueMarker);
-        if (endIndex > limit) {
+        if (endIndex > limit || endIndex < 0) {
             throw new IonException("Malformed data: declared length exceeds the number of bytes remaining in the stream.");
         }
         byte b = buffer[(int) peekIndex++];
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
index 92091c599f..2d81d09974 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
@@ -498,6 +498,70 @@ public void expectLobWithOverflowingEndIndexToFailCleanly(boolean constructFromB
         reader.close();
     }
 
+    @Test
+    public void expectIncompleteAnnotationWrapperWithOverflowingEndIndexToFailCleanly() {
+        // This test exercises the case where an annotation wrapper's length itself does not overflow a java long,
+        // but its end index (calculated by adding the reader's current index in the buffer to the value's length) does.
+        // Note: this is only tested for fixed input sources because non-fixed sources will wait for more input
+        // to determine if the annotation wrapper is well-formed. The next test tests a similar failure case for
+        // both types of inputs.
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            true,
+            0xE0, 0x01, 0x00, 0xEA,
+            0xEE,
+            0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFE // 9-byte VarUInt with value just below Long.MAX_VALUE
+        );
+        assertThrows(IonException.class, reader::nextValue);
+        reader.close();
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void expectCompleteAnnotationWrapperWithOverflowingEndIndexToFailCleanly(boolean constructFromBytes) {
+        // This test exercises the case where an annotation wrapper's length itself does not overflow a java long,
+        // but its end index (calculated by adding the reader's current index in the buffer to the value's length) does.
+        // Unlike the previous test, this test contains the remaining bytes of the annotation wrapper, allowing the
+        // cursor to advance to a failure condition even when the input is not fixed.
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
+            0xE0, 0x01, 0x00, 0xEA,
+            0xEE,
+            0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFE, // 9-byte VarUInt with value just below Long.MAX_VALUE
+            0x81, 0x83
+        );
+        assertThrows(IonException.class, reader::nextValue);
+        reader.close();
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void expectLobWithOverflowingLengthToFailCleanly(boolean constructFromBytes) {
+        // This test exercises the case where a value's length overflows a java long.
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
+            0xE0, 0x01, 0x00, 0xEA, // IVM
+            0x9E, // clob with length VarUInt
+            0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, // 10-byte VarUInt with value that exceeds Long.MAX_VALUE
+            0x00 // The first byte of the clob
+        );
+        assertThrows(IonException.class, reader::nextValue);
+        reader.close();
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void expectAnnotationWrapperWithOverflowingLengthToFailCleanly(boolean constructFromBytes) {
+        // This test exercises the case where an annotation wrapper's length overflows a java long.
+        IonReaderContinuableCoreBinary reader = initializeReader(
+            constructFromBytes,
+            0xE0, 0x01, 0x00, 0xEA,
+            0xEE,
+            0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF // 10-byte VarUInt with value that exceeds Long.MAX_VALUE
+        );
+        assertThrows(IonException.class, reader::nextValue);
+        reader.close();
+    }
+
     @Test
     public void expectIncompleteContainerToFailCleanlyAfterFieldSid() {
         IonReaderContinuableCoreBinary reader = initializeReader(

From 341c252c74d43c5bc65b409f2c34c396d6bf9f14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 14:44:58 -0700
Subject: [PATCH 366/490] Bump the github-action-dependencies group with 4
 updates (#779)

Bumps the github-action-dependencies group with 4 updates: [actions/checkout](https://github.com/actions/checkout), [github/codeql-action](https://github.com/github/codeql-action), [actions/setup-java](https://github.com/actions/setup-java) and [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action).


Updates `actions/checkout` from 4.1.1 to 4.1.2
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/b4ffde65f46336ab88eb53be808477a3936bae11...9bb56186c3b09b4f86b1c65136769dd318469633)

Updates `github/codeql-action` from 3.24.6 to 3.24.9
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/8a470fddafa5cbb6266ee11b37ef4d8aae19c571...1b1aada464948af03b950897e5eb522f92603cc2)

Updates `actions/setup-java` from 4.1.0 to 4.2.1
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4.1.0...v4.2.1)

Updates `gradle/wrapper-validation-action` from 2.1.1 to 2.1.2
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/699bb18358f12c5b78b37bb0111d3a0e2276e0e2...b231772637bb498f11fdbc86052b6e8a8dc9fc92)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml                  |  8 ++++----
 .../ion-java-performance-regression-detector.yml       | 10 +++++-----
 .github/workflows/ion-test-driver.yml                  |  6 +++---
 .github/workflows/main.yml                             |  8 ++++----
 .github/workflows/prepare-release.yml                  |  4 ++--
 .github/workflows/publish-release-artifacts.yml        |  4 ++--
 .github/workflows/scorecard.yml                        |  4 ++--
 .github/workflows/test-inspect-version-action.yml      |  2 +-
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2b77a3ec09..02335d309a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
+        uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
+        uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
+        uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 9608fa3491..41b242b974 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -58,27 +58,27 @@ jobs:
 
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v4.1.0
+        uses: actions/setup-java@v4.2.1
         with:
           distribution: 'corretto'
           java-version: 11
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           ref: ${{ github.base_ref }}
           submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index f2a3ece17f..3c457d7c2b 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # master
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # master
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -80,7 +80,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # master
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2665f2b6ab..2e319ac944 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,12 +20,12 @@ jobs:
           - java: 17
       fail-fast: false
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           submodules: recursive
-      - uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2.1.1
+      - uses: gradle/wrapper-validation-action@b231772637bb498f11fdbc86052b6e8a8dc9fc92 # v2.1.2
       - name: Use java ${{ matrix.java }}
-        uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
@@ -53,7 +53,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 49669c486e..cce1d2c5ca 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index a1f08dd7d3..737c0d20c4 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -29,7 +29,7 @@ jobs:
     # First, a sanity check to ensure that the library version matches the release version
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
       - name: Validate project version matches tag
         shell: bash
         run: |
@@ -48,7 +48,7 @@ jobs:
     steps:
         # TODO: replace with artifact upload/download -- make sure there's no race condition with other builds also
         # uploading an artifact.
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
         with:
           submodules: recursive
       - uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ff7e79a330..894181fb48 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.1.0
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.1.0
         with:
           persist-credentials: false
 
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
+        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index 2eb8532430..ec1e7c0550 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v3.6.0
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From 57d7a5439aca42a2db6d93d860ebc5f17f009cbb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Apr 2024 10:53:02 -0700
Subject: [PATCH 367/490] Bump the github-action-dependencies group with 1
 update (#780)

Bumps the github-action-dependencies group with 1 update: [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `codecov/codecov-action` from 4.1.0 to 4.1.1
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/54bcd8715eee62d40e33596ef5e8f0f48dbbccab...c16abc29c95fcf9174b58eb7e1abf4c866893bc8)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2e319ac944..7ba1426f70 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -38,7 +38,7 @@ jobs:
           arguments: minifyTest
       - run: ./ion-test-driver-run version
       - if: ${{ matrix.upload_reports }}
-        uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
+        uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0

From f0a389f7a744a5bf4a9283225fe976e6cffd8c95 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Apr 2024 09:41:03 -0700
Subject: [PATCH 368/490] Bump the github-action-dependencies group with 3
 updates (#782)

Bumps the github-action-dependencies group with 3 updates: [github/codeql-action](https://github.com/github/codeql-action), [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `github/codeql-action` from 3.24.9 to 3.24.10
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/1b1aada464948af03b950897e5eb522f92603cc2...4355270be187e1b672a7a1c7c7bae5afdc1ab94a)

Updates `gradle/gradle-build-action` from 3.1.0 to 3.2.0
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/29c0906b64b8fc82467890bfb7a0a7ef34bda89e...fe59895742b4f984530980e4f693943577526b61)

Updates `codecov/codecov-action` from 4.1.1 to 4.2.0
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/c16abc29c95fcf9174b58eb7e1abf4c866893bc8...7afa10ed9b269c561c2336fd862446844e0cbf71)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml           | 6 +++---
 .github/workflows/main.yml                      | 6 +++---
 .github/workflows/publish-release-artifacts.yml | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 02335d309a..3f553d1635 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/autobuild@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7ba1426f70..1782ce30a5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,16 +29,16 @@ jobs:
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
-      - uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
+      - uses: gradle/gradle-build-action@fe59895742b4f984530980e4f693943577526b61 # v3.2.0
         with:
           arguments: build
       - name: Test minified JAR
-        uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
+        uses: gradle/gradle-build-action@fe59895742b4f984530980e4f693943577526b61 # v3.2.0
         with:
           arguments: minifyTest
       - run: ./ion-test-driver-run version
       - if: ${{ matrix.upload_reports }}
-        uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1
+        uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 737c0d20c4..bc58e7d020 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
         with:
           submodules: recursive
-      - uses: gradle/gradle-build-action@29c0906b64b8fc82467890bfb7a0a7ef34bda89e # v3.1.0
+      - uses: gradle/gradle-build-action@fe59895742b4f984530980e4f693943577526b61 # v3.2.0
         with:
           arguments: build cyclonedxBom
       - name: Upload Jar to GitHub release
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 894181fb48..9a0a1faf4e 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
         with:
           sarif_file: results.sarif

From f807803916a24bd7c3bea20f10d599d8cf5495af Mon Sep 17 00:00:00 2001
From: Yoann Vernageau <6807151+yvrng@users.noreply.github.com>
Date: Tue, 9 Apr 2024 19:05:47 +0200
Subject: [PATCH 369/490] Allow custom writer configurations in
 IonSystemBuilder (#781)

* Allow custom writer configurations in IonSystemBuilder

* Update baseline.xml with JDK 17

* fix: fix typo in javadoc

Co-authored-by: Zack Slayton <zack.slayton@gmail.com>

* fix: typo in javadoc

Co-authored-by: Zack Slayton <zack.slayton@gmail.com>

* fix: typo in javadoc

Co-authored-by: Zack Slayton <zack.slayton@gmail.com>

* Add default values on builders

* Add javadoc

* Add more tests on catalog

* Fix tests on catalog

---------

Co-authored-by: Zack Slayton <zack.slayton@gmail.com>
Co-authored-by: Matthew Pope <81593196+popematt@users.noreply.github.com>
---
 build.gradle.kts                              |    2 +-
 config/spotbugs/baseline.xml                  | 1840 ++++++++---------
 .../amazon/ion/system/IonSystemBuilder.java   |  135 +-
 .../ion/system/IonSystemBuilderTest.java      |   43 +
 4 files changed, 1068 insertions(+), 952 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 773a793dd3..1d7ae0975f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -322,7 +322,7 @@ tasks {
                             "xsltproc",
                             "--output", spotbugsBaselineFile,
                             "$rootDir/config/spotbugs/baseline.xslt",
-                            "${outputLocation.get()}/spotBugs"
+                            "${outputLocation.get()}"
                         )
                     }
                 }
diff --git a/config/spotbugs/baseline.xml b/config/spotbugs/baseline.xml
index 79b19a3ce6..656a32390c 100644
--- a/config/spotbugs/baseline.xml
+++ b/config/spotbugs/baseline.xml
@@ -1,307 +1,307 @@
-<BugCollection version="4.7.3" sequence="0" timestamp="1675378162557" analysisTimestamp="1675378162587" release="1.9.6-SNAPSHOT">
+<BugCollection version="4.7.3" sequence="0" timestamp="1712606556088" analysisTimestamp="1712606556119" release="1.11.5-SNAPSHOT">
   <BugInstance type="NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE" priority="2" rank="13" abbrev="NP" category="STYLE" instanceHash="dfc0f20e980ed41b0fb16167cccef563" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
     <ShortMessage>Possible null pointer dereference on branch that might be infeasible</ShortMessage>
     <LongMessage>Possible null pointer dereference of Timestamp._fraction on branch that might be infeasible in com.amazon.ion.Timestamp.equals(Timestamp)</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2884]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="equals" signature="(Lcom/amazon/ion/Timestamp;)Z" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="2752" end="2794" startBytecode="0" endBytecode="450" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2766" end="2808" startBytecode="0" endBytecode="450" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.equals(Timestamp)</Message>
     </Method>
     <Field classname="com.amazon.ion.Timestamp" name="_fraction" signature="Ljava/math/BigDecimal;" isStatic="false" primary="true" role="FIELD_CONTAINS_VALUE">
-      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
         <Message>In Timestamp.java</Message>
       </SourceLine>
       <Message>Value contained in com.amazon.ion.Timestamp._fraction</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2794" end="2794" startBytecode="251" endBytecode="251" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_DEREF">
-      <Message>Dereferenced at Timestamp.java:[line 2794]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2808" end="2808" startBytecode="251" endBytecode="251" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_DEREF">
+      <Message>Dereferenced at Timestamp.java:[line 2808]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2790" end="2790" startBytecode="238" endBytecode="238" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_KNOWN_NULL">
-      <Message>Known null at Timestamp.java:[line 2790]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2804" end="2804" startBytecode="238" endBytecode="238" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_KNOWN_NULL">
+      <Message>Known null at Timestamp.java:[line 2804]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RC_REF_COMPARISON" priority="1" rank="1" abbrev="RC" category="CORRECTNESS" instanceHash="37701f2731e243676fa1126c1a454fea" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Suspicious reference comparison</ShortMessage>
-    <LongMessage>Suspicious comparison of Integer references in com.amazon.ion.Timestamp.make_localtime()</LongMessage>
+    <ShortMessage>Comparaison de références suspecte</ShortMessage>
+    <LongMessage>Comparaison suspecte des références com.amazon.ion.Timestamp._offset dans com.amazon.ion.Timestamp.make_localtime()</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2884]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="make_localtime" signature="()Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="1213" end="1238" startBytecode="0" endBytecode="48" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="1225" end="1251" startBytecode="0" endBytecode="49" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.make_localtime()</Message>
     </Method>
     <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.Integer" start="59" end="1825" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
-        <Message>At Integer.java:[lines 59-1825]</Message>
+      <SourceLine classname="java.lang.Integer" start="71" end="1872" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
+        <Message>At Integer.java:[lines 71-1872]</Message>
       </SourceLine>
       <Message>Actual type Integer</Message>
     </Type>
     <Field classname="com.amazon.ion.Timestamp" name="_offset" signature="Ljava/lang/Integer;" isStatic="false" primary="true" role="FIELD_VALUE_OF">
-      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
         <Message>In Timestamp.java</Message>
       </SourceLine>
       <Message>Value loaded from field com.amazon.ion.Timestamp._offset</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="1236" end="1236" startBytecode="84" endBytecode="84" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[line 1236]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="1249" end="1249" startBytecode="85" endBytecode="85" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[line 1249]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RC_REF_COMPARISON_BAD_PRACTICE" priority="2" rank="16" abbrev="RC" category="BAD_PRACTICE" instanceHash="ba9366bac044ba2194b3cae4093c18c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Suspicious reference comparison to constant</ShortMessage>
     <LongMessage>Suspicious comparison of a Integer reference to constant in com.amazon.ion.Timestamp.print(Appendable, Timestamp)</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2884]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="print" signature="(Ljava/lang/Appendable;Lcom/amazon/ion/Timestamp;)V" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="2148" end="2215" startBytecode="0" endBytecode="177" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2162" end="2229" startBytecode="0" endBytecode="177" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.print(Appendable, Timestamp)</Message>
     </Method>
     <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.Integer" start="59" end="1825" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
-        <Message>At Integer.java:[lines 59-1825]</Message>
+      <SourceLine classname="java.lang.Integer" start="71" end="1872" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
+        <Message>At Integer.java:[lines 71-1872]</Message>
       </SourceLine>
       <Message>Actual type Integer</Message>
     </Type>
     <Field classname="com.amazon.ion.Timestamp" name="UNKNOWN_OFFSET" signature="Ljava/lang/Integer;" isStatic="true" primary="true" role="FIELD_VALUE_OF">
-      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
         <Message>In Timestamp.java</Message>
       </SourceLine>
       <Message>Value loaded from field com.amazon.ion.Timestamp.UNKNOWN_OFFSET</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2157" end="2157" startBytecode="46" endBytecode="46" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[line 2157]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2171" end="2171" startBytecode="47" endBytecode="47" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[line 2171]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2165" end="2165" startBytecode="108" endBytecode="108" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[line 2165]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2179" end="2179" startBytecode="111" endBytecode="111" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[line 2179]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2173" end="2173" startBytecode="170" endBytecode="170" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[line 2173]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2187" end="2187" startBytecode="175" endBytecode="175" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[line 2187]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2191" end="2191" startBytecode="268" endBytecode="268" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[line 2191]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2205" end="2205" startBytecode="276" endBytecode="276" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[line 2205]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RC_REF_COMPARISON_BAD_PRACTICE" priority="2" rank="16" abbrev="RC" category="BAD_PRACTICE" instanceHash="937b7d8f7325c30807c0d31b0d3bdba7" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Suspicious reference comparison to constant</ShortMessage>
     <LongMessage>Suspicious comparison of a Integer reference to constant in com.amazon.ion.Timestamp.printZ(Appendable)</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2884]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="printZ" signature="(Ljava/lang/Appendable;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="2111" end="2132" startBytecode="0" endBytecode="30" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2125" end="2146" startBytecode="0" endBytecode="30" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.printZ(Appendable)</Message>
     </Method>
     <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.Integer" start="59" end="1825" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
-        <Message>At Integer.java:[lines 59-1825]</Message>
+      <SourceLine classname="java.lang.Integer" start="71" end="1872" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
+        <Message>At Integer.java:[lines 71-1872]</Message>
       </SourceLine>
       <Message>Actual type Integer</Message>
     </Type>
     <Field classname="com.amazon.ion.Timestamp" name="UNKNOWN_OFFSET" signature="Ljava/lang/Integer;" isStatic="true" primary="true" role="FIELD_VALUE_OF">
-      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
         <Message>In Timestamp.java</Message>
       </SourceLine>
       <Message>Value loaded from field com.amazon.ion.Timestamp.UNKNOWN_OFFSET</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2117" end="2117" startBytecode="61" endBytecode="61" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[line 2117]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2131" end="2131" startBytecode="61" endBytecode="61" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[line 2131]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RC_REF_COMPARISON_BAD_PRACTICE" priority="2" rank="16" abbrev="RC" category="BAD_PRACTICE" instanceHash="c185acf6bba0feadecfdd3085f6dc93b" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Suspicious reference comparison to constant</ShortMessage>
     <LongMessage>Suspicious comparison of a Integer reference to constant in com.amazon.ion.Timestamp.set_fields_from_calendar(Calendar, Timestamp$Precision, boolean)</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2884]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="set_fields_from_calendar" signature="(Ljava/util/Calendar;Lcom/amazon/ion/Timestamp$Precision;Z)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="380" end="438" startBytecode="0" endBytecode="130" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="382" end="440" startBytecode="0" endBytecode="130" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.set_fields_from_calendar(Calendar, Timestamp$Precision, boolean)</Message>
     </Method>
     <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.Integer" start="59" end="1825" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
-        <Message>At Integer.java:[lines 59-1825]</Message>
+      <SourceLine classname="java.lang.Integer" start="71" end="1872" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
+        <Message>At Integer.java:[lines 71-1872]</Message>
       </SourceLine>
       <Message>Actual type Integer</Message>
     </Type>
     <Field classname="com.amazon.ion.Timestamp" name="UNKNOWN_OFFSET" signature="Ljava/lang/Integer;" isStatic="true" primary="true" role="FIELD_VALUE_OF">
-      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
+      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
         <Message>In Timestamp.java</Message>
       </SourceLine>
       <Message>Value loaded from field com.amazon.ion.Timestamp.UNKNOWN_OFFSET</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="434" end="434" startBytecode="285" endBytecode="285" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[line 434]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="436" end="436" startBytecode="285" endBytecode="285" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[line 436]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="c2029a51b12e7834b0f8742d886d38c3" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer) where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer) comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2884]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="&lt;init&gt;" signature="(Ljava/math/BigDecimal;Lcom/amazon/ion/Timestamp$Precision;Ljava/lang/Integer;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="732" end="771" startBytecode="0" endBytecode="434" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="743" end="782" startBytecode="0" endBytecode="434" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="746" end="748" startBytecode="110" endBytecode="113" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[lines 746-748]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="757" end="759" startBytecode="110" endBytecode="113" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 757-759]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="748" end="750" startBytecode="115" endBytecode="118" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[lines 748-750]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="759" end="761" startBytecode="115" endBytecode="118" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 759-761]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="751" end="753" startBytecode="125" endBytecode="128" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[lines 751-753]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="762" end="764" startBytecode="125" endBytecode="128" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 762-764]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="74f8353cfe942e522c8de66a81285331" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.Timestamp.clearUnusedPrecision() where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.Timestamp.clearUnusedPrecision() comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2884]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="clearUnusedPrecision" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="2351" end="2364" startBytecode="0" endBytecode="157" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2365" end="2378" startBytecode="0" endBytecode="157" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.clearUnusedPrecision()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2353" end="2355" startBytecode="46" endBytecode="49" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[lines 2353-2355]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2367" end="2369" startBytecode="46" endBytecode="49" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 2367-2369]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2355" end="2357" startBytecode="51" endBytecode="54" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[lines 2355-2357]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2369" end="2371" startBytecode="51" endBytecode="54" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 2369-2371]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2358" end="2360" startBytecode="61" endBytecode="64" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[lines 2358-2360]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2372" end="2374" startBytecode="61" endBytecode="64" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 2372-2374]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="83ced4ac6513fc3047dd1da75d409bd2" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2884]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="&lt;init&gt;" signature="(Ljava/math/BigDecimal;Lcom/amazon/ion/Timestamp$Precision;Ljava/lang/Integer;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="732" end="771" startBytecode="0" endBytecode="434" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="743" end="782" startBytecode="0" endBytecode="434" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="743" end="753" startBytecode="70" endBytecode="132" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[lines 743-753]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="754" end="764" startBytecode="70" endBytecode="132" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 754-764]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="96331491fb00e3addee611d915a03efe" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.Timestamp.calendarValue() where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2884]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="calendarValue" signature="()Ljava/util/Calendar;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="1564" end="1597" startBytecode="0" endBytecode="351" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="1578" end="1611" startBytecode="0" endBytecode="351" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.calendarValue()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="1580" end="1593" startBytecode="87" endBytecode="166" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[lines 1580-1593]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="1594" end="1607" startBytecode="87" endBytecode="166" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 1594-1607]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="6da020549cddfb25863236aec8fd75ec" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.Timestamp.clearUnusedPrecision() where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2870" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2870]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 74-2884]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="clearUnusedPrecision" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="2351" end="2364" startBytecode="0" endBytecode="157" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2365" end="2378" startBytecode="0" endBytecode="157" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.clearUnusedPrecision()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2351" end="2361" startBytecode="11" endBytecode="73" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[lines 2351-2361]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2365" end="2375" startBytecode="11" endBytecode="73" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 2365-2375]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE" priority="1" rank="14" abbrev="CN" category="BAD_PRACTICE" instanceHash="48115647b6b96b3a00651b8a0648e649" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="580">
     <ShortMessage>Class defines clone() but doesn't implement Cloneable</ShortMessage>
     <LongMessage>com.amazon.ion.impl.BlockedBuffer defines clone() but doesn't implement Cloneable</LongMessage>
     <Class classname="com.amazon.ion.impl.BlockedBuffer" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="38" end="1041" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="38" end="1041" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>At BlockedBuffer.java:[lines 38-1041]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.BlockedBuffer</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.BlockedBuffer" name="clone" signature="()Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="173" end="196" startBytecode="0" endBytecode="443" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="173" end="196" startBytecode="0" endBytecode="443" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java"/>
       <Message>In method com.amazon.ion.impl.BlockedBuffer.clone()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="173" end="196" startBytecode="0" endBytecode="443" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java" synthetic="true">
+    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="173" end="196" startBytecode="0" endBytecode="443" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java" synthetic="true">
       <Message>At BlockedBuffer.java:[lines 173-196]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="OS_OPEN_STREAM" priority="2" rank="16" abbrev="OS" category="BAD_PRACTICE" instanceHash="2beb630b98529c2ec849305b3b9385cd" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Method may fail to close stream</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl.BlockedBuffer(InputStream) may fail to close stream</LongMessage>
+    <ShortMessage>La méthode peut ne pas fermer un flux</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl.BlockedBuffer(InputStream) peut ne pas fermer un flux</LongMessage>
     <Class classname="com.amazon.ion.impl.BlockedBuffer" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="38" end="1041" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="38" end="1041" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>At BlockedBuffer.java:[lines 38-1041]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.BlockedBuffer</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.BlockedBuffer" name="&lt;init&gt;" signature="(Ljava/io/InputStream;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="155" end="163" startBytecode="0" endBytecode="30" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="155" end="163" startBytecode="0" endBytecode="30" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java"/>
       <Message>In method new com.amazon.ion.impl.BlockedBuffer(InputStream)</Message>
     </Method>
     <Type descriptor="Ljava/io/OutputStream;" role="TYPE_CLOSEIT">
-      <SourceLine classname="java.io.OutputStream" start="48" end="193" sourcefile="OutputStream.java" sourcepath="java/io/OutputStream.java">
-        <Message>At OutputStream.java:[lines 48-193]</Message>
+      <SourceLine classname="java.io.OutputStream" start="52" end="198" sourcefile="OutputStream.java" sourcepath="java/io/OutputStream.java">
+        <Message>At OutputStream.java:[lines 52-198]</Message>
       </SourceLine>
       <Message>Need to close java.io.OutputStream </Message>
     </Type>
-    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" primary="true" start="156" end="156" startBytecode="32" endBytecode="32" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" primary="true" start="156" end="156" startBytecode="32" endBytecode="32" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
       <Message>At BlockedBuffer.java:[line 156]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="49ae3f2aff89fca77ece8f5b6b1d8e1d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer) may expose internal representation by storing an externally mutable object into BlockedBuffer$BlockedByteOutputStream._buf</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream._buf</LongMessage>
     <Class classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1310" end="1656" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1310" end="1656" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>At BlockedBuffer.java:[lines 1310-1656]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/BlockedBuffer;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1333" end="1337" startBytecode="0" endBytecode="93" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1333" end="1337" startBytecode="0" endBytecode="93" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java"/>
       <Message>In method new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" name="_buf" signature="Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>In BlockedBuffer.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream._buf</Message>
@@ -309,25 +309,25 @@
     <LocalVariable name="bb" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named bb</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true" start="1334" end="1334" startBytecode="6" endBytecode="6" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true" start="1334" end="1334" startBytecode="6" endBytecode="6" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
       <Message>At BlockedBuffer.java:[line 1334]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="d862968857053de2e52f028d75db8af3" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer, int) may expose internal representation by storing an externally mutable object into BlockedBuffer$BlockedByteOutputStream._buf</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer, int) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream._buf</LongMessage>
     <Class classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1310" end="1656" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1310" end="1656" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>At BlockedBuffer.java:[lines 1310-1656]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/BlockedBuffer;I)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1345" end="1352" startBytecode="0" endBytecode="158" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1345" end="1352" startBytecode="0" endBytecode="158" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java"/>
       <Message>In method new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer, int)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" name="_buf" signature="Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>In BlockedBuffer.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream._buf</Message>
@@ -335,25 +335,25 @@
     <LocalVariable name="bb" register="1" pc="30" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named bb</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true" start="1349" end="1349" startBytecode="30" endBytecode="30" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true" start="1349" end="1349" startBytecode="30" endBytecode="30" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
       <Message>At BlockedBuffer.java:[line 1349]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="7df0b5cbb977df79b8ff3750bbd5a37d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream(BlockedBuffer) may expose internal representation by storing an externally mutable object into BlockedBuffer$BufferedOutputStream._buffer</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream(BlockedBuffer) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream._buffer</LongMessage>
     <Class classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" start="1674" end="1776" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" start="1674" end="1776" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>At BlockedBuffer.java:[lines 1674-1776]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/BlockedBuffer;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" start="1676" end="1679" startBytecode="0" endBytecode="88" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" start="1676" end="1679" startBytecode="0" endBytecode="88" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java"/>
       <Message>In method new com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream(BlockedBuffer)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" name="_buffer" signature="Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>In BlockedBuffer.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream._buffer</Message>
@@ -361,7 +361,7 @@
     <LocalVariable name="buffer" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named buffer</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" primary="true" start="1677" end="1677" startBytecode="6" endBytecode="6" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/com/amazon/ion/impl/BlockedBuffer.java">
+    <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" primary="true" start="1677" end="1677" startBytecode="6" endBytecode="6" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
       <Message>At BlockedBuffer.java:[line 1677]</Message>
     </SourceLine>
   </BugInstance>
@@ -369,16 +369,16 @@
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonBinary.lenInt(BigInteger, boolean) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 42-940]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary" name="lenInt" signature="(Ljava/math/BigInteger;Z)I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="535" end="548" startBytecode="0" endBytecode="181" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="535" end="548" startBytecode="0" endBytecode="181" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary.lenInt(BigInteger, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="538" end="544" startBytecode="16" endBytecode="65" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="538" end="544" startBytecode="16" endBytecode="65" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[lines 538-544]</Message>
     </SourceLine>
   </BugInstance>
@@ -386,22 +386,22 @@
     <ShortMessage>Condition has no effect</ShortMessage>
     <LongMessage>Useless condition: it's known that longVal != Long.MIN_VALUE at this point</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 42-940]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary" name="lenInt" signature="(J)I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="518" end="530" startBytecode="0" endBytecode="206" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="518" end="530" startBytecode="0" endBytecode="206" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary.lenInt(long)</Message>
     </Method>
     <String value="longVal != Long.MIN_VALUE">
       <Message>Value longVal != Long.MIN_VALUE</Message>
     </String>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary" start="529" end="529" startBytecode="97" endBytecode="97" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java" role="SOURCE_UNREACHABLE_CODE">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" start="529" end="529" startBytecode="97" endBytecode="97" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java" role="SOURCE_UNREACHABLE_CODE">
       <Message>Unreachable code at IonBinary.java:[line 529]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="529" end="529" startBytecode="94" endBytecode="94" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="529" end="529" startBytecode="94" endBytecode="94" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 529]</Message>
     </SourceLine>
   </BugInstance>
@@ -409,22 +409,22 @@
     <ShortMessage>Condition has no effect</ShortMessage>
     <LongMessage>Useless condition: it's known that longVal &gt;= 0 at this point</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 42-940]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary" name="lenInt" signature="(J)I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="518" end="530" startBytecode="0" endBytecode="206" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="518" end="530" startBytecode="0" endBytecode="206" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary.lenInt(long)</Message>
     </Method>
     <String value="longVal &gt;= 0">
       <Message>Value longVal &gt;= 0</Message>
     </String>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary" start="521" end="521" startBytecode="14" endBytecode="14" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java" role="SOURCE_UNREACHABLE_CODE">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" start="521" end="521" startBytecode="14" endBytecode="14" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java" role="SOURCE_UNREACHABLE_CODE">
       <Message>Unreachable code at IonBinary.java:[line 521]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="521" end="521" startBytecode="11" endBytecode="11" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="521" end="521" startBytecode="11" endBytecode="11" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 521]</Message>
     </SourceLine>
   </BugInstance>
@@ -432,13 +432,13 @@
     <ShortMessage>Condition has no effect due to the variable type</ShortMessage>
     <LongMessage>Useless condition: it's always longVal &gt;= Long.MIN_VALUE because variable type is long</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="42" end="940" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 42-940]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary" name="lenVarUInt" signature="(J)I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="445" end="455" startBytecode="0" endBytecode="216" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary" start="445" end="455" startBytecode="0" endBytecode="216" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary.lenVarUInt(long)</Message>
     </Method>
     <String value="longVal &gt;= Long.MIN_VALUE">
@@ -447,10 +447,10 @@
     <Type descriptor="J">
       <Message>Type long</Message>
     </Type>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary" start="454" end="454" startBytecode="111" endBytecode="111" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java" role="SOURCE_UNREACHABLE_CODE">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" start="454" end="454" startBytecode="111" endBytecode="111" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java" role="SOURCE_UNREACHABLE_CODE">
       <Message>Unreachable code at IonBinary.java:[line 454]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="454" end="454" startBytecode="108" endBytecode="108" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary" primary="true" start="454" end="454" startBytecode="108" endBytecode="108" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 454]</Message>
     </SourceLine>
   </BugInstance>
@@ -458,195 +458,195 @@
     <ShortMessage>Class defines clone() but doesn't implement Cloneable</ShortMessage>
     <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager defines clone() but doesn't implement Cloneable</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="clone" signature="()Lcom/amazon/ion/impl/IonBinary$BufferManager;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="396" end="398" startBytecode="0" endBytecode="88" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="396" end="398" startBytecode="0" endBytecode="88" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.clone()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="396" end="398" startBytecode="0" endBytecode="88" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java" synthetic="true">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="396" end="398" startBytecode="0" endBytecode="88" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java" synthetic="true">
       <Message>At IonBinary.java:[lines 396-398]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="7a2dfc422120143b681c7f39bd32798c" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.buffer() may expose internal representation by returning IonBinary$BufferManager._buf</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.buffer() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._buf</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="buffer" signature="()Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="414" end="414" startBytecode="0" endBytecode="46" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="414" end="414" startBytecode="0" endBytecode="46" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.buffer()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_buf" signature="Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>In IonBinary.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._buf</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="414" end="414" startBytecode="4" endBytecode="4" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="414" end="414" startBytecode="4" endBytecode="4" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 414]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="bb5993199b143728b278261ec17b72f2" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.openReader() may expose internal representation by returning IonBinary$BufferManager._reader</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.openReader() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._reader</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="openReader" signature="()Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="402" end="405" startBytecode="0" endBytecode="85" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="402" end="405" startBytecode="0" endBytecode="85" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.openReader()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_reader" signature="Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>In IonBinary.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._reader</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="405" end="405" startBytecode="26" endBytecode="26" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="405" end="405" startBytecode="26" endBytecode="26" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 405]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="13a1cd7af738123e4c2e7d41e42da55f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.openWriter() may expose internal representation by returning IonBinary$BufferManager._writer</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.openWriter() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._writer</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="openWriter" signature="()Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="408" end="411" startBytecode="0" endBytecode="85" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="408" end="411" startBytecode="0" endBytecode="85" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.openWriter()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_writer" signature="Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>In IonBinary.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._writer</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="411" end="411" startBytecode="26" endBytecode="26" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="411" end="411" startBytecode="26" endBytecode="26" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 411]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="e23a2c4995e81e2f50e116d22b11817" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.reader() may expose internal representation by returning IonBinary$BufferManager._reader</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.reader() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._reader</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="reader" signature="()Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="415" end="415" startBytecode="0" endBytecode="46" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="415" end="415" startBytecode="0" endBytecode="46" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.reader()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_reader" signature="Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>In IonBinary.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._reader</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="415" end="415" startBytecode="4" endBytecode="4" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="415" end="415" startBytecode="4" endBytecode="4" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 415]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="33ce07038be68a0b32e72494c0b0779d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.reader(int) may expose internal representation by returning IonBinary$BufferManager._reader</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.reader(int) risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._reader</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="reader" signature="(I)Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="420" end="421" startBytecode="0" endBytecode="69" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="420" end="421" startBytecode="0" endBytecode="69" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.reader(int)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_reader" signature="Lcom/amazon/ion/impl/IonBinary$Reader;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>In IonBinary.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._reader</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="421" end="421" startBytecode="13" endBytecode="13" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="421" end="421" startBytecode="13" endBytecode="13" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 421]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="ce9dc2b4001e503cbc79f5cd18a70d87" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.writer() may expose internal representation by returning IonBinary$BufferManager._writer</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.writer() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._writer</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="writer" signature="()Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="416" end="416" startBytecode="0" endBytecode="46" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="416" end="416" startBytecode="0" endBytecode="46" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.writer()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_writer" signature="Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>In IonBinary.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._writer</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="416" end="416" startBytecode="4" endBytecode="4" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="416" end="416" startBytecode="4" endBytecode="4" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 416]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="3f96230ef763752c8cd65017112683aa" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.writer(int) may expose internal representation by returning IonBinary$BufferManager._writer</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.writer(int) risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._writer</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="writer" signature="(I)Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="425" end="426" startBytecode="0" endBytecode="69" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="425" end="426" startBytecode="0" endBytecode="69" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$BufferManager.writer(int)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_writer" signature="Lcom/amazon/ion/impl/IonBinary$Writer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>In IonBinary.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._writer</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="426" end="426" startBytecode="13" endBytecode="13" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="426" end="426" startBytecode="13" endBytecode="13" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 426]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="cb558f16e9df13958572ae691116db56" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl.IonBinary$BufferManager(BlockedBuffer) may expose internal representation by storing an externally mutable object into IonBinary$BufferManager._buf</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl.IonBinary$BufferManager(BlockedBuffer) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.IonBinary$BufferManager._buf</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$BufferManager</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$BufferManager" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/BlockedBuffer;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="333" end="337" startBytecode="0" endBytecode="87" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="333" end="337" startBytecode="0" endBytecode="87" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method new com.amazon.ion.impl.IonBinary$BufferManager(BlockedBuffer)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.IonBinary$BufferManager" name="_buf" signature="Lcom/amazon/ion/impl/BlockedBuffer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>In IonBinary.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.IonBinary$BufferManager._buf</Message>
@@ -654,52 +654,24 @@
     <LocalVariable name="buf" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named buf</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="334" end="334" startBytecode="6" endBytecode="6" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true" start="334" end="334" startBytecode="6" endBytecode="6" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 334]</Message>
     </SourceLine>
   </BugInstance>
-  <BugInstance type="DM_NUMBER_CTOR" priority="2" rank="18" abbrev="Bx" category="PERFORMANCE" instanceHash="388801c49e11ff5a202ec9542929bad" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Method invokes inefficient Number constructor; use static valueOf instead</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.IonBinary$Reader.readVarIntWithNegativeZero() invokes inefficient new Integer(int) constructor; use Integer.valueOf(int) instead</LongMessage>
-    <Class classname="com.amazon.ion.impl.IonBinary$Reader" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
-        <Message>At IonBinary.java:[lines 942-1815]</Message>
-      </SourceLine>
-      <Message>In class com.amazon.ion.impl.IonBinary$Reader</Message>
-    </Class>
-    <Method classname="com.amazon.ion.impl.IonBinary$Reader" name="readVarIntWithNegativeZero" signature="()Ljava/lang/Integer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1475" end="1525" startBytecode="0" endBytecode="468" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
-      <Message>In method com.amazon.ion.impl.IonBinary$Reader.readVarIntWithNegativeZero()</Message>
-    </Method>
-    <Method classname="java.lang.Integer" name="&lt;init&gt;" signature="(I)V" isStatic="false" role="METHOD_CALLED">
-      <SourceLine classname="java.lang.Integer" start="1082" end="1084" startBytecode="0" endBytecode="69" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
-      <Message>Called method new Integer(int)</Message>
-    </Method>
-    <Method classname="java.lang.Integer" name="valueOf" signature="(I)Ljava/lang/Integer;" isStatic="true" role="SHOULD_CALL">
-      <SourceLine classname="java.lang.Integer" start="1057" end="1059" startBytecode="0" endBytecode="90" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
-      <Message>Should call Integer.valueOf(int) instead</Message>
-    </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" primary="true" start="1519" end="1519" startBytecode="227" endBytecode="227" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
-      <Message>At IonBinary.java:[line 1519]</Message>
-    </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1523" end="1523" startBytecode="240" endBytecode="240" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at IonBinary.java:[line 1523]</Message>
-    </SourceLine>
-  </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="9748c6aaf34a4d74620a1ec326f0f096" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonBinary$Reader.readIntAsInt(int) where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.IonBinary$Reader.readIntAsInt(int) comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$Reader" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 942-1815]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$Reader</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$Reader" name="readIntAsInt" signature="(I)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1218" end="1250" startBytecode="0" endBytecode="345" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1218" end="1250" startBytecode="0" endBytecode="345" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$Reader.readIntAsInt(int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" primary="true" start="1237" end="1239" startBytecode="115" endBytecode="116" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" primary="true" start="1237" end="1239" startBytecode="115" endBytecode="116" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[lines 1237-1239]</Message>
     </SourceLine>
   </BugInstance>
@@ -707,16 +679,16 @@
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonBinary$Reader.readIntAsInt(int) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$Reader" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 942-1815]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$Reader</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$Reader" name="readIntAsInt" signature="(I)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1218" end="1250" startBytecode="0" endBytecode="345" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1218" end="1250" startBytecode="0" endBytecode="345" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$Reader.readIntAsInt(int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" primary="true" start="1229" end="1243" startBytecode="47" endBytecode="159" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" primary="true" start="1229" end="1243" startBytecode="47" endBytecode="159" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[lines 1229-1243]</Message>
     </SourceLine>
   </BugInstance>
@@ -724,30 +696,30 @@
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonBinary$Reader.readIntAsLong(int) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$Reader" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 942-1815]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$Reader</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$Reader" name="readIntAsLong" signature="(I)J" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1167" end="1212" startBytecode="0" endBytecode="508" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="1167" end="1212" startBytecode="0" endBytecode="508" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$Reader.readIntAsLong(int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" primary="true" start="1177" end="1204" startBytecode="49" endBytecode="279" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" primary="true" start="1177" end="1204" startBytecode="49" endBytecode="279" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[lines 1177-1204]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="BIT_AND" priority="1" rank="5" abbrev="BIT" category="CORRECTNESS" instanceHash="489579953b9cb45b99949c6c8254098f" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Incompatible bit masks</ShortMessage>
-    <LongMessage>Incompatible bit masks in (e &amp; 0x80 == 0x40) yields a constant result in com.amazon.ion.impl.IonBinary$Writer.writeIntValue(long)</LongMessage>
+    <ShortMessage>Masques binaires incompatibles</ShortMessage>
+    <LongMessage>Des masques binaires incompatibles renvoient un résultat constant dans com.amazon.ion.impl.IonBinary$Writer.writeIntValue(long)</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$Writer" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$Writer" start="1819" end="2917" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Writer" start="1819" end="2917" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 1819-2917]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonBinary$Writer</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonBinary$Writer" name="writeIntValue" signature="(J)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonBinary$Writer" start="2422" end="2443" startBytecode="0" endBytecode="277" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonBinary$Writer" start="2422" end="2443" startBytecode="0" endBytecode="277" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonBinary$Writer.writeIntValue(long)</Message>
     </Method>
     <String value="0x80">
@@ -756,396 +728,343 @@
     <String value="0x40">
       <Message>Value 0x40</Message>
     </String>
-    <SourceLine classname="com.amazon.ion.impl.IonBinary$Writer" primary="true" start="2433" end="2433" startBytecode="69" endBytecode="69" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/com/amazon/ion/impl/IonBinary.java">
+    <SourceLine classname="com.amazon.ion.impl.IonBinary$Writer" primary="true" start="2433" end="2433" startBytecode="69" endBytecode="69" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
       <Message>At IonBinary.java:[line 2433]</Message>
     </SourceLine>
   </BugInstance>
-  <BugInstance type="IT_NO_SUCH_ELEMENT" priority="2" rank="16" abbrev="It" category="BAD_PRACTICE" instanceHash="91c1d0791b8d7dac1944ff029e517a2f" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Iterator next() method cannot throw NoSuchElementException</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.IonReaderBinaryIncremental$2.next() cannot throw NoSuchElementException</LongMessage>
-    <Class classname="com.amazon.ion.impl.IonReaderBinaryIncremental$2" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryIncremental$2" start="1846" end="1860" sourcefile="IonReaderBinaryIncremental.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryIncremental.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryIncremental.java">
-        <Message>At IonReaderBinaryIncremental.java:[lines 1846-1860]</Message>
-      </SourceLine>
-      <Message>In class com.amazon.ion.impl.IonReaderBinaryIncremental$2</Message>
-    </Class>
-    <Method classname="com.amazon.ion.impl.IonReaderBinaryIncremental$2" name="next" signature="()Ljava/lang/String;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryIncremental$2" start="1855" end="1855" startBytecode="0" endBytecode="43" sourcefile="IonReaderBinaryIncremental.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryIncremental.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryIncremental.java"/>
-      <Message>In method com.amazon.ion.impl.IonReaderBinaryIncremental$2.next()</Message>
-    </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryIncremental$2" start="1855" end="1855" startBytecode="0" endBytecode="43" sourcefile="IonReaderBinaryIncremental.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryIncremental.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryIncremental.java" synthetic="true">
-      <Message>At IonReaderBinaryIncremental.java:[line 1855]</Message>
-    </SourceLine>
-  </BugInstance>
-  <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="39cabc5dbc8ca25a27f2639c1305ab0f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderBinaryRawX.has_next_helper_raw() where one case falls through to the next case</LongMessage>
-    <Class classname="com.amazon.ion.impl.IonReaderBinaryRawX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryRawX" start="55" end="1354" sourcefile="IonReaderBinaryRawX.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryRawX.java">
-        <Message>At IonReaderBinaryRawX.java:[lines 55-1354]</Message>
-      </SourceLine>
-      <Message>In class com.amazon.ion.impl.IonReaderBinaryRawX</Message>
-    </Class>
-    <Method classname="com.amazon.ion.impl.IonReaderBinaryRawX" name="has_next_helper_raw" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryRawX" start="258" end="345" startBytecode="0" endBytecode="710" sourcefile="IonReaderBinaryRawX.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryRawX.java"/>
-      <Message>In method com.amazon.ion.impl.IonReaderBinaryRawX.has_next_helper_raw()</Message>
-    </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderBinaryRawX" primary="true" start="327" end="330" startBytecode="354" endBytecode="357" sourcefile="IonReaderBinaryRawX.java" sourcepath="com/amazon/ion/impl/IonReaderBinaryRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderBinaryRawX.java">
-      <Message>At IonReaderBinaryRawX.java:[lines 327-330]</Message>
-    </SourceLine>
-  </BugInstance>
-  <BugInstance type="URF_UNREAD_FIELD" priority="2" rank="18" abbrev="UrF" category="PERFORMANCE" instanceHash="5dee2f4eb7ae9b82ef90087df5982dfa" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Unread field</ShortMessage>
-    <LongMessage>Unread field: com.amazon.ion.impl.IonReaderLookaheadBuffer.currentNumberOfAnnotations</LongMessage>
-    <Class classname="com.amazon.ion.impl.IonReaderLookaheadBuffer" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderLookaheadBuffer" start="22" end="956" sourcefile="IonReaderLookaheadBuffer.java" sourcepath="com/amazon/ion/impl/IonReaderLookaheadBuffer.java" relSourcepath="src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java">
-        <Message>At IonReaderLookaheadBuffer.java:[lines 22-956]</Message>
-      </SourceLine>
-      <Message>In class com.amazon.ion.impl.IonReaderLookaheadBuffer</Message>
-    </Class>
-    <Field classname="com.amazon.ion.impl.IonReaderLookaheadBuffer" name="currentNumberOfAnnotations" signature="J" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderLookaheadBuffer" sourcefile="IonReaderLookaheadBuffer.java" sourcepath="com/amazon/ion/impl/IonReaderLookaheadBuffer.java" relSourcepath="src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java">
-        <Message>In IonReaderLookaheadBuffer.java</Message>
-      </SourceLine>
-      <Message>Field com.amazon.ion.impl.IonReaderLookaheadBuffer.currentNumberOfAnnotations</Message>
-    </Field>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderLookaheadBuffer" primary="true" start="285" end="285" startBytecode="17" endBytecode="17" sourcefile="IonReaderLookaheadBuffer.java" sourcepath="com/amazon/ion/impl/IonReaderLookaheadBuffer.java" relSourcepath="src/com/amazon/ion/impl/IonReaderLookaheadBuffer.java">
-      <Message>At IonReaderLookaheadBuffer.java:[line 285]</Message>
-    </SourceLine>
-  </BugInstance>
   <BugInstance type="SBSC_USE_STRINGBUFFER_CONCATENATION" priority="2" rank="18" abbrev="SBSC" category="PERFORMANCE" instanceHash="1983f5982865e6bca7fcbab80f84c0eb" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Method concatenates strings using + in a loop</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.IonReaderTextRawTokensX.peekNullTypeSymbolUndo(int[], int) concatenates strings using + in a loop</LongMessage>
+    <ShortMessage>La méthode concatène des chaînes au moyen de + en boucle</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.IonReaderTextRawTokensX.peekNullTypeSymbolUndo(int[], int) concatène des chaînes au moyen de + en boucle</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="peekNullTypeSymbolUndo" signature="([II)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="421" end="429" startBytecode="0" endBytecode="186" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="426" end="434" startBytecode="0" endBytecode="186" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.peekNullTypeSymbolUndo(int[], int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="424" end="424" startBytecode="12" endBytecode="12" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[line 424]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="429" end="429" startBytecode="12" endBytecode="12" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 429]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="7ac13daf00bed04a0dc687024ba3a5c3" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.load_double_quoted_string(StringBuilder, boolean) where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.load_double_quoted_string(StringBuilder, boolean) comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="load_double_quoted_string" signature="(Ljava/lang/StringBuilder;Z)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2020" end="2061" startBytecode="0" endBytecode="388" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2038" end="2079" startBytecode="0" endBytecode="388" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.load_double_quoted_string(StringBuilder, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2039" end="2041" startBytecode="115" endBytecode="118" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2039-2041]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2057" end="2059" startBytecode="115" endBytecode="118" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2057-2059]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="e71ff3699310d9d02654e42aa19f1ea7" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.load_fixed_digits(StringBuilder, int) where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.load_fixed_digits(StringBuilder, int) comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="load_fixed_digits" signature="(Ljava/lang/StringBuilder;I)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1695" end="1726" startBytecode="0" endBytecode="388" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1713" end="1744" startBytecode="0" endBytecode="388" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.load_fixed_digits(StringBuilder, int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1707" end="1710" startBytecode="90" endBytecode="91" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 1707-1710]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1725" end="1728" startBytecode="90" endBytecode="91" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1725-1728]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1712" end="1715" startBytecode="114" endBytecode="115" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 1712-1715]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1730" end="1733" startBytecode="114" endBytecode="115" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 1730-1733]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1717" end="1720" startBytecode="138" endBytecode="139" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 1717-1720]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1735" end="1738" startBytecode="138" endBytecode="139" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 1735-1738]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="aa3a0c04d8e812b2cc9b8e968316999c" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.load_single_quoted_string(StringBuilder, boolean) where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.load_single_quoted_string(StringBuilder, boolean) comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="load_single_quoted_string" signature="(Ljava/lang/StringBuilder;Z)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1936" end="1982" startBytecode="0" endBytecode="421" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1954" end="2000" startBytecode="0" endBytecode="421" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.load_single_quoted_string(StringBuilder, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1955" end="1959" startBytecode="115" endBytecode="118" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 1955-1959]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1973" end="1977" startBytecode="115" endBytecode="118" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1973-1977]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="52a2b4795d02a2af4518de7c8fc46346" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_byte_helper() where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_byte_helper() comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_base64_byte_helper" signature="()I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2539" end="2571" startBytecode="0" endBytecode="439" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2557" end="2589" startBytecode="0" endBytecode="441" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_byte_helper()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2561" end="2564" startBytecode="146" endBytecode="149" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2561-2564]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2579" end="2582" startBytecode="148" endBytecode="151" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2579-2582]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2565" end="2568" startBytecode="172" endBytecode="175" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 2565-2568]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2583" end="2586" startBytecode="174" endBytecode="177" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 2583-2586]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="a8ea82c1e5d992dab6cd75d14f2a8a05" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper() where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper() comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_double_quoted_string_helper" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1998" end="2011" startBytecode="0" endBytecode="178" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2016" end="2029" startBytecode="0" endBytecode="178" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2001" end="2006" startBytecode="69" endBytecode="72" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2001-2006]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2019" end="2024" startBytecode="69" endBytecode="72" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2019-2024]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2006" end="2008" startBytecode="74" endBytecode="77" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 2006-2008]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2024" end="2026" startBytecode="74" endBytecode="77" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 2024-2026]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="d1e587d656a8337e9067d0cf2b73a976" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_over_container(int) where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.skip_over_container(int) comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_over_container" signature="(I)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1208" end="1280" startBytecode="0" endBytecode="539" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1213" end="1298" startBytecode="0" endBytecode="637" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_over_container(int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1215" end="1219" startBytecode="121" endBytecode="124" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 1215-1219]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1225" end="1229" startBytecode="129" endBytecode="132" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1225-1229]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="a4a066a68adf31d418a174990aefe0b1" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint) where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint) comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_single_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1917" end="1927" startBytecode="0" endBytecode="176" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1935" end="1945" startBytecode="0" endBytecode="176" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1919" end="1921" startBytecode="45" endBytecode="48" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 1919-1921]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1937" end="1939" startBytecode="45" endBytecode="48" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1937-1939]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="ee5b2dc71707fd11c5c55336b3872f2a" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy) where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy) comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_triple_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;Lcom/amazon/ion/impl/IonReaderTextRawTokensX$CommentStrategy;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2134" end="2159" startBytecode="0" endBytecode="261" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2152" end="2177" startBytecode="0" endBytecode="261" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2137" end="2139" startBytecode="41" endBytecode="44" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2137-2139]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2155" end="2157" startBytecode="41" endBytecode="44" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2155-2157]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="75b268bc0bf180f5e16e86d8d89d390d" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.read_escaped_char_content_helper(int, boolean) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_escaped_char_content_helper" signature="(IZ)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2455" end="2494" startBytecode="0" endBytecode="363" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2473" end="2512" startBytecode="0" endBytecode="365" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_escaped_char_content_helper(int, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2472" end="2491" startBytecode="64" endBytecode="185" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2472-2491]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2490" end="2509" startBytecode="64" endBytecode="187" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2490-2509]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="fca794c841dd591a8aa91960632076fc" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_block_comment() where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_block_comment" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="934" end="950" startBytecode="0" endBytecode="152" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="939" end="955" startBytecode="0" endBytecode="152" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_block_comment()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="935" end="948" startBytecode="6" endBytecode="57" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 935-948]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="940" end="953" startBytecode="6" endBytecode="57" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 940-953]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="567161b456e11f066d8b9bfff637442b" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper() where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_double_quoted_string_helper" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1998" end="2011" startBytecode="0" endBytecode="178" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2016" end="2029" startBytecode="0" endBytecode="178" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1999" end="2010" startBytecode="9" endBytecode="82" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 1999-2010]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2017" end="2028" startBytecode="9" endBytecode="82" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2017-2028]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="4cf1c4e0aa4e006bf568be9fbda9762b" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_single_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1917" end="1927" startBytecode="0" endBytecode="176" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1935" end="1945" startBytecode="0" endBytecode="176" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1918" end="1926" startBytecode="9" endBytecode="66" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 1918-1926]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1936" end="1944" startBytecode="9" endBytecode="66" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1936-1944]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="d014b15325fcb8575d20785aba624041" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_triple_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;Lcom/amazon/ion/impl/IonReaderTextRawTokensX$CommentStrategy;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2134" end="2159" startBytecode="0" endBytecode="261" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2152" end="2177" startBytecode="0" endBytecode="261" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2135" end="2158" startBytecode="6" endBytecode="108" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2135-2158]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2153" end="2176" startBytecode="6" endBytecode="108" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2153-2176]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="8e9d13a407c4f6bac4e762a72e9ba7b3" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Condition has no effect</ShortMessage>
     <LongMessage>Useless condition: it's known that c != -1 at this point</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_base64_getchar_helper" signature="(I)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2574" end="2582" startBytecode="0" endBytecode="141" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2592" end="2600" startBytecode="0" endBytecode="142" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_getchar_helper(int)</Message>
     </Method>
     <String value="c != -1">
       <Message>Value c != -1</Message>
     </String>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2577" end="2577" startBytecode="36" endBytecode="36" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
-      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2577]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2595" end="2595" startBytecode="36" endBytecode="36" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2595]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2576" end="2576" startBytecode="27" endBytecode="27" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[line 2576]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2594" end="2594" startBytecode="27" endBytecode="27" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 2594]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="60de97d50a6ac53097856cdc7425614c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Condition has no effect</ShortMessage>
     <LongMessage>Useless condition: it's known that c != 125 ('}') at this point</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_base64_getchar_helper" signature="(I)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2574" end="2582" startBytecode="0" endBytecode="141" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2592" end="2600" startBytecode="0" endBytecode="142" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_getchar_helper(int)</Message>
     </Method>
     <String value="c != 125 ('}')">
       <Message>Value c != 125 ('}')</Message>
     </String>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2577" end="2577" startBytecode="36" endBytecode="36" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
-      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2577]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2595" end="2595" startBytecode="36" endBytecode="36" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2595]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2576" end="2576" startBytecode="33" endBytecode="33" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[line 2576]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2594" end="2594" startBytecode="33" endBytecode="33" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 2594]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="ac257771a68961d6170b90e54af30e64" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Condition has no effect</ShortMessage>
     <LongMessage>Useless condition: it's known that len &lt;= 0 at this point</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="65" end="2897" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 65-2897]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_hex_escape_sequence_value" signature="(I)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2498" end="2515" startBytecode="0" endBytecode="255" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2516" end="2533" startBytecode="0" endBytecode="257" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_hex_escape_sequence_value(int)</Message>
     </Method>
     <String value="len &lt;= 0">
       <Message>Value len &lt;= 0</Message>
     </String>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2510" end="2510" startBytecode="49" endBytecode="49" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
-      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2510]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2528" end="2528" startBytecode="49" endBytecode="49" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2528]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2509" end="2509" startBytecode="46" endBytecode="46" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[line 2509]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2527" end="2527" startBytecode="46" endBytecode="46" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 2527]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="63520ea30e12c2314c00f268931e030a" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawX.parseSymbolToken(String, StringBuilder, int) where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawX.parseSymbolToken(String, StringBuilder, int) comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" start="72" end="1440" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawX.java">
-        <Message>At IonReaderTextRawX.java:[lines 72-1440]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" start="72" end="1446" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java">
+        <Message>At IonReaderTextRawX.java:[lines 72-1446]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawX" name="parseSymbolToken" signature="(Ljava/lang/String;Ljava/lang/StringBuilder;I)Lcom/amazon/ion/SymbolToken;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" start="745" end="772" startBytecode="0" endBytecode="406" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" start="745" end="772" startBytecode="0" endBytecode="408" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawX.parseSymbolToken(String, StringBuilder, int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" primary="true" start="756" end="758" startBytecode="104" endBytecode="107" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/com/amazon/ion/impl/IonReaderTextRawX.java">
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" primary="true" start="756" end="758" startBytecode="106" endBytecode="109" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java">
       <Message>At IonReaderTextRawX.java:[lines 756-758]</Message>
     </SourceLine>
   </BugInstance>
@@ -1153,22 +1072,22 @@
     <ShortMessage>Condition has no effect</ShortMessage>
     <LongMessage>Useless condition: it's known that c &gt;= 65535 (0xffff) at this point</LongMessage>
     <Class classname="com.amazon.ion.impl.IonTokenConstsX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="27" end="951" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="27" end="951" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenConstsX.java">
         <Message>At IonTokenConstsX.java:[lines 27-951]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonTokenConstsX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonTokenConstsX" name="escapeSequence" signature="(I)Ljava/lang/String;" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="388" end="409" startBytecode="0" endBytecode="322" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="388" end="409" startBytecode="0" endBytecode="322" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenConstsX.java"/>
       <Message>In method com.amazon.ion.impl.IonTokenConstsX.escapeSequence(int)</Message>
     </Method>
     <String value="c &gt;= 65535 (0xffff)">
       <Message>Value c &gt;= 65535 (0xffff)</Message>
     </String>
-    <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="401" end="401" startBytecode="77" endBytecode="77" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java" role="SOURCE_UNREACHABLE_CODE">
+    <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="401" end="401" startBytecode="77" endBytecode="77" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenConstsX.java" role="SOURCE_UNREACHABLE_CODE">
       <Message>Unreachable code at IonTokenConstsX.java:[line 401]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" primary="true" start="400" end="400" startBytecode="74" endBytecode="74" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java">
+    <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" primary="true" start="400" end="400" startBytecode="74" endBytecode="74" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenConstsX.java">
       <Message>At IonTokenConstsX.java:[line 400]</Message>
     </SourceLine>
   </BugInstance>
@@ -1176,39 +1095,39 @@
     <ShortMessage>Condition has no effect</ShortMessage>
     <LongMessage>Useless condition: it's known that c &lt;= 1114111 (0x10ffff) at this point</LongMessage>
     <Class classname="com.amazon.ion.impl.IonTokenConstsX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="27" end="951" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="27" end="951" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenConstsX.java">
         <Message>At IonTokenConstsX.java:[lines 27-951]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonTokenConstsX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonTokenConstsX" name="escapeSequence" signature="(I)Ljava/lang/String;" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="388" end="409" startBytecode="0" endBytecode="322" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" start="388" end="409" startBytecode="0" endBytecode="322" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenConstsX.java"/>
       <Message>In method com.amazon.ion.impl.IonTokenConstsX.escapeSequence(int)</Message>
     </Method>
     <String value="c &lt;= 1114111 (0x10ffff)">
       <Message>Value c &lt;= 1114111 (0x10ffff)</Message>
     </String>
-    <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" primary="true" start="388" end="388" startBytecode="7" endBytecode="7" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/com/amazon/ion/impl/IonTokenConstsX.java">
+    <SourceLine classname="com.amazon.ion.impl.IonTokenConstsX" primary="true" start="388" end="388" startBytecode="7" endBytecode="7" sourcefile="IonTokenConstsX.java" sourcepath="com/amazon/ion/impl/IonTokenConstsX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenConstsX.java">
       <Message>At IonTokenConstsX.java:[line 388]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="2a3aa1c1ca170777e5487dcfe23af64b" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.IonTokenReader.readEscapedCharacter(PushbackReader, boolean) where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.IonTokenReader.readEscapedCharacter(PushbackReader, boolean) comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.IonTokenReader" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="41" end="1620" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="41" end="1620" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
         <Message>At IonTokenReader.java:[lines 41-1620]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonTokenReader</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonTokenReader" name="readEscapedCharacter" signature="(Ljava/io/PushbackReader;Z)I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="1134" end="1197" startBytecode="0" endBytecode="745" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="1134" end="1197" startBytecode="0" endBytecode="750" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java"/>
       <Message>In method com.amazon.ion.impl.IonTokenReader.readEscapedCharacter(PushbackReader, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" primary="true" start="1167" end="1171" startBytecode="307" endBytecode="308" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" primary="true" start="1167" end="1171" startBytecode="308" endBytecode="309" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
       <Message>At IonTokenReader.java:[lines 1167-1171]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="1179" end="1183" startBytecode="365" endBytecode="366" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="1179" end="1183" startBytecode="367" endBytecode="368" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at IonTokenReader.java:[lines 1179-1183]</Message>
     </SourceLine>
   </BugInstance>
@@ -1216,35 +1135,35 @@
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonTokenReader.matchKeyword(StringBuilder, int, int) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonTokenReader" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="41" end="1620" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="41" end="1620" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
         <Message>At IonTokenReader.java:[lines 41-1620]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonTokenReader</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonTokenReader" name="matchKeyword" signature="(Ljava/lang/StringBuilder;II)Lcom/amazon/ion/impl/IonTokenReader$Type;" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="722" end="761" startBytecode="0" endBytecode="424" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="722" end="761" startBytecode="0" endBytecode="424" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java"/>
       <Message>In method com.amazon.ion.impl.IonTokenReader.matchKeyword(StringBuilder, int, int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" primary="true" start="724" end="756" startBytecode="10" endBytecode="244" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" primary="true" start="724" end="756" startBytecode="10" endBytecode="244" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
       <Message>At IonTokenReader.java:[lines 724-756]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="ES_COMPARING_STRINGS_WITH_EQ" priority="1" rank="9" abbrev="ES" category="BAD_PRACTICE" instanceHash="9d5144bbccad95f029d2e28c030ddfc9" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="597">
-    <ShortMessage>Comparison of String objects using == or !=</ShortMessage>
-    <LongMessage>Comparison of String objects using == or != in com.amazon.ion.impl.IonTokenReader$Type.setNumericValue(IonTokenReader, String)</LongMessage>
+    <ShortMessage>Comparaison d'objets String utilisant == ou !=</ShortMessage>
+    <LongMessage>Comparaison d'objets String utilisant == ou != dans com.amazon.ion.impl.IonTokenReader$Type.setNumericValue(IonTokenReader, String)</LongMessage>
     <Class classname="com.amazon.ion.impl.IonTokenReader$Type" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type" start="54" end="209" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type" start="54" end="209" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
         <Message>At IonTokenReader.java:[lines 54-209]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonTokenReader$Type</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonTokenReader$Type" name="setNumericValue" signature="(Lcom/amazon/ion/impl/IonTokenReader;Ljava/lang/String;)Lcom/amazon/ion/impl/IonTokenReader$Type;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type" start="150" end="194" startBytecode="0" endBytecode="117" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type" start="150" end="194" startBytecode="0" endBytecode="117" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java"/>
       <Message>In method com.amazon.ion.impl.IonTokenReader$Type.setNumericValue(IonTokenReader, String)</Message>
     </Method>
     <Type descriptor="Ljava/lang/String;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.String" start="125" end="3345" sourcefile="String.java" sourcepath="java/lang/String.java">
-        <Message>At String.java:[lines 125-3345]</Message>
+      <SourceLine classname="java.lang.String" start="140" end="4657" sourcefile="String.java" sourcepath="java/lang/String.java">
+        <Message>At String.java:[lines 140-4657]</Message>
       </SourceLine>
       <Message>Actual type String</Message>
     </Type>
@@ -1254,64 +1173,64 @@
     <LocalVariable name="eFormat" register="3" pc="232" role="LOCAL_VARIABLE_VALUE_OF">
       <Message>Value loaded from eFormat</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type" primary="true" start="184" end="184" startBytecode="233" endBytecode="233" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type" primary="true" start="184" end="184" startBytecode="233" endBytecode="233" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
       <Message>At IonTokenReader.java:[line 184]</Message>
     </SourceLine>
     <Property name="edu.umd.cs.findbugs.detect.RefComparisonWarningProperty.DYNAMIC_AND_UNKNOWN" value="true"/>
   </BugInstance>
   <BugInstance type="NM_CLASS_NAMING_CONVENTION" priority="2" rank="16" abbrev="Nm" category="BAD_PRACTICE" instanceHash="2f78ac987f6763ec5762edc7af0ba831" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Class names should start with an upper case letter</ShortMessage>
-    <LongMessage>The class name com.amazon.ion.impl.IonTokenReader$Type$timeinfo doesn't start with an upper case letter</LongMessage>
+    <ShortMessage>Nom de classe devant commencer par une majuscule</ShortMessage>
+    <LongMessage>Le nom de la classe com.amazon.ion.impl.IonTokenReader$Type$timeinfo ne commence pas par une majusucle</LongMessage>
     <Class classname="com.amazon.ion.impl.IonTokenReader$Type$timeinfo" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type$timeinfo" start="132" end="143" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java">
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type$timeinfo" start="132" end="143" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
         <Message>At IonTokenReader.java:[lines 132-143]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonTokenReader$Type$timeinfo</Message>
     </Class>
-    <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type$timeinfo" start="132" end="143" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/com/amazon/ion/impl/IonTokenReader.java" synthetic="true">
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type$timeinfo" start="132" end="143" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java" synthetic="true">
       <Message>At IonTokenReader.java:[lines 132-143]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="BIT_IOR_OF_SIGNED_BYTE" priority="2" rank="2" abbrev="BIT" category="CORRECTNESS" instanceHash="93df0fa44c6dfe9f55204cae04ba21c3" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Bitwise OR of signed byte value</ShortMessage>
-    <LongMessage>Bitwise OR of signed byte value computed in com.amazon.ion.impl.IonUTF8.getAs4BytesReversed(int)</LongMessage>
+    <ShortMessage>Ou binaire d'un octet signé</ShortMessage>
+    <LongMessage>Ou binaire d'un octet signé calculé dans com.amazon.ion.impl.IonUTF8.getAs4BytesReversed(int)</LongMessage>
     <Class classname="com.amazon.ion.impl.IonUTF8" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="35" end="406" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="35" end="406" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java">
         <Message>At IonUTF8.java:[lines 35-406]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonUTF8</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonUTF8" name="getAs4BytesReversed" signature="(I)I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="174" end="193" startBytecode="0" endBytecode="267" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="174" end="193" startBytecode="0" endBytecode="267" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java"/>
       <Message>In method com.amazon.ion.impl.IonUTF8.getAs4BytesReversed(int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonUTF8" primary="true" start="179" end="179" startBytecode="52" endBytecode="52" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" primary="true" start="179" end="179" startBytecode="52" endBytecode="52" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java">
       <Message>At IonUTF8.java:[line 179]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="183" end="183" startBytecode="69" endBytecode="69" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="183" end="183" startBytecode="69" endBytecode="69" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at IonUTF8.java:[line 183]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="188" end="188" startBytecode="96" endBytecode="96" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="188" end="188" startBytecode="96" endBytecode="96" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at IonUTF8.java:[line 188]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="BIT_IOR_OF_SIGNED_BYTE" priority="2" rank="2" abbrev="BIT" category="CORRECTNESS" instanceHash="c7af8fe0a87cebec80f386f18d0bad53" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Bitwise OR of signed byte value</ShortMessage>
-    <LongMessage>Bitwise OR of signed byte value computed in com.amazon.ion.impl.IonUTF8.packBytesAfter1(int, int)</LongMessage>
+    <ShortMessage>Ou binaire d'un octet signé</ShortMessage>
+    <LongMessage>Ou binaire d'un octet signé calculé dans com.amazon.ion.impl.IonUTF8.packBytesAfter1(int, int)</LongMessage>
     <Class classname="com.amazon.ion.impl.IonUTF8" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="35" end="406" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="35" end="406" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java">
         <Message>At IonUTF8.java:[lines 35-406]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonUTF8</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonUTF8" name="packBytesAfter1" signature="(II)I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="254" end="270" startBytecode="0" endBytecode="228" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="254" end="270" startBytecode="0" endBytecode="228" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java"/>
       <Message>In method com.amazon.ion.impl.IonUTF8.packBytesAfter1(int, int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonUTF8" primary="true" start="262" end="262" startBytecode="60" endBytecode="60" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" primary="true" start="262" end="262" startBytecode="60" endBytecode="60" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java">
       <Message>At IonUTF8.java:[line 262]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="266" end="266" startBytecode="78" endBytecode="78" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="266" end="266" startBytecode="78" endBytecode="78" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at IonUTF8.java:[line 266]</Message>
     </SourceLine>
   </BugInstance>
@@ -1319,111 +1238,111 @@
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonUTF8.convertToUTF8Bytes(int, byte[], int, int) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonUTF8" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="35" end="406" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="35" end="406" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java">
         <Message>At IonUTF8.java:[lines 35-406]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonUTF8</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonUTF8" name="convertToUTF8Bytes" signature="(I[BII)I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="211" end="238" startBytecode="0" endBytecode="428" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="211" end="238" startBytecode="0" endBytecode="428" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java"/>
       <Message>In method com.amazon.ion.impl.IonUTF8.convertToUTF8Bytes(int, byte[], int, int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonUTF8" primary="true" start="214" end="235" startBytecode="12" endBytecode="230" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/com/amazon/ion/impl/IonUTF8.java">
+    <SourceLine classname="com.amazon.ion.impl.IonUTF8" primary="true" start="214" end="235" startBytecode="12" endBytecode="230" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java">
       <Message>At IonUTF8.java:[lines 214-235]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" priority="2" rank="11" abbrev="RCN" category="CORRECTNESS" instanceHash="a947663772ecc40ffa3682e827dfdb04" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>Nullcheck of value previously dereferenced</ShortMessage>
-    <LongMessage>Nullcheck of IonWriterSystemBinary._patch at line 518 of value previously dereferenced in com.amazon.ion.impl.IonWriterSystemBinary.closeValue()</LongMessage>
+    <ShortMessage>Test de nullité d'une valeur préalablement déréférencée</ShortMessage>
+    <LongMessage>Test de nullité dans com.amazon.ion.impl.IonWriterSystemBinary._patch d'une valeur préalablement déréférencée dans com.amazon.ion.impl.IonWriterSystemBinary.closeValue()</LongMessage>
     <Class classname="com.amazon.ion.impl.IonWriterSystemBinary" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="40" end="1048" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/com/amazon/ion/impl/IonWriterSystemBinary.java">
-        <Message>At IonWriterSystemBinary.java:[lines 40-1048]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="40" end="1049" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java">
+        <Message>At IonWriterSystemBinary.java:[lines 40-1049]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonWriterSystemBinary</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonWriterSystemBinary" name="closeValue" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="510" end="520" startBytecode="0" endBytecode="156" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/com/amazon/ion/impl/IonWriterSystemBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="511" end="521" startBytecode="0" endBytecode="156" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonWriterSystemBinary.closeValue()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.IonWriterSystemBinary" name="_patch" signature="Lcom/amazon/ion/impl/IonWriterSystemBinary$PatchedValues;" isStatic="false" primary="true" role="FIELD_VALUE_OF">
-      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/com/amazon/ion/impl/IonWriterSystemBinary.java">
+      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java">
         <Message>In IonWriterSystemBinary.java</Message>
       </SourceLine>
       <Message>Value loaded from field com.amazon.ion.impl.IonWriterSystemBinary._patch</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" primary="true" start="517" end="517" startBytecode="51" endBytecode="51" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/com/amazon/ion/impl/IonWriterSystemBinary.java">
-      <Message>At IonWriterSystemBinary.java:[line 517]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" primary="true" start="518" end="518" startBytecode="51" endBytecode="51" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java">
+      <Message>At IonWriterSystemBinary.java:[line 518]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="518" end="518" startBytecode="64" endBytecode="64" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/com/amazon/ion/impl/IonWriterSystemBinary.java" role="SOURCE_REDUNDANT_NULL_CHECK">
-      <Message>Redundant null check at IonWriterSystemBinary.java:[line 518]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="519" end="519" startBytecode="64" endBytecode="64" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java" role="SOURCE_REDUNDANT_NULL_CHECK">
+      <Message>Redundant null check at IonWriterSystemBinary.java:[line 519]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="IS2_INCONSISTENT_SYNC" priority="2" rank="17" abbrev="IS" category="MT_CORRECTNESS" instanceHash="6d5e152f4ead561f66657ad28715856a" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="366">
-    <ShortMessage>Inconsistent synchronization</ShortMessage>
-    <LongMessage>Inconsistent synchronization of com.amazon.ion.impl.LocalSymbolTable.mySymbolNames; locked 75% of time</LongMessage>
+    <ShortMessage>Synchronisation incohérente</ShortMessage>
+    <LongMessage>Synchronisation incohérente de com.amazon.ion.impl.LocalSymbolTable.mySymbolNames; verrouillée à 58%</LongMessage>
     <Class classname="com.amazon.ion.impl.LocalSymbolTable" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="53" end="874" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java">
-        <Message>At LocalSymbolTable.java:[lines 53-874]</Message>
+      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="52" end="863" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java">
+        <Message>At LocalSymbolTable.java:[lines 52-863]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.LocalSymbolTable</Message>
     </Class>
     <Field classname="com.amazon.ion.impl.LocalSymbolTable" name="mySymbolNames" signature="[Ljava/lang/String;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java">
+      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java">
         <Message>In LocalSymbolTable.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.LocalSymbolTable.mySymbolNames</Message>
     </Field>
-    <Int value="75" role="INT_SYNC_PERCENT">
-      <Message>Synchronized 75% of the time</Message>
+    <Int value="58" role="INT_SYNC_PERCENT">
+      <Message>Synchronized 58% of the time</Message>
     </Int>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" primary="true" start="856" end="856" startBytecode="56" endBytecode="56" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
-      <Message>Unsynchronized access at LocalSymbolTable.java:[line 856]</Message>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" primary="true" start="845" end="845" startBytecode="56" endBytecode="56" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 845]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="849" end="849" startBytecode="62" endBytecode="62" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 849]</Message>
+    </SourceLine>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="859" end="859" startBytecode="95" endBytecode="95" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 859]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="860" end="860" startBytecode="62" endBytecode="62" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
-      <Message>Unsynchronized access at LocalSymbolTable.java:[line 860]</Message>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="143" end="143" startBytecode="9" endBytecode="9" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 143]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="870" end="870" startBytecode="95" endBytecode="95" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
-      <Message>Unsynchronized access at LocalSymbolTable.java:[line 870]</Message>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="145" end="145" startBytecode="17" endBytecode="17" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 145]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="424" end="424" startBytecode="51" endBytecode="51" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="424" end="424" startBytecode="51" endBytecode="51" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 424]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="555" end="555" startBytecode="22" endBytecode="22" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="555" end="555" startBytecode="22" endBytecode="22" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 555]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="575" end="575" startBytecode="119" endBytecode="119" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="575" end="575" startBytecode="119" endBytecode="119" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 575]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="563" end="563" startBytecode="51" endBytecode="51" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="563" end="563" startBytecode="51" endBytecode="51" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 563]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="564" end="564" startBytecode="66" endBytecode="66" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="564" end="564" startBytecode="66" endBytecode="66" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 564]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="144" end="144" startBytecode="9" endBytecode="9" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
-      <Message>Synchronized access at LocalSymbolTable.java:[line 144]</Message>
-    </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="146" end="146" startBytecode="17" endBytecode="17" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
-      <Message>Synchronized access at LocalSymbolTable.java:[line 146]</Message>
-    </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="494" end="494" startBytecode="38" endBytecode="38" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="494" end="494" startBytecode="38" endBytecode="38" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 494]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="401" end="401" startBytecode="5" endBytecode="5" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="401" end="401" startBytecode="5" endBytecode="5" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 401]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="IS2_INCONSISTENT_SYNC" priority="2" rank="17" abbrev="IS" category="MT_CORRECTNESS" instanceHash="51a58628ea63298078b87f36b7a3416e" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="366">
-    <ShortMessage>Inconsistent synchronization</ShortMessage>
-    <LongMessage>Inconsistent synchronization of com.amazon.ion.impl.LocalSymbolTable.mySymbolsCount; locked 81% of time</LongMessage>
+    <ShortMessage>Synchronisation incohérente</ShortMessage>
+    <LongMessage>Synchronisation incohérente de com.amazon.ion.impl.LocalSymbolTable.mySymbolsCount; verrouillée à 81%</LongMessage>
     <Class classname="com.amazon.ion.impl.LocalSymbolTable" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="53" end="874" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java">
-        <Message>At LocalSymbolTable.java:[lines 53-874]</Message>
+      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="52" end="863" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java">
+        <Message>At LocalSymbolTable.java:[lines 52-863]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.LocalSymbolTable</Message>
     </Class>
     <Field classname="com.amazon.ion.impl.LocalSymbolTable" name="mySymbolsCount" signature="I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java">
+      <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java">
         <Message>In LocalSymbolTable.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.LocalSymbolTable.mySymbolsCount</Message>
@@ -1431,83 +1350,55 @@
     <Int value="81" role="INT_SYNC_PERCENT">
       <Message>Synchronized 81% of the time</Message>
     </Int>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" primary="true" start="848" end="848" startBytecode="35" endBytecode="35" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
-      <Message>Unsynchronized access at LocalSymbolTable.java:[line 848]</Message>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" primary="true" start="837" end="837" startBytecode="35" endBytecode="35" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 837]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="854" end="854" startBytecode="46" endBytecode="46" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
-      <Message>Unsynchronized access at LocalSymbolTable.java:[line 854]</Message>
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="843" end="843" startBytecode="46" endBytecode="46" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_UNSYNC_ACCESS">
+      <Message>Unsynchronized access at LocalSymbolTable.java:[line 843]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="379" end="379" startBytecode="1" endBytecode="1" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="379" end="379" startBytecode="1" endBytecode="1" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 379]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="555" end="555" startBytecode="18" endBytecode="18" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="555" end="555" startBytecode="18" endBytecode="18" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 555]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="557" end="557" startBytecode="30" endBytecode="30" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="557" end="557" startBytecode="30" endBytecode="30" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 557]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="575" end="575" startBytecode="123" endBytecode="123" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="575" end="575" startBytecode="123" endBytecode="123" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 575]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="570" end="570" startBytecode="76" endBytecode="76" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="570" end="570" startBytecode="76" endBytecode="76" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 570]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="576" end="576" startBytecode="130" endBytecode="130" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="576" end="576" startBytecode="130" endBytecode="130" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 576]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="576" end="576" startBytecode="135" endBytecode="135" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="576" end="576" startBytecode="135" endBytecode="135" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 576]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="563" end="563" startBytecode="58" endBytecode="58" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="563" end="563" startBytecode="58" endBytecode="58" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 563]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="401" end="401" startBytecode="9" endBytecode="9" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
+    <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="401" end="401" startBytecode="9" endBytecode="9" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java" role="SOURCE_LINE_SYNC_ACCESS">
       <Message>Synchronized access at LocalSymbolTable.java:[line 401]</Message>
     </SourceLine>
   </BugInstance>
-  <BugInstance type="DM_NUMBER_CTOR" priority="2" rank="18" abbrev="Bx" category="PERFORMANCE" instanceHash="c32777862ff0ea61cb0e842c3079810c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Method invokes inefficient Number constructor; use static valueOf instead</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readVarInteger() invokes inefficient new Integer(int) constructor; use Integer.valueOf(int) instead</LongMessage>
-    <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="135" end="660" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
-        <Message>At SimpleByteBuffer.java:[lines 135-660]</Message>
-      </SourceLine>
-      <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader</Message>
-    </Class>
-    <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" name="readVarInteger" signature="()Ljava/lang/Integer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="330" end="378" startBytecode="0" endBytecode="439" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
-      <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readVarInteger()</Message>
-    </Method>
-    <Method classname="java.lang.Integer" name="&lt;init&gt;" signature="(I)V" isStatic="false" role="METHOD_CALLED">
-      <SourceLine classname="java.lang.Integer" start="1082" end="1084" startBytecode="0" endBytecode="69" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
-      <Message>Called method new Integer(int)</Message>
-    </Method>
-    <Method classname="java.lang.Integer" name="valueOf" signature="(I)Ljava/lang/Integer;" isStatic="true" role="SHOULD_CALL">
-      <SourceLine classname="java.lang.Integer" start="1057" end="1059" startBytecode="0" endBytecode="90" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
-      <Message>Should call Integer.valueOf(int) instead</Message>
-    </Method>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" primary="true" start="372" end="372" startBytecode="202" endBytecode="202" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
-      <Message>At SimpleByteBuffer.java:[line 372]</Message>
-    </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="376" end="376" startBytecode="215" endBytecode="215" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at SimpleByteBuffer.java:[line 376]</Message>
-    </SourceLine>
-  </BugInstance>
   <BugInstance type="NP_NULL_PARAM_DEREF" priority="2" rank="8" abbrev="NP" category="CORRECTNESS" instanceHash="beb1e796c5e40b6af4fc4a6a96fabb76" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>Method call passes null for non-null parameter</ShortMessage>
-    <LongMessage>Null passed for non-null parameter of com.amazon.ion.Timestamp.createFromUtcFields(Timestamp$Precision, int, int, int, int, int, int, BigDecimal, Integer) in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readTimestamp(int)</LongMessage>
+    <ShortMessage>Méthode passant null à un paramètre déréférencé inconditionnellement</ShortMessage>
+    <LongMessage>L'appel de méthode dans com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readTimestamp(int) passe null à un paramètre de com.amazon.ion.Timestamp.createFromUtcFields(Timestamp$Precision, int, int, int, int, int, int, BigDecimal, Integer) déréférencé de façon inconditionnelle</LongMessage>
     <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="135" end="660" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="135" end="660" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
         <Message>At SimpleByteBuffer.java:[lines 135-660]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" name="readTimestamp" signature="(I)Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="503" end="560" startBytecode="0" endBytecode="544" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="503" end="560" startBytecode="0" endBytecode="544" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java"/>
       <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readTimestamp(int)</Message>
     </Method>
     <Method classname="com.amazon.ion.Timestamp" name="createFromUtcFields" signature="(Lcom/amazon/ion/Timestamp$Precision;IIIIIILjava/math/BigDecimal;Ljava/lang/Integer;)Lcom/amazon/ion/Timestamp;" isStatic="true" role="METHOD_CALLED">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="663" end="663" startBytecode="0" endBytecode="144" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="674" end="674" startBytecode="0" endBytecode="145" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>Called method com.amazon.ion.Timestamp.createFromUtcFields(Timestamp$Precision, int, int, int, int, int, int, BigDecimal, Integer)</Message>
     </Method>
     <Int value="1" role="INT_MAYBE_NULL_ARG">
@@ -1516,37 +1407,37 @@
     <LocalVariable name="p" register="3" pc="74" role="LOCAL_VARIABLE_VALUE_OF">
       <Message>Value loaded from p</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" primary="true" start="559" end="559" startBytecode="210" endBytecode="210" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_INVOKED">
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" primary="true" start="559" end="559" startBytecode="210" endBytecode="210" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_INVOKED">
       <Message>Method invoked at SimpleByteBuffer.java:[line 559]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="509" end="509" startBytecode="7" endBytecode="7" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_NULL_VALUE">
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="509" end="509" startBytecode="7" endBytecode="7" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_NULL_VALUE">
       <Message>Null value at SimpleByteBuffer.java:[line 509]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="521" end="521" startBytecode="76" endBytecode="76" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_KNOWN_NULL">
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="521" end="521" startBytecode="76" endBytecode="76" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_KNOWN_NULL">
       <Message>Known null at SimpleByteBuffer.java:[line 521]</Message>
     </SourceLine>
     <Property name="edu.umd.cs.findbugs.detect.NullDerefProperty.LONG_RANGE_NULL_SOURCE" value="true"/>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="9a234b1a21f1d8ba763393929cce11e4" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
-    <LongMessage>Switch statement found in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(int, int, boolean) where one case falls through to the next case</LongMessage>
+    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
+    <LongMessage>Un switch de com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(int, int, boolean) comporte un cas qui déborde sur le suivant</LongMessage>
     <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
         <Message>At SimpleByteBuffer.java:[lines 841-1383]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" name="writeVarInt" signature="(IIZ)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="967" end="1002" startBytecode="0" endBytecode="446" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="967" end="1002" startBytecode="0" endBytecode="446" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java"/>
       <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(int, int, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="987" end="988" startBytecode="141" endBytecode="144" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="987" end="988" startBytecode="141" endBytecode="144" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
       <Message>At SimpleByteBuffer.java:[lines 987-988]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="988" end="989" startBytecode="153" endBytecode="156" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="988" end="989" startBytecode="153" endBytecode="156" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at SimpleByteBuffer.java:[lines 988-989]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="989" end="990" startBytecode="165" endBytecode="168" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="989" end="990" startBytecode="165" endBytecode="168" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at SimpleByteBuffer.java:[lines 989-990]</Message>
     </SourceLine>
   </BugInstance>
@@ -1554,16 +1445,16 @@
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeULong(long, int) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
         <Message>At SimpleByteBuffer.java:[lines 841-1383]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" name="writeULong" signature="(JI)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="1179" end="1189" startBytecode="0" endBytecode="275" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="1179" end="1189" startBytecode="0" endBytecode="275" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java"/>
       <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeULong(long, int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="1179" end="1187" startBytecode="1" endBytecode="158" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="1179" end="1187" startBytecode="1" endBytecode="158" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
       <Message>At SimpleByteBuffer.java:[lines 1179-1187]</Message>
     </SourceLine>
   </BugInstance>
@@ -1571,16 +1462,16 @@
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(int, int, boolean) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
         <Message>At SimpleByteBuffer.java:[lines 841-1383]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" name="writeVarInt" signature="(IIZ)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="967" end="1002" startBytecode="0" endBytecode="446" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="967" end="1002" startBytecode="0" endBytecode="446" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java"/>
       <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(int, int, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="986" end="990" startBytecode="99" endBytecode="180" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="986" end="990" startBytecode="99" endBytecode="180" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
       <Message>At SimpleByteBuffer.java:[lines 986-990]</Message>
     </SourceLine>
   </BugInstance>
@@ -1588,16 +1479,16 @@
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(long, int, boolean) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
         <Message>At SimpleByteBuffer.java:[lines 841-1383]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" name="writeVarInt" signature="(JIZ)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="1090" end="1143" startBytecode="0" endBytecode="656" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="1090" end="1143" startBytecode="0" endBytecode="656" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java"/>
       <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(long, int, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="1123" end="1133" startBytecode="145" endBytecode="330" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="1123" end="1133" startBytecode="145" endBytecode="330" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
       <Message>At SimpleByteBuffer.java:[lines 1123-1133]</Message>
     </SourceLine>
   </BugInstance>
@@ -1605,34 +1496,34 @@
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarUInt(int, int, boolean) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
         <Message>At SimpleByteBuffer.java:[lines 841-1383]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" name="writeVarUInt" signature="(IIZ)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="1014" end="1034" startBytecode="0" endBytecode="321" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="1014" end="1034" startBytecode="0" endBytecode="321" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java"/>
       <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarUInt(int, int, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="1020" end="1030" startBytecode="44" endBytecode="161" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/SimpleByteBuffer.java">
+    <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true" start="1020" end="1030" startBytecode="44" endBytecode="161" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
       <Message>At SimpleByteBuffer.java:[lines 1020-1030]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="d58e1592bc2a700caa5be665fe6fe77e" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl.UnifiedDataPageX$Bytes(byte[], int, int) may expose internal representation by storing an externally mutable object into UnifiedDataPageX$Bytes._bytes</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl.UnifiedDataPageX$Bytes(byte[], int, int) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.UnifiedDataPageX$Bytes._bytes</LongMessage>
     <Class classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" start="168" end="204" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" start="168" end="204" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java">
         <Message>At UnifiedDataPageX.java:[lines 168-204]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.UnifiedDataPageX$Bytes</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" name="&lt;init&gt;" signature="([BII)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" start="173" end="178" startBytecode="0" endBytecode="121" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" start="173" end="178" startBytecode="0" endBytecode="121" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java"/>
       <Message>In method new com.amazon.ion.impl.UnifiedDataPageX$Bytes(byte[], int, int)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" name="_bytes" signature="[B" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java">
         <Message>In UnifiedDataPageX.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.UnifiedDataPageX$Bytes._bytes</Message>
@@ -1640,25 +1531,25 @@
     <LocalVariable name="bytes" register="1" pc="14" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named bytes</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" primary="true" start="175" end="175" startBytecode="14" endBytecode="14" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+    <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" primary="true" start="175" end="175" startBytecode="14" endBytecode="14" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java">
       <Message>At UnifiedDataPageX.java:[line 175]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="5631ddc5128a828436df68eb6b9359c6" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl.UnifiedDataPageX$Chars(char[], int, int) may expose internal representation by storing an externally mutable object into UnifiedDataPageX$Chars._characters</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl.UnifiedDataPageX$Chars(char[], int, int) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.UnifiedDataPageX$Chars._characters</LongMessage>
     <Class classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" start="210" end="251" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" start="210" end="251" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java">
         <Message>At UnifiedDataPageX.java:[lines 210-251]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.UnifiedDataPageX$Chars</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" name="&lt;init&gt;" signature="([CII)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" start="215" end="220" startBytecode="0" endBytecode="121" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" start="215" end="220" startBytecode="0" endBytecode="121" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java"/>
       <Message>In method new com.amazon.ion.impl.UnifiedDataPageX$Chars(char[], int, int)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" name="_characters" signature="[C" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+      <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java">
         <Message>In UnifiedDataPageX.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.UnifiedDataPageX$Chars._characters</Message>
@@ -1666,25 +1557,25 @@
     <LocalVariable name="chars" register="1" pc="14" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named chars</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" primary="true" start="217" end="217" startBytecode="14" endBytecode="14" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/com/amazon/ion/impl/UnifiedDataPageX.java">
+    <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" primary="true" start="217" end="217" startBytecode="14" endBytecode="14" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java">
       <Message>At UnifiedDataPageX.java:[line 217]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="b694ed23a3292b72fc9a15b1055e9e87" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl._Private_FastAppendableDecorator(_Private_FastAppendable) may expose internal representation by storing an externally mutable object into _Private_FastAppendableDecorator.myOutput</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl._Private_FastAppendableDecorator(_Private_FastAppendable) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_FastAppendableDecorator.myOutput</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_FastAppendableDecorator" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" start="31" end="100" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" start="31" end="100" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_FastAppendableDecorator.java">
         <Message>At _Private_FastAppendableDecorator.java:[lines 31-100]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_FastAppendableDecorator</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_FastAppendableDecorator" name="&lt;init&gt;" signature="(Lcom/amazon/ion/util/_Private_FastAppendable;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" start="31" end="33" startBytecode="0" endBytecode="69" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" start="31" end="33" startBytecode="0" endBytecode="69" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_FastAppendableDecorator.java"/>
       <Message>In method new com.amazon.ion.impl._Private_FastAppendableDecorator(_Private_FastAppendable)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_FastAppendableDecorator" name="myOutput" signature="Lcom/amazon/ion/util/_Private_FastAppendable;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_FastAppendableDecorator.java">
         <Message>In _Private_FastAppendableDecorator.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_FastAppendableDecorator.myOutput</Message>
@@ -1692,113 +1583,113 @@
     <LocalVariable name="output" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named output</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" primary="true" start="32" end="32" startBytecode="6" endBytecode="6" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/com/amazon/ion/impl/_Private_FastAppendableDecorator.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" primary="true" start="32" end="32" startBytecode="6" endBytecode="6" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_FastAppendableDecorator.java">
       <Message>At _Private_FastAppendableDecorator.java:[line 32]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="979e51d12a6742548549ed889fc05276" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_IonBinaryWriterBuilder.getInitialSymbolTable() may expose internal representation by returning _Private_IonBinaryWriterBuilder.myInitialSymbolTable</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_IonBinaryWriterBuilder.getInitialSymbolTable() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl._Private_IonBinaryWriterBuilder.myInitialSymbolTable</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="39" end="384" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
-        <Message>At _Private_IonBinaryWriterBuilder.java:[lines 39-384]</Message>
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="39" end="414" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+        <Message>At _Private_IonBinaryWriterBuilder.java:[lines 39-414]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_IonBinaryWriterBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" name="getInitialSymbolTable" signature="()Lcom/amazon/ion/SymbolTable;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="135" end="135" startBytecode="0" endBytecode="46" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="135" end="135" startBytecode="0" endBytecode="46" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java"/>
       <Message>In method com.amazon.ion.impl._Private_IonBinaryWriterBuilder.getInitialSymbolTable()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" name="myInitialSymbolTable" signature="Lcom/amazon/ion/SymbolTable;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
         <Message>In _Private_IonBinaryWriterBuilder.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_IonBinaryWriterBuilder.myInitialSymbolTable</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true" start="135" end="135" startBytecode="4" endBytecode="4" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true" start="135" end="135" startBytecode="4" endBytecode="4" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
       <Message>At _Private_IonBinaryWriterBuilder.java:[line 135]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="c0ea811377595a8421959f727e278998" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_IonBinaryWriterBuilder.setInitialSymbolTable(SymbolTable) may expose internal representation by storing an externally mutable object into _Private_IonBinaryWriterBuilder.myInitialSymbolTable</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_IonBinaryWriterBuilder.setInitialSymbolTable(SymbolTable) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_IonBinaryWriterBuilder.myInitialSymbolTable</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="39" end="384" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
-        <Message>At _Private_IonBinaryWriterBuilder.java:[lines 39-384]</Message>
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="39" end="414" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+        <Message>At _Private_IonBinaryWriterBuilder.java:[lines 39-414]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_IonBinaryWriterBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" name="setInitialSymbolTable" signature="(Lcom/amazon/ion/SymbolTable;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="153" end="181" startBytecode="0" endBytecode="343" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="153" end="181" startBytecode="0" endBytecode="345" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java"/>
       <Message>In method com.amazon.ion.impl._Private_IonBinaryWriterBuilder.setInitialSymbolTable(SymbolTable)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" name="myInitialSymbolTable" signature="Lcom/amazon/ion/SymbolTable;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
         <Message>In _Private_IonBinaryWriterBuilder.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_IonBinaryWriterBuilder.myInitialSymbolTable</Message>
     </Field>
-    <LocalVariable name="symtab" register="1" pc="126" role="LOCAL_VARIABLE_NAMED">
+    <LocalVariable name="symtab" register="1" pc="128" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named symtab</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true" start="179" end="179" startBytecode="126" endBytecode="126" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true" start="179" end="179" startBytecode="128" endBytecode="128" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
       <Message>At _Private_IonBinaryWriterBuilder.java:[line 179]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_MUTABLE_ARRAY" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="aca2d4624c416fb2d215e8f3628836ee" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Field is a mutable array</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0 is a mutable array</LongMessage>
+    <ShortMessage>Un champ est un tableau modifiable</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0 est un tableau modifiable</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonConstants" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonConstants" start="23" end="275" sourcefile="_Private_IonConstants.java" sourcepath="com/amazon/ion/impl/_Private_IonConstants.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonConstants.java">
-        <Message>At _Private_IonConstants.java:[lines 23-275]</Message>
+      <SourceLine classname="com.amazon.ion.impl._Private_IonConstants" start="23" end="282" sourcefile="_Private_IonConstants.java" sourcepath="com/amazon/ion/impl/_Private_IonConstants.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonConstants.java">
+        <Message>At _Private_IonConstants.java:[lines 23-282]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_IonConstants</Message>
     </Class>
     <Field classname="com.amazon.ion.impl._Private_IonConstants" name="BINARY_VERSION_MARKER_1_0" signature="[B" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonConstants" sourcefile="_Private_IonConstants.java" sourcepath="com/amazon/ion/impl/_Private_IonConstants.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonConstants.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonConstants" sourcefile="_Private_IonConstants.java" sourcepath="com/amazon/ion/impl/_Private_IonConstants.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonConstants.java">
         <Message>In _Private_IonConstants.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_IonConstants" primary="true" start="103" end="103" startBytecode="61" endBytecode="61" sourcefile="_Private_IonConstants.java" sourcepath="com/amazon/ion/impl/_Private_IonConstants.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonConstants.java">
-      <Message>At _Private_IonConstants.java:[line 103]</Message>
+    <SourceLine classname="com.amazon.ion.impl._Private_IonConstants" primary="true" start="111" end="111" startBytecode="61" endBytecode="61" sourcefile="_Private_IonConstants.java" sourcepath="com/amazon/ion/impl/_Private_IonConstants.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonConstants.java">
+      <Message>At _Private_IonConstants.java:[line 111]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_MUTABLE_ARRAY" priority="1" rank="16" abbrev="MS" category="MALICIOUS_CODE" instanceHash="a4efef007b82cbeb6ba15e77ec77047f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Field is a mutable array</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_IonTextAppender.ZERO_PADDING is a mutable array</LongMessage>
+    <ShortMessage>Un champ est un tableau modifiable</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonTextAppender.ZERO_PADDING est un tableau modifiable</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="43" end="1008" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
-        <Message>At _Private_IonTextAppender.java:[lines 43-1008]</Message>
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="43" end="1032" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
+        <Message>At _Private_IonTextAppender.java:[lines 43-1032]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_IonTextAppender</Message>
     </Class>
     <Field classname="com.amazon.ion.impl._Private_IonTextAppender" name="ZERO_PADDING" signature="[Ljava/lang/String;" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
         <Message>In _Private_IonTextAppender.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_IonTextAppender.ZERO_PADDING</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true" start="111" end="111" startBytecode="327" endBytecode="327" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true" start="111" end="111" startBytecode="335" endBytecode="335" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
       <Message>At _Private_IonTextAppender.java:[line 111]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_PKGPROTECT" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="d0ab04bc1ad42d1fad533b0b48ddfb6d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Field should be package protected</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_IonTextAppender.OPERATOR_CHAR_FLAGS should be package protected</LongMessage>
+    <ShortMessage>Un champ devrait être package protected</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonTextAppender.OPERATOR_CHAR_FLAGS devrait être package protected</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="43" end="1008" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
-        <Message>At _Private_IonTextAppender.java:[lines 43-1008]</Message>
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="43" end="1032" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
+        <Message>At _Private_IonTextAppender.java:[lines 43-1032]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_IonTextAppender</Message>
     </Class>
     <Field classname="com.amazon.ion.impl._Private_IonTextAppender" name="OPERATOR_CHAR_FLAGS" signature="[Z" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
         <Message>In _Private_IonTextAppender.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_IonTextAppender.OPERATOR_CHAR_FLAGS</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true" start="98" end="98" startBytecode="253" endBytecode="253" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true" start="98" end="98" startBytecode="253" endBytecode="253" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
       <Message>At _Private_IonTextAppender.java:[line 98]</Message>
     </SourceLine>
   </BugInstance>
@@ -1806,76 +1697,76 @@
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl._Private_IonTextAppender.isIdentifierKeyword(CharSequence) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="43" end="1008" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
-        <Message>At _Private_IonTextAppender.java:[lines 43-1008]</Message>
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="43" end="1032" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
+        <Message>At _Private_IonTextAppender.java:[lines 43-1032]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_IonTextAppender</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_IonTextAppender" name="isIdentifierKeyword" signature="(Ljava/lang/CharSequence;)Z" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="410" end="465" startBytecode="0" endBytecode="562" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="410" end="465" startBytecode="0" endBytecode="562" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java"/>
       <Message>In method com.amazon.ion.impl._Private_IonTextAppender.isIdentifierKeyword(CharSequence)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true" start="421" end="460" startBytecode="27" endBytecode="323" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextAppender.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true" start="421" end="460" startBytecode="27" endBytecode="323" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
       <Message>At _Private_IonTextAppender.java:[lines 421-460]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_SHOULD_BE_FINAL" priority="1" rank="16" abbrev="MS" category="MALICIOUS_CODE" instanceHash="5b00fde4435120c6dcd09015babd6015" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Field isn't final but should be</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_IonTextWriterBuilder.STANDARD isn't final but should be</LongMessage>
+    <ShortMessage>Un champ n'est pas final alors qu'il devrait l'être</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonTextWriterBuilder.STANDARD n'est pas final mais devrait l'être</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" start="33" end="314" sourcefile="_Private_IonTextWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonTextWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java">
-        <Message>At _Private_IonTextWriterBuilder.java:[lines 33-314]</Message>
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" start="33" end="329" sourcefile="_Private_IonTextWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonTextWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java">
+        <Message>At _Private_IonTextWriterBuilder.java:[lines 33-329]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_IonTextWriterBuilder</Message>
     </Class>
     <Field classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" name="STANDARD" signature="Lcom/amazon/ion/impl/_Private_IonTextWriterBuilder;" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" sourcefile="_Private_IonTextWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonTextWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" sourcefile="_Private_IonTextWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonTextWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java">
         <Message>In _Private_IonTextWriterBuilder.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_IonTextWriterBuilder.STANDARD</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" primary="true" start="44" end="44" startBytecode="11" endBytecode="11" sourcefile="_Private_IonTextWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonTextWriterBuilder.java" relSourcepath="src/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" primary="true" start="44" end="44" startBytecode="11" endBytecode="11" sourcefile="_Private_IonTextWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonTextWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java">
       <Message>At _Private_IonTextWriterBuilder.java:[line 44]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="6da378526fc82201e6b54f920bd795" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_MarkupCallback.getAppendable() may expose internal representation by returning _Private_MarkupCallback.myAppendable</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_MarkupCallback.getAppendable() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl._Private_MarkupCallback.myAppendable</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="190" end="351" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="190" end="351" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java">
         <Message>At _Private_MarkupCallback.java:[lines 190-351]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_MarkupCallback</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_MarkupCallback" name="getAppendable" signature="()Lcom/amazon/ion/util/_Private_FastAppendable;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="200" end="200" startBytecode="0" endBytecode="46" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="200" end="200" startBytecode="0" endBytecode="46" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java"/>
       <Message>In method com.amazon.ion.impl._Private_MarkupCallback.getAppendable()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_MarkupCallback" name="myAppendable" signature="Lcom/amazon/ion/util/_Private_FastAppendable;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java">
         <Message>In _Private_MarkupCallback.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_MarkupCallback.myAppendable</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true" start="200" end="200" startBytecode="4" endBytecode="4" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true" start="200" end="200" startBytecode="4" endBytecode="4" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java">
       <Message>At _Private_MarkupCallback.java:[line 200]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="1bc20b2396d805db0503a8cfe3a4ac01" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl._Private_MarkupCallback(_Private_FastAppendable) may expose internal representation by storing an externally mutable object into _Private_MarkupCallback.myAppendable</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl._Private_MarkupCallback(_Private_FastAppendable) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_MarkupCallback.myAppendable</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="190" end="351" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="190" end="351" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java">
         <Message>At _Private_MarkupCallback.java:[lines 190-351]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_MarkupCallback</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_MarkupCallback" name="&lt;init&gt;" signature="(Lcom/amazon/ion/util/_Private_FastAppendable;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="190" end="192" startBytecode="0" endBytecode="69" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="190" end="192" startBytecode="0" endBytecode="69" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java"/>
       <Message>In method new com.amazon.ion.impl._Private_MarkupCallback(_Private_FastAppendable)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_MarkupCallback" name="myAppendable" signature="Lcom/amazon/ion/util/_Private_FastAppendable;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java">
         <Message>In _Private_MarkupCallback.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_MarkupCallback.myAppendable</Message>
@@ -1883,69 +1774,69 @@
     <LocalVariable name="appendable" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named appendable</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true" start="191" end="191" startBytecode="6" endBytecode="6" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/com/amazon/ion/impl/_Private_MarkupCallback.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true" start="191" end="191" startBytecode="6" endBytecode="6" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java">
       <Message>At _Private_MarkupCallback.java:[line 191]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_SHOULD_BE_FINAL" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="652384d5d2378bce4067c28205a4ab59" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Field isn't final but should be</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions.FNID_identity isn't final but should be</LongMessage>
+    <ShortMessage>Un champ n'est pas final alors qu'il devrait l'être</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions.FNID_identity n'est pas final mais devrait l'être</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" start="30" end="333" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" start="30" end="333" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 30-333]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions</Message>
     </Class>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions" name="FNID_identity" signature="I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions.FNID_identity</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true" start="114" end="114" startBytecode="21" endBytecode="21" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true" start="114" end="114" startBytecode="21" endBytecode="21" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 114]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_SHOULD_BE_FINAL" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="7466384ad6d6901614632524bf856c4f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Field isn't final but should be</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions.FNID_no_conversion isn't final but should be</LongMessage>
+    <ShortMessage>Un champ n'est pas final alors qu'il devrait l'être</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions.FNID_no_conversion n'est pas final mais devrait l'être</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" start="30" end="333" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" start="30" end="333" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 30-333]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions</Message>
     </Class>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions" name="FNID_no_conversion" signature="I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions.FNID_no_conversion</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true" start="113" end="113" startBytecode="17" endBytecode="17" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true" start="113" end="113" startBytecode="17" endBytecode="17" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 113]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="BC_UNCONFIRMED_CAST" priority="2" rank="17" abbrev="BC" category="STYLE" instanceHash="2dbcb25375fc771b3962e53d90af7ee8" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Unchecked/unconfirmed cast</ShortMessage>
-    <LongMessage>Unchecked/unconfirmed cast from java.math.BigDecimal to com.amazon.ion.Decimal in com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal)</LongMessage>
+    <ShortMessage>Transtypage non vérifié/non confirmé</ShortMessage>
+    <LongMessage>Transtypage non vérifié/non confirmé de com.amazon.ion.Decimal vers value dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal)</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="addValue" signature="(Ljava/math/BigDecimal;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="505" end="507" startBytecode="0" endBytecode="7" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="505" end="507" startBytecode="0" endBytecode="7" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal)</Message>
     </Method>
     <Type descriptor="Ljava/math/BigDecimal;" role="TYPE_FOUND">
-      <SourceLine classname="java.math.BigDecimal" start="228" end="5723" sourcefile="BigDecimal.java" sourcepath="java/math/BigDecimal.java">
-        <Message>At BigDecimal.java:[lines 228-5723]</Message>
+      <SourceLine classname="java.math.BigDecimal" start="305" end="5815" sourcefile="BigDecimal.java" sourcepath="java/math/BigDecimal.java">
+        <Message>At BigDecimal.java:[lines 305-5815]</Message>
       </SourceLine>
       <Message>Actual type java.math.BigDecimal</Message>
     </Type>
     <Type descriptor="Lcom/amazon/ion/Decimal;" role="TYPE_EXPECTED">
-      <SourceLine classname="com.amazon.ion.Decimal" start="48" end="426" sourcefile="Decimal.java" sourcepath="com/amazon/ion/Decimal.java" relSourcepath="src/com/amazon/ion/Decimal.java">
+      <SourceLine classname="com.amazon.ion.Decimal" start="48" end="426" sourcefile="Decimal.java" sourcepath="com/amazon/ion/Decimal.java" relSourcepath="src/main/java/com/amazon/ion/Decimal.java">
         <Message>At Decimal.java:[lines 48-426]</Message>
       </SourceLine>
       <Message>Expected com.amazon.ion.Decimal</Message>
@@ -1953,94 +1844,94 @@
     <LocalVariable name="value" register="1" pc="1" role="LOCAL_VARIABLE_VALUE_OF">
       <Message>Value loaded from value</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="505" end="505" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="505" end="505" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 505]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="c2797b12d401329b15b33d898826132e" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDate() may expose internal representation by returning _Private_ScalarConversions$ValueVariant._date_value</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDate() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="getDate" signature="()Ljava/util/Date;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="565" end="566" startBytecode="0" endBytecode="78" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="565" end="566" startBytecode="0" endBytecode="78" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDate()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_date_value" signature="Ljava/util/Date;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="566" end="566" startBytecode="23" endBytecode="23" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="566" end="566" startBytecode="23" endBytecode="23" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 566]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="2f740c4ec56c82773af0108950b50244" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDecimal() may expose internal representation by returning _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDecimal() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="getDecimal" signature="()Lcom/amazon/ion/Decimal;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="561" end="562" startBytecode="0" endBytecode="78" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="561" end="562" startBytecode="0" endBytecode="78" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDecimal()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_decimal_value" signature="Lcom/amazon/ion/Decimal;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="562" end="562" startBytecode="23" endBytecode="23" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="562" end="562" startBytecode="23" endBytecode="23" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 562]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="3445b251f5b9b22a9b7c11eb0f8f9b18" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getTimestamp() may expose internal representation by returning _Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getTimestamp() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="getTimestamp" signature="()Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="569" end="570" startBytecode="0" endBytecode="78" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="569" end="570" startBytecode="0" endBytecode="78" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getTimestamp()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_timestamp_value" signature="Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="570" end="570" startBytecode="23" endBytecode="23" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="570" end="570" startBytecode="23" endBytecode="23" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 570]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="112e0051b0813f283c398373d0802d4d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Decimal) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Decimal) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="addValue" signature="(Lcom/amazon/ion/Decimal;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="509" end="511" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="509" end="511" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Decimal)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_decimal_value" signature="Lcom/amazon/ion/Decimal;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</Message>
@@ -2048,25 +1939,25 @@
     <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named value</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="509" end="509" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="509" end="509" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 509]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="6583b1eb19f73cdc461bc4116b37d243" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Timestamp) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Timestamp) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="addValue" signature="(Lcom/amazon/ion/Timestamp;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="517" end="519" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="517" end="519" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Timestamp)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_timestamp_value" signature="Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</Message>
@@ -2074,25 +1965,25 @@
     <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named value</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="517" end="517" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="517" end="517" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 517]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="589da41cf438e747d7ed7167f383fec1" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="addValue" signature="(Ljava/math/BigDecimal;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="505" end="507" startBytecode="0" endBytecode="74" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="505" end="507" startBytecode="0" endBytecode="74" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_decimal_value" signature="Lcom/amazon/ion/Decimal;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</Message>
@@ -2100,25 +1991,25 @@
     <LocalVariable name="value" register="1" pc="5" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named value</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="505" end="505" startBytecode="5" endBytecode="5" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="505" end="505" startBytecode="5" endBytecode="5" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 505]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="ef493d618a888e73be4c0bf250e37110" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Date) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._date_value</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Date) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="addValue" signature="(Ljava/util/Date;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="513" end="515" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="513" end="515" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Date)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_date_value" signature="Ljava/util/Date;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</Message>
@@ -2126,25 +2017,25 @@
     <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named value</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="513" end="513" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="513" end="513" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 513]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="9aed0612674cf9959c8fc7c8704b6c3f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Decimal) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Decimal) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="setValue" signature="(Lcom/amazon/ion/Decimal;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="463" end="465" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="463" end="465" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Decimal)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_decimal_value" signature="Lcom/amazon/ion/Decimal;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</Message>
@@ -2152,25 +2043,25 @@
     <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named value</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="463" end="463" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="463" end="463" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 463]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="d0ff0229be9c1c1b891b6496d34e5ca1" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Timestamp) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Timestamp) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="setValue" signature="(Lcom/amazon/ion/Timestamp;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="471" end="473" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="471" end="473" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Timestamp)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_timestamp_value" signature="Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</Message>
@@ -2178,25 +2069,25 @@
     <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named value</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="471" end="471" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="471" end="471" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 471]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="9b0573d22a4daf2279fcc1e811a682c2" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Date) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._date_value</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Date) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_ScalarConversions$ValueVariant</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="setValue" signature="(Ljava/util/Date;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="467" end="469" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="467" end="469" startBytecode="0" endBytecode="71" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java"/>
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Date)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" name="_date_value" signature="Ljava/util/Date;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>In _Private_ScalarConversions.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</Message>
@@ -2204,25 +2095,25 @@
     <LocalVariable name="value" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named value</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="467" end="467" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/com/amazon/ion/impl/_Private_ScalarConversions.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true" start="467" end="467" startBytecode="2" endBytecode="2" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
       <Message>At _Private_ScalarConversions.java:[line 467]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="3292330b87d18c82fcfd8345b0cc7d63" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable) may expose internal representation by storing an externally mutable object into _Private_SymtabExtendsCache.myReaderSymtab</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_SymtabExtendsCache.myReaderSymtab</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="27" end="64" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="27" end="64" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
         <Message>At _Private_SymtabExtendsCache.java:[lines 27-64]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_SymtabExtendsCache</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_SymtabExtendsCache" name="symtabsCompat" signature="(Lcom/amazon/ion/SymbolTable;Lcom/amazon/ion/SymbolTable;)Z" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="42" end="64" startBytecode="0" endBytecode="227" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="42" end="64" startBytecode="0" endBytecode="227" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java"/>
       <Message>In method com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_SymtabExtendsCache" name="myReaderSymtab" signature="Lcom/amazon/ion/SymbolTable;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
         <Message>In _Private_SymtabExtendsCache.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_SymtabExtendsCache.myReaderSymtab</Message>
@@ -2230,25 +2121,25 @@
     <LocalVariable name="readerSymtab" register="2" pc="87" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named readerSymtab</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true" start="58" end="58" startBytecode="87" endBytecode="87" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true" start="58" end="58" startBytecode="87" endBytecode="87" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
       <Message>At _Private_SymtabExtendsCache.java:[line 58]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="eecd0e4d8408e77ef05ad3b3b1c6f801" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable) may expose internal representation by storing an externally mutable object into _Private_SymtabExtendsCache.myWriterSymtab</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_SymtabExtendsCache.myWriterSymtab</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="27" end="64" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="27" end="64" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
         <Message>At _Private_SymtabExtendsCache.java:[lines 27-64]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_SymtabExtendsCache</Message>
     </Class>
     <Method classname="com.amazon.ion.impl._Private_SymtabExtendsCache" name="symtabsCompat" signature="(Lcom/amazon/ion/SymbolTable;Lcom/amazon/ion/SymbolTable;)Z" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="42" end="64" startBytecode="0" endBytecode="227" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java"/>
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="42" end="64" startBytecode="0" endBytecode="227" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java"/>
       <Message>In method com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl._Private_SymtabExtendsCache" name="myWriterSymtab" signature="Lcom/amazon/ion/SymbolTable;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+      <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
         <Message>In _Private_SymtabExtendsCache.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_SymtabExtendsCache.myWriterSymtab</Message>
@@ -2256,7 +2147,7 @@
     <LocalVariable name="writerSymtab" register="1" pc="82" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named writerSymtab</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true" start="57" end="57" startBytecode="82" endBytecode="82" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true" start="57" end="57" startBytecode="82" endBytecode="82" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
       <Message>At _Private_SymtabExtendsCache.java:[line 57]</Message>
     </SourceLine>
   </BugInstance>
@@ -2264,114 +2155,114 @@
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2.beforeStepIn(IonManagedBinaryWriter, IonType) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" start="328" end="420" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
-        <Message>At IonManagedBinaryWriter.java:[lines 328-420]</Message>
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" start="327" end="419" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+        <Message>At IonManagedBinaryWriter.java:[lines 327-419]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" name="beforeStepIn" signature="(Lcom/amazon/ion/impl/bin/IonManagedBinaryWriter;Lcom/amazon/ion/IonType;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" start="333" end="355" startBytecode="0" endBytecode="242" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java"/>
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" start="332" end="354" startBytecode="0" endBytecode="242" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java"/>
       <Message>In method com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2.beforeStepIn(IonManagedBinaryWriter, IonType)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" primary="true" start="335" end="351" startBytecode="18" endBytecode="130" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
-      <Message>At IonManagedBinaryWriter.java:[lines 335-351]</Message>
+    <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$2" primary="true" start="334" end="350" startBytecode="18" endBytecode="130" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+      <Message>At IonManagedBinaryWriter.java:[lines 334-350]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="4d5ab012fdcd7de1e2fc6655d9bfc5b2" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3.afterStepOut(IonManagedBinaryWriter) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="422" end="510" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
-        <Message>At IonManagedBinaryWriter.java:[lines 422-510]</Message>
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="421" end="509" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+        <Message>At IonManagedBinaryWriter.java:[lines 421-509]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" name="afterStepOut" signature="(Lcom/amazon/ion/impl/bin/IonManagedBinaryWriter;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="437" end="476" startBytecode="0" endBytecode="384" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java"/>
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="436" end="475" startBytecode="0" endBytecode="384" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java"/>
       <Message>In method com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3.afterStepOut(IonManagedBinaryWriter)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" primary="true" start="437" end="473" startBytecode="7" endBytecode="220" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
-      <Message>At IonManagedBinaryWriter.java:[lines 437-473]</Message>
+    <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" primary="true" start="436" end="472" startBytecode="7" endBytecode="220" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+      <Message>At IonManagedBinaryWriter.java:[lines 436-472]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="95b64a0dc0e56077c5d1f2513e96e9ec" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3.writeInt(IonManagedBinaryWriter, long) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="422" end="510" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
-        <Message>At IonManagedBinaryWriter.java:[lines 422-510]</Message>
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="421" end="509" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+        <Message>At IonManagedBinaryWriter.java:[lines 421-509]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" name="writeInt" signature="(Lcom/amazon/ion/impl/bin/IonManagedBinaryWriter;J)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="494" end="510" startBytecode="0" endBytecode="208" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java"/>
+      <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" start="493" end="509" startBytecode="0" endBytecode="208" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java"/>
       <Message>In method com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3.writeInt(IonManagedBinaryWriter, long)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" primary="true" start="500" end="506" startBytecode="59" endBytecode="104" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
-      <Message>At IonManagedBinaryWriter.java:[lines 500-506]</Message>
+    <SourceLine classname="com.amazon.ion.impl.bin.IonManagedBinaryWriter$UserState$3" primary="true" start="499" end="505" startBytecode="59" endBytecode="104" sourcefile="IonManagedBinaryWriter.java" sourcepath="com/amazon/ion/impl/bin/IonManagedBinaryWriter.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java">
+      <Message>At IonManagedBinaryWriter.java:[lines 499-505]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="e531b8f0ec0bd6a1fdfe3969f045a568" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.getBuffer() may expose internal representation by returning PoolableByteBuffer.buffer</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.getBuffer() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.buffer</LongMessage>
     <Class classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" start="12" end="31" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" start="12" end="31" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
         <Message>At PoolableByteBuffer.java:[lines 12-31]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.bin.utf8.PoolableByteBuffer</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" name="getBuffer" signature="()Ljava/nio/ByteBuffer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" start="31" end="31" startBytecode="0" endBytecode="46" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java"/>
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" start="31" end="31" startBytecode="0" endBytecode="46" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java"/>
       <Message>In method com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.getBuffer()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" name="buffer" signature="Ljava/nio/ByteBuffer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
         <Message>In PoolableByteBuffer.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.buffer</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" primary="true" start="31" end="31" startBytecode="4" endBytecode="4" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
+    <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" primary="true" start="31" end="31" startBytecode="4" endBytecode="4" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
       <Message>At PoolableByteBuffer.java:[line 31]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="dd12a2fa0c1d9ca7e991926a3dbcfc33" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.getBuffer() may expose internal representation by returning Utf8StringEncoder$Result.buffer</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.getBuffer() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.buffer</LongMessage>
     <Class classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="128" end="148" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="128" end="148" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
         <Message>At Utf8StringEncoder.java:[lines 128-148]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" name="getBuffer" signature="()[B" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="141" end="141" startBytecode="0" endBytecode="46" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java"/>
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="141" end="141" startBytecode="0" endBytecode="46" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java"/>
       <Message>In method com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.getBuffer()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" name="buffer" signature="[B" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
         <Message>In Utf8StringEncoder.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.buffer</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true" start="141" end="141" startBytecode="4" endBytecode="4" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+    <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true" start="141" end="141" startBytecode="4" endBytecode="4" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
       <Message>At Utf8StringEncoder.java:[line 141]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="37090090b85d969f582bf784a80bac99" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result(int, byte[]) may expose internal representation by storing an externally mutable object into Utf8StringEncoder$Result.buffer</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result(int, byte[]) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.buffer</LongMessage>
     <Class classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="128" end="148" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="128" end="148" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
         <Message>At Utf8StringEncoder.java:[lines 128-148]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" name="&lt;init&gt;" signature="(I[B)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="128" end="131" startBytecode="0" endBytecode="88" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java"/>
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="128" end="131" startBytecode="0" endBytecode="88" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java"/>
       <Message>In method new com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result(int, byte[])</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" name="buffer" signature="[B" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+      <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
         <Message>In Utf8StringEncoder.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.buffer</Message>
@@ -2379,7 +2270,7 @@
     <LocalVariable name="buffer" register="2" pc="11" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named buffer</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true" start="130" end="130" startBytecode="11" endBytecode="11" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
+    <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true" start="130" end="130" startBytecode="11" endBytecode="11" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
       <Message>At Utf8StringEncoder.java:[line 130]</Message>
     </SourceLine>
   </BugInstance>
@@ -2387,13 +2278,13 @@
     <ShortMessage>Bad comparison of nonnegative value with negative constant or zero</ShortMessage>
     <LongMessage>Bad comparison of nonnegative value with 0 in com.amazon.ion.impl.lite.IonContainerLite.add(int, IonValueLite)</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonContainerLite" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite" start="35" end="751" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
-        <Message>At IonContainerLite.java:[lines 35-751]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite" start="39" end="857" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>At IonContainerLite.java:[lines 39-857]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonContainerLite</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonContainerLite" name="add" signature="(ILcom/amazon/ion/impl/lite/IonValueLite;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite" start="559" end="573" startBytecode="0" endBytecode="204" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite" start="653" end="667" startBytecode="0" endBytecode="204" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonContainerLite.add(int, IonValueLite)</Message>
     </Method>
     <Int value="0" role="INT_VALUE">
@@ -2402,71 +2293,71 @@
     <LocalVariable name="index" register="1" pc="50" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named index</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite" primary="true" start="569" end="569" startBytecode="50" endBytecode="50" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
-      <Message>At IonContainerLite.java:[line 569]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite" primary="true" start="663" end="663" startBytecode="50" endBytecode="50" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <Message>At IonContainerLite.java:[line 663]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="b7e63818cc4fb7d7cacbaf6e3670ee33" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.next() may expose internal representation by returning IonContainerLite$SequenceContentIterator.__current</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.next() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__current</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="191" end="361" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
-        <Message>At IonContainerLite.java:[lines 191-361]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="275" end="463" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>At IonContainerLite.java:[lines 275-463]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="next" signature="()Lcom/amazon/ion/IonValue;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="276" end="283" startBytecode="0" endBytecode="141" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="360" end="367" startBytecode="0" endBytecode="141" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.next()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="__current" signature="Lcom/amazon/ion/impl/lite/IonValueLite;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
         <Message>In IonContainerLite.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__current</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="283" end="283" startBytecode="53" endBytecode="53" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
-      <Message>At IonContainerLite.java:[line 283]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="367" end="367" startBytecode="53" endBytecode="53" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <Message>At IonContainerLite.java:[line 367]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="684c779584e3e2b9fcb83562f66693c5" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.previous() may expose internal representation by returning IonContainerLite$SequenceContentIterator.__current</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.previous() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__current</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="191" end="361" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
-        <Message>At IonContainerLite.java:[lines 191-361]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="275" end="463" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>At IonContainerLite.java:[lines 275-463]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="previous" signature="()Lcom/amazon/ion/IonValue;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="301" end="309" startBytecode="0" endBytecode="140" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="400" end="408" startBytecode="0" endBytecode="140" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.previous()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="__current" signature="Lcom/amazon/ion/impl/lite/IonValueLite;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
         <Message>In IonContainerLite.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__current</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="309" end="309" startBytecode="48" endBytecode="48" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
-      <Message>At IonContainerLite.java:[line 309]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="408" end="408" startBytecode="48" endBytecode="48" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <Message>At IonContainerLite.java:[line 408]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="75d6b0614d6a1619bd6e44699b8b9706" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator(IonContainerLite, int, boolean) may expose internal representation by storing an externally mutable object into IonContainerLite$SequenceContentIterator.this$0</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator(IonContainerLite, int, boolean) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.this$0</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="191" end="361" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
-        <Message>At IonContainerLite.java:[lines 191-361]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="275" end="463" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>At IonContainerLite.java:[lines 275-463]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/lite/IonContainerLite;IZ)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="200" end="209" startBytecode="0" endBytecode="189" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="284" end="293" startBytecode="0" endBytecode="189" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java"/>
       <Message>In method new com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator(IonContainerLite, int, boolean)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="this$0" signature="Lcom/amazon/ion/impl/lite/IonContainerLite;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
         <Message>In IonContainerLite.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.this$0</Message>
@@ -2474,48 +2365,48 @@
     <LocalVariable name="this$0" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named this$0</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="200" end="200" startBytecode="2" endBytecode="2" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
-      <Message>At IonContainerLite.java:[line 200]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="284" end="284" startBytecode="2" endBytecode="2" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <Message>At IonContainerLite.java:[line 284]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SA_FIELD_SELF_ASSIGNMENT" priority="1" rank="1" abbrev="SA" category="CORRECTNESS" instanceHash="e157432d9915932567d32bd045df9794" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Self assignment of field</ShortMessage>
-    <LongMessage>Self assignment of field IonContainerLite$SequenceContentIterator.__pos in com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.force_position_sync_helper()</LongMessage>
+    <ShortMessage>Auto-alimentation d'un champs</ShortMessage>
+    <LongMessage>Auto-alimentation du champs com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__pos dans com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.force_position_sync_helper()</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="191" end="361" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
-        <Message>At IonContainerLite.java:[lines 191-361]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="275" end="463" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
+        <Message>At IonContainerLite.java:[lines 275-463]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="force_position_sync_helper" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="225" end="254" startBytecode="0" endBytecode="296" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="309" end="338" startBytecode="0" endBytecode="296" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.force_position_sync_helper()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" name="__pos" signature="I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
         <Message>In IonContainerLite.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__pos</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="234" end="234" startBytecode="51" endBytecode="51" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonContainerLite.java">
-      <Message>At IonContainerLite.java:[line 234]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true" start="318" end="318" startBytecode="51" endBytecode="51" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
+      <Message>At IonContainerLite.java:[line 318]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="79891fc74efbc99a58252ed737deca1f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator(IonDatagramLite, boolean) may expose internal representation by storing an externally mutable object into IonDatagramLite$SystemContentIterator.this$0</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator(IonDatagramLite, boolean) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator.this$0</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" start="604" end="853" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
-        <Message>At IonDatagramLite.java:[lines 604-853]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" start="585" end="834" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+        <Message>At IonDatagramLite.java:[lines 585-834]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/lite/IonDatagramLite;Z)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" start="614" end="623" startBytecode="0" endBytecode="178" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" start="595" end="604" startBytecode="0" endBytecode="178" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
       <Message>In method new com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator(IonDatagramLite, boolean)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" name="this$0" signature="Lcom/amazon/ion/impl/lite/IonDatagramLite;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
         <Message>In IonDatagramLite.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator.this$0</Message>
@@ -2523,75 +2414,75 @@
     <LocalVariable name="this$0" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named this$0</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" primary="true" start="614" end="614" startBytecode="2" endBytecode="2" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
-      <Message>At IonDatagramLite.java:[line 614]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" primary="true" start="595" end="595" startBytecode="2" endBytecode="2" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+      <Message>At IonDatagramLite.java:[line 595]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" priority="1" rank="9" abbrev="RCN" category="CORRECTNESS" instanceHash="db2225a597140cf69dffc0ffe5dcc0a0" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>Nullcheck of value previously dereferenced</ShortMessage>
-    <LongMessage>Nullcheck of IonDatagramLite$SystemIteratorPosition.__local_values at line 1094 of value previously dereferenced in com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.push_system_value(IonValueLite)</LongMessage>
+    <ShortMessage>Test de nullité d'une valeur préalablement déréférencée</ShortMessage>
+    <LongMessage>Test de nullité dans com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.__local_values d'une valeur préalablement déréférencée dans com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.push_system_value(IonValueLite)</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="856" end="1157" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
-        <Message>At IonDatagramLite.java:[lines 856-1157]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="837" end="1138" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+        <Message>At IonDatagramLite.java:[lines 837-1138]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" name="push_system_value" signature="(Lcom/amazon/ion/impl/lite/IonValueLite;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1093" end="1103" startBytecode="0" endBytecode="229" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1074" end="1084" startBytecode="0" endBytecode="229" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.push_system_value(IonValueLite)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" name="__local_values" signature="[Lcom/amazon/ion/impl/lite/IonValueLite;" isStatic="false" primary="true" role="FIELD_VALUE_OF">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
         <Message>In IonDatagramLite.java</Message>
       </SourceLine>
       <Message>Value loaded from field com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.__local_values</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true" start="1093" end="1093" startBytecode="8" endBytecode="8" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
-      <Message>At IonDatagramLite.java:[line 1093]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true" start="1074" end="1074" startBytecode="8" endBytecode="8" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+      <Message>At IonDatagramLite.java:[line 1074]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1094" end="1094" startBytecode="16" endBytecode="16" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java" role="SOURCE_REDUNDANT_NULL_CHECK">
-      <Message>Redundant null check at IonDatagramLite.java:[line 1094]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1075" end="1075" startBytecode="16" endBytecode="16" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java" role="SOURCE_REDUNDANT_NULL_CHECK">
+      <Message>Redundant null check at IonDatagramLite.java:[line 1075]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" priority="2" rank="11" abbrev="RCN" category="CORRECTNESS" instanceHash="7b7d1cc56b68e53eb5a551bbf5bc7fe0" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>Nullcheck of value previously dereferenced</ShortMessage>
-    <LongMessage>Nullcheck of curr at line 1153 of value previously dereferenced in com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.count_system_values(IonSystem, SymbolTable, SymbolTable)</LongMessage>
+    <ShortMessage>Test de nullité d'une valeur préalablement déréférencée</ShortMessage>
+    <LongMessage>Test de nullité dans curr d'une valeur préalablement déréférencée dans com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.count_system_values(IonSystem, SymbolTable, SymbolTable)</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="856" end="1157" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
-        <Message>At IonDatagramLite.java:[lines 856-1157]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="837" end="1138" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+        <Message>At IonDatagramLite.java:[lines 837-1138]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" name="count_system_values" signature="(Lcom/amazon/ion/IonSystem;Lcom/amazon/ion/SymbolTable;Lcom/amazon/ion/SymbolTable;)I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1147" end="1157" startBytecode="0" endBytecode="188" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1128" end="1138" startBytecode="0" endBytecode="188" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.count_system_values(IonSystem, SymbolTable, SymbolTable)</Message>
     </Method>
     <LocalVariable name="curr" register="2" pc="34" role="LOCAL_VARIABLE_VALUE_OF">
       <Message>Value loaded from curr</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true" start="1148" end="1148" startBytecode="3" endBytecode="3" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java">
-      <Message>At IonDatagramLite.java:[line 1148]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true" start="1129" end="1129" startBytecode="3" endBytecode="3" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+      <Message>At IonDatagramLite.java:[line 1129]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1153" end="1153" startBytecode="35" endBytecode="35" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonDatagramLite.java" role="SOURCE_REDUNDANT_NULL_CHECK">
-      <Message>Redundant null check at IonDatagramLite.java:[line 1153]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1134" end="1134" startBytecode="35" endBytecode="35" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java" role="SOURCE_REDUNDANT_NULL_CHECK">
+      <Message>Redundant null check at IonDatagramLite.java:[line 1134]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="ES_COMPARING_STRINGS_WITH_EQ" priority="2" rank="11" abbrev="ES" category="BAD_PRACTICE" instanceHash="8c2c628526908e5f999348173832bbb7" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="597">
-    <ShortMessage>Comparison of String objects using == or !=</ShortMessage>
-    <LongMessage>Comparison of String objects using == or != in com.amazon.ion.impl.lite.IonStructLite.validate()</LongMessage>
+    <ShortMessage>Comparaison d'objets String utilisant == ou !=</ShortMessage>
+    <LongMessage>Comparaison d'objets String utilisant == ou != dans com.amazon.ion.impl.lite.IonStructLite.validate()</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonStructLite" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="41" end="818" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
-        <Message>At IonStructLite.java:[lines 41-818]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="38" end="753" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+        <Message>At IonStructLite.java:[lines 38-753]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonStructLite</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonStructLite" name="validate" signature="()Ljava/lang/String;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="219" end="233" startBytecode="0" endBytecode="73" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="216" end="230" startBytecode="0" endBytecode="73" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonStructLite.validate()</Message>
     </Method>
     <Type descriptor="Ljava/lang/String;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.String" start="125" end="3345" sourcefile="String.java" sourcepath="java/lang/String.java">
-        <Message>At String.java:[lines 125-3345]</Message>
+      <SourceLine classname="java.lang.String" start="140" end="4657" sourcefile="String.java" sourcepath="java/lang/String.java">
+        <Message>At String.java:[lines 140-4657]</Message>
       </SourceLine>
       <Message>Actual type String</Message>
     </Type>
@@ -2601,269 +2492,342 @@
     <LocalVariable name="error" register="1" pc="164" role="LOCAL_VARIABLE_VALUE_OF">
       <Message>Value loaded from error</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="233" end="233" startBytecode="166" endBytecode="166" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
-      <Message>At IonStructLite.java:[line 233]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="230" end="230" startBytecode="166" endBytecode="166" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+      <Message>At IonStructLite.java:[line 230]</Message>
     </SourceLine>
     <Property name="edu.umd.cs.findbugs.detect.RefComparisonWarningProperty.COMPARE_STATIC_STRINGS" value="true"/>
   </BugInstance>
   <BugInstance type="NP_LOAD_OF_KNOWN_NULL_VALUE" priority="2" rank="16" abbrev="NP" category="STYLE" instanceHash="398a2e584fed81324bd20bd97797f3b0" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>Load of known null value</ShortMessage>
-    <LongMessage>Load of known null value in com.amazon.ion.impl.lite.IonStructLite.add(SymbolToken, IonValue)</LongMessage>
+    <ShortMessage>Chargement d'une valeur connue pour être à null</ShortMessage>
+    <LongMessage>Chargement d'une valeur connue pour être à null dans com.amazon.ion.impl.lite.IonStructLite.add(SymbolToken, IonValue)</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonStructLite" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="41" end="818" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
-        <Message>At IonStructLite.java:[lines 41-818]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="38" end="753" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+        <Message>At IonStructLite.java:[lines 38-753]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonStructLite</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonStructLite" name="add" signature="(Lcom/amazon/ion/SymbolToken;Lcom/amazon/ion/IonValue;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="509" end="529" startBytecode="0" endBytecode="33" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="481" end="501" startBytecode="0" endBytecode="33" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonStructLite.add(SymbolToken, IonValue)</Message>
     </Method>
-    <LocalVariable name="text" register="3" pc="58" role="LOCAL_VARIABLE_VALUE_OF">
+    <LocalVariable name="text" register="3" pc="59" role="LOCAL_VARIABLE_VALUE_OF">
       <Message>Value loaded from text</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="528" end="528" startBytecode="59" endBytecode="59" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
-      <Message>At IonStructLite.java:[line 528]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="500" end="500" startBytecode="60" endBytecode="60" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+      <Message>At IonStructLite.java:[line 500]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SBSC_USE_STRINGBUFFER_CONCATENATION" priority="2" rank="18" abbrev="SBSC" category="PERFORMANCE" instanceHash="e29cf5bfde55497ab095a8a75b41d74" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Method concatenates strings using + in a loop</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.lite.IonStructLite.validate() concatenates strings using + in a loop</LongMessage>
+    <ShortMessage>La méthode concatène des chaînes au moyen de + en boucle</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.impl.lite.IonStructLite.validate() concatène des chaînes au moyen de + en boucle</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonStructLite" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="41" end="818" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
-        <Message>At IonStructLite.java:[lines 41-818]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="38" end="753" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+        <Message>At IonStructLite.java:[lines 38-753]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonStructLite</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonStructLite" name="validate" signature="()Ljava/lang/String;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="219" end="233" startBytecode="0" endBytecode="382" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="216" end="230" startBytecode="0" endBytecode="382" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonStructLite.validate()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="229" end="229" startBytecode="121" endBytecode="121" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonStructLite.java">
-      <Message>At IonStructLite.java:[line 229]</Message>
-    </SourceLine>
-  </BugInstance>
-  <BugInstance type="DM_NUMBER_CTOR" priority="2" rank="18" abbrev="Bx" category="PERFORMANCE" instanceHash="891671454919512bbe81eb1400a49b93" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Method invokes inefficient Number constructor; use static valueOf instead</ShortMessage>
-    <LongMessage>com.amazon.ion.impl.lite.IonTimestampLite.setLocalOffset(int) invokes inefficient new Integer(int) constructor; use Integer.valueOf(int) instead</LongMessage>
-    <Class classname="com.amazon.ion.impl.lite.IonTimestampLite" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonTimestampLite" start="29" end="246" sourcefile="IonTimestampLite.java" sourcepath="com/amazon/ion/impl/lite/IonTimestampLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonTimestampLite.java">
-        <Message>At IonTimestampLite.java:[lines 29-246]</Message>
-      </SourceLine>
-      <Message>In class com.amazon.ion.impl.lite.IonTimestampLite</Message>
-    </Class>
-    <Method classname="com.amazon.ion.impl.lite.IonTimestampLite" name="setLocalOffset" signature="(I)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonTimestampLite" start="215" end="216" startBytecode="0" endBytecode="68" sourcefile="IonTimestampLite.java" sourcepath="com/amazon/ion/impl/lite/IonTimestampLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonTimestampLite.java"/>
-      <Message>In method com.amazon.ion.impl.lite.IonTimestampLite.setLocalOffset(int)</Message>
-    </Method>
-    <Method classname="java.lang.Integer" name="&lt;init&gt;" signature="(I)V" isStatic="false" role="METHOD_CALLED">
-      <SourceLine classname="java.lang.Integer" start="1082" end="1084" startBytecode="0" endBytecode="69" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
-      <Message>Called method new Integer(int)</Message>
-    </Method>
-    <Method classname="java.lang.Integer" name="valueOf" signature="(I)Ljava/lang/Integer;" isStatic="true" role="SHOULD_CALL">
-      <SourceLine classname="java.lang.Integer" start="1057" end="1059" startBytecode="0" endBytecode="90" sourcefile="Integer.java" sourcepath="java/lang/Integer.java"/>
-      <Message>Should call Integer.valueOf(int) instead</Message>
-    </Method>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonTimestampLite" primary="true" start="215" end="215" startBytecode="6" endBytecode="6" sourcefile="IonTimestampLite.java" sourcepath="com/amazon/ion/impl/lite/IonTimestampLite.java" relSourcepath="src/com/amazon/ion/impl/lite/IonTimestampLite.java">
-      <Message>At IonTimestampLite.java:[line 215]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="226" end="226" startBytecode="121" endBytecode="121" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+      <Message>At IonStructLite.java:[line 226]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT" priority="2" rank="17" abbrev="BSHIFT" category="STYLE" instanceHash="2fcf6ca181f8ad96d590e312b49a642c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Unsigned right shift cast to short/byte</ShortMessage>
-    <LongMessage>Unsigned right shift cast to short/byte in com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarInt(int)</LongMessage>
+    <ShortMessage>Décalage à droite non signé et transtypage short/byte</ShortMessage>
+    <LongMessage>Décalage à droite non signé et transtypage vers un short/byte dans com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarInt(int)</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="90" end="1464" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
+      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="90" end="1464" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
         <Message>At ReverseBinaryEncoder.java:[lines 90-1464]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.ReverseBinaryEncoder</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" name="writeVarInt" signature="(I)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="538" end="619" startBytecode="0" endBytecode="700" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="538" end="619" startBytecode="0" endBytecode="700" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java"/>
       <Message>In method com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarInt(int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true" start="571" end="571" startBytecode="118" endBytecode="118" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true" start="571" end="571" startBytecode="118" endBytecode="118" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
       <Message>At ReverseBinaryEncoder.java:[line 571]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="581" end="581" startBytecode="174" endBytecode="174" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="581" end="581" startBytecode="174" endBytecode="174" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at ReverseBinaryEncoder.java:[line 581]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="592" end="592" startBytecode="246" endBytecode="246" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="592" end="592" startBytecode="246" endBytecode="246" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at ReverseBinaryEncoder.java:[line 592]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT" priority="2" rank="17" abbrev="BSHIFT" category="STYLE" instanceHash="fd4898df5b4dfc93069b54d16ee4ef7c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Unsigned right shift cast to short/byte</ShortMessage>
-    <LongMessage>Unsigned right shift cast to short/byte in com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarUInt(int)</LongMessage>
+    <ShortMessage>Décalage à droite non signé et transtypage short/byte</ShortMessage>
+    <LongMessage>Décalage à droite non signé et transtypage vers un short/byte dans com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarUInt(int)</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="90" end="1464" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
+      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="90" end="1464" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
         <Message>At ReverseBinaryEncoder.java:[lines 90-1464]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.ReverseBinaryEncoder</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" name="writeVarUInt" signature="(I)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="472" end="521" startBytecode="0" endBytecode="530" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="472" end="521" startBytecode="0" endBytecode="530" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java"/>
       <Message>In method com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarUInt(int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true" start="486" end="486" startBytecode="69" endBytecode="69" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true" start="486" end="486" startBytecode="69" endBytecode="69" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
       <Message>At ReverseBinaryEncoder.java:[line 486]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="494" end="494" startBytecode="116" endBytecode="116" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="494" end="494" startBytecode="116" endBytecode="116" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at ReverseBinaryEncoder.java:[line 494]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="503" end="503" startBytecode="179" endBytecode="179" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="503" end="503" startBytecode="179" endBytecode="179" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at ReverseBinaryEncoder.java:[line 503]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="513" end="513" startBytecode="252" endBytecode="252" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="513" end="513" startBytecode="252" endBytecode="252" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at ReverseBinaryEncoder.java:[line 513]</Message>
     </SourceLine>
   </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="c44e2a3d646df3e5542a6dadd8c623f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.getIonBinaryWriterBuilder() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.system.IonSystemBuilder.binaryWriterBuilder</LongMessage>
+    <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.system.IonSystemBuilder" name="getIonBinaryWriterBuilder" signature="()Lcom/amazon/ion/system/IonBinaryWriterBuilder;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="345" end="345" startBytecode="0" endBytecode="46" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <Message>In method com.amazon.ion.system.IonSystemBuilder.getIonBinaryWriterBuilder()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.system.IonSystemBuilder" name="binaryWriterBuilder" signature="Lcom/amazon/ion/system/IonBinaryWriterBuilder;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>In IonSystemBuilder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.system.IonSystemBuilder.binaryWriterBuilder</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="345" end="345" startBytecode="4" endBytecode="4" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 345]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="4a97b7ce8f9d4ea446f9b0a8a853f3ea" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.getIonTextWriterBuilder() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.system.IonSystemBuilder.textWriterBuilder</LongMessage>
+    <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.system.IonSystemBuilder" name="getIonTextWriterBuilder" signature="()Lcom/amazon/ion/system/IonTextWriterBuilder;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="292" end="292" startBytecode="0" endBytecode="46" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <Message>In method com.amazon.ion.system.IonSystemBuilder.getIonTextWriterBuilder()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.system.IonSystemBuilder" name="textWriterBuilder" signature="Lcom/amazon/ion/system/IonTextWriterBuilder;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>In IonSystemBuilder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.system.IonSystemBuilder.textWriterBuilder</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="292" end="292" startBytecode="4" endBytecode="4" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 292]</Message>
+    </SourceLine>
+  </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="238ea94b9fbc4d991e904f39656925e4" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.system.IonSystemBuilder.getReaderBuilder() may expose internal representation by returning IonSystemBuilder.readerBuilder</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.getReaderBuilder() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.system.IonSystemBuilder.readerBuilder</LongMessage>
     <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="84" end="358" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
-        <Message>At IonSystemBuilder.java:[lines 84-358]</Message>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.system.IonSystemBuilder" name="getReaderBuilder" signature="()Lcom/amazon/ion/system/IonReaderBuilder;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="287" end="287" startBytecode="0" endBytecode="46" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="398" end="398" startBytecode="0" endBytecode="46" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
       <Message>In method com.amazon.ion.system.IonSystemBuilder.getReaderBuilder()</Message>
     </Method>
     <Field classname="com.amazon.ion.system.IonSystemBuilder" name="readerBuilder" signature="Lcom/amazon/ion/system/IonReaderBuilder;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
         <Message>In IonSystemBuilder.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.system.IonSystemBuilder.readerBuilder</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="287" end="287" startBytecode="4" endBytecode="4" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
-      <Message>At IonSystemBuilder.java:[line 287]</Message>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="398" end="398" startBytecode="4" endBytecode="4" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 398]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="9351307308fc1a50b5c24fb76646cac6" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.setIonBinaryWriterBuilder(IonBinaryWriterBuilder) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.system.IonSystemBuilder.binaryWriterBuilder</LongMessage>
+    <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.system.IonSystemBuilder" name="setIonBinaryWriterBuilder" signature="(Lcom/amazon/ion/system/IonBinaryWriterBuilder;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="363" end="365" startBytecode="0" endBytecode="75" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <Message>In method com.amazon.ion.system.IonSystemBuilder.setIonBinaryWriterBuilder(IonBinaryWriterBuilder)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.system.IonSystemBuilder" name="binaryWriterBuilder" signature="Lcom/amazon/ion/system/IonBinaryWriterBuilder;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>In IonSystemBuilder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.system.IonSystemBuilder.binaryWriterBuilder</Message>
+    </Field>
+    <LocalVariable name="?" register="-1" pc="11" role="LOCAL_VARIABLE_UNKNOWN">
+      <Message>Local variable stored in JVM register ?</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="364" end="364" startBytecode="12" endBytecode="12" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 364]</Message>
+    </SourceLine>
+  </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="7f5d5be9a0962a786a4878b30c8a8774" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.setIonTextWriterBuilder(IonTextWriterBuilder) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.system.IonSystemBuilder.textWriterBuilder</LongMessage>
+    <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.system.IonSystemBuilder" name="setIonTextWriterBuilder" signature="(Lcom/amazon/ion/system/IonTextWriterBuilder;)V" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="310" end="312" startBytecode="0" endBytecode="75" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <Message>In method com.amazon.ion.system.IonSystemBuilder.setIonTextWriterBuilder(IonTextWriterBuilder)</Message>
+    </Method>
+    <Field classname="com.amazon.ion.system.IonSystemBuilder" name="textWriterBuilder" signature="Lcom/amazon/ion/system/IonTextWriterBuilder;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>In IonSystemBuilder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.system.IonSystemBuilder.textWriterBuilder</Message>
+    </Field>
+    <LocalVariable name="?" register="-1" pc="11" role="LOCAL_VARIABLE_UNKNOWN">
+      <Message>Local variable stored in JVM register ?</Message>
+    </LocalVariable>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="311" end="311" startBytecode="12" endBytecode="12" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 311]</Message>
     </SourceLine>
   </BugInstance>
-  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="bb9e01cd9f71a1049efd92d5d3c49a41" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.system.IonSystemBuilder.setReaderBuilder(IonReaderBuilder) may expose internal representation by storing an externally mutable object into IonSystemBuilder.readerBuilder</LongMessage>
+  <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="624bf93bedc7b88bdd39ad55bb6888b6" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.setReaderBuilder(IonReaderBuilder) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.system.IonSystemBuilder.readerBuilder</LongMessage>
     <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="84" end="358" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
-        <Message>At IonSystemBuilder.java:[lines 84-358]</Message>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.system.IonSystemBuilder" name="setReaderBuilder" signature="(Lcom/amazon/ion/system/IonReaderBuilder;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="305" end="307" startBytecode="0" endBytecode="69" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="416" end="418" startBytecode="0" endBytecode="75" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
       <Message>In method com.amazon.ion.system.IonSystemBuilder.setReaderBuilder(IonReaderBuilder)</Message>
     </Method>
     <Field classname="com.amazon.ion.system.IonSystemBuilder" name="readerBuilder" signature="Lcom/amazon/ion/system/IonReaderBuilder;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
         <Message>In IonSystemBuilder.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.system.IonSystemBuilder.readerBuilder</Message>
     </Field>
-    <LocalVariable name="builder" register="1" pc="6" role="LOCAL_VARIABLE_NAMED">
-      <Message>Local variable named builder</Message>
+    <LocalVariable name="?" register="-1" pc="11" role="LOCAL_VARIABLE_UNKNOWN">
+      <Message>Local variable stored in JVM register ?</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="306" end="306" startBytecode="6" endBytecode="6" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
-      <Message>At IonSystemBuilder.java:[line 306]</Message>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="417" end="417" startBytecode="12" endBytecode="12" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 417]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_EXPOSE_REP" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="309257473ba90ad1ae51e692ce2020b4" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Public static method may expose internal representation by returning array</ShortMessage>
-    <LongMessage>Public static com.amazon.ion.system.IonSystemBuilder.standard() may expose internal representation by returning IonSystemBuilder.STANDARD</LongMessage>
+    <ShortMessage>Une méthode statique publique risque d'exposer une représentation interne en renvoyant un tableau</ShortMessage>
+    <LongMessage>La méthode statique publique com.amazon.ion.system.IonSystemBuilder.standard() peut exposer une représentation interne en renvoyant com.amazon.ion.system.IonSystemBuilder.STANDARD</LongMessage>
     <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="84" end="358" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
-        <Message>At IonSystemBuilder.java:[lines 84-358]</Message>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.system.IonSystemBuilder" name="standard" signature="()Lcom/amazon/ion/system/IonSystemBuilder;" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="96" end="96" startBytecode="0" endBytecode="27" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="98" end="98" startBytecode="0" endBytecode="27" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
       <Message>In method com.amazon.ion.system.IonSystemBuilder.standard()</Message>
     </Method>
     <Field classname="com.amazon.ion.system.IonSystemBuilder" name="STANDARD" signature="Lcom/amazon/ion/system/IonSystemBuilder;" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
         <Message>In IonSystemBuilder.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.system.IonSystemBuilder.STANDARD</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="96" end="96" startBytecode="3" endBytecode="3" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/com/amazon/ion/system/IonSystemBuilder.java">
-      <Message>At IonSystemBuilder.java:[line 96]</Message>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="98" end="98" startBytecode="3" endBytecode="3" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 98]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="BC_EQUALS_METHOD_SHOULD_WORK_FOR_ALL_OBJECTS" priority="2" rank="16" abbrev="BC" category="BAD_PRACTICE" instanceHash="b1501ead4d1f31655c61d7d81eb69329" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Equals method should not assume anything about the type of its argument</ShortMessage>
     <LongMessage>Equals method for com.amazon.ion.util.Equivalence$Field assumes the argument is of type Equivalence$Field</LongMessage>
     <Class classname="com.amazon.ion.util.Equivalence$Field" primary="true">
-      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="421" end="471" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java">
-        <Message>At Equivalence.java:[lines 421-471]</Message>
+      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="444" end="496" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/main/java/com/amazon/ion/util/Equivalence.java">
+        <Message>At Equivalence.java:[lines 444-496]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.util.Equivalence$Field</Message>
     </Class>
     <Method classname="com.amazon.ion.util.Equivalence$Field" name="equals" signature="(Ljava/lang/Object;)Z" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="468" end="470" startBytecode="0" endBytecode="135" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java"/>
+      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="493" end="495" startBytecode="0" endBytecode="139" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/main/java/com/amazon/ion/util/Equivalence.java"/>
       <Message>In method com.amazon.ion.util.Equivalence$Field.equals(Object)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.util.Equivalence$Field" primary="true" start="468" end="468" startBytecode="1" endBytecode="1" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java">
-      <Message>At Equivalence.java:[line 468]</Message>
+    <SourceLine classname="com.amazon.ion.util.Equivalence$Field" primary="true" start="493" end="493" startBytecode="1" endBytecode="1" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/main/java/com/amazon/ion/util/Equivalence.java">
+      <Message>At Equivalence.java:[line 493]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT" priority="2" rank="11" abbrev="NP" category="BAD_PRACTICE" instanceHash="6ac3d35c70d5495ccdd6381542086821" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>equals() method does not check for null argument</ShortMessage>
-    <LongMessage>com.amazon.ion.util.Equivalence$Field.equals(Object) does not check for null argument</LongMessage>
+    <ShortMessage>Méthode equals() ne vérifiant pas la nullité</ShortMessage>
+    <LongMessage>com.amazon.ion.util.Equivalence$Field.equals(Object) ne vérifie pas la nullité d'un paramètre</LongMessage>
     <Class classname="com.amazon.ion.util.Equivalence$Field" primary="true">
-      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="421" end="471" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java">
-        <Message>At Equivalence.java:[lines 421-471]</Message>
+      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="444" end="496" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/main/java/com/amazon/ion/util/Equivalence.java">
+        <Message>At Equivalence.java:[lines 444-496]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.util.Equivalence$Field</Message>
     </Class>
     <Method classname="com.amazon.ion.util.Equivalence$Field" name="equals" signature="(Ljava/lang/Object;)Z" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="468" end="470" startBytecode="0" endBytecode="135" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java"/>
+      <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="493" end="495" startBytecode="0" endBytecode="139" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/main/java/com/amazon/ion/util/Equivalence.java"/>
       <Message>In method com.amazon.ion.util.Equivalence$Field.equals(Object)</Message>
     </Method>
     <LocalVariable name="other" register="1" pc="0" role="LOCAL_VARIABLE_PARAMETER_NAMED">
       <Message>Parameter other</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="468" end="470" startBytecode="0" endBytecode="135" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/com/amazon/ion/util/Equivalence.java" synthetic="true">
-      <Message>At Equivalence.java:[lines 468-470]</Message>
+    <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="493" end="495" startBytecode="0" endBytecode="139" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/main/java/com/amazon/ion/util/Equivalence.java" synthetic="true">
+      <Message>At Equivalence.java:[lines 493-495]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="e557838e54f12add1769c485479329bb" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
-    <LongMessage>com.amazon.ion.util.JarInfo.getBuildTime() may expose internal representation by returning JarInfo.ourBuildTime</LongMessage>
+    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode com.amazon.ion.util.JarInfo.getBuildTime() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.util.JarInfo.ourBuildTime</LongMessage>
     <Class classname="com.amazon.ion.util.JarInfo" primary="true">
-      <SourceLine classname="com.amazon.ion.util.JarInfo" start="48" end="125" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/com/amazon/ion/util/JarInfo.java">
-        <Message>At JarInfo.java:[lines 48-125]</Message>
+      <SourceLine classname="com.amazon.ion.util.JarInfo" start="43" end="120" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/main/java/com/amazon/ion/util/JarInfo.java">
+        <Message>At JarInfo.java:[lines 43-120]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.util.JarInfo</Message>
     </Class>
     <Method classname="com.amazon.ion.util.JarInfo" name="getBuildTime" signature="()Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.util.JarInfo" start="70" end="70" startBytecode="0" endBytecode="46" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/com/amazon/ion/util/JarInfo.java"/>
+      <SourceLine classname="com.amazon.ion.util.JarInfo" start="65" end="65" startBytecode="0" endBytecode="46" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/main/java/com/amazon/ion/util/JarInfo.java"/>
       <Message>In method com.amazon.ion.util.JarInfo.getBuildTime()</Message>
     </Method>
     <Field classname="com.amazon.ion.util.JarInfo" name="ourBuildTime" signature="Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.util.JarInfo" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/com/amazon/ion/util/JarInfo.java">
+      <SourceLine classname="com.amazon.ion.util.JarInfo" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/main/java/com/amazon/ion/util/JarInfo.java">
         <Message>In JarInfo.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.util.JarInfo.ourBuildTime</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.util.JarInfo" primary="true" start="70" end="70" startBytecode="4" endBytecode="4" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/com/amazon/ion/util/JarInfo.java">
-      <Message>At JarInfo.java:[line 70]</Message>
+    <SourceLine classname="com.amazon.ion.util.JarInfo" primary="true" start="65" end="65" startBytecode="4" endBytecode="4" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/main/java/com/amazon/ion/util/JarInfo.java">
+      <Message>At JarInfo.java:[line 65]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="90d966275cb56b8eb2c12e2e886d9799" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
-    <LongMessage>new com.amazon.ion.util.Printer$Options(Printer) may expose internal representation by storing an externally mutable object into Printer$Options.this$0</LongMessage>
+    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
+    <LongMessage>La méthode new com.amazon.ion.util.Printer$Options(Printer) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.util.Printer$Options.this$0</LongMessage>
     <Class classname="com.amazon.ion.util.Printer$Options" primary="true">
-      <SourceLine classname="com.amazon.ion.util.Printer$Options" start="84" end="111" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java">
-        <Message>At Printer.java:[lines 84-111]</Message>
+      <SourceLine classname="com.amazon.ion.util.Printer$Options" start="88" end="115" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/main/java/com/amazon/ion/util/Printer.java">
+        <Message>At Printer.java:[lines 88-115]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.util.Printer$Options</Message>
     </Class>
     <Method classname="com.amazon.ion.util.Printer$Options" name="&lt;init&gt;" signature="(Lcom/amazon/ion/util/Printer;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.util.Printer$Options" start="84" end="84" startBytecode="0" endBytecode="61" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java"/>
+      <SourceLine classname="com.amazon.ion.util.Printer$Options" start="88" end="88" startBytecode="0" endBytecode="61" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/main/java/com/amazon/ion/util/Printer.java"/>
       <Message>In method new com.amazon.ion.util.Printer$Options(Printer)</Message>
     </Method>
     <Field classname="com.amazon.ion.util.Printer$Options" name="this$0" signature="Lcom/amazon/ion/util/Printer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.util.Printer$Options" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java">
+      <SourceLine classname="com.amazon.ion.util.Printer$Options" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/main/java/com/amazon/ion/util/Printer.java">
         <Message>In Printer.java</Message>
       </SourceLine>
       <Message>Field com.amazon.ion.util.Printer$Options.this$0</Message>
@@ -2871,21 +2835,21 @@
     <LocalVariable name="this$0" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named this$0</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.util.Printer$Options" primary="true" start="84" end="84" startBytecode="2" endBytecode="2" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java">
-      <Message>At Printer.java:[line 84]</Message>
+    <SourceLine classname="com.amazon.ion.util.Printer$Options" primary="true" start="88" end="88" startBytecode="2" endBytecode="2" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/main/java/com/amazon/ion/util/Printer.java">
+      <Message>At Printer.java:[line 88]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SIC_INNER_SHOULD_BE_STATIC" priority="2" rank="18" abbrev="SIC" category="PERFORMANCE" instanceHash="f1c9859bc3808074f14801216c655fa8" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Should be a static inner class</ShortMessage>
-    <LongMessage>Should com.amazon.ion.util.Printer$Options be a _static_ inner class?</LongMessage>
+    <ShortMessage>Devrait être une classe interne statique</ShortMessage>
+    <LongMessage>La classe com.amazon.ion.util.Printer$Options devrait-elle être une classe interne static ?</LongMessage>
     <Class classname="com.amazon.ion.util.Printer$Options" primary="true">
-      <SourceLine classname="com.amazon.ion.util.Printer$Options" start="84" end="111" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java">
-        <Message>At Printer.java:[lines 84-111]</Message>
+      <SourceLine classname="com.amazon.ion.util.Printer$Options" start="88" end="115" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/main/java/com/amazon/ion/util/Printer.java">
+        <Message>At Printer.java:[lines 88-115]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.util.Printer$Options</Message>
     </Class>
-    <SourceLine classname="com.amazon.ion.util.Printer$Options" start="84" end="111" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/com/amazon/ion/util/Printer.java" synthetic="true">
-      <Message>At Printer.java:[lines 84-111]</Message>
+    <SourceLine classname="com.amazon.ion.util.Printer$Options" start="88" end="115" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/main/java/com/amazon/ion/util/Printer.java" synthetic="true">
+      <Message>At Printer.java:[lines 88-115]</Message>
     </SourceLine>
   </BugInstance>
 </BugCollection>
diff --git a/src/main/java/com/amazon/ion/system/IonSystemBuilder.java b/src/main/java/com/amazon/ion/system/IonSystemBuilder.java
index c6c69c74f8..35db2ef2a0 100644
--- a/src/main/java/com/amazon/ion/system/IonSystemBuilder.java
+++ b/src/main/java/com/amazon/ion/system/IonSystemBuilder.java
@@ -24,6 +24,8 @@
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
 import com.amazon.ion.impl._Private_Utils;
+import java.util.Objects;
+import java.util.Optional;
 
 /**
  * The builder for creating {@link IonSystem}s.
@@ -101,7 +103,10 @@ public static IonSystemBuilder standard()
 
     IonCatalog myCatalog;
     boolean myStreamCopyOptimized = false;
-    IonReaderBuilder readerBuilder;
+
+    IonTextWriterBuilder textWriterBuilder = IonTextWriterBuilder.standard().withCharsetAscii();
+    IonBinaryWriterBuilder binaryWriterBuilder = IonBinaryWriterBuilder.standard();
+    IonReaderBuilder readerBuilder = IonReaderBuilder.standard();
 
 
     /** You no touchy. */
@@ -114,6 +119,8 @@ private IonSystemBuilder(IonSystemBuilder that)
     {
         this.myCatalog      = that.myCatalog;
         this.myStreamCopyOptimized = that.myStreamCopyOptimized;
+        this.textWriterBuilder = that.textWriterBuilder;
+        this.binaryWriterBuilder = that.binaryWriterBuilder;
         this.readerBuilder = that.readerBuilder;
     }
 
@@ -271,7 +278,113 @@ public final IonSystemBuilder withStreamCopyOptimized(boolean optimized)
         return b;
     }
 
+    //=========================================================================
 
+    /**
+     * Gets the text writer builder whose options will be used when building an
+     * {@link IonSystem}. By default, {@link IonTextWriterBuilder#standard()}
+     * using {@code US-ASCII} encoding will be used.
+     *
+     * @see #setIonTextWriterBuilder(IonTextWriterBuilder)
+     * @see #withIonTextWriterBuilder(IonTextWriterBuilder)
+     */
+    public final IonTextWriterBuilder getIonTextWriterBuilder() {
+        return textWriterBuilder;
+    }
+
+    /**
+     * Sets the text writer builder whose options will be used when building
+     * an {@link IonSystem}. The writer builder's catalog will never be used; the
+     * catalog provided to {@link #setCatalog(IonCatalog)} or
+     * {@link #withCatalog(IonCatalog)} will always be used instead.
+     *
+     * @param builder the writer builder to use in built systems.
+     *  If null, each system will be built with {@link IonTextWriterBuilder#standard()}
+     *  using {@code US-ASCII} encoding.
+     *
+     * @see #getIonTextWriterBuilder()
+     * @see #withIonTextWriterBuilder(IonTextWriterBuilder)
+     *
+     * @throws UnsupportedOperationException if this is immutable.
+     */
+    public final void setIonTextWriterBuilder(IonTextWriterBuilder builder) {
+        mutationCheck();
+        textWriterBuilder = Objects.requireNonNull(builder);
+    }
+
+    /**
+     * Declares the text writer builder whose options will be used when building
+     * an {@link IonSystem}, returning a new mutable builder if this is immutable.
+     * The writer builder's catalog will never be used; the catalog provided to
+     * {@link #setCatalog(IonCatalog)} or {@link #withCatalog(IonCatalog)} will
+     * always be used instead.
+     *
+     * @param builder the writer builder to use in built systems.
+     *  If null, each system will be built with {@link IonTextWriterBuilder#standard()}
+     *  using {@code US-ASCII} encoding.
+     *
+     * @see #getIonTextWriterBuilder()
+     * @see #setIonTextWriterBuilder(IonTextWriterBuilder)
+     */
+    public final IonSystemBuilder withIonTextWriterBuilder(IonTextWriterBuilder builder)
+    {
+        IonSystemBuilder b = mutable();
+        b.setIonTextWriterBuilder(builder);
+        return b;
+    }
+
+    //=========================================================================
+
+    /**
+     * Gets the binary writer builder whose options will be used when building an
+     * {@link IonSystem}. By default, {@link IonBinaryWriterBuilder#standard()} will
+     * be used.
+     *
+     * @see #setIonBinaryWriterBuilder(IonBinaryWriterBuilder)
+     * @see #withIonBinaryWriterBuilder(IonBinaryWriterBuilder)
+     */
+    public final IonBinaryWriterBuilder getIonBinaryWriterBuilder() {
+        return binaryWriterBuilder;
+    }
+
+    /**
+     * Sets the binary writer builder whose options will be used when building
+     * an {@link IonSystem}. The writer builder's catalog will never be used; the
+     * catalog provided to {@link #setCatalog(IonCatalog)} or
+     * {@link #withCatalog(IonCatalog)} will always be used instead.
+     *
+     * @param builder the writer builder to use in built systems.
+     *  If null, each system will be built with {@link IonBinaryWriterBuilder#standard()}.
+     *
+     * @see #getIonBinaryWriterBuilder()
+     * @see #withIonBinaryWriterBuilder(IonBinaryWriterBuilder)
+     *
+     * @throws UnsupportedOperationException if this is immutable.
+     */
+    public final void setIonBinaryWriterBuilder(IonBinaryWriterBuilder builder) {
+        mutationCheck();
+        binaryWriterBuilder = Objects.requireNonNull(builder);
+    }
+
+    /**
+     * Declares the binary writer builder whose options will be used to use when building
+     * an {@link IonSystem}, returning a new mutable builder if this is immutable.
+     * The writer builder's catalog will never be used; the catalog provided to
+     * {@link #setCatalog(IonCatalog)} or {@link #withCatalog(IonCatalog)} will
+     * always be used instead.
+     *
+     * @param builder the writer builder to use in built systems.
+     *  If null, each system will be built with {@link IonBinaryWriterBuilder#standard()}.
+     *
+     * @see #getIonBinaryWriterBuilder()
+     * @see #setIonBinaryWriterBuilder(IonBinaryWriterBuilder)
+     */
+    public final IonSystemBuilder withIonBinaryWriterBuilder(IonBinaryWriterBuilder builder)
+    {
+        IonSystemBuilder b = mutable();
+        b.setIonBinaryWriterBuilder(builder);
+        return b;
+    }
 
     //=========================================================================
 
@@ -303,7 +416,7 @@ public final IonReaderBuilder getReaderBuilder() {
      */
     public final void setReaderBuilder(IonReaderBuilder builder) {
         mutationCheck();
-        readerBuilder = builder;
+        readerBuilder = Objects.requireNonNull(builder);
     }
 
     /**
@@ -334,16 +447,13 @@ public final IonSystemBuilder withReaderBuilder(IonReaderBuilder builder)
      */
     public final IonSystem build()
     {
-        IonCatalog catalog =
-            (myCatalog != null ? myCatalog : new SimpleCatalog());
+        IonCatalog catalog = Optional.ofNullable(myCatalog).orElseGet(SimpleCatalog::new);
 
-        IonTextWriterBuilder twb =
-            IonTextWriterBuilder.standard().withCharsetAscii();
-        twb.setCatalog(catalog);
+        IonTextWriterBuilder twb = textWriterBuilder.copy().withCatalog(catalog);
+        IonBinaryWriterBuilder bwb = binaryWriterBuilder.copy().withCatalog(catalog);
+        IonReaderBuilder rb = readerBuilder.copy().withCatalog(catalog);
 
-        _Private_IonBinaryWriterBuilder bwb =
-            _Private_IonBinaryWriterBuilder.standard();
-        bwb.setCatalog(catalog);
+        // TODO Use #setStreamCopyOptimized directly on the BWB
         bwb.setStreamCopyOptimized(myStreamCopyOptimized);
 
         // TODO Would be nice to remove this since it's implied by the BWB.
@@ -353,9 +463,8 @@ public final IonSystem build()
         bwb.setInitialSymbolTable(systemSymtab);
         // This is what we need, more or less.
 //        bwb = bwb.fillDefaults();
-        IonReaderBuilder rb = readerBuilder == null ? IonReaderBuilder.standard() : readerBuilder;
-        rb = rb.withCatalog(catalog);
-        return newLiteSystem(twb, bwb, rb);
+
+        return newLiteSystem(twb, (_Private_IonBinaryWriterBuilder) bwb, rb);
     }
 
     //=========================================================================
diff --git a/src/test/java/com/amazon/ion/system/IonSystemBuilderTest.java b/src/test/java/com/amazon/ion/system/IonSystemBuilderTest.java
index ad3f40b0fb..6e0379f275 100644
--- a/src/test/java/com/amazon/ion/system/IonSystemBuilderTest.java
+++ b/src/test/java/com/amazon/ion/system/IonSystemBuilderTest.java
@@ -133,6 +133,49 @@ public void testStreamCopyOptimizedImmutability()
         b2.setStreamCopyOptimized(false);
     }
 
+    //-------------------------------------------------------------------------
+
+    @Test
+    public void testIonTextWriterBuilder()
+    {
+        IonCatalog textWriterCatalog = new SimpleCatalog(); // should be ignored
+        IonTextWriterBuilder textWriterBuilder = IonTextWriterBuilder.standard().withCatalog(textWriterCatalog);
+
+        IonSystemBuilder systemBuilder = IonSystemBuilder.standard().withIonTextWriterBuilder(textWriterBuilder);
+        assertSame(textWriterBuilder, systemBuilder.getIonTextWriterBuilder());
+
+        IonCatalog systemCatalog = new SimpleCatalog();
+        IonSystem system = systemBuilder.withCatalog(systemCatalog).build();
+        assertSame(systemCatalog, system.getCatalog());
+    }
+
+    @Test
+    public void testIonBinaryWriterBuilder()
+    {
+        IonCatalog binaryWriterCatalog = new SimpleCatalog(); // should be ignored
+        IonBinaryWriterBuilder binaryWriterBuilder = IonBinaryWriterBuilder.standard().withCatalog(binaryWriterCatalog);
+
+        IonSystemBuilder systemBuilder = IonSystemBuilder.standard().withIonBinaryWriterBuilder(binaryWriterBuilder);
+        assertSame(binaryWriterBuilder, systemBuilder.getIonBinaryWriterBuilder());
+
+        IonCatalog systemCatalog = new SimpleCatalog();
+        IonSystem system = systemBuilder.withCatalog(systemCatalog).build();
+        assertSame(systemCatalog, system.getCatalog());
+    }
+
+    @Test
+    public void testIonReaderBuilder()
+    {
+        IonCatalog readerCatalog = new SimpleCatalog(); // should be ignored
+        IonReaderBuilder readerBuilder = IonReaderBuilder.standard().withCatalog(readerCatalog);
+
+        IonSystemBuilder systemBuilder = IonSystemBuilder.standard().withReaderBuilder(readerBuilder);
+        assertSame(readerBuilder, systemBuilder.getReaderBuilder());
+
+        IonCatalog systemCatalog = new SimpleCatalog();
+        IonSystem system = systemBuilder.withCatalog(systemCatalog).build();
+        assertSame(systemCatalog, system.getCatalog());
+    }
 
     //-------------------------------------------------------------------------
 

From 409987bbd4ccccf845efe0b8027afcd16a0d3613 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 10 Apr 2024 17:02:14 -0700
Subject: [PATCH 370/490] Adds a configurable limit to the number of timestamp
 fractional second digits that are written to text representations.

---
 src/main/java/com/amazon/ion/Timestamp.java   | 94 +++++++++++++++++--
 .../com/amazon/ion/_Private_Trampoline.kt     |  9 ++
 .../amazon/ion/impl/IonWriterSystemText.java  |  6 +-
 .../impl/_Private_IonTextWriterBuilder.java   |  7 ++
 .../ion/system/IonTextWriterBuilder.java      | 44 +++++++++
 .../java/com/amazon/ion/TimestampTest.java    | 81 ++++++++++++++++
 .../com/amazon/ion/impl/TextWriterTest.java   |  7 ++
 7 files changed, 238 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/com/amazon/ion/_Private_Trampoline.kt

diff --git a/src/main/java/com/amazon/ion/Timestamp.java b/src/main/java/com/amazon/ion/Timestamp.java
index 3ecb91baa3..13057cf689 100644
--- a/src/main/java/com/amazon/ion/Timestamp.java
+++ b/src/main/java/com/amazon/ion/Timestamp.java
@@ -19,6 +19,7 @@
 import static com.amazon.ion.util.IonTextUtils.printCodePointAsString;
 
 import com.amazon.ion.impl._Private_Utils;
+import com.amazon.ion.system.IonTextWriterBuilder;
 import com.amazon.ion.util.IonTextUtils;
 import java.io.IOException;
 import java.math.BigDecimal;
@@ -133,6 +134,18 @@ public final class Timestamp
     private static final int FLAG_MINUTE    = 0x08;
     private static final int FLAG_SECOND    = 0x10;
 
+    /**
+     * The default maximum number of digits in the fractional component that will be written when a text representation
+     * of a timestamp is requested. If more precision is needed, timestamps can be serialized using a text IonWriter
+     * configured with {@link IonTextWriterBuilder#withMaximumTimestampPrecisionDigits(int)}.
+     *
+     * @see #toString()
+     * @see #toZString()
+     * @see #print(Appendable)
+     * @see #printZ(Appendable)
+     */
+    public static final int DEFAULT_MAXIMUM_DIGITS_TEXT = 10000;
+
     /**
      * The precision of the Timestamp.
      */
@@ -2035,16 +2048,34 @@ public Timestamp withLocalOffset(Integer offset)
      * Returns the string representation (in Ion format) of this Timestamp in
      * its local time.
      *
+     * @throws IonException if the text representation of the timestamp requires more than
+     *  {@link Timestamp#DEFAULT_MAXIMUM_DIGITS_TEXT}.
+     *
      * @see #toZString()
      * @see #print(Appendable)
      */
     @Override
     public String toString()
+    {
+        return toString(DEFAULT_MAXIMUM_DIGITS_TEXT);
+    }
+
+    /**
+     * Returns the string representation (in Ion format) of this Timestamp in
+     * its local time.
+     *
+     * @throws IonException if the text representation of the timestamp requires more than
+     *  the given maximum.
+     *
+     * @see #toZString()
+     * @see #print(Appendable)
+     */
+    String toString(int maximumDigits)
     {
         StringBuilder buffer = new StringBuilder(32);
         try
         {
-            print(buffer);
+            print(buffer, maximumDigits);
         }
         catch (IOException e)
         {
@@ -2059,6 +2090,9 @@ public String toString()
      * Returns the string representation (in Ion format) of this Timestamp
      * in UTC.
      *
+     * @throws IonException if the text representation of the timestamp requires more than
+     *  {@link Timestamp#DEFAULT_MAXIMUM_DIGITS_TEXT}.
+     *
      * @see #toString()
      * @see #printZ(Appendable)
      */
@@ -2087,11 +2121,33 @@ public String toZString()
      * @param out not {@code null}
      *
      * @throws IOException propagated when the {@link Appendable} throws it
+     * @throws IonException if the text representation of the timestamp requires more than
+     *  {@link Timestamp#DEFAULT_MAXIMUM_DIGITS_TEXT}.
      *
      * @see #printZ(Appendable)
      */
     public void print(Appendable out)
         throws IOException
+    {
+        print(out, DEFAULT_MAXIMUM_DIGITS_TEXT);
+    }
+
+    /**
+     * Prints to an {@code Appendable} the string representation (in Ion format)
+     * of this Timestamp in its local time.
+     * <p>
+     * This method produces the same output as {@link #toString()}.
+     *
+     * @param out not {@code null}
+     *
+     * @throws IOException propagated when the {@link Appendable} throws it
+     * @throws IonException if the text representation of the timestamp requires more than
+     *  the given maximum.
+     *
+     * @see #printZ(Appendable)
+     */
+    private void print(Appendable out, int maximumDigits)
+        throws IOException
     {
         // we have to make a copy to preserve the "immutable" contract
         // on Timestamp and we don't want someone reading the calendar
@@ -2103,7 +2159,7 @@ public void print(Appendable out)
             adjusted = make_localtime();
         }
 
-        print(out, adjusted);
+        print(out, adjusted, maximumDigits);
     }
 
 
@@ -2116,6 +2172,8 @@ public void print(Appendable out)
      * @param out not {@code null}
      *
      * @throws IOException propagated when the {@code Appendable} throws it.
+     * @throws IonException if the text representation of the timestamp requires more than
+     *  {@link Timestamp#DEFAULT_MAXIMUM_DIGITS_TEXT}.
      *
      * @see #print(Appendable)
      */
@@ -2146,6 +2204,25 @@ public void printZ(Appendable out)
     }
 
 
+    /**
+     * Throws if the text representation of the timestamp would require more than the given number of digits in its
+     * fractional component.
+     * @param value a Timestamp with a non-null fraction.
+     * @param maximumDigits the maximum number of digits allowed.
+     */
+    private static void requirePrecisionWithinLimit(Timestamp value, int maximumDigits) {
+        if (value._fraction.scale() > maximumDigits) {
+            throw new IonException(String.format(
+                "Timestamp with %d digits of precision cannot be serialized because it exceeds the " +
+                    "configurable maximum timestamp precision of %d digits. Timestamps that require more digits " +
+                    "may be written using a text writer configured with " +
+                    "IonTextWriterBuilder.withMaximumTimestampPrecisionDigits.",
+                value._fraction.scale(),
+                maximumDigits
+            ));
+        }
+    }
+
     /**
      * helper for print(out) and printZ(out) so that printZ can create
      * a zulu time and pass it directly and print can apply the local
@@ -2153,9 +2230,10 @@ public void printZ(Appendable out)
      * contract to be immutable).
      * @param out destination for the text image of the value
      * @param adjusted the time value with the fields adjusted to match the desired text output
+     * @param maximumDigits the maximum number of digits allowed in the fractional seconds
      * @throws IOException
      */
-    private static void print(Appendable out, Timestamp adjusted)
+    private static void print(Appendable out, Timestamp adjusted, int maximumDigits)
         throws IOException
     {
         // null is our first "guess" to get it out of the way
@@ -2164,11 +2242,14 @@ private static void print(Appendable out, Timestamp adjusted)
             return;
         }
 
+        if (adjusted._precision == Precision.SECOND && adjusted._fraction != null) {
+            requirePrecisionWithinLimit(adjusted, maximumDigits);
+        }
+
         // so we have a real value - we'll start with the date portion
         // which we always have
         print_digits(out, adjusted._year, 4);
         if (adjusted._precision == Precision.YEAR) {
-            assert adjusted._offset == UNKNOWN_OFFSET;
             out.append("T");
             return;
         }
@@ -2176,7 +2257,6 @@ private static void print(Appendable out, Timestamp adjusted)
         out.append("-");
         print_digits(out, adjusted._month, 2);  // convert calendar months to a base 1 value
         if (adjusted._precision == Precision.MONTH) {
-            assert adjusted._offset == UNKNOWN_OFFSET;
             out.append("T");
             return;
         }
@@ -2184,8 +2264,6 @@ private static void print(Appendable out, Timestamp adjusted)
         out.append("-");
         print_digits(out, adjusted._day, 2);
         if (adjusted._precision == Precision.DAY) {
-            assert adjusted._offset == UNKNOWN_OFFSET;
-            // out.append("T");
             return;
         }
 
@@ -2202,7 +2280,7 @@ private static void print(Appendable out, Timestamp adjusted)
             }
         }
 
-        if (adjusted._offset != UNKNOWN_OFFSET) {
+        if (adjusted._offset != null) {
             int min, hour;
             min = adjusted._offset;
             if (min == 0) {
diff --git a/src/main/java/com/amazon/ion/_Private_Trampoline.kt b/src/main/java/com/amazon/ion/_Private_Trampoline.kt
new file mode 100644
index 0000000000..c4b9680c24
--- /dev/null
+++ b/src/main/java/com/amazon/ion/_Private_Trampoline.kt
@@ -0,0 +1,9 @@
+package com.amazon.ion
+
+/**
+ * **NOT FOR APPLICATION USE. This method may be removed at any time.**
+ * Trampoline to the non-public `Timestamp.toString(Int)` method.
+ */
+internal fun printTimestamp(timestamp: Timestamp, maximumDigits: Int): String {
+    return timestamp.toString(maximumDigits)
+}
diff --git a/src/main/java/com/amazon/ion/impl/IonWriterSystemText.java b/src/main/java/com/amazon/ion/impl/IonWriterSystemText.java
index c0f7de3fc5..bf8f545505 100644
--- a/src/main/java/com/amazon/ion/impl/IonWriterSystemText.java
+++ b/src/main/java/com/amazon/ion/impl/IonWriterSystemText.java
@@ -16,6 +16,7 @@
 package com.amazon.ion.impl;
 
 import static com.amazon.ion.SystemSymbols.SYMBOLS;
+import static com.amazon.ion._Private_TrampolineKt.printTimestamp;
 import static com.amazon.ion.impl._Private_IonConstants.tidList;
 import static com.amazon.ion.impl._Private_IonConstants.tidSexp;
 import static com.amazon.ion.impl._Private_IonConstants.tidStruct;
@@ -641,13 +642,14 @@ public void writeTimestamp(Timestamp value) throws IOException
         else if (_options._timestamp_as_string)
         {
             // Timestamp is ASCII-safe so this is easy
+            String valueText = printTimestamp(value, _options.getMaximumTimestampPrecisionDigits());
             _output.appendAscii('"');
-            _output.appendAscii(value.toString());
+            _output.appendAscii(valueText);
             _output.appendAscii('"');
         }
         else
         {
-            _output.appendAscii(value.toString());
+            _output.appendAscii(printTimestamp(value, _options.getMaximumTimestampPrecisionDigits()));
         }
 
         closeValue();
diff --git a/src/main/java/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java b/src/main/java/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
index ced626d845..9d8ae52c2a 100644
--- a/src/main/java/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
+++ b/src/main/java/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java
@@ -199,6 +199,13 @@ private _Private_IonTextWriterBuilder fillDefaults()
             b.setNewLineType(NewLineType.PLATFORM_DEPENDENT);
         }
 
+        if (b.getMaximumTimestampPrecisionDigits() < 1) {
+            throw new IllegalArgumentException(String.format(
+                "Configured maximum timestamp precision must be positive, not %d.",
+                b.getMaximumTimestampPrecisionDigits()
+            ));
+        }
+
         return (_Private_IonTextWriterBuilder) b.immutable();
     }
 
diff --git a/src/main/java/com/amazon/ion/system/IonTextWriterBuilder.java b/src/main/java/com/amazon/ion/system/IonTextWriterBuilder.java
index b88fb4bca0..40785cd1f4 100644
--- a/src/main/java/com/amazon/ion/system/IonTextWriterBuilder.java
+++ b/src/main/java/com/amazon/ion/system/IonTextWriterBuilder.java
@@ -20,6 +20,7 @@
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonWriter;
 import com.amazon.ion.SymbolTable;
+import com.amazon.ion.Timestamp;
 import com.amazon.ion.impl._Private_IonTextWriterBuilder;
 import com.amazon.ion.impl._Private_Utils;
 import java.io.OutputStream;
@@ -221,6 +222,7 @@ public static IonTextWriterBuilder json()
     private int myLongStringThreshold;
     private NewLineType myNewLineType;
     private boolean myTopLevelValuesOnNewLines;
+    private int myMaximumTimestampPrecisionDigits = Timestamp.DEFAULT_MAXIMUM_DIGITS_TEXT;
 
 
     /** NOT FOR APPLICATION USE! */
@@ -240,6 +242,7 @@ protected IonTextWriterBuilder(IonTextWriterBuilder that)
         this.myLongStringThreshold  = that.myLongStringThreshold;
         this.myNewLineType          = that.myNewLineType;
         this.myTopLevelValuesOnNewLines = that.myTopLevelValuesOnNewLines;
+        this.myMaximumTimestampPrecisionDigits = that.myMaximumTimestampPrecisionDigits;
     }
 
 
@@ -764,6 +767,47 @@ public final IonTextWriterBuilder withWriteTopLevelValuesOnNewLines(boolean writ
 
     //=========================================================================
 
+    /**
+     * Gets the maximum number of digits of fractional second precision allowed to be written for timestamp values.
+     *
+     * @return the currently configured maximum.
+     *
+     * @see #setMaximumTimestampPrecisionDigits(int)
+     * @see #withMaximumTimestampPrecisionDigits(int)
+     */
+    public final int getMaximumTimestampPrecisionDigits() {
+        return myMaximumTimestampPrecisionDigits;
+    }
+
+    /**
+     * Sets the maximum number of digits of fractional second precision allowed to be written for timestamp values.
+     * Default: {@link Timestamp#DEFAULT_MAXIMUM_DIGITS_TEXT}.
+     *
+     * @see #getMaximumTimestampPrecisionDigits()
+     * @see #withMaximumTimestampPrecisionDigits(int)
+     */
+    public void setMaximumTimestampPrecisionDigits(int maximumTimestampPrecisionDigits) {
+        mutationCheck();
+        myMaximumTimestampPrecisionDigits = maximumTimestampPrecisionDigits;
+    }
+
+    /**
+     * Sets the maximum number of digits of fractional second precision allowed to be written for timestamp values.
+     * Default: {@link Timestamp#DEFAULT_MAXIMUM_DIGITS_TEXT}.
+     *
+     * @return this instance, if mutable; otherwise a mutable copy of this instance.
+     *
+     * @see #getMaximumTimestampPrecisionDigits()
+     * @see #setMaximumTimestampPrecisionDigits(int)
+     */
+    public final IonTextWriterBuilder withMaximumTimestampPrecisionDigits(int maximumTimestampPrecisionDigits) {
+        IonTextWriterBuilder b = mutable();
+        b.setMaximumTimestampPrecisionDigits(maximumTimestampPrecisionDigits);
+        return b;
+    }
+
+    //=========================================================================
+
     /**
      * Creates a new writer that will write text to the given output
      * stream.
diff --git a/src/test/java/com/amazon/ion/TimestampTest.java b/src/test/java/com/amazon/ion/TimestampTest.java
index 1709fe8da8..819f980a19 100644
--- a/src/test/java/com/amazon/ion/TimestampTest.java
+++ b/src/test/java/com/amazon/ion/TimestampTest.java
@@ -17,6 +17,7 @@
 
 import static com.amazon.ion.Decimal.NEGATIVE_ZERO;
 import static com.amazon.ion.Decimal.negativeZero;
+import static com.amazon.ion.Timestamp.DEFAULT_MAXIMUM_DIGITS_TEXT;
 import static com.amazon.ion.Timestamp.MAXIMUM_ALLOWED_TIMESTAMP_IN_MILLIS_DECIMAL;
 import static com.amazon.ion.Timestamp.MINIMUM_TIMESTAMP_IN_MILLIS;
 import static com.amazon.ion.Timestamp.MINIMUM_TIMESTAMP_IN_MILLIS_DECIMAL;
@@ -32,6 +33,8 @@
 import static com.amazon.ion.impl._Private_Utils.UTC;
 
 import com.amazon.ion.Timestamp.Precision;
+
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -40,7 +43,9 @@
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
+import java.util.function.Function;
 
+import com.amazon.ion.system.IonTextWriterBuilder;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -3098,4 +3103,80 @@ public void testInstantVsTimestampMillis() {
         assertEquals(millisFromTimestamp, ts2.getMillis());
         */
     }
+
+    private void expectCleanToStringFailure(Timestamp timestamp, Function<Timestamp, String> function) {
+        try {
+            function.apply(timestamp);
+            fail();
+        } catch (IonException e) {
+            // Expected.
+        }
+    }
+
+    @FunctionalInterface
+    private interface TimestampPrintFunction {
+        void print(Timestamp timestamp, Appendable appendable) throws IOException;
+    }
+
+    private void expectCleanPrintFailure(Timestamp timestamp, TimestampPrintFunction function) throws IOException {
+        StringBuilder sb = new StringBuilder();
+        try {
+            function.print(timestamp, sb);
+        } catch (IonException e) {
+            // Expected.
+        }
+        assertTrue(sb.toString().isEmpty());
+    }
+
+    @Test
+    public void testCleanFailureWhenAttemptingToWriteVeryPreciseTimestampToString() throws IOException {
+        Timestamp timestamp = Timestamp.forSecond(2024, 4, 10, 10, 56, BigDecimal.valueOf(0, Timestamp.DEFAULT_MAXIMUM_DIGITS_TEXT + 1), 0);
+        expectCleanToStringFailure(timestamp, Timestamp::toString);
+        expectCleanToStringFailure(timestamp, Timestamp::toZString);
+        expectCleanPrintFailure(timestamp, Timestamp::print);
+        expectCleanPrintFailure(timestamp, Timestamp::printZ);
+    }
+
+    private void expectEquivalentTimestampStrings(Timestamp timestamp, Function<Timestamp, String> toStringFunction, TimestampPrintFunction printFunction) throws IOException {
+        String text = toStringFunction.apply(timestamp);
+        StringBuilder sb = new StringBuilder();
+        printFunction.print(timestamp, sb);
+        assertEquals(text, sb.toString());
+        assertFalse(text.isEmpty());
+    }
+
+    @Test
+    public void testSuccessWhenWritingTimestampWithPrecisionAtMaximum() throws IOException {
+        Timestamp timestamp = Timestamp.forSecond(2024, 4, 10, 10, 56, BigDecimal.valueOf(0, Timestamp.DEFAULT_MAXIMUM_DIGITS_TEXT), 0);
+        expectEquivalentTimestampStrings(timestamp, Timestamp::toString, Timestamp::print);
+        expectEquivalentTimestampStrings(timestamp, Timestamp::toZString, Timestamp::printZ);
+    }
+
+    private void testAtAndAboveMaximumDigits(int maximum) throws IOException {
+        Timestamp aboveMaximum = Timestamp.forSecond(2024, 4, 10, 10, 56, BigDecimal.valueOf(0, maximum + 1), 0);
+        Timestamp atMaximum = Timestamp.forSecond(2024, 4, 10, 10, 56, BigDecimal.valueOf(0, maximum), 0);
+        StringBuilder sb = new StringBuilder();
+        IonTextWriterBuilder builder = IonTextWriterBuilder.standard();
+        if (maximum != DEFAULT_MAXIMUM_DIGITS_TEXT) {
+            builder = builder.withMaximumTimestampPrecisionDigits(maximum);
+        }
+        try (IonWriter writer = builder.build(sb)) {
+            try {
+                writer.writeTimestamp(aboveMaximum);
+                fail();
+            } catch (IonException e) {
+                // Expected.
+            }
+            // The error is recoverable, so subsequently writing a valid timestamp should work.
+            writer.writeTimestamp(atMaximum);
+        }
+        assertEquals(atMaximum.toString(), sb.toString());
+    }
+
+    @Test
+    public void testCleanFailureWhenAttemptingToWriteVeryPreciseTimestampWithTextWriter() throws IOException {
+        testAtAndAboveMaximumDigits(DEFAULT_MAXIMUM_DIGITS_TEXT);
+        testAtAndAboveMaximumDigits(DEFAULT_MAXIMUM_DIGITS_TEXT - 1);
+        testAtAndAboveMaximumDigits(42);
+    }
 }
diff --git a/src/test/java/com/amazon/ion/impl/TextWriterTest.java b/src/test/java/com/amazon/ion/impl/TextWriterTest.java
index 60dd1ccf74..3090dc73fb 100644
--- a/src/test/java/com/amazon/ion/impl/TextWriterTest.java
+++ b/src/test/java/com/amazon/ion/impl/TextWriterTest.java
@@ -32,6 +32,8 @@
 import com.amazon.ion.system.IonTextWriterBuilder;
 import com.amazon.ion.system.IonTextWriterBuilder.LstMinimizing;
 import com.amazon.ion.system.IonWriterBuilder.IvmMinimizing;
+
+import java.io.IOException;
 import java.io.OutputStream;
 import org.junit.Test;
 
@@ -616,6 +618,11 @@ public void testAnnotationNotSetToIvmOnStartOfStream()
         super.testAnnotationNotSetToIvmOnStartOfStream();
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void testNegativeMaximumTimestampDigitsFails() throws IOException  {
+        try (IonWriter writer = IonTextWriterBuilder.standard().withMaximumTimestampPrecisionDigits(-1).build(new StringBuilder())) {}
+    }
+
     @Override
     protected void checkFlushedAfterTopLevelValueWritten()
     {

From cccd14559f980b4a293a6413bbab7749c062348b Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 11 Apr 2024 17:12:06 -0700
Subject: [PATCH 371/490] Ensures that the cursor's value marker is fully reset
 between values.

---
 .../com/amazon/ion/impl/IonCursorBinary.java  |  1 +
 ...onReaderContinuableTopLevelBinaryTest.java | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 7e06b6db4e..c426b813ec 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -1094,6 +1094,7 @@ private boolean checkContainerEnd() {
      * Resets state specific to the current value.
      */
     private void reset() {
+        valueMarker.typeId = null;
         valueMarker.startIndex = -1;
         valueMarker.endIndex = -1;
         fieldSid = -1;
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index cb4d44ae34..a0720710c7 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -3933,6 +3933,25 @@ public void annotationSequenceLengthThatOverflowsBufferThrowsIonException(boolea
         );
     }
 
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void incompleteAnnotationAfterStructFailsCleanly(boolean constructFromBytes) throws Exception {
+        expectIonException(
+            constructFromBytes,
+            reader -> {
+                try {
+                    assertEquals(IonType.STRUCT, reader.next());
+                } catch (Exception e) {
+                    fail();
+                }
+                // This should fail with IonException due to unexpected EOF.
+                reader.next();
+            },
+            0xDF, // null.struct
+            0xE6, 0x81 // Incomplete annotation wrapper declaring length 6
+        );
+    }
+
     /**
      * Verifies that corrupting each byte in the input data results in IonException, or nothing.
      * @param constructFromBytes whether to provide bytes (true) or an InputStream (false) to the reader.

From eb6c87768f55350b9df5dfd0e1f85b846aef8eda Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Fri, 12 Apr 2024 15:27:14 -0700
Subject: [PATCH 372/490] Adds check for license headers and unused imports
 (#789)

---
 build.gradle.kts                              | 69 ++++++++++++++++++-
 .../com/amazon/ion/_Private_Trampoline.kt     |  2 +
 2 files changed, 68 insertions(+), 3 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 1d7ae0975f..e909992fee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -30,8 +30,8 @@ plugins {
     id("org.cyclonedx.bom") version "1.7.2"
     id("com.github.spotbugs") version "5.0.13"
     id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
-    // TODO: more static analysis. E.g.:
-    // id("com.diffplug.spotless") version "6.11.0"
+
+    id("com.diffplug.spotless") version "6.11.0"
 
     // Used for generating the third party attribution document
     id("com.github.jk1.dependency-license-report") version "2.5"
@@ -69,6 +69,7 @@ group = "com.amazon.ion"
 version = File(project.rootDir.path + "/project.version").readLines().single()
 description = "A Java implementation of the Amazon Ion data notation."
 
+val githubRepositoryUrl = "https://github.com/amazon-ion/ion-java/"
 val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
 val generatedResourcesDir = "$buildDir/generated/main/resources"
 lateinit var sourcesJar: AbstractArchiveTask
@@ -99,6 +100,68 @@ licenseReport {
     )
 }
 
+/**
+ * This is the `git remote` name that corresponds to amazon-ion/ion-java.
+ * It is used for applying the "spotless" checks only to things that are changed
+ * compared to the master branch of the source repo.
+ */
+val sourceRepoRemoteName: String by lazy {
+    val git = System.getenv("GIT_CLI") ?: "git"
+
+    fun String.isSourceRepo(): Boolean {
+        val url = "$git remote get-url ${this@isSourceRepo}".runCommand()
+        return "amazon-ion/ion-java" in url || "amzn/ion-java" in url
+    }
+
+    var name = "$git remote".runCommand().lines().firstOrNull { it.isSourceRepo() }
+
+    if (System.getenv("CI") == "true") {
+        // When running on a CI environment e.g. GitHub Actions, we might need to automatically add the remote
+        if (name == null) {
+            name = "ci_source_repository"
+            "$git remote add $name $githubRepositoryUrl".runCommand()
+        }
+        // ...and make sure that we have indeed fetched that remote
+        "$git fetch $name".runCommand()
+    }
+
+    name ?: throw Exception(
+        """
+            |No git remote found for amazon-ion/ion-java. Try again after running:
+            |
+            |    git remote add -f <name> $githubRepositoryUrl
+            """.trimMargin()
+    )
+}
+
+fun String.runCommand(workingDir: File = rootProject.projectDir): String {
+    val parts = this.split("\\s".toRegex())
+    val proc = ProcessBuilder(*parts.toTypedArray())
+        .directory(workingDir)
+        .redirectOutput(ProcessBuilder.Redirect.PIPE)
+        .redirectError(ProcessBuilder.Redirect.PIPE)
+        .start()
+    proc.waitFor(30, TimeUnit.SECONDS)
+    return proc.inputStream.bufferedReader().readText()
+}
+
+spotless {
+    ratchetFrom("$sourceRepoRemoteName/master")
+
+    val shortFormLicenseHeader = """
+        // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+        // SPDX-License-Identifier: Apache-2.0
+    """.trimIndent()
+
+    java {
+        licenseHeader(shortFormLicenseHeader)
+        removeUnusedImports()
+    }
+    kotlin {
+        licenseHeader(shortFormLicenseHeader)
+    }
+}
+
 tasks {
     withType<JavaCompile> {
         options.encoding = "UTF-8"
@@ -418,7 +481,7 @@ publishing {
         pom {
             name.set("Ion Java")
             description.set(project.description)
-            url.set("https://github.com/amazon-ion/ion-java/")
+            url.set(githubRepositoryUrl)
 
             licenses {
                 license {
diff --git a/src/main/java/com/amazon/ion/_Private_Trampoline.kt b/src/main/java/com/amazon/ion/_Private_Trampoline.kt
index c4b9680c24..a44b34cc3a 100644
--- a/src/main/java/com/amazon/ion/_Private_Trampoline.kt
+++ b/src/main/java/com/amazon/ion/_Private_Trampoline.kt
@@ -1,3 +1,5 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion
 
 /**

From 2e6be644a3b5e4f26dc7b3e3819cdc0ebee08c02 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 12 Apr 2024 16:23:06 -0700
Subject: [PATCH 373/490] Adds testing of IonValue's multithreaded contract
 over the 'good' ion-tests files. (#769)

* Adds testing of IonValue's multithreaded contract over the 'good' ion-tests files.

* Update src/test/java/com/amazon/ion/GoodIonMultithreadedTest.java

Co-authored-by: Matthew Pope <81593196+popematt@users.noreply.github.com>

* Run spotlessApply to fix failing CI check

---------

Co-authored-by: Matthew Pope <81593196+popematt@users.noreply.github.com>
Co-authored-by: Matthew Pope <popematt@amazon.com>
---
 .../com/amazon/ion/impl/IonCursorBinary.java  |   1 -
 .../amazon/ion/GoodIonMultithreadedTest.java  | 191 ++++++++++++++++++
 ...onReaderContinuableTopLevelBinaryTest.java |   2 -
 3 files changed, 191 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/com/amazon/ion/GoodIonMultithreadedTest.java

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index c426b813ec..52401ae300 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 package com.amazon.ion.impl;
 
 import com.amazon.ion.BufferConfiguration;
diff --git a/src/test/java/com/amazon/ion/GoodIonMultithreadedTest.java b/src/test/java/com/amazon/ion/GoodIonMultithreadedTest.java
new file mode 100644
index 0000000000..c947696f74
--- /dev/null
+++ b/src/test/java/com/amazon/ion/GoodIonMultithreadedTest.java
@@ -0,0 +1,191 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+package com.amazon.ion;
+
+import com.amazon.ion.junit.Injected;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.CompletableFuture;
+
+import static com.amazon.ion.TestUtils.GLOBAL_SKIP_LIST;
+import static com.amazon.ion.TestUtils.GOOD_IONTESTS_FILES;
+import static com.amazon.ion.TestUtils.testdataFiles;
+
+/**
+ * Tests IonValue's multithreaded contract over the `good` ion-tests files.
+ *
+ * For each file, the test randomly chooses a child value to test and marks that value as read-only. Then
+ * it spawns many instances of an async task to concurrently perform read operations on the chosen value.
+ * Finally, it asserts that all instances of the async task got the same results from the read operations.
+ *
+ * Testing every value at every depth would be more robust, but is likely more suited to a suite of 
+ * long-running tests that are executed periodically, rather than the unit tests that are executed on each build.
+ * This test is expected to take only a few seconds to execute.
+ */
+public class GoodIonMultithreadedTest extends IonTestCase {
+
+    @Injected.Inject("testFile")
+    public static final File[] FILES = testdataFiles(GLOBAL_SKIP_LIST, GOOD_IONTESTS_FILES);
+
+    private File myTestFile;
+
+    public void setTestFile(File file) {
+        myTestFile = file;
+    }
+
+    /**
+     * Wraps a byte array to provide an implementation of `equals` that compares the content of the array.
+     */
+    private static class ByteArrayWrapper {
+        private final byte[] array;
+
+        ByteArrayWrapper(byte[] array) {
+            this.array = array;
+        }
+
+        @Override
+        public boolean equals(Object that) {
+            return that instanceof ByteArrayWrapper && Arrays.equals(array, ((ByteArrayWrapper) that).array);
+        }
+    }
+
+    /**
+     * Ensures all elements in the given list are equivalent to each other.
+     * @param list the list to test.
+     */
+    private static void assertAllElementsEqual(List<?> list) {
+        int i = 0; int j = 1;
+        while (i < list.size() && j < list.size()) {
+            assertEquals(list.get(i), list.get(j));
+            i++;
+            j++;
+        }
+    }
+
+    /**
+     * Makes the given IonValue read-only, then accesses its attributes concurrently from many threads. Verifies that
+     * the results are the same from each thread.
+     * @param value the value to test.
+     */
+    private void testMultithreadedAccess(IonValue value) {
+        // Make read-only so that concurrent access is legal.
+        value.makeReadOnly();
+        // Concurrently access the value using many threads, recording the results.
+        int numberOfTasks = 100;
+        List<CompletableFuture<Void>> tasks = new ArrayList<>();
+        List<IonValue> parentContainers = Collections.synchronizedList(new ArrayList<>());
+        List<Integer> hashCodes = Collections.synchronizedList(new ArrayList<>());
+        List<SymbolToken> fieldNames = Collections.synchronizedList(new ArrayList<>());
+        List<List<SymbolToken>> annotations = Collections.synchronizedList(new ArrayList<>());
+        List<List<Object>> values = Collections.synchronizedList(new ArrayList<>());
+        for (int task = 0; task < numberOfTasks; task++) {
+            tasks.add(CompletableFuture.runAsync(
+                () -> {
+                    hashCodes.add(value.hashCode());
+                    parentContainers.add(value.getContainer());
+                    fieldNames.add(value.getFieldNameSymbol());
+                    annotations.add(Arrays.asList(value.getTypeAnnotationSymbols()));
+                    if (value.isNullValue()) {
+                        values.add(Collections.singletonList(value.getType()));
+                    } else {
+                        switch (value.getType()) {
+                            case NULL:
+                                values.add(Collections.singletonList(value.getType()));
+                                break;
+                            case BOOL:
+                                values.add(Collections.singletonList(((IonBool) value).booleanValue()));
+                                break;
+                            case INT:
+                                switch (((IonInt) value).getIntegerSize()) {
+                                    case INT:
+                                    case LONG:
+                                        values.add(Collections.singletonList(((IonInt) value).longValue()));
+                                        break;
+                                    case BIG_INTEGER:
+                                        values.add(Collections.singletonList(((IonInt) value).bigIntegerValue()));
+                                        break;
+                                }
+                                break;
+                            case FLOAT:
+                                values.add(Collections.singletonList(((IonFloat) value).doubleValue()));
+                                break;
+                            case DECIMAL:
+                                values.add(Collections.singletonList(((IonDecimal) value).decimalValue()));
+                                break;
+                            case TIMESTAMP:
+                                values.add(Collections.singletonList(((IonTimestamp) value).timestampValue()));
+                                break;
+                            case SYMBOL:
+                                values.add(Collections.singletonList(((IonSymbol) value).symbolValue()));
+                                break;
+                            case STRING:
+                                values.add(Collections.singletonList(((IonString) value).stringValue()));
+                                break;
+                            case CLOB:
+                            case BLOB:
+                                values.add(Collections.singletonList(new ByteArrayWrapper(((IonLob) value).getBytes())));
+                                break;
+                            case LIST:
+                            case SEXP:
+                            case STRUCT:
+                            case DATAGRAM:
+                                IonContainer container = (IonContainer) value;
+                                List<Object> children = new ArrayList<>();
+                                container.forEach(children::add);
+                                values.add(children);
+                                break;
+                        }
+                    }
+                }
+            ));
+        }
+        tasks.forEach(CompletableFuture::join);
+        assertAllElementsEqual(parentContainers);
+        assertAllElementsEqual(hashCodes);
+        assertAllElementsEqual(fieldNames);
+        assertAllElementsEqual(annotations);
+        assertAllElementsEqual(values);
+    }
+
+    /**
+     * Selects a child value of the container at an arbitrary depth and index.
+     * @param random source of randomness for the selection.
+     * @param container the container.
+     * @return a value.
+     */
+    private IonValue selectValueToTest(Random random, IonContainer container) {
+        int numberOfValues = container.size();
+        int valueToTarget = random.nextInt(numberOfValues + 1);
+        IonValue value = null;
+        if (valueToTarget == numberOfValues) {
+            // Don't descend further.
+            value = container;
+        } else {
+            Iterator<IonValue> iterator = container.iterator();
+            for (int i = 0; i <= valueToTarget; i++) {
+                value = iterator.next();
+            }
+            if (value instanceof IonContainer) {
+                // Descend into the container and select one of its children.
+                value = selectValueToTest(random, (IonContainer) value);
+            }
+        }
+        return value;
+    }
+
+    @Test
+    public void testRandomMultithreadedAccess() throws Exception {
+        // Descend to a random child value, make that value read-only, then concurrently access that value.
+        Random random = new Random();
+        IonDatagram datagram = load(myTestFile);
+        IonValue value = selectValueToTest(random, datagram);
+        testMultithreadedAccess(value);
+    }
+}
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index a0720710c7..476b667cd3 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 package com.amazon.ion.impl;
 
 import com.amazon.ion.BufferConfiguration;
@@ -61,7 +60,6 @@
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;

From 146c2e4e3e5a8cc9bdc27e1707abde5c8ba4b073 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 12 Apr 2024 15:17:13 -0700
Subject: [PATCH 374/490] Makes AbstractIonWriter.writeValues iterative.

---
 .../ion/impl/bin/AbstractIonWriter.java       | 222 ++++++++++--------
 1 file changed, 126 insertions(+), 96 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java b/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
index 0fe57ed210..f8e1591163 100644
--- a/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
+++ b/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.bin;
 
 import com.amazon.ion.Decimal;
@@ -85,92 +72,135 @@ public final void writeValue(final IonReader reader) throws IOException
         writeValueRecursive(reader);
     }
 
+    /**
+     * Performs a depth-first (recursive-like) traversal of the IonReader's current value, writing all values and
+     * annotations encountered during the traversal. This method is not implemented using recursion.
+     *
+     * @param reader       The IonReader that will provide a value to write.
+     * @throws IOException if either the provided IonReader or this writer's underlying OutputStream throw an
+     *                     IOException.
+     * @throws IllegalStateException if this writer is inside a struct but the IonReader is not.
+     */
     public final void writeValueRecursive(final IonReader reader) throws IOException
     {
-        final IonType type = reader.getType();
-
-        final SymbolToken fieldName = reader.getFieldNameSymbol();
-        if (fieldName != null && !isFieldNameSet() && isInStruct())
-        {
-            setFieldNameSymbol(fieldName);
-        }
-        final SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
-        if (annotations.length > 0)
-        {
-            setTypeAnnotationSymbols(annotations);
-        }
-        if (reader.isNullValue())
-        {
-            writeNull(type);
-            return;
-        }
-
-        switch (type)
-        {
-            case BOOL:
-                final boolean booleanValue = reader.booleanValue();
-                writeBool(booleanValue);
-                break;
-            case INT:
-                switch (reader.getIntegerSize())
-                {
-                    case INT:
-                        final int intValue = reader.intValue();
-                        writeInt(intValue);
-                        break;
-                    case LONG:
-                        final long longValue = reader.longValue();
-                        writeInt(longValue);
-                        break;
-                    case BIG_INTEGER:
-                        final BigInteger bigIntegerValue = reader.bigIntegerValue();
-                        writeInt(bigIntegerValue);
-                        break;
-                    default:
-                        throw new IllegalStateException();
+        // The IonReader does not need to be at the top level (getDepth()==0) when the function is called.
+        // We take note of its initial depth so we can avoid advancing the IonReader beyond the starting value.
+        int startingDepth = getDepth();
+
+        // The IonReader will be at `startingDepth` when the function is first called and then again when we
+        // have finished traversing all of its children. This boolean tracks which of those two states we are
+        // in when `getDepth() == startingDepth`.
+        boolean alreadyProcessedTheStartingValue = false;
+
+        // The IonType of the IonReader's current value.
+        IonType type;
+
+        while (true) {
+            // Each time we reach the top of the loop we are in one of three states:
+            // 1. We have not yet begun processing the starting value.
+            // 2. We are currently traversing the starting value's children.
+            // 3. We have finished processing the starting value.
+            if (getDepth() == startingDepth) {
+                // The IonReader is at the starting depth. We're either beginning our traversal or finishing it.
+                if (alreadyProcessedTheStartingValue) {
+                    // We're finishing our traversal.
+                    break;
                 }
-                break;
-            case FLOAT:
-                final double doubleValue = reader.doubleValue();
-                writeFloat(doubleValue);
-                break;
-            case DECIMAL:
-                final Decimal decimalValue = reader.decimalValue();
-                writeDecimal(decimalValue);
-                break;
-            case TIMESTAMP:
-                final Timestamp timestampValue = reader.timestampValue();
-                writeTimestamp(timestampValue);
-                break;
-            case SYMBOL:
-                final SymbolToken symbolToken = reader.symbolValue();
-                writeSymbolToken(symbolToken);
-                break;
-            case STRING:
-                final String stringValue = reader.stringValue();
-                writeString(stringValue);
-                break;
-            case CLOB:
-                final byte[] clobValue = reader.newBytes();
-                writeClob(clobValue);
-                break;
-            case BLOB:
-                final byte[] blobValue = reader.newBytes();
-                writeBlob(blobValue);
-                break;
-            case LIST:
-            case SEXP:
-            case STRUCT:
-                reader.stepIn();
-                stepIn(type);
-                while (reader.next() != null) {
-                    writeValue(reader);
+                // We're beginning our traversal. Don't advance the cursor; instead, use the current
+                // value's IonType.
+                type = reader.getType();
+                // We've begun processing the starting value.
+                alreadyProcessedTheStartingValue = true;
+            } else {
+                // We're traversing the starting value's children (that is: values at greater depths). We need to
+                // advance the cursor by calling next().
+                type = reader.next();
+            }
+
+            if (type == null) {
+                // There are no more values at this level. If we're at the starting level, we're done.
+                if (getDepth() == startingDepth) {
+                    break;
                 }
-                stepOut();
+                // Otherwise, step out once and then try to move forward again.
                 reader.stepOut();
-                break;
-            default:
-                throw new IllegalStateException("Unexpected type: " + type);
+                stepOut();
+                continue;
+            }
+
+            final SymbolToken fieldName = reader.getFieldNameSymbol();
+            if (fieldName != null && !isFieldNameSet() && isInStruct()) {
+                setFieldNameSymbol(fieldName);
+            }
+            final SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
+            if (annotations.length > 0) {
+                setTypeAnnotationSymbols(annotations);
+            }
+            if (reader.isNullValue()) {
+                writeNull(type);
+                continue;
+            }
+
+            switch (type) {
+                case BOOL:
+                    final boolean booleanValue = reader.booleanValue();
+                    writeBool(booleanValue);
+                    break;
+                case INT:
+                    switch (reader.getIntegerSize()) {
+                        case INT:
+                            final int intValue = reader.intValue();
+                            writeInt(intValue);
+                            break;
+                        case LONG:
+                            final long longValue = reader.longValue();
+                            writeInt(longValue);
+                            break;
+                        case BIG_INTEGER:
+                            final BigInteger bigIntegerValue = reader.bigIntegerValue();
+                            writeInt(bigIntegerValue);
+                            break;
+                        default:
+                            throw new IllegalStateException();
+                    }
+                    break;
+                case FLOAT:
+                    final double doubleValue = reader.doubleValue();
+                    writeFloat(doubleValue);
+                    break;
+                case DECIMAL:
+                    final Decimal decimalValue = reader.decimalValue();
+                    writeDecimal(decimalValue);
+                    break;
+                case TIMESTAMP:
+                    final Timestamp timestampValue = reader.timestampValue();
+                    writeTimestamp(timestampValue);
+                    break;
+                case SYMBOL:
+                    final SymbolToken symbolToken = reader.symbolValue();
+                    writeSymbolToken(symbolToken);
+                    break;
+                case STRING:
+                    final String stringValue = reader.stringValue();
+                    writeString(stringValue);
+                    break;
+                case CLOB:
+                    final byte[] clobValue = reader.newBytes();
+                    writeClob(clobValue);
+                    break;
+                case BLOB:
+                    final byte[] blobValue = reader.newBytes();
+                    writeBlob(blobValue);
+                    break;
+                case LIST:
+                case SEXP:
+                case STRUCT:
+                    reader.stepIn();
+                    stepIn(type);
+                    break;
+                default:
+                    throw new IllegalStateException("Unexpected type: " + type);
+            }
         }
     }
 

From 8c42413e9d20cd87a1bf728786bc2ebf97c0a54a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 11:51:51 -0700
Subject: [PATCH 375/490] Bump the github-action-dependencies group with 4
 updates (#796)

Bumps the github-action-dependencies group with 4 updates: [github/codeql-action](https://github.com/github/codeql-action), [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action), [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `github/codeql-action` from 3.24.10 to 3.25.0
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4355270be187e1b672a7a1c7c7bae5afdc1ab94a...df5a14dc28094dc936e103b37d749c6628682b60)

Updates `gradle/wrapper-validation-action` from 2.1.2 to 3.3.0
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/b231772637bb498f11fdbc86052b6e8a8dc9fc92...460a3ca55fc5d559238a0efc7fa9f7465df8585d)

Updates `gradle/gradle-build-action` from 3.2.0 to 3.3.0
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/fe59895742b4f984530980e4f693943577526b61...8baac4c8ef753599f92eeb509c246d09d6250fa6)

Updates `codecov/codecov-action` from 4.2.0 to 4.3.0
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/7afa10ed9b269c561c2336fd862446844e0cbf71...84508663e988701840491b86de86b666e8a86bed)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml           | 6 +++---
 .github/workflows/main.yml                      | 8 ++++----
 .github/workflows/publish-release-artifacts.yml | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 3f553d1635..c388222ed1 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/init@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/autobuild@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/analyze@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1782ce30a5..4c956ea1be 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -23,22 +23,22 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           submodules: recursive
-      - uses: gradle/wrapper-validation-action@b231772637bb498f11fdbc86052b6e8a8dc9fc92 # v2.1.2
+      - uses: gradle/wrapper-validation-action@460a3ca55fc5d559238a0efc7fa9f7465df8585d # v3.3.0
       - name: Use java ${{ matrix.java }}
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
-      - uses: gradle/gradle-build-action@fe59895742b4f984530980e4f693943577526b61 # v3.2.0
+      - uses: gradle/gradle-build-action@8baac4c8ef753599f92eeb509c246d09d6250fa6 # v3.3.0
         with:
           arguments: build
       - name: Test minified JAR
-        uses: gradle/gradle-build-action@fe59895742b4f984530980e4f693943577526b61 # v3.2.0
+        uses: gradle/gradle-build-action@8baac4c8ef753599f92eeb509c246d09d6250fa6 # v3.3.0
         with:
           arguments: minifyTest
       - run: ./ion-test-driver-run version
       - if: ${{ matrix.upload_reports }}
-        uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
+        uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index bc58e7d020..fd4ba6816f 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
         with:
           submodules: recursive
-      - uses: gradle/gradle-build-action@fe59895742b4f984530980e4f693943577526b61 # v3.2.0
+      - uses: gradle/gradle-build-action@8baac4c8ef753599f92eeb509c246d09d6250fa6 # v3.3.0
         with:
           arguments: build cyclonedxBom
       - name: Upload Jar to GitHub release
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 9a0a1faf4e..9e89308f0b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/upload-sarif@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
         with:
           sarif_file: results.sarif

From 2d724158037141114810053b0a99bb6cb7633e99 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 11 Mar 2024 17:19:26 -0700
Subject: [PATCH 376/490] Adds more multithreaded access testing to StructTest.

---
 src/test/java/com/amazon/ion/StructTest.java | 148 ++++++++++++++++---
 1 file changed, 130 insertions(+), 18 deletions(-)

diff --git a/src/test/java/com/amazon/ion/StructTest.java b/src/test/java/com/amazon/ion/StructTest.java
index 15cd31fb54..1932f3e79c 100644
--- a/src/test/java/com/amazon/ion/StructTest.java
+++ b/src/test/java/com/amazon/ion/StructTest.java
@@ -1,32 +1,22 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion;
 
 import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
 
 import com.amazon.ion.impl._Private_IonValue;
 import com.amazon.ion.impl._Private_Utils;
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.ListIterator;
+import java.util.Map;
 import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -390,6 +380,8 @@ public void testDeepPut()
         IonBool inserted = system().newNullBool();
         nested.put("c", inserted);
         assertSame(inserted, ((IonStruct)value.get("a")).get("c"));
+        testMultithreadedAccess(nested);
+        testMultithreadedAccess(value);
     }
 
     @Test
@@ -564,6 +556,8 @@ public void testPutNull()
         value.add("f", system().newInt(3));
         value.put("f", null);
         assertEquals(1, value.size());
+
+        testMultithreadedAccess(value);
     }
 
     @Test
@@ -700,6 +694,7 @@ public void testStructIteratorRemove()
     {
         IonStruct value = (IonStruct) oneValue("{a:b,c:d,e:f}");
         testIteratorRemove(value);
+        testMultithreadedAccess(value);
     }
 
 
@@ -749,6 +744,8 @@ public void testRemoveAfterClone()
         IonValue v = s2.get("b");
         s2.remove(v);
         assertNull(s2.get("b"));
+
+        testMultithreadedAccess(s2);
     }
 
     @Test
@@ -758,6 +755,8 @@ public void testRemoveAfterCloneAndRemove() {
 
         assertNotNull(struct2.remove("b"));
         assertFalse(struct2.containsKey("b"));
+
+        testMultithreadedAccess(struct2);
     }
 
     @Test
@@ -773,6 +772,8 @@ public void testPutOfClone()
         v1.addTypeAnnotation("hi");
         v2 = system().clone(v1);
         s.put("g", v2);
+
+        testMultithreadedAccess(s);
     }
 
 
@@ -806,6 +807,8 @@ public void testRemove()
         }
         catch (NullPointerException e) { }
 
+        testMultithreadedAccess(s);
+
         s = system().newEmptyStruct();
         assertNull(s.remove("something"));
         assertTrue(s.isEmpty());
@@ -888,6 +891,8 @@ public void testRemoveAll()
         }
         catch (NullPointerException e) { }
 
+        testMultithreadedAccess(s);
+
         s = system().newEmptyStruct();
         changed = s.removeAll((String[]) null);
         assertFalse(changed);
@@ -948,6 +953,8 @@ public void testRetainAll()
         }
         catch (NullPointerException e) { }
 
+        testMultithreadedAccess(s);
+
         s = system().newEmptyStruct();
         changed = s.retainAll("holla");
         assertFalse(changed);
@@ -998,6 +1005,7 @@ public void testRemoveViaIteratorThenDirect()
         i.next();
         i.remove();
         s.remove(v0);
+        testMultithreadedAccess(s);
     }
 
     @Test
@@ -1112,6 +1120,7 @@ public void testReplacingReadOnlyChild()
         assertSame(n1, c.iterator().next());
 
         assertEquals(null, n2.getContainer());
+        testMultithreadedAccess(c);
     }
 
     //-------------------------------------------------------------------------
@@ -1125,6 +1134,20 @@ public void testCloneAndRemove()
         assertEquals(expected, actual);
 
         assertEquals(struct("a::b::{}"), actual.cloneAndRemove("d"));
+        testMultithreadedAccess(actual);
+    }
+
+    @Test
+    public void testCloneAndRemoveWithManyFields()
+    {
+        // More than 5 fields in both the original and cloned structs, triggering the field map optimization.
+        IonStruct s1 = struct("a::b::{c:1,d:2,e:3,d:3,f:5,g:6}");
+        IonStruct actual = s1.cloneAndRemove("f");
+        IonStruct expected = struct("a::b::{c:1,d:2,e:3,d:3,g:6}");
+        assertEquals(expected, actual);
+
+        assertEquals(struct("a::b::{}"), actual.cloneAndRemove("c", "d", "e", "g"));
+        testMultithreadedAccess(actual);
     }
 
     @Test
@@ -1216,6 +1239,7 @@ public void testCloneAndRemoveWithUnknownAnnotationTextOnRoot()
         // If we don't fail we should at least retain the SID.
         IonStruct expected = struct(SHARED_SYMBOL_TABLE + "$99::{d:2,d:3}");
         assertEquals(expected, actual);
+        testMultithreadedAccess(actual);
     }
 
     @Test
@@ -1234,6 +1258,7 @@ public void testCloneAndRemoveWithUnknownAnnotationTextOnField()
         // If we don't fail we should at least retain the SID.
         expected = struct(SHARED_SYMBOL_TABLE + "a::{d:$99::2}");
         assertEquals(expected, actual);
+        testMultithreadedAccess(actual);
     }
 
     //-------------------------------------------------------------------------
@@ -1246,6 +1271,19 @@ public void testCloneAndRetain() {
         assertEquals(expected, actual);
 
         assertEquals(struct("a::{}"), actual.cloneAndRetain("e"));
+        testMultithreadedAccess(actual);
+    }
+
+    @Test
+    public void testCloneAndRetainWithManyFields() {
+        // More than 5 fields in both the original and cloned structs, triggering the field map optimization.
+        IonStruct s1 = struct("a::{c:1,d:2,e:3,d:3,f:5,g:6}");
+        IonStruct actual = s1.cloneAndRetain("c", "d", "f", "g");
+        IonStruct expected = struct("a::{c:1,d:2,d:3,f:5,g:6}");
+        assertEquals(expected, actual);
+
+        assertEquals(struct("a::{}"), actual.cloneAndRetain("e"));
+        testMultithreadedAccess(actual);
     }
 
     @Test
@@ -1342,6 +1380,7 @@ public void testCloneAndRetainWithUnknownAnnotationTextOnRoot()
         // If we don't fail we should at least retain the SID.
         IonStruct expected = struct(SHARED_SYMBOL_TABLE + "$99::{c:1,e:3}");
         assertEquals(expected, actual);
+        testMultithreadedAccess(actual);
     }
 
     @Test
@@ -1359,6 +1398,7 @@ public void testCloneAndRetainWithUnknownAnnotationTextOnField()
         // If we don't fail we should at least retain the SID.
         expected = struct(SHARED_SYMBOL_TABLE + "a::{c:$99::1,e:3}");
         assertEquals(expected, actual);
+        testMultithreadedAccess(actual);
     }
 
 
@@ -1553,7 +1593,79 @@ public void testRandomChanges()
                 System.out.println("---");
             }
         }
+        // Now make sure the generated struct can be accessed concurrently by multiple threads after being made
+        // read-only.
+        testMultithreadedAccess(s1);
     }
+
+    @Test
+    public void removeElementsUntilBelowSizeThreshold() {
+        // The following struct is larger than the size threshold for the field map cache.
+        IonStruct struct = struct("{foo: 1, foo: 2, foo: 3, bar: 4, baz: 5, zar: 6}");
+        // Removing two fields drops the struct below the threshold.
+        struct.remove("zar");
+        struct.remove("baz");
+        // Verify that cloning and accessing via multiple threads works properly.
+        testMultithreadedAccess(struct);
+    }
+
+    /**
+     * Verifies that the givens struct can be accessed concurrently after it is made read-only.
+     * @param original the struct to test.
+     */
+    private void testMultithreadedAccess(IonStruct original) {
+        Set<String> fieldNames = new HashSet<>();
+        original.iterator().forEachRemaining(value -> fieldNames.add(value.getFieldName()));
+        for (int i = 0; i < 2; i++) {
+            // One trial in which clone is performed first, the other in which it is not.
+            IonStruct struct = (i == 0) ? original : original.clone();
+            struct.makeReadOnly();
+            int numberOfTasks = 100;
+            // Initialize the collection of results, one per task. Because each task only accesses its own index
+            // in the results array, no synchronization is needed.
+            Object[] results = new Object[numberOfTasks];
+            for (int task = 0; task < numberOfTasks; task++) {
+                results[task] = new HashMap<>();
+            }
+            // Concurrently access all fields in the struct using many threads, recording the results.
+            List<CompletableFuture<Void>> tasks = new ArrayList<>();
+            for (int task = 0; task < numberOfTasks; task++) {
+                final int currentTask = task;
+                tasks.add(CompletableFuture.runAsync(
+                    () -> {
+                        Map<String, IonValue> resultMap = (Map<String, IonValue>) results[currentTask];
+                        for (String fieldName : fieldNames) {
+                            resultMap.put(fieldName, struct.get(fieldName));
+                        }
+                    }
+                ));
+            }
+            tasks.forEach(CompletableFuture::join);
+            // Verify the results in a single thread.
+            for (Object result : results) {
+                Map<String, IonValue> resultMap = (Map<String, IonValue>) result;
+                resultMap.forEach((name, value) -> assertStructContainsMapping(original, name, value));
+            }
+        }
+    }
+
+    /**
+     * Verifies that the given struct contains the given value at the given field name. This works even if the struct
+     * contains multiple values for the given field name, regardless of the order of values.
+     * @param struct the struct to examine.
+     * @param fieldName the target value's field name.
+     * @param value the target value.
+     */
+    private void assertStructContainsMapping(IonStruct struct, String fieldName, IonValue value) {
+        Set<IonValue> valuesForField = new HashSet<>();
+        struct.iterator().forEachRemaining(v -> {
+            if (v.getFieldName().equals(fieldName)) {
+                valuesForField.add(v);
+            }
+        });
+        assertTrue(valuesForField.contains(value));
+    }
+
     void dump(IonStruct s1_temp, ArrayList<TestField> s2) {
         _Private_IonValue s1 = ((_Private_IonValue)s1_temp);
         s1.dump(new PrintWriter(System.out));
@@ -1898,7 +2010,7 @@ int find_index(ArrayList<TestField> s2, IonValue v1)
     @Test
     public void testMultipleRandomChanges()
     {
-        for (int ii=0; ii<20; ii++) {
+        for (int ii=0; ii<500; ii++) {
             testRandomChanges();
         }
     }

From 515870636d29b58b9bd3d2bf5f51c9b5e8980dd2 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Tue, 23 Apr 2024 10:45:20 -0700
Subject: [PATCH 377/490] Change IonSystemBuilder's default charset to UTF-8
 (#802)

---
 .../amazon/ion/impl/lite/IonSystemLite.java   | 19 ++-------
 .../amazon/ion/system/IonSystemBuilder.java   | 42 ++++++-------------
 2 files changed, 15 insertions(+), 46 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/lite/IonSystemLite.java b/src/main/java/com/amazon/ion/impl/lite/IonSystemLite.java
index 525cff6e21..3eeeba1973 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonSystemLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
@@ -72,10 +59,10 @@ final class IonSystemLite
     /** Not null. */
     private final IonCatalog         _catalog;
     private final IonLoader          _loader;
+
     /** Immutable. */
     private final IonTextWriterBuilder myTextWriterBuilder;
     /** Immutable. */
-
     private final _Private_IonBinaryWriterBuilder myBinaryWriterBuilder;
     /** Immutable. **/
     private final IonReaderBuilder myReaderBuilder;
diff --git a/src/main/java/com/amazon/ion/system/IonSystemBuilder.java b/src/main/java/com/amazon/ion/system/IonSystemBuilder.java
index 35db2ef2a0..fecc451b54 100644
--- a/src/main/java/com/amazon/ion/system/IonSystemBuilder.java
+++ b/src/main/java/com/amazon/ion/system/IonSystemBuilder.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.system;
 
 import static com.amazon.ion.impl.lite._Private_LiteDomTrampoline.newLiteSystem;
@@ -104,7 +91,7 @@ public static IonSystemBuilder standard()
     IonCatalog myCatalog;
     boolean myStreamCopyOptimized = false;
 
-    IonTextWriterBuilder textWriterBuilder = IonTextWriterBuilder.standard().withCharsetAscii();
+    IonTextWriterBuilder textWriterBuilder = IonTextWriterBuilder.standard();
     IonBinaryWriterBuilder binaryWriterBuilder = IonBinaryWriterBuilder.standard();
     IonReaderBuilder readerBuilder = IonReaderBuilder.standard();
 
@@ -282,8 +269,7 @@ public final IonSystemBuilder withStreamCopyOptimized(boolean optimized)
 
     /**
      * Gets the text writer builder whose options will be used when building an
-     * {@link IonSystem}. By default, {@link IonTextWriterBuilder#standard()}
-     * using {@code US-ASCII} encoding will be used.
+     * {@link IonSystem}. By default, {@link IonTextWriterBuilder#standard()} will be used.
      *
      * @see #setIonTextWriterBuilder(IonTextWriterBuilder)
      * @see #withIonTextWriterBuilder(IonTextWriterBuilder)
@@ -294,13 +280,10 @@ public final IonTextWriterBuilder getIonTextWriterBuilder() {
 
     /**
      * Sets the text writer builder whose options will be used when building
-     * an {@link IonSystem}. The writer builder's catalog will never be used; the
-     * catalog provided to {@link #setCatalog(IonCatalog)} or
-     * {@link #withCatalog(IonCatalog)} will always be used instead.
+     * an {@link IonSystem}.
      *
      * @param builder the writer builder to use in built systems.
-     *  If null, each system will be built with {@link IonTextWriterBuilder#standard()}
-     *  using {@code US-ASCII} encoding.
+     *  If unset, each system will be built with {@link IonTextWriterBuilder#standard()}.
      *
      * @see #getIonTextWriterBuilder()
      * @see #withIonTextWriterBuilder(IonTextWriterBuilder)
@@ -320,8 +303,7 @@ public final void setIonTextWriterBuilder(IonTextWriterBuilder builder) {
      * always be used instead.
      *
      * @param builder the writer builder to use in built systems.
-     *  If null, each system will be built with {@link IonTextWriterBuilder#standard()}
-     *  using {@code US-ASCII} encoding.
+     *  If unset, each system will be built with {@link IonTextWriterBuilder#standard()}.
      *
      * @see #getIonTextWriterBuilder()
      * @see #setIonTextWriterBuilder(IonTextWriterBuilder)
@@ -354,7 +336,7 @@ public final IonBinaryWriterBuilder getIonBinaryWriterBuilder() {
      * {@link #withCatalog(IonCatalog)} will always be used instead.
      *
      * @param builder the writer builder to use in built systems.
-     *  If null, each system will be built with {@link IonBinaryWriterBuilder#standard()}.
+     *  If unset, each system will be built with {@link IonBinaryWriterBuilder#standard()}.
      *
      * @see #getIonBinaryWriterBuilder()
      * @see #withIonBinaryWriterBuilder(IonBinaryWriterBuilder)
@@ -374,7 +356,7 @@ public final void setIonBinaryWriterBuilder(IonBinaryWriterBuilder builder) {
      * always be used instead.
      *
      * @param builder the writer builder to use in built systems.
-     *  If null, each system will be built with {@link IonBinaryWriterBuilder#standard()}.
+     *  If unset, each system will be built with {@link IonBinaryWriterBuilder#standard()}.
      *
      * @see #getIonBinaryWriterBuilder()
      * @see #setIonBinaryWriterBuilder(IonBinaryWriterBuilder)
@@ -407,7 +389,7 @@ public final IonReaderBuilder getReaderBuilder() {
      * {@link #withCatalog(IonCatalog)} will always be used instead.
      *
      * @param builder the reader builder to use in built systems.
-     *  If null, each system will be built with {@link IonReaderBuilder#standard()}.
+     *  If unset, each system will be built with {@link IonReaderBuilder#standard()}.
      *
      * @see #getReaderBuilder()
      * @see #withReaderBuilder(IonReaderBuilder)
@@ -427,7 +409,7 @@ public final void setReaderBuilder(IonReaderBuilder builder) {
      * always be used instead.
      *
      * @param builder the reader builder to use in built systems.
-     *  If null, each system will be built with {@link IonReaderBuilder#standard()}.
+     *  If unset, each system will be built with {@link IonReaderBuilder#standard()}.
      *
      * @see #getReaderBuilder()
      * @see #setReaderBuilder(IonReaderBuilder)
@@ -462,7 +444,7 @@ public final IonSystem build()
         SymbolTable systemSymtab = _Private_Utils.systemSymtab(1);
         bwb.setInitialSymbolTable(systemSymtab);
         // This is what we need, more or less.
-//        bwb = bwb.fillDefaults();
+        //     bwb = bwb.fillDefaults();
 
         return newLiteSystem(twb, (_Private_IonBinaryWriterBuilder) bwb, rb);
     }

From 94caf270f6a29edf9671e722bae4591c91aef540 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Tue, 23 Apr 2024 11:04:17 -0700
Subject: [PATCH 378/490] Use CodeBuild-hosted runners for perf testing and
 automated publishing (#801)

---
 ...n-java-performance-regression-detector.yml | 28 ++++++++++++---
 .../workflows/publish-release-artifacts.yml   | 26 +++++---------
 build.gradle.kts                              | 34 +++++++++++++++----
 src/main/java/com/amazon/ion/Span.java        | 17 ++--------
 4 files changed, 62 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 41b242b974..37d9dccc31 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -46,10 +46,30 @@ jobs:
           name: ${{env.test_data_id}}
           path: testData
 
+  select-runner-type:
+    # If you want to use codebuild runners for your personal fork, follow the instructions to set
+    # up a codebuild project. https://docs.aws.amazon.com/codebuild/latest/userguide/action-runner.html
+    # Then, create a repository variable for your fork named `CODEBUILD_PROJECT_NAME` with the name
+    # of the project you created.
+    name: Select Runner Type
+    runs-on: ubuntu-latest
+    # We want to run on external PRs, but not on internal ones as push automatically builds
+    # H/T: https://github.com/Dart-Code/Dart-Code/commit/612732d5879730608baa9622bf7f5e5b7b51ae65
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'amazon-ion/ion-java'
+    env:
+      use-codebuild: ${{ vars.CODEBUILD_PROJECT_NAME != '' || github.repository_owner == 'amazon-ion' }}
+      codebuild-project-name: ${{ vars.CODEBUILD_PROJECT_NAME != '' && vars.CODEBUILD_PROJECT_NAME || 'ion-java' }}
+      al2-arm: "codebuild-${{ vars.CODEBUILD_PROJECT_NAME != '' && vars.CODEBUILD_PROJECT_NAME || 'ion-java' }}-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large"
+    outputs:
+      runner-type: ${{ env.use-codebuild && env.al2_arm || 'ubuntu-latest' }}
+    steps:
+      - name: Dump Config
+        run: echo '${{ toJSON(env) }}'
+
   detect-regression:
     name: Detect Regression
-    runs-on: ubuntu-latest
-    needs: generate-test-data
+    runs-on: ${{ needs.select-runner-type.outputs.runner-type }}
+    needs: [ generate-test-data, select-runner-type ]
     strategy:
       matrix:
         test-data: ['nestedStruct', 'nestedList', 'sexp', 'realWorldDataSchema01', 'realWorldDataSchema02', 'realWorldDataSchema03']
@@ -57,11 +77,11 @@ jobs:
       fail-fast: false
 
     steps:
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4.2.1
         with:
           distribution: 'corretto'
-          java-version: 11
+          java-version: 17
 
       - name: Checkout ion-java-benchmark-cli
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index fd4ba6816f..40171fbc2b 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -25,11 +25,16 @@ permissions:
   contents: read
 
 jobs:
-  check-tag:
-    # First, a sanity check to ensure that the library version matches the release version
-    runs-on: ubuntu-latest
+  publish-to-github-release:
+    # only run if `check-tag` completes successfully
+    needs: check-tag
+    runs-on: "codebuild-ion-java-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large"
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
+        with:
+          submodules: recursive
       - name: Validate project version matches tag
         shell: bash
         run: |
@@ -39,21 +44,9 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-  publish-to-github-release:
-    # only run if `check-tag` completes successfully
-    needs: check-tag
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-        # TODO: replace with artifact upload/download -- make sure there's no race condition with other builds also
-        # uploading an artifact.
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
-        with:
-          submodules: recursive
       - uses: gradle/gradle-build-action@8baac4c8ef753599f92eeb509c246d09d6250fa6 # v3.3.0
         with:
-          arguments: build cyclonedxBom
+          arguments: build cyclonedxBom publishToSonatype closeAndReleaseSonatypeStagingRepository
       - name: Upload Jar to GitHub release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -64,4 +57,3 @@ jobs:
         run: |
           gh release upload "v$(<project.version)" "build/libs/ion-java-$(<project.version).jar"
           gh release upload "v$(<project.version)" "build/reports/bom.json"
-  # TODO: Add `publish-to-maven-central` job
diff --git a/build.gradle.kts b/build.gradle.kts
index e909992fee..ea31b24f79 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -6,7 +6,6 @@ import org.gradle.kotlin.dsl.support.zipTo
 import org.jetbrains.kotlin.gradle.dsl.KotlinCompile
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 import proguard.gradle.ProGuardTask
-import java.net.URI
 import java.time.Instant
 import java.util.Properties
 
@@ -23,6 +22,10 @@ plugins {
     kotlin("jvm") version "1.9.0"
     java
     `maven-publish`
+
+    // There are newer versions available, but they are not guaranteed to support Java 8.
+    id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+
     jacoco
     signing
     id("com.github.johnrengelman.shadow") version "8.1.1"
@@ -69,6 +72,7 @@ group = "com.amazon.ion"
 version = File(project.rootDir.path + "/project.version").readLines().single()
 description = "A Java implementation of the Amazon Ion data notation."
 
+val isCI: Boolean = System.getenv("CI") == "true"
 val githubRepositoryUrl = "https://github.com/amazon-ion/ion-java/"
 val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
 val generatedResourcesDir = "$buildDir/generated/main/resources"
@@ -115,7 +119,7 @@ val sourceRepoRemoteName: String by lazy {
 
     var name = "$git remote".runCommand().lines().firstOrNull { it.isSourceRepo() }
 
-    if (System.getenv("CI") == "true") {
+    if (isCI) {
         // When running on a CI environment e.g. GitHub Actions, we might need to automatically add the remote
         if (name == null) {
             name = "ci_source_repository"
@@ -504,12 +508,20 @@ publishing {
             }
         }
     }
-    repositories.mavenCentral {
-        credentials {
-            username = properties["ossrhUsername"].toString()
-            password = properties["ossrhPassword"].toString()
+}
+
+nexusPublishing {
+    // Documentation for this plugin, see https://github.com/gradle-nexus/publish-plugin/blob/v1.3.0/README.md
+    this.repositories {
+        sonatype {
+            nexusUrl.set(uri("https://aws.oss.sonatype.org/service/local/staging/deploy/maven2/"))
+            // For CI environments, the username and password should be stored in
+            // ORG_GRADLE_PROJECT_sonatypeUsername and ORG_GRADLE_PROJECT_sonatypePassword respectively.
+            if (!isCI) {
+                username.set(properties["ossrhUsername"].toString())
+                password.set(properties["ossrhPassword"].toString())
+            }
         }
-        url = URI.create("https://aws.oss.sonatype.org/service/local/staging/deploy/maven2")
     }
 }
 
@@ -519,5 +531,13 @@ signing {
     // if signing.keyId, signing.password, signing.secretKeyRingFile, etc are
     // not present in gradle.properties.
     isRequired = isReleaseVersion
+
+    if (isCI) {
+        val signingKeyId: String? by project
+        val signingKey: String? by project
+        val signingPassword: String? by project
+        useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+    }
+
     sign(publishing.publications["IonJava"])
 }
diff --git a/src/main/java/com/amazon/ion/Span.java b/src/main/java/com/amazon/ion/Span.java
index c40bb6173e..1b1d742959 100644
--- a/src/main/java/com/amazon/ion/Span.java
+++ b/src/main/java/com/amazon/ion/Span.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion;
 
 import com.amazon.ion.facet.Faceted;

From 5ee9f7ea9dede1d52ce252126ffa37b097348606 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 22 Apr 2024 16:57:44 -0700
Subject: [PATCH 379/490] Ensures that using a cursor after close has no
 effect.

---
 .../com/amazon/ion/impl/IonCursorBinary.java  | 23 ++++++++++++++-----
 .../amazon/ion/impl/IonCursorBinaryTest.java  | 20 +++++++++++++++-
 ...onReaderContinuableTopLevelBinaryTest.java | 18 +++++++++++++++
 3 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 52401ae300..4887aca16f 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -92,7 +92,7 @@ private static class RefillableState {
          * READY state). This enables the reader to complete the previous IonCursor API invocation if it returned a
          * NEEDS_DATA event.
          */
-        State state = State.READY;
+        State state;
 
         /**
          * The number of bytes that still need to be consumed from the input during a fill or seek operation.
@@ -124,14 +124,20 @@ private static class RefillableState {
          */
         int individualBytesSkippedWithoutBuffering = 0;
 
-        RefillableState(InputStream inputStream, int capacity, int maximumBufferSize) {
+        RefillableState(InputStream inputStream, int capacity, int maximumBufferSize, State initialState) {
             this.inputStream = inputStream;
             this.capacity = capacity;
             this.maximumBufferSize = maximumBufferSize;
+            this.state = initialState;
         }
 
     }
 
+    /**
+     * Dummy state that indicates the cursor has been terminated and that additional API calls will have no effect.
+     */
+    private static final RefillableState TERMINATED_STATE = new RefillableState(null, -1, -1, State.TERMINATED);
+
     /**
      * Stack to hold container info. Stepping into a container results in a push; stepping out results in a pop.
      */
@@ -249,7 +255,7 @@ private static class RefillableState {
     /**
      * Holds information necessary for reading from refillable input. Null if the cursor is byte-backed.
      */
-    private final RefillableState refillableState;
+    private RefillableState refillableState;
 
     /**
      * Describes the byte at the `checkpoint` index.
@@ -455,7 +461,8 @@ private static IonBufferConfiguration getFixedSizeConfigurationFor(
         refillableState = new RefillableState(
             inputStream,
             configuration.getInitialBufferSize(),
-            configuration.getMaximumBufferSize()
+            configuration.getMaximumBufferSize(),
+            State.READY
         );
         registerOversizedValueHandler(configuration.getOversizedValueHandler());
     }
@@ -1898,12 +1905,15 @@ private boolean slowIsAwaitingMoreData() {
      * exceeds the maximum buffer size.
      */
     void terminate() {
-        refillableState.state = State.TERMINATED;
+        refillableState = TERMINATED_STATE;
+        // Use a unified code path for all cursors after termination. This path forces a termination check before
+        // accessing the input stream or buffer.
+        isSlowMode = true;
     }
 
     @Override
     public void close() {
-        if (refillableState != null) {
+        if (refillableState != null && refillableState.inputStream != null) {
             try {
                 refillableState.inputStream.close();
             } catch (IOException e) {
@@ -1913,6 +1923,7 @@ public void close() {
         buffer = null;
         containerStack = null;
         byteBuffer = null;
+        terminate();
     }
 
     /* ---- End: version-agnostic parsing, utility, and public API methods ---- */
diff --git a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
index 581289a78e..436bb0030a 100644
--- a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonBufferConfiguration;
@@ -31,6 +30,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class IonCursorBinaryTest {
@@ -427,4 +427,22 @@ public void expectValueLargerThanMaxArraySizeToFailCleanly() {
 
         cursor.close();
     }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void expectUseAfterCloseToHaveNoEffect(boolean constructFromBytes) {
+        // Using the cursor after close should not fail with an obscure unchecked
+        // exception like NullPointerException, ArrayIndexOutOfBoundsException, etc.
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x20
+        );
+        cursor.close();
+        assertEquals(IonCursor.Event.NEEDS_DATA, cursor.nextValue());
+        assertNull(cursor.getValueMarker().typeId);
+        assertEquals(IonCursor.Event.NEEDS_DATA, cursor.nextValue());
+        assertNull(cursor.getValueMarker().typeId);
+        cursor.close();
+    }
 }
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
index 476b667cd3..1080dc3962 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinaryTest.java
@@ -4009,4 +4009,22 @@ public void corruptEachByteThrowsIonException(boolean constructFromBytes) {
         corruptEachByteThrowsIonException(constructFromBytes, false, true);
         corruptEachByteThrowsIonException(constructFromBytes, false, false);
     }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void expectUseAfterCloseToHaveNoEffect(boolean constructFromBytes) throws Exception {
+        // Using the cursor after close should not fail with an obscure unchecked
+        // exception like NullPointerException, ArrayIndexOutOfBoundsException, etc.
+        reader = readerFor(
+            constructFromBytes,
+            0xE0, 0x01, 0x00, 0xEA,
+            0x20
+        );
+        reader.close();
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        assertNull(reader.next());
+        assertNull(reader.getType());
+        reader.close();
+    }
 }

From abf106f1bbb6b3352ca66b715d2d3a5e72fb9b7b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 18:06:03 +0000
Subject: [PATCH 380/490] Bump the github-action-dependencies group across 1
 directory with 4 updates

Bumps the github-action-dependencies group with 4 updates in the / directory: [actions/checkout](https://github.com/actions/checkout), [github/codeql-action](https://github.com/github/codeql-action), [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) and [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action).


Updates `actions/checkout` from 4.1.2 to 4.1.3
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/9bb56186c3b09b4f86b1c65136769dd318469633...1d96c772d19495a3b5c517cd2bc0cb401ea0529f)

Updates `github/codeql-action` from 3.25.0 to 3.25.2
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/df5a14dc28094dc936e103b37d749c6628682b60...8f596b4ae3cb3c588a5c46780b86dd53fef16c52)

Updates `gradle/wrapper-validation-action` from 3.3.0 to 3.3.1
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/460a3ca55fc5d559238a0efc7fa9f7465df8585d...5188e9b5527a0a094cee21e2fe9a8ca44b4629af)

Updates `gradle/gradle-build-action` from 3.3.0 to 3.3.1
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/8baac4c8ef753599f92eeb509c246d09d6250fa6...e2097ccd7e8ed48671dc068ac4efa86d25745b39)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml                  |  8 ++++----
 .../ion-java-performance-regression-detector.yml       |  8 ++++----
 .github/workflows/ion-test-driver.yml                  |  6 +++---
 .github/workflows/main.yml                             | 10 +++++-----
 .github/workflows/prepare-release.yml                  |  4 ++--
 .github/workflows/publish-release-artifacts.yml        |  4 ++--
 .github/workflows/scorecard.yml                        |  4 ++--
 .github/workflows/test-inspect-version-action.yml      |  2 +-
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c388222ed1..2a4a5c4287 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
+        uses: github/codeql-action/init@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
+        uses: github/codeql-action/autobuild@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
+        uses: github/codeql-action/analyze@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 37d9dccc31..cc0b4114e4 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -84,21 +84,21 @@ jobs:
           java-version: 17
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           ref: ${{ github.base_ref }}
           submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 3c457d7c2b..6c30506205 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # master
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # master
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -80,7 +80,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # master
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4c956ea1be..2c14b54021 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,20 +20,20 @@ jobs:
           - java: 17
       fail-fast: false
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           submodules: recursive
-      - uses: gradle/wrapper-validation-action@460a3ca55fc5d559238a0efc7fa9f7465df8585d # v3.3.0
+      - uses: gradle/wrapper-validation-action@5188e9b5527a0a094cee21e2fe9a8ca44b4629af # v3.3.1
       - name: Use java ${{ matrix.java }}
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'corretto'
           java-version: ${{ matrix.java }}
-      - uses: gradle/gradle-build-action@8baac4c8ef753599f92eeb509c246d09d6250fa6 # v3.3.0
+      - uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
         with:
           arguments: build
       - name: Test minified JAR
-        uses: gradle/gradle-build-action@8baac4c8ef753599f92eeb509c246d09d6250fa6 # v3.3.0
+        uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
         with:
           arguments: minifyTest
       - run: ./ion-test-driver-run version
@@ -53,7 +53,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index cce1d2c5ca..ae7467a8d4 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 40171fbc2b..a4b76e2469 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -32,7 +32,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.6.0
         with:
           submodules: recursive
       - name: Validate project version matches tag
@@ -44,7 +44,7 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-      - uses: gradle/gradle-build-action@8baac4c8ef753599f92eeb509c246d09d6250fa6 # v3.3.0
+      - uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
         with:
           arguments: build cyclonedxBom publishToSonatype closeAndReleaseSonatypeStagingRepository
       - name: Upload Jar to GitHub release
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 9e89308f0b..062c9b5d2f 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.1.0
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.1.0
         with:
           persist-credentials: false
 
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
+        uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index ec1e7c0550..df77874ef4 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v3.6.0
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From e85079a4aa9d2dc6d0febcceb43df48b104a4675 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Tue, 23 Apr 2024 15:56:21 -0700
Subject: [PATCH 381/490] Update publish-release-artifacts.yml (#811)

---
 .github/workflows/publish-release-artifacts.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index a4b76e2469..b8e7bd8230 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -26,8 +26,6 @@ permissions:
 
 jobs:
   publish-to-github-release:
-    # only run if `check-tag` completes successfully
-    needs: check-tag
     runs-on: "codebuild-ion-java-${{ github.run_id }}-${{ github.run_attempt }}-arm-3.0-large"
     permissions:
       contents: write

From 2a87e2b75b7abca86ff4908d1a1fcb7776057198 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Wed, 24 Apr 2024 12:27:19 -0700
Subject: [PATCH 382/490] Improve automated release workflow (#812)

---
 .github/workflows/publish-release-artifacts.yml | 17 +++++++++++++----
 build.gradle.kts                                |  9 +++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index b8e7bd8230..4e54414b61 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -15,7 +15,7 @@
 # TODO: Consider whether we should merge this with the "prepare-release" workflow rather
 # than having separate workflows.
 
-name: Publish Artifacts for Release
+name: "Publish Release Artifacts"
 
 on:
   release:
@@ -42,10 +42,19 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-      - uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
+      - name: Build Release Artifacts
+        uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
         with:
-          arguments: build cyclonedxBom publishToSonatype closeAndReleaseSonatypeStagingRepository
-      - name: Upload Jar to GitHub release
+          arguments: build cyclonedxBom
+      - name: Publish to Sonatype
+        uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
+        with:
+          arguments: publishToSonatype
+      - name: Close and Release Sonatype Staging Repository
+        uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
+        with:
+          arguments: closeAndReleaseSonatypeStagingRepository
+      - name: Upload Artifacts to GitHub Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         # TODO - reusability
diff --git a/build.gradle.kts b/build.gradle.kts
index ea31b24f79..8b92773b51 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -75,6 +75,8 @@ description = "A Java implementation of the Amazon Ion data notation."
 val isCI: Boolean = System.getenv("CI") == "true"
 val githubRepositoryUrl = "https://github.com/amazon-ion/ion-java/"
 val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
+// The name we're checking for corresponds to the name that is set in the `publish-release-artifacts.yml` file.
+val isReleaseWorkflow: Boolean = System.getenv("GITHUB_WORKFLOW") == "Publish Release Artifacts"
 val generatedResourcesDir = "$buildDir/generated/main/resources"
 lateinit var sourcesJar: AbstractArchiveTask
 lateinit var javadocJar: AbstractArchiveTask
@@ -150,6 +152,13 @@ fun String.runCommand(workingDir: File = rootProject.projectDir): String {
 }
 
 spotless {
+    // If this is an automated release workflow, don't configure any style checks.
+    // This is important because we're ratcheting from `master` and when we create
+    // a release that is not directly from `master`, the spotless checks can cause
+    // the release workflow to fail if `master` has any commits that are not in the
+    // release branch.
+    if (isReleaseWorkflow) return@spotless
+
     ratchetFrom("$sourceRepoRemoteName/master")
 
     val shortFormLicenseHeader = """

From 85fd711fcbddad9eff26c209a5ddb1c51c9bc62f Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Fri, 26 Apr 2024 11:51:08 -0700
Subject: [PATCH 383/490] Set Java toolchain for gradle build and fix Sonatype
 URL (#818)

---
 .github/workflows/main.yml                    |  57 ++++++++-----
 .../workflows/publish-release-artifacts.yml   |  23 +++---
 build.gradle.kts                              |  76 +++++++++++++-----
 gradle/wrapper/gradle-wrapper.jar             | Bin 61608 -> 43462 bytes
 gradle/wrapper/gradle-wrapper.properties      |   3 +-
 gradlew                                       |  29 ++++---
 gradlew.bat                                   |  20 ++---
 settings.gradle.kts                           |   6 ++
 8 files changed, 141 insertions(+), 73 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2c14b54021..0269242812 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,42 +9,55 @@ on:
 
 
 jobs:
-  test:
+  build-and-test:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        include:
-          - java: 8
-          - java: 11
-            upload_reports: true
-          - java: 17
-      fail-fast: false
     steps:
       - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           submodules: recursive
-      - uses: gradle/wrapper-validation-action@5188e9b5527a0a094cee21e2fe9a8ca44b4629af # v3.3.1
-      - name: Use java ${{ matrix.java }}
+      - name: Setup Java
         uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
           distribution: 'corretto'
-          java-version: ${{ matrix.java }}
-      - uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
+          java-version: 8
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43
         with:
-          arguments: build
-      - name: Test minified JAR
-        uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
-        with:
-          arguments: minifyTest
-      - run: ./ion-test-driver-run version
-      - if: ${{ matrix.upload_reports }}
-        uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
+          validate-wrappers: true
+      - run: ./gradlew build
+      - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
         with:
-          name: spotbugs-report-${{ matrix.runs-on }}-java-${{ matrix.java }}
+          name: spotbugs-report
           path: build/reports/spotbugs/
+      - name: ion-java-cli sanity check
+        run: ./ion-test-driver-run version
+
+  verify-jre-compatibility:
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [8, 11, 17, 21]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        with:
+          submodules: recursive
+      - name: Setup Java
+        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        with:
+          distribution: 'corretto'
+          java-version: |
+            8
+            ${{matrix.java}}
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43
+        with:
+          cache-read-only: true
+          validate-wrappers: true
+      - run: ./gradlew minifyTest${{matrix.java}}
 
   check-version:
     # Ensures that the version is not a release (i.e. -SNAPSHOT) or if it is a release version,
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 4e54414b61..5665d02e7b 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -42,18 +42,23 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-      - name: Build Release Artifacts
-        uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
+      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
         with:
-          arguments: build cyclonedxBom
-      - name: Publish to Sonatype
-        uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
+          distribution: 'corretto'
+          java-version: |
+            8
+            11
+            17
+            21
+      - uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43
         with:
-          arguments: publishToSonatype
+          validate-wrappers: true
+      - name: Build Release Artifacts
+        run: ./gradlew build cyclonedxBom
+      - name: Publish to Sonatype
+        run: ./gradlew publishToSonatype
       - name: Close and Release Sonatype Staging Repository
-        uses: gradle/gradle-build-action@e2097ccd7e8ed48671dc068ac4efa86d25745b39 # v3.3.1
-        with:
-          arguments: closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew closeAndReleaseSonatypeStagingRepository
       - name: Upload Artifacts to GitHub Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
index 8b92773b51..974dfbf108 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -55,6 +55,19 @@ repositories {
     google()
 }
 
+// This list should be kept up to date to include all LTS versions of Corretto.
+// These are the versions that we guarantee are supported by `ion-java`, though it can probably run on other versions too.
+val SUPPORTED_JRE_VERSIONS = listOf(8, 11, 17, 21)
+
+java {
+    toolchain {
+        // Always build with the minimum supported Java version so that builds are reproducible,
+        // and so it automatically targets the min supported version.
+        languageVersion.set(JavaLanguageVersion.of(SUPPORTED_JRE_VERSIONS.min()))
+        vendor.set(JvmVendorSpec.AMAZON)
+    }
+}
+
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.0")
 
@@ -78,9 +91,6 @@ val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
 // The name we're checking for corresponds to the name that is set in the `publish-release-artifacts.yml` file.
 val isReleaseWorkflow: Boolean = System.getenv("GITHUB_WORKFLOW") == "Publish Release Artifacts"
 val generatedResourcesDir = "$buildDir/generated/main/resources"
-lateinit var sourcesJar: AbstractArchiveTask
-lateinit var javadocJar: AbstractArchiveTask
-lateinit var minifyJar: ProGuardTask
 
 sourceSets {
     main {
@@ -175,14 +185,14 @@ spotless {
     }
 }
 
+// Tasks that must be visible outside the tasks block
+lateinit var sourcesJar: AbstractArchiveTask
+lateinit var javadocJar: AbstractArchiveTask
+lateinit var minifyJar: ProGuardTask
+
 tasks {
     withType<JavaCompile> {
         options.encoding = "UTF-8"
-        // The `release` option is not available for the Java 8 compiler, but if we're building with Java 8 we don't
-        // need it anyway.
-        if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
-            options.release.set(8)
-        }
     }
     withType<KotlinCompile<KotlinJvmOptions>> {
         kotlinOptions {
@@ -451,28 +461,56 @@ tasks {
         maxHeapSize = "1g" // When this line was added Xmx 512m was the default, and we saw OOMs
         maxParallelForks = Math.max(1, Runtime.getRuntime().availableProcessors() / 2)
         useJUnitPlatform()
-        // report is always generated after tests run
-        finalizedBy(jacocoTestReport)
     }
 
     test {
         applyCommonTestConfig()
+        // report is always generated after tests run
+        finalizedBy(jacocoTestReport)
     }
 
-    /** Runs the JUnit test on the minified jar. */
-    register<Test>("minifyTest") {
-        applyCommonTestConfig()
-        classpath = project.configurations.testRuntimeClasspath.get() + project.sourceSets.test.get().output + minifyJar.outputs.files
-        dependsOn(minifyJar)
-    }
-
-    /** Runs the JUnit test on the shadow jar. */
+    /**
+     * Runs the JUnit test on the shadow jar.
+     * Potentially useful for debugging issues that are not reproducible in the standard `test` task.
+     */
     register<Test>("shadowTest") {
         applyCommonTestConfig()
         classpath = project.configurations.testRuntimeClasspath.get() + project.sourceSets.test.get().output + shadowJar.get().outputs.files
         dependsOn(minifyJar)
     }
 
+    val jvmSpecificMinifyTests = SUPPORTED_JRE_VERSIONS.map {
+        // Run the JUnit tests on the minified jar using the given java version for setting up the JRE
+        register<Test>("minifyTest$it") {
+            javaLauncher.set(
+                project.javaToolchains.launcherFor {
+                    languageVersion.set(JavaLanguageVersion.of(it))
+                    vendor.set(JvmVendorSpec.AMAZON)
+                }
+            )
+            applyCommonTestConfig()
+            classpath = project.configurations.testRuntimeClasspath.get() + project.sourceSets.test.get().output + minifyJar.outputs.files
+            dependsOn(minifyJar)
+        }
+    }.toTypedArray()
+
+    /**
+     * Umbrella task for the JUnit tests on the minified jar for all supported JRE versions.
+     *
+     * This ensures that the built JAR will run properly on all the supported JREs. It is time-consuming
+     * to run all tests for each JRE, so they are not included in the `build` task. However, they are
+     * mandatory as a prerequisite for publishing any release.
+     *
+     * They should all be run in the CI workflow for every PR, but it is best if they run concurrently
+     * in separate workflow steps.
+     */
+    val minifyTest = register<Task>("minifyTest") {
+        group = "verification"
+        dependsOn(jvmSpecificMinifyTests)
+    }
+
+    publish { dependsOn(minifyTest) }
+
     withType<Sign> {
         setOnlyIf { isReleaseVersion && gradle.taskGraph.hasTask(":publish") }
     }
@@ -523,7 +561,7 @@ nexusPublishing {
     // Documentation for this plugin, see https://github.com/gradle-nexus/publish-plugin/blob/v1.3.0/README.md
     this.repositories {
         sonatype {
-            nexusUrl.set(uri("https://aws.oss.sonatype.org/service/local/staging/deploy/maven2/"))
+            nexusUrl.set(uri("https://aws.oss.sonatype.org/service/local/"))
             // For CI environments, the username and password should be stored in
             // ORG_GRADLE_PROJECT_sonatypeUsername and ORG_GRADLE_PROJECT_sonatypePassword respectively.
             if (!isCI) {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7710deaf9f98673a68957ea02138b60d0a..d64cd4917707c1f8861d8cb53dd15194d4248596 100644
GIT binary patch
literal 43462
zcma&NWl&^owk(X(xVyW%ySuwf;qI=D6|RlDJ2cR^yEKh!<L)kv!^b;wzjN=MbLPE6
z#Qs54Mb(a4xpF<3xwf(#I0QP#moHyHKtM=7umAmr3<3k9AfYb8AfqVBBrhW-p{ORI
zp$-WG`qx|5b@g0VIWYsKzV}*LSf1fX%5<DxH2bTXmT7RMuqAb62#S(Z1H@42g>@I-
zp9QeisK*rlxC>+~7Dk4IxIRsKBHqdR9b3+fyL=ynHmIDe&|>O*VlvO+%z5;9Z$|DJ
zb4dO}-R=MKr^6EKJiOrJdLnCJn>np<Vr_Xn3)te~Xt>?~vU-1sSFgPu;pthGwf}bG
z(1db%xwr#x)r+`4AGu$j7~u2MpVs3VpLp|mx&;>`0p0vH6kF+D2CY0fVdQOZ@h;A`
z{infNyvmFUiu*X<?lkm_Rwc7`N28EaGe!}kzj7nfhW^@lTVlH-#Uo^46(tYuSUgOx
zQr0fsq(~O?24S?tV(okgsek@TWWcu+UvB}S%m>G}RNMNwXrbec_*a3N=2zJ|Wh5z*
z5rAX$JJR{#zP>KY**>xHTuw?|-Rg|o24V)74HcfVT;WtQHXlE+_4iPE8QE#DUm%x0
zEKr75ur~W%w#-My3Tj`hH6EuEW+8K-^5P62$7Sc5OK+22qj&Pd1;)1#4tKihi=~8C
zHiQSst0cpri6%OeaR`PY>HH_;CPaRNty%WTm4{wDK8V6gCZlG@U3$~JQZ;<Vs5#qH
zEVy+t;!5@Xu1$jID=`9nIoF+Jc9_az6+@ZeQX+!p62E#%NU_ikW&7u6D)sZpOG{u|
z={bCQI06wwYzSWO$q~5IHw{K<h(x`GAQV}I+HC2mJ9);BffzPtNZV^JzK+Q*#E)sp
z_;y^CR19xFFVGX1#sx$S&@R1md`SKw94gSZefoLMIz1SgFUJeHlDdu>HPvDJcT1V{
z?>H@13MJcCNe#5z+MecYNi@VT5|&UiN1D4ATT+%M+h4c$t;C#UAs3O_q=GxK0}8%8
z8J(_M9bayxN}69ex4dzM_P3oh@ZGREjVvn%%r7=xjkqxJP4kj}5tlf;QosR=%4L5y
zWhgejO=vao5oX%mOHbhJ8V+SG&K5dABn6!WiKl{|oPkq(9z8l&Mm%(=qGcFzI=eLu
zWc_oCLyf;hVlB@dnwY98?75B20=n$>u3b|NB28H0u-6Rpl((%KWEBOfElVWJx+5yg
z#SGqwza7f}$z;n~g%4HDU{;V{gXIhft*q2=4zSezGK~nBgu9-Q*rZ#2f=Q}i2|qOp
z!!y4p)4o=LVUNhlkp#JL{tfkhXNbB=Ox>M=n6soptJw-IDI|_$is2w}(XY>a=H52d
z3zE$tjPUhW<B7^QI+mzDc0r|3FgQFs!Jsdf2mD!`%+)SGMT!&dDeNq8Wnr~TJ=;SJ
zCjA5AMnKC>WS+5h=KVH&uqQS=$v3nRs&p$%11b%5qtF}S2#Pc`IiyBIF4%A!;AVoI
zXU8-Rpv!DQNcF~(qQnyyMy=-AN~U>#&X1j5BLDP{?K!%h!;hfJI>$mdLSvktEr*89
zdJHvby^$xEX0^l9g$xW-d?J;L0#(`UT~zpL&*cEh$L|HPAu=P8`OQZV!-}l`noSp_
zQ-1$q$R-gDL)?6YaM!=8H=QGW$NT2SeZlb8PKJdc=F-cT@j7Xags+Pr*jPtlHFnf-
zh?q<6;)27IdPc^Wdy-mX%2s84C1xZq9Xms+==F4);O`VUASmu3(RlgE#0+#giLh-&
zc<QGvU&1r_Xz58P7NkF*I*90qex!^xxfEgH#K;#C|KMCf;CA5Qt-NV8mGe5b-lG!j
zRL`7OWA4AJCL!FWu3g%<l7t>xm3_e}n4<JRr%rS6Swi_EMqL;`T8Bl3(r42Q<|~(Y
zc;e@g+fVh%OUP%og+-&}AUrto$4spr+PoQd2Zp+clpMO`)?XEs_x|w9_1so-38=4Y
zn`D1h2@&{Ai|aMqEbZDK1O5PGO%pa3=lgn}`i!wzdMR^A4OKHJ)Gs9YZ1vnbkiv-D
z$-P%T9AC{vA3^Up7DULFj^rOQ`7gHyAFny;2s;Lb$MDVB@Qs!<`=}5GFJ_Xz>{%|X
zJp{G_j+%`j_q5}k{eW&TlP}J2wtZ2^<^E(O)4OQX8FDp6RJq!F{(6eHWSD3=f~(h}
zJXCf7=r<16X{pHkm%yzYI_=VDP&9bmI1*)Y<!NUzHwGU;+XI38Q(`+NB8>XZeB}F?
z(%QsB5fo*FUZxK$<e}vt0yO7dH1jD~7>oX~X^69;x~j7ms8xlzpt-T15e9}$4T-pC
z6PFg@;B-j|Ywajpe4~bk#S6(fO^|mm1hKOPfA%8-_iGCfICE|=P_~e;Wz6my&)h_~
zkv&_xSAw7AZ%ThYF(4jADW4vg=oEdJGVOs>FqamoL3Np8>?!W#!R-0%2Bg4h?kz5I
zKV-rKN2n(vUL%D<4oj@|`eJ>0i#TmYBtYmfla;c!ATW%;xGQ0*TW@PTlGG><@dxUI
zg>+3SiGdZ%?5N=8uoLA|$<tQF__q{Hb+omJ>4isK$aJ%i{hECP$bK{J#0W2gQ3YEa
zZQ50Stn6hqdfxJ*9#NuSLwKFCU<kW<Z$>Gk@c=(igyVL;;2^wi4o30YXSIb2g_ud$
zgpCr@H0qWtk2hK8Q|&wx)}4+hTYlf;$a4#oUM=V@Cw#!$(nOFFpZ;0lc!qd=c$S}Z
zGGI-0jg~S~cgVT=4Vo)b)|4phjStD49*EqC)IPwyeKBLcN;Wu@Aeph;emROAwJ-0<
z_#>wVm$)ygH|qyxZaet&(Vf%pVdnvKWJn9`%DAxj3ot;v>S$I}jJ$FLBF*~iZ!ZXE
zkvui&p}fI0Y=IDX)mm0@tAd|fEHl~J&K}ZX(Mm3cm1UAuwJ42+AO5@HwYfDH7ipIc
zmI;1J;J@+aCNG1M`Btf>YT>~c&3<N>j~Qi@Py5JT6;zjx$cvOQW@3oQ>|}GH?TW-E
z1R;q^QFjm5W~7f}c3Ww|awg1BAJ^slEV~Pk`Kd`PS$7;SqJZNj->it4DW2l15}xP6
zoCl$kyEF%yJni0(L!Z&14m!1ur<bj#167-*(B|jp)F*o{Q;Hn)6)_<P63qS{7s)%O
z``Aek8i5TJj-mjjYtt1A_~`C%@M}|?ur(!4Oz?<A^)?FLyfSWzL9}|;jFV^_SWWx7
zZqoBj%8Zht{DR?*BSX3Fo`9QF2<={td!w9oLBkZ!>Xh6Btj_5JYt1{#+H8w?5QI%%
zo-$KYWNMJVH?Hh@1n7OSu~QhSswL8x0=$<8QG_zepi_<zlB#8m+hcE7gc<MZ-I}wy
z>`y_79=nK=_ZP_`Em2UI*tyQoB+r{1QYZCpb?2OrgUw#oRH$?^Tj!Req>XiE#~B|~
z+%HB;=ic+R@px4Ld8mwpY;W^A%8%l8$@B@1m5n`TlKI6bz2mp*^^^1mK$COW$HOfp
zUGTz-cN9?BGEp}5A!mDFjaiWa2_J2Iq8qj<W!S?C&KT9grEb&=%wm;aC1~>0mXzk;
z66JBKRP{p%wN7XobR0YjhAuW9T1Gw3FDvR5dWJ8ElNYF94e<ioutKi#n7!$mwZ7cG
z1bc^4#{Lo^rv1yy&HM`wbm`jfSY+G{qjDC1m?i9np*9^ecJ6!CKPZ;Z?_@`Nrs+nA
zB6#eGiAgK!RqyysJp%o~7rj*4vtuR7j|$OCbL9xyI9^gP(08>F3ebu+QwKjtvVu4L
zI9ip#mQ@4uqVdkl-TUQMb^XBJVLW(-$s;Nq;@5gr4`UfLgF$adIhd?rHOa%D);whv
z=;krPp~@I+-Z|r#s3yCH+c1US?dnm+C*)r{m+86sTJusLdNu^sqLrfWed^ndHXH`m
zd3#cOe3>w-ga(Dus_^ppG9AC>Iq{y%%CK+Cro_sqLCs{VLuK=dev>OL1dis4(PQ5R
zcz<j+gH(MtWYW4^8ed>)>DjEkfV+M<e_sEdzrS<1AHM%agf4oS_E5Eo5a@5bZSJRE
z-3LG-!nD1<2E1K6xQ;KRI>O;~>VUlYF00SgfUo~@(&9$Iy2|G0T9BSP?&T22>K46D
zL*~j#yJ?)^*%J3!16f)@Y2Z^kS*BzwfAQ7K96rFRIh>#$*$_Io;z>ux@}G98!fWR@
zGTFxv4r~v)Gsd|pF91*-eaZ3Qw1MH$K^7JhWIdX%o$2kCbvGDXy)a?@8T&1dY4`;L
z4Kn+f%SSFWE_rpEpL9bnlmYq`D!6F%di<&Hh=+!VI~j)2mfil03T#jJ_s?}VV0_hp
z7T9bWxc>Jm2Z0WMU?`Z$xE74Gu~%s{mW!d4uvK<j&<1yHv!7+02LGZ>Cx@WD+gPUQ
zV0vQS(Ig++z=EHN)BR44*EDSWIyT~R4$FcF*VEY*8@l=218Q05D2$|fXKFhRgBIEE
zdDFB}1dKkoO^7}{5crKX!p?dZWNz$m>1icsXG2N+((x0OIST9Zo^DW_tytvlwXGpn
zs8?pJXjEG;T@qrZi%#h<Ub!eG-{OloH-RpCzw35}x@i|jcqI|*S)Mk#vJASbW?htA
zkoiPl104oY;UP=8R1euujt$?djSOx?y-rqs2lMK%Qb9yZr^vF%!MGNK6X7qcO{3$l
z`SpE|3;1<tJDRMxF=rVtiibsxjcy7ac&I!rJ(vX~wSh6hna0U?6s6xBR8R}cWK=Mr
z0w`kyzSZL7v262fj&Zs-DwNn*X?a01@1FD@>93?FP$!&P4JA(&H61tqQi=opRzNpm
zkrG}$^t9&XduK*Qa1?<l%^7R<o*-c=iC4sk-`i4!S6!9X4fSx+qbvvgrLLuj@E8FE
zq?-x^MET$9MfCquFDi&A%1BD6sWU1_{+DLFRrob7FUP<*gCNI1JNawshbr?t+t&Wg
zFNRT>355wd8G2CI6QEh@Ua>AsD;7oRUNLPb76m4HG3K?)wF~IyS3`fXuNM>${?wmB
zpVz;?6_(Fiadfd{vUCBM*_kt$+F3J+IojI;9L(gc9n3{sEZyzR9o!_mOwFC#tQ{Q~
zP3-`#uK#tP3Q7~Q;4H|wjZHO8h7e4IuBxl&vz2w~D8)w=Wtg31zpZhz%+kzSzL*dV
zwp@{WU4i;hJ7c2f1O;7Mz6<tj2!R+wyuceauj<?kVu{wyl=%JHPkLzkWmg+Z?RG$#
zRU+Lf6+%iJNryt(CfbHrg5cMQPHCKXNZUXf@5VtUpcIZ(1nKR6v)V%+OF~*L&Q2bo
zXdQmkq&Da<4ZR}a$I6XIt`dd!z6Ld%&o(8?bghVIHa*@Mm4a2#r;SUX#A+KRSH^xk
zTs2!r=Ribpu&~Zx#mw!4jE91^t<FzpP{8m$mj$1xwQ{_Z*|&XtH^s|T`GZmEqGKAk
zj@Xz#kk3*eWc-B>qRKeASoIv0_bV=i@NMG*l<#+;INk-^`5w@}Dj~;k=|}qM1vq_P
z|GpBGe_IKq|LNy9SJhKOQ$c=5L{Dv|Q_lZl=-ky*BFBJLW9&y_C|!vyM~rQx=!vun
z?rZJQB5t}Dctmui5i31C_;_}C<yrm%u8E>En}_W%>oSXtt>@kE1=JW*4*v4tPp;O6
zmAk{)m!)}34pTWg8{i>($%NQ(Tl;QC@J@FfBoc%Gr&m560^kgSfodAFrIjF}aIw)X
zoXZ`@IsMkc8_=w%-7`D6Y4e*CG8k%Ud=GXhsTR50jUnm+R*0A(O3UKFg0`K;qp1bl
z7``HN=?39ic_kR|^R^~w-*pa?Vj#7|e9F1iRx{GN2?wK!xR1GW!qa=~pjJb-#u1K8
zeR?Y2i-pt}yJq;SCiVHODIvQJX|ZJaT8nO+(?HXbLefulKKgM^B(UIO1r+S=7;kLJ
zcH}1J=Px2jsh3Tec&v8Jcbng8;V-`#*UHt?hB(pmOipKwf3Lz8rG$heEB30Sg*2rx
zV<|KN86$soN(I!BwO`1n^^uF2*x&vJ$2d$>+`(romzHP|)K_KkO6Hc>_dwMW-M(#S
zK(~SiXT1@fvc#U+?|?PniDRm01)f^#55;nhM|wi?oG>yBsa?~?^xTU|fX-R(sTA+5
zaq}-8Tx7zrOy#3*JLIIVsBmHYLdD}!0NP!+ITW+Thn0)8SS!$@)HXwB3tY!fMxc#1
zMp3H?q3eD?u&Njx4;KQ5G>32+GRp1Ee5qMO0lZjaRRu&{W<&~DoJNGkcYF<5(Ab+J
zgO>VhBl{okDPn78<%&e2mR{jwVCz5Og;*Z;;3%VvoGo_;HaGLWYF7q#jDX=Z#Ml`H
z858YVV$%J|e<1n`%6Vsvq7GmnAV0wW4$5qQ3uR@1i>tW{xrl|ExywIc?fNgYlA?C5
zh$ezAFb5{rQu6i7BSS5*J-|9DQ{6^BVQ{b*lq`xS@RyrsJN?-t=MTMPY;WYeKBCNg
z^2|pN!Q^WPJuuO4!|P@jzt&tY1Y8d%FNK5xK(!@<w&%9D$8VsECTj#p>`jO2aEA*4
zkO6b|UVBipci?){-Ke=+1;mGlND8)6+P;8sq}UXw2hn;fc7nM>g}GSMWu&v&fqh<p
z##88~l{cY%DBl|WjH>iViYT=fZ(|3Ox^$aWPp4a8h24tD<|8-!aK0lHgL$N7Efw}J
zVIB!7=T$U`ao1?upi5V4Et*-lTG0XvExbf!ya{cua==$WJyVG(CmA6Of*8E@DSE%L
z`V^$qz&RU$7G5mg;8;=#`@rRG`-uS<w08Td3B}9G%N}FK9HR~!f^Cj{`y^tJfREum
z*~gqwb#dcwc-QI{m8GKpLpC4_K%Vfi)$F_F!#pL|shy<Q%NAC^CU`RL!|-5srD#ZO
zn{I~O)p%c{5m;d<;UUXgV+yNvL<rtSIQngc|6F6>18$0WPN@!v2d{H2sOqP|!(cQ@
zUHo!d>>yFArLPf1q`uBvY32miqShLT1B@gDL4XoVTK&@owOoD)OIHXrYK-a1d$B{v
zF^}8D3Y^g%^cnvScOSJR5QNH+BI%d|;J;wWM3~l>${fb8DNPg)wrf|GBP8p%LNGN#
z3EaIiItgwtGgT&iYCFy9-LG}bMI|4LdmmJ<aSE*uYY8*ef191mD07amYtQ+>t@V@%
zb6B)1kc=T)(|L@0;wr<>=?r04N;E&ef+7C^`wPWtyQe(*pD1pI_&XHy|0gIGHMekd
zF_*M<adlI3H~C+q^IzcHq+zQxXN(?TC=A;~jCHxB64cks3Odw>4yi6J&Z4LQj65)S
zXwdM{SwUo%3<O37{DHPAG$A+a&Uh?}DLaiJmVVmFZ1SIa$#%_k^;QaeeZ7P1{c?b9
zC=eLHcdO3e<gc?V;V!z6HlJL{r#Zyj=E&V_!6PB!qLm)(8_YSrHh0%Boz_*kUx6mK
zb|)@dlgu8i#ZFeI!mo!f$fZhLo%K}Hqt2m#>SbPwFsHgqF@V|6afT|R6?&S;lw=8%
z3}@9<sV<+=?Zw{9R&#fEo?wO?NZ(DJrAWh4NL*AP6WG<pY>B=#JI3@B*#4s!O))~z
zc>2_4Q_#&+5V`GFd?88^;c1i7;Vv_I*qt!_Yx*n=;rj!82rrR2rQ8u5(Ejlo{15P%
zs~!{%XJ>FmJ})H^I9<JZ=qNB8Uvp_IODk79lcQ%6N8nJ<layarnSw*wERT@1y+@T9
zbCRk63Z9EFi*?65Y?t(rNyKH`R2OmS8*97sR}##9$$k=`zv4t1*Bd!||1<$^?K3bV
zch~R<>bn^Re&38H{xA!0l3^89k(oU;bZWXM@kn$#aoS&Y4l^-WEn<v2GMB&`=$+t{
zsqH-Hrg^zC-u%NR+$BDUf%Zr&u$O+4nJ{Bn;W>-fH39Jb9lA%s*WsKJQl?n9B7_~P
z-XM&WL7Z!PcoF6_D>V@$CvUIEy=+Z&0kt{szMk=f1|M+r*a43^$$B^MidrT0J;RI`
z(?f!O<8UZkm$_Ny$<xT<$ZIyDj(fr1FYD^^at+o!IT*&wJZ2YcAjrNtR7B|~_E5=s
zOz!Ci^%eTS=@CxD@zJ?@F7iX3EI*kkt`>Hth1J#^4ni+im8M9mr&k|3cIgwvjAgjH
z8`N&h25xV#v*d$qBX5jkI|xOhQn!>IYZK7l5#^P4M&twe9&Ey@@GxYMxBZq2e7?`q
z$~Szs0!g{2fGcp9PZEt|rdQ6bhAgpcLHPz?f-vB?$dc*!9OL?Q8mn7->bFD2Si60*
z<SxIYe5*?<(^};SmYZJUE5uTQgi>!O%y)fCdMSV|lkF9w%x~J*A&srMyYY3{=&$}H
zGQ4VG_?$2X(0|vT0{=;W$~icCI{b6W{B!Q8xdGhF|D{25G_5_+%s(46lhvNLkik~R
z><gHECVNA9lSE@px%4b)MU9AlX-3O&uNmc}yl!RiOZVkYH*st9io|}a-%W^-z%%sS
zBRKzv>nr(&C#5wwOzJZQo9m|U<;&Wk!_#q|V>fsmj1g<6%hB{jGoNUPjgJslld><h
z0D4sDtR`m}US*Y@1-q?v_8uo!>xmODzGjY<PkPw{-%~Z34UsBBxRhv{JbTqaVf$5q
z{S2pJqjiGYd2`{L@&>c?7JSuA?A_QzjDw5AsRgi@Y|Z0{F{!1=!NES-#*f^s4l0Hu
zz468))2IY5dmD9pa*(yT5{EyP^G>@ZWumealS-*WeRcZ}B%gxq{MiJ|RyX-^C1V=0
z@iKdrGi1jTe8Ya^x7yyH$kBNvM4R~`fbPq$BzHum-3Zo8C6=KW@||>zsA8-Y9uV5V
z#oq-f5L5}V<&wF4@X@<3^C%ptp6+Ce)~hGl`kwj)bsAjmo_GU^r940Z-|`<)oGnh7
zFF0Tde3>ui?8Yj{sF-Z@)yQd~CGZ*w-6p2U<8}JO-sRsVI5dBji`01W8A&3$?<gda
z?BZWzCe?!+Mzz3|voidco80@c=7!Ur=?8_d@M{njoqdXf;HO=-j8&nJI$X=2*nR5b
zdkQR1yvkj-(Jw_Mm=h7q^yxfjEp7^;bcyq6D@_K&VWKp^Sop&nM1y{dpIssXCy2i4
z=LyazjEE+1j0KJwbLD2TWETW$BXbT?w}d!pg$Bwi+bH5Fd+>}lxBaC&vn0E$c5tW*
zX>5(zzZ=qn&!J~KdsPl;P@bmA-Pr8T*)eh_+Dv5=Ma|XSle6t(k8qcgNyar{*ReQ8
zTXwi=8vr>!3Ywr+BhggHDw8ke==NTQVMCK`$69fhzEFB*4+H9LIvdt-#IbhZvpS}}
zO3lz;P?zr0*0$%-Rq_y^k(?I{Mk}h@w}cZpMUp|ucs55bcloL2)($u%mXQw({Wzc~
z;6nu5MkjP)0C(@%6Q_I_vsWrfhl7Zpoxw#WoE~r&GOSCz;_ro6i(^hM>I$8y>`!wW
z*U^@?B!MMmb89I}2(hcE4zN2G^kwyWCZp5JG>$Ez7zP~D=J^LMjSM)27_0B_X^C(M
z`fFT+%DcKlu?^)FCK>QzSnV%IsXVcUFhFdBP!6~se&xxrIxsvySAWu++IrH;FbcY$
z2DWTvSBRfLwdhr0nMx+URA$j3i7_*6BWv#DXfym?ZRDcX9C?cY9sD3q)uBDR3uWg=
z(lUIzB)G$Hr!){>E{s4Dew+tb9kvToZp-1&c?y2wn@Z~(VBhqz`cB;{E4(P3N2*nJ
z_>~g@;UF2iG{Kt(<1PyePTKahF8<)pozZ*xH~U-kfoAayCwJViIrnqwqO}7{0pHw$
zs2Kx?s#<e4dK%3b&+)k6Y|;S4DL85-WyrKVIj_j{{6I$&%2Do^b$2hE@5=a;FpA#?
zj?ue-OJN&$@J%?YKM$eGC(JtcZy!B$NWApB@di<X3W1e<da}udYMoeI3o7_<JF=Zh
zYpeXWvB)_@QIIYWL@3|7rB4|sFVTbw@}gXInS&gjZDpG1DvPM{2=+Ykc&(i5ifc$_
zh}LZ8qwN(P?@iKtl~(pPzWr%^DDJwnMm5!z?#c5FjG;&ZIUT6z@~tYZ+k;3g@lXUv
zc!5>vQr7XZ264>5RNKSL8|Ty^=PsIx^}QqOOcfpGUU4tRkUc|kc7-!Ae6!+<d3LhN
z&XzYh?Io|}4gfQtnbqxLyJD!7AFApf16JvF_cy6Y`x$Llw|Gfz;B@D2LO~qGw&vqe
zsH^CM_BX(-!fK<Eo8IYbMVZ6+S7(ZE0!FE(^I(-o-1+IZ<U0&RNxqDrwiyUBYR)d<
z#!m|@8#oaZv2FVRDr{+-;DajT%LpK4DvrtxtKBx!-{g~??&MQ(9~5@mIpt?Y@cvL%
zN}LG<11t5Cf)G^&gR<1lgJ{-R<J>B{o~7nFpm3|G5^=0#Bnm6`V}oSQlrX(u%OWnC
zoLPy&Q;1J<Q=Rw7zP0W`<I7X@-?=Nf;Xee%N*w}vJKiE|cD<4a=^PO7MQlM02j-+$
zKCm^lM#p{(Wj}5i#kBavYT-0#nTBp`m_35(`HY&Y@4YUMZTiPw%I|bpPk6PK|CYyI
z`Xes=050k(L_<N^Jv(Mpm{{2H2c!?vIl%96&k^E-?K&Vk`$KkeX~Jw~Fsfk(d16L!
z-bf)Sz$PAGgB&vJhQ}eDyRs{2lK?Gq>ui&7ST0~#+}I^&?vcE*t47~Xq#YwvA^6^}
z`WkC)$AkNub|t@S!$8CBlwbV~?yp&@9h{D|3<UyWg7|l{^glZ5Dp<R^T02<&bDDly
zL;vF_RkK%`Q$`P93~`T9H0DLwoQ7TLazhh0=(S3=G6^=$?i+3C_*1LCvRZO39g|43
z<9HQ9$%`iR2>z-vJXgzRC5^nYm+PyPcgRzAnEi6Q^gslXYRv4nycsy-SJu?lMps-?
zV`U*#WnFsdPLL)Q$AmD|0`UaC4ND07+&UmOu!eHruzV|OUox<+Jl|Mr@6~C`T@P%s
zW7sgXLF2SSe9Fl^O(I*{9wsFSYb2l%-;&Pi^d<d5gZY$ouXkSxh!i;YM~orayzvd9
z$>pv!{)C3d0AlNY6!4fgmSgj_wQ*7Am<LG|<(H6ae*!sIhw}*%cn8L{G&Qz)Il&k~
zdUB%q=yN3Oz|C{wnn*7=Y}H`Tp)^(dl#`ZFq_B51Ks``*Lp3oxGdwsr3V(Qn1t<fg
ziSMz83x=Ap$h4F(3LJRw8rYw8Xe?}PuG+VUk_bdjjrHLOpBsF^D$Ey0j+dIBQyzkk
z^3ERO0R}UDBy9?czbAa9qFbE3)`4Z5^?OXpH_#GiC*r#QhzMY=jT%oM-$ku0=Z=SS
zPUHZ>7&$z;Jg&wgR-Ih;lUvWS|KTSg!&s_E9_bXBkZvGiC6bFKDWZxsD$*NZ#_8bl
zG1P-#@?OQzE<T`h^Ta9L)yZGSKEF-RZ;~y;F=H0>D7@jlMJTH@V!6k;W>auvft)}g
zhoV{7$q=*<qV(a={b8n4s4yhm_oFzSM6cYhPn}4ss!6ccUzX#rKA~T>;=l{O>Q4a@
ziMjf_u*o^PsO)#BjC%0^h>Xp@;5$p{JSYDt)zbb}s{Kbt!T*I@Pk@X0zds6wsefuU
zW$XY%yyRGC94=6mf?x+bbA5CDQ2AgW1T-jVAJbm7K(gp+;v6E0WI#kuACgV$r}6L?
zd|Tj?^%^*N&b>Dd{Wr$FS2qI#Ucs1yd4N+RBUQiSZGujH`#I)mG&VKoDh=KKFl4=G
z&MagXl6*<)$6P}*Tiebpz5L=oMaPrN+caUXRJ`D?=K9!e0f{@D&cZLKN?iNP@X0aF
zE(^pl+;*T5qt?1jRC=5PMgV!XNITRLS_=9{CJExaQj;<KOp}Ss$xf3w95Awwovm~a
z$iUieZ+;LRH(+2InXK7*7kZ|*f#fpjzjcGEbKAy*9*Q%Ik>lt!&pdzpK?8p>%Mb+D
z?yO*uSung=-`QQ@yX@Hyd4@CI^r{2oiu`%^bNkz+Nkk!IunjwNC|WcqvX~k=><-I3
zDQdbdb|!v+I<k8C-8h1&l^p%~4R~&So2|v->z01$w@aMl!R)koD77Xp;eZwzSl-AT
zr@Vu{=xvgfq9akRrrM)}=!=xcs+U1JO}{t(avgz`6RqiiX<|hGG1pmop8k6Q+G_mv
zJv|RfDheUp2L3=^C=4aCBMBn0aRCU(DQwX-W(RkRwmLeuJYF<0urcaf(=7)JPg<3P
zQs!~G)9CT18o!J4{zX{_e}4eS)U-E)0FAt}wEI(c0%HkxgggW;(1E=>J17_hsH^sP
z%lT0LGgbUXHx-K*CI-MCrP66UP0PvGqM$MkeLyqHdbgP|_Cm!7te~b8p+e6sQ_3k|
zVcwTh6d83ltdnR>D^)BYQpDKlLk3g0Hdcgz2}%qUs9~~Rie)A-BV1mS&naYai#xcZ
z(d{8=-LVpTp}2*y)|gR~;qc7fp26}lPcLZ#=JpYcn3AT9(UIdOyg+d(P5T7D&*P}#
zQCYplZO5|7+r19%9e`v^vfSS1sbX1c%=w1;oyruXB%Kl$ACgKQ6=qNWLsc=28xJjg
zwvsI5-%SGU|3p>&zXVl^vVtQT3o-#$UT9LI@Npz~6=4!>mc431VRNN8od&Ul^+G<O
z&+UaGr()Me%6V)8@*Bx3oT4=TBj_vjymMyd8nWP{_ePd?ZpLR5y@P!PwPSnq@b%?+
z-3jAw7s2p_He|nVH%u;ROIVANf3n6TyT+w(2_c_sy)MF$<SLbp^<>_kHC`G=6WVWM
z%9eWNyy(FTO|A+@x}Ou3CH)oi;t#7rAxdIXfNFwOj_@Y&TGz6P_sqiB`Q6<Z9`{@I
zG)gW^Bs^4xVzBtFwh6KfO16ddPYr(3GPqiVlbqYNdp{z1`WEdF){s~pqbp&T6o|uZ
zd@{Wd+K`h(<$gjo>Lxy|Q{`|fgmRG(k+!#b*M+Z9zFce)f-7;?Km5O=LHV9f9_87;
zF7%R2B+$?@sH&&-$@tzaPYkw0;=i|;vWdI|Wl3q_Zu>l;XdIw2FjV=;Mq5t1Q0|f<
zs08j54Bp`3RzqE=2enlkZxmX6OF+@|2<)A^RNQpBd6o@OXl+i)<H_i&N`daO9#gRD
zbNRiucg54Gy(2fGrWtv`LB0NuWCH3@RHOJamGJ+B#lKG`{v$j0pO8><bNM_W{ENJH
zS2a-j%gz<EZJA$~1=AFf&`NH0`}A|!jr|e^sYu1)OS{vLFWmU*j55~$42^zF3vE?V
zDx)gAg1%Glt~U?HFUqs}9{v)ryb$pHbibYndMV|B@l;eyS(h=KEpcIvczVDE78@Xj
zSAm;1J^1Dwm>zO%D4iGiQNuXd+zIR{_lb96{lc~bxsBveIw6umhShTX+3@ZJ=YHh@
zWY3(d0azg;7oHn>H<>?4@*RQbi>SmM=JrHvIG(~BrvI)#W(<iZ@?A1TuACNgdXURW
z+)gvyNh;kbU(liR<_1NHe=TW&=0kt+K?wKELV`s)-;TebXWQlc!-`aY6o(nMsy+|=
z(E4T?*-uU}N^Du>EAeO6fS+}mxxcc+X~W6&YVl86W9WFSS}Vz-f9vS?XUDBk)3TcF
z8V?$4Q)`uKFq>xT=)Y9mMFVTUk*NIA!0$?RP6Ig0TBmUFrq*Q-Agq~DzxjStQyJ({
zBeZ;o5qUUKg=4Hypm|}>>L=XKsZ!<FKQ_ntYAcXmoND))pw_T3pH%fHY!pNqk5cuV
zOHA2*8nP`0K~OlwGy0SH3EWaDB-i#4%#|`_{yB={(lcN;3!10+Pxox-HkRohVDL0|
z8{E!B)=^(A?$N_ctiS3J)!iY`)ts!F9ODnu96)<93qPUBnzlYuy=Jt+bF8r45!B4r
zWzRGHHPnO9ti}*NAt&~?DFW+%!bE>F$yNTDO)jt4H0gdQ5$f|d&bnVCMMXhNh)~mN
z@_UV6D7MVlsWz+zM+inZZp&P4fj=tm6fX)<V@r2uJW+0vvpHTeeFv#Sgo7s}BAm4K
zjGGF<Q!n^&4xvzX0>SG5H>OsQf_I8c<Dg8clrV~^w3Z*%r!X6dX4x@j9;{JD(8l7}
z(Qgx)wY{>~uGCig$GzuwViK54bcgL;VN|FnyQl>Ed7(@>=8$a_UKIz|V6CeVSd2(P
z0Uu>A8A+muM%HLFJQ9UZ5c)<?oM~-8FHMf~w|t%VP|2Tazr<2Sjx#;msM?}B)jn`T
z*pYak+6)TB+ee7iYW3p=zQkY>BSAv_zH#1f02x?h9C}@pN@6{>UiAp>({Fn(T9Q8B
z^`zB;kJ5b`>%dLm+Ol}ty!3;8f1XDSVX0AUe5P#@I+FQ-`$(a;zNgz)4x5hz$Hfbg
z!Q(z26wHLXko(1`;(BAOg_wShpX0ixfWq3ponndY+u%1gyX)_h=v1zR#V}#q{au6;
z!3K=7fQwnRfg6FXtNQmP>`<;!N137paFS%y?;lb1@BEdbvQHYC{976l`cLqn;b8lp
zIDY>~m{gDj(wfnK!lpW6pli)HyLEiUrNc%eXTil|F2s(AY+LW5hkKb>TQ3|Q4S9rr
zpDs4uK_co6XPsn_z$LeS{K4jFF`2>U`tbgKdyDne`xmR<@6AA+_hPNKCOR-Zqv;xk
zu5!HsBUb^!4uJ7v0RuH-7?l?}b=w5lzzXJ~gZcxRKOovSk@|#V<jQ-(2_xKpDYt{m
zs6<ysaM*D{ARcUnlk4D!8f*k1G{Ip@*-dFQ!bhc3zg>+MuX%Y+=;14i*<yct;~?4+
z8a$HdaeCZdGnM?f>%{)_gSW9(#4%)AV#3__kac1|qUy!uyP{>?U#5wYNq}y$S9pCc
zF<Mndv5MKme1!JVgsoWscJ<knfP)Xe)2}9N1^EiWQ;6~WJPU`LW&2l%<A5V5ht~*^
zy?4tqc_+c^CwHLPg-(Ehm=L2yf~2Mxlz*2rKsp2n_Y-esI>c~4mgSC*G~j0u#qqp9
z${>3HV~@->GqEhr_Xwoxq?Hjn#=s2;i~g^&Hn|aDKpA<n^4$fC$Kuspwq}<LNwu8C
zbf6;H40RGwOB}XjobHn85?fmF9ub`bI+IQM@Py%7F9WcE4R&_4B5<%dGT-3U#$8JL
z+9W_t43rJ$Gf^G?+|wOo&KIwqf2&OR?zMoHUZhcc%t4i);VELMxvn-h%aEuLgl_t^
zn}SzihDXMuweFhp8a#vz8k>>Oc%HlW(KA1?BXqpxB;Ydx)w;2z^MpjJ(Qi(X!$5RC
z*P{~%JGDQqojV>2JbEeCE*OEu!$XJ>bWA9Oa_Hd;y)F%MhBRi*LPcdqR8X`NQ&1L#
z5#9L*@qxrx8n}LfeB^J{%-?SU{FCwiWyHp682F+|pa+CQa3ZLzBqN1{)h4d6+vBbV
zC#NEbQLC;}me3eeYnOG*nXOJZEU$xLZ1<1Y=7r0(-U0P6<g54#mo~h%m97FKEIHpA
zi1;stE`DWrPG;ZcvR%GkPkplBUD5E>-AqwMAM`a(Ed#7vJkn6plb4eI4?2y3y<C7^
zMN|!317AP-8b+h`frBg^oc&CV#@gdFKbOG_+V@md3_}H++3*0>OTGmmDQ!z9`wzbf
z_OY#0@5=bnep;MV<TyaesE-ymV~)h1zKx)bzGTLWVIp8Jc0Xjtfz?g}02XS&L-sgn
zz+J7FV@}%gTsBPancF*aFOCi$QUrJa8Ibmw3#H6HwLunm!~S7uJfJF*x^4TdZ((BQ
z!OA8ez?xzj5&N>0X_;;<l|1-%NB+RStv%4V3*k9dM&8$D*6KHj&I{f#=G0sJycjJ9
zsbnF%tPoJ^)WY9aH4DzA@Up>SJJWEf^E6Bd^tVJ9znWx&Ks8t*<NkWUjNZuHXm?wX
z&k+-16-gZ2l39lpjw5PGa}Nvw$IGx#fYlU<*{);MA3*W3V0a83>B>AM@?;D4oWUGc
z!H*`6d7Cxo6VuyS4Eye&L1ZRhrRmN6Lr`{NL(wDbif|y&z)JN>Fl5#Wi&mMIr5i;x
zBx}3YfF>><oG8>8EC(fYnmpu~)CYHuHCyr5*`ECap%t@y=jD>!_%3iiE|LN$mK9>-
zHdtpy8fGZtkZF?%TW~29JIAfi2jZT8>OA7=h;8T{{k<t+bcx0feOM-&l9hI?Xmy(z
z-fq}pe2pf8j{{(B0xe64n-!77hMklQf7$y)E8W+2Z@Tt{aWpu0WCZ>?c2`nCEx9$r
zS+*&vt~2o^^J+}RDG@+9&M^K*z4p{5#IEVbz`1%`m5c2};aGt=V?~vI<yv(rk2~bL
zj=};pL9GggLHjow%gVWrUmkyePLZ<Qj(q4u0~rKInZFBgS5;8-hpCcg={gcFHnWum
zMonS>M}ZdPECD<VzUqoNT#)>I)47|CWBCfDWUbxBCnmYivQ*0Nu_xb*C>~C9(VjHM
zxe<*D<#dQ8TlpMX2c@M<9$w!RP$hpG4cs%AI){jp*Sj|*`m)5(Bw*A0$*i-(C<so-
zb=dYmBN5sxWooS6f<r|QIT;nm(*5IP;!0gq<>A5#%>a)$+jI2C9r6|(>J8InryENI
z$NohnxDUB;wAYDwrb*!N3noBTKP<UImuz_p@!@WwtKs6Oq=w->pPN}~09SEL18tkG
zxgz(RYU_;DPT{l?Q$+eaZaxnsWCA^ds^0PVRkIM%bOd|G2IEBBiz{&^JtNsODs;5z
zICt_Zj8wo^KT$7Bg4H+y!Df#3mbl%%?|EXe!&(Vmac1DJ*y~3+kRKAD=Ovde4^^%~
zw<9av18HLyrf*_>Slp;^i`Uy~`mvBjZ|?Ad63<fPCD(QY8B|u!l)brK@3#~ULtEdK
zqfCRe>yQa#YK`4+c6;pW4?XIY9G1(Xh9WO8{F-Aju+nS9Vmv=$Ac0ienZ+p9*O%NG
zMZKy5?%Z6TAJTE?o5vEr0r>f>hb#2w2U3DL64*au_@P!J!TL`oH2r*{>ffu6|A7tv
zL4juf$DZ1MW5ZPsG!5)`k8d8c$J$o;%EIL0va9&GzWvkS%ZsGb#S(?{!UFOZ9<$a|
zY|a+5kmD5N&{vRqkgY>aHsBT&`rg|&kezoD)gP0fsNYHsO#TRc_<dLhZf-oCe<uor
zVn+D3J+?dI`OPTIwX%7HL4coV@n&0F`$sgzfV#jy^Nxhx;htyfm`2*%2*E<EEua3X
z>$n6Lf1Z{?+DLziXlHrq4sf(!>O{?Tj;Eh@%)+nRE_2VxbN&&%%caU#JDU%vL3}Cb
zsb4AazPI<wjJ5Xm?P>{>8H&d=jUaZDS$-0^AxE@utGs;-Ez_F(qC9T=UZX=>ok2k2
ziTn{K?y~a5reD2A)P${NoI^>JXn>`IeArow(41c-Wm~)wiryEP(OS{YXWi7;%dG9v
zI?mwu1MxD{yp_rrk!j^cKM)dc4@p4Ezyo%lRN|XyD}}>v=Xoib0gOcdXrQ^*61HNj
z=NP|pd>@yfvr-=m{8$3A8TQGMTE7g=z!%yt`8`Bk-0MMwW~h^++;qyUP!J~ykh1GO
z(FZ59xuFR$(WE;F@UUyE@Sp>`aVNjyj=Ty>_Vo}xf`e7`F;j-IgL5`1<e8<5GZ9t_
zSKJ;j#8L2sA)KLlG+guS4jf40SgEe!dKKK0Hbs4NAYj<w(>~-#70$9_=uBMq!2&1l
zomRgpD58@)YYfvLtPW}{C5B35R;ZVvB<<#)x%srmc_S=A7F@DW8>QOEGwD6suhwCg
z>Pa+YyULhmw%BA*4yjDp|2{!T98~<6Yf<Ht&p|`G9M?uugEk_wVc(bM<s*XMD&4B1
z!i3%8q|snVIZ`!_i1*YyreC8Lohwejbmzog)&}vE7Rz1dcR%OnN}_3vj`{K=-3O~_
zu1c5_k};f^gB06dul({<`Lcpka0Ph<!;#yPQz#pwe?I#d5?HpUA@y)AJdD~*W6*^J
z9IAb}`aqXze3Z5+o@S&yu8d^LhgI0a?q{$=xrJP?yBJszi{*k);E$b`3mcYPuTL=d
zCCNFg0QG16+KKF$c43P(5eJVL61PLUzK~wHo_6%n7f<5cmB2yHn6OgGuGvm#^QB$O
zIXl<)?hk{+{p_;>d(wo1mQ!KWwq0eg+6)o1>W~f~kL<-S+P@$wx*zeI|1t7z#Sxr5
zt6w+;YblPQNplq4Z#T$GLX#j6yldXAqj>4gAnnWtBICUnA&-dtnlh=t0Ho_vEKwV`
z)DlJi#!@nkYV#$!)@>udAU*hF?V`2$Hf=V&6PP_|r#Iv*J$9)pF@X3`k;5})9^o4y
z&)~?EjX5yX1<xGQ%1@{UCW^23>2O(BsFy-l6}nYeuKkiq`u9145&3Ssg^y{5G3Pse
z9w(YVa0)N-fLaBq1`P!_#>SS(8fh_5!f{UrgZ~uEdeMJIz7DzI5!NHHqQtm~#CPij
z?=N|J>nPR6_sL7!f4hD_|KH`vf8(Wpnj-(gPWH+ZvID}%?~68SwhPTC3u1_cB`otq
z)U?6qo!ZLi5b>*KnYHWW=3F!p%h1;h{L&(Q&{qY6)_qxNfbP6E3yYpW!EO+IW3?@J
z);4>g4gnl^8klu7uA>eGF6rIGSynacogr)KUwE_R4E5Xzi*Qir@b-jy55-JPC8c~(
zo!W8y9OGZ&`xmc8;=4-U9=h{vCqfCNzYirONmGbRQlR`WWlgnY+1wCXbMz&NT~9*|
z6@FrzP!LX&{no2!Ln_3|I==_4`@}V?4a;YZKTdw;vT<+K+z=uWbW(&bXEaWJ^W8Td
z-3&1bY^Z*oM<=M}LVt>_<PFYrPfhFhSu%npt;+8<VSwjlcQC8wPbX!R<;Rgr<C++E
zby{kGH;!C6486yrVIwy8>j+p=2Iu7<ee5Yzkv)1V_(^OyjiyljyAy{*({<c49<wJ_
zD`WoEKZ35Gv<M<<pCYpQZ?|m!#mlmG_*_DC0N62ESbuImD+AoD)Lj4`<}R)PJ25MB
zQ(JSFe<_~3nt|(_B)R}zmNZN0*RPG}Ru~x4q$U+I`RU|gs%W~s18LSc)J(SC3~+Y<
zk0lr!;49KA_>pZmbXrhQ_k)ysE9yXKygFNw$5hwDn(M>H+e1&9BM5!|81vd%r%vEm
zqxY3?F@fb6O#5UunwgAHR9jp_W2zZ}NGp2%mTW@(hz7$^<W>+a`A?mb8|_G*GNMJ)
zjqegXQio=i@AINre&%ofexAr95aop5C+0MZ0m-l=MeO8m3epm7U%vZB8+I+C*iNFM
z#T3l`gknX;D$-`2XT^Cg*vrv=RH+P;_dfF++cP?B_msQI4j+lt&rX2)3GaJx%W*Nn
zkML%D{z5tpHH=dk<tahvnnE?`>sQ*gzc|}gzW;lwAbxoR07VNgS*-c3d&8J|;@3t^
zVUz*J*&r7DFRuFVDCJDK8V9NN5hvpgGjwx+5n)qa;YCKe8TKtdnh{I7NU9BCN!0dq
zczrBk8pE{{@vJa9ywR@mq*J=v+PG;?fwqlJVhijG!3VmIKs>9T6r7MJpC)m!Tc#>g
zMtVsU>wbwFJEfwZ{vB|ZlttNe83)$iz`~#8UJ^r)lJ@HA&G#}W&ZH*;k{=TavpjWE
z7hdyLZPf*X%Gm}i`Y{OGeeu^~nB8=`{r#TUrM-`;1cBvEd#d!kPqIgYySYhN-*1;L
z^byj%Yi}Gx)Wnkosi337BKs}+5H5dth1JA{Ir-JKN$7zC)*}hqeoD(WfaUDPT>0`-
z(6sa0AoIqASwF`>hP}^|)a_j2s^P<w)m}Rj^15uY<n!4_%<!d#{vZ=Z_P}@eeW-Ox
z;JQLPzZSHN-l$$DLG%r}N3ZZZvwUxH+BWNXE{dS!hk|G5x)?-llV>Qn*qVC{Q}htR
z5-)duBFXT_V56-+UohKXlq~^6uf!6sA#ttk1o~*QEy_Y-S$gAvq47J9Vtk$5oA$Ct
zYhYJ@8{hsC^98${!#Ho?4y5MCa7iGnfz}b9jE~h%EA<g+BN#3fNo`|_hPZ+|%)bb7
zIn_D<^wYb`{#zL<_<s|myPLHg(|`4wmJ7hi$=pTU+V#^hHu-$b(Luw-PR!Bav-v(-
z@?W|xOvONHUKm|~3~s1|_Dl38>Av~Qxu)_rAV;^cygV~5r_~?l=B`zObj7S=H=~$W
z<UmLzInv1Ql%M`_G9-u94*9n+0oO@^hhKgl*ZXu|6{=bN1o_txgnax72@;~Z7?^Oq
z7?^&}>PtI_m%g$`kL_fVUk9J<CtwAz7a!$Q&-Jh3I_W5n|1(dhB)p#U+Wl>@>EiBH
zOO&jtn~&`hIFMS5S`g8w94R4H40mdNUH4W@@XQk1sr17b{@y|JB*G9z1|CrQjd+GX
z6+KyURG3;!*BQrentw{B2R&@2&`2}n(z-2&X7#r!{yg@<!&3xwQWd$^>Soy}cRD~j
zj<Og|6*w}HqZTw8{Il!Ft=<O5!dlKfOz|j$Z^w5&_=~)z5Z-}bt_7jqebZL&Vjmk}
z(RA*=wrL0UL*<vcZEZprIhH<3JJLr)CAtGH+&D8sC~U9fHYR9L!BM()S6a1mtsI!E
z--M=*g<DRnwm1hG$L!!=946pI4AzFaqTKQdn(cd9nxm|_%Tp(UbUJVdmn&m&OV5sT
zjBA&CZ;!B-hP7XTLul+iNP4Dg{KGjcnsK_H51vQ)!>9@UBW+N|4HW4AWapy4wfUI-
zZ`gSL6DUlgj*f1hSOGXG0IVH8HxK?o2|3HZ;KW{K+yPAlxtb)NV_2AwJm|E)FRs&&
z=c^e7bvUsztY|+f^k7NXs$o1EUq>cR7C0$UKi6IooHWlK_#?IWDkvywnzg&ThWo^?
z2O_N{5X39#?eV9l)xI(>@!vSB{DLt*oY!K1R8}_?<kMv(YfJ|7amweKbCcwmp-oP{
zR^MH3r^g&R=wr#qxEEp(KK<zYcr_;1=X$Imnu<Z`RiZwY8*iRY{cWxHh1c@XJZ&pv
zV{U_Z%$qRKL70X;eBqb*t1O=8k$SB(oK)NPT~SfHMOv=9#+69sQt>%+0^C{d9a%N4
zoxHVT1&Lm<qomrTXsCPGIz?rb+qQLuzE?D*s2JcateF>|uDX%$QrBun5e-F`HJ^T$
zmzv)p@4ZHd_w9!%Hf9UYNvGCw2TTTbrj9pl+T9<ayV5<}<wvT;Sn~c<QFT@1O08w<
zkEzBm=w)jYybjnZrhSE(k<3uFR)#=txys^{+XA;N)s*?BH^)|A82SR=)(_iGhC7T3
z6;In+x<8Dm5KW<GS7?86#S~&}Tl{Cy3IDd}BL8#I#Xpxf?HmDS<l^QQ0CzjL|Nnnw
z7e`AMb5~dSPx>%-_-}L(tES>Or-}Z4F*{##n3~L~TuxjirGuIY#H7{%$E${?p{Q01
zi6T`n;rbK1yIB9jmQNycD~yZq&mbIsFWHo|ZAChSFPQa<(%d8mGw<NE-PqxpYmaZY
z>*V3fh|yFoxOOiWJd(qvVb!Z$b88cg->N=qO*4<Ju1L$F55Eg|&pd*ih%*g;pO{D%
z0by!&Tpi~?D_*9Y{Y99`;u%i~<7J9|%7CE#RGy9%il*j9uH#6qR8ZZ3+-)Oz_wKW(
z^pYp_3KlClW0cl`;)I55^HEmIrxSK3i7Y3l?;+5qj8LrRLEa*uvXRuegx26kvwYL_
zb#;U>k~6;R==|9ihg&riu#P~s4Oap9O7f%crSr^rljeIfXDEg>wi)&v*a%7zpz<9w
z*r!3q9J|390x`Zk;g$&OeN&ctp)VKRpDSV@kU2Q>jtok($Y-*x8_$2piTxun81@vt
z!Vj?COa0fg2RPXMSIo26T=~0d`{oGP*eV+$!0I<(4azk&Vj3SiG=Q!6mX0p$z7I};
z9BJUFgT-K9MQQ-0@Z=^7R<{bn2Fm48endsSs`V7_@%8?Bxkqv>BDoVcj?K#dV#uUP
zL1ND~?D-|VGKe3Rw_7-Idpht>H6XRLh*U7epS6byiGvJpr%d}XwfusjH9g;Z98H`x
zyde%%5mhGOiL4wljCaWCk-&uE4_OOccb9c!ZaWt4B(wYl!?vyzl%7n~QepN&eFUrw
zFIOl9c({``6~QD+43*_tzP{f2x41h(?b43^y6=iwyB)2os5hBE!@YUS5?N_tXd=h(
z)WE286Fbd>R4M^P{!G)f;h<3<yF&*^O7$OuoRrI)h{eq;PvnVS@*1~LuT)USkQaNv
zOM$`oAtUE4j7%H>Q>Fipuy+d2q-)!RyTgt;wr$(?9ox3;q+{E*ZQHhOn;lM`cjnu9
zXa48ks-v(~b*;MAI<>YZH(^NV8vjb34be<!O&B^}ixjt}bVWn%lGLAylA+d{-I3Ov
zYGthSdKw$ke{f2yKKz!}A?+JRYrVrnNgphJxf8a2-SUbcd-<f$tEQ|wN=!zhIVy6o
z{e*aA58OB1vmh4GpWd_ASE)%_0rN^UY7rBTo&!Y1@Ctrd$H;scFhnl=M`1%EsufNC
z-OLaEwV5;h{|wOY5$Wp2@8oFu?G`jM&~vo;?-m}Z`0Z8WNBRVdp)MQ|2K`3!%98{%
zdNe?VYC=$}mLx4b>E<_cwKlJoR;k6lJNSP6v}uiyRD?|0w+X@o1ONrH8a$fCxXpf?
z?$DL0)7|X}Oc%h^zrMKWc-NS9I0Utu@>*j}b@tJ=ixQSJ={4@854wzW@E>VSL+Y{i
z#0b=WpbCZS>kUCO_iQz)LoE>P5LIG-hv9E+oG}DtlIDF>$tJ1aw9^LuhLEHt?BCj&
z(O4I8v1s#HUi5A>nIS-JK{v!7dJx<eVzUtPaTI7fl_Lc9Q7H|gBw|{WKmed^JnGV(
zu>)^Yg%XjNmlkWAq2*cv#tHgz`Y(bETc6CuO1VkN^L-L3j_x<4NqYb5rzrLC-7uOv
z!5e`GZt%B782C5-fGnn*GhDF$%(qP<74Z}3xx+{$4cYKy2ik<NlkqF%3WflOIsu<r
zJ1Ia^)U`#vAWMh>xI7B2N+2r07DN;|-T->nU&!=Cm#rZt%O_5c&1Z%nlWq3TKAW0w
zQqemZw_ue--2uKQsx+niCUou?HjD`xhEjjQd3%rrBi82crq*~#uA4+>vR<_S{~5ce
z-2<NdSzF&R56UcB$b`5iPf1tk$#inbE+bN7x7fQ!g0(-tUeP$5mD|<oEEQs$_4x-D
zh0c}WhYdr7ofXz6ohh@zpmk*n(FlBp!zEgxx$uEo2H<WsrEGtxER628jLj$t%l9)Q
zpgsl-$*Z~WylJ9&D{WG%{31lN8lbCEKy<E~v-RJ-A&Im)1f}cclb5D<{1Q#Vu%0dO
zWKBG_7m(=clSMuCN`u^GxdNe&YF`-TUb|;%bmJ`YPw4~vsx(y)NXfrJ;zl=TdJvdM
zgjB=Fy{n+66I+(Z4-Ri^DAN$}Va@@|i(LY(Ta%N-!9$yT@Di8@Q|ICHs-$>EIl?~s
z1=<moH2Vo(ywx9NJa$4J-?u#55cOFdV)B}0g(o*O*fidd5c?ici{Ux!YWxH)lJBu&
zebpoNCFHe!@Sp-PDw*l@?whO<W~J*cdfDfxv>GVL{NxP1N3%=AOaC}j_Fv=ur&THz
zyO!d9kHq|c73kpq`$+t+8Bw7MgeR5~`d7ChYyGCBWSteTB>8WAU(NPYt2Dk`@#+}=
zI4SvLlyk#pBgV<A2?oY=e+fBwTE4;jq%tyXWMQiSYYYO}#)dHPJlDLuJulo6SGjK1
z`gH3!=BMJnht1ob+aBAuUFTlcx2QPoAUzlvdTgFMd@}Q&V?T*GzNthb2P4Otx?F}b
zQU!B?T171=l1DVswq8U{dUopH<i_9aHNW4O!%Ue4mI5N4Rk3KVw;&F(OhCj^%kuG+
z8MtBDbnF(k2oZuHMNq<)Iaf2h9OF2sY%r9g4<_CbzLUIxWdSMTHg+tXTNiq(CW|G{
zGd*nwn$nSQ3yn2F)sHm_LxN&3a)|o1Bxxow1q4-amB&cP3_zydal7X0#bqu|rbi}z
za?8dV(p~@OkF-Z^V2VNz4r_~<b6L?KbFZxteo)3x8MUXZIB5k|m&5ONIJ2mEmpJ8+
zS^3scTkT>igEe`?NG*vl7V6m+<}%FwPV=~PvvA)=#ths==DRTDEYh4V5}Cf$z@#;<
zyWfLY_5sP$gc3LLl2x+Ii)#b2nhNXJ{R~vk`s5U7Nyu^3yFg&D%Txwj6QezMX`V(x
z=C`{76*mNb!qHHs)#GgGZ_7|vkt9izl_&PBrsu@}L`X{95-2jf99K)0=*N)VxBX2q
z((vkpP2RneSIiIUEnGb?VqbMb=Zia+rF~+iqslydE34cSLJ&BJW^3knX@M;t*b=EA
zNvGzv41Ld_T+WT#XjDB840vovUU^FtN_)G}7v)1lPetgpEK9YS^OWFkPoE{ovj^=@
zO9N$S=G$1ecndT_=5ehth2Lmd1II-PuT~C9`XVePw$y8J#dpZ?Tss<6wtVglm(Ok7
z3?^oi@pPio6l&!z8JY(pJvG=*pI?GIOu}e<i-gr8K;Jwm`jb9}cg?7%k?$ozkvP<q
z^_0<VPv%dHn>^EB6QYk$#FJQ%^AIK$I4epJ+9t?KjqA+bkj&PQ*|vLttme+`9G=L%
ziadyMw_7-M)hS(3E$QGNCu|o23|%O+VN7;Qggp?PB3K-iSeBa2b}V4_wY`G1Jsfz4
z9|SdB^;|I8E8gWqHKx!vj_@SMY^hLEIb<lAtPrMWpQ?Gx@0V+>SMCuE?WKq=c2mJK
z8LoG-pnY!uhqFv&L?yEuxo{dpMTsmCn)95xanqBrNPTgXP((H$9N${Ow~Is-FBg%h
z53;|Y5$MUN)9W2HBe2TD`ct^LHI<(xWrw}$qSoei?}s)&w$;&!14w6B6>Yr6Y8b)S
z0r71`WmAvJJ`1h&poLftLU<!Z5k{sKI&`B$86NJr<vepFmH?(W7PH*&i|mr?Ft$yK
zlQ2hYqAhr7MyE%yewrikAeSqlmaqf6`n)*-iF$8(XN#mJ2C<)bI6Vjy(bW4=>S6Ir
zC$bG9!Im_4Zjse)<TV^7Y-skQbZaPLqlJGP?6u?Ar53a`=TEMdV9Pz$A~Oa(Rc*59
zlP6c&tH(X*j_BPct#psJ_4ej*FB0-ZmxrgT1go#{dSJYBN5b(ilJd0C{DrQAlZa_y
z_`$lr_=xcxo6aRz`CVouz-G0iMAr=_WWB~^j&$tY`E*!!JHXJsUn?rao*@+eB&qDA
zW99F#`#iK!JA{ggeYTsjHg%UzJKlG}4g|0~H1^LtyCeCE^d_K<#AGK3JmN+YTaC5S
z91&>#K=oJM9mHW1{%l8sz$1o?ltdKlLTxWWPB>Vk22czVt|1%^wn<WkC7-mZ1~!CF
z*?s-mfPHuh>N@*!l)}?EgtvhC>vlHm^t+ogpgHI1_$1ox9e;>0!+b(tBrmXR<YSIe
z+ujWarO6U*;i)~AxpZt4t`{u9*(+s;XcKm*(c~N9u#mFIlYU2WORAXM_UYQcUg$Ee
zx5S=-_TAMk8a1Q-)f_5{=PkrVgJA;Ro116-3NLM9UpBJ!h?qkH2BSize2e<I)M16H
z`{Y|kfSkRI?YvZ4;f|#JKgvo95q7X$@!Rjljd&2-g(yOk)xl#i>B`PY1vp-R**8N7
zGP|QqI$m(Rdu#=(?!(N<WmSu~%G3p+kgCkb(yT{~ITG_cvZ}c9BIo-Bx{A8PA+JSS
zM`u{@ucuz=u?fnE^32?!>}G9QhQ%o!aXE=aN{&wtGP8|_qh+7a_j_sU5|J^)vxq;#
zjvzLn%_QPHZZIWu1&mRAj;Sa_97p_lLq_{~j!M9N^1yp3U_SxRqK&JnR%6VI#^E12
z>CdOVI^_9aPK2eZ4h&^{pQs}xsijXgFYRIxJ~N7&BB9jUR1fm!(xl)mvy|3e6-B3j
zJn#ajL;bFTYJ2+Q)tDjx=3IklO@Q+FFM}6UJr6km7hj7th9n_&JR7fnqC!hTZoM~T
zBeaVFp%)0cbPhejX<8pf5HyRUj2>aXnXBqDJe73~J%P(2C?-RT{c<cL>3NjE`)om!
zl$uewSgWkE66$Kb34+QZZvRn`fob~Cl9=cRk@Es}KQm=?E~CE%spXaMO6YmrMl%9Q
zl<Oi>A3Q$3|L1QJ4?->UjT&<QWaf5;5SDgEG|O+++eQ`L7IecmPP{~vvxpw+mh_w?
z)_nm*UV;|XpG)3akT+?)#!p)ksH$g>CBd!~ru<az8{#I2>{Ih^in&JXO=|<6J!&qp
zRe*OZ*cj5bHYlz!!~iEKcuE|;U4vN1rk$xq6>bUWD*u(V@8sG^7>kVuo(QL@Ki;yL
zWC!FT(q{E8#on>%1iAS0HMZDJg{Z{^!De(vSIq&;1$+b)oRMwA3nc3mdTSG#3uYO_
z>+x;7p4I;uHz?ZB>dA-BKl+t-3IB!jBRgdvAbW!aJ(Q{aT>+iz?91`C-xbe)IBoND
z9_Xth{6?(y3rddwY$GD65IT#f3<(0o#`di{sh2gm{dw*#-Vnc3r=4==&PU^hCv$qd
zjw;<UDv>>i&?L*Wq#TxG$mFIUf>eK+170KG;~+o&1;Tom9}}mKo23KwdEM6UonXgc
z!6N(@k8q@HPw{O8O!lAyi{rZv|DpgfU{py+j(X_cwpKqcalcqKIr0kM^%Br3SdeD>
zHSKV94Yxw;pjzDHo!Q?8^0bb%L|wC;4U^9I#pd5O&eexX<SpYMUi;NrGyaua!-+-%
z(b6a1gZ;D+I4*J4ZzM0c^5vOx!1kF+S*rg^EpYq4Q$8Zv`)iCLe*9oY_%}BDzxap$
zLASmGRxF(y%$&cS<d#PK1_s~QhLoPQp2`0OZ5YXZBV6=I+(qKW;)rW-X|QN4Rtu+O
zUSe{k6uD&;e7|DG*7jRd*&ewJO@NTU@h#Yzt1=3xB&wH^G8Ykks+&HQ<6Vd9>+Im{
z?jKnCcsE|H?{uGMqVie_C~w7GX)kYGWAg%-?8|N_1#W-|4F)3YTDC+QSq1s!DnO<W
zN9@pSmktp>ML3@d`mG%o2YbYd#jww|jD$gotpa)kntakp#K;+yo-_ZF9qrNZw<%#C
zuPE@#3RocLgPyiBZ+R_-FJ_$xP!RzWm|aN)S+{$LY9vvN+IW~Kf3TsEIvP+B9Mtm!
zpfNNxObWQpLoaO&cJh5>%sl<u+Ou}Gr38*?+PIrbJtKK2C4@@i^3b)w#L5cfzsc$p
zGS#mh6Pugtp<?+N{dA+4Q%bSY%c7pXA|R9VW%COsIn2Bo=M^XtO8d8nsr~aAmv2eX
zu1Bz3botI2)|TFV6HCJkzYB4<>ZnHl_Q~(-Tfh!DMz(dTWld@LG1VRF`9`DYKhyNv
z2pU|UZ$#_yUx_B_|MxUq^glT}O5Xt(Vm4Mr02><%C)@v;vPb@pT$*yzJ4aPc_FZ3z
z3}PLoMBIM>q_9U2rl^sGhk1VUJ89=*?7|v`{!Z{6bqFMq<nxEmclgCD+90@&@li(W
z@s`8&MDulaH_%E?T~GV|zVm+MR`OB^kjC~xrEgb}MlNn^7GQ&p?tO;j2-%IuU~fD(
z0>(mYiA?%KbsI~JwuqVA9$H5vDE+VocjX+G^%bieqx->s;XWlKcuv(s%y%D5Xbc9+
zc(_2nYS1&^yL*ey664&4`IoOeDIig}y-E~_GS?m;D!xv5-xwz+G`5l6V+}CpeJDi^
z%4ed$qowm88=iYG+(`ld5Uh&>Dgs4uPHSJ^TngXP_V6fPyl~>2bhi20QB%lSd#yYn
zO05?KT1z@?^-bqO8Cg`;ft>ilejsw<PFMVi?0Z@%ZV7rUN23RZ3KB-HQ4YJB9u)4=
za)vbs@fTDRfs8YOO9lTq9t(nMd5S}gTT;muT}2|Lp9^&=2z~`<$j8jb{Rm0Lj+(J;
zBs1-Ce%8FDmkdHi5cJ6Wi^?0Snek8_6eCPHqaWM%UBUa}9l;;Shpu<^ueJT0tU&6s
zM}#unAgS&xl(DwgfMw$=1QcnDcIW6g!~<;08&1lIeTOvuGw?sf1Lf^Kz4~1^b^i*7
zQv6%-{2%J%9~}I@Dko75!V~i_(Z_~qE@Eg*k5ZaIz;BO8D2h5gAVv@$PDearM7jpi
z&t7+EZUrTlNkkN39;K<FA&>@2%RR7;`$Vs;FmO(Yr3Fp`pHGr@P2hC%QcA|X&N2Dn
zYf`MqXdHi%cGR@%y7Rg7?d3?an){s$zA{!H;Ie5exE#c~@NhQUFG8V=SQh%UxUeiV
zd7#UcYqD=lk-}sEwlpu&H^T_V0{#G?<Ioj?HL)KBNR`OQ7)HFN^?vHg<3bOCMy{-_
zoJlS{0I_uDhHNKG64k_@&-j<$nist8llO}aD}1PO>lZMxL7ih_&{(g)MWBnCZxtXg
znr#}>U^6!jA%e}@Gj49LWG@*&<lmaA<6<$*MXpyYdp&6c<H(Q`F-~?W^X9RVJSh6?
zS8Z8DnkwU?#%B!h%)j^e-VAuVDAU!JK1md@BbHM`aL3Du8QeW#u5Ow!LJ{cJE;g7g
zfS6lhpcAG^4%Z7tD(JDejR@8=mF27gB&U9t&uA8@v6X<1)e#$W_^iPrw&Q6FYe!O;
z;mr4?<{+g_EB>t0V>Cxc3?oO7LSG%~)Y5}f7vqUUnQ;STjdDU}P9IF9d9<$;=QaXc
zL1^X7>fa^jHBu_}9}J~#-oz3Oq^JmGR#?GO7b9a(=R@fw@}Q{{@`Wy1vIQ#Bw?>@X
z-_RGG@wt|%u`XUc%W{J<m*s=4j2#hKvp}Xrwm)9{h;W6E2ZrwT0V)(gGD?GnU0RwM
z#HcK41SrivBddca)fHXF?z{gCQT_P@wx-H|POi8hsVAB%nToV4iMN+KZh1=!UMaa>
z>iSeiz8C3H7@St3mOr_mU+&bL#Uif;+Xw-aZdNYUpdf>Rvu0i0t6k*}vwU`XNO2he
z%miH|1tQ8~ZK!zmL&wa3E;l?!!XzgV#%PMVU!0xrDsNNZUWKlbi<KaWZPRa*yQzPD
z?-!`siNqS2^Ar7FQc!m$_+UxWcy|gEk+B~FLt>OjzH-1Uoxm8E#r`#2Sz;-o&qcqB
zC-O_R{QGuynW14@)7&@yw1U}uP(1cov)t<bZtw#(M)(XiJYfL8BvaF25ezUn8smY%
zIL-I&o$OIFs>wxeLus0s|7ayrtT8c#`&2~Fiu2=R;1_4bCaD=*E@cYI>7YSnt)nQc
zohw5CsK%m?8Ack)qNx`W0_v$5S}nO|(V|RZKBD+btO?JXe|~^Qqur%@eO~<8-L^9d
z=GA3-V14ng9L29~XJ>a5k~xT2152zLhM*@zlp2P5Eu}bywkcqR;ISbas&#T#;HZSf
z2m69qTV(V@EkY(<qXx5YNic%z2;It?O+T%icQRw=w~P}(cE?O$<=1P^LjThO*$J$+
z*<@biHe!q%g+LQ{F#~S5QTZUfOZ3GP3D<=D3j0f!9E7HkjxKc_g)z1!o;_rP|9bAk
z`BjEQCx<KIvi^GM1jRkNM0nRs6P0hPcy|5t18}ZQi<ZQS>1Dk3`}j)JMo%ZVJ*5eB
zYOjIisi+igK0#yW*gBGj?@I{~mUOvRFQR^pJbEbzFxTubnrw(Muk%}jI+vXmJ;{Q6
zrSobKD>T%}jV4Ub?L1+MGOD~0Ir%-`iTnWZN^~YPrcP5y3VMAzQ+&en^VzKEb$K!Q
z<7Dbg&DNXuow*eD5yMr+#08nF!;%4vGrJI++5HdCFcGLfMW!KS*Oi@=7hFwDG!h2<
zPunUEAF+HncQkbfFj&pbzp|MU*~60Z(|Ik%Tn{BXMN!hZOosNIseT?R;A`W?=d?5X
zK(FB=9mZusYahp|K-wyb={rOpdn=@;4YI2W0E<s2&%i8x7RnmR_dIeK2wKPtVA?`W
z&(y5N6Uhf;St!k{QtA^2hklC0F0jNQ1^WG!Djrw#gypMTn;8cIm2IT14W4+8Zfd?P
z(RlNsG)S|I($<XQ_wo(zU~QxgZ&c8}J!LwJ+gC5c>cbMKyo~-#^?h`BA9~o285%oY
zfifCh5Lk$SY@|2A@a!T2V+{^!psQkx4?x0HSV`(w9{l75QxMk!)U52Lbhn{8ol?S)
zCKo*7<MT2Z&#yn*rVnwZQkr>R(z!uk<6*qO=wh!Pul{(qq6g6xW;X68GI_CXp`XwO
zxuSgPRAtM8K7}5E#-GM!*ydOOG_{A{)hkCII<|2=ma*71ci_-}VPARm3crFQjLYV!
z9zbz82$|l01mv`$WahE2$<xD1<`ujC!7ijORpLN)M&U@lEiyOfPgz+#&<j+G)Ve@{
z49uhDM!il+f+1Ohddi`=p(=u!h7sLm7yGqK4%#ZKd%YvUI(=BCzpn|IbHf!`E?jjq
zNkN-}Pa3AG2My;G@zYOnXl4g(LduE~%FKPJPA6{M4Z@(IC6iu#g0fgCkY2yVR!o7w
zSAe0_FH9n8VszXsaA+KDe(<8VA=dXe;@Mvzyql~A=eKPoX4qg$E{b4p|B|j96u7YW
zNCPo=y&#Ttz?U7fK~W6j?Kuo=wXeV4?w*;OO9xZst|SP^Q4kbKqBIl8hkGC7OOt_I
zzHTK9Aly><gDl|FkR~>=fAGWkd^X2kY(J7<hlY%A5J0#uldARym;T+|d;|>iz}WGS
z@%MyBEO=A?HB9=^?nX`@nh;7;la<vP=GJ_DWqB#{#!`KAdu6%FTU8VbENgD#KJ^CI
z);B^q)Y@yF(YlyL5A}rZXOX1<`Dd>Ajs+fbo!|K^mE!tOB>$2a_O0y-*uaIn8k^6Y
zSbuv;5~##*4Y~+y7Z5O*3w<R;J{o5i>4qgI5V^17u*ZeupVGH^nM&$qmAk|anf*>r
zWc5CV;-JY-Z@Uq1Irpb^O`L_7AGiqd*YpGUShb==os$uN3yYvb`wm6d=?T*it&pDk
zo`vhw)RZX|91^^Wa_ti2zBFyWy4cJu#g)_S6~jT}CC{DJ_kKpT`$oAL%b^!2M;JgT
zM3ZNbUB?}kP(*YYvXDIH8^7LUxz5oE%kMhF!rnPqv!GiY0o}NR$OD=ITDo9r<LYGN
z?2+*it!7d=84FF3EQ!5V&5166oc{Z1O8<?lF+=(kiua&7_M#TrD_|it=_mE6Cz1eX
zwfacTRHwa2jO`w@vfr7ByY*=K7se2@f$`RJFOlykOa!$prgR<-&f{zzV_tCE6E=v(
zZk!PdC3n<fkSRL#m(DteyDn?OK=a6ita@qk4DQ*rtk@>%4E>E0Y^R(rS^~XjWyVI6
zMOR5rPXhTp*G*M&X#NTL`Hu*R+u*QNoiOKg4CtNPrjgH>c?H<b@rgzW2`xq%+zxdV
zGQjVif3BBaXojc?{FLuym0L2fO1Nh(c42RW12b^>i4MUG#I917fx**+<zC5r06AVA
zs!KCNuuLq&Z|e$b{bN7-`NGtKU0>pJfOo!z<a0Lrf~l|OU$j3PPNH#8yRT5C5cWK;
z4Ck57(G?59g@;(s9m49`EtaF2lDH|dGl0xCg>FM&*da&G_x)L(`k&TPI*t3e^{crd
zX<4I$5nBQ8Ax_lmNRa~E*zS-R0sxkz`|>7q_?*e%7bxqNm3_eRG#1ae3gtV9!fQpY
z+!^a38o4ZGy9!J5sylDxZTx$JmG!wg7;>&5H1)>f4dXj;B+@6tMlL=)cLl={jLMxY
zbbf1ax3S4>bwB9-$;SN2?+GULu;UA-35;VY*^9Blx)Jwyb$=U!D>HhB&=jSsd^6yw
zL)?a|>GxU!W}ocTC(?-%z3!IUhw^uzc`Vz_g>-tv)(XA#JK^)ZnC|l1`@CdX1@|!|
z_9gQ)7uOf?cR@KDp97*>6X|;t@Y`k_N@)aH7gY27)COv^P3ya9I{4z~vUjLR9~z1Z
z5=G{mVtKH*&$*t0@}-i_v|3B$AHHYale7>E+jP`ClqG%L{u;*ff_h@)al?RuL7tOO
z->;I}>%WI{;vbLP3VIQ^iA$4wl6@0sDj|~112Y4OFjMs`13!$JGkp%b&E8QzJw_L5
zOnw9joc0^;O%OpF$Qp)W1HI!$4BaXX84`%@#^dk^hFp^pQ@rx4g(8Xjy#!X%<A@Ix
z5U>+X5Jd@fs3amGT`}mhq#L97R>OwT5-m|h#yT_-v@(k$q7P*9X~T*3)LTdzP!*B}
z+SldbVWrrwQo9wX*%FyK+sRXTa@O?WM^FGWOE?S`R(0P{<6p#f?0NJvnBia?k^fX2
zNQs7K-?EijgHJY}&zsr;qJ<*PCZUd*x|dD=IQPUK_nn)@X4KWtqoJNHkT?ZWL_hF?
zS8lp2(q>;RXR|F;1O}EE#}gCrY~#n^O`_I&?&z5~7N;zL0)3Tup`%)oHMK-^r$NT%
zbFg|o?b9w(q@)6w5V%si<$!U<#}s#x@0<ZXLbXYKvlKR0q_0uaLFS0K_yZx{oRI6O
zi*Yz=QW(i&SHEhi(35LX5YAi{vy`;KnIJ$O_Y#C4gG~=hcxXw*NH*okugRb;j#&_y
z)}Rg9+nz^&!aY|=fJZ?L&1;1?%7EYHgT5ryT&e6MH~EPzrS<7r*22}w^{P@eQei1e
zd>aX-hP>zwS#9*75VXA4K*%gUc>+yzupTDBOKH8WR4V0pM(HrfbQ&eJ79>HdCvE=F
z|J>s;;iDLB^3(9}?biKbxf1$lI!*Z%*0&8UUq}wMyPs_hclyQQi4;NUY+x2qy|0J;
zhn8;5)4ED1oHwg+VZF|80<4MrL97tGGXc5Sw$wAI#|2*cvQ=jB5+{AjMiDHmhUC*a
zlmiZ`LAuAn_}hftXh;`Kq0zblDk8?O-`tnilIh|;3lZp@F_osJUV9`*R29M?7H{Fy
z`nfVEIDIWXmU&YW;NjU8)EJpXhxe5t+scf|VXM!^bBlwNh)~7|3?fWwo_~ZFk(22%
zTMesYw+LNx3J-_|DM~`v<!_@4wF#cHZ_E9}9+lbenMh?8-P99`3uA4wl$95cN^e{4
z^f$@0?%=HSAz>93yXe=jPD{q;li<xOVXMn1yKMTqv6XhqrnsCUXSTSsjJ{x^XFo@J
z{WA$2#dyTq?%~VAg|L)nty{-VrW88Lu82|x7td?b;LG2_DA_BpkSSx!@P8<G?h<XX
zNw7xGt`p+BMOcS|$jn%|wK)WAaS99%p8&_kFrLJVp7_Jg4yOpvWS`>;5PD?Dyk+b?
zo21|XpT@)$BM$%F=P9J19Vi&1#{jM3!^Y&fr&_`toi`XB1!n>sbL%U9I5<7!@?t)~
z;&H%z>bAaQ4f$wIzkjH70;<8tp<T&Yl>UoxzKrPhn#IQfS%9l5=Iu))^XC<58D!-O
z{B+o5R^Z21H0T9JQ5gNJnqh#qH^na|z92=hONIM~@_i<m8HDcej!764)8GxDF)RMg
z!DFoaWC9)+nME7X6Bjpkb{QXd4;jG|u8$8kw{X8T%Z{fASla5Kj43Dc#xwsm?e^ow
zcpj5R3LQeCN@Z#}!7^cGYJ3aEd-Gp-Jj@_K{U*}A((dH-)nN*GjCV>uOi|F>jBh<M
zWxy1uqU)B}MVkHZ;j2o<4&9z0o{ro;0~$*^2bQ$8Q;vmWoz6BD$xqze?6Q)tzTZs7
zG{RspTbUAmB!P|sU1Q@1do~tC7@>-?aA20}Qx~EpDGElELNn~|7WRXRFnw+Wdo`|#
zBpU=Cz3z%cUJ0mx_1($X<40XEIYz(`noWeO+x#yb_pwj6)R(__%@_Cf>txOQ74wSJ
z0#F3(zWWaR-jMEY$7C*3HJrohc79>MCUu26mfYN)f4M~4gD`}EX4e}A!U}QV8!S47
z6y-U-%+h`1n`*pQuKE%Av0@)+wBZr9mH}@vH@i{v(m-6QK7Ncf17x_D=)32`FOjjo
zg|^VPf5c6-!FxN{25dvVh#f<C2j|FW^wcEVOx|0?I*o1i)tbC%E;daCUUqnT*va?<
z#^@&RTCo<xj8b($3`PD<adop6xc~jgfA19=fzjFXxO)$!??RO(s_s88E>og=NNpXz
zfB$o+0jbRkHH{!TKhE709f+jI^$3#v1Nmf80w`@7-5$1Iv_`)W^px8P-({xwb;D0y
z7LKDAHgX<84?l!I*Dvi2#D@oAE^J|g$3!)x1Ua;_;<@#l1fD}lqU2_tS^6Ht$1Wl}
zBESo7o^)9-Tjuz$8YQSGhfs{BQV6zW7dA?0b(Dbt=UnQs&4zHfe_sj{RJ4uS-vQpC
zX;Bbsuju4%!o8?&m4UZU@~Z<l{fpuI7gBNBuLonV&UnEv8Mm+}6y;;iZ7)_U-2H6P
zik(*@ZnhVtEFTNE*=&MLnOTGYcGC{O?!<?O$^7><Ix|i$iDSBHQSY+=yJ@Z(hm=j8
zLng0c8d`c!aP=6?o|-71!|y*rlW^s|L>ZjeFF6ex2ss5_60_JS_|iNc+R0GIjH1@Z
z=rLT9%B|WWgOrR7IiIwr2=T;Ne?30M!@{%Qf8o`!>=s<2CBpCK_TWc(DX51>e^xh8
z&@$^b6CgOd7KXQV&Y4%}_#uN*mbanXq(2=Nj`L7H7*k(6F8s6{FOw@(DzU`4-*77{
zF+dxpv}%mFpYK?>N_2*#Y?oB*qEKB}VoQ@bzm>ptmVS_EC(#}Lxxx730trt0G)#$b
zE=wVvtqOct1%*9}U{q<)2?{+0TzZzP0jgf9*)arV)*e!f`|jgT{7_9iS@e)recI#z
zbzolURQ+TOzE!ymqvBY7+5NnAbWxvMLsLTwEbFqW=CPyCsmJ}P1^V30|D5E|p3BC5
z)3|qgw@ra7aXb-wsa|l^in~1_<?%wr8cBwUUhaLFkF#>fm{7bS9jhVRkYVO#U{qMp
z)Wce+|DJ}4<2gp8r0_xfZpMo#{Hl2MfjLcZdRB9(B(A(f;+4s*FxV{1F|4d`*sRNd
zp4#@sEY|?^FIJ;tmH{@keZ$P(sLh5IdOk@k^0uB^<vY$Teo5@@0*v8p)6|Qc!#V-V
z19rz;O<~HzAD{>BWr@pk6mHy$qf&~rI>P*a;h0C{%oA*i!VjWn&D~O#MxN&f@1Po#
zKN+<Mx&_V;mQ6by$gOOv@*=130y8ws;u!(S9My%BQ_xyRTms3Q+kzSy&vNnQacNo>
zrGrkSjcr?^R#nGl<#Q722^wbYcgW@{+6CBS<1@%dPA8HC!~a`jTz<`g_l5N1M<n^b
zu`mSxZ+unU+QCuJ((?b36-TN-d1@FTfBA^ddw8UCuT`zjb=Fz?S6Qufs*9jSR|1nK
zFf2vJS;<?+uRmFfTer5Vv1$_#5QG8wt@)CbC^|w;&`=|x<yh14$tmJUYy0g0%PA`M
zOgeNCX{{Nxe0ra@9=~<n^L&fj)_rb#gMU)NmxDTM+6}H9CM!Fi?NW<y$)i_5yC^Lw
z2UV(8qc395hk@%W59BzlhhVt(<xJvm!~c3l+ocXQq>@9wn9GOAZ>nqNgq!yOCb<ux
z3a7GGof9{?JXCwFGGvl~3dP~BNs%SovKoTvXW8FuXj`m7Bnn?jUZ$?pzzIRqprlp7
z2WeoTGz*SooG8Jko3Cp>Z@1z`U_N`Z>}+1HIZxk*5RDc&rd5{3qjRh8QmT$VyS;jK
z;AF+r6XnnCp=wQYoG|rT2@8&IvKq*IB_WvS%nt%e{MCFm`&W*#LX<V7)65J}gDBN(
zk<mMjk3Ksz1;V7!3@X8he*FSaSG=@7E0@=@yHKsO4iF;tj3{tU-4xewSJc&$#1UMZ
zuOWXXn?>c|HrD?nVBo=(8*=Aq?u$sDA_sC_RPDUiQ+wnIJET8vx$&fxkW~kP9qXKt
zozR)@xGC!P)CTkjeWvXW5&@2?)qt)jiYWWBU?AUtzAN}{JE1I)dfz~7$;}~BmQF`k
zpn11qmObXwRB8&rnEG*#4Xax3XBkKlw(;tb?Np^i+H8m(Wyz9k{~ogba@laiEk;2!
zV*QV^6g6(QG%vX5Um#^sT&_e`B1pBW5yVth<mfskR&uj=IULHb38<tse=w*}Q<7Qz
z3<|`SLDlf5BpLb9#iQyjF6U}7JJ`^RZ>~xUs#0}nv?~C#l?W+9Lsb_5)!71rirGvY
zTIJ$OPOY516Y|_014sNv+Z8cc5t_V=i>lWV=vN<QPmtSpXv;kT!7hs-HH@i&RiI&9
z!dO2CvGs>u#!58y9Zl&G<qC8KlC>sMEW#pPYPYGHQ|;vFvd*9eM==$_=vc7xnyz0~
zY}r??$<`wAO?JQk@?RGvkWVJlq2dk9vB(yV^vm{=NVI8dhsX<)O(#nr9YD?I?(VmQ
z^r7VfUBn<~p3()8yOBjm$#KWx!5hRW)5Jl7wY@ky9lNM^jaT##8QGVsYeaVy<knK7
z-|ItZG@v_5HqwNL*X;&)fE*o2En9}_QSQ~Sxpo=`)<(LLcGS!($DADohdab0N6KTw
zF9i4%@WsNPJ2f@Kf&OK)$mJTfFx16uGFyQhd(9)Ota05_m2b4&e^Iw3r!jC#Hp$0t
zt!S{)s#CdvfKjo>wmpv>X|Xj7gWE1Ezai&wVLt3p)k4w~yrskT-!PR!kiyQlaxl((
zXhF%Q9x}1TMt3~u@|#wWm-Vq?ZerK={8@~&@9r5JW}r#45#rWii};t`{5#&3$W)|@
zbAf<Wd~LF&Fa+z%sLq|a7`8BxH;x+F8(HU&VXoK6B>2yDNe0q}NEUvq_Quq3cTjcw
z@H_;$hu&xllCI9CFDLuScEMg|x{S7GdV8<&Mq=ezDnRZAyX-8gv97YTm0bg=d)(>N
z+B2F<g3)ia(W`M0HCo-hfSmEqFQ$W5j$wJ;?r7W^?`K&S(*5L=PU?;K=%mT~AoyLc
zmB9dB0BfY<$42H7qp*b&gqwjPG@?GHqEWMaXbG2l^~e?yEl$rb2e+7tNeQjQi!%mG
z!n&myqi%P$bT;(Jy7TA*2tP}NXfszN-aSbAw)CRWi!Y&moQuMP!ZIYY+|-Hi;nfsw
zSAibHD0K*Rx488O94=w;IYZ)nc%KdXcP-D4kAzBYZwl}PDc(ZIiFm=)7;@JjuDF@@
zh({Ks)K#T@$U#?|cc5wW7j|#<s#)XeeNmP*9S3P%QoJ+84!)t-Q3y&LB4VHT${%s|
zTG3XIg~2`B_RVw|0J-Nqqo+Pe*FeW61Sh*R7{v~e$s_}74Z{>cqvI9>jGtnK%eO%y
zoBPkJTk%y`8TLf4)IXPBn`U|9>O~WL2C~C$z~9|0m*YH<-vg2CD^SX#&)B4ngOSG$
zV^wmy_iQk>dfN@Pv(ckfy&#ak@MLC7&Q6Ro#!ezM*VEh`+b3Jt%m(^T&p&WJ2Oqvj
zs-4nq0TW6cv~(YI$n0UkfwN}kg3_fp?(ijSV#tR9L0}l2qjc7W?i*q01=St0eZ=4h
zyGQbEw`9OEH>NMuIe)hVwYHsGERWOD;JxEiO7cQv%pFCeR+IyhwQ|y@&^24k+|8fD
zLiOWFNJ2&vu2&`Jv96_z-Cd5RLgmeY3*4rDOQo?Jm`;I_(+ejsPM03!ly!*Cu}Cco
zrQSrEDHNyzT(D5s1rZq!8#?f6@v6dB7a-aWs(Qk>N?UGAo{gyt<fmzm5NzZ|fs&#}
zncD~rYY0$e-KIJ+=Op({4j(9PIkXkc_SkA;(m*CznUsh<u&YaQ2?WX;ffj?q#rkaD
zhgb+R9A8jgPt^w}K)OK@H5E_#!Z=VQBe3%qPvYY%REdJYYg39A`{$NP_M^}lrMFR7
z+z-hJlg#zeS)0^WAq|DzTPsJlg*U_m2#Hg-0Wmz@?iH!<yiUNaD#c-kYUp!%4RSKq
z{aEO|^oK+y2EtPt%bwO#VBE9DxJ9N@ufrh+8SIe+8$#E{7>lh$%_IhyL7h?DLXDGx
zgxGE<S);`7Ye2u;8Dq575#~501>BQoCAWo-$LRvM=F5MTle`M})t3vVv;2j0HZY&G
z22^iGhV@uaJh(X<Ji#4pfqzo+6CV|xa;=Mz*tzH^bNhkjCY|vEWb}4_nF}mp3zj6F
z<RK*`vdncONn`be@hcYCs`Fx)%bT8wV$T8!b%e<R8G~jKI85M<1J$4NY<nL0CutfG
z<0HvW$c5I*1#_hw)1(15*aH)~KVw0;{Zp_ZQI?8k=6OO?W$jqY0waZgj%rb>yyY%}
zd4iH_UfdV#T=3n}(Lj^|n;O4|$;xhu*8T3hR1mc_A}fK}jfZ7LX~*n5+`8N2q#rI$
z@<<NwLoApZ<e3!J$+qrZqXhfixi{}uCew+VjVR``fj1Lf`2I-jD>_2VANlYF$vIH$
zl<)+*tIWW78IIINA7Rr7i{<Y3K#4WL2gwP{V}$lxr|)k#^h4W{mX@Le*u!g#hfAGO
zCeSa;u(-xw0ZspUEBo+8Ru(%}-m6Ro%1{7aEL$_dA#RWFH+pZ@3`vn|LIY-BbZ`xA
z;0Hf*V6m6EEIJ?MTj|I!l!v*XnqWfITy`ve|BDjjbn-XMEaj|oNyd!_<K^Ti36kh1
z(%3QLBv(><;#^yzxoLNkXL)eSs=%<Gis)1JtKs|A*=kDqutu=D>|P>$YQIh+ea_3k
z_s7r4%j7%&*NHSl?R4k%1>Z=M9o#zxY!n8sL5>BO-ZP;T3Gut>iLS@U%IBrX6BA3k
z)&@q}V8a{X<5B}K5s(c(LQ=%v1ocr`t$EqqY0EqVjr65usa=0bkf|O#ky{<C<t3zu
z`hM@H`e*c^To>j3)WBR<Rk0XEu3I97LQj|W=oPZA>(((L^wmyHRzoWuL2~WTC=`yZ
zn%VX`L=|Ok0v7?s<AoD@n8D7kz^e<8kpe+<X#n2|WDSoR5^oCGt<jgs)X#u5@PWV+
z<b`lm>>IHg?yA<ed=nI4vx^O}jp~R0s4CS5p`R9jtX~z7xF-Z5gJMA(5vqNQrH2}B
zLEIs&NxKWPrwn0(*pI+NhLe0_cU!>rBcync5rG#^+u)>a%qjES%dRZoIyA8gQ;StH
z1Ao7{<&}6U=5}4v<)1T7t!J_CL%U}CKNs<r5fMyAUKFZK{y9U{q!s_ZSKXqW%qBRr
z?bu0a7Zic(_|KEJWkFJk=&bobT<sZBi;dXUmO?)}m$)B<s0Nr7^=$mY+Dr7ke?^*x
z4Vt?Ovyz0Mk+fmZjXJTAv@hijH2y5Cf|5J3ryKO57~3?_EAxOUYF##HdjopeNH4%@
zuGqW!`j7vRX*U7T5B1|m8}h%c4gNobJO8sb_&>-0xWoTTeqj{5{?Be$L0_tk>M9o8
zo371}S#30rKZFM{`H_(L`EM9DGp+Mifk&IP|C2Zu_)Ghr4Qtpmkm1osCf@%Z$%t+7
zYH$Cr)Ro@3-QDeQJ8m+x6%;?YYT;k6Z0E-?kr>x33`H%*ueBD7Zx~3&HtWn0?2Wt}
zTG}*|v?{$ajzt}xPzV%lL1t-URi8*Zn)YljXNGDb>;!905Td|mpa@mHjIH%VIiGx-
zd@MqhpYFu<g)7l4&_bNaog=DANE?ZcfM)*NEMkm~{>4_?y5N4xiHn3vX&|e6r~Xt>
zZG`aGq|yTNjv;9E+Txuoa@A(9V7g?1_T5FzRI;!=NP1Kqou1z5?%X~Wwb{trRfd>i
z8&y^H)8YnKyA_Fyx>}RNmQIczT?w2J4SNvI{5J&}Wto|8FR(W;Qw#b1G<1%#tmYzQ
zQ2mZA-PAdi%RQOhkHy9Ea#TPSw?WxwL@H@cbkZwIq0B!@ns}niALidmn&W?!Vd4Gj
zO7FiuV4*6Mr^2xlFSvM;Cp_#r8UaqIzHJQg_z^rEJw&OMm_8NGAY2)rKvki|o1bH~
z$2IbfVeY2L(^*rMRU1lM5Y_sgrDS`Z??nR2lX;zyR=c%UyGb*%TC-Dil?Si<D{nTD
zMw8K;)%(lo#`W8jOV@qoJ#X}Mwbyz4a;PcPaSBZqr;F)uJhh<vQG%Y4Mw<phKlLRw
zIw!C3k>hkjrQy~TMv6;BMs7P8il`H7DmpVm@rJ;b)hW)BL)GjS154b*xq-NXq2cwE
z^;VP7ua2pxvCmxrnqUYQMH%a%nHmwmI33nJM(>4LznvY*k&C0{<x1=XMzKZ~Bs`;;
zzjN;>8f*%?zggpDgkuz&JBx{9mfb@wegEl2v!=}Sq2Gaty0<)UrOT0{MZtZ~j5y&w
zXlYa_jY)I_+VA-^#mEox#+G>UgvM!Ac8zI<%JRXM_73Q!#i3O|)lOP*qBeJG#BST0
zqohi)<I-A(NiPhXic7WGcd${Bs6q40O%lhVI#-EDK6jPHL9qSG))QSk?b4HNO46Kt
zq~AhM!n=+cMgd8rvaDcAUqe9_Py+)1zbv_Wy{}+a|F1es@~Qc9kW@MgedI!i{HhtJ
z!kAvsCV6n8=$My(7M_90IyH+8**uSL-iyt^&8vOeIRo?HTA5+#Xr^9U=2eV`Xlmc$
zFjy%l4c$~))iDJkH$oB2LfNc)TX?BjEeaRo@~X+PeGiiD85sGHqRqi@$1TzmJ+rd3
zVg^Gn@P5KfN#t5@T7Lvq5F&=Y)v)n4Cjfha{J2+Jic#JjOH^ggzd<;^a<68vsD0fr
zC*U$7*i1uw{BlNp8mMWqc46bk3VHJ?|MSSFbx~ox6ZBjsfPa3I5EWvc##{^VJo^EN
z<}Cr>O!|$|2SeJQo(w6w7%*92S})XfnhrH_Z8qe!G5>CglP=nI7JAOW?(Z29;pXJ9
zR9`KzQ=WEhy*)WH>$;7Cdz|>*i>=##0bB)oU0OR>>N<21e4rMCHDemNi2LD>Nc$;&
zQRFthpWniC1J6@Zh~iJCoLOxN`oCKD5Q4r%ynwgUKPlIEd#?QViIqovY|czyK8>6B
zSP%{2-<;%;1`#0mG^B(8KbtXF;Nf>K#Di72UWE4gQ%(_26Koiad)q$xRL~?pN71ZZ
zujaaCx~jXjygw;<Ay^b{e7rQ>rI!WB=xrOJO6HJ!!w}7eiivtCg5K|F6$EXa)=xUC
za^JXSX98W`7g-tm@uo|BKj39Dl;sg5ta;4qjo^pCh~{-HdLl6qI9Ix6f$+qiZ$}s=
zNguKrU;u+T@ko(Vr1>)Q%h$?UKXCY<ELeH%x_-+;N!NPjI@5|c>>3se%&;h2osl2D
zE4A9bd7_|^njDd)6cI*FupHpE3){4NQ*$k*cOWZ_?CZ>Z4_fl@n(mMnYK62Q1d@+I
zr&<rzyB}9!OG>O))G4hMih<XQCmlZu^@8%Z@1T|FyI_m%FM=cL3%T#%II(MZ`FKla
zpXXu4TSaVkB7;tYPyY<uMC(fA=<j-47<k>gBqRIAJkLdk(p(D~X{-oBUA+If@B}j&
zsHbeJ3RzTq96lB7d($h$xTeZ^gP0c{t!Y0c)aQE;$FY2!mACg!GDEMKXFOPI^)nHZ
z`aSPJpvV0|bbrzhWWkuPURlDeN%<qMpCcxwvwqRMaqc9@{O;iK_N2snE#x<P5c1;#
zmjI^QLBwgKbA!596SF19-xAg`j~Dtp%yL%PsIy-Iy#n3_juW-DvzXBY7{iAZ@^xZK
z@xr2R*rSktAvjWK{FY-U0t8|bspU3(%@64Udl&2uFK6|JrwGTmi+3cF9F%O9@lnIC
zs=6lONtdy$oHQyWIz$zmM@0(12^Y0f!FDBU-xO1sA%B@8>VT8tndV8?d)eN*i4I@u
zVKl^6{?}A?P)Fsy?3oi#clf}L18t;TjNI2>eI&(ezDK7RyqFxcv%>?oxUlonv(px)
z$vnPzRH`y5A(x!yOIfL0bmgeMQB$H5wenx~!ujQK*nUBW;@Em&6Xv2%s(~H5WcU2R
z;%Nw<$tI)a`Ve!>x+qegJnQsN2N7HaKzrFqM>`6R*gvh%O*-%THt<rb___hz1Q*?5
z6WlWA+_DZ_V%@(Z;W6IiWcwb%0tQS@7FVT8L%H@;-K!LOiZIstqiCW*I~5y<2j59v
z*;R0rbBXIxu3n@3a3wxbyp;2oPnr)69p#+<DwNc<oL?vCKSPPJA(K9!1O*f4{YL62
zn|Sj8G%K~6J)K=!JP_YX8V=PjLK~TW_=@Nh@Cw-!NlZLY;2_j0TFoobFt-2R;qd|Z
z5LA6AxE3z?^1m|nTtbf_LVu#lgMMaoQSi!)(ir+k@yiKNqZa8D=pY1qBEL59w8xB>
zrB$Nk;lE;z{s{r^PPm5qz(&lM{sO*g+W{sK+m3M_z=4=&CC>T`{X}1Vg2PEfSj2x_
zmT*(x;ov%3F?qoEeeM>dUn$a*?SIGyO8m<CDx(PoF9Z7P(-Vz@5G~R_9zlbonzZYL
z!@f`rWC1aNE3{SDF~{lPR$(P=;{QgE*BcIk`ok>806J1W1o+4HRhc2`9$s6hM#qAm
zChQ87b~GEw{ADfs+5}FJ8+|bIlIv(jT$Ap#hSHoXdd9#w<#cA<1Rkq^*EEkknUd4&
zoIWIY)sAswy6fSERVm&!SO~#iN$OgOX*{9@_BWFyJTvC%S++ilSfCrO(?u=Dc?CXZ
zzCG&0yVR{Z`|ZF0eEApWE<q~aV-3QaRPuwFB`iCbViORA{tX~ST{rFw+In$j?7gLL
zT8ETr1QUOZxkIpI@5JqQk|b^xG*nZ910-;>o#s9osV>F{uK{QA@BES#&;#KsScf>y
zvs?vIbI>VrT<*!;XmQS=bhq%46-aambZ(8KU-wOO2=en~D}MCToB_u;Yz{)1ySrPZ
z@=$}EvjTdzTWU7c0ZI6L8=yP+YRD_eMMos}b5vY^S*~VZysrkq<`cK3>>v%uy7jgq
z0ilW9KjVDHLv0b<1K_`1IkbTOINs0=m-22c%M~l=^S}%hbli-3?BnNq?b`hx^HX2J
zIe6ECljRL0uBWb`%{EA=%!<byF4eC4KX4aZdAqSwE!&>i^4sMcj+U_TaTZRb+~GOk
z^ZW!nky0n*Wb*r+Q|9H@ml@Z5gU&W`(z4-j!OzC1wOke`TRAYGZVl$PmQ16{3196(
zO*?`--I}Qf(2HIwb2&1FB^!faPA2=sLg(@6P4mN)>Dc3i(B0;@O-y2;lM4akD>@^v
z=u>*|!s&9zem70g7zfw9FXl1bpJW(C#5w#uy5!V?Q(U35A~$dR%LDVnq@}kQm13{}
zd53q3N(s$Eu{R}k2esbftfjfOITCL;jWa$}(mmm}d(&7JZ6d3%IABCapFFYjdEjdK
z&4Edqf$G^MNAtL=uCDRs&Fu@FXRgX{*0<(@c3|PNHa>L%zvxWS={L8%qw`STm+=Rd
zA}FLspESSIpE_^41~#5yI2bJ=9`oc;GIL!JuW&7YetZ?0H}$$%8rW@*J37L<XFjIr
zWJ?$CMV^YggN$kCs0w8InCxL-qk`fNzT7&VA*&~~T=_(uA$CzC9vrKbN28^=3?MLv
zFoK23^axE9-(UuJp6l-WH~flb#LWz<-GZXz4PS*&{c?IaOs6}Rx>-~Rsx!)8($nI4
zZhcZ2^=Y+p4YPl%j!nFJA|*M^gc(0o$i3nlphe+~-_m}jVkRN{spFs(o0ajW@f3K{
zDV!#BwL322CET$}Y}^0ixYj2w>&Xh12|R8&yEw|wLDvF!lZ#dOTHM9pK6<Y!obdB7
zJ?!B#A1=BS7Ka=6k6_mfjXh1lGwLZR4PT*9n^^MB#jyfEy~L|)^EN8(11T8rrN7f?
z?@)HsizJFWKFr(u1x(=}jA~A*@;u9iCG}YS49mN9degGJEr@RQbFX&wZoBr{H3Nr7
z?H=$Zj>@Nm-@9Lnng4ZHBgBSrr7KI8YCC9DX5Kg|`HsiwJHg2(7#nS;A{b3tVO?Z%
za{m5b3rFV6EpX;=;n#wltDv1LE*|g5pQ+OY&*6qCJZc5oDS6Z6JD#6F)bWxZSF@q%
z+1WV;m!lRB!n^PC>RgQCI#D1br_o^#iPk>;K2hB~0^<~)?p}LG%kigm@moD#q3PE+
zA^Qca)(xnqw6x>XFhV6ku9r$E>bWNrVH9fum0?4s?Rn2LG{Vm_+QJHse6xa%nzQ?k
zKug4PW~#Gtb;#5+9!QBgyB@q=s<UxAOfSGI17`#WQPoP8A+0%MXyAyK3J=T4^Kbj7
zlt}Oe#L`UOUU8o&zkUW`eBtn39$xzlz~(3x_>k9=$S{4T>wjFICStOM?__fr+Kei1
z3j~xPqW;W@YkiUM;HngG!;>@AITg}vAE`M2Pj9Irl4w1fo4w<|Bu!%rh%a(Ai^Zhi
zs92>v5;@Y(Zi#RI*ua*h`d_7;byQSa*v9E{2x$<hp}Q26jsc}%C<*BjhE^Jt66tP1
zKtKU0Q9$V-l~zCy7`juGR=*kVy&nUYi+t;Q*P6xR{P8}s&pC7U+3()_`4tk8P7SO*
zts+C&EBA;W!X3G&`&E+LxzU~6Q<emFH@kgR*8?20u2XLWT3aI!YMwas1=TsetFPnK
zg5`qHR`D=R<(><-_=5Z<7{%)}4XExANcz@rK69T0x3%H<@frW>RA8^swA+^a(FxK|
zFl3LD*ImHN=X<Tm`8DfC>DUkrR<xW<(jZxC)!wKS)92Mp`by<@CGgeKED~ZJ3Jy$+
zjW_5$gXkQl+$Z+QJ~I#o6Pp!?bb78VSX!(@(92a;u-;wW%qe9fMiUm=#PwkrAbXT5
zVo>hp6RY5$rQ{bRgSO*(vEHYV)3Mo6Jy3puiLmU&g82p{qr0F?ohmbz)f2r{X2|T2
z$4fdQ=>0BeKbiVM!e-lIIs8wVTuC_m7}<Ui;+XED-5oBiR>y4A_%ikI;Wm5$9j(^Y
z(cD%U%k)X>_>9~t8;pGzL6L-fm<ULs+oY32iJK8t`MZXpBuoD$6OMAKyL46!gYNWE
zud<`{zju@c#T_7EyRG#xA7t1QT}ZgtiYwog7J*c#?<fNv<K7Htr4Bz79uv2x*w)<k
z=a;7q%vaAz-hD(kAxqWM%g9t=$}0NKb?)GaBa8K156rk8wWyI)MB=&^_{THh+}COk
zUzRKn7T0APWWnx<r&J-F&{b%n+JRIgYHuv;^|;Hor$0q~|8BI{QjuMG8JYxvYF}Gn
zy*In4ANN}0dpJx*JPO@eiJFX7bD|1WV+M;rfsj3PIBa@gpsi3FnkV~X3nx%2?_ypI
zh}S3zV-DKR|K!F9Z3-RZumjj)P_`}W2J~q|bB0)a9xHmA&%h{<vyYF9&zIJ>QO@K;
zo&vQzMlgY95;1BSkngY)e{`n0!NfVgf}2mB3t}D9@*N;FQ{HZ3Pb%BK6;5#-O|WI(
zb6h@qTLU~AbVW#_6?c!?Dj65Now7*pU{h!1+eCV^KCuPAGs28~3k@ueL5+u|Z-7}t
z9|lskE`4B7W8wMs@<RoRq4K_1jQ|2oJg$O-rP`~;Bzz?@Jlrn0Z@<=ZmJTM3jjq_~
zRZ}mS?n&K}m}#OA-nYs)kQ@R^-(uFAD{$CgCv6|t>xJa{#bsCGDFoRSNSnmNYB&U7
zVGKWe%+kFB6kb)e;<v}cel^QYVzboCh<hrVzAa>TyHfqtU6~fRg)f|>=5(N36)0+C
z`hv65J<$B}WUc!wFAb^QtY31yNleq4dzmG`1wHTj=c*=hay9iD071Hc?oYoUk|M*_
zU1GihAMBsM@5rUJ(qS?9ZYJ6@{bNqJ`2Mr+5#hKf?doa?F|+^IR!8lq9)wS3tF_9n
zW_?hm)G(M+MYb?V9YoX^_mu5h-LP^TL^!Q9Z7|@sO(rg_4+@=PdI)WL(B7`!K^ND-
z-uIuVDCVEdH_C@c71YGYT^_Scf_dhB8Z2Xy6vGtBSlYud9vggOqv^L~F{BraSE_t}
zIkP+Hp2&nH^-MNEs}^`oMLy11`PQW$T|K(`Bu*(f@)mv1-qY(_YG&J2M2<7k;;RK~
zL{Fqj9yCz8(S{}@c)S!65aF<=&eLI{hAMErCx&>i7OeDN>okvegO87OaG{Jmi<|}D
zaT@b|0X{d@OIJ7zvT>r+eTzgLq~|Dpu)Z&db-P4z*`M$UL51lf>FLlq6rfG)%doyp
z)3kk_YIM!03eQ8Vu_2fg{+osaEJPtJ-<V*830?$46vO`8Mw##QM*`Rr?w|#MyZ6A&
z_}pwQU2m8=Sp54^L})3wA`G=0rsaz56>s36R+5_AEG12`NG)IQ#TF9c@$99%0iye+
zUzZ57=m2)$D(5Nx!n)=5Au&O0BBgwxIBaeI(mro$#&UGCr<;C{UjJVAbVi%|+WP(a
zL$U@TYCxJ=1{Z~}rnW;7UVb7+ZnzgmrogDxhjLGo>c~MiJAWs&&;AGg@%U?Y^0JhL
ze(x6Z74JG6FlOFK(T}SXQfhr}RIFl@QXKnIcXYF)5|V~e-}suHILKT-k|<*~Ij|VF
zC;t@=uj=hot~*!C68G8hTA%8SzOfETOXQ|3FSaIEjvBJp(A)7SWUi5!Eu#yWgY+;n
zlm<$+UDou*V+246_o#V4kMdto8hF%%Lki#zPh}KYXmMf?hrN0;>Mv%`@{0Qn`Ujp)
z=lZe+13>^Q!9zT);H<(#bIeRWz%#*}sgUX9P|9($kexOyKIOc`dLux}c$7It4u|Rl
z6SSkY*V~g_B-hMPo_ak>>z@AVQ(_N)VY2kB3IZ0G(iDUYw+2d7W^~(Jq}KY=JnWS(
z#rzEa&0uNhJ>QE8iiyz;n2H|SV#Og+wEZv=f2%1ELX!SX-(d3tEj$5$1}70Mp<&eI
zCkfbByL7af=qQE@5vDVxx1}FSGt_a1DoE3SDI+G)mBAna)KBG4p8Epxl9QZ4BfdAN
zFnF|Y(umr;gRgG6NLQ$?ZWgllE<HJXYDr?-K8^D!ZlPa8ZG&+c+DJy(x5;Feg3L)*
zvdpRL&@{hyOZBRzTt*TCk9hewUpi`*Kt|w8q}nwi%?T`D?1ox^RZSRut44vMd{LO!
z5<xD{qy<T%oDMUy9H#9$W-Wu8GwxNdV(5T7B?RP@ZWH6Jt?*TpR4hY26nALXC@f!D
z_AE{^bi`q0U%atoVV5-5alLF?pA>eeq~z^ZS7L?<(~O&$5|y)Al^iMKy}&W+eMm1W
z7EMU)u^ke(A1#XCV>CZ71}P}0x)4wtHO8#JRG3MA-6g=`ZM!FcICCZ{IEw8Dm2&LQ
z1|r)BUG^0GzI6f946RrBlfB1Vs)~8toZf~7)+G;pv&XiUO(%5bm)pl=p>nV^o*;&T
z;}@oZSibzto$arQgfkp|<o4}2aWyA-u@g@X@*3Qq>z4Z($P>dTXE{4O=vY0!)kDO*
zGF8a4wq#VaFpLfK!iELy@?-SeRrdz%F*}hjKcA*y@mj~VD3!it9lhRhX}5YOaR9$}
z3m<U!dsnGfk?KY|+&M@U4to6WN5Fr~Z2Y~S6z;ugWov!c#T4Pid7?1x8wY`#cM-K&
zXZ31E^^+4l<8TS_eV}PTTl9cUjRQB-789L;;mi28ms9Ok_n}yunSfm?pRC6bk9iMK
z{Me@L*Hx9gKeGtG68!~RS?gRYfl2zINnyRg@p)U*X(<_ksV`=o%2XWE5-Y+=UYL-Y
ztqFc{r$bTOOr%6GK_kGlR5`+;tTS|8zSb;+levJ}UbU#B1Mej>S%$2Be7{l(+MVx3
z(4?h;P!jnRmX9J9sYN#7i=iyj_5q7n#X(!cdqI2lnr8T$IfOW<_v`eB!d9xY1<?8m
zc=9ctC~_znEmY{3do4Y&tSr#K8MEwV*K>P=2q&WtOXY=D9QYteP)De?S4}FK6#6Ma
z=E*V+#<o63M9PbR(KQau)lC&KzK0v*^~#=c>s8>L;8aVroK^6iKo=MH{4yEZ_>N-N
z`(|;aOATba1^asjxlILk<4}f~`39dBFlxj>Dw(hMYKPO3EEt1@S`1lxFNM+J@uB7T
zZ8WKjz7HF1-5&2=l=fqF-*@>n5J}jIxdDwpT?oKM3s8Nr`x8JnN-kCE?~aM1H!hAE
z%%w(3kHfGwMnMmNj(SU(w42OrC-euI>Dsjk&jz3ts}WHqmMpzQ3vZrsXrZ|}+MHA7
z068obeXZTsO*6RS@o3x80E4ok``rV^Y3hr&C1;|ZZ0|*EKO`$lECUYG2gVFtUTw)R
z4Um<0ZzlON`zTdvVdL#KFoMFQX*a5wM0Czp%wTtfK4Sjs)P**RW&?lP$(<}q%r68Z
zS53Y!d@<WHAUBA*8bUiRbm%Z;gZhfNqOZBHucO1A@&fFR43kejZro_v)VLcPwS7}~
zK5k!0!+rSL*HKlXVA@0UZ>&~ne9O)A^tNrXHhXBkj~$8j%pT1%%mypa9A<G!EKb<E
z`}8*o7Vl;U@K#TU5!9`Os$JU!y8FCud{w+#5g>W5E&s9)rjF4@O3ytH{0z6riz|@<
zB~UPh*wRFg2^7EbQrHf0y?E~dHlkOxof_a?M{LqQ^C!i2dawHTPYUE=X@2(<D?FV&
zcM@&VpBXA?L{0tb_j)NYM}%xYbEn~9R`f?;g|efm#wA%S{AP`lHyTMh8%rB%5P`TA
z^U37=Hfa1dqP}{-l>3<=OOxs8qn_(y>pU>u^}3y&df{JarR0@VJn0f+U%UiF=$Wyq
zQvnVHESil@d|8&R<%}uidGh7@u^(%?$#|&J$pvFC-n8&A>utA=n3#)yMkz+qnG3wd
zP7xCnF|$9Dif@N~L)Vde3hW8W!UY0BgT2v(wzp;tlLmyk2%N|0jfG$%<;A&IVrOI<
z!L)o>j>;dFaqA3pL}b-Je(bB@VJ4%!JeX@3x!i{yIeIso^=n?<yGgTTZ!PNB?9gX<
zIb-Mwo=t8!k;=1f5ke{{mjD;8+drvc=j_XPyvGfArKBJEaX2!s2-K1+v_zbm8v7BT
za`|K1N2}$TyJ@nhBOHb0du-5xRz>fDX`3bU=eG7sTc%g%ye8$v8P@yKE^XD=NYxTb
zbf!Mk=h|otpqjFaA-vs5YOF-*GwWPc7VbaOW&stlANnCN8iftFMMrUdYNJ_Bnn5Vt
zxfz@Ah|+4&P;reZxp;MmEI7C|FOv8NKUm8njF7Wb6Gi7DeODLl&G~}G4be&*Hi0Qw
z5}77vL0P+7-B%UL@3<Hx#GB2%vG%0rC1(94hq216=?s(ssfs{vDgp`%$+N_!WRy9C
za}K<}u;;Pqc=!2V0k{Hgo5p0-m1!D$f?OU9<FJ2<5oh^cbOGSGfdj2^%OxwDfU-z~
z(XR@2k_uf5r(>n1&JPxW^d@vVwp?u#gVcJqY9#@-3X{ok#UfW3<1fb%FT`|)V~ggq
z(3AUoUS-;7)^hCjdT0Kf{i}h)mBg4qhtHHBti=~h^n^OTH5U*XMgDLIR@sre`AaB$
zg)IGBET_4??m@cx&c~bA80O7B8CHR7(LX7%HThkeC*@vi{-pL%e)yXp!B2InafbDF
zjPXf1mko3h59{lT6EEbxKO1Z5GF71)WwowO6kY|6tjSVSWdQ}NsK2x{>i|MKZK8%Q
zfu&_0D;CO-Jg0#YmyfctyJ!mRJp)e#@O0mYdp|8x;G1%OZQ3Q847YWTyy|%^cpA;m
zze0(5p{tMu^lDkpe?HynyO?a1$_LJl2L&mpeKu%8YvgRNr=%2z${%WThHG=vrWY@4
zsA`OP#O&)TetZ>s%h!=+CE15lOOls&nvC~$Qz0Ph7tHiP;O$i|eDwpT{cp>+)0-|;
zY$|bB+Gbel>5aRN3>c0x<ruzyyQ%Zy5vf6}`4)t?d-C#9!GHs<@Hns>)4U=|X+z+{
zn*_p*EQ<B%95agq4hNqm^)z*%GD}I4q^^7sH5Hy)x3mf2i}!E6)Yg(THpWRZ7O-FM
zN0W_>oquRL+=+p;=lm`d71&1NqBz&_ph)MXu(Nv6&XE7(RsS)^MGj5Q?Fwude-(sq
zjJ>aOq!7!EN>@(fK7EE#;i_BGvli`5U;r!YA{JRodLBc6-`n8K+Fjgwb%sX;j=qHQ
z7&Tr!)!{HXoO<2BQrV9Sw?JRa<KG5emNB(T<y(NWmqssKxUatWWx*DdyYw_kOIJd)
z;k&Pys2Tnf4Po((JL<eVe)|O!Lv`GXH>LXV8HrsNevvnf>Y-6|{T!pYLl7jp$-nEE
z#X!4G4L#K0qG_4Z;Cj6=;b|Be$hi4JvMH!-voxqx^@8cXp`B??eFBz2lLD8RRaRGh
zn7kUfy!YV~p(R|p7iC1Rdgt$_24i0cd-S8HpG|`@my70g^y`gu%#Tf_L2<gJMO);m
zEk>1-k?sRRZHK&at(*ED0P8iw{7?R$9~OF$Ko;Iu5)ur5<->x!m<Z%nn+oUd>93Eb
zFYpIx60s=Wxxw=`$aS-O&dCO_9?b1yKiPCQmSQb>T)963`*U+Ydj5kI(B(B?HNP8r
z*bfSBpSu)w(Z3j7HQoRjUG(+d=IaE~tv}y14zHHs|0UcN52fT8V_<@2ep_ee{QgZG
zmgp8iv4V{k;~8@I%M3<#B;2R>Ef(Gg_cQM7%}0s*^)SK6!Ym+~P^58*wnwV1BW@eG
z4sZLqsUvBbFsr#8u7S1r4teQ;t)Y@jnn_m5jS$CsW1um!p&PqAcc8!zyiXHVta9QC
zY~wCwC<otwTnmD(e1ezd?<0DwVxo}=Fub>F0U%xiQPD_INKtTb;A|Zf29(mu9NI;E
zc-e>*1%(LSXB`g}kd`#}O;veb<(sk~RWL|f3ljxCnEZDdNSTDV6#Td({6l&y4IjKF
z^}lIUq*ZUqgTPumD)RrCN{M^jhY>E~1pn|KOZ5((%F)G|*ZQ|r4zIbrEiV%42hJV8
z3xS)=!X1+=olbdGJ=yZil?oXLct8FM{(6ikLL3E%=q#O6(H$p~gQu6T8N!plf!96|
z&Q3=`L~>U0zZh;z(pGR2^S^{#PrPxTRHD1RQOON&f)Siaf`GLj#UOk&(|@0?zm;Sx
ztsGt8=29-MZs5CSf1l1jNFtNt5rFNZxJPvkNu~2}7*9468TWm>nN9TP&^!;J{-h)_
z7WsHH9|F%I`Pb!>KAS3jQWKfGivTVkMJLO-HUGM_a4UQ_%RgL6WZvrW+Z4ujZn;y@
zz9$=oO!7qVTaQAA^BhX&ZxS*|5dj803M=k&2%QrXda`-Q#IoZL6E(g+tN!6CA!CP*
zCpWtCujIea)ENl0liwVfj)Nc<9mV%+e@=d`haoZ*<oI1yD0)ode<2{}h3=ee3^GUp
zK^Zv;a(K^#^f3JYFh@>`B7+PNjEbXBkv=B+Pi^~L#EO$D$ZqTiD8f<5$eyb54-(=3
zh)6i8i|jp(@OnRrY5B8t|LFXFQVQ895n*P16cEKTrT*~yLH6Z4e*bZ5otpRDri&+A
zfNbK1D5@O=sm`fN=WzWyse!za5n%^+6dHPGX#8DyIK>?9qyX}2XvBWVqbP%%D)7$=
z=#$WulZlZR<{m#gU7lwqK4WS1Ne$#_P{b17qe$~UOXCl>5b|6WVh;5vVnR<%d+Lnp
z$uEmML38}U4vaW8>shm6CzB(Wei3s#NAWE3)a2)z@i{4jTn;;aQS)O@l{rUM`J@K&
l00vQ5JBs~;vo!vr%%-k{2_Fq1Mn4QF81S)AQ99zk{{c4yR+0b!

literal 61608
zcmb5VV{~QRw)Y#`wrv{~+qP{x72B%VwzFc}c2cp;N~)5ZbDrJayPv(!dGEd-##*zr
z)#n-$y^sH|_dchh3@8{H5D*j;5D<{i*8l<n`R`94An31eIWbisdMSBvMo=KdzZu#!
z2=IUVG7$V4U%UUmhH^skQsQDNstj`C4{}qJvNH4x^YAkCG&57PP0CD5tUr(Lr|8F|
zrsbw-rRacR&cjU84vV#^0hr{ahs87@nB*8}#Ta+ach127GUL}I|L4%azP25lE&lDO
z{@DihA2t@wMy9rA|5sDgzngkE8#y|fIse-(VW+DelrTU*`j|jKH2?E168}A!#$SIR
zXJlp1U}9_J;*z5Y>5IFJ|DjL!e)upfGNX(kojugZ3I`oH1PvW`wFW_ske0j@lB9bX
zO;2)`y+|!@X(fZ1<2n!Qx*)_^Ai@Cv-dF&(vnudG?0CsddG_&Wtae(n|K59ew)6St
z#dj7_(Cfwzh$H$5M!$UDd8=4>IQsD3xV=lXUq($;(h*$0^yd+b{qq63f0r_de#!o_
zXDngc>zy`uor)4A^2M#U*DC~i+dc<)Tb1Tv&~Ev@oM)5iJ4Sn#8iRw16XXuV50BS7
zdBL5Mefch(&^{luE{*<o)$0CtHMXCiFaqU;N{t<$9@JbXquVr@cf{y~BNB(J5=Tji
zlK?_g|E;1zl$VJ=#ZmElT~Y6jy-|?2PUv}kl<0irKUHY7@2t={_gVdY)lv8kM+ad9
zC<O%>5qtCZk$oFr3<io|2$Itc(&(T+V0vhN)K$Fl^c3u8y`}{@R7L#c1&Qu_+u$L|
zkw6sZeUEd0xxV1r@X7Bj^XUCX<ecNL?GSk}zL!>RH=H!c3wGR=HJ(yKc_re_X9pD`
zJ;uxPzUfVpgU>DSq?J;I@a+10l0ONXPcDkiYcihREt5~T<to{?YLB3#Ek~Bd_FRTK
z3SVU)NWfW~bevBhSgga`J`3XaEJ;UR&tR-QNI#e+fX1mkLg(kYRIlBUeP!g)rVvkV
zmBQF>5Gb}sT0+6Q;AWHl`<y=xe2MOa)>S5dV>lv%-p9l#xNNy7ZCr%cyqHY%TZ8Q4
zbp&#ov1*$#grNG#1vgfFOLJCaNG@K|2!W&HSh@3@Y%T?<RDDZ2kvE4KZX_tTk{8@Y
z+1Qu}v&0qF!3ps~B5R6-#N&o4vQEcX3!~lWKK-JjRoUbPQR)>3YI75bJp!VP*$*!<
z;(ffNS_;@RJ`=c7yX04!u3JP*<8jeqLHVJu#WV&v6wA!OYJS4h<_}^QI&97-;=ojW
zQ-1t)7wnxG*5I%U4)9$wlv5Fr;cIizft@&N+3<m!sp`}{5>2O%B{R1POm$oap@&f|
zh+5J{>U6ftv|vAeKGc|zC=kO(+l7_cLpV}-D#oUltScw})N>~JOZLU_0{Ka2e1evz
z{^a*ZrLr+JUj;)K&u2CoCAXLC2=fVScI(m_p~0FmF>>&3DHziouln?;sxW`NB}cSX
z8?I<poVWwH93~xX>sJB)Z=aYRz!X=yJn$kyOWK%rCYf-YarNqKzmWu$ZvkP12b4qH
z<cj_@_^h^p^q&$rHm}tFrF$o@p+N@Luju~MbeZxq_WbMvMAonH{#8FcaQx#1Ex963
zthr*D;hp#t`U%;8Lw{en#r&PBH>hS9Q>j<}(*frr?z<%9hl*i^#@*O2q<G8@m-E{I
z`}pP(W$_?tQz?qiq)AkeSb{O1HEI<O&IPY2fz^)h2U5WFf)$o|GVN9!>(Z^CN)c2c
z>1B~D;@YpG?G!Yk+*yn4vM4sO-_!&m6+`k|3zd;8DJnxsBYtI;W3We+FN@|tQ5EW=
z!VU>jtim0Mw#iaT8t_<+qKIEB-WwE04lBd%Letbml9N!?SLrEG$nmn7&W(W`VB@5S
zaY=s<l}}fvx=2PUlRXVFqYw_pix_=MLAKV-vfffnNa-G}V}-DjqeGu81{_6c7DT4*
zgNTK&HNdPkT}|m;Wopt-pwH(=vK!Mcs#L3p7EuhKtdS*$(gi7K6)2mt;vO}}@U2?@
zic8*RBj6lGpirRD%IH>Ew2}i@F_1P4OtEw?xj4@D6>_e=m=797#hg}f*l^`AB|Y0#
z9=)o|%TZFCY$SzgSjS|8AI<m~)~<LWT=KD$snpvb;<|raYO=8NN=pEex{aVNGen|i
z4hGyCiz+M`>-%J4x}J)!IMxY3_KYze`_I=c1nmrk@E8c9?MVRu)7+Ue79|<R7R(*W
zmGI9WxS<;F_rj?)6ZJ2+&*@e<mlh^Wi>)rBX7tVB7U|w4*h(;Gi3D9le49B38`wuv
zp7{4X^p<CFK*NrFla6?I(q;<C*K@ag4>+K4*$@gU(Tq3K1a#3SmYhvI42)GzG4f|u
zwQFT1<JTz}_6=eHFU^e2CZtm7+S~2?G10jrHLa$Yc>n_=n|jpi=70-yE9LA+d*T8u
z`=VmmXJ_f6WmZve<c3j)L*cT@L>ZPct$Cgu^~gFiyL>Lnpj*6ee>*0pz=t$IJ}+rE
zsf@>jlcG%Wx;Cp5x)YSVvB<GcbWPQ65t~gc{a(L|Y**_KX&N^LV{4p;>1$yyY1l&o
zvwX=D7k)Dn;ciX?Z)Pn8$flC8#m`nB&(8?RSdBvr?>T9?E$U3u<MGKL6<gI3+cigX
zr2;7xjAPPdw|q3|5<Av+0yh@5pePF?so63EF4(f;!m<(9QF+GK>IX7T?$v4dWCa46
z+&`ot8ZTEgp7G+c52oHJ8nw5}a^dwb_l%MOh(ebVj9>_koQP^$2B~eUfSbw9RY$_<
z&DDWf2LW;b0ZDOaZ&2^i^g+5uTd;GwO(-bbo|P^;CNL-<vp1D1$R<L}_zoyFQ(?^n
zl`6VAFTjED$Nit=axARyg>%?9mRmxEw~5&z=X^Rvbo^WJW=n_%*7974RY}JhFv46>
zd}`2|qkd;89l}R;i~9T)V-Q%K)O=yfVKNM4Gbacc7AOd>#^&W&)Xx!Uy5!BHnp9kh
z`a(7MO6+Ren#>R^D0K)1sE{Bv>}s6Rb9MT14u!(NpZOe-?4V=>qZ>}uS)!y~;jEUK
z&!U7Fj&{WdgU#L0%bM}SYXRtM5z!6M+kgaMKt%3FkjWYh=#QUpt$XX1!*XkpSq-pl
zhMe{muh#<vd{NzT8hJO~2nwSu@|uKui`Q8EdXeGz4>knk{9_V3%qdDcWDv}v)m4t9
z<k^O7as2~K;#kz6&_j;+XcIB_r9LslJ=plZ802GD7!wKurp5N7C0N7MrBiyAL~c=u
zE%@soR=E%Ksd7<Rzkb}c1=?E^tRZO%BD}eh;$H);oB)^Nt6e4N2J+}eE=O>Qhv{;}
zc{}#V^N3H>9mFM8`i`0p+fN@GqX+kl|M94$BK3J-X`Hyj8r!#x6Vt(PXjn?N)qedP
z=o1T^#<s;C9Ui_c^t!}2S-XqPF?-?4;fe4415B~F0>?1^a{;bZ&x`U{f?}TMo8ToN
zkHj5<VbXBbPLm`saJ%OL;G18~%@f$_blKkP1#<P0FY;5DtZHS)$u-A?Yn3SA3J@bT
zA1d!HbKV+f1Ugw07K&jwzua_~#;P<Rn>v|}r}wDEi7I@)Gj+S1aE<Lr;qg@51w32$
zyxn{bK>-GdnLN+$hw!=DzglMaj#{qjXi_dwpr|HL(gcCXwGLEmi|{4&4#OZ4ChceA
zKVd4K!D>_N=_X;{poT~4Q+!Le+ZV>=H7v1*l%w`|`Dx8{)McN@NDlQyln&N3@bFpV
z_1w~O4EH3fF@IzJ9kDk@7@QctFq8FbkbaH7K$iX=bV~o<VCiV&YRTZ}?C^!Fu2yC)
zv{Vzb(sB&ct#XXgvg1<Aax>#gfh?2JD6lZf(XP>~DACF)fGFt)X%-h1yY~MJU{nA5
ze2zxWMs{YdX3q5XU*9hOH0!_S24DOBA5usB+Ws$6{|AMe*joJ?RxfV}*7AKN9V*~J
zK+OMcE@bTD>TG1<D&k;gXJl_GYh`aH;$ZLob;4%Of6;ZSs-6Ri5E?%yZ1lwjNo$M0
zh+s;*GL1qh63T)l8*vTt!qBLZ)~cQ14>*yc?*qGqjBN8mgg@h1cJLDv)0!WRPIkC`
zZrWXrceVw;fB%3`6kq=a!pq|hFIsQ%ZS<kf2ia2#pBvu`A3V%+`AJvHB*NUK3~nQF
zw*gxnx7LCX(Z^1w*|SqdvT{$S%V#1K_mVQ7La-Aw%y<w}ejK@Lu|-CGm40~>lo~)D
z|64!aCnw-?>}AG|*iOl44KVf8@|joXi&|)1rB;EQWgm+iHfVbgllP$f!$<xMKNPGw
z75lQ-&s?W5309;y6gIrMn!YgKCh2h_t)HK6EcT@xYc0sgM!#>Wf42%NO5b(j9Bw6L
z;0dpUUK$5GX4QbMlTmLM_jJt!u<VK-KUt7Z%d43gTkafnEz;tKrLF`kq7eb@)^GVH
zVzlnCl^>r`_0~$b#BB7FL*%XFf<<YlClUogc56^3Yyh4jgqXW7(#Qu|X^(|f$!!nL
zr<Jlyt{`j<%HJ7(Ibr+qi51D$ikY1it_}mi&OTSv%-y{FbY?e9I<zP))1O}CdnlMB
z)E{0F(+ck9%;u_OGgFgau=Rw8qE6u}01y?;f@M5NLv*P|4@P3@#u%P9aWCL)&PJT|
zX@dygu5XWA26#e~n6RWn&*Bl^^VBtoVJBn^bDnW4mHo4ME6_YI9>b__1o)Ao<oAII
zl<ghkn)lbTvrX_mEpa~6_wy3!knhoEQy$s)O&Eje&DuVJ{~mIy!7WXiU&-a=SC+^7
zzq_L1{|UJN-6?C-bu@6*&_3i@#`~C#P@p9X(Ce2%iic!mTBMYuD`LZ<OM}*McxA(w
zkj(d|!1fegueE#LwG9egYdYR8KktNowE4+1AfZ@IuxN3gT>3rlobbN8-(T!1d<VYe
z=uu*dc`@_NH-vid1r!+qd!W<p6Hp2sR=vY4yh`?ujy)PePx7Y^!w{->-bR8D3S0@d
zLI!*GMb5s~Q<&sjd}lBb8Nr0>PqE6_!3!2d(KAWFxa{hm`@u|a(%#i(#f8{BP2wbs
zt+N_slWF4IF_O|{w`c~)Xvh&R{Au~CFmW#0+}MBd2~X}t9lz6*E7uAD`@EBDe$>7W
zzPUkJx<`f$0VA$=>R57^(K^h86>09?>_@M(R4q($!Ck6GG@pnu-x*exAx1jOv|>KH
zjNfG5pwm`E-=ydcb+3BJwuU;V&OS=6yM^4Jq{%AVqnTTLwV`AorIDD}T&<zk=U4_F
z%akElkXp@CbeS<cl%y^#t}u_*o+Kw^Xa%!S>jWr8pB&j28fVtk_y*JRP^t@l*($UZ
z6(B^-PBNZ+z!p?+e8@$&jCv^EWLb$WO=}Scr$6SM*&~B95El~;W_0(Bvoha|uQ1<y
zI;g~pq<puh8JAZSg`e`{9Ul}WlQxSt?3%o&hA!;)cXW-;B<UPjMu}?EtHvVS7g>T<
zO$%_oLAwf1bW*rKWmlD+@CP&$ObiDy=nh1b2ejz%LO9937N{LDe7gle4i!{}I$;&Y
zkexJ9Ybr+lrCmKWg&}p=`2&Gf10orS?<wSRKh%(i*-EzBy^*(nk#EV0x%s+gVr5#i
zF*^yn?NFz@z)jkaF%P~*zrnDtj18`Mit$=8TVU0_Xu0XQT-29W)`{}4Y{_WLO}la2
z3kum*Acd(?w(30MQ0iXECV4}56Baro5eg?Ji{&xv>4$Vr<ApIaAwLyRgnDz_63EnQ
zb0F~DwJxa8Y6V&P@8Y;IWU23PX|5YXwRO5>zWidT=*6{KzOGMo?KI0>GL0{iFWc;C
z+LPq%VH5g}6V@-tg2m{C!-$fapJ9y}c$U}aUmS{9#0CM*8pC|sfer!)nG7Ji>mfRh
z+~6CxNb<thuojmgyDIx-O?L~|1OMp?{&5*5nw(NYRF76i1VE!yuFbdk^SXpYh9d!e
zisi>>6eWKMHBz-w2{mLL<sWnSR{lp+GVAVGNcs2U?&%}ZbUT({ThKL33h5&godIvq
z#4SFCl~dpzw{Kf9GWC*<(5@{J-YWs96Ulo#)6da2L@e?NLIhPLoWud(Gbix6rPhyM
z+#ezG31H`whsp_@rDLe9hoK&0hz}tS!3q2%y1yY-p%>wdA7dA-qfTu^A2yG1+9s5k
zcF=le_UPYG&q!t5Zd_*E_P3Cf5<i9lV%B>T6821bO<oZ<I;eq^g7*0L=5+o%xOyh3
zV}b+qIu^3vM+=S`g6~mUfaz2O^0b~+Y02%irk{L(|9!#otC{hV00sh*`O?q-K|B9x
zc@lEAaI-VBcNOzAF>`daa`;DODm8Ih8k89=RN;-asHIigj`n=ux>*f!OC5#;X5i;Q
z+V!GUy0|&Y_*8k_QRUA8$lHP;GJ3UUD08P|ALknng|YY13)}!!HW@0z$q+kCH%xet
zlWf@BXQ=b=4}QO5eNnN~CzWBbHGUivG=`&eWK}<gH9L&>beuV*;?zt=P#pM*eTuy3
zP}c#}AXJ0OIaqXji78l;YrP4sQe#^pOqwZUiiN6^0RCd#D271XCbEKpk`HI0IsN^s
zES7YtU#7=8gTn#lkrc~6)R9u&SX6*Jk4GFX7){E)WE?pT8a-%6P+zS6o&A#ml{$WX
zABFz#i7`DDlo{34)oo?bOa4Z_lNH>n;f0nbt$JfAl~;4QY@}NH!X|A$KgMmEsd^&Y
zt;pi=>AID7ROQfr;MsMtClr5b0)xo|fwhc=qk33wQ|}$@?{}qXcmECh>#kUQ-If0$
zseb{Wf4VFGLNc*Rax#P8ko*=`MwaR-DQ8L8V8r=2N{Gaips2_^cS|oC$+yScRo*uF
zUO|5=?Q?{p$inDpx*t#Xyo6=s?bbN}y>NNVxj9NZCdtwRI70jxvm3!5R7yiWjREEd
zDUjrsZhS|P&|Ng5r+f^kA6BNN#|Se}_GF>P6sy^e8kBrgMv3#vk%m}9PCwUWJg-AD
zFnZ=}lbi*mN<K#(vlYbGZAX^KQmjvAYCRG*UOU`z2$j+74AdgXr3(r`Z*t~vhyGOF
z)w@e8rCo#wjxU`Xq#TN0kURQy8Y45b@jCRNbbQi7ac)K;Y9F%JPMNFNffNKTTeU*T
zHQTmYG^Gu1I@&Jv`71fu(BSKE_ZcDAC6eM{-i#Ce{raky!z_b9d|h7zARvnW>-AOm
zCs)r=*YQAA!`e<R&0)*Xk7%|k&^;uv62@(5&ac_hW*F9=TfvBeS~Qh~EX`oba74cG
z_zl_hTH19>#1N>aHF=bb*z*hXH#Wl$z^o}x##ZrUc=kh%OHWhp=7;?8%Xj||@V?1c
ziWoaC$^&04;A|T)!Zd9sU<cT<Lad$0pGXX1w=fLRLa7aSLO9sinK2%NmW<mIFjiuc
z-cT9?*>zE&$ODyJ<B|PnBKliB6c94vLSghm91pGb$1o^7rM2a&%c}D$u}j(J@zRz#
zi%s0i4BD9?+o@$HB_##NjTPLR3oh&PgIxvX>aBpvqsw19Uiuq{i#VK1!htkdRWBnb
z`{rat=nHArT%^R>u#CjjCkw-7%g53|&7z-;X<Ac^=g(0g1=gRkv{@6{)+2MuRw4?q
zSyffm46G$5&03=o2M%0CNA&bH8`|Q+lj*sOSA!_VPI<qibefjTL~ySR5|HpXSu-Wk
zjm)E}CNtR?XF>+ewb?OLWiV|#nuc8mp*LuGSi3IP<<*Wyo9GKV7l0Noa4Jr0g3p_$
z*R9{qn=?IXC#WU>48-k5V2Oc_>P;4_)J@bo1|pf=%Rcbgk=5m)CJZ`caHBTm3%!Z9
z_?7LHr_BXbKKr=JD!%?KhwdYSdu8XxPoA{n8^%_lh5cjRHuCY9Zlpz8g+$f@bw@0V
z+6DRMT9c|>1^3D|$Vzc(C?M~iZurGH2pXPT%F!JSaAMdO%!5o0uc&iqHx?ImcX6fI
zCApkzc~OOnfzAd_+-DcMp&AOQxE_EsMqKM{%dRMI5`5CT&%mQO?-@F6tE*xL?aEGZ
z8^wH@wRl`Izx4sDmU>}Ym{ybUm@F83qqZPD<I_<D@SDBXpcm$%pP;@}1x+1rECR~6
z%mPO96ZtCMfz6TZL_tB_o<jX(0%{4O*=Jpf{(}rOT%n6F&#4F#H{^%{gCRk)ccFmy
zlAyZVmLT4N#~F)~@`1bcBU<gu4>6nFm?t?(7>h*?`fw)L3t*l%*iw0Qu#?$5eq!Qc
zpQvqgSxrd83NsdO@lL6#{%lsYXWen~d3p4fGBb7&5xqNYJ)yn84!e1PmPo7ChVd%4
zHUsV0<QfI}<M8O`g)!{5VcjkDZIjCu8(aqo6;;=sPlL7o>Mh?VpzZD=A6%)Qrd~i7
z96*RPbid;BN{Wh?adeD_p8YU``kOrGkNox3D9~!K?w>#kFz!4lzOWR}puS(DmfjJD
z`x0z|qB33*^0mZdM&6$|+T>fq>M%yoy(BEjuh9L0>{P&XJ3enGpoQRx`v6$txXt#c
z0#N?b5%srj(4xmPvJxrlF3H%OM<X=kF451d5XRpaI3Rddya;o<MiVe63o}q9!6}_c
zo)Za~rjO%XWDn6$-;t})ZmU#rhSPD)qiCJFwO-$XixQk0X*gbZ^iyuL^ft*8RskMZ
z61oYTT##Iok;Rg+0anh212gV|jFfog*GZX}VV7x@cwuYn2k0l|CdXJ3M&=>B!jvfy
z;wx8RzU~lb?h_}@V=bh6p8PSb-dG|-T#A?`c&H2`_!u+uenIZe`6f~A7r)`9m8atC
zt(b|6Eg#!Q*DfRU=Ix`#B_dK)nnJ_+>Q<1d7W)eynaVn`FNuN~%B;uO2}vXr5^zi2
z!ifIF5@Zlo0^h~8+ixFBGqtweFc`C~JkSq}&*a3<b*AGX+4JAVcr=k1@(BfrL*bH3
zB2tsVQA!i($9n4x3TKj4fyB9v6dVeLF9ce$&KiuST#O+L;`7)j^T{2s!k-fHs3AFL
z;*i&)+V}HhjAA_Rcq9bBAlY`@fUE4EXY~}ibwoho??7zC!;EPmIuC?iA|=eX-ry23
zydv?^AaCLg6^~XLVJgXk5t3-5-l5#+-WH4#R6H+-pH>C}L?b5Mh-bW=e)({F_g4O3
zb@SFTK3VD9QuFgFnK4Ve_pXc3{S$=+Z;;4+;*{<o#P)-O8F)a#4K`1Xm|~?q)i|U3
zYQ`j;(xom@I4xe9dA2S6y-d+xYe;^;M{B3B`KM&`C&=Gb<o8unUCEbv9DNO{|Er29
z8aca|Ig>H}Rc;845rP?DLK6G5Y-xdUKkA6E3Dz&5f{F^FjJQ(NSpZ8q-_!L3LL@H*
zxbDF{gd^U3uD;)a)sJwAVi}7@%pRM&?5IaUH%+m{E)DlA_$IA1=&jr{KrhD5q&lTC
zAa3c)A(K!{#nOvenH6XrR-y>*4M#DpTTOGQEO5Jr6kni9pDW`rvY*fs|ItV;CVITh
z=`rxcH2nEJpkQ^(;1c^hfb8vGN;{{oR=qNyKtR1;J>CByul*+=`NydWnSWJR#I2lN
zTvgnR|MBx*XFsfdA&;tr^dYaqRZp*2NwkAZE6kV@1f{76e56eUmGrZ>MDId)oqSWw
z7d&r3qfazg+W2?bT}F)4jD6sWaw`_fXZGY&wnGm$FRPFL$HzVTH^MYBHWGCOk-89y
zA+n+Q6EVSSCpgC~%uHfvyg@ufE^#u?JH?<73A}jj5iILz4Qqk5$+^U(SX(-qv5agK
znUkfpke(KDn~dU0>gdKqjTkVk`0`9^0n_wzXO7R!0Thd<OO)*@xLj!dA|^KI{(+g5
z4&&;v3+^PaBya7Rnu#!)XYc}vIWqv)^MY!O)bd!?B<}^dB*bn^DfNh`{LBe@BaZ7K
z79Vu@{$pu8y#gTfUJ?t()owinp0&lUvSWm~f6lhfPNSF&`a(>@S;U`y)VVP&mOd-2
z(hT(|$=>4FY;CBY9#_lB$;|Wd$aOMT5<N7HW=#J5xiuClp{tnl<jC$q#gWfwjqeAY
zV;sA^S=5DG9oD|_sR@+2OPrAQibqT{OGVV96@Akgvd57K5T@^KQN}?9VsiR^`m+&4
z6Wo=&#vs$B<Y9Yj#aZVD^shN}siQ$PUDTmt>O_3}DYXEHn&Jrc3`2JiB`b6X@EUOD
zVl0S{ijm65@n^19T3l%>*;F(?3r3s?zY{thc4%AD30CeL_4{8x6&cN}zN3fE+x<9;
zt2j1RRVy5j22-8U8a6$pyT+<`f+x2l$fd_{qEp_bfxfzu>ORJsXaJn4>U6oNJ#|~p
z`*ZC&NPXl&=vq2{Ne79AkQncuxvbOG+28*2wU$R=GOmns3W@HE%^r)Fu%Utj=r9t`
zd;SVOnA(=MXgnOzI2@3SGKHz8HN~Vpx&!Ea+Df~`*n@8O=0!b4m?7cE^K*~@fqv9q
zF*uk#1@6Re_<^9eElgJD!nTA@K9C732tV~;B`hzZ321Ph=^BH?zXddiu{Du5*IPg}
zqDM=QxjT!Rp|#Bkp$(mL)aar)f(dOAXUiw81pX0DC|Y4;>Vz>>DMshoips^8Frdv}
zlTD=cKa48M>dR<>(YlLPOW%rokJZNF2gp8fwc8b2sN+i6&-pHr?$rj|uFgktK@jg~
zIFS(%=r|QJ=$kvm_~@n=ai1lA{7Z}i+zj&yzY+!t$iGUy|9jH#&oTNJ;JW-3n>DF+
z3aCOzqn|$X-Olu_<wOD+V1cxb0Z}9)qPN6k=yG%7N(OXSN(!|;<~~&ZV7<|dWJ*$O
zcc8BYF-@yY+0BQ2=@gx;O-;QS>p7brzn`uk1F*N4@=b=m;S_C?#hy{&NE#3Hk<sC+
z@RVY+px5c26lyz%OfzZTn@(3s>ATrg?enaVGT^$qIjvgc61y!T$9<1B@?_ibtDZ{G
zeXInVr5?OD_nS_O|CK3|RzzMmu+8!#Zb8Ik;rkIAR%6?$pN@d<0dKD2c@k2quB%s(
zQL^<_EM6ow8F6^wJN1QcPOm|ehA+dP(!>IX=Euz5qqIq}Y3;ibQtJnkDmZ8c8=Cf3
zu`mJ!Q6wI7EblC5RvP*@)j?}W=WxwCvF3*5Up_`3*a~z$`wHwCy)2risye=1mSp%p
zu+tD6NAK3o@)4VBsM!@);qgsjgB$kkCZhaimHg&+k69~drbvRTacWKH;YCK(!rC?8
zP#cK5JPHSw;V;{Yji=55X~S+)%(8fuz}O>*F3)hR;STU`z6T1aM#Wd+FP(M5*@T1P
z^06O;I20S<pPBYLx^KQ-E#4lJKf0#2<$Urm^J75xe^_~ooFOaniz#EWEnAqL5nl;d
z;Y?#EUwvbZHb_{bP#Z+Xi6;``%`1xT4(Qh>k!bxW<-O;E081KRdHZrtsGJflFRRFS
zdi5w<L%xAIZMaxEN{|sC`S2LX=HNoo7yNMxu?JQZn!#EHpMVSC`Z-rSU>9OVDGSL3
zNrC7GVsGN=b;YH9jp8Z2$^!K@h=r-xV(aEH@#JicPy;A0k1>g1g^XeR`YV2HfmqXY
zYbRwaxHvf}OlCAwHoVI&QBLr5R|THf?nAevV-=~V8;gCsX>jndvNOcFA+DI+zbh~#
zZ7<oMFIjT?dRB+;KT%*|Gjj)Lv;R$(lsDCpKH})P;^<HgAW$|Ic$UC!!9k_^)<VFb
z+R-4(+=Oiwvgpt>`qNk&w+_+Yp!}j;OYxIfx_{f0-ONc?mHCiCUak=>j>~>YR4#w#
zuKz~UhT!L~GfW^CPqG8Lg)&Rc6y^{%3H7iLa%^l}cw_8UuG;8nn9)kbPGXS}p3!L_
zd#9~5CrH8xtUd?{d2y^PJg+z(xIfRU;`}^=OlehGN2=?}9yH$4Rag}*+AWotyxfCJ
zHx=r7ZH>j<rs-kbQ;s$ZI)B{YCAt<1f8=Z!C#+cW@(f}Vui2`~bhsJNt4X5FEVH#V
zmS~5qafT)ZOfofB3RY^p$qiO+hKg5MB@4BiWOlTuD_ywdEG^^`73sk%6$@P{w!m`d
zG%&#}O$F6xyMIL5Ey>2kV?%7WTtp+-HMa0)_*DBBmC{sd$)np&GEJ__kEd`xB5a2A
z*J+yx>4o#ZxwA{;NjhU*1KT~=ZK~GAA;KZHDyBNTaWQ1+;tOFFthnD)DrCn`DjBZ%
zk$N5B4^$`n^jNSOr=t(zi8TN4fpaccsb`zOPD~iY=UEK$0Y70bG{idLx@IL)7^(pL
z{??Bnu=lDeguDrd%qW1)H)H`9otsOL-f4bSu};o9OXybo6J!Lek`a4ff>*O)BDT_g
z<6@SrI|C9klY(>_PfA^qai7A_)VNE4c^ZjFcE$Isp>`e5fLc)rg@8Q_d^Uk24$2bn
z9#}6kZ2ZxS9<C46&Y+Q7nYM#)S{~e<-0SXbx^w1jyAP0t!{t{i)+bD@w$9YAlUQVZ
z1TZ|^=9cLiz;Bipmt#c?%u(c5s;}6EMb|KG%X+!BskufNDiLAbfcJAi-eKFCylmQ6
zcLgpiYS;T5u|4vj(43@Xs-;?LT?Reu-O1voTo*8Sg!T${N!fhDdj5F-jP4kcswNTc
zUPNlqr9(p*&QkY(6{Uw9+-&ZY^AVhuru!iEZSXWk{J62Y8RTWl#jvm?@UsOLN*n1U
z!!2c97^PYdYbw;1W(h-dY_NJ_bbOqzz80YwLA6En%W5F}=@a-dB;!cvFG55bE7@zZ
zf}Zz=u;({6%w-qMyr7YLW0H?0K>sI(RqT7?El2@B+($>eBQrNi_k#CDJ8D9}8$mmm
z4oSKO^F$i+NG)-HE$O6s1--6EzJa?C{x=QgK&c=)b(Q9OVoAXYEEH20G|q$}Hue%~
zO3B^bF=t7<z$Rj(z@}-%hhp0KDg5g-Vvj!qOr85&aqTpaaojC^CwQZHKk%N1&RJ@?
z3@mmU8UkLd^u+>t48sN<h@~F@WN(LX`%4J3P$~sLqIq2q^WYYan1y*WKS{^KXRSVj
zlRp2YD0*vmi}GIu(VMSMj`)AFtcV!7m`T~YnAy8nxmvlKskk~@*;{;3?|-#CT^;_>
zWh_zA`w~|){-!^g<vJDMm4#3w(!Hhyj3dofOB57x=Mu^T@6Gt<KN~lv>?6Mqf6ieV
zFx~aPUOJGR=4{KsW7I?<=J2|lY`NTU=lt=%JE9H1vBpkcn=uq(q~=?iBt_-r(PLBM
zP-0dxljJO>4W<w&)Z{UhZ0!m()I68e=px8_4B`37AI|bCZuMk_SVKAQz?8+4(l0C)
z<3()qDfD9UTW*wnelf4D7bR(}=TB;gs;ds+7QE~CAQ*jDKKADDC`3G?7kn$!=a5d&
z?I(JT9>q-;stY)CLB4q`-r*T$!K2o}?E-w_i>3_aEbA^MB7P5piwt1dI-6o!qWCy0
ztYy<q;G5p>!x9arGTS?kabkkyv*yxvsPQ7Vx)twkS6z2T@kZ|kb8yjm+^$|sEBm<L
zGtKcNM?a1<P1GHe%USdss^9iYmKI=GuiV`dL*Z(*)<W%!5IIDyJ!oJjHJOEa1m1VQ
zKco1NMHn5?h{5SRY#VFF?T!bo5_IIEbO;WfqdSQACJa+&8o3bgw;L^BimN?NlN(v)
zotn;%myS`DPUIQ+7RCnB)mY`2o&e;1Xh962y`p4wurO(bDXEWXms!a&F9;L0^G^Mo
zh1W&LQdXhd1KHjKV}xwOkQ>vACeqbz)RmxkkDQX-A*K!YFziuhwb|ym>C$}U|J)4y
z$(z#)GH%uV6{ec%Zy~AhK|+GtG8u@c884Nq%w`O^wv2#A(&xH@c5M`Vjk*SR_tJnq
z0trB#aY)!EKW_}{#L3lph5ow=@|D5Lz<fcUCo&Ka|9|4HGWHH0_J4ujUnr>JYUFD6
z7XnUeo_V0DVSIKMFD_T0AqAO|#VFDc7c?c-Q%#u00F%!_TW1@JVn<z*P@k#}SDu4q
z5BK|xV6S3>sfvm@_9HKWflBOUD~)RL``-!P;(bCON_4eVdduMO>?IrQ__*zE@7(OX
zUtfH@AX*53&xJW*Pu9zcqxGiM>xol0I~QL5B%Toog3Jlenc^WbVgeBvV8C8AX^Vj&
z^I}H})B=VboO%q1;aU5ACMh{yK4J;xlMc`jCnZR^!~LDs_MP&8;dd@4LDWw~*>#OT
zeZHwdQWS!tt5MJQI~cw|Ka^b4c|qyd<d8BjG@CVcx~A0@_+-3ySS5}V#nYxqHn&dJ
z3huaTsOBL$pM0~v6%?s%@?17;o|*#UY1tt-m0po1{B8Xt+V4%@*4l_1x6MTTu=i^t
zEF!^0`A{SAgixqmbf=fe`Q#RQV7q0JEE%qC5Cl7U3dvP`CnnYy>_ly(+Ql2m&AAw^
zQeSXDOOH!!mAgzAp0z)DD>6Xo``b6QwzUV@w%h}Yo>)a|xRi$jGuHQhJVA%>)PUvK
zBQ!l0hq<3VZ*RnrDODP)>&iS^wf64<Gan-0fT=xEEaI^H)!ok-sB8re6ozEmX5c@6
zvzFx43)HzN8|btxEr_+m_ES??hMpoBdA+u`<Ko)3jSDsJ<bNahp^L1kFKCk01nKG#
zd~B+qtlfL5f8$8ToxOxz!oqk&<wEbF*v1K2QV8d>C;MGqDvx>|p;35%6(u+IHoNbK
z;Gb;TneFo<v+>*`zUKS6kwF*&b!U8e5m4YAo03a_e^!5BP42+r)LFhEy?_7U1IR<;
z^0v|DhCYMSj<-;MtY%R@Fg;9Kky^pz_t2nJfKWfh5Eu@_l{^ph%1z{jkg5jQrkvD<
z#vdK!nku*RrH~TdN~`wDs;d>XY1PH?O<4^U4lmA|wUW{Crrv#r%N>7k#{Gc44Fr|t
z@UZP}Y-TrAmnEZ39A*@6;ccsR>)$A)S>$-Cj!=x$rz7IvjHIPM(TB+JFf{ehuIvY$
zsDAwREg*%|=>Hw$`us~RP&3{QJg%}RjJKS^mC_!U;E5u>`X`jW$}P`Mf}?7G7FX#{
zE(9u1SO;3q@ZhDL9O({-RD+SqqPX)`0l5IQu4q)49TUTkxR(czeT}4`WV~pV*KY&i
zAl3~X%D2cPVD^B43*~&f%+Op)wl<&|D{;=SZwImydWL6@_RJjxP2g)s=dH)u9Npki
zs~z9A+3fj0l?yu4N0^4aC5x)O<N_(0*g4u)%5Tt4@gHE>snm0qrhz@?nwG_`h(71P
znbIewljU%T*cC=~NJy|)#hT+lx#^5MuDDnkaMb*Efw9eThXo|*WOQzJ*#3dmRWm@!
zfuSc@#kY{Um^gBc^_Xd<M_=Opb*sV>xnl!n&y&}R4yAbK&RMc+P<gSSGsa9{ngu3h
za2rxBU6lA9Q9VAy<_CQ=#9?ge+|8rFr3YI44QC0@KPf?KG3#CkaUontfvoWcA#`fT
zUZ-M@9-{1Ei|?wN2X<<LG$En}QHwMqs=8ZuZNc+NsKkIl=}k#BjOIG2xpH6pY<h{d
zJ7c4SQ-wCPPp+Ave;R605<i{lO4KXOUo>^Ti;YIUh|C+K<WCtgj)+#X5!{~T0amf)
zA{NO!xG0_A(b+3`Y%~$@K6*;z4@GJOlO9iW_I)Uf=v75p{Zaa%riIlQ1XqxqD1P*v
zC_nl;^-H^oHskLi&AkX0pf_;|=*Q=gaUudCp%zN>1|=Z^{nZ}}rxH*v{xR!i%qO~o
zTr`WDE@k$M9o0r4YUFFeQO7xCu_Zgy)==;fCJ94M_rLAv&~NhfvcLWCoaGg2ao~3e
zBG?Ms9B+efMkp}7BhmISGWmJsKI@a8b}4lLI48oWKY|8<gk-*;t9-{k%FCJZFy<gM
z@C~rOBUWWT##Z+g3*3Vzs8fuTtjp`u#+{x*gRagQ8={zUb)t|^B2y%Lt=XH5-VU*g
zu-s*8g`Ceku&#kTTsG4pdKc+Q1?Ns^+`Anuzw^Kt@dXzw8(rtBy~EfPkytdOlMc6V
z+PjsVo1fq23ba`d{M8JQ|H)T-V`Ygmnsk8K`>?zuuNc$lt5Npr+<T4KxJJ<bPDeY<
zV$Y5gj%daxmn&XvpKy&xAedNSRNzj*+uARZbEwx*_BW(K#OMC!{`XgH-y>p7a#sWu
zh!@2nnLBVJK!$S~>r<AjX6^_+fORZ96soQxKn~@)BfuHDd$;Hq1kJ%oj=cQPA05n|
zlDech7|+hqRvU>2-pN||^w|fY`CT{TFnJy`B|e5;=+_v4l8O-fkN&UQbA4NKTyntd
zqK{xEKh}U{NHoQUf!M=2(&w+eef77VtYr;xs%^cPfKLObyOV_9q<<ILDt_So;x8tA
z{AwHiN2#Wqm5a+41^y+oU(NG>(%76-J%vR>w9!us-0c-~Y?_EVS<!Xa#y}`2>%v!*
z15s2s3eTs$Osz$JayyH|5nPAIPEX=U;r&p;K14G<1)bvn@?bM5kC{am|C5%hyxv}a
z(DeSKI5ZfZ1*%dl8frIX2?);R^^~LuDOpNpk-2R8U1w92HmG1m&|j&J{EK=|p$;f9
z7Rs5|jr4r8k5El&qcuM+YRlKny%t+1CgqEWO>3;BSRZi(LA3U%Jm{@{y+A+w(gzA<
z7dBq6a1sEWa4cD0W7=Ld9z0H7RI^Z7vl(bfA;72j?SWCo`#5mVC$l1Q2--%V)-uN*
z9ha*s-AdfbDZ8R8*fpwjzx=WvOtmSzGFjC#X)hD%Caeo^OWjS(3h|d9_*U)l%{Ab8
z<xdQ$23|WMjf-IqBJa@-|5QJamPBg?UmANYzk#NVaoTNbS)|8H20|;zb3-A+V#wVA
z0O?V!?94t>fv$yoP{OuUl@$(-sEVNt{*=qi5P=lpxWVuz2?I7Dc%BRc+NGNw+323^
z5BXGfS71oP^%apUo(Y#xkxE)y?>BFzEBZ}UBbr~R4$%b7h3iZu3S(|A;&HqBR{nK&
z$;GApNnz=kNO^FL&nYcfpB7Qg;hGJPsCW44CbkG1@l9pn0`~<fs1~obTx_FSX-JYV
zGQWAl6QMe=gj$TPFe4r4b4Ol;Htq0ghUXm#FhLL;q=vj^?zll8F~1Y_ME5KlGBn?W
zJLZAtGO*e1y^&@oxuzM@8GNx$4<>oKy5S777uH)l{irK!ru|X+;4&0D;VE*Ii|<3P
zUx#xUqvZT5kVQxsF#~MwKnv7;1pR^0;PW@$@T7I?s`_rD1EGUdSA5Q(C<>5SzE!vw
z;{L&kKFM-MO>hy#-8z`sdVx})^(Dc-dw;k-h*9O2_YZw}|9^y-|8RQ`BWJUJL(Cer
zP5Z@fNc>p<r+olf3Wx4QNlGzhncc!S>TXABbTRY-B5*MphpZv6#i802giwV&SkFCR
zGMETyUm(KJbh+&$8X*RB#+{surjr;8^REEt`2<qz>&Dubw3$mx>|~B5IKZJ`s_6fw
zKAZx9&PwBqW1Oz0r0A4GtnZd7XTKViX2%kPfv+^X3|_}RrQ2e3l<T~g*|IE{P97HV
zvf#Y<i{KPN_dP%1)NHb~ix&=&GH9>=KG_VyY`H?I5&CS+lAX5HbA%TD9u6&s#v!G>
zzW9n4J%d5ye7x0y`*{KZvqyXUfMEE^ZIffzI=Hh|3J}^yx7eL=s+TPH(Q2GT-sJ~3
zI463C{(ag7-hS1ETtU;_&+49ABt5!A7C<XW?{o=2DnJxLDD~{m*zq$azI0t7>wLwe
z=SoA8mYZIQeU;9txI=zcQVbuO%q@E)JI+6Q!3lMc=Gbj(ASg-<Uq;hB9d^p}DAXc~
zT?U|Ep>{V27u>z2e8n;Nc*pf}AqKz1D>p9G#QA+7mqqrEjGfw+85Uyh!=tTFTv3|O
z+)-kFe_8FF_EkTw!YzwK^Hi^_dV5x-Ob*UWmD-})qKj9@aE8g240nUh=g|j28^?v7
zHRTBo{0KGaWBbyX2+lx$wgXW{3aUab6B<q-FjF>hm1G1{jTC7ota*JM6t+qy)c5<@
zpc&<Cv-}2TvNf)-u^)w4IR#IAb30P8NKX2F^|M`)t)gNvmzY$92){_sASc~#MG?G6
z01+~17JwM!JPSxaJJtTz7$&8s`H3FldxQ%9@~nj<<O#kvf=K=$4nLLmHGiFo3Mq&*
ziIi#gQw#(**q&>(jVdTJf(q3xB=JotgF$X>cxh7k*(T`-V~AR+`%e?YOeALQ2Qud(
zz35YizXt(aW3qndR}fTw1p()Ol4t!D1pitGNL95{SX4ywzh0SF;=!wf=?Q?_h6!f*
zh7<+GFi)q|XBsvXZ^qVCY$LUa{5?!CgwY?EG;*)0ceFe&=A;!~o`ae}Z+6me#^sv-
z<kA1n(=XTnu@rJsCenhu-Zv&%WBDK;wE+-m5)3gqDM=UJSV|IgE?>1F6=WNd6>M(~
z+092z>?Clrcp)lYNQl9jN-JF6n&Y0mp7|I0dpPx+4*RRK+VQI~>en0Dc;Zf<!>l+x
z_e_b7s`t1_A`RP3$H}y7F9_na%D7EM+**G_Z0l_nwE+&d_kc35n$Fxkd4r=ltRZhh
zr9zER8>j(EdV&Jgh(+i}ltESBK62m0nGH6tCBr90!4)-`HeBmz54p~QP#dsu%nb~W
z7sS|(Iydi>C@6ZM(Us!jyIiszMkd)^u<1D+R@~O>HqZIW&kearPWmT>63%_t2B{_G
zX{&a(gOYJx!Hq=!T$RZ&<8LDnxsmx9+TBL0gTk$|vz9O5GkK_Yx+55^R=2g!K}NJ3
zW?C;XQCHZl7H`K5^BF!Q5X2^Mj93&0l_O3Ea3!Ave|ixx+~bS@Iv18v2ctpSt4zO{
zp#7pj!AtDmti$T`e9{s^jf(ku&E|83JIJO5Qo9weT6g?@vX!{7)cNwymo1+u(YQ94
zopuz-L@|5=h8A!(g-<F;G9^=CwUG2BBM&6@esQFH4>MXgLJC0MA|CgQF8qlonnu#j
z;uCeq9ny9QSD|p)9sp3ebgY3rk#y<wu$Scub#>0DA(SHdh$DUm^?GI<>%e1?&}w(b
zd<n{_{wZL^#}W>ip1;P2Z=1wM+$q=TgLP$}svd!vk+BZ@h<^4R=GS2+sri7Z*2f`9
z5_?i)xj?m#pSVchk-SR!2&uNhzEi+#5t1Z$o0PoLGz*pT64%+|Wa+rd5Z}60(j?X=
z{NLjtgRb|W?CUADqOS@(*MA-l|E342NxRaxLTDqsO<GMIr8u8#%dIQrz(r`Q(hkza
zil8N-`Js{wU0Gy<JdGKt>yfWWe%N(jjBh}G<qND?0TH2WotV2BO}oGFXR`nNIoZPu
zAYBqht4AIf6%UvOQWL(@v@#P!g?Z{m=yxdflhU-MrdJ3Lu4OwZ%yKkuPkk0$Ko)O*
z;5yrsNkvYZsjZQILNsEr+ECa0P<^XyVVf2;%`lxDRkz-!;wa1;EB{emo`C=%{Gykq
zq<4i~ETk#P9zK#gq4PdG1l$Vspzwyb@<LIRCp@UiYQvSVfg*oiL+eCZD0<3etyAQ>
zm7WPel6jXijaTiNita+z(5GCO0NM=Melxud57P<u@R2P46Q9-DyjXBHUN>P^d_U##
zbA;9iVi<@wr0DGB8<n8`yw;2Kv**CeqAs$L&plPhIa#v7(dTNoPt@&}ED@M*lxC!x
z`6s~+J|uy;3o7Lq<uMmSEF9Dw$gP)!=7bwIZF}v$SuOexM&6SRtdGcL+`+Tm+leuz
zpp$tX{Sz|>=T9Ab#2K_#zi=<XArhO6r_`n&7XSM212-MzWyRNG*!uO-#ecnE^8eXw
z{A)4%t2FvosVP<UQ~s;l`0?z0m3m-lgN!65Mz=sfFM<3$$g-N5nIt_Q>$igy<I%16
z>K48@;V|W`fg~7;+!q8)aCOo{HA@vpSy-4`^!ze6-~8|QE||hC{ICKllG9fbg_Y7v
z$jn{00!ob3!@~-Z%!rSZ0JO#@>|3k10mLK0JR<I1S>KP-Cc8UYFu>z93=Ab-r^oL2
zl`-&VBh#=-?{l1TatC;VweM^=M7-DUE>m+xO7Xi6vTEsReyLs8KJ+2GZ&rxw$d4IT
zPXy6pu^4#e;;ZTsgmG+ZPx>piodegkx2n0}SM77+Y*j^~ICvp#2wj^BuqRY*&cjmL
zcKp78aZt>e{3YBb4!J_2|K~A`lN=u&5j!byw`1itV(+Q_?RvV7&Z5XS1HF)L2v6ji
z&kOEPmv+k_lSXb{$)of~(BkO^py&7oOzpjdG>vI1kcm_oPFHy38%D4&A4h_CSo#lX
z2#oqMCTEP7UvUR3mwkPxbl8AMW(e{ARi@HCYLPSHE^L<1I}OgZD{I#YH#GKnpRmW3
z2jkz~Sa(D)f?V?$gNi?<F$5NpPo_(+mLu%j0uVGhEpW~}8A-6p@(iN<J78jy&84)}
zW71~;kMKbRG+MZ(!>6)Y;Sm{&?~2p=0&BUl_(@hYeX8YjaRO=IqO7neK0RsSNdYjD
zaw$g2sG(>JR=8Iz1<iqC50Fc?zkwnhu-?J#4v?gbo)h!toq+!EipMj&Dd=4)`^!2@
zL(!GW5QxLJO&{?1u~Q}Au)moY@9Q-~Yr01D0la`rUI3jK%5PxGU7;z+IlI=Bb;^2b
zL|Kc&B2+#W3&e}l>SK4`*kqd_3-?;_BIcaaMd^}<@MYbYisWZm2C2<aQM85hCqTrH
z{L!?Z_;my2c?%RMej)yS*$eqpa!UR3e9te>|Np_l|8r9yM|JkUngSo@?wci(7&O9a
z%|V(4C1c9pps0xxzPbXH=}QTxc2rr7fXk$9`a6TbWKPCz&p=VsB8^W96W=BsB|7bc
zf(QR8&Ktj*iz)wK&mW`#V%4XTM&jWNnDF56O+2bo<3|NyUhQ%#OZE8$Uv2a@J>D%t
zMVMiHh?es!Ex19q&6eC&L=XDU_BA&uR^^w>fpz2_`U87q_?N2y;!Z!bjoeKrzfC)}
z?m^PM=(z{%n9K`p|7Bz$LuC7!>tFOuN74MFELm}OD9?%jpT>38J;=1Y-VWtZAscaI
z_8jUZ#GwWz{JqvGEUmL?G#l5E=*m>`cY?m*XOc*yOCNtpuIGD+Z|kn4Xww=BLrNYS
zGO=wQh}Gtr|7DGXLF%|`G>J~l{k^*{;S-Zhq|&HO7rC_r;o`gTB7)uMZ|WWIn@e0(
zX$MccUMv3ABg^$%_lNrgU{EVi8O^UyGHPNRt%R!1#MQJn41aD|_93NsBQhP80yP<9
zG4(&0u7AtJJXLPcqzjv`S~5;Q|5TVGccN=Uzm}K{v)?f7W!230C<``9(64}D2raRU
zAW5bp%}VEo{4Rko`bD%Ehf=0voW?-4Mk#d3_pXTF!-TyIt6U+({6OXWVAa;s-`Ta5
zTqx&8msH3+DLrVmQOTBOAj=uoxKYT3DS1^zBXM?1W+7gI!aQNPYfUl{3;PzS9*F7g
zWJN8x?KjBDx^V&6iCY8o_gslO16=kh(|Gp)kz8qlQ`dzxQv;)V&t+B}wwdi~uBs4?
zu~G|}y!`3;8#vIMUdyC7YEx6bb^1o}G!Jky4cN?BV9ejBfN<&!4M)L&lRKiuMS#3}
z_B}Nkv+zzxhy{dYCW$oGC&J(Ty&7%=5B$sD0bkuPmj7g>|962`(Q{ZZMDv%YMuT<n
z1<0L@A~^*&C~fETTawHVh1kk4b*^p0vQ^7?+3dKBe<pM8Snh`k_7R%#IZRUEl1U~%
z`#y5ddd+xk?tVQb4dNJ(7Ry%2!BTF1HzW?PK!2%Oj>^Kwe<oH3RpEUQV(1=JAftKZ
zy};jv^`iGA^yoK}($W9zl~UM?CzovcbP5)_-K0QR<B0^>iRDvYTEop3IgFv#)(w>1
zSzH><Zx#DBcM*ETggCrIL|G$?#sL+^<gVn#xwx<>J`q!LK)c(AK>&Ib)A{g`<Y-)}
z(@A>Fdykxqd`Yq@yB}E{gnQV$K!}RsgMGWqC3DKE(=!{}ekB3+(1?g}xF>^icEJbc
z5bdxAPkW90atZT+&*7qoLqL#p=>t-(-lsnl2XMpZcYeW|o|a322&)yO_8p(&Sw{|b
zn(tY$xn5yS$DD)UYS%sP?c|z>1dp!QUD)l;aW#`%qMtQJjE!s2z`+bTSZmLK7SvCR
z=@I4|U^sCwZLQSfd*ACw9B@`1c1|&i^W_OD(570SDLK`MD0wTiR8|$7+%{cF&){$G
zU~|$^Ed?TIxyw{1$e|D$050n8AjJvvOWhLtLHbSB|HIfjMp+gu>DraHZJRrdO53(=
z+o-f{+qNog+qSLB%KY;5>Av6X(>-qYk3IIEwZ<NM%r#@ph<M*8##>5~6a+P9lMpC^
z8CJ0q>rEpjlsxCvJm=kms@tlN4+sv}He`xkr`S}bGih4t`<??rFdF>+#VEIt{1veE
z{ZLtb_pSbcfcYPf4=T1+|BtR!x5|X#x2TZEEkUB6kslKAE;x)*0x~ES0kl4Dex4e-
zT2P~|lT^vUnMp{7e4OExfxak0EE$Hcw;D$ehTV4a6hqxru0$|Mo``<ad1s?_=B%gG
zj{L^&w-1CqbSvv%+|q1FJ)359<5+$A?k|aG#gf7{>>*a5=1Ym0u>BDJKO|=<aBj&U
z!0#X%Y@1|KDHEa^`rc~}k?jREFe&j9TBf#RRLMm;>TEWJ5jZu!W}t$Kv{1!q`4Sn7
zrxRQOt>^6}Iz@%gA3&=5r;Lp=N@WKW;>O!eGIj#J;&>+3va^~GXRHCY2}*g#9ULab
zitCJ<BaQ=1ucETLnpX3y9t5BR+e(ST=YEEKt=Xy112Qwtm%k5x3c!p6oV{m@40JL~
zMB3IXGFiti$`r3qU9KkWdD0B0w2nH;70p*qOE_JEtaHOH+N1->t-OV0*D_Q3<g8V9
zm;BOnA1)>Q`p1_+GbPxRtV_T`<bX@8s=3hE?KYV`p2tWy54^?jcuq~6l*BOhxjN!!
z^YfKP5Wx%5767qY3bUCxe@{w@7?)5tek^Vgrr3xWzb~<2Na~Zi%p1V6d4U4sHORMh
z9<@8lXrisZuzFU)mBl0t68eB`oJwH{20{o{g2s-%u#nv&QU2tWM_W%e#~|NHMfxMp
zRM-h=($EQMHtd>jyATjax<;zZ?;S+VD}a(aN7j?4<~>BkHK7bO8_Vqfdq1#W&p~2H
z&w-gJB4?;Q&pG9%8P(oOGZ#`!m>qAeE)SeL*t8KL|1oe;#+uOK6w&PqSDhw^9-&Fa
zuEzbi!!7|YhlWhqmiUm!muO(F8-F7|r#5lU8d0+=;<`{$mS=AnAo4Zb^{%p}*gZL!
zeE!#-zg0FWsSnabl<CMbQ4500Q{TvpvXiCGkUi%tX9!KeG$87g>w!9$<&K(#z!XOW
z;*BVx2_+H#`1b@>RtY@=KqD)63brP+`Cm$L1@ArAddNS1oP8UE$p05R=bvZoYz+^6
z<)!v7pRvi!u_-V?!d}XWQR1~<lt}&9=&X{!*q{T%vI&{Sql_q~<bs=JfiC4k%hiD{
zRMjOdmSC*@3g=cAidK~^ywyFbdK)j^Qfk#UXd3U_FVoVd36bG{jjlOgvTnRjwERxE
z-E?_B9}RvmAC==a9mt*EnLWKm#&~+??Fr%8dgmR~zKWmR?y!954DdPLk@GI+AE4lI
zaun<-;SD&jV2s%R#Q0+$h!8+tU=(WXL8diA>0q(H3{d^4JGa=W#^Z<@TvI6J*lk!A
zZ*UIKj*hyO#5akL*Bx6iPKvR3_2-^2mw|Rh-3O_SGN3V9GRo52Q;JnW{iTGqb9W99
z7_+F(Op6>~3P-?Q8LTZ-lwB}xh*@J2Ni5HhUI3`ct|*W#pqb>8i*TXOLn~GlYECIj
zhLaa_rBH|1jgi(S%~31Xm{NB!30*mcsF_wgOY2N0XjG_`kFB+<Q#E!oi6v4mWmmdp
zpCrFYK7#3Llx<^JC{`QMc}y7Mn#rZi!bmnYGsz|v>uQuJbBm3bIM$qhUyE&$_u$gb
zpK_r{<D#n}U~r18Q9cpu7_WA|bVw~jkB-T@SBIs83_WOQD$QsrBK8v#YGtIb&;BA|
z^f-o}1u<5bRf8_Ai4>99svp3N3p4yHHS=#csK@j9ql*>j0X=+cD2dj<^Wiu@i>c_v
zK|ovi7}@4sVB#bzq$n3`EgI?~xDmkCW=2&^tD5RuaSNHf@Y!5C(Is$hd6cuyoK|;d
zO}w2AqJPS`Zq+(mc*^%6qe>1d&(n&~()6-ZATASNPsJ|XnxelLkz8r1x@c2XS)<e9
zVDeO<GC^N~@|t1?t&LxH8U-PQrqH;wsans3SgO3&9*BgbwK}9Dflo4DW(9&*G**t#
z5(08JP06aA!pS}33kTL;jmGw?eS&0eIbzv7kJDI{B{&cbYAXd|poH#n6YP+a2@zVP
zWf{CReG1A6D#=7l;{fY(f3mEcnyX-WV_u(j7L&<Bc&1CA15=N1l%Cemxh+LFLxzmc
zt>R*H(_B=IN>JeQUR;T=i3<^~;$<+8W*eRKWGt7c#>N`@;#!`kZ!P!&{9J1>_g8Zj
zXEXxmA=^{8A|3=Au+LfxIWra)4p<}1LYd_$1KI0r3o~s1N(x#QYgvL4#2{z8`=mXy
zQD#iJ0itk1d<pD1VGk%&4ci=+Hjcz)Hl94LD0g{3<>@Iy*DtXw)Wz!H@G2St?QZFz
zVPkM%H8Cd2EZS?teQN*Ecnu|PrC!a7F_XX}AzfZl3fXfhBtc<ff5WA{o}hG14*z(i
z*K_njw8`Ho`NMT6nej4znco^0DB`cm%kp~PK-34BfJ(Qcochw!NghIgsj#o-Nb`t)
zVGl9HfN7q|>2-)zaC2eKx*{XdM~Q<w$HWL{PMI^AT`G`ii!EB$YscY^Nuk(!FqRxn
z*|K+rA*VtJW^XRqgd8Y5^-S8rFcCRbuvV#xa2-&i<B=Kn-}$dv?>Uo4IwcGgVdW69
z1UrSAqqMALf^2|(I}hgo38l|Ur=-SC*^Bo5ej`hb;C$@3%NFxx5{cxXUMnTyaX{>~
zjL~xm;*`d08bG_K3-E+T<mWVYr6j8n!!pJNx6>I>#oqIN2=An(C6aJ*MrKlxj?-;G
zICL$hi>`F%{xd%V{$NhisHSL~R>f!F7AWR&7b~TgLu6!3s#~8|VKIX)KtqTH5aZ8j
zY?wY)XH~1_a3&>#j7N}0az+HZ;is;Zw(Am{MX}YhDTe(t{ZZ;TG}2qWYO+hdX}vp9
z@uIRR8g#y~-^E`Qy<u*MJx^Q>em(31{H0&V?GLdq9LEOb2(ea#e-$_`5Q{T%E?W(6
z(XbX*Ck%TQM;9V2LL}*Tf`yzai{0@pYMwBu%(I@wTY!;kMrzcfq0w?X`+y@0ah510
zQX5SU(I!*Fag4U6a7Lw%LL;L*PQ}2v2WwYF(lHx_Uz2ceI$mnZ7*eZ?RFO8UvKI0H
z9Pq-mB`mEqn6n_W9(s~Jt_D~j!Ln9HA)P;owD-l~9FYszs)oEKShF9Zzcmnb8kZ7%
zQ`>}ki1k<x*@h~9?|=_B5VcO=(N^K=D-I1iVfpHyvC6!w*bgI46!csKF<oV!JERin
zC3YrClGibB+Okmq$7*m2AOB?ld|Q}!uqu?r3IphaCt<@Ce+TI8+X!99XM!>wUO3j~
zEmh140sOkA9v>j@#56ymn_RnSF`p@9cO1XkQy6_Kog?0ivZDb`QWOX@tjMd@^Qr(p
z!sFN=A)QZm!sTh(#q%O{Ovl{IxkF!&+A)w2@50=?a-+VuZt6On1;d4YtUDW{YNDN_
zG@_jZi1IlW8cck{uHg^g=H58l<Vm9}1(ifQn)gr*uOc)p;i+Z*up!G6Q|ct@A`Rg+
z(Pz0_^vr7n#ozLauq<wGnI09PQ^$^ELvBezzpX||sLv`=K>PQ^HwnybWy@@8iw%G!
zwB9qVGt_?~M*nFAKd|{cGg+8`+w{j_^;nD>IrPf-S%YjBslSEDxgKH{5p)3LNr!lD
z4ii)^%d&cCXIU7UK?^ZQwmD(RCd=?OxmY(Ko#+#CsTLT;p#A%{;t5YpHFWgl+@)N1
zZ5VDyB;+TN+<e(DQM$-KBEOK~JQZ@8DI*iN)<P3BrrACFCTIK*u%S0|53PEu^7Ehl
zV?l&OVm@;rL5p)wh*^@1$Q~X9$Hva^6d8UaU{+1U9laP}p;1lPmY%c!ngm|hODD5L
zR(ju!H$Q+Hyll6?dXg{bqQO>g@u~{UrWrv)&#u~k$S&GeW)G{M#&Di)LdYk?{($Cq
zZGMKeYW)aMtjmKgvF0Tg>Mmkf9IB#2tYmH-s%D_9y3{tfFmX1BSMtbe<(yqAyWX60
zzkgSgKb3c{QPG2MalYp`7mIrYg|Y<4Jk?XvJK)?|Ecr+)oNf}XLPuTZK%W>;<|r+%
zTNViRI|{sf1v7CsWHvFrkQ$F7+FbqPQ#Bj7XX=#M(a~9^80}~l-DueX#;b}Ajn3VE
z{BWI}$q{XcQ3g{(p>IOzFcAMDG0xL)H%wA)<(gl3I-oVhK~u_m=hAr&oeo|4lZbf}
z+pe)c34Am<=z@5!2;_lwya;<D$$PCDT2t07f~T~1`gm+|*CJY!i+dS#iTCYHqqaw)
zj3blRU6F#gfxw(pj>l?xV5&kWe}*5uBvckm(d|7R>&(iJNa6Y05SvlZcWBlE{{%2-
z`86)Y5?H!**?{QbzGG~|k2O%eA8q=gxx-3}&Csf6<9BsiXC)T;x4YmbBIkNf;0Nd5
z%whM^!K+9zH>on_<&>Ws?^v-EyNE)}4g$Fk?Z#748e+GFp)QrQQETx@u6(1fk2!(W
zWiCF~MomG*y4@<N?CDr+4XG>Zk;h#2H8S@&@xwBIs|82R*^K(i*0MTE%Rz4rgO&$R
zo9Neb;}_ulaCcdn3i17MO3NxzyJ=l;LU*N9ztBJ30j=+?6>N4{9YXg$m=^9@Cl9VY
zbo^{yS@gU=)EpQ#;UIQBpf&zfCA;00H-ee=1+TRw@(h%W=)7WYSb5a%$UqNS@oI@=
zDrq|+Y9e&SmZrH^iA>Of8(9~Cf-G(P^5Xb%dDgMMIl8gk6zdyh`D3OGNVV4P9<?|P
z-j@F$ZGb0Iv;Q#+1Y3DEbQ`j-$mx&dLKYe~f)g}x!W9%BxOE?Kegu;<P)6;RKC|^}
zuJcGCm-}}fgpn&rErt=!;=F^)mLo%`4-bb4yDU-hjLg207h})(!Na3IFjNh3pKxT}
z=E-#C&M%2%{LBV_R9}(GHx_~&?Nkjbxq||ycJqejQ<li(BiXow>X|EvIhplXDld8d
z^YWtYUz@tpg*38Xys2?z<AsaQ9`FX9=vO?VclV^OO+^DZP}?dQBIRV1wR9IEL|AA?
z7%zFkNU4u`%FPFrUA%S(<E|t-Co&aM3igfI^tDcE$Eb&ti7J;v)|Nx;#i_p~XN=1!
z)X%9>j$F8%ivA47cGSl;h<CJwzu8LTNYjfHY0+mYtoV3~Y9LHg`fNrZqRIVH7(WTd
z42@(A4wsKs;UK_xXvYSsGH}!mq-W9RUS>jD23#*62w3+fwxNE7M7zVK?x_`dBSgPK
zWY_~wF~OEZi9|~CSH8}Xi>#8G73!QLCAh58W+KMJJC81{60?&~BM_0t-u|VsPBxn*
zW7viEKwBBTsn_A{g@1!wnJ8@&h&d>!qAe+j_$$Vk;OJq`hrjzEE8Wjtm)Z>h=*M25
zOgETOM9-8xuuZ&^@rLObtcz>%iWe%!uGV09nUZ*nxJAY%&KAYGY}U1WChFik7HIw%
zZP$3Bx|TG_`~19XV7kfi2GaBEhKap&)Q<9`aPs#^!kMjtPb|+-fX66z3^E)iwyXK7
z8)_p<)O{|i&!qxtgBvWXx8*69WO$5zACl++1qa;)<j>0zlXf`eKWl!0zV&<N=whgf
z=0i25aXKIFe5mUpdv-EHM0EKf_KV-DV|@p1jm^E@ea)Z2_?f|N<(<RzPtbPo`ldD#
zI%|89YOckdy*j(=6Uy}VGgbFV<WBdKw7C5m8tRP;Q*C~&kBFvF=i}Ch{i_Y2;40L{
z)K`6LTNK+2*O5nKkI3d23^q*hZS22n$b8(0jEvxXx>I`8?sG)OD2Vy?reNN<{eK+_
za4M;H<OEXEJ~5%>h%&IszR%)&gpgRCP}yheQ+l#AS-GnY81M!kzhWxIR?PW`G3G?}
z$d%J28uQIuK@QxzGMKU_;r8P0+oIjM+k)&lZ39i#(ntY)*B$fdJnQ3Hw3Lsi8z&V+
zZly2}(Uzpt2aOubRjttzqrvinBFH4jrN)f0hy)tj4__UTwN)#1fj3-&dC_Vh7}ri*
zfJ=oqLMJ-_<#rwVyN}_a-rFBe2>U;;1(7UKH!$L??zTbbzP#bvyg7OQBGQklJ~DgP
zd<1?RJ<}8lWwSL)`jM53iG+}y2`_yUvC!JkMpbZyb&50V3sR~u+lok<jf)#biL}k>
zT0uFRS-yx@8q4fPRZ%KIpLp8R#;2%c&Ra4p(GWRT4)qLaPNxa&?8!LRVdOUZ)2vrh
zBSx&kB%#Y4!+>~)<&c>D$O}!$o{<1AB$M7-<IbItSWbLS$Bc!yc*D!JSUNWc8Xxf_
zVwhYbcOY|jLi^_r`vZ|o_zYvjAL=OwCK>^`h!eW;c(3J~ztoOgy6Ek8Pwu5Y`Xion
zFl9fb!k2`3uHPAbd(D^IZmwR5d<V^a36$=BnmM)YfOhH6RTrUdB@GYwz`_7nuN|p$
z2V+%uCpN}@8r+zC1m$Ow)b62uBx&p=p4>8D$495nN2`Ue&`W;M-nlb8T-OVKt|fHk
zBpjX$a(IR6*-swdNk@#}G?k6F-~c{AE0EWoZ?H|ZpkBxqU<Xf3W+7zF%bMQpG=#+f
zxoMuDrN{!Y23^6mg$;7E;@7@XK+}=Qy_1Iq=)6u><0NUtvubJtwJ1mHV%9v?GdDw;
zAyXZiD}f0Zdt-cl9(P1la<zqwbP8fB?G%>+vQ$Er0~v}gY<d-*YcL&hT|=1btDzQ0
z(6p4%7<LXbtyHJnL793Fi@vF^&-iy&?CL=~h5%o&zh5-LcEwfjJAHm-%n>JVwQazv
zH#+Z%2CIfOf90fNMGos|{zf&N`c0@x0N`tkFv|_9af3~<0z@mnf*e;%r*Fbuwl-IW
z{}B3=(mJ#iwLIPiUP`J3SoP~#)6v;aRXJ)A-pD2?_2_CZ#}SAZ<#v7&Vk6{*i(~|5
z9v^nC`T6o`CN*n%&9+bopj^r|E(|pul;|q6m7Tx+U|UMjWK8o-lBSgc3ZF=rP{|l9
zc&R$4+-UG6i}c==!;I#8aDIb<c|ovf|J^|Tj-z?&rajbtaSL_j7Uc0sHFrW;_^dt-
zQ#fau&15?b-*_*c%@nFsI=MGU)fm~M{Fd@lsp;TW6Jkt3nUS9YuP-Tfk2eIECIc%$
z>AvgLuB66CQLRoTMu~jdw`fPlKy@AKYWS-xyZzPg&JRAa@m-H43*+ne!8B7)HkQY4
zIh}NL4Q79a-`x;I_^>s$Z4J4-Ngq=XNWQ>yAUCoe&SMAYowP>r_O}S=V+3=3&(O=h
zNJDYNs*R3Y{WLmBHc?mFEe<W&)(jM#)z+=`SB74}QX|RMwfle6Thto6L#|vM@u#0*
ztZPlYvT0zrSFcI`K3V@ZCpyY>A4`0Y`_CN%?8qbDvG2m}kMA<oe^a9RxBh_fznjAU
zf#du4cCea-8;%*8ujt0;{b1xdnQNl5jFDE#5oW@VJH^(R%s7q~rTyVyDmv+^@G9kH
z%EEY*)+Bm)^R;|yi#2u-s5sOFeMj}4zCG@p*Wui}tgN&XA2U*^<u-uW$>iqCv`_BK
z_6a@n`$#w6Csr@e2YsMx8udNWtNt=kcqDZdWZ-lGA$?1PA*f4?X*)hjn{sSo8!bHz
zb&lGdAgBx@iTNPK#T_wy`KvOIZvTWqSHb=gWUCKXAiB5ckQI`1KkPx{{%1R*F2)Oc
z(9p@yG{fRSWE*M9cdbrO^)8vQ2U`H6M>V$gK*rz!&f%@3t*d-r3mSW>D;wYxOhUul
zk~~&ip5B$mZ~-F1orsq<|1bc3Zpw6)Ws5;4)HilsN;1t<c`^?I-+NnRQ4BGkk~5AC
z0<$*Ro7kbksCaNZpO7OZW9m3e<*|QD8IN<HqQL0bQb?^#z-zS1;!&h|;E)H}5Jl#+
zCY~IC9W~KX9IJ7*k9=2dUeTLAi3<AIBU3?FCq$C2J&dn1i(kvgVStn3OK%1HGEEH`
zl}RP!K66_VDRlySL3JlB;5@HA+t}EVjAW&zabiDB5+pE{4&BssI0+>x;N6)tuePw&
z==OlmaN*ybM&-V`yt|;vDz(_+UZ0m&&9#{9O|?0I|4j1YCMW;fXm}YT$0%EZ5^YEI
z4i9WV*JBmEU{qz5O{#bs`R1wU%W$qKx?bC|e-iS&d*Qm7S=l~bMT{~m3iZl+PIXq{
zn-c~|l)*|NWLM%ysfTV-oR0AJ3O>=uB-v<rdTg~-U`VQ{V%4>pld{V|cWFhI<K__!
zY_p+lRa{>~sx>ciV9sPkC*3i0Gg_9G!=4ar*-W?D9)?EFL1=;O+W8}WGdp8TT!Fgv
z{HKD`W>t(`Cds_qliEzuE!r{ihwEv1l5o~iqlgjAyGBi)$%zNvl~fSlg@M=C{TE;V
zQkH`zS8b&!ut(m)%4n2E6MB>p*4(oV>+PT51#I{OXs9j1vo>9I<4CL1k<SbW+&Ap)
zSP*RZJ^w%mwwxG^lpbQp<y#<c`2j6=tpT??9=M$m1k}On6M$1Q5AVN0sPBwg`c0Qr
zK7<G4?wG+Kw(dAkFQ`e4mKX@c)c%GbcTo2#ozT|>v1aurV*AFZ^w_qfVL*G2rG@D2
zrs87oV3#mf8^E5hd_b$IXfH6vHe&lm@7On~Nkcq~YtE!}ad~?5*?X*>y`o;6Q9lkk
zmf%TYonZM`{vJg$`lt@MXsg%*&zZZ0uUSse8o=!=bfr&DV)9Y6$c!2$NHyYAQf*Rs
zk{^?gl9<l6aHM&uD+l3hFT+28k8g^pGn-H<ZHHcXYg$z(F4Jtp_Xx|{2t8=tZN`>E
z5Im8wlAsvQ6C2?DyG@95gUXZ3?pPijug25g;#(esF_~3uCj3~94}b*L>N2GSk%Qst
z=w|Z>UX$m!ZOd(x<j9eXHfco7njabXV6r(0b^4(&cOlQ%n~ZRCkU^)bOK|u;Tf(Z<
z)%A&Z?!gx&FfQcJ1ka~zxh=jKlF$aS^I`L9N6Zfp2RNgghhUbdivb)_o_wrkQKiXN
z>V*2xvWjN&c5BVEdVZ0wvmk)I+YxnyK%l~caR=7uNQ=+cnNTLZ@&M!I$Mj-r{!P=;
z`C2)D=VmvK8@T5S9JZoRtN!S*D_oqOxyy!q6Zk|~4aT|*iRN)fL)c>-yycR>-is0X
zKrko-iZw(f(!}dEa?hef5yl%p0-v-8#8CX8!W#n2KNyT--^3hq6r&`)5Y@>}e^4h-
zlPiDT^zt}Ynk&x@F8R&=)k8j$=N{w9qUcIc&)Qo9u4Y(Ae@9tA`3oglxjj6c{^pN(
zQH+Uds2=9WKjH#KBIwrQI%bbs`mP=7V>rs$KG4|}>dxl_k!}3ZSKeEen4Iswt9<Vx
zE>6GGw`E6^5Ov)VyyY}@itlj&sao|>Sb5<mx7{zaG9j_ba8Zn5K#G`;;jnCwfaV@2
zfB--<s_Ho?au3X)Qq+^=$Mw2HA}6H$ph@(};1h67duDcz_!MjV18bU|6b%Yl$;l2>
zeY+#1EK(}iaYI~EaHQkh7Uh>DnzcfIKv8ygx1Dv`8N8a6m+AcTa-f;17RiEed>?RT
zk=dAksmFYPMV1v<x&y*?3CAt4n)nj%7c<8p@rCUMNPw>IS(Qc6tUO+`1jRZ}tcDP?
zt)=7B?yK2RcAd1+Y!$K5*ds=SD;EEqCMG6+OqPoj{&8Y5IqP(&@zq@=A7+X|JBRi4
zMv!czlMPz)gt-St2VZwDD=w_S>g<u1Alo`a@)M5xCeMm@9WTygn}Yg{&GRz>Rpc-g
zUd*J3>bXeZ?Ps<QEw|QH!GID7xAtR|TnBoHBL<H(2d@TU#K4aKAqr%K?)oO@TEsL|
z$E~b1c<o8NtC45_R5dw2rqX6;J5J_&h8cu*m3XD9tC|sJ;e8Y=eOnkOd$m`EdItJX
zTGByXs@S95>johe;z7k|d<*T21PA1i)AOi8iMRwTBSCd0ses{)Q`9o&p9rsKeLaiY
zluBw{1r_IFKR76YCAfl&_S1*(yFW8HM^T()&p#<HVVqAydIWX%r4Ei9mtCFU`OZ^T
z_1ESE&U8ftMAYS>6y%{(j7Qu56^ZJx1LnN`-RTwimdnuo*M8N1ISl+$C-%=HLG-s}
zc99>IXRG#FEWqSV9@GFW$V8!{>=lSO%v@X*pz*7()xb>=yz{E$3VE;e)_Ok@A*~El
zV$sYm=}uNlUxV~6e<6LtYli1!^X!Ii$L~j4e<Di*Wks4eNuVJ#URzGdQAorX=_3nr
zTY4XzG?{}|&rMky&CY^jd+B~p1Ozm))}*z)nm|j_SWDXWZBTh?(8Uy`cyh1-pmxt5
zjD#-N>{sI$tq_A(OkGquC$+>Rw3NFObV2Z)3Rt~Jr{oYGnZaFZ^g5TDZlg;gaeIP}
z!7;T{(9h7mv{s@piF{-35L=Ea%kOp;^j|b5ZC#xvD^^n#vPH=)lopYz1n?Kt;vZmJ
z!FP>Gs7=W{sva+aO9S}jh0vBs+|(B6Jf7t4F^jO3su;M13I{2rd8PJjQe1JyBUJ5v
zcT%>D?8^Kp-70bP8*rulxlm)SySQhG$Pz*bo@mb5bvpLAEp${?r^2!Wl*6d7+0Hs_
zGPaC~w0E!bf1qFLDM@}zso7i~(``)H)zRgcExT_2#!YOPtBVN5Hf5~L<CCU1e$yOy
z6y7=%D3L0U<zJX-p<cShe85I0&7b?ixuHr*ev;88LfDXt4Y`h@aRt6fu_)dfSD<Cr
z3(iZbika`#1V{5t?5XV6saWc^(a!gyl;XpLlkO0|q305rjpn!-bJS#zH-=YO2U^?b
zP1+|Sw)zw1D{|SG>l3f~rWZ(UsJtM?O*cA1_W0)&qz%{bDoA}{$S&-r;0iIkIjbY~
zaAqH45I&ALpP=9Vof4OapFB`+_PLDd-0hMqCQq08>6G+C;9R~}Ug_nm?hhdkK$xpI
zgXl24{4jq(!gPr2bGtq+hyd3%Fg%nofK`psHMs}EFh@}sdWCd!5NMs)eZg`ZlS#O0
zru6b8#NClS(25tXqnl{|Ax@RvzEG!+esNW-VRxba(f`}hGoqci$U(g30i}2w9`&z=
zb8XjQLGN!REzGx)mg~RSBaU{KCPvQx8)|TNf|Oi8KWgv{7^tu}pZq|<WiMz3rpp0|
zLKIB_Ddvk1cM8BJ6cz;POHz%T{sZWf@&L60uqu2&dwrJ0x%22+Vt2z(`{TJ@iys}w
z!}_>BS&S<53fC2K4Fw6>M^s$R$}LD*sUxdy6Pf5YKDbVet;P!bw5Al-<ZmNM;fK}9
z(;Q617)?cwmeRBfr;WSdE!Fz~?sf588oJj!s$c%WwoO(_AtXkQF4F2xuV&`n3oC*l
zLD81gPrag(&l;y|c-6wE>8I1Nr(`SAubX5^D9hk6$agWpF}T#Bdf{b9-F#2WVO*5N
zp+5uGgADy7m!hAcFz{-sS0kM7O)qq*rC!>W@St~^OW@R1wr{ajyYZq5H!T?P0e+)a
zaQ%IL@X_`hzp~vRH0yUblo`#g`LMC%9}P;TGt+I7qNcBSe&tLGL4zqZqB!Bfl%SUa
z6-J_XLrnm*WA`34&mF+&e1sPCP9=deazrM=Pc4Bn(nV;X%HG^4%Afv4CI~&l!Sjzb
z{rHZ3od0!Al{}oBO>F*mOFAJrz>gX-vs!7>+_G%BB(ljWh$252j1h;9p~xVA=9_`P
z5KoFiz96_QsTK%B&>M<OVS!jKFsPBm{4n!1mDS$m*VO~m3uK*2h!9O|jhe3!GzDyp
zmM22!H~y1+2FiH-J&wO+VnjS|-3)(QdJ8GSi_0-d@y02VONd&XMRu?%tIoeyAs1$&
z2@H?hToaxd!hmqD8)Z|B2n$^2x?>SXEYh`|U5PjX1(+4b#1PufXRJ*uZ*KWdth1<0
zsAmgjT%bowLyNDv7bTUGy|g~N34I-?lqxOUtFpTLSV6?o?<7-UFy*`-BEUsrdANh}
zBWkDt2SAcGHRiqz)x!iVoB~&t?$yn6b#T=SP6Ou8lW=B>=>@ik93LaB<r_MA^r8W%
ziwVD->L56ub`>Uo!>0@O8?e)<QIehhF!1N7m_bQW9~;%fo1oD+{TinM^gu6xUX$9F
z^gK5Cv;EFbXK<zio1!h?E;s-FrZ3QhuHd!0)cpDvEbI3w{vR$q;(uOJ7iSCW{{p7}
zzpuyoZ?3nn{f4C38vNHAyE@U#eZOM?=C{-2UlQnl`=S4Hqo#$ulC_2XKi`(Y%2I9%
zqNtzb4J1RV?vRT8h2_}z5~y*Sgu$dNV1nirGVW<X<VBI;%p5`{W68rsXC;}R;jakJ
z0|m|oj_XPtH?ikucx#{-lLC?H?Xm4UZUlvXpMMX?{2yLx{C@@l#~h%b<Z5!*?F#~7
z095<~W**NHf+sw4TNn%fn$l^{-JfWtHQojXS8Dc{?sWuvz_8QOqS~YA!SB*+&X?5E
zc^efB&iaXnDoz0~4^Spx+uz)U7%v&d#A(?qFNi&QSA^y{ire}JOmf8O+>$t(sgy$I
z6tk3nS@yFFBC#aFf?!d_3;%>wHR;A3f2SP?Na8~$r5C1N(>-ME@HOpv4B|Ty7%jAv
zR}GJ<XhgBAgrpe%$kuJ?YuHb|v3u|gT`)+e7qK&fd+OIT;m{2y88S)Qjteg<Q~$%4
ztWsl)3xFMc%#UK*uV$e^e8U)bASn;aR5V)4e)Ps$ABOTa{{}89$FHcj_RA}KxYL!h
zSrRM4@Tm%S<9Rz@I&&S5FGd?4IjT9i`X#uinJ?GKu9Y@)$2gn)g#xfRYzz}$o40kc
zUGLF?z*ujtv{_Guq~e)cC*Ac97qz^+p^m9P_~1ybTfTl`R|}Lp|Ml;SQqm*IP;a^W
z9;xGPWdv5qh996kRjsCCzq4}wrC^JZQF7^!wb*8uc0Cs&R?O~n$pgltCC+R$?wqfx
zwy~I{d?&0hu}J>wsiJZ5@H+D$^Cwj#0XA_(m^COZl8y7Vv(k=iav1=%QgBOVzeAiw
zaDzzdrxzj%sE^c9_uM5D;$A_7)Ln}BvBx^=)fO+${ou%B*u$(IzVr-gH3=zL6La;G
zu0Kzy5CLyNGoKRtK=G0-w|tnwI)puPDOakRzG(}R9fl7#<|oQ<MB>EX;E#yCWVg95
z;NzWbyF&wGg_k+_4x4=z1<Z>GUcn6JrdX4nOVGaAQ8#^Ga>aFvajQN{!+9rgO-dHP
zIp@%&ebVg}IqnRWwZRTNxLds+gz2@~VU(HI=?Epw>?yiEdZ>MjajqlO>2KDxA>)cj
z2|k%dhh%d8SijIo1~20*5YT1eZTDkN2rc^zWr!2`5}f<2f%M_$to*3?Ok>e9$X>AV
z2jYmfAd)s|(h?|B(XYrIfl=Wa_lBvk9R1KaP{90-z{xKi+&8=dI$W0+qzX|ZovW<E
zC+%g!uYXZ#{jQrY@A!`XSl_$&A2T@qFMZ>GOotP+vvYR(o=jo?k1=oG?%;pSqxcU*
zWVGVMw?z__XQ9mnP!hziHC`ChGD{k#SqEn*ph6l46PZVkm>JF^Q{p&0=MKy_6apts
z`}%_y+Tl_dSP(;Ja&sih$>qBH;bG;4;75)jUoVqw^}ee=ciV;0#t09AOhB^Py7`NC
z-m+ybq<g4G1!&FidKvq|9sin}V;o>1>_OO+V*Z>dhk}QFKA8V?9Mc4WSpzj<uaKj4
zz}(y<qx>{6IWfFpF7l^au#r7&^BK2Ac7vCkCn{m0uuN93Ee&rXfl1NBY4NnO9lFUp
zY++C1I;_{#OH#TeP2Dp?l4KOF8ub?m6zE@XOB5Aiu$E~QNBM@;r+A5mF2W1-c7>ex
zHiB=WJ&|`6wDq*+xv8UNLVUy4uW1OT>ey~Xgj@MMpS@wQbHAh>ysYvdl-1YH@&+Q!
z0<dQW^;Ehn%fw-)fLb!<4HzREhM1Zj4kjQ!T09v0)QjqeWq<OYpA_`5xmMw!4+hTR
zy23Q(soXn+J<2mcH_6m%eJ0y`u>75(Qd4C!V`9Q9<BqX7QhEx1y7+HYACF;~N>jI4
zSt{HJRvZec>vaL_brKhQ<Sq8Wy8KCM4!1b}xe_|=NZ|wZo%q0h&x4@*-#-Tbp8b4J
zfIv}0{e+iDV}#Wuh874=&m%<?pIcYWQ;w#b%}b$Vn_q_?BZ`tWoll1nw0pK?nDM!-
z=IiSL)l|LG>QwbpQd4_Lmmr0@1GdUeU-QcC{{8o=@nwwf>+dIKFVzPriGNX4VjHCa
zTbL9w{Y2V87c2ofX%`(48A+4~mYTiFFl!e{3K^C_k%{&QTs<v>gOd0*95KmWN)P}m
zTRr{`f7@=v#+z_&fKYkQT!mJn{*crj%ZJz#(+c?>cD&2Lo~FFAWy&UG*<xxo3kzJ2
zrDbwgE`xL0p0OC~L$bVXy!zt2LN-Bue6r%b!O~*CllYPQ0{bnjSehnxRLfHKB-|@S
zlh%>Op^pV`BR^I|g?T>4l5;b|5OQ@t*?_Slp`*~Y3`&RfKD^1uLezIW(cE-Dq2z%I
zBi8bWsz0857`6e!ahet}1>`9cYyIa{pe53Kl?8|Qg2RGrx@Alv<K-1&TVh*%QiVeJ
zw<z)|0uz2^&{c%EX_mp!Y-<wmxQMClEpwtlv3E9lug>G3HAL-^9c^1GW;)vQt8IK+
zM>!IW*~682A~MDlyCukldMd;8P|<R1w8m*driNj?SBnHCqQ^}34Oe^3F0Wd5k+$DP
zQwx>JCZ&oNL(;HZgJ>ie1PlaInK7C@Jg{3kMKYui?e!b`(<sqcbV3|*ChSZ+u!m%p
zEk@sY6s}w^f<Db4!cs^*ZGoz!MF)itzenWdp0zit8&_HB23ZX%(}%Z-Chi<kQ@WUl
zT(v|=*&C-%O}S43l>&?t6PTb5UPrW-6DVU%^@^E`*y-Fd(p|`+JH&MzfEq;kikdse
ziFOiDW<yyXIOCw#j{)5?sD|95dJ6|$X;1y3bb<7j_^}nbX8;6j=KzRx3FdimHz<(c
zmSo@-#x~D(T}VTzSST7#biiP$37XpFV(s+vv(iSQ7I!I8ZKqf)^AfEZ&wdg|>H(D<
zyV7Rxt^D0_N{v?O53N$a2gu%1pxbeK;&ua`ZkgSic~$+zvt~|<wi2DKd{6zkbA_nq
zIDNbroZZR_UCliI>1Yb=UfKJW2F7wC^evlPf(*El+#}ZBy0d4kbV<JHB3rsDar1c{
z*Grb7r<dUjw#Am*!d&=V6x;*79S0!!;4TYA32Cmkx<yQp-R3&_+bQ0~49f!Bd2Cjh
zY&ZW=x21K3F4Sqd64lC<?QGcC)^WatWhoHF<DfExT|%m}Lve<W;m6AecsIu@s0HQ0
z;sGJq(EmLz1*2Qiyo444kgnXvB8<S~!4hSZRBcLs5-RY^L){UWNUr}q*A1gbe)#eg
zz(0&3ca!IWGoRZDX)3;$au=OUlsYF1T^to-gPZnvv#Y<VH=JL`_g(awH73M`{N`#+
zM=?0F=nU77E!)#P{EV4*TbZi+Vs~bStn<aVgf!NSMHxgf7h?GP4G2di7FV36>JsK-
z05>;>?<bli&gVpMCL_8-A4$tJhB_D&hw-4^NArA$&y|p#ogw7&h}dJ%CEK$3W)AC;
zB<R-89-M6xZfPWd_I--v3O~wpU}AYdMP!!rzs-<7%souf_ov6p&#=XmicWCcA^v(i
z^$FXa(|I&$nbQ+B27F?0?Z^K8%^&ecmd7x56FH*E3-SkLxGOY1IdX{hC<?uJylK#7
zi2V;{_ejM8ds|1sKS)_lFkhgT7C<dvCtL4&gyZ~4^H+QGzy7tLWUlb(Q}7*2=f6KB
z|9wmq{^na*+Zh=D$LrK5O6DKL<=`E2)@Eu~hCrAV@a{mqT|sU4z}1jd<b(ueFLn(4
zUZHTR{bj6UIE0=T-J21VUTh)oVManyGcTv~O$<%sVXX~J8<8H`Ass|=?nH|Vn8KKb
zp7ksuqRA>HZO(YBF&v5tNv_WcI@O@LKFl*VO?L(!BAd!KbkVzo;v@~3v`-816GG?P
zY+H3ujC>5=Am3RIZDdT#0G5A6xe`vGCNq88ZC1aVXafJkUlcYmHE^+Z{*S->ol%-O
znm9R0TYTr2w*N8Vs#s-5=^w*{Y}qp5GG)Yt1oLNsH7y~N@>Eghms|K*Sdt_u!&I}$
z+GSdFTpbz%KH+?B%Ncy;C`uW6oWI46(tk>r|5|-K6)?O0d_neghUUOa9BXHP*>vi;
z={&jIGMn-92HvInCMJcyXwHTJ42FZp&Wxu+9Rx;1x(EcIQwPUQ@YEQQ`bbMy4q3hP
zNFoq~Qd0=|xS-R}k1Im3;8s{BnS!iaHIMLx)aITl)+)?Yt#fo<CYMyMO(N&hjUd(9
zrYcKju%_{w9OiZ0tXHbEUp6a7E}jZhUfM~7VrxCUryOyfws<yaoJP#_!TR~^I8*%M
z_blHbfonlI>v|Eh>}dv@o6R{tG>uHsy&jGmWN5+*wAik|78(b?jtysPHC#e+Bzz~V
zS3eEXv7!Qn4uWi!FS3B?afdD*{fr9>B~&tc671fi--V}~E4un;Q|PzZRwk<k{$576
z3)*^Wn$J&4ijeAub)TAsrRanvyo+2b|HaO}Wck&TsBIjDEciAZ)xNHrg{+;Ot(c~w
z>-azprM$4AesvUb5`S`(5x#5VJ~4%ET6&%GR$<o;Uw@jHNXKq{o{-vatV``S=;pJq
zosYFs*w$E-x(PmXNY}^Ik!Ys=1N(H?1>}muHV-5lTsCi_R|6KM(g2PCD@|yOpKluT
zakH!1V7nKN)?6JmC-zJoA#ciFux8!)ajiY%K#RtEg$gm1#oKUKX_Ms^%hvKWi|B=~
zLbl-L)-=`bfhl`>m!^sRR{}cP`Oim-{7}oz4p@>Y(FF5FUEOfMwO!ft6YytF`iZRq
zfFr{!&0Efqa{1k|bZ4KLox;&V@ZW$997;+Ld8Yle91he{BfjRhjFTFv&^YuBr^&Pe
zswA|Bn$vtifycN8Lxr`D7!Kygd7CuQyWqf}Q_PM}<N^zG*sz{_fcU3v7O7XnC*4Aa
zpb=9eR0`H6KOu7y5Lux$;j6glQ=Cnx<g;4DUpTr~Jiv#5xF0h9DaFBD=)!%6jHEWX
z889cm)A<znb}Qr@2Ih@T`xk4BNl)lK%%ilOmpuyg+8+eO;vs(GN026wy-zF$0Bpho
zpq~g*HNw~h8hh>cX~S1$-6xUD%-jrSi24sBTFNz(Fy{QL2AmNbaVggWOhP;UY4D>S
zqKr!UggZ9Pl9Nh_H;qI`-WoH{ceXj?m8<o#3`K%nSO84PqMf~>y==MGY`AOJ7l0Uu
z)>M%?dtaz2rjn1SW3k+p`1vs&lwb%msw8R!5nLS;upDSxViY98IIbxnh{}mRfEp=9
zbrPl>HEJeN7J=KnB6?dwEA6YMs~chHNG?pJsEj#&iUubd<U9vAx5z41A?(bgtMGpP
zwCR*+-u<wI9%Dmvw`F@KM2us_U9@<TVJ^`{G6!5FE!-2ia+H}$Pk<_s|H<&5&#|JG
z3Zn(zsf_P;Kw|kH0@8N`a`zB$aW?-R7Gz=c|MM@CRcxG;L{NR7$sfsEaj*@Gm8+D)
z(~4{oh<j#<<rU=_ed_JxH3P1uWIgXZ?Yi3Q9}(WL@MIKBarw?*{rs^Y<VO%bf%sm-
z_bzSLCFW%#vYlVDwobBmPB_h8cs)NCW`4*P8t+ny7P4fq&4#)qdy+@I-1a2!GTstR
zV`C1q#W;Z%KqC%`A!VsO1lwv42E|Arp%SMpI;`;{)L@G58XaAs;HkN28=c;-R9iC5
zFv>f3JJwu=C(t?J<di8FrDi&_<8Gi8I{@c2;!g0*Fs7Y{NizU~U~DCr9#QGUWLJ8$
z6So7^8!gBboMj9cpk@?3jQ~}GdEFW_-L0Go4=cq7S|ztSu>pE6xMyhA3e}SRhunDC
zn-~83*9=mADU<BlwTn$=?eGI*${p@%-gJ&Jk4}GnjS5v2d|X>sk^<vsaU5-S-Dt?B
z^CJPj)ts%v&i(kUo{Z{ey^V2<p;Ul;SaF~f0+aoAk+x^fU+c<H8=??`0+ELm<<WYa
zejibs7IS57q5_UvyT>sCc%&&G1q5T^HR9$P#2DejaG`Ui*z1hI#h7dwpIXg)C{8s<
z%^#@uQRAg-$z&fmnYc$Duw63_Zopx|n{Bv*9Xau{a)2%?H<6D>kYY7_)e>OFT<6TT
z0A}MQLgXbC2uf`;67`mhlcUhtXd)Kbc$PMm=|V}h;*_%vCw4L6r>3Vi)lE5`8hkSg
zNGmW-BAOO)(W((6*e_tW&I>Nt9B$xynx|sj^ux~?q?J@F$L4;rnm_xy8E*JYwO-<G
zAw2a{1_{}UDtg6k<H!^~Ep9z*WtT)Wa}-x7C<<#g4x~4C&Od75vZaK9?9f%g*!4dQ
zlJiKHKS~B<_~zQHLZ6Yr&U0^y*|A2BEYT5Dfy(GmpC7JBa0_LKHpXMU18JJV<l9Ls
zF!CE=82FF4{}RO?1()5W%NVF=#KHe0qmy=`QxbdS#(f7zm(X!J9h!WZ#V5Q+oI9e!
z6moH<;DB=(^c^&S`<-WI`KlIm1rpiXUn1r!q_#i$C`6hPDt7K}0@M9MwW@Xl0adOq
zH-`cCnl0!pNDx>02<I8n_zF__isE*QA^i~z{Rx#YCf{3mI<#SoM*K+EC4@|p=};uD
z7_^98UUK#Y*>u9_@@W0_2@?B@1J{y~Q39N3NX^t7#`=34Wh)X~sU&uZWgS1Z09%<L
zecj}N4CM_`#U|#O1uFgDAre$wf)a-3-~Yms53N&v-}+YY_<tMCi2mPu{-62klqQt-
zKRjkVla6-e>_k|EjA4w_QqPdY`oIdv$dJZ;(!k)#U8L+|y~gCzn+6WmFt#d{OUu<Y
zOY_Uc<|e?RL-YmB)%)`@T7RB<R-QF>KHqh1-uX_p*Af8pFYkYvKPKBxyid4KHc}H`
z*KcyY;=@wzXYR{`d{6RYPhapShXIV?0cg_?ahZ7do)Ot#mxgXYJYx}<%E1pX;zqHd
zf!c(onm{~#!O$2`VIXezECAHVd|`vyP)Uyt^-075X@NZDBaQt<>trA3nY-Dayki4S
zZ^j6CCmx1r46`4G9794j-WC0&R9(G7kskS>=y${j-2;(BuIZTLDmAyWTG~`0)Bxqk
zd{NkDe9ug|ms@0A>JVmB-IDuse9h?z9nw!U6tr7t-Lri5H`?TjpV~8(gZWFq4Vru4
z!86bDB;3lpV%{rZ`3gtmcRH1hjj!loI9jN>6stN6A*ujt!~s!2Q+U1(EFQEQb(h4E
z6VKuRouEH`G6+8Qv2C)K@^;ldIuMVXdDDu}-!7FS8~k^&+}e9EXgx~)4V4~o6P^52
z)a|`J-fOirL^oK<pJlgk;{wTU6<tzCapMDlBXxQB3Le5okt#72xJqlvoHh5h4)(GA
zUTE7RMa>}tqD@pqBZi_;7N43%{IQ{v&G9^Y^1?SesL`;Z(dt!nn9Oj5Odde%opv&t
zxJ><~b#m+^KV&b?R#)fRi;eyqAJ_0(nL*61yPkJGt;gZxSHY#t>ATnEl-E%q$E16%
zZdQfvhm5B((y4E3Hk6cBdwGdDy?i5CqBlCVHZr-rI$B#>Tbi4}Gcvyg_~2=6O9D-8
zY2|tKrNzbVR$h57R?Pe+gUU_il}<WpPK0&c7Cf)^kTlHgLh*e9eYX-e@u&J%`pP#5
zSj}Dq@1tQz)i#Nl`VxH|LIiAxaA`Jd1@-!*lgdAtByP{OU%az&?42B}362L=feNrt
z*RxHj$ZWxdny=m=<L*KF`s!?l3-xy=FSk?@Svj!g{kbFhL)s~jx0dj5*@zub3TmN4
zewl(O8Lgo<<c>ZaWu|Az#QO@};=|(L-R<FtHfil3F$IN__;{K(;=@HW!#QUN35a{%
zD~|)u$b9KdYl2xdz7y|l$=m8DlwhQqP%?Kb=<$vL)3-UG2JBk4^e{I9(8U>Vf0AIW
zq#pO+RfM7tdV`9lI6g;{qABNId`fG%U9Va^ravVT^)CklDcx)YJKeJdGpM{W1v8jg
z@&N+mR?BPB=K1}kNwXk_pj44sd>&^;d!Z~P>O78emE@Qp@&8PyB^^4^2f7e)gekMv
z2aZNvP@;%i{+_~>jK7*2wQc6nseT^n6St9KG#1~Y@$~zR_=AcO2hF5lCoH|M&c{vR
zSp(GRVVl=T*m~dIA;HvYm8HOdCkW&&4M~UDd^H)`p__!4k+6b)yG0Zcek8OLw$C^K
z3-BbLiG<G*%4Ey*o=CXuznD%-E)(BI7(ff9<6pa$Zrz&C5rTB04~@$dmXojzFZ}L`
zRg%4@Gzl_8#O!M!**o3FiOinwAw)3js>_%qX|ZYpXJ$(c@aa7b4<SFTt=8S6LG4l8
zlcVxZ?pLGnmVxFRWw8r17^k5AI;7>-*IQkDF}=gZSV`*ljP|5mWuHSCcf$5<NC<*)
ze^<2Ph^^DKawiOIF%89MPGPWue;M0vE~6E*nOMq4MZhj`p<K636GBRJmj%~d#Domc
ztZs(zo{Afl&>qqhZTv&P?I$z^>}qP(q!Aku2yA5vu38d8x*q{6-1<l@ZEBJgr=yj*
z=|5IuLM<?M78&Zia4KQ3zqq+Pj;>`%PrE_r0-9Qo?a#7Zbz#iGI7K<(@k^|i4QJ1H
z4jx?{rZbgV!me2VT72@n<DR5mdN;#-C(eB6{T-1WCMC<4OG#$>BjucoT<x)|o8t&d
zcz=#pXpp<Y6uDD$*V387M|STow%*8!)gvQM!5ojXJnYQsrshiZijh#8qBZXPD|nB>
zUM9;Y%TCoDop<GM?%qaP$qD5N_Re&x#fQeb`~mmirR*mz_8isV?5XN|lxXW*GxnA&
zqsd>?Q5fEQ35bCYk7!;gH*;t9t-QHLXGmUF;|vm365<zVCrfXPo#;){ym}VQ_ne6P
z!(%<fPO&{N)}Gkkd3S$5{D%<)xgUX}Egyy6<A)LM2E@O{a2F|=%ja^_%j2M#nVpYQ
z+Vn8PewW=9ex!-s%zI(~4dD%n1{+wKXJGwACYXJl_&|&PO&v1w1{IxqSjzH=O`!a0
z5uLkNYxP09lfjZM9-3XAXLL^%{CG2G^qD8VIQJT6@woCmj1pDW{O5QmD{ub{Aim!S
zn{UQG3M0t%#80q7^iVb`W7wUM)To100*n8PpM~ji<yC~2IwTb__!9_^>#X)6b2<By
zsr~`(aBfe%efKJJR45%#bJrSl;-dx20E32$(x^6gOAVg&3g6`rfg4?vYT5$B3KPW4
zR@y2a@?kp2S0H8-qBmQlH&;6+BIP#!%KAya@JVOY!KKN){N`mS*zmNqmHEMR@TXC!
zhcA$PyEZicF>Njsyf1h9JW#x$;@x5Nx2$K$Z-O3txa%;OEbOn6xBzd4n4v)Va=sj5
z%rb#j7{_??Tjb8(Hac<^&s^V{yO-BL*uSUk2;X4xt%NC8SjO-3?;Lzld{gM5A=9AV
z)DBu-Z8rRvXXwSVDH|dL-3FODWhfe1C_iF``F05e{dl(MmS|W%k-j)!7(ARkV?6r~
zF=o42y+VapxdZn;GnzZfGu<6oG-gQ7j7Zvgo7Am@jYxC2FpS@I;Jb%EyaJDBQC(q%
zKlZ}TVu!>;i3t~OAgl@QYy1X|T~D{HOyaS*Bh}A}S#a9MYS{XV{R-|niEB*W%GPW!
zP^NU(L<}>Uab<;)#H)rYbnqt|dOK(-DCnY==%d~y(1*{D{Eo1cqIV8*iMfx&J*%yh
zx=+WHjt0q2m*pLx8=--U<Z87HfG;q}m>qfM6ZWjkev>W-*}_*$Y(bikH`#-Gn#!6_
zIA&kxn;XYI;eN9yvqztK-a113A%97in5CL5Z&#VsQ4=fyf&3MeKu70)(x^z_uw*RG
zo2Pv&+81u*DjMO6>Mrr7vKE2CONqR6C0(*;@4FBM;jPIiuTuhQ-0&C)JIzo_k>TaS
zN_hB;_G=JJJvGGpB?uGgSeKaix~AkNtYky4P7GDTW6{rW{}V9K)Cn^vBYKe*OmP!;
zohJs=l-0sv5&p<L!P8aAhZ$ViHW~K#|M7K>L6-bowk~(swtdRBZQHh8)m^r2+qTtZ
zt4m$B?OQYNyf<S0cjiW%jPp4ocVzDU+iN|mA64$QnCRX3c5pg1#I)OdNDpa)HtXcw
znS3MtA?j8rhi-3|Locu;@KXBA={WJ{lWM@;qi^|k4d=wZbBn}Q)l=zT(OGe|_o;CO
ziN`_dE+z*6Zl6pK%FbeS8#lFna!rG6w2@{OT7y$1;)CKbPy6)aPZ(-qT1;zMcLvBi
z9RxxN#TW55YCB1_U7%BGo@JJx^`VOeiY`Vr8$|ccM-ilzFdc~nYS+WJ)ii$)A*7+Q
zN_y1r@TZnl*uB$J6tDKRYLySLcU(ahq@Q$EoWpLzi!}*SMM~)}4Ayz}zY&Wi`h9#!
z&9oY2DPtdHFqYBFk2l(gA{>BA0E)g28a*{)a=%%f-?{F;++-Xs#5|7kSHTD*E9@$V
ztE%7zX4A(L`n)FY8Y4pOnKC|Pf)j$iR#yP;V0+|Hki+D;t4I4BjkfdYliK9Gf6RYw
z;3px$Ud5aTd`yq$N7*WOs!{X91hZZ;AJ9iQOH%p;v$R%OQum_h#rq9*{ve(++|24z
zh2P;{-Z?u#rOqd0)D^_Ponv(Y9KMB9#?}nJdUX&r_rxF0%3__#8~ZwsyrSPmtWY27
z-54ZquV2t_W!*+%uwC=h-&_q~&nQer0(FL74to%&t^byl^C?wTaZ-IS9OssaQFP)1
zAov0o{?IRAcCf+PjMWSdmP42gysh<IAjP3I4~XaCM5*E+%@4H^3M`6ye$$tP$WNbE
zbdn`)4v4TUCT*VNiX&D{_|KnFA~G{kE=ntpOsoNd$eKT1|78iI(^E{syjncr1LOg7
zvpOD8>|c9Ma&Q^?_+>>+-yrC8WR;*XmJ;>r9v*>=W}tgWG;WIt{~L8`gk8DP{dSdG
z4SDM7g5ahMHYHHk*|mh9{AKh-qW7X+GEQybJt9A@RV{gaHUAva+=lSroK^NUJYEiL
z?X6l9ABpd)9zzA^;FdZ$QQs#uD@hdcaN^;Q=AXlbHv511Me<Gn_mEdR&MLv`f?Kx%
z8r4<bviQ`;c8%82V_>ye`p>P4Y2nbl<QidqPDpe9A~^s`DTJhVk(6Y``I7s6)Uf8I
z)$kBCwQT*1X4n1zt#H4(j7MaFrUGFu3Oe@=ajNRN9Ue(NO3~8Zbcu3`OQey;tOFq)
z;kWaA7JY$F6d<n$zVRV0FWGDsVrWK8OU713_M!=l4OywWwXC>ED<i?mQmUeusywBn
zNXtr^%xvIn1M3zrm2h?T?3n_;CTQ@tsgJ7GBW2Zl9w{U92R%)EW#YjprYugOXEz#;
z)Ez=1KR_+sWJf1M8ko8ef2>EeZo}-$@g&L98Aih6tgLz--${eKTxymIipy0xSYgZZ
zq^yyS4<Tkg@?|;c$V~f<0k6LL2{(FY|1JSj8S@S!VF=edAL=G_+qo_9OeZ<iQZN90
zxqZ|^@d^`g3BJ>yNPTtPj-sM?R8@9Q1gtXPqv{$lb5i|C1yymwnGdfYV3nA-;5!Wl
zD0fayn!B^grdE?q^}ba{-LIv*Z}+hZm_F9c$$cW!bx2DgJD&6|bBIcL@=}kQA1^Eh
zXTEznqk)!!IcTl>ey?V;X8k<+C^DRA{F?T*j0wV`fflrLBQq!l7cbkAUE*6}WabyF
zgpb+|tv=aWg0i}9kBL8ZCObYqHEycr5<J4qyW|o@#4QxtPb0tj1I7virQLPL&}gD@
zWjo9xh~qO(Y0IO<4tNTVXq#ofI9{0jiG){*U=jU%>tpc-$|vdvaBsu#lXD@u_e1iL
z{h>xMRS0a7KvW?VttrJFpX^5DC4Bv4cp6gNG6#8)7r7IxXfSNSp6)_6tZ4l>(D+0I
zPhU)N!sKywaBusHdVE!yo5$20JAU8V_X<uu|HFmVS7PN?;)jmliX-5g<9aNnC&_+8
z-H|>cW{QmO!p<W)v=kYJ37)j)g374|egJcV6PD)VfLvm4bO_Afd90nM0aO!mY&r=|
zH0q8BQ`<MnSES{IMkD&HI#0sb$cxN8L2}my{Ib`%4}@To>*~ns8{2~bhjydnmA&=r
zX9NSM9QYogYMDZ~kS#Qx`mt>AmeR3p@K$`fbJ%LQ1c5lEOz<%BS<}2DL+$>MFcE%e
zlxC)heZ7#i80u?32eOJI9oQRz0z;JW@7Th4q}YmQ-`Z?@y3ia^_)7f37QMwDw~<-@
zT)B6fftmK_6YS!?{uaj5lLxyR++u*ZY2Mphm5cd7PA5=%rd)95hJ9+aGSNfjy>Ylc
zoI0nGIT3sKmwX8h=6CbvhVO+ehFIR155h8iRu<x!^Z2M1Pzq+-oyvlRxQ>XZx^<Tr
z@8Tbpd#czm8-Yg}>cW>rq5K4z_dvM#hRER=WR@THs%WELI9uYK9HN44Em2$#@k)hD
zicqRPKV#yB;UlcsTL_}zCMK0T;eXHfu`y2(dfwm(v)IBbh|#R>`2cot{m7}8_X&oD
zr@94PkMCl%d3FsC4pil=#{3uv^+)pvxfwmPUr)T)T|GcZVD$wVj$mjkjDs`5cm8N!
zXVq2CvL;gWGpPI4;9j;2&hS*o+LNp&C5Ac=OXx*W5y6Z^az)^?G0)!_iAfjH5wiSE
zD(F}hQZB#tF5iEx@0sS+dP70DbZ*<=5X^)Pxo^8aKzOzuyc2rq=<0-k;Y_ID1>9^v
z+)nc36}?>jen*1%OX3R*KRASj${u$gZ$27Hpcj=95kK^aLzxhW6jj_$w6}%#1*$5D
zG1H_vYFrCSwrRqYw*9<}OYAOQT)u%9lC`$IjZV<4`9Sc;j{Qv_6+uHrYifK&On<JP
zpp<X22(sjxoU&97`N=lyhUxuG!%J2u>4V_7yMil!0Yv55z@dFyD{U@Sy>|vTX=P_(
zRm<2xj*Z}B30VAu@0e+}at*y?wXTz|rPalwo?4ZZc>hS0Ky6<x)^TtrxYs71dY<}C
zJ7~9+X<qB9Zm?iEJZ{MZLP-V?O@>~mi@kv#?xP2a;yt?5=(-CqvP_3&$KdjB7Ku;#
z`GLE*jW1QJB5d&E?IJO?1+!Q8HQMGvv^RuFoi=mM4+^tOqvX%X&viB%Ko2o-v4~~J
z267ui;gsW?J=qS=D*@*xJvAy3IOop5bEvfR4MZC>9Y4Z$rGI|EHNNZ7KX;Ix{xSvm
z-)Cau-xuTm|7`4kUdXvd_d^E=po(76ELfq5OgxIt3aqDy#zBfIy-5<3gpn{Ce`-ha
z<;6y@{Bgqw?c~h*&j{FozQCh=`Lv-5Iw!KdSt;%GDOq%=(V!dJ-}|}|0o5G2kJj6{
z`jCSPs$9Fe8O(+qALZiJ$WtR=<@GvsdM)IJ`7XrBfW0iyYE#Vy^e@zb<IIW7E)E^$
zm?~*Pm)RIxAq=^<S?g8*w}0T;h&X*9TfW7JL9qW1?e*VsCQ%P#8&~J=^eZt-8&g4J
z<L@1$tf8Hu`M+0?$?EIQIO<qmc$)KnDqVdnE7YcB<+P}|>ysg*B5Z_kSL6<)vqoaH
zQ{!9!*{e9UZo^h+qZ`T@LfVwAEwc&+9{C8c%oj41q#hyn<&zA9IIur~V|{mmu`n5W
z8)-Ou$YgjQ*PMIqHhZ_9E?(uoK0XM5aQkarcp}WT^7b^FC#^i>#8LGZ9puDuXUYas
z7caX)V5U6uY-L5Wl%)j$qRkR;7@3T<EihbM1}BSdl7mLfHh7Z5IU<tc_%R)hu1Pls
zW*$=d#aMnI^7$3UsHv{BJ5sQxr58gtU@13faQaKvtp1NTWBK(kBri8RFv{lQVz)EU
zE;0H{^qHFLE{ETvnK|d(2S~MWjq;7`XfESL1**kOb%IOfr--P)KDb+w?)o%$&plmc
z3-QPg+R@uss3E2opQk7Rm)`)TI@=AW{c<ZyIj@DoEI=}EtHB@U67zEBY|IA?TC1^`
z&MhCeE#}CUNjguncG~Xq>*N64YK_!`Fw=>CAwe~2loI1<>DZW&sb7Q)X;6E08&$h!
z2=c1i4UOO{R4TmkTz+o9n`}+%d%blR6P;5{`qjtxlN$~I%tMMDCY`~e{+mRF!rj5(
z3ywv)P_PUUqREu)TioPkg&5RKjY6z%pRxQPQ{#GNMTPag^S8(8l{!{WGNs2U1JA-O
zq02VeYcArhTAS;v3);k(&<OjocC=$o?TRU(R~HX`_by+I$w5@xw6t<*2LdvKE37`k
zgY2w6(gNl$CTp!>6ayCH8SXN@r;1NQeJ*y^NHM+zOd;?t&c!Hq^SR_w6twGV8dl>j
zjS+Zc&Yp7cYj&c1y3IxQ%*kWiYypvoh(k8g`HrY<_Bi-r%m-@SLfy-6mobxkWHxyS
z>TtM2M4;Uqqy|+8Q++VcEq$PwomV1D4UzNA*Tgkg9#Gpz#~&iPf|Czx!J?qss?e|3
z4gTua75-P{2X7w9eeK3~GE0ip-D;%%gTi)8bR~Ez@)$gpuS~jZs`CrO5SR-Xy7bkA
z89fr~mY}u4A$|r1$fe-;T{yJh#9Ime1iRu8eo?uY9@yqAU3P!rx~SsP;LT<Jbf>BL
ze<j@!$|69+G^FV<0dmKnWNMprxNJU~t{`&uDIb};O#gD#SUtD<w>oMK(!;(Zt8313
z3)V)q_%eflKW?BnMZa}6E0c7t!$-mC$<TXTDwQQ@WJ4kOaQ${ot9q1qI<zc^KS<Kt
zJ(!kxatq|HncYDRPoG>qt44OME5F(6B$E8w*TUN-h}0dOiXI+TH<trrR;qgADWj3>
zYFrr&k1(yO(|J0vP|{22@Z}bxm@7BkjO)f)&^fv|?_<v?bGp^(v{LHw7E&dh_!6#a
zLp5=pJXzMz!=2cx?pBZ$`*>JX+s)1*|7X7HH(W?b3QZ3!V|~m?8}uJsF>NvE4@fik
zjyyh+U*tt`g6v>k9ub88a;ySvS1QawGn7}aaR**$rJA=a<ruy*aA7&R1cdXAZ=fvQ
z7?AwvVWRDBj+?RQxP9<Eld<T8co91b&oa-&h-paua##@#UmSeWbQ$6ASd2{|yWwae
z<_OD(+JZih5G;0?))pr+4(0uA{>#eUT~ngUbJ%V=qsFIekLbv!YkqjTG{<Sx6K-xw
zVH;1ZChlA4?P<S<vBp1muSlGxcq+nmq$>_$F;$w19$(ivIs*1>?2ka%uMOx@B9`LD
zhm~)z@u4x*zcM1WhiX)!U{qOjJHt1xs{G1S?rYe)L)ntUu^-(o_dfqZu)}W(X%Uu|
zN*qI@&R2fB#Jh|Mi+eMrZDtbNvYD3|v0Kx>E#Ss;Be*T$@DC!2A|mb%d}TTN3J+c=
zu@1gTOXFYy972S+=C;#~)Z{Swr0VI5&}WYzH22un_Yg5o%f9fvV(`6!{C<(Zi<Hd)
zf?9YZqa5KsuLo~(-?`o~M(QFQk@|~fIjZ4c7cvux!@E|473(pKcY&_>gQ2`wso)cj
z9O12k)15^Wuv#rHpe*k5#4<VO!y+MK+RjQ{k<R&Ijfdv^PCr2`Wq*gcd9n6M$i7GS
zWD{0IJi~-slkyvdQrT5W#wgs9QYp`V2JT@Oyl*x}WLwPT{TMA3DhMeG;UOsO>vb%c
znP+Gjr<-p%01d<+^yrSoG?}F=eI8X;?=Fo2a~HUiJ>L!oE#9tXRp!adg-b9D;(6$E
zeW0tH$US04zTX$OxM&X+2ip>KdFM?iG_fgOD-qB|uFng8*#<c|@^p^*czNe~u#Nhe
zA)gEd7Y`NP(8Yn{!E*NxRd3vR5UuC8pCja3oAbZOImMj}O}<yG-*N8}_O_-n_V(7U
z|0U0lR$iA||BgL@A$5!LUrdsQMwOx>Z5jgqGY=zLU?4!OlO#~YBTB9b9#~H@nqQ#5
z6bV));d?IJTVBC+79>rGuy1JgxPLy$dA7;_^^L)02m}XLjFR*qH`eI~+eJo(7D`LH
z(W%lGnGK+Vk_3kyF*zpgO=1MxMg?hxe3}}YI<hw>>dVs8l}5eWjYu4=w6MWK09+05
zGdpa#$awd>Q<Pu(7+f+_x8>|@aZa*z{5F3xy3n@E4YT9%TmMo0jxW59p0bI?&S}M+
z&^NG%rf7h*m9~p#b19|`wO5OMY-=^XT+=yrfGNpl<&~~FGsx_<SH(o8TA?{1o1y)q
z^L3tn!1Q##WYDg?vz6gJq+H{z0Z6=`Rsx+yjHa+c2dL}U+sI|bMA@UmvrjrPhz-y{
zc=i~q1XE+Ro}#t=Wg5zemW=SD_L>`IaFn+sEgF$hgOa~oAVAiu^a$jHcqkE=dj`ze
z=axsfrzzh6VGD0x#6Ff=t%+VTiq!n6^gv*uIUD<9fOhvR;al5kcY${uunn}-!74<7
zmP^3cl-kyN(QY!!Z-^PY-OUkh=3ZWk6>le$_Q&xk4cgH{?i)C%2RM@pX5Q{jdSlo!
zVau5v44cQX5|zQlQDt;dCg)oM0B<=P1CR!W%!^m$!{pKx;bn9DePJjWBX)q!`$;0K
zqJIIyD#aK;#-3&Nf=&IhtbV|?ZGYHSphp~6th`p2<qF+^4BzD@E~uh`pn_7wEi&g3
z=?JBYF~BWU4<wU8Cij8+F{u4npgj-<kzS>rkw&((%kBV7<{siEOU7AxJj+FuRdDu$
zcmTW8usU_u!r<xT=YN-SyzXKiR(!Xt>)#jg|J=Gt{##7;uf4A5cdt6Y02}f(d2)z~
z)CH~gVAOwBLk$ZiIOn}NzDjvfw(w$u|BdCBI#)3xB-Ot?nz?iR38ayCm48M=_#9r7
zw8%pwQ<9mb&#7Es5~_>pN3~#+Er~Q86J+2TDXM6umCbukd-X6pRIr5tF?VauT8jW>
zY^#)log>jtJs2s3xoiPB7~8#1ZMv>Zx0}H58k-@H2huNyw~wsl0B8j)H5)H9c7y&i
zp8^0;rKbxC1eEZ-#Qxvz)Xv$((8lK9I>BspPajluysw^f#t9P;OUis43mmEzX+lk*
zc4T-Ms9_687GR+~QS#0~vxK#DSGN=a-m(@eZTqw2<+lN9>R~gK2)3;sT4%nI%Y|0m
zX9SPR!>?~s=j5H4WMqeTW8QaLZ=1bWS5I3xZ&$(ypc=tHrv+hX@s)VG(tc!yvLM7n
zshN=C#v={X1r;)xn0Pow_1eMhkn!{;x$BJ#PIz)m585&%cmzk;btQzZAN_^zis;n?
z?6I~bN?s;7vg_dtoTc4A5Ow*Rb}No#UYl)sN|RmoYo}k^cKLXd8F`44?RrokkPvN5
ztUrx;U~B;jbE_qGd3n0j2i}A{enJvJ?gSF~NQj~EP5vM-w4@;QQ5n(Npic}XNW6B0
zq9F4T%6kp7qGhd0vpQc<W<L!fXJ~a+;4Khyr5Qhi14))aSy_<lw1b(PskQ0m-#boe
zA7vv?mzfH`Jh>z+nMk8GOAmbz8Bt4@GtewGr6_>Xj>ge)SyfY}nu>Y!a@HoIx(StD
zx`!>RT&}tpBL%nOF%7XIFW?n1AP*xthCMzhrU6G!U6?m4!CPWTvn#Yaoi_95CT2!L
z|B=5zeRW30&ANGN>J9#GtCm&3SF6n4TqDz<-{@ZXkrkRDCpV$DwCtI^e&3i1A{A<x
z;2|tq%BrQu8b~3XIcCW(SwO2Qo{~(iKF8b80t{dy-ASxDFVBu71<-fKB?XPiF|me|
z=x6N^A6xeq&BtV~$BZ<o(2Y7NHHWgSlhiV?0&?tHLu3b)_J-PW>r&JZtS^c+lyPa6
z%JJr42S_;eFC<HyN&ZMSk+!vPxQr^jTrZ{0+R?&~n(bDfIxeox!m}PUNIWM6DI?<(
zT2si%OLG7mJo(b>#M~bdtQePhOU32WDiZ4@H&af)z#$Y|hnQNb)8(3?1Ad>5uaZ1z
zU~!jt3XUI@gpWb8tWTyH7DGvKvzYfqNIy3P{9vpwz_C-QL&`+8Io$F5PS-@YQJoEO
z17D9P(+sXajWSH_8&C?fn>rTLX+(?KiwX#JNV)xE0!Q@>Tid$V2#r4y6fkph?YZ>^
z(o^<V`ne&X_HQL}Ps!gij?%w4&m}?Ps6H^U)X!|>q(0*P->3?I0cELXJn(N|#qTm6
zAPIL~n)m!50;*?5=MOOc<ZEVd{!x0=tWkQjcj#EEXI8($zpYhY?h=S*e^`Z`)3UF{
zky_7<Nsk@h^#%w~-;v}gpHV)m{?b3wAf*D66ID!&W8QczIGr*dR(n<CK$mURTOiAV
z<lD*0YMaqWe&BGwyT1$fC#E5mWk%?^kGR|yu~8)%i_)F%6Vm6DYe;%inSs@0A+dn0
z=o*C|Cgxb{F1AEY_-9NniiLigsT<CHl5`@W3sl@4i-Z28RhP$TcY**+xoy|*Iji|!
zh&M<pkuw^lO>4Wk;w(0c$(!e?vpV23S|n|Y7?nyc<krXgvoM8Y4s4-xP^eZOrQh6(
zbL?h7r&v>8)fD8t-KI&nTklH&BzqQ}D(1gH3P+5zGUzIjT~x`;e8JH=86&5&l-DP%
z)F+Et(h|GJ?rMy-Zrf>Rv@<3^OrCJ1xv_N*_@-K5=)-jP(}h1Rts44H&ou8!G_C1E
zhTfUDASJ2vu!4@j58{NN;78i?6__xR75QEDC4JN{>RmgcNrn-EOpEOcyR<8FS@RB@
zH!R7J=`<qyvO5jTK-`}T1}ITNlGB)M;WAqsA4^>KK^u06eeI|X@}KvQmdKE3AmAy8
zM4IIvde#e4O(iwag<LKgGj#`eK5h`_DRA^{i>`UL5yQo>6&7^=D4yE-Eo9$9R2hR}
zn;Z9i-d=R-xZl4@?s%8|m1M`$J6lW1r0Y)+8q$}Vn4qyR1jqTjGH;@Z!2KiGun2~x
zaiEfzVT<|_b6t}~XPeflAm8hvCHP3Bp*tl{^y_e{Jsn@<QpTRxy~I48d!aMjkL30E
zCwGqg2Ht%$0a~0zPmAFTrO04}q6!O3%)kobW9+~-B779_EFydi@hStv32;GGAB+Vo
zGQY$EjAd0ZZ^AD*7vM__>w+KP{7}bH_s=1S2E1sj=18a39*Ag~lbkT^_OQuYQey=b
zW^{0xlQ@O$^cSxUZ8l(Mspg8z0cL*?yH4;X2}TdN)uN31A%$3$a=4;{S@h#Y(~i%)
zc=K7Ggl=<xZMTLme>&2hYVic*W65gpSPE70pU;FN@3k?BYdNDKv6wlsBAF^);qiqI
zhklsX4TaWiC%VbnZ|yqL+Pcc;(#&E*{+Rx&<&R{uTYCn^OD|mAk4%Q7gbbgMnZwE{
zy7QMK<srwzjF^HmPE;6uLX+TQVJBikFu1hk1`NI#LP|tjvdEkWrdIO=;M;EM96tck
zqH2Rg)#aB!i2Hker_h78G^ozmPAa8sdEWhkLrs})dH+^%<;*UJE3(=5-E|mqSymt{
zkeEv8zHsZx=**5b-w}p5Xd7L~o?@ppl%Y9RVO`!rYId5z?Jvj9nVZn6<VMiK@kpV_
z1E$*oN*ji}VXj6PUp@ZYuo^Dnx<e#Km@qL^G)wt_SZ^Bvqa(cI4J2>%jIjU@ye?0;
z;0--&xVeD}m_hq9A8a}c9WkI2YKj8t!Mkk!o%AQ?<GgxY5guXo8{}TlwGN)h5Xy0(
zvcI7t!O|M=E-&3>|CCBL9}n570}OmZ(w)YI6#QS&p<={tcek*D{CPR%eVA1WBGUXf
z%gO2vL7iVDr1$!LAW)1@H>GoIl=&yyZ7=*9;wrOYQ}O}u>h}4FWL?N2ivURlUi11-
zl{G0fo`9?$iAEN<4kxa#9e0SZPqa{pw?K=tdN5tRc7HDX-~Ta6_+#<kdw-7-Sl_2=
z|H~-xohbjG&B=fL3tN~PTmP#gOHTUFDEW|W%U0cvO`+=TXVqc}ZD?)i48&nf$uM$J
zdaI1Tn{}|JhL&S?m7gT`ZL=Z;b3@Yf?}{VLjq3<fa4fPjlWW;eoL6h<o8Q?<?;r~O
z#-NU<rfKpDlw);-3!-?YoOD<cc?HJl{T3cRqiFQnp#g>s9W&d`6PB7dF*G@|!Mc}i
zc=9&T+edI(@la}QU2An#wlkJ&7RmTEMhyC_A8hWM54?s1WldCFuBmT5*I3K9=1aj=
z6V@93P-lUou`xmB!ATp0(We$?)p*oQs;(Kku15~q9`-LSl{(Efm&@%(zj?aK2;5}P
z{6<@-3^k^5FCDT@Z%XABEcuPoumYkiD&)-8z2Q}HO9OVEU3WM;V^$5r4q>h^m73XF
z5!hZ7SCjfxDcXyj(({vg8FU(m2_}36L_yR>fnW)u=`1t@mPa76`2@%8v@2@$N@TE`
z)kYhGY1jD;B9V=Dv1>BZhR9IJmB?X9Wj99f@MvJ2F<eY`A?(Jl!-zJY9?iV<S8YR1
zzKj>im*R`rsRilvz_3n!nPFLmj({EP!@CGkY5R*Y_dSO{qto~WerlG}DMw9k+n}pk
z*nL~7R2gB{_9=zpqX|*vkU-dx)(j+83uvYGP?K{hr*j2pQsfXn<_As6z%-z+wFLqI
zMhTkG>2M}#BLIOZ(ya1y8#W<+uUo@(43=^4@?CX{-hAuaJki(_A(uXD(>`lzu<hcX
zu<`rODLH+-71-BRaTp})^?Ug_ji6bWm(uXz1O|suX_K)0b#uG8X5wLm7%2Sb7ascW
zc=2~bRAf14wvTyf*%a`PoV7;4md$VXW5kfQ|I7t7mp0vAMFj%-`CY<<|I0A(uPXjm
z;Z|$@heULVpQ5pA?0OXhIAlr@%7pBE0xX{h3@YSTP_chU7b*SNZ(7GgIMVq)5zF1p
z)y;tA%@&vX>M~M;3XA48ZEN@HRV{1nvt?CV)t;|*dow0Ue2`B*iA&!rI`fZQ=b28=
z_dxF}iUQ8}nq0SA4NK@^EQ%=)OY;3fC<$goJ&Kp|APQ@qVbS-<AMg7|<xK7gEQ0*G
zlcf^Q6}hF3@wqieC-alDZL9Le?IO#mRyv1!PW+owXxKCN3nDf53%oqiVrCNyxSko6
zH$42{o(;K2cOd*r*Fv7Uq*F$gLW9SI>MtJQBc)^aO8mYFsbhafeRKdHPW&s^&;%>v
zlTz`YE}CuQ@_X&mqm{+{!h2r)fPGeM_Ge4RRYQkrma`&G<>RW<>S(?#LJ}O-t)d$<
zf}b0svP^Zu@)MqwEV<VUFg__G=GHzjJUM5j%&XT6R(8v6!}8X_uU2*s^;Gn>^Fb_j
zPYYs~vmEC~cOIE6Nc^@b@nyL!w<ZLmMX}N-x6Tx~S9?LZi8cq$5v`F@+&&v*zO9fh
z{v+HUi$rP{f92r|TVIstb;@o^KTr>5o?nQ!$mGq(Pa|1-MD}K0si<&}eag=}WLSDO
z<gdc$xr#hPYiFOOqHB%j&x|A|!bGgNCR1!rS<T3;h{c#J$<sk-tkl))tF|4cBRWRl
z&dyToHxyc1cCuWTaMT#l7IV#Q*r`dxs=6EIq=JkuRAmOOcZKN9Y?+9u7Dm;XJxOjJ
z-I)7X%K36EYHj2(tC1R=#0QSgSx}N6tdO~Vt8eh?B{sf&$)`<qcA{Q-Z7$eq;;bT3
zY~n$;RB|}W2Q~dA;b!X6q{*=M?CK#TX0Fna=`uBpMj;8+^Wj1litN9#+$A~CTT+;^
zb>E4+eA~!J(K}605<AJateB#!5Jo3MRGQXgY#11*@WWa$<7LH&X|GNMTbGbRj>x&4
zT72P7J^)Y)b(3g2MZ@1bv%o1ggwU4Yb!DhQ=uu-;vX+Ix8>#y6wgNKuobvrPNx?$3
zI{BbX<=Y-cBtvY&#MpGTgOLYU4W+csqWZx!=AVMb)Z;8%#1*x_(-)teF>45TCRwi1
z)N<HNFgUCSJViO;(JJ)Kbs4vjFO%F?kvSN-O|_NwW(EOiHj<(STe$x6RQM9bLsVXv
zyH0p@OIcRdC>n>hy3_lo44n-4A@=L2gI$yXCK0lPmMuldhLxR8aI;VrHIS{Dk}yp=
zwjhB6v@0DN=Hnm~3t>`CtnPzvA*Kumfn5OLg&-m&fO<k$Ar7F>bRD};c}Hf?n&mS<
z%$wztc%kjWjCf-?+q(bZh9k~(gs?i4`XVfqMXvPVkUWfm4+EBF(nOkg!}4u)6I)JT
zU6IXqQk?p1a2(bz^S;6ZH3Wy9!JvbiSr7%c$#G1eK2^=~z1WX+VW)CPD#G~)13~pX
zErO(>x$J_4qu-)lNlZkLj2}y$OiKn0ad5Imu5p-2dnt<E$QZc-BKsz(vO|0}pqQi;
zUZ-Nt*kB&hE*49T8u+j=M$kHp6)365a>)(YI|b7rJ3TBUQ8FB8=&ym50*ibd2NAbj
z;JA&hJ$AJlldM+tO;Yl3rBOFiP8fDdF?t(`gkRpmT9inR@uX{bThYNmxx-LN5K8h0
ztS%w*;V%b`%;-NARbNXn9he&AO4$rvmkB#;aaOx?Wk|yBCmN{oMTK&E)`s&APR<-5
z#;_e75z;LJ)gBG~h<^`SGmw<$Z3p`KG|I@7Pd)sTJnouZ1hRvm3}V+#lPGk4b&A#Y
z4VSNi8(R1z7-t=L^%;*;iMTIAjrXl;h106hFrR{n9o8vlz?+*a1P{rEZ2ie{luQs}
zr6t746>eoqiO5)^y;4H%2<BkZi5tt<3x!UQt98zj1W<8j93$uGFF$h$bdznZWhb7b
znLTQgvx9Qcm<Xepxl=K85buKY=Ib!qE>~&FT*Qc*9_oC2$+&syHWsA=rn3B~4#QEW
zf4GT3i_@)f(Fj}gAZj`7205M8!B&HhmbgyZB<D9PSg2+}Rs%jVF~$y=V~y{^%}%>&
z+COyAVNxql#DwfP;H48Yc+Y~ChV6b9auLnfXXvpjr<~lQ@>VbCpQvWz=lyVf1??_c
zAo3C^otZD@(v?X)UX*@w?TF|F8KF>l7%!<kbph8cUodrPAJJd%WY@2~TX}(qwom%@
z@ARbG&%LPifU_Ql=J~cDcFG>Dzu+hksSA^akEkx8QD(V(lK+HBCw6C}2onVExW)f$
zncm*HI(_H;jF@)6eu}Tln!t?ynRkcqBA5MitIM@L^(4_Ke}vy7c%<hQf3mTV+||FK
zM8Z)>$w{(`&7Rn=u>oDM+Z^RUYcbSOPwT(ONyq76R>$V6_M_UP4vs=__I#io{{((|
zy5=k=oVr-Qt$FImP~+&sN8rf2UH*vRMpwohPc@9?id17La4weIfBNa>1Djy+1=ugn
z@}Zs;eFY1OC}WBDxDF=i=On_33(jWE-QYV)HbQ^VM!n>Ci9_W0Zofz7!m>do@KH;S
z4k}FqEAU2)b%B_B-QcPnM5Zh=dQ+4|DJoJwo?)f2nWBuZE@^>a<zU@xT0d6IHav4c
zb~p!{)~4X`9H7f4Os$BBi<uW85TZB$IwVnnn`k+3Lfce&Rzjf31s|*fwe$YbK${pp
z*tbfAnkuI*vOT>(gP~ObzMuyNJTgJFUPcH`%9UFA(P23iaKgo0)CI!SZ>35LpFaD7
z)C2sW$ltSEYNW<tWp;)M)gi8^dT+jcDl%}Kf?9QFd|xmfdxyfsPbDwk@9&~vG_Z{u
zQ@p1E$rDYzYk{^3<YL}K%>%%j<B%d>8F;yK{iHI2Q^}coF@LX`=EvxZb*_O;2Z0Z5
z<t@FVe@+!TR-b?O`lYlsu6VQ^Cc0rHAKtKSmI7A=<mxAvBKvVotgv_F`ia+@cV{@3
zy%&0z)&wPGy<09(8G)NL7S=D5jeCAhpA=|&BSJ~}awHo4v-XZ)h*67&lQ|?paWB>7
zlccxmCfCI;_^awp|G748%Wx%?t9Sh8!V9Y(9$B?9R`G)Nd&snX1j+VpuQ@GGk=y(W
zK|<$O`Cad`Y4#W3GKXgs%lZduAd1t1<7LwG4*zaStE*S)XXPFDyKdgiaVXG2)LvDn
zf}eQ_S(&2!H0Mq1Yt&WpM1!7b#yt_ie7naOfX129_E=)beKj|p1VW9q>>+e$3@G$K
zrB%i_TT1DHjOf7IQ8)Wu4#K%ZSCDGMP7Ab|Kvjq7*~@ewPm~h_-8d4jmNH<pfqQ|I
z!YTVc{?ZH@BD}h%vf=bWfAP7V&Rf=bOq^~NLhGU}*|~<aTkKW3_RmeG><&mNZC@CI
zKxG5O08|@<4(6IEC@L-lcrrvix&_Dj4tBvl=8A}2UX|)~v#V$L22U}UHk`B-1MF(t
zU6aVJWR!>Y0@4m0UA%Sq9B5;4hZvsOu=>L`IU4#3r_t}os|vSDVMA??h>QJ1FD1vR
z*@rclvfD!Iqoxh>VP+?b9TVH8g@KjYR@rRWQy44A`f6doIi+8VTP~pa%`(Oa@5?=h
z8><Is*|k4Wm^S61QF)a<b`%iwYpxvvT(i)Wl=h}ig6i!wS_O7k(5TrzzI?is`$I8d
z$z1Mr-D&oAZ)MmzC$>YxNvA##a3D0)^P|2|+0~f|UsAJV=q(S>eq-dehQ+T>*Q@qN
zU8@kdpU5gGk%ozt?%c8oM6neA?GuSsOfU_b1U)uiEP8eRn~>M$p*R<ZDjnI@9&_4j
zI`4*Q2=nj*9uzH;Gu_8WE&$sDhr9nJLFhU9Bv)!XWvooTphZtN9KcCLiqNi+h}ur>
z43n<hxuc>SZs@^<WV-bOALh{_dBfKfn*4#)TgN}6y#WUIp+l&~VD|#ldfZNBNs;@m
zS{mb4W+67xR5c{QS7@T2*gXOVr}5|HczT)AS`}XpsO4tdd+JVn=SX}g{arjc7QkFk
zHZ<NsBq&W{nHqZoNtG1Ute+=NE{|iy5|n;P%nfsl^(IIYhq3S)UIQ*NU03bZwJx*4
zQzUTd9A|99S!YfiJ_-wo3J!<F$&{VivMD`XXm0Bu+OE<559mi7u2Y~|x^)>ahO78s
zulbK@@<h3kY!x99eCXNI6Xqcoq^(;E47A_F;5jh+=)w=Fa|ac@0W~805Z1K?m2-aZ
z_PM~|?5~!^-AVd?#6L>{3=2=@^yZ)DuIC$ki;`2WNbD_#`LOHN9iMsrgzt-T<8aeh
z(oXrqI$Kgt6)Icu=?11NWs>{)_ed1wh>)wv6RYNUA-C&bejw{cBE_5Wzeo!AHdTd+
z)d(_I<lp0C`-jdEx%X`fgA>KN7z^n|As~3XS=cCB_TgM7rK;X586re`{~Foml$aKs
zb!4Pe7hEP|370EWwn$HKPM!kL94UPZ1%8B^e5fB+=Iw^6=?5n3tZGYjo<LZzL3wRS
zup2H>v83CLB&OQ++p)WCMeshCv_9-~G9C_2x`LxTDjUcW$l6e!6-&a^fM3oP9*g(H
zmCk0nGt1UMdU#pfg1G0um5|sc|KO<+qU1E4iBF~RvN*+`7uNHH^gu{?nw2DSCjig%
zI@ymKZSK=PhHJa(jW&xeApv&JcfSmNJ4uQ|pY=Lcc>=J|{>5Ug3@x#R_b@55xFgfs
za^ANzWdD$Z<U}6PgaA%eY(CW;x5+F+yl^XP2Bql$&W8EBo9%+^n_xCuT9!pO)T7IA
zIK0{%X*E|HV2tzk&y<5TGwwQ6n=7aT2C$X7!8!IrZW$aoAn)WJ?v*?W1!&5C4nM5{
zWoA1hpY;z2qVJE!-Hx+{n)a9;7-5nsfdg-s(1Z`ASH2G*CidBrdtn8~z&E9i#K(Xw
z-Bsq;CKAH4C5uwAJ=PBGLT`;i-yr*%avIjt8()FKn;ONq?ZOl6r7r2gA8id7aZR8H
zkQQDdpGqFH3kr_E%owg2TJlzX36fdb$8nyNPyDDmQJ4>YtFs$d7+oiw0ZmPk2&l|<
z<x&&$7ib2ej}4u3C&TVWo+QOSY8`)=TKM3B15YRkG(_~kSKH?`|JrQ_+F_N_Co^0&
zvxP3H%7O1|@yv6g+m!aLTRW+Hk7YP3d1I)hnHb;rNJCkVCSCDHT|E9f^kjiuB~JVl
zc*5a}8#TnsiWXYd(bScC7_@<goaS6xy4H8xH3fdhTCApNoQMMogPqBP7A@OXQHFJU
zKQ~bFt27lIZzEGQyZYoJ?l_YLwhR*{7Mi?dFxPpGzM#{R^MO(}HQ<Ao@MM(QAFeR?
z9x;dXWYMI#Ha}F=D2W1Up6B5n1#Qy3d~xgxv|q=apg?>c8()w<zOy41on%=kA*#Y{
z0og?wJMUow+HvOt<{XjsenX5x`gy8e_^N5MDD_7ZXcJ59c^tP6-)iv>fiJx@EGpQT
zG$8iLkQ<Bz!QU<f11CFG(&h^m;C^s4M{|Yun5e%@G)2|F({Tpn9PRX$iywb~U?K%i
z{B{K^m!1e36pY3nMHm!O2H&bV2Sex2PdH9|_KnDCF$RLTr=BAiFs!#>Z-086doF1R
zh<#9cz_vRsJdoXbD=QgOtpm}cFAJX8c}<S)cIn9ORwwc%xm&y_N%n2(D36`CNO*eH
z(^`;*BQm*bu6y8Gon03;XAAZTweS(3(Xbbn=v!G8j?Ron8y>>Jew;PQJSXSb^;wlC
zxXLHTS|!GZ-VK_4wV<K&EBIT5&!ue;RuejXlJEQ^lqpnHHDOtJS}S^5XV?}zlJASU
z><9bk4RUmlsByzW_^b>)$6R+jQ}^wco1nMA`9Lncs;&QGp!`5Tx#aXXU?}5_RrtUY
zx(EMzDhl-a^y^f5yfFLMnOO#u)l69&4M?|ne|2EV><q9R0Y~+Z3w;m(5m%re_$$7`
z<Gg)eKU@b_PL8s{Ps&LDP!)zk2(edhJ^yaR@*8)}x|M_(cQ7AcEP}mKvBCrF?z}lG
zILn}|!g5R$!Zv4&c-lW<WSOBq1Rog|>zQ}4JQCBel?~2I4?D|>L$%H(peOOII!U}i
z-j)*h1rODe9{0`xmhG;`AKqw1p0_KhEIU8)DoGnEn9wAhXPaxO_(jNSij~J5m$P*$
z9Mt(t;eV}2+i|kjQpBFcNb7_(VbuF<;RQB~R~p>2*Lg>a&7DEEuq*I%Ls4{zHeUDq
z+M0&YhEn^C*9-B4Q7HJ$xj)dORCXPK+)ZtLOa0o&)Sl+f(Y{p*68$-#yagW5^HQnQ
z0pWpo<wx7z5zDoIkHG$ymR~;3`&Y{tlF_(wP`;ZA^4@ca6I8^iUxaXXoVp%YygVuS
z^p979t3og#iZ#^h$Al&6@;J4M)6fgx>Qpxg8<&gx9im(>=x6v#&RbQ7^AsjxeSDA?
zi4MEJUC~ByG!P<Exv`*r7_Yizi*BaQOJ4i91z(1bzWdZ!B@*bOS>iBjq7$pK&FA^5
z=Y@dtQnuy%IfsaR`TVP0q^3mixl&J-3!$H!ua#{A>0Z1JdLq#d<JNUELP-R*m0VUZ
zr@z_%V#93^JIrjOP1jCie^|YWze;pwe3m=p#P06t-`lrQB|e;IfAz~b%CcG_;@uR_
ztzRt=M;G)xATi9qfu}c_vv`Fnklc3(zkC(*sFIq*hD94Z(S5M{ifn{2`diLfuuHXv
zFs-^dEr2|&Sc-TCQ~#w~b>4UV<w%Vzul~hYYNbR+N-v)`hnqLXgLN>9nlYm641ZHl
zH6mK~iI6lR3OUEVL}Z5{ONZ_6{Nk%Bv03ag<1HVN?R%w2^aR5@E>6(r>}IoMl$wRF
zWr-DItN*k7T$NTT8B)+23c?171sADhj<pTnb%>Inb2Xb>GhFYGC&3{b>huvLlaS4O
z^{j5q+b5H?Z)yuy%AByaVl2yj9cnalY1sM<gzM#36)4^l9)*NC=3hG!BRp6-hll>Q
zXI#e%*CLajxGxP!K6xf9RD2pMHOfAa1d^Lr6kE`IBpxOiGXfNcoQ*FI6wsNtLD!T+
zC4r2q>5qz0f}UY^RY#1^0*FPO*Zp-U1h9U|qWjwqJaDB(pZ`<`U-xo7+JB$zvwV}^
z2>$0&Q5k#l|Er7*PPG1yc<j+Hgj7{K<ER~hRdQ!)3|;oFNJd6dX^HEEI)euHneoJ$
z#-=LNX#HXNd@=J~82(=b;~qImSTU^93kye1(_ij%--v7epTHJ*SmLm)Mr{G>j4BGz
zg&`d*?nUi1Q!OB>{V@T$A;)8@h;*Rb1{xk_8X<34L`s}xkH-rQZvjM`jI=jaJRGRg
zeEcjYChf-78|RLrao%4HyZBfnAx5KaE~@Sx+o-2MLJ>j-6uDb!U`odj*=)0k)K75l
zo^)8-iz{_k7-_qy{Ko~N#B`n@o#A22YbKiA>0f3k=p-B~XX=<MSGacN)U%?3i^I)a
z4|ju)0K%rke~yEQ2vA37As200K~)P$Qn?#4ZHYa~(Wt8h>`Ug>jl$e7>I=hph0&AK
z?ya;(NaKY_!od=tFUcGU5Kwt!c9EPUQLi;JDCT*{<P27@Ql_745n_YIplWoIkPmd?
zjni(f{BYZi1TY@c3Y-$9V6}aPNgOR10uajL&cR1nrt&w^(F48Kd=63F>90O@Wc>b|
zI;&GIY$JlQW^9?R$-OEUG|3sp+hn+TL(YK?S@ZW<4PQa}=IcUAn_wW3d!r#$B}n08
z*&lf(YN21NDJ74DqwV`l`RX(4zJ<(E4D}N0@QaE-hnfdPDku~@yhb^AeZL73RgovX
z6=e>!`&e^l@1WA5h!}}PwwL*Gjg!LbC5g0|qb8H$^S{eGs%cc?4vTyVFW=s6KtfW?
z@&Xm+E(uz(qDbwDvRQI9DdB<2sW}FYK9sg*f%-i*>*n{t-_wXvg~N7gM|a91B!x|K
zyLbJ~6!!JZpZ`#HpCB8g#Q*~VU47Rp$NyZb3WhEgg3ivSwnjGJgi0BEV?!H}Z@QF|
zrO`Kx*52;FR#J-V-;`oR-pr!t>bYf)UYcixN=(FUR6$fhN@~i09^3WeP3*)D*`*mJ
z1u%klAbzQ=P4s%|FnVTZv%|@(HDB+ap5S#cFSJUSGkyI*Y>9Lwx|0lTs%uhoCW(f1
zi+|a9;vDPfh3nS<7m~wqTM6+pEm(&z-Ll;lFH!w#(Uk#2>Iv~2Hu}lITn7hnOny`~
z*Vj=r<&Nwpq^@g5m`u&QTBRoK*}plAuHg$L$~NO#wF0!*r0OfcS%)k0A??uY*@B^C
zJe9WdU(w){rTIf<;rwJt^_35^d<<XSsx?mw)n~){BsbL1=79ZX5?H71;`*yX`P%U3
z9dsudtG@K{p%|%!@RtG#orG18Av*K)9d~LiHHzeA=4Q06n;{~60AXElVy_J*Z&2CF
zp|X7HJ`glDJpI%)eEoh5Dl@aV4XzCd7I3h;$e>A@$Fq<Kz~u9L>EZW6kwyfAo2<Z|
zy3%L_hMPa(<umu2v5sA_J3z6-{K(d~$J~4408!Z7Av~VG6@gUq$uIvPdF1W1aD#o5
zduZVQADr;N)%*YL8UNQ4RXh2KvxLTL3?P}<10R;Gt4A4zs;3=8mxM~<C=zK2N2BF_
z5X%OdmcX7!lwdYW89I@JvW5Y?DM>x0T$Ye2MZox6Z7<%Qbu$}}u{rtE+h2M+Z}T4I
zxF1cwJ(Uvp!T#mogWkhb(?SxD4_#tV(Sc8N4Gu*{Fh#<qKjSG6^WceMtGbTpPr(Wp
zmgkN_thv2q#a|ZDK`6x8hTYSCcEj8@4CUy-8F(6a=F5THL-y-iP9(OwzAI;Vy<tI^
z3G+}Jawg&-7y<Ib9Ee?g0ms+d7vMKLqafCU-Z5p<huT>})Pvb^ef%jrlnG*&Ie+J5
zsly5oo?1((um&lLDxn(DkYtk`My>lgKTp3Y4?hTQ4_`YNOFtjF-FUY#d#(EQd(rfz
zB8z%Vi;?x)ZM$3c>yc5H8KBvSevnWNdCbAj?QCac)6-K~Xz@EZp}~N9q)5*Ufjz3C
z6kkOeI{3H(^VO8hKDrVjy2DXd;5w<IeAyEChw*xM>r4nb`19yJi0DO@607MSx+7F$
zz3F7sl8JV@@sM$6`#JmSilqI%Bs)}Py2eFT;TjcG5?8$zwV60b(_5A>b#uk~7U^bO
z>y|6SCrP2IGST(8HFuX|XQUXPLt2gL_hm|uj1Ws`O2VW>SyL^uXkl>Zvkcpi?@!F7
z%svLoT@{R#XrIh^<BvD8TN@?R0^1~VQ|Dyb`Pt?eHbKjd_U@{*5*?M1r2-=@kXKy_
z<+1e;D_wch)*kXNfy<8J;B_ZPfIuGZlU+DheTq7D4xiwHKVcB3^tAriI9e?w7hG|b
zzAE`Lttd0z+DArViohu(*8FTGnED_vJ&J6-5=>*dE~$YhMwC+b7JE09NAS47kT%Ew
zD!XjxA@1+KOAyu`H2z#h+pGm!lG<xxwAYpf>>WI0v745l+Fd><3dh{ATq%h?JSdEt
zu%J*zfFUx%Tx&0DS5WSbE)<i~BDkB9<hoUP9wxHiG+%EYy<~b)kp7JgYH!LlPK#fp
zJ2>vwZSoAGT=;W#(DoiL($BcK;U*w`xA&kheyMLI673HCb7fGkp{_vdV2uo;vSoAH
z9BuLM#Vzwt#rJH>58=KXa#O;*)_N{$>l7`umacQ0g$pI3iW4=L<O;S5E41~94p-)Z
zdj7nov9|DvAZ$CyXNpo?<F@0YV%cmvbNl3LBDOM(t`bSs@dF1YDKZSzsj_O_xqIsv
zuCIbkxI<=6yR`L`!>--O;Wiq0zy7OKp`j2r^y3`7X!?sq9rr5B{41BkBr1fEd1#Q3
z-dXc2RSb4U>FvpVhlQ<Pz-+-AoFa}hrx!}<Af7A>CIzQ-hs=<OvYsM3tZJYC;kL6d
zg5_D(?q{yw{$oVco%AG1zHw)1ueC6Yqq>8420z=7F2F(^x<PaYq(0J8j!WZuHlRML
zvw=Ou(u?QDY^uASsn_awr45Elt7VSt*KdrZ=5#dpwIJ?;ZL2@+Q)(UbDV8x4(c3iO
z2aeiw>D;^RXgpjlh8S6*xCP#Gj2+Q0bAg?XARw3dnlQ*Lz3vk}m`HXmCgN=?bIL{T
zi}Ds-xn|P)dxhraT@XY$ZQ&^%x8y!o+?n#+>+dZ1c{hYwNTNRke@3enT(a@}V*X{!
z81+{Jc2UR;+Zcbc6cUlafh4DFKwp>;M}8SGD+YnW3Q_)*9Z_pny_z+MeYQm<P^9sZ
znu|D_<^I{Ste`SvT@HfHmt@`N$>z?r%EVaN0d!NE*FVPq&U@vo{ef6wkMIDEWLbDs
zz91$($XbGnQ?4WHjB~4xgPgKZts{p|g1B{-4##}#c5aL5C6_RJ<Ttl4G#F(}kh2N+
zSmGyT4m$ai#zH>_(*5>85B1}U!<!2UM(Sssbgv-0jQn3Z5Z=St$WFu4dk8%00AohQ
z5_j$rTra@;%r#_}_?yR(M9~qtS0k9ms7u1^E8A@EK84Z`D~?syqKIQJH&9UN_(2yn
zaXv?4f`av1qKK8aD`4!ISzW$pIw{{@aR?}Ecb%D}kOc_L9P-b$q;o5b(%uM(yrG^H
znekk2NVFX17-R54zr%wT27VgHKA8R)BU{N1+t3`IdwbgwB&^T5eo$rnjs4P+bjHcm
z77A$!ebLmbShMNcWal#|h%#mjg#kG>_<``}q-97Q7~u)(&lsb(WT^(*n7H%33%@_b
zO5(?-v??s??33b19xiB7t_YT!q8!qAzN1#RD@3;kYAli%kazt#YN7}MhVu=ljuz27
z1`<+g8oVwy57&$`Ci<lcu~1NgJrU{`5a2BQw}bDY_L1`4I2DtS>HeaM)tz(OSt4E#
zJ@P6E*e504oUw~RD(=9WP8QdW^6wRdFb<cdg|`6ZEa;xyB#I9Rs;NDT4}$+Loeugr
zbvE!V{r7<a0%G`|d!>KII!GAWecJ(?{`EzTR@?j!3g?$@LLCt;U={>!9z7DU!(1Jq
zqEwdx5q?W1Ncm7mXP8MFwAr?nw5$H%cb>Q><9j{Tk2RY9ngGvaJgWXx^r!ywk{ph-
zs2PFto4@IIwBh{oXe;yMZJYlS?3%a-CJ#js90hoh5W5d^OMwCFmpryHFr|mG+*ZP$
zqyS5BW@s}|3xUO0PR<^{a2M(gkP5BDGxvkWkP<K5ZUpLtQ+!)MrC%3LpSOp81VT|8
z`5eKrF=|Etn*ZUmlMfM>udSV*TMRK5Qm4?~VuqVAOerffRt$HGAvp;M++Iq$E6alB
z;ykBr-eZ6v_H^1Wip56Czj&=`mb^TsX|FPN#-gnlP03AkiJDM=?y|LzER1M93R4sC
z*HT(;EV=*F*>!+Z{r!KG?6ODMGvkt3viG=@kQJHNMYd}bS4KrrHf4`&*(0m0R5Hqz
zEk)r=sFeS?MZRvn<@Z0&bDw)XkMnw+_xqgp=W{;ioX`6;G-P9N%wfoYJ$-m$L#MC%
z^sH?tSzA|WWP(cN3({~_*X$l{M*;1V{l$;T6b){#l4pswDTid26HaXgKed}13YIP=
zJRvA3nmx{}R$Lr&S4!kWU3`~dxM}>VXWu6Xd(VP}z1->h&f%82eXD_TuTs@=c;l0T
z|LHmWKJ+?7hkY=YM>t}zvb4|lV;!ARMtWFp!E^J=Asu9w&kVF*i{T#}sY++-qnVh!
z5TQ|=>)+vutf{&qB+LO9^jm#rD7E5+tcorr^Fn5Xb0B;)f^$7Ev#}G_`r==ea294V
z--v4LwjswWlSq9ba6i?IXr8M_VEGQ$H%hCqJTFQ3+1B9tmxDUhnNU%dy4+zbqYJ|o
z3!N{b?A@{;cG2~nb-`|z;gEDL5ffF@oc3`R{fGi)0wtMqEkw4tRX3t;LVS3-zAmg^
zgL7Z{hmdPSz9oA@t>tZ1<|Khn&Lp=_!Q=@a?k+t~H&3jN<D4lUIhOd<?VDvgDnvrv
zz4=bg&Q;9n@uc^iq`xXjs5@BQ!NS5opc3BrP@?~P;z^Qv`Js*uUB!=stZpEOE$b)R
zQxsw(IgM0&bG=Jf+qmL9GGuX(@~b*ICb{?!`)}nwe3LaSl?_|rUF4ioLoFM(NIeT+
zOKlkfiYnHFG~d{}FZa@Q<nc(z+=>?dr(}7s;{L+jiKY57?WsF<x$5(lnpgwn)O@}o
zm3JYnm4Rj#@s?R(%kb|ZbDA)EH@$HmiVZ=w#ueOujETmpQ?K4Mr-BPxy*=Nq8}JVy
z#56o0y=a}jd673Gv7}G<2uYeY0mf=dtU2A6uJh#AT8x)S@ir?$6K1@Z)IQBld?Tr^
zudQ9`))1>BfW^mu6a03_^VKrdK=9egXw@!nzZ3TbYc*osyQNoCXP<Zq2`FgMzc{q+
zIDOTRUdg?S`IKPsH65f_m0G5{N%M)-S*QGJiQ8{KrZfn>YoFS<&Nr97MrQCOK(gO8
z;0@iqRTJy4-RH)PJld5`AJN}n?5r^-enKrHQOR;z>UMfm+e8~4ZL5k<wXGZfd!cWm
ztc=YM>>oXMiYq12Bx4eVQv0jFgp_zC#``sjZpywYqISM<Z(6s5vy51{{W$X+<42zI
z;e`%SFQ2fhLB<k%50BpMXlDw)x~VpQDv`K({mgA$mG8<AA=t)&L)h!yPq&EG@f8{P
z%XOQmFJemuJ;TQ?lJMWU8}KDO<bjssGJ~49Nml=8jImj;lWy%M+VzkM8LLkTvVv-W
zmn{C{45Kd4H*kbG%Q@IvTEktPO?Mv{Z$%kt0f~d)m$KGFq;u|{$w|nEQsiYcFhjd2
z3v?U}8fhHjqFPC9$=Fq3tz*+codZs-1b+Tf9m}?)DWmrAN22i3w~rPj2YXjvju|&#
znqaTV5(jf&i4!%JGKM`4#z@2*NPG5H$ijMnavb}Gn9xE`1Q{crG}2$MmuL7@F65FR
z0xLb!Wu}yQJ{Q6e9h!KU`Ti%P7EQe7k)+_X{u%tf)w9Fv=N`VqWfiOBf_HQbd1bz4
zW%TLhHRPyq_EuVMhCbOuJP^K^4kKe!!1@kR?_c0SHX&x?{Q2OoG{||aYih=9bS|!F
z<cQERPH9`ya%U+f*QqD_X6YXmV0)7P%vCE#So?F2HZQNX*44$?d#Qe}-b1uf{Wp$I
z)Y!bOEo8adSxiM*F_2|dQyWs!O2fVGOQ!2K>P}VZ@!~1Mf$!x|opj%mQ98JnSk@`~
zPmmyuPZKtZOnEC!1y!?`TYRsZ!II;d!iln}%e}bk5qIiUADERr*K$3dekgHV9TtBX
zi5q!J!6Zgd#cLxRmZN^J`o@Zv{+p+<_#8^nvY)44Hw_2i@?R&5n^q33fpOnDg1nPQ
z_r<$hURl~OketX|Tdbvf_7=3x^rSFJtEp@tuDpVB&uq)qW;xUQ7mmkr-@eZwa$l+?
zoKk``Vz@TH#>jMce*8>@FZ+@BEUdYa_K0i|{*;j9MW<wwdhTzBnOlwwk4Kt)7s2g3
zJDz_{6T#mTJh2%53=$SO-WG?!kVGQ8g?l#J(fznDyqLKr$?=3GKUqf7N@pa0?@+|*
zp=O8v;Hz+#EIDxmBuR-y_g>3K%pnM*T;@>|o@lMhgLrpZP5aol(z>g;b4}|e$U~Fn
zGL%(}p%Jsl4LxE!VW_Y4T>e}W4e#~F03H_^R!Q)kpJG{lO!@I4{mFo^V#ayHh_5~o
zB$O71gcE(G@6xv);#Ky?e(Ed}^O+Ho(t=93T9T3TnEY(OVf_dR-gY@j<p^xgTM4Iq
zrCY@#l+H9>j+iJSY?q|6prBv(S9A4k=2fN<j+SIxJ$8-$(X3S;`a)u*-aXG@Fxkkb
zz`!`U|Ab>Zz!W@S=B@~b?TJRTuBQq448@juN#Y=3q=^VCF>Z}n6wICJ<^^Kn8C;mK
zZYiFSN#Z$?NDGV7(#}q2tAZAtE63icK-MY>UQu4MWlGIbJ$AF8Zt-jV;@7P5MPI>%
zPWvO!t%1+s>-A%`;0^o8Ezeaa4DMwI8ooQrJ;ax@Qt<g=or(e&kDiQJ!hhqL8KxVw
zWJ6PQ!IA26UJ4}+#q%ainj)=JR5&&_RwTbaN|FlM82`5Ec}Q!F`f;L%kKp2?Ah-k3
zgq^r#V{&E4(oy=cr_(r|Zf64Bmp6$0-q1bv_7H!Z93tnzcYD$NO}e<ZeCt=a4U9ZQ
z*y-EcdO@5zUI}mxkF_RZde}9~xCuD{`YEU2r#LY2LKC8M0-vAYyG^hVez}0n@Prea
zq0L%k0}ng7kweZyQ})@cg-wc7wUZ;`;IN?hz?kqz|JZQ<pwuZ=rV-cDic42sS`99*
zMcL5|E|-(O7l|KyQ~>*6XONWw)dPwOPI9@u*EG&844*1~EoZ2qsAe~M>d`;Bc_CWY
zMoDKEmDh-}k9d6*<0g@aQmsnrM1H9IcKYZs)><)d92{|0Hh8?~XbF)7U+UmP@P<zO
zTK%M?zK-$akeNk$8Bi=bHSDQQD{L(&W*G+6>w_6geVB?7N$4J4*E0z3EO&5kRS(EE
zv92(+e5WxLXMN{h;-|8@!Q#0q247hb^3R%*k3MuMO5*L}$0D#5P*N$aHd54C<Wviv
z>+=_RToYXTyewugOaDmGsCvb4H1s=@gkfVnzTCWKMa-Mm1v4Wq!t-JIrbV&EWwKDe
ze#kJpOq#iRlFz%5#6Fio9IUlKnQ#X&DY8Ux#<-WqxAac-y%U_L+EZZ4Rg5*yNg`f<
zSZn&uio@zanUCPqX1l4W&B!;UWs#P7B^|4WwoCxQXl|44n^cBNqu=3Vl*ltAqsUQO
z9q_@nD0<nNCi%{?zVlX<z4vRDQLAj8CDO_6Ee@!Kk%zz9AkC;~?Z?fCyM`h0VSIM!
z)<YS|G4p)`ye~>zq0O8r`coEm>9+|rA3HL#l}X;0##>SJS$cVavOZVCpSGf4mUU1(
zWaRCUYc^9QbG9=vpWo%xP}CMFnMb{reA`K7t<BJjA783oFo?rh&7)#{uHi~2^!ZU^
zQ6^|ZrnHesREnE2?ng^c0ZAnlC4C12x5_&&$*w%5QB}>T(t5DM)d9l}jVPY>qoRzT
zE3m-p#=i=$9x*CB`AL>SY}u3agYFl#uULNen#&44H;!L@I{RI=PlWxG8J((f)ma7A
z@jLvQ>?Nx`n?3ChRG#HqE3MXP8*o3!Qq`+t8EMt_p)oeKHqPusBxPn!#?R??-=e3e
zo73WNs<ENIuq^CzKQPSey+?XX|3#leW7<yK_PWcE812^X>_IZF`WLigre=|`aS2^>
zN1zn!7k&Dh28t%VpJ%<Xnbsu79=)^VoAo^<Y#d`N0#C|JR-(K_BCGt0zo8Xn`zpf}
zN0>**&E!eAcB5oLjQFFcJQj*URMia%Ya3@q1UQ18=oWMM6`I}iT_&L1gl?*~6nU<l
z2-Ao?0hw>4q4Z0<S?e@BXyH5z8SQv8@{f=@<?<zph9`>`H<5yDp(HeZ+RGf9`mM&=
zn-qRp%i!g$R;i1d1aMZ{IewNjE@p2+Z{`x{*xL*x$?WV~{BjJpsP&C&JK0HLoy<jU
zIllUrhUc9$)6cu}xy&^N!ah3LKPGi3!kGx@=!kK=v8b-!=l<ZUj?(8#ECS+uF|Q8W
z%$X&<vfXN({Lp)jV&il%dqa{+$?Pn5QEsr+XQQWvw<xHNXLCmTywcS+e{;K<G=R)Y
zq^PtuC7@F8jC@COWJXsGonj|R_H-RV$fSQQIlNmsDyc-3^m2BTUHi+d!)YpOiVN>f
z`0z^v&fBQSa!I7FU~9MaQ%e|?RP>sM^2PL!mE^Q1Ig_4M$5BRfi72oMYu6Ke?wmDX
z@0a%-V|z}b23K=ye(W+fG#w|jJUnT{=KR5jfuq!RX}<1irTDw(${<&}dWQu4;EuE<
z@3u4dBkQaCHHM&;cE0z50_V!(vJ1_V)A8?C#eJuLkt!98Z%|Bgzidc0j|<WDg(m5f
zkAcIde5&rV@AQq8=TC^wvz66%m)1x186~-ro7Q_;(a%0p3PaF!>z(&o)TCzYlrgZA
zC3@i>L!&Gw_~7`>puB97I2lK)<HEfWxACj&R$ZxM&BS~!z9mj#OS!_YeV8_c$Lhua
zx$L@m6QNDWW7To~=QO$DndhYMD~^JEh}^LkAQrEBahvg2kUIHG?W$Fl3&f8!xrq?#
zVzQaEbhureIRirP@jQ4jjU8!;9yU7#nlDdTg++>lESZQqVXc_8T^G2O#VHhO?IC$g
zOYhXJ7)~C<8l|Xrftka@QuowScM{K&0zskoU$Aw~vIRVRF<AR*uvTpW;<}dB`KH7=
z0zMh?uvn?evU)1vOs(Z-A)R|ZfwnitnP{0J>9TEQ4*3=_5)98B`=t8(N%ZuWqmwlW
zllAzq=E5_5!sKDXam@w`ZD(nl%LAPxQuEtDcKPqu9LPJvNIITawU#c^PQ2HmZgs)r
zH^+gRwZ?0)8IFQgU)+p@0Iqb^tcEoqcB@zhfz_FaOM&_d<|jnU>q5nSKa<@%9|dje
zIupcg1!tRiMP4X=oG<7s4|AW&^-Cw4FL9<j5FZy2(<{6zV;Cr;sKVFBe)t_>OuI$t
zxjc*y;Uw!G7a|jz>E*2+PlR(CemWebS7m-&*CDwnmx<p<;?@-|!NOSWIXM;zWzH#H
zw~LN~h21P#6P5S4S0tHB*h1mOme<9LE5wrG9-sYU<V~%5?DjJSjVmfTS{FVBMU|xJ
zLxKvDECM<2Ct4XQn{y*e=}A(D%}%d)wjxb4JWn~6o|adqWe&d`W<;B&rhZ{m<xBTe
zTfxg{p%Pan4!VBbzV+*EhnV^gk*ZCPtbF+RnK8LY+}7hLPH2cjDxs54G}E;J+OL5u
z-)e-BGs~16Ve<@}%%Yg_tPF6@MRnxB#67NA8*0x1SygK61xgySR{Dj^Qv95{+q9G?
z&oas&yrgQ5<hzs#1APQcu4&a1Jm)EcZ<5M+B+V6uA!<X*f+BM1G6ETT?9UU!S(X<*
z3+0i<xmU%VCOy5<-!fUiQH(s^j%O>biRqJvQ&os-sC&4OWt^(2@vG4|jui#Df@-D=
zh3D%8Y3R6+jRBStSvH9pt&tCI`NK08J1*pC(?OM0h!bS-JK3I}`pDY<h?u~U3ifVP
zzM+jQr6P^jPQhr%kj2xD<Nh=Tq&d`zkFi8o<`YdIY=k18t*|!K^nLo5ajk+hs6Bp-
zk@Lw$^_c|;&52lViPS5Q_dW05Gf%VxY$a`BX+SZt$Pa;6Zg9av*AH=+T}?_bQ`|1Z
z7$0O%Kh+hqWgsf&6oH(>-fDIaB_*W6KS+TO0Q*%kkeuN6uWITt=TsCGw6uBE710q;
zRluI%j{?@jwhM|l5&TB!-TkQs!A=DXRE>u18t@;<GyYhSY){4adn^9h%|f#_c&^`_
z10Mt9G8F~}*DnAJj0_|l*!tW@o9|~9kL|fNN}uoN0v@_W!>zndD0M$U@Igrt?UW2;
z7%=dsHIVH_LCkGUU0fW&UMjDnvjcc0Mp(mK&;d~ZJ5EJ)#7@aTZvGDFXzFZg2Lq~s
z5PR_LazNN)JD5K_uK*Hy{mXuHTkGGv|9V8KP#iQ$3!G*^<vQCb8A!zMm1WFOl7{98
zIR`sCu=J^BZ4U#_{%*k9okdV|ll!lgm+FB5v;g`?YzG^BXCSx0b|qTdcHlu$wQUa`
zoXEGJ(^Cm_Hx$^i*N$Q^sL+W11uNqWceMjrCLqBX%yD=90^N?%vB@tq03HtD_ja8k
zczXM9_`kSE%M$-J7I;S#zP)$5<Dm>>7UiE{|1G1A-qg(xH;Xa>&<yyX9xHcB26BP+
zPnbWn+J9+OqNC1jST{hyYET2X4DId6e!2so%2<LSqG;{xg3xj`+jjr{QCH<^lAH#-
z%nr7+QIWS(GLYU(2POLH9+&+IaJU;-zX3~JLClHopo8xWq&@2a2xMWF4$dGA-T_Qm
zvRfiWjmJe00E&B<T0qDA_n_JC2{}_27<fAvX76H+0Gao+z?lqtIPe|n%J6G30KK2Y
zvk9R1z;zxZ7#I?JI1$_j;Dp)(akZcB``HRDged~Hza#S`FefvBd8=Rm?{(y$zyYY#
ztzBGzK|jer82*7N<T93NE?{Z~OnZ&$7d`;fHif&XGwiQM5tc+=t_4)Nfa>%f|BZkH
zG=J^0pHzSAq<Ef&scdjHNe9Cabu4G6fDi?-bwHB8nj*@>v5*5ysQ{Puy^-_|IPrii
zKS$mE10Zngf>Sgg@BjpRyJbrHe<b*u$MOkVX|VxS6$m9TxPFxkWUt%-sQ&7!;pi>o
zD8Ro0LI*W#+9?^xlOS^c>Z^<PSN?~<N&8a&(HNvHdI#<#>^n^0I|FH^@^`ZR`{H=$
zjO0_$cnpBM7Zcm?H_RXIu-Lu~qweDSV|tEZBZh!e6hQy->}e;d#osZ1hQj{HhHkC0
zJ|F-HKmeTGgDe979ogBz24;@<|I7;TU!IXb@oWMsMECIETmQy`zPtM`|NP}PjzR_u
zKMG1Z{%1kWeMfEf(10U#w!clmQ2)JC8zm(Fv!H4dUHQHCFLikID?hrd{0>kCQt?kP
zdqn2ZG0}ytcQJ7t_B3s0ZvH3PYjkjQ`Q%;jV@?MK-+z3etBCGGo4f4`y^|AdCs!DH
zThTQ;cL5dM{|tB_1y6K3bVa^hx_<9J(}5`2SDz1^0bT!Vm*JV;9~t&{IC{$DUAVV*
z{|E=#yN{wNdTY@$6z{_KNA3&%w|vFu1n9XRcM0Ak>`U<T8FIf&km%6pDfxDx)9&vJ
zjh3Jf9S=S6-7a2O(*AgR)8L`wq35dE#pBHWBi`?sYtW(56Nv0WFXsFSdjBzoe(-)5
z4I3;m{OcaQb20k&F?{r<p`VQ21$)@EFW8<lwEuNZ8l46GZ0;^g^pn4{?C%Ejb4t6I
zqaFKVqTko{oLWL}G5W6mF8YU;`=W0zqwI4A038~AzjGJ*T<@Qt_wIgbK(WEp95p#V
Njln_&>W!lQ`ah3D4r%}Z

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 37aef8d3f0..b82aa23a4f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d421c..1aa94a4269 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85bee..7101f8e467 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 06a2b7f50d..054e32e32e 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,2 +1,8 @@
+
+// Automatically resolve and download any missing JDK versions
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version("0.8.0")
+}
+
 rootProject.name = "ion-java"
 include("ion-java-cli")

From 38e9423926b47995815e4749657556047e50d9d6 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 24 Apr 2024 15:00:35 -0700
Subject: [PATCH 384/490] Bumps version to 1.11.8-SNAPSHOT.

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 4178a4832f..498b0b93a8 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.5-SNAPSHOT
+1.11.8-SNAPSHOT

From cdebd73bf99c6e3eacf629cd8fcca49e5df452fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 Apr 2024 09:54:52 -0700
Subject: [PATCH 385/490] Bump the github-action-dependencies group with 2
 updates (#819)

Bumps the github-action-dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [github/codeql-action](https://github.com/github/codeql-action).


Updates `actions/checkout` from 4.1.3 to 4.1.4
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/1d96c772d19495a3b5c517cd2bc0cb401ea0529f...0ad4b8fadaa221de15dcec353f45205ec38ea70b)

Updates `github/codeql-action` from 3.25.2 to 3.25.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/8f596b4ae3cb3c588a5c46780b86dd53fef16c52...d39d31e687223d841ef683f52467bd88e9b21c14)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml                     | 8 ++++----
 .../ion-java-performance-regression-detector.yml          | 8 ++++----
 .github/workflows/ion-test-driver.yml                     | 6 +++---
 .github/workflows/main.yml                                | 6 +++---
 .github/workflows/prepare-release.yml                     | 4 ++--
 .github/workflows/publish-release-artifacts.yml           | 2 +-
 .github/workflows/scorecard.yml                           | 4 ++--
 .github/workflows/test-inspect-version-action.yml         | 2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2a4a5c4287..1ff2b8d35e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
+        uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
+        uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
+        uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index cc0b4114e4..f2f26de6f2 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -84,21 +84,21 @@ jobs:
           java-version: 17
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           ref: ${{ github.base_ref }}
           submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 6c30506205..0dce2b8aa3 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # master
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # master
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -80,7 +80,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # master
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0269242812..35d1c14b69 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           submodules: recursive
       - name: Setup Java
@@ -42,7 +42,7 @@ jobs:
         java: [8, 11, 17, 21]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           submodules: recursive
       - name: Setup Java
@@ -66,7 +66,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.6.0
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index ae7467a8d4..584b149939 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.6.0
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.6.0
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 5665d02e7b..04e4d61d2a 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.6.0
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.6.0
         with:
           submodules: recursive
       - name: Validate project version matches tag
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 062c9b5d2f..80e9f70576 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.1.0
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.1.0
         with:
           persist-credentials: false
 
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
+        uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index df77874ef4..37f7a90a09 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v3.6.0
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From 89d61a7cc5014165ba814228da766c2b618654c3 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 29 Apr 2024 16:12:02 -0700
Subject: [PATCH 386/490] Revert "Change IonSystemBuilder's default charset to
 UTF-8 (#802)"

This reverts commit 515870636d29b58b9bd3d2bf5f51c9b5e8980dd2.
---
 .../java/com/amazon/ion/system/IonSystemBuilder.java  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/amazon/ion/system/IonSystemBuilder.java b/src/main/java/com/amazon/ion/system/IonSystemBuilder.java
index fecc451b54..8b8e571462 100644
--- a/src/main/java/com/amazon/ion/system/IonSystemBuilder.java
+++ b/src/main/java/com/amazon/ion/system/IonSystemBuilder.java
@@ -91,7 +91,7 @@ public static IonSystemBuilder standard()
     IonCatalog myCatalog;
     boolean myStreamCopyOptimized = false;
 
-    IonTextWriterBuilder textWriterBuilder = IonTextWriterBuilder.standard();
+    IonTextWriterBuilder textWriterBuilder = IonTextWriterBuilder.standard().withCharsetAscii();
     IonBinaryWriterBuilder binaryWriterBuilder = IonBinaryWriterBuilder.standard();
     IonReaderBuilder readerBuilder = IonReaderBuilder.standard();
 
@@ -269,7 +269,8 @@ public final IonSystemBuilder withStreamCopyOptimized(boolean optimized)
 
     /**
      * Gets the text writer builder whose options will be used when building an
-     * {@link IonSystem}. By default, {@link IonTextWriterBuilder#standard()} will be used.
+     * {@link IonSystem}. By default, {@link IonTextWriterBuilder#standard()}
+     * using {@code US-ASCII} encoding will be used.
      *
      * @see #setIonTextWriterBuilder(IonTextWriterBuilder)
      * @see #withIonTextWriterBuilder(IonTextWriterBuilder)
@@ -283,7 +284,8 @@ public final IonTextWriterBuilder getIonTextWriterBuilder() {
      * an {@link IonSystem}.
      *
      * @param builder the writer builder to use in built systems.
-     *  If unset, each system will be built with {@link IonTextWriterBuilder#standard()}.
+     *  If unset, each system will be built with {@link IonTextWriterBuilder#standard()}
+     *  using {@code US-ASCII} encoding.
      *
      * @see #getIonTextWriterBuilder()
      * @see #withIonTextWriterBuilder(IonTextWriterBuilder)
@@ -303,7 +305,8 @@ public final void setIonTextWriterBuilder(IonTextWriterBuilder builder) {
      * always be used instead.
      *
      * @param builder the writer builder to use in built systems.
-     *  If unset, each system will be built with {@link IonTextWriterBuilder#standard()}.
+     *  If unset, each system will be built with {@link IonTextWriterBuilder#standard()}
+     *  using {@code US-ASCII} encoding.
      *
      * @see #getIonTextWriterBuilder()
      * @see #setIonTextWriterBuilder(IonTextWriterBuilder)

From 178c010f53ec57b20f33b4d7737e0c0775dafe91 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 2 May 2024 10:49:57 -0700
Subject: [PATCH 387/490] Ensures that encountering an incomplete binary IVM
 causes clean failure.

---
 .../com/amazon/ion/impl/IonCursorBinary.java  |  3 +++
 .../amazon/ion/impl/IonCursorBinaryTest.java  | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 4887aca16f..6166cfc381 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -1113,6 +1113,9 @@ private void reset() {
      * point to the first byte after the IVM.
      */
     private void readIvm() {
+        if (limit < peekIndex + IVM_REMAINING_LENGTH) {
+            throw new IonException("Incomplete Ion version marker.");
+        }
         majorVersion = buffer[(int) (peekIndex++)];
         minorVersion = buffer[(int) (peekIndex++)];
         if ((buffer[(int) (peekIndex++)] & SINGLE_BYTE_MASK) != IVM_FINAL_BYTE) {
diff --git a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
index 436bb0030a..38336067bc 100644
--- a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
@@ -13,6 +13,7 @@
 import java.util.function.Consumer;
 
 import static com.amazon.ion.BitUtils.bytes;
+import static com.amazon.ion.IonCursor.Event.NEEDS_DATA;
 import static com.amazon.ion.IonCursor.Event.VALUE_READY;
 import static com.amazon.ion.IonCursor.Event.START_CONTAINER;
 import static com.amazon.ion.IonCursor.Event.START_SCALAR;
@@ -445,4 +446,25 @@ public void expectUseAfterCloseToHaveNoEffect(boolean constructFromBytes) {
         assertNull(cursor.getValueMarker().typeId);
         cursor.close();
     }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void expectIncompleteIvmToFailCleanly(boolean constructFromBytes) {
+        IonCursorBinary cursor = initializeCursor(
+            constructFromBytes,
+            0xE0, 0x01, 0x00, 0xEA, // Complete IVM
+            0x20, // Int 0
+            0xE0, 0x01 // Incomplete IVM
+        );
+        assertEquals(START_SCALAR, cursor.nextValue());
+        if (constructFromBytes) {
+            // This is a fixed stream, so no more bytes will become available. An error must be raised when the
+            // incomplete IVM is encountered.
+            assertThrows(IonException.class, cursor::nextValue);
+        } else {
+            // This is a growing stream, so the cursor waits for more bytes.
+            assertEquals(NEEDS_DATA, cursor.nextValue());
+        }
+        cursor.close();
+    }
 }

From f669d30f4ef345cf037cfa113a05e6a12924d953 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 10:24:38 -0700
Subject: [PATCH 388/490] Bump codecov/codecov-action in the
 github-action-dependencies group (#831)

Bumps the github-action-dependencies group with 1 update: [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `codecov/codecov-action` from 4.3.0 to 4.3.1
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/84508663e988701840491b86de86b666e8a86bed...5ecb98a3c6b747ed38dc09f787459979aebb39be)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 35d1c14b69..d7816ac6d8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
+      - uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0

From 77e3b788494ab94663dfe10fcc6808524a871f63 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 8 May 2024 14:03:29 -0700
Subject: [PATCH 389/490] Fixes a bug that prevented seeking to a span created
 from a different reader in a stream with a large number of symbols.

---
 ...IonReaderContinuableApplicationBinary.java | 22 +++++-----
 .../ion/streaming/SeekableReaderTest.java     | 41 +++++++++++--------
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 6b1969c963..213c300415 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -1,9 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 package com.amazon.ion.impl;
 
-import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
@@ -469,8 +467,12 @@ protected void restoreSymbolTable(SymbolTable symbolTable) {
             cachedReadOnlySymbolTable = snapshot;
             imports = snapshot.importedTables;
             firstLocalSymbolId = imports.getMaxId() + 1;
+            // 'symbols' may be smaller than 'idToText' if the span was created from a different reader.
+            int shortfall = snapshot.idToText.length - symbols.length;
+            if (shortfall > 0) {
+                growSymbolsArray(shortfall);
+            }
             localSymbolMaxOffset = snapshot.maxId - firstLocalSymbolId;
-            // Note: because `symbols` only grows, `snapshot.listView` will always fit within `symbols`.
             System.arraycopy(snapshot.idToText, 0, symbols, 0, snapshot.idToText.length);
         } else {
             // Note: this will only happen when `symbolTable` is the system symbol table.
@@ -569,6 +571,13 @@ private SymbolToken getSymbolToken(int sid) {
         return new SymbolTokenImpl(text, sid);
     }
 
+    private void growSymbolsArray(int shortfall) {
+        int newSize = nextPowerOfTwo(symbols.length + shortfall);
+        String[] resized = new String[newSize];
+        System.arraycopy(symbols, 0, resized, 0, localSymbolMaxOffset + 1);
+        symbols = resized;
+    }
+
     /**
      * Uses the underlying raw reader to read the symbol tables from the stream. Capable of resuming if not enough
      * data is currently available to complete the symbol table.
@@ -598,13 +607,6 @@ private boolean valueUnavailable() {
             return event == Event.NEEDS_DATA || event == Event.NEEDS_INSTRUCTION;
         }
 
-        private void growSymbolsArray(int shortfall) {
-            int newSize = nextPowerOfTwo(symbols.length + shortfall);
-            String[] resized = new String[newSize];
-            System.arraycopy(symbols, 0, resized, 0, localSymbolMaxOffset + 1);
-            symbols = resized;
-        }
-
         private void finishReadingSymbolTableStruct() {
             stepOutOfContainer();
             if (!hasSeenImports) {
diff --git a/src/test/java/com/amazon/ion/streaming/SeekableReaderTest.java b/src/test/java/com/amazon/ion/streaming/SeekableReaderTest.java
index 95992ac0f9..5726bc47f5 100644
--- a/src/test/java/com/amazon/ion/streaming/SeekableReaderTest.java
+++ b/src/test/java/com/amazon/ion/streaming/SeekableReaderTest.java
@@ -1,25 +1,11 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.streaming;
 
 import com.amazon.ion.IonDatagram;
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonWriter;
 import com.amazon.ion.ReaderMaker;
-import com.amazon.ion.SeekableReader;
 import com.amazon.ion.Span;
 import com.amazon.ion.TestUtils;
 import com.amazon.ion.impl._Private_Utils;
@@ -367,6 +353,29 @@ public void testHoistingFromSpanCreatedByDifferentReaderBeforeNext()
         assertEquals("bar", in.stringValue());
     }
 
+    @Test
+    public void testHoistingFromSpanCreatedByDifferentReaderWithManySymbols()
+    {
+        // Note: larger than IonReaderContinuableApplicationBinary.SYMBOLS_LIST_INITIAL_CAPACITY (128)
+        int numberOfSymbols = 129;
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < numberOfSymbols; i++) {
+            sb.append("foo").append(i).append(' ');
+        }
+        read(sb.toString());
+        for (int i = 0; i < numberOfSymbols; i++) {
+            in.next();
+        }
+        Span barSpan = sr.currentSpan();
+
+        read(sb.toString()); // Creates a new reader
+        initFacets();
+
+        hoist(barSpan);
+        assertSame(IonType.SYMBOL, in.next());
+        assertEquals("foo128", in.stringValue());
+    }
+
 
     //========================================================================
     // Failure cases

From 41788d7f790cc71c804c57ec085c2ed167fae3f0 Mon Sep 17 00:00:00 2001
From: Linlin Sun <linls@amazon.com>
Date: Sat, 11 May 2024 13:14:37 -0700
Subject: [PATCH 390/490] Bumps version to 1.11.9-SNAPSHOT.

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 498b0b93a8..0461d5bfc4 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.8-SNAPSHOT
+1.11.9-SNAPSHOT

From 444f9e150ee65c4aa089dcbd508e4df2b33d4376 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 May 2024 12:13:20 -0700
Subject: [PATCH 391/490] Bump the github-action-dependencies group with 3
 updates (#850)

Bumps the github-action-dependencies group with 3 updates: [actions/checkout](https://github.com/actions/checkout), [github/codeql-action](https://github.com/github/codeql-action) and [ossf/scorecard-action](https://github.com/ossf/scorecard-action).


Updates `actions/checkout` from 4.1.4 to 4.1.5
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/0ad4b8fadaa221de15dcec353f45205ec38ea70b...44c2b7a8a4ea60a981eaca3cf939b5f4305c123b)

Updates `github/codeql-action` from 3.25.3 to 3.25.5
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/d39d31e687223d841ef683f52467bd88e9b21c14...b7cec7526559c32f1616476ff32d17ba4c59b2d6)

Updates `ossf/scorecard-action` from 2.3.1 to 2.3.3
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/0864cf19026789058feabb7e87baa5f140aac736...dc50aa9510b46c811795eb24b2f1ba02a914e534)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml                     | 8 ++++----
 .../ion-java-performance-regression-detector.yml          | 8 ++++----
 .github/workflows/ion-test-driver.yml                     | 6 +++---
 .github/workflows/main.yml                                | 6 +++---
 .github/workflows/prepare-release.yml                     | 4 ++--
 .github/workflows/publish-release-artifacts.yml           | 2 +-
 .github/workflows/scorecard.yml                           | 6 +++---
 .github/workflows/test-inspect-version-action.yml         | 2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1ff2b8d35e..5a5d9b3424 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+        uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+        uses: github/codeql-action/autobuild@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+        uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index f2f26de6f2..8004e9f08d 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -84,21 +84,21 @@ jobs:
           java-version: 17
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           ref: ${{ github.base_ref }}
           submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 0dce2b8aa3..621dfa450e 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # master
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # master
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -80,7 +80,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # master
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d7816ac6d8..5a5220b109 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           submodules: recursive
       - name: Setup Java
@@ -42,7 +42,7 @@ jobs:
         java: [8, 11, 17, 21]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           submodules: recursive
       - name: Setup Java
@@ -66,7 +66,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.6.0
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 584b149939..6e81329195 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.6.0
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.6.0
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 04e4d61d2a..16ded4be61 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.6.0
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.6.0
         with:
           submodules: recursive
       - name: Validate project version matches tag
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 80e9f70576..bd5dafbe60 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,12 +32,12 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.1.0
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.1.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+        uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index 37f7a90a09..d75d8a89ad 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v3.6.0
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From 43dc638f0b421083cbdce21f081e2032162ce915 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Thu, 16 May 2024 12:11:11 -0700
Subject: [PATCH 392/490] Set Java toolchain for spotbugs task (#863)

---
 build.gradle.kts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 974dfbf108..98bd83ff67 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -375,6 +375,13 @@ tasks {
     project.gradle.startParameter.excludedTaskNames.add(":spotbugsTest")
 
     spotbugsMain {
+        launcher.set(
+            project.javaToolchains.launcherFor {
+                languageVersion.set(JavaLanguageVersion.of(SUPPORTED_JRE_VERSIONS.min()))
+                vendor.set(JvmVendorSpec.AMAZON)
+            }
+        )
+
         val spotbugsBaselineFile = "$rootDir/config/spotbugs/baseline.xml"
 
         val baselining = project.hasProperty("baseline") // e.g. `./gradlew :spotbugsMain -Pbaseline`

From 13ece8477d020960c1c30a15397a6b7d7aebe5da Mon Sep 17 00:00:00 2001
From: "Carl J. Mosca" <carljmosca@gmail.com>
Date: Thu, 16 May 2024 16:02:02 -0400
Subject: [PATCH 393/490] Removes some unused code.  (#858)

* initial code removal

* imports/copyright updates via spotless apply
---
 .../ion/impl/IonReaderTextRawTokensX.java     |  23 +-
 .../ion/impl/IonTextBufferedStream.java       | 311 ------------------
 .../amazon/ion/impl/UnifiedInputStreamX.java  |  31 +-
 3 files changed, 7 insertions(+), 358 deletions(-)
 delete mode 100644 src/main/java/com/amazon/ion/impl/IonTextBufferedStream.java

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java b/src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java
index 94876a285f..5a2f89ba80 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl;
 
 import static com.amazon.ion.impl.IonTokenConstsX.CharacterSequence.CHAR_SEQ_ESCAPED_NEWLINE_SEQUENCE_1;
@@ -1582,11 +1569,11 @@ protected IonType load_number(StringBuilder sb) throws IOException
             int c2 = read_char();
             if (Radix.HEX.isPrefix(c2)) {
                 sb.append((char)c);
-                c = loadRadixValue(sb, has_sign, c2, Radix.HEX);
+                c = loadRadixValue(sb, c2, Radix.HEX);
                 return load_finish_number(sb, c, IonTokenConstsX.TOKEN_HEX);
             } else if (Radix.BINARY.isPrefix(c2)) {
                 sb.append((char) c);
-                c = loadRadixValue(sb, has_sign, c2, Radix.BINARY);
+                c = loadRadixValue(sb, c2, Radix.BINARY);
                 return load_finish_number(sb, c, IonTokenConstsX.TOKEN_BINARY);
             }
             // not a next value, back up and try again
@@ -1843,7 +1830,7 @@ else if (c == '+' || c == '-') {
         return load_finish_number(sb, c, IonTokenConstsX.TOKEN_TIMESTAMP);
     }
 
-    private final int loadRadixValue(StringBuilder sb, boolean has_sign, int c2, Radix radix)
+    private final int loadRadixValue(StringBuilder sb, int c2, Radix radix)
         throws IOException
     {
         radix.assertPrefix(c2);
diff --git a/src/main/java/com/amazon/ion/impl/IonTextBufferedStream.java b/src/main/java/com/amazon/ion/impl/IonTextBufferedStream.java
deleted file mode 100644
index 2be9e8f4ab..0000000000
--- a/src/main/java/com/amazon/ion/impl/IonTextBufferedStream.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package com.amazon.ion.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * InputStream implementations over a number of types (byte[] and String)
- * that do not handle character decoding.  Each byte is treated as just
- * a character from 0 to 255.  These are used internally to wire up some
- * of the Iterator code to some of the base64 encoding (or decoding)
- * routins in ion.impl.
- */
-abstract class IonTextBufferedStream extends InputStream
-{
-    public static IonTextBufferedStream makeStream(byte[] bytes) {
-        return new SimpleBufferStream(bytes);
-    }
-    public static IonTextBufferedStream makeStream(byte[] bytes, int offset, int len) {
-        return new OffsetBufferStream(bytes, offset, len);
-    }
-    public static IonTextBufferedStream makeStream(String text) {
-        return new StringStream(text);
-    }
-    /*** FIXME: REMOVE OR FINISH
-    public static IonTextBufferedStream makeStream(InputStream stream) {
-        return new StreamStream(stream);
-    }
-    */
-    public abstract int getByte(int pos);
-    public abstract int position();
-    public abstract IonTextBufferedStream setPosition(int pos);
-
-    /*** FIXME: REMOVE OR FINISH
-    static final class StreamStream extends IonTextBufferedStream
-    {
-        static final int DEFAULT_BUFFER_SIZE = (32*1024);
-
-        InputStream _stream;
-        byte []     _buffer1;
-        byte []     _buffer2;
-        long        _file_pos1;
-        long        _file_pos2;
-        int         _len;
-        int         _pos;
-
-        public StreamStream (InputStream stream)
-        {
-            _stream = stream;
-            _buffer1 = new byte[DEFAULT_BUFFER_SIZE];
-            _buffer2 = new byte[DEFAULT_BUFFER_SIZE];
-            _pos = 0;
-            _file_pos1 = 0;
-            _file_pos2 = -1;
-            _len = load(_buffer1);
-        }
-        int load(byte[] buffer) {
-
-        }
-
-        @Override
-        public final int getByte(int pos) {
-            if (pos < 0 || pos >= _len) return -1;
-            return _buffer[pos] & 0xff;
-        }
-
-        @Override
-        public final int read()
-            throws IOException
-        {
-            if (_pos >= _len) return -1;
-            return _buffer[_pos++];
-        }
-
-        @Override
-        public final int read(byte[] bytes, int offset, int len) throws IOException
-        {
-            int copied = 0;
-            if (offset < 0) throw new IllegalArgumentException();
-            copied = len;
-            if (_pos + len >= _len) copied = _len - _pos;
-            System.arraycopy(_buffer, _pos, bytes, offset, copied);
-            _pos += copied;
-            return copied;
-        }
-
-        @Override
-        public final int position() {
-            return _pos;
-        }
-
-        @Override
-        public final SimpleBufferStream setPosition(int pos)
-        {
-            if (_pos < 0 || _pos > _len) throw new IllegalArgumentException();
-            _pos = pos;
-            return this;
-        }
-
-        @Override
-        public void close() throws IOException
-        {
-            _stream.close();
-            super.close();
-        }
-    }
-    */
-
-    static final class SimpleBufferStream extends IonTextBufferedStream
-    {
-        byte [] _buffer;
-        int     _len;
-        int     _pos;
-
-        public SimpleBufferStream(byte[] buffer)
-        {
-            _buffer = buffer;
-            _pos = 0;
-            _len = buffer.length;
-        }
-
-        @Override
-        public final int getByte(int pos) {
-            if (pos < 0 || pos >= _len) return -1;
-            return _buffer[pos] & 0xff;
-        }
-
-        @Override
-        public final int read()
-            throws IOException
-        {
-            if (_pos >= _len) return -1;
-            return _buffer[_pos++];
-        }
-
-        @Override
-        public final int read(byte[] bytes, int offset, int len) throws IOException
-        {
-            int copied = 0;
-            if (offset < 0) throw new IllegalArgumentException();
-            copied = len;
-            if (_pos + len >= _len) copied = _len - _pos;
-            System.arraycopy(_buffer, _pos, bytes, offset, copied);
-            _pos += copied;
-            return copied;
-        }
-
-        @Override
-        public final int position() {
-            return _pos;
-        }
-
-        @Override
-        public final SimpleBufferStream setPosition(int pos)
-        {
-            if (_pos < 0 || _pos > _len) throw new IllegalArgumentException();
-            _pos = pos;
-            return this;
-        }
-
-        @Override
-        public void close()
-            throws IOException
-        {
-            _pos = _len;
-            super.close();
-        }
-    }
-
-    static final class StringStream extends IonTextBufferedStream
-    {
-
-        String _string;
-        int    _end;
-        int    _pos;
-
-        public StringStream(String text)
-        {
-            _string = text;
-            _pos = 0;
-            _end = text.length();
-        }
-
-        @Override
-        public final int getByte(int pos) {
-            if (pos < 0) return -1;
-            if (pos >= _end) return -1;
-            return _string.charAt(pos);
-        }
-
-        @Override
-        public final int read()
-            throws IOException
-        {
-            if (_pos >= _end) return -1;
-            char c = _string.charAt(_pos++);
-            return c;
-        }
-
-        @Override
-        public final int read(byte[] bytes, int offset, int len) throws IOException
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public final int position() {
-            return _pos;
-        }
-
-        @Override
-        public final StringStream setPosition(int pos)
-        {
-            if (pos < 0) throw new IllegalArgumentException();
-            if (pos > _end) throw new IllegalArgumentException();
-            _pos = pos;
-            return this;
-        }
-
-        @Override
-        public void close()
-            throws IOException
-        {
-            _pos = _end;
-            super.close();
-        }
-    }
-
-    static final class OffsetBufferStream extends IonTextBufferedStream
-    {
-        byte [] _buffer;
-        int     _start;
-        int     _end;
-        int     _pos;
-
-        public OffsetBufferStream(byte[] buffer, int start, int max)
-        {
-            _buffer = buffer;
-            _pos = start;
-            _start = start;
-            _end = start + max;
-        }
-
-        @Override
-        public final int getByte(int pos) {
-            if (pos < 0) return -1;
-            pos += _start;
-            if (pos >= _end) return -1;
-            return _buffer[pos] & 0xff;
-        }
-
-        @Override
-        public final int read()
-            throws IOException
-        {
-            int c;
-            if (_pos >= _end) return -1;
-            c = (((int)_buffer[_pos++]) & 0xFF);  // trim sign extension bits
-            return c;
-        }
-
-        @Override
-        public final int read(byte[] bytes, int offset, int len) throws IOException
-        {
-            int copied = 0;
-            if (offset < 0) throw new IllegalArgumentException();
-            copied = len;
-            if (_pos + len >= _end) copied = _end - _pos;
-            System.arraycopy(_buffer, _pos, bytes, offset, copied);
-            _pos += copied;
-            return copied;
-        }
-
-        @Override
-        public final int position() {
-            return _pos - _start;
-        }
-
-        @Override
-        public final OffsetBufferStream setPosition(int pos)
-        {
-            if (pos < 0) throw new IllegalArgumentException();
-            pos += _start;
-            if (pos > _end) throw new IllegalArgumentException();
-            _pos = pos;
-            return this;
-        }
-
-        @Override
-        public void close()
-            throws IOException
-        {
-            _pos = _end;
-            super.close();
-        }
-    }
-}
diff --git a/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java b/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java
index 71967f7332..8356a9beea 100644
--- a/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java
+++ b/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java
@@ -1,21 +1,7 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl;
 
-import com.amazon.ion.impl.IonReaderTextRawTokensX.IonReaderTextTokenException;
 import com.amazon.ion.impl.UnifiedSavePointManagerX.SavePoint;
 import java.io.Closeable;
 import java.io.IOException;
@@ -383,19 +369,6 @@ public final int read(byte[] dst, int offset, int length) throws IOException
         }
         return length - remaining;
     }
-    private int read_utf8(int c) throws IOException
-    {
-        int len = IonUTF8.getUTF8LengthFromFirstByte(c);
-        for (int ii=1; ii<len; ii++) {
-            int c2 = read();
-            if (c2 == -1) {
-                throw new IonReaderTextTokenException("invalid UTF8 sequence encountered in stream");
-            }
-            c |= (c2 << (ii*8));
-        }
-        c = IonUTF8.getScalarFrom4BytesReversed(c);
-        return c;
-    }
 
     /**
      * the refill method is the key override that is filled in by

From e58f7149b38f5a1c490e9274556d5b7957a159c5 Mon Sep 17 00:00:00 2001
From: "Carl J. Mosca" <carljmosca@gmail.com>
Date: Mon, 20 May 2024 15:35:52 -0400
Subject: [PATCH 394/490] Removes more unused code (#864)

* unused code removal

* avoid ion-11-encoding merge conflicts
---
 .../java/com/amazon/ion/apps/BaseApp.java     | 18 ++---------
 .../ion/impl/IonWriterSystemBinary.java       | 28 ++--------------
 .../amazon/ion/impl/UnifiedInputStreamX.java  |  2 --
 .../amazon/ion/impl/bin/IonEncoder_1_1.java   |  4 +--
 .../ion/impl/bin/IonRawBinaryWriter.java      | 32 ++-----------------
 .../ion/impl/lite/IonTimestampLite.java       | 23 ++-----------
 6 files changed, 10 insertions(+), 97 deletions(-)

diff --git a/src/main/java/com/amazon/ion/apps/BaseApp.java b/src/main/java/com/amazon/ion/apps/BaseApp.java
index 96ca1a5ea8..3dca74ddfe 100644
--- a/src/main/java/com/amazon/ion/apps/BaseApp.java
+++ b/src/main/java/com/amazon/ion/apps/BaseApp.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.apps;
 
 import com.amazon.ion.IonCatalog;
@@ -20,7 +7,6 @@
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.SymbolTable;
-import com.amazon.ion.impl._Private_IonConstants;
 import com.amazon.ion.system.IonSystemBuilder;
 import com.amazon.ion.system.SimpleCatalog;
 import java.io.BufferedInputStream;
diff --git a/src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java b/src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java
index 2b9dd26c73..06d66c38df 100644
--- a/src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl;
 
 import static com.amazon.ion.impl._Private_IonConstants.tidDATAGRAM;
@@ -265,10 +252,8 @@ static long[] growOne(long[] source, int newSize) {
     /** Ensure we don't use a closed {@link #output} stream. */
     private boolean _closed;
 
-    private final static int TID_FOR_SYMBOL_TABLE_PATCH = _Private_IonConstants.tidDATAGRAM + 1;
     private final static int DEFAULT_PATCH_COUNT        = 10;
     private final static int DEFAULT_PATCH_DEPTH        = 10;
-    private final static int NOT_A_SYMBOL_TABLE_IDX     = -1;
 
     // Patch:
     //          offset in data stream
@@ -385,11 +370,6 @@ public final boolean isInStruct()
         return _in_struct;
     }
 
-    private final boolean topInStruct() {
-        if (_top == 0) return false;
-        boolean in_struct = _patch_in_struct[_patch_stack[_top - 1]];
-        return in_struct;
-    }
     protected final boolean atDatagramLevel()
     {
         return (topType() == _Private_IonConstants.tidDATAGRAM);
@@ -440,10 +420,6 @@ final SymbolTable inject_local_symbol_table() throws IOException
         return symbols;
     }
 
-    private final int topLength() {
-        return _patch_lengths[_patch_stack[_top - 1]];
-    }
-
     private final int topType() {
         if (_top == 0) return _Private_IonConstants.tidDATAGRAM;
         return _patch_types[_patch_stack[_top - 1]];
diff --git a/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java b/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java
index 8356a9beea..2858ab3529 100644
--- a/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java
+++ b/src/main/java/com/amazon/ion/impl/UnifiedInputStreamX.java
@@ -344,7 +344,6 @@ public final void skip(int skipDistance) throws IOException
                            + getPosition();
             throw new IOException(message);
         }
-        return;
     }
     // NB this method does not follow the contract of InputStream.read, it will return 0 at EOF
     //    It is unclear what the implication to the rest of the system to make it 'conform'
@@ -478,7 +477,6 @@ private void set_current_page(int new_page_idx, UnifiedDataPageX new_page, int p
 
         make_page_current(new_page, new_page_idx, pos, new_page.getBufferLimit());
 
-        return;
     }
     private int refill_is_eof() {
         _eof = true;
diff --git a/src/main/java/com/amazon/ion/impl/bin/IonEncoder_1_1.java b/src/main/java/com/amazon/ion/impl/bin/IonEncoder_1_1.java
index 7b1ca9d4b2..a543a54b47 100644
--- a/src/main/java/com/amazon/ion/impl/bin/IonEncoder_1_1.java
+++ b/src/main/java/com/amazon/ion/impl/bin/IonEncoder_1_1.java
@@ -1,7 +1,8 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.bin;
 
 import com.amazon.ion.Decimal;
-import com.amazon.ion.IonText;
 import com.amazon.ion.IonType;
 import com.amazon.ion.Timestamp;
 import com.amazon.ion.impl.bin.utf8.Utf8StringEncoder;
@@ -9,7 +10,6 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.nio.charset.StandardCharsets;
 
 import static com.amazon.ion.impl.bin.Ion_1_1_Constants.*;
 import static java.lang.Double.doubleToRawLongBits;
diff --git a/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index 315d4bf204..e2073126c0 100644
--- a/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.bin;
 
 import static com.amazon.ion.Decimal.isNegativeZero;
@@ -57,7 +44,6 @@
 import java.math.BigInteger;
 import java.util.Iterator;
 import java.util.ListIterator;
-import java.util.NoSuchElementException;
 
 /**
  * Low-level binary {@link IonWriter} that understands encoding concerns but doesn't operate with any sense of symbol table management.
@@ -226,10 +212,6 @@ int numberOfLengthBytes() {
         }
     }
 
-    private static final byte STRING_TYPE_EXTENDED_LENGTH       = (byte) 0x8E;
-    private static final byte[] STRING_TYPED_PREALLOCATED_2     = makeTypedPreallocatedBytes(0x8E, 2);
-    private static final byte[] STRING_TYPED_PREALLOCATED_3     = makeTypedPreallocatedBytes(0x8E, 3);
-
     /** Max supported annotation length specifier size supported. */
     private static final int MAX_ANNOTATION_LENGTH = 0x7F;
 
@@ -601,16 +583,6 @@ private void addPatchPoint(final ContainerInfo container, final long position, f
         updateLength(patchLength - oldLength);
     }
 
-    /**
-     * This is used to reclaim the placeholder patch point after scan the current container.
-     * @param placeholderPatchIndex represents the index of the placeholder patch point.
-     */
-    private void reclaimPlaceholderPatchPoint(int placeholderPatchIndex) {
-        if (placeholderPatchIndex >= patchPoints.size() - 1) {
-            patchPoints.remove();
-        }
-    }
-
     private ContainerInfo popContainer()
     {
         final ContainerInfo currentContainer = containers.pop();
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonTimestampLite.java b/src/main/java/com/amazon/ion/impl/lite/IonTimestampLite.java
index d7841c05fe..2eb8b4d791 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonTimestampLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonTimestampLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.IonTimestamp;
@@ -32,12 +19,6 @@ final class IonTimestampLite
 {
     public final static Integer UTC_OFFSET = Timestamp.UTC_OFFSET;
 
-    private static final int BIT_FLAG_YEAR      = 0x01;
-    private static final int BIT_FLAG_MONTH     = 0x02;
-    private static final int BIT_FLAG_DAY       = 0x04;
-    private static final int BIT_FLAG_MINUTE    = 0x08;
-    private static final int BIT_FLAG_SECOND    = 0x10;
-    private static final int BIT_FLAG_FRACTION  = 0x20;
     private static final int HASH_SIGNATURE =
         IonType.TIMESTAMP.toString().hashCode();
 

From 9436dbe9a94457fd3d85b3d62feb21af8ca6cc23 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 31 May 2024 12:31:39 -0700
Subject: [PATCH 395/490] Bump the github-action-dependencies group with 3
 updates (#865)

Bumps the github-action-dependencies group with 3 updates: [actions/checkout](https://github.com/actions/checkout), [github/codeql-action](https://github.com/github/codeql-action) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `actions/checkout` from 4.1.5 to 4.1.6
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/44c2b7a8a4ea60a981eaca3cf939b5f4305c123b...a5ac7e51b41094c92402da3b24376905380afc29)

Updates `github/codeql-action` from 3.25.5 to 3.25.6
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/b7cec7526559c32f1616476ff32d17ba4c59b2d6...9fdb3e49720b44c48891d036bb502feb25684276)

Updates `codecov/codecov-action` from 4.3.1 to 4.4.1
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/5ecb98a3c6b747ed38dc09f787459979aebb39be...125fc84a9a348dbcf27191600683ec096ec9021c)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml                     | 8 ++++----
 .../ion-java-performance-regression-detector.yml          | 8 ++++----
 .github/workflows/ion-test-driver.yml                     | 6 +++---
 .github/workflows/main.yml                                | 8 ++++----
 .github/workflows/prepare-release.yml                     | 4 ++--
 .github/workflows/publish-release-artifacts.yml           | 2 +-
 .github/workflows/scorecard.yml                           | 4 ++--
 .github/workflows/test-inspect-version-action.yml         | 2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5a5d9b3424..8d2ab2c380 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
+        uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
+        uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
+        uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 8004e9f08d..8ee31d6c0e 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -84,21 +84,21 @@ jobs:
           java-version: 17
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           ref: ${{ github.base_ref }}
           submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 621dfa450e..35fe0ae983 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # master
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # master
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -80,7 +80,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # master
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5a5220b109..7cb462220a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           submodules: recursive
       - name: Setup Java
@@ -25,7 +25,7 @@ jobs:
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
+      - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
@@ -42,7 +42,7 @@ jobs:
         java: [8, 11, 17, 21]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           submodules: recursive
       - name: Setup Java
@@ -66,7 +66,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.6.0
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 6e81329195..a0fba671e3 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.6.0
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.6.0
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 16ded4be61..95cd7a235b 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.6.0
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.6.0
         with:
           submodules: recursive
       - name: Validate project version matches tag
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index bd5dafbe60..37e27e0b8b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.1.0
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.1.0
         with:
           persist-credentials: false
 
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
+        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index d75d8a89ad..0a5ebc6c66 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v3.6.0
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From c57924f303a3e2e1326d02a34dcc410ec9b508e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 11:31:58 -0700
Subject: [PATCH 396/490] Bump github/codeql-action in the
 github-action-dependencies group (#872)

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.25.6 to 3.25.7
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/9fdb3e49720b44c48891d036bb502feb25684276...f079b8493333aace61c81488f8bd40919487bd9f)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 8d2ab2c380..371802083b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 37e27e0b8b..6b5df3d2ed 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
         with:
           sarif_file: results.sarif

From f350aa306b032581dc025d0f9bcfa065e576527c Mon Sep 17 00:00:00 2001
From: Richard Giliam <nirosys@gmail.com>
Date: Tue, 11 Jun 2024 17:03:49 -0700
Subject: [PATCH 397/490] Address ion-test-driver failure by upgrading pip with
 setup-python action. (#875)

* Use setup-python to force pip upgrade; fixes error with pip 22.0

* Roll ion-test-driver back to pre-1.1/1.0 split

* Revert ion-test-driver reference back to master

Co-authored-by: Tyler Gregg <greggt@amazon.com>

---------

Co-authored-by: Tyler Gregg <greggt@amazon.com>
---
 .github/workflows/ion-test-driver.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 35fe0ae983..3b6903d4fb 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -26,6 +26,11 @@ jobs:
           ref: master
           path: ion-test-driver
 
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
       - name: Set up python3 env
         run: python3 -m venv ion-test-driver/venv && . ion-test-driver/venv/bin/activate
 

From 04eed1279da254d34cbb3381f7d41f7d0530da8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jun 2024 09:54:17 -0700
Subject: [PATCH 398/490] Bump the github-action-dependencies group across 1
 directory with 4 updates (#886)

Bumps the github-action-dependencies group with 4 updates in the / directory: [actions/checkout](https://github.com/actions/checkout), [github/codeql-action](https://github.com/github/codeql-action), [gradle/actions](https://github.com/gradle/actions) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `actions/checkout` from 4.1.6 to 4.1.7
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/a5ac7e51b41094c92402da3b24376905380afc29...692973e3d937129bcbf40652eb9f2f61becf3332)

Updates `github/codeql-action` from 3.25.7 to 3.25.10
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f079b8493333aace61c81488f8bd40919487bd9f...23acc5c183826b7a8a97bce3cecc52db901f8251)

Updates `gradle/actions` from 3.3.2 to 3.4.1
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/db19848a5fa7950289d3668fb053140cf3028d43...31ae3562f68c96d481c31bc1a8a55cc1be162f83)

Updates `codecov/codecov-action` from 4.4.1 to 4.5.0
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/125fc84a9a348dbcf27191600683ec096ec9021c...e28ff129e5465c2c0dcc6f003fc735cb6ae0c673)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml                |  8 ++++----
 .../ion-java-performance-regression-detector.yml     |  8 ++++----
 .github/workflows/ion-test-driver.yml                |  6 +++---
 .github/workflows/main.yml                           | 12 ++++++------
 .github/workflows/prepare-release.yml                |  4 ++--
 .github/workflows/publish-release-artifacts.yml      |  4 ++--
 .github/workflows/scorecard.yml                      |  4 ++--
 .github/workflows/test-inspect-version-action.yml    |  2 +-
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 371802083b..4d7afe4148 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+        uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+        uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+        uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 8ee31d6c0e..b4168f88d5 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -84,21 +84,21 @@ jobs:
           java-version: 17
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           ref: ${{ github.base_ref }}
           submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 3b6903d4fb..89f1efa877 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # master
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # master
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -85,7 +85,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # master
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7cb462220a..9c8f435743 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           submodules: recursive
       - name: Setup Java
@@ -21,11 +21,11 @@ jobs:
           distribution: 'corretto'
           java-version: 8
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43
+        uses: gradle/actions/setup-gradle@31ae3562f68c96d481c31bc1a8a55cc1be162f83
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
@@ -42,7 +42,7 @@ jobs:
         java: [8, 11, 17, 21]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           submodules: recursive
       - name: Setup Java
@@ -53,7 +53,7 @@ jobs:
             8
             ${{matrix.java}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43
+        uses: gradle/actions/setup-gradle@31ae3562f68c96d481c31bc1a8a55cc1be162f83
         with:
           cache-read-only: true
           validate-wrappers: true
@@ -66,7 +66,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.6.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index a0fba671e3..53a57864d7 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.6.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.6.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 95cd7a235b..f26aaa65c3 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.6.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.6.0
         with:
           submodules: recursive
       - name: Validate project version matches tag
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43
+      - uses: gradle/actions/setup-gradle@31ae3562f68c96d481c31bc1a8a55cc1be162f83
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6b5df3d2ed..b6f7e1bc82 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.1.0
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.1.0
         with:
           persist-credentials: false
 
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index 0a5ebc6c66..1fd82fce01 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.6.0
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From 62f97c18b43d08bbf0d47adeb1931d10fc1aa805 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jun 2024 16:08:31 +0000
Subject: [PATCH 399/490] Bump gradle/actions in the github-action-dependencies
 group

Bumps the github-action-dependencies group with 1 update: [gradle/actions](https://github.com/gradle/actions).


Updates `gradle/actions` from 3.4.1 to 3.4.2
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/31ae3562f68c96d481c31bc1a8a55cc1be162f83...dbbdc275be76ac10734476cc723d82dfe7ec6eda)

---
updated-dependencies:
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/main.yml                      | 4 ++--
 .github/workflows/publish-release-artifacts.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9c8f435743..b4924602af 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
           distribution: 'corretto'
           java-version: 8
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@31ae3562f68c96d481c31bc1a8a55cc1be162f83
+        uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda
         with:
           validate-wrappers: true
       - run: ./gradlew build
@@ -53,7 +53,7 @@ jobs:
             8
             ${{matrix.java}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@31ae3562f68c96d481c31bc1a8a55cc1be162f83
+        uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index f26aaa65c3..85b6d37fc3 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@31ae3562f68c96d481c31bc1a8a55cc1be162f83
+      - uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda
         with:
           validate-wrappers: true
       - name: Build Release Artifacts

From f8e120544b380bfc6ef109ec41e947e7b126fa30 Mon Sep 17 00:00:00 2001
From: Zack Slayton <zack.slayton@gmail.com>
Date: Tue, 2 Jul 2024 06:34:02 -0400
Subject: [PATCH 400/490] Restores float <-> decimal conversions in the binary
 reader (#905)

While the documentation for `IonReader#doubleValue` and `decimalValue`
indicates that those methods will throw an exception when then the
current value's `IonType` is not `FLOAT` or `DECIMAL` respectively,
versions of `ion-java` up to and including v1.10.5 would quietly
coerce numeric values to the requested type. The new binary reader
implementation hewed to the documentation's stated contract, but
this ended up being a breaking change for a small number of users
who depended on the previous behavior.

This PR restores the previously supported numeric type coercions
for `doubleValue`, `decimalValue`, and `bigDecimalValue` and adds
unit tests to prevent future regressions.
---
 build.gradle.kts                              |  4 +-
 .../impl/IonReaderContinuableCoreBinary.java  | 13 +++-
 .../ion/IonReaderValueCoercionTest.java       | 78 +++++++++++++++++++
 3 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/com/amazon/ion/IonReaderValueCoercionTest.java

diff --git a/build.gradle.kts b/build.gradle.kts
index 98bd83ff67..614495f46b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -90,7 +90,7 @@ val githubRepositoryUrl = "https://github.com/amazon-ion/ion-java/"
 val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
 // The name we're checking for corresponds to the name that is set in the `publish-release-artifacts.yml` file.
 val isReleaseWorkflow: Boolean = System.getenv("GITHUB_WORKFLOW") == "Publish Release Artifacts"
-val generatedResourcesDir = "$buildDir/generated/main/resources"
+val generatedResourcesDir = "${layout.buildDirectory}/generated/main/resources"
 
 sourceSets {
     main {
@@ -103,7 +103,7 @@ licenseReport {
     // though ion-java does not depend on ion-java-cli. By default, the license report generator includes
     // the current project (ion-java) and all its subprojects.
     projects = arrayOf(project)
-    outputDir = "$buildDir/reports/licenses"
+    outputDir = "${layout.buildDirectory}/reports/licenses"
     renderers = arrayOf(InventoryMarkdownReportRenderer(), TextReportRenderer())
     // Dependencies use inconsistent titles for Apache-2.0, so we need to specify mappings
     filters = arrayOf(
diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
index df501feb7f..93331bfd31 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 package com.amazon.ion.impl;
 
 import com.amazon.ion.Decimal;
@@ -594,6 +593,12 @@ public BigDecimal bigDecimalValue() {
             scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.decimal_value));
             value = scalarConverter.getBigDecimal();
             scalarConverter.clear();
+        } else if (valueTid.type == IonType.FLOAT) {
+            scalarConverter.addValue(doubleValue());
+            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.double_value);
+            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.decimal_value));
+            value = scalarConverter.getDecimal();
+            scalarConverter.clear();
         } else {
             throwDueToInvalidType(IonType.DECIMAL);
         }
@@ -622,6 +627,12 @@ public Decimal decimalValue() {
             scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.decimal_value));
             value = scalarConverter.getDecimal();
             scalarConverter.clear();
+        } else if (valueTid.type == IonType.FLOAT) {
+            scalarConverter.addValue(doubleValue());
+            scalarConverter.setAuthoritativeType(_Private_ScalarConversions.AS_TYPE.double_value);
+            scalarConverter.cast(scalarConverter.get_conversion_fnid(_Private_ScalarConversions.AS_TYPE.decimal_value));
+            value = scalarConverter.getDecimal();
+            scalarConverter.clear();
         } else {
             throwDueToInvalidType(IonType.DECIMAL);
         }
diff --git a/src/test/java/com/amazon/ion/IonReaderValueCoercionTest.java b/src/test/java/com/amazon/ion/IonReaderValueCoercionTest.java
new file mode 100644
index 0000000000..f7701a7703
--- /dev/null
+++ b/src/test/java/com/amazon/ion/IonReaderValueCoercionTest.java
@@ -0,0 +1,78 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+package com.amazon.ion;
+
+import com.amazon.ion.system.IonReaderBuilder;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class IonReaderValueCoercionTest {
+
+    static Stream<InputStream> testData() {
+        byte[] textData = "$ion_1_0 42 42e0 42.0".getBytes(StandardCharsets.UTF_8);
+        byte[] binaryData = {
+            // Version marker 1.0
+            (byte) 0xE0, 0x01, 0x00, (byte) 0xEA,
+            // 1-byte int
+            0x21,
+            // `42`
+            0x2A,
+            // 4-byte float
+            0x44,
+            // `42e0`
+            0x42, 0x28, 0x00, 0x00,
+            // 3-byte decimal
+            0x53,
+            // `42d0`
+            (byte) 0xc1, 0x01, (byte) 0xa4,
+        };
+        return Stream.of(
+            new ByteArrayInputStream(textData),
+            new ByteArrayInputStream(binaryData)
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("testData")
+    void coerceNumberToDouble(InputStream inputStream) {
+        IonReader reader = IonReaderBuilder.standard().build(inputStream);
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(reader.doubleValue(), 42.0);
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(reader.doubleValue(), 42.0);
+        assertEquals(IonType.DECIMAL, reader.next());
+        assertEquals(reader.doubleValue(), 42.0);
+    }
+
+    @ParameterizedTest
+    @MethodSource("testData")
+    void coerceNumberToBigDecimal(InputStream inputStream) {
+        IonReader reader = IonReaderBuilder.standard().build(inputStream);
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(reader.bigDecimalValue(), BigDecimal.valueOf(42));
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(reader.bigDecimalValue(), BigDecimal.valueOf(42.0));
+        assertEquals(IonType.DECIMAL, reader.next());
+        assertEquals(reader.bigDecimalValue(), BigDecimal.valueOf(42.0));
+    }
+
+    @ParameterizedTest
+    @MethodSource("testData")
+    void coerceNumberToDecimal(InputStream inputStream) {
+        IonReader reader = IonReaderBuilder.standard().build(inputStream);
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(reader.decimalValue(), Decimal.valueOf(42));
+        assertEquals(IonType.FLOAT, reader.next());
+        assertEquals(reader.decimalValue(), Decimal.valueOf(42.0));
+        assertEquals(IonType.DECIMAL, reader.next());
+        assertEquals(reader.decimalValue(), Decimal.valueOf(42.0));
+    }
+}
\ No newline at end of file

From 2a46423868f24fb30d0d5050925711ba9581f4eb Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 2 Jul 2024 17:16:55 -0700
Subject: [PATCH 401/490] Fixes handling of annotation wrapper length
 overflows.

---
 .../com/amazon/ion/impl/IonCursorBinary.java  | 12 +++--
 .../amazon/ion/impl/IonCursorBinaryTest.java  | 50 +++++++++++++++++++
 2 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 6166cfc381..0014535e7f 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -502,6 +502,9 @@ private long availableAt(long index) {
      * @return true if the buffer has sufficient capacity; otherwise, false.
      */
     private boolean ensureCapacity(long minimumNumberOfBytesRequired) {
+        if (minimumNumberOfBytesRequired < 0) {
+            throw new IonException("The number of bytes required cannot be represented in a Java long.");
+        }
         if (freeSpaceAt(offset) >= minimumNumberOfBytesRequired) {
             // No need to shift any bytes or grow the buffer.
             return true;
@@ -809,11 +812,11 @@ private boolean uncheckedReadAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
             throw new IonException("Malformed data: declared length exceeds the number of bytes remaining in the stream.");
         }
         byte b = buffer[(int) peekIndex++];
-        int annotationsLength;
+        long annotationsLength;
         if (b < 0) {
             annotationsLength = (b & LOWER_SEVEN_BITS_BITMASK);
         } else {
-            annotationsLength = (int) uncheckedReadVarUInt_1_0(b);
+            annotationsLength = uncheckedReadVarUInt_1_0(b);
         }
         annotationSequenceMarker.startIndex = peekIndex;
         annotationSequenceMarker.endIndex = annotationSequenceMarker.startIndex + annotationsLength;
@@ -821,6 +824,9 @@ private boolean uncheckedReadAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
         if (peekIndex >= endIndex) {
             throw new IonException("Annotation wrapper must wrap a value.");
         }
+        if (peekIndex < 0) {
+            throw new IonException("Malformed data: declared length exceeds the number of bytes remaining in the stream.");
+        }
         return false;
     }
 
@@ -855,7 +861,7 @@ private boolean slowReadAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
         }
         // Record the post-length index in a value that will be shifted in the event the buffer needs to refill.
         setMarker(peekIndex + valueLength, valueMarker);
-        int annotationsLength = (int) slowReadVarUInt_1_0();
+        long annotationsLength = slowReadVarUInt_1_0();
         if (annotationsLength < 0) {
             return true;
         }
diff --git a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
index 38336067bc..fb0e99e57e 100644
--- a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
@@ -467,4 +467,54 @@ public void expectIncompleteIvmToFailCleanly(boolean constructFromBytes) {
         }
         cursor.close();
     }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void annotationSequenceLengthExceedsJavaLong(boolean constructFromBytes) {
+        try (
+            IonCursorBinary cursor = initializeCursor(
+                constructFromBytes,
+                0xE0, 0x01, 0x00, 0xEA, // IVM
+                0xEA, // Annotation wrapper, length 10
+                0x01, 0x16, 0x76, 0x76, 0x76, 0x76, 0x3F, 0x3F, 0x76, 0x76, 0xF3, // Annotation sequence length > Long.MAX_VALUE
+                0x9E // The start of the annotation sequence
+            )
+        ) {
+            assertThrows(IonException.class, cursor::nextValue);
+        }
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void annotationSequenceLengthPlusCurrentIndexExceedsJavaLong(boolean constructFromBytes) {
+        try (
+            IonCursorBinary cursor = initializeCursor(
+                constructFromBytes,
+                0xE0, 0x01, 0x00, 0xEA, // IVM
+                0xEA, // Annotation wrapper, length 10
+                0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, // Annotation sequence length = Long.MAX_VALUE
+                0x9E // The start of the annotation sequence
+            )
+        ) {
+            assertThrows(IonException.class, cursor::nextValue);
+        }
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void annotationWrapperLengthPlusCurrentIndexExceedsJavaLong(boolean constructFromBytes) {
+        try (
+            IonCursorBinary cursor = initializeCursor(
+                constructFromBytes,
+                0xE0, 0x01, 0x00, 0xEA, // IVM
+                0xEE, // Annotation wrapper, variable length
+                0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0xFF, // Annotation wrapper length = Long.MAX_VALUE
+                0x81, // Annotation sequence length = 1
+                0x83, // SID 3
+                0x9E // The start of the wrapped value
+            )
+        ) {
+            assertThrows(IonException.class, cursor::nextValue);
+        }
+    }
 }

From 549754309ed6aea059261071910ac7d454a2c35f Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 12 Jul 2024 15:50:52 -0700
Subject: [PATCH 402/490] Bumps version to 1.11.10-SNAPSHOT.

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 0461d5bfc4..f64fc5d4c7 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.9-SNAPSHOT
+1.11.10-SNAPSHOT

From 6d18900bc995bc8bf9ef7db34b049098b71d041f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 16:37:42 +0000
Subject: [PATCH 403/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.25.10 to 3.25.11
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/23acc5c183826b7a8a97bce3cecc52db901f8251...b611370bb5703a7efb587f9d136a52ea24c5c38c)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4d7afe4148..35d2545ea7 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+        uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+        uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+        uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b6f7e1bc82..6fe03c82e2 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+        uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
         with:
           sarif_file: results.sarif

From 8aa68f069abb58fa72be976ac83d04df563210c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 21:11:59 +0000
Subject: [PATCH 404/490] Bump the github-action-dependencies group across 1
 directory with 2 updates

Bumps the github-action-dependencies group with 2 updates in the / directory: [github/codeql-action](https://github.com/github/codeql-action) and [gradle/actions](https://github.com/gradle/actions).


Updates `github/codeql-action` from 3.25.11 to 3.25.12
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/b611370bb5703a7efb587f9d136a52ea24c5c38c...4fa2a7953630fd2f3fb380f21be14ede0169dd4f)

Updates `gradle/actions` from 3.4.2 to 3.5.0
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/dbbdc275be76ac10734476cc723d82dfe7ec6eda...d9c87d481d55275bb5441eef3fe0e46805f9ef70)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml           | 6 +++---
 .github/workflows/main.yml                      | 4 ++--
 .github/workflows/publish-release-artifacts.yml | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 35d2545ea7..91c7dbce6c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+        uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+        uses: github/codeql-action/autobuild@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+        uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b4924602af..0ce78b61eb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
           distribution: 'corretto'
           java-version: 8
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda
+        uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70
         with:
           validate-wrappers: true
       - run: ./gradlew build
@@ -53,7 +53,7 @@ jobs:
             8
             ${{matrix.java}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda
+        uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 85b6d37fc3..0c362c0e50 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda
+      - uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6fe03c82e2..76f97ae06b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+        uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
         with:
           sarif_file: results.sarif

From d6296157555e34c6b6967d24b6b8473a4e578dda Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Thu, 18 Jul 2024 09:29:51 -0700
Subject: [PATCH 405/490] Update README.md (#915)

Fixing the build, javadoc, and maven badges.
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index de1b515882..b42cacebe7 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # Amazon Ion Java
 A Java implementation of the [Ion data notation](https://amazon-ion.github.io/ion-docs).
 
-[![Build Status](https://travis-ci.org/amazon-ion/ion-java.svg?branch=master)](https://travis-ci.org/amazon-ion/ion-java)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.amazon.ion/ion-java/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.amazon.ion/ion-java)
-[![Javadoc](https://javadoc-badge.appspot.com/com.amazon.ion/ion-java.svg?label=javadoc)](http://www.javadoc.io/doc/com.amazon.ion/ion-java)
+![Build Status](https://github.com/amazon-ion/ion-java/actions/workflows/main.yml/badge.svg)
+![Maven Central Version](https://img.shields.io/maven-central/v/com.amazon.ion/ion-java)
+[![Javadoc](https://javadoc.io/badge2/com.amazon.ion/ion-java/javadoc.svg)](https://javadoc.io/doc/com.amazon.ion/ion-java) 
 
 ## Setup
 This repository contains a [git submodule](https://git-scm.com/docs/git-submodule)

From 4e600a0bc0715ace0f342b2b7cced23bdd384ba0 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Thu, 18 Jul 2024 09:40:25 -0700
Subject: [PATCH 406/490] Update README.md (#916)

* Update README.md

Badges at the top!

* Update README.md
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b42cacebe7..6c505670ba 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # Amazon Ion Java
-A Java implementation of the [Ion data notation](https://amazon-ion.github.io/ion-docs).
-
 ![Build Status](https://github.com/amazon-ion/ion-java/actions/workflows/main.yml/badge.svg)
 ![Maven Central Version](https://img.shields.io/maven-central/v/com.amazon.ion/ion-java)
 [![Javadoc](https://javadoc.io/badge2/com.amazon.ion/ion-java/javadoc.svg)](https://javadoc.io/doc/com.amazon.ion/ion-java) 
 
+A Java implementation of the [Ion data notation](https://amazon-ion.github.io/ion-docs).
+
 ## Setup
 This repository contains a [git submodule](https://git-scm.com/docs/git-submodule)
 called `ion-tests`, which holds test data used by `ion-java`'s unit tests.

From e75c3a480e5b1ce7f760823352c2d9d2d9648ca4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Aug 2024 12:32:29 -0700
Subject: [PATCH 407/490] Bump the github-action-dependencies group across 1
 directory with 2 updates (#918)

Bumps the github-action-dependencies group with 2 updates in the / directory: [github/codeql-action](https://github.com/github/codeql-action) and [ossf/scorecard-action](https://github.com/ossf/scorecard-action).


Updates `github/codeql-action` from 3.25.12 to 3.25.15
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4fa2a7953630fd2f3fb380f21be14ede0169dd4f...afb54ba388a7dca6ecae48f608c4ff05ff4cc77a)

Updates `ossf/scorecard-action` from 2.3.3 to 2.4.0
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/dc50aa9510b46c811795eb24b2f1ba02a914e534...62b2cac7ed8198b15735ed49ab1e5cf35480ba46)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 91c7dbce6c..7f8a0d0e63 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
+        uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
+        uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
+        uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 76f97ae06b..be822ad345 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -37,7 +37,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
+        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           sarif_file: results.sarif

From 76baedb45be616e6667b4b5ab7b3d2aa80da14b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 10:46:24 -0700
Subject: [PATCH 408/490] Bump the github-action-dependencies group with 2
 updates (#919)

Bumps the github-action-dependencies group with 2 updates: [actions/setup-java](https://github.com/actions/setup-java) and [gradle/actions](https://github.com/gradle/actions).


Updates `actions/setup-java` from 4.2.1 to 4.2.2
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4.2.1...v4.2.2)

Updates `gradle/actions` from 3.5.0 to 4
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/d9c87d481d55275bb5441eef3fe0e46805f9ef70...af1da67850ed9a4cedd57bfd976089dd991e2582)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../ion-java-performance-regression-detector.yml          | 2 +-
 .github/workflows/main.yml                                | 8 ++++----
 .github/workflows/publish-release-artifacts.yml           | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index b4168f88d5..41cea5a59e 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -78,7 +78,7 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.2.1
+        uses: actions/setup-java@v4.2.2
         with:
           distribution: 'corretto'
           java-version: 17
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 0ce78b61eb..d395cbed81 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,12 +16,12 @@ jobs:
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
         with:
           distribution: 'corretto'
           java-version: 8
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
         with:
           validate-wrappers: true
       - run: ./gradlew build
@@ -46,14 +46,14 @@ jobs:
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
         with:
           distribution: 'corretto'
           java-version: |
             8
             ${{matrix.java}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70
+        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 0c362c0e50..18df129251 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -42,7 +42,7 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-      - uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
         with:
           distribution: 'corretto'
           java-version: |
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@d9c87d481d55275bb5441eef3fe0e46805f9ef70
+      - uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
         with:
           validate-wrappers: true
       - name: Build Release Artifacts

From 86861f92acfc8585a3c24bfa3abb7262d01d8867 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 5 Aug 2024 16:49:14 -0700
Subject: [PATCH 409/490] Adds checks for annotation wrappers with length 0.

---
 .../com/amazon/ion/impl/IonCursorBinary.java  |  6 ++++
 .../amazon/ion/impl/IonCursorBinaryTest.java  | 31 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
index 0014535e7f..b6ffde9383 100644
--- a/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonCursorBinary.java
@@ -803,6 +803,9 @@ private boolean uncheckedReadAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
             } else {
                 endIndex = uncheckedReadVarUInt_1_0(b);
             }
+            if (endIndex == 0) {
+                throw new IonException("Annotation wrapper must wrap a value.");
+            }
         } else {
             endIndex = valueTid.length;
         }
@@ -851,6 +854,9 @@ private boolean slowReadAnnotationWrapperHeader_1_0(IonTypeID valueTid) {
             if (valueLength < 0) {
                 return true;
             }
+            if (valueLength == 0) {
+                throw new IonException("Annotation wrapper must wrap a value.");
+            }
         } else {
             // At this point the value must be at least 3 more bytes: 1 for the smallest-possible annotations
             // length, 1 for the smallest-possible annotation, and 1 for the smallest-possible value representation.
diff --git a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
index fb0e99e57e..4708b49ba1 100644
--- a/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonCursorBinaryTest.java
@@ -517,4 +517,35 @@ public void annotationWrapperLengthPlusCurrentIndexExceedsJavaLong(boolean const
             assertThrows(IonException.class, cursor::nextValue);
         }
     }
+
+    @Test
+    public void annotationWrapperLengthZeroAtStreamEndFailsCleanly() {
+        try (
+            IonCursorBinary cursor = initializeCursor(
+                // Note: a refillable reader would await more bytes before throwing. See the next test.
+                true,
+                0xE0, 0x01, 0x00, 0xEA, // IVM
+                0xEE, // Annotation wrapper, variable length
+                0x80  // VarUInt 0 at stream end. This is an error because annotation wrappers must wrap a value.
+            )
+        ) {
+            assertThrows(IonException.class, cursor::nextValue);
+        }
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void annotationWrapperLengthZeroFailsCleanly(boolean constructFromBytes) {
+        try (
+            IonCursorBinary cursor = initializeCursor(
+                constructFromBytes,
+                0xE0, 0x01, 0x00, 0xEA, // IVM
+                0xEE, // Annotation wrapper, variable length
+                0x80, // VarUInt 0. This is an error because annotation wrappers must wrap a value.
+                0x20, 0x20, 0x20 // Value bytes to pad the input. A refillable reader expects at least this many bytes to compose a valid annotation wrapper.
+            )
+        ) {
+            assertThrows(IonException.class, cursor::nextValue);
+        }
+    }
 }

From f7cf5e28241fdeaac1bb2149884469cc29ef7724 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Mon, 5 Aug 2024 17:22:03 -0700
Subject: [PATCH 410/490] Adds checks for timestamp values with length 0.

---
 .../impl/IonReaderContinuableCoreBinary.java  |  3 ++
 .../IonReaderContinuableCoreBinaryTest.java   | 35 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
index 93331bfd31..f0ce3e41be 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableCoreBinary.java
@@ -750,6 +750,9 @@ public Timestamp timestampValue() {
         }
         prepareScalar();
         peekIndex = valueMarker.startIndex;
+        if (peekIndex >= valueMarker.endIndex) {
+            throw new IonException("Timestamp value cannot have length 0.");
+        }
         return minorVersion == 0 ? readTimestamp_1_0() : readTimestamp_1_1();
     }
 
diff --git a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
index 2d81d09974..4b5c92fa2e 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderContinuableCoreBinaryTest.java
@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonCursor;
@@ -13,6 +12,7 @@
 import java.io.ByteArrayInputStream;
 
 import static com.amazon.ion.BitUtils.bytes;
+import static com.amazon.ion.IonCursor.Event.START_SCALAR;
 import static com.amazon.ion.impl.IonCursorTestUtilities.STANDARD_BUFFER_CONFIGURATION;
 import static com.amazon.ion.impl.IonCursorTestUtilities.Expectation;
 import static com.amazon.ion.impl.IonCursorTestUtilities.ExpectationProvider;
@@ -631,4 +631,37 @@ public void expectIncompleteAnnotationHeaderToFailCleanly() {
         assertThrows(IonException.class, reader::nextValue);
         reader.close();
     }
+
+    @Test
+    public void timestampLengthZeroAtStreamEndFailsCleanly() {
+        try (
+            IonReaderContinuableCoreBinary reader = initializeReader(
+                // Note: a refillable reader would await more bytes before throwing. See the next test.
+                true,
+                0xE0, 0x01, 0x00, 0xEA, // IVM
+                0x6E, // Timestamp value, variable length.
+                0x80  // VarUInt 0 at stream end. This is an error because there is no length 0 timestamp.
+            )
+        ) {
+            assertEquals(START_SCALAR, reader.nextValue());
+            assertThrows(IonException.class, reader::timestampValue);
+        }
+    }
+
+    @ParameterizedTest(name = "constructFromBytes={0}")
+    @ValueSource(booleans = {true, false})
+    public void timestampLengthZeroFailsCleanly(boolean constructFromBytes) {
+        try (
+            IonReaderContinuableCoreBinary reader = initializeReader(
+                constructFromBytes,
+                0xE0, 0x01, 0x00, 0xEA, // IVM
+                0x6E, // Timestamp value, variable length.
+                0x80, // VarUInt 0 at stream end. This is an error because there is no length 0 timestamp.
+                0x20   // Value byte to pad the input. A refillable reader expects at least this many bytes to compose a valid timestamp.
+            )
+        ) {
+            assertEquals(START_SCALAR, reader.nextValue());
+            assertThrows(IonException.class, reader::timestampValue);
+        }
+    }
 }

From 85c41a4fd8900ba478c01cc4c71d4bca63ee70a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:49:45 +0000
Subject: [PATCH 411/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.25.15 to 3.26.0
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/afb54ba388a7dca6ecae48f608c4ff05ff4cc77a...eb055d739abdc2e8de2e5f4ba1a8b246daa779aa)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7f8a0d0e63..c82eeba68d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/autobuild@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index be822ad345..33b3927df9 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
         with:
           sarif_file: results.sarif

From b268c916400462ec39fa880ab25b453b592f6b54 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 10:38:08 -0700
Subject: [PATCH 412/490] Bump github/codeql-action in the
 github-action-dependencies group (#925)

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.26.0 to 3.26.2
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/eb055d739abdc2e8de2e5f4ba1a8b246daa779aa...429e1977040da7a23b6822b13c129cd1ba93dbb2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c82eeba68d..b723b4970a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
+        uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
+        uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
+        uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 33b3927df9..12baeed6d0 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
+        uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
         with:
           sarif_file: results.sarif

From ea306ebca60e442d78609025927a5e003ac61850 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 9 Aug 2024 17:50:54 -0700
Subject: [PATCH 413/490] Adds a 'jmh' gradle target and directory for adding
 targeted microbenchmarks; adds one for IonValue.getType().

---
 build.gradle.kts                              |   2 +
 settings.gradle.kts                           |   1 +
 .../amazon/ion/IonValueGetTypeBenchmark.java  | 104 ++++++++++++++++++
 3 files changed, 107 insertions(+)
 create mode 100644 src/jmh/java/com/amazon/ion/IonValueGetTypeBenchmark.java

diff --git a/build.gradle.kts b/build.gradle.kts
index 614495f46b..9df5b7f987 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -44,6 +44,8 @@ plugins {
     // Without `apply false`, the plugin is automatically applied to the main "jar" task, which somehow interferes with
     // the "spotbugsMain" task, causing it to fail. Instead, we will create a separate task to generate the bundle info.
     id("biz.aQute.bnd.builder") version "6.4.0" apply false
+
+    id("me.champeau.jmh") version "0.7.2"
 }
 
 jacoco {
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 054e32e32e..89ea6b1f1d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,3 +6,4 @@ plugins {
 
 rootProject.name = "ion-java"
 include("ion-java-cli")
+include("jmh")
diff --git a/src/jmh/java/com/amazon/ion/IonValueGetTypeBenchmark.java b/src/jmh/java/com/amazon/ion/IonValueGetTypeBenchmark.java
new file mode 100644
index 0000000000..156a5a771a
--- /dev/null
+++ b/src/jmh/java/com/amazon/ion/IonValueGetTypeBenchmark.java
@@ -0,0 +1,104 @@
+package com.amazon.ion;
+
+
+import com.amazon.ion.system.IonSystemBuilder;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.BenchmarkMode;
+import org.openjdk.jmh.annotations.Fork;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Measurement;
+import org.openjdk.jmh.annotations.Mode;
+import org.openjdk.jmh.annotations.OutputTimeUnit;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.Warmup;
+import org.openjdk.jmh.infra.Blackhole;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.concurrent.TimeUnit;
+
+@BenchmarkMode(Mode.AverageTime)
+@OutputTimeUnit(TimeUnit.NANOSECONDS)
+@Fork(1)
+@Warmup(iterations = 3, time = 10, timeUnit = TimeUnit.SECONDS)
+@Measurement(iterations = 5, time = 10, timeUnit = TimeUnit.SECONDS)
+@State(Scope.Benchmark)
+public class IonValueGetTypeBenchmark {
+
+    private static final IonSystem system = IonSystemBuilder.standard().build();
+
+    private final IonBool bool = system.newBool(false);
+    private final IonInt integer = system.newInt(123);
+    private final IonNull ionNull = system.newNull();
+    private final IonFloat ionFloat = system.newFloat(42);
+    private final IonDecimal ionDecimal = system.newDecimal(1.23);
+    private final IonString string = system.newString("abc");
+    private final IonSymbol symbol = system.newSymbol("def");
+    private final IonBlob blob = system.newBlob(new byte[]{});
+    private final IonClob clob = system.newClob(new byte[]{});
+    private final IonStruct struct = system.newEmptyStruct();
+    private final IonList list = system.newEmptyList();
+    private final IonSexp sexp = system.newEmptySexp();
+    private final IonDatagram dg = system.newDatagram();
+
+    @Benchmark
+    public int testAddSuffixViaInstanceVariablePlus() {
+        return integer.getType().ordinal() +
+            bool.getType().ordinal() +
+            ionNull.getType().ordinal() +
+            ionFloat.getType().ordinal() +
+            ionDecimal.getType().ordinal() +
+            string.getType().ordinal() +
+            symbol.getType().ordinal() +
+            blob.getType().ordinal() +
+            clob.getType().ordinal() +
+            struct.getType().ordinal() +
+            list.getType().ordinal() +
+            sexp.getType().ordinal() +
+            dg.getType().ordinal();
+    }
+
+    private final IonDatagram realWorld;
+    private Blackhole bh;
+
+    public IonValueGetTypeBenchmark() {
+        try {
+            realWorld = system.getLoader().load(Paths.get("/Users/greggt/Documents/StructuredLogging/kinesis/service_log_legacy.ion").toFile());
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Setup
+    public void setup(Blackhole bh) {
+        this.bh = bh;
+    }
+
+    @Benchmark
+    public void getTypeReadWorld() {
+        getTypeRecursive(realWorld);
+    }
+
+    public void getTypeRecursive(IonContainer container) {
+        bh.consume(container.getType());
+        for (IonValue child : container) {
+            IonType type = child.getType();
+            bh.consume(type);
+            switch (type) {
+                case STRUCT:
+                case LIST:
+                case SEXP:
+                    getTypeRecursive((IonContainer) child);
+                    break;
+                default:
+                    break;
+            }
+        }
+    }
+}

From fa12d308c6ad20b686b7f18e0fa03d9e3d571d2c Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 13 Aug 2024 14:42:57 -0700
Subject: [PATCH 414/490] Optimizes IonValue.getType() to avoid vtable/itable
 lookups when invoked on IonStruct values.

---
 .../amazon/ion/IonValueGetTypeBenchmark.java  | 45 +++++++++----------
 .../com/amazon/ion/impl/lite/IonBlobLite.java | 19 ++------
 .../com/amazon/ion/impl/lite/IonBoolLite.java | 19 ++------
 .../com/amazon/ion/impl/lite/IonClobLite.java | 19 ++------
 .../amazon/ion/impl/lite/IonDatagramLite.java | 19 ++------
 .../amazon/ion/impl/lite/IonDecimalLite.java  | 19 ++------
 .../amazon/ion/impl/lite/IonFloatLite.java    | 19 ++------
 .../com/amazon/ion/impl/lite/IonIntLite.java  | 19 ++------
 .../com/amazon/ion/impl/lite/IonListLite.java | 19 ++------
 .../com/amazon/ion/impl/lite/IonNullLite.java | 19 ++------
 .../com/amazon/ion/impl/lite/IonSexpLite.java | 19 ++------
 .../amazon/ion/impl/lite/IonStringLite.java   | 19 ++------
 .../amazon/ion/impl/lite/IonStructLite.java   | 19 ++------
 .../amazon/ion/impl/lite/IonSymbolLite.java   | 19 ++------
 .../ion/impl/lite/IonTimestampLite.java       |  2 +-
 .../amazon/ion/impl/lite/IonValueLite.java    | 37 ++++++++-------
 16 files changed, 81 insertions(+), 250 deletions(-)

diff --git a/src/jmh/java/com/amazon/ion/IonValueGetTypeBenchmark.java b/src/jmh/java/com/amazon/ion/IonValueGetTypeBenchmark.java
index 156a5a771a..518c0b9f01 100644
--- a/src/jmh/java/com/amazon/ion/IonValueGetTypeBenchmark.java
+++ b/src/jmh/java/com/amazon/ion/IonValueGetTypeBenchmark.java
@@ -1,3 +1,5 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion;
 
 
@@ -5,7 +7,6 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
@@ -16,11 +17,7 @@
 import org.openjdk.jmh.infra.Blackhole;
 
 import java.io.IOException;
-import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
 import java.util.concurrent.TimeUnit;
 
 @BenchmarkMode(Mode.AverageTime)
@@ -31,24 +28,24 @@
 @State(Scope.Benchmark)
 public class IonValueGetTypeBenchmark {
 
-    private static final IonSystem system = IonSystemBuilder.standard().build();
+    private static final IonSystem SYSTEM = IonSystemBuilder.standard().build();
 
-    private final IonBool bool = system.newBool(false);
-    private final IonInt integer = system.newInt(123);
-    private final IonNull ionNull = system.newNull();
-    private final IonFloat ionFloat = system.newFloat(42);
-    private final IonDecimal ionDecimal = system.newDecimal(1.23);
-    private final IonString string = system.newString("abc");
-    private final IonSymbol symbol = system.newSymbol("def");
-    private final IonBlob blob = system.newBlob(new byte[]{});
-    private final IonClob clob = system.newClob(new byte[]{});
-    private final IonStruct struct = system.newEmptyStruct();
-    private final IonList list = system.newEmptyList();
-    private final IonSexp sexp = system.newEmptySexp();
-    private final IonDatagram dg = system.newDatagram();
+    private final IonBool bool = SYSTEM.newBool(false);
+    private final IonInt integer = SYSTEM.newInt(123);
+    private final IonNull ionNull = SYSTEM.newNull();
+    private final IonFloat ionFloat = SYSTEM.newFloat(42);
+    private final IonDecimal ionDecimal = SYSTEM.newDecimal(1.23);
+    private final IonString string = SYSTEM.newString("abc");
+    private final IonSymbol symbol = SYSTEM.newSymbol("def");
+    private final IonBlob blob = SYSTEM.newBlob(new byte[]{});
+    private final IonClob clob = SYSTEM.newClob(new byte[]{});
+    private final IonStruct struct = SYSTEM.newEmptyStruct();
+    private final IonList list = SYSTEM.newEmptyList();
+    private final IonSexp sexp = SYSTEM.newEmptySexp();
+    private final IonDatagram dg = SYSTEM.newDatagram();
 
     @Benchmark
-    public int testAddSuffixViaInstanceVariablePlus() {
+    public int ionValueGetType() {
         return integer.getType().ordinal() +
             bool.getType().ordinal() +
             ionNull.getType().ordinal() +
@@ -64,12 +61,12 @@ public int testAddSuffixViaInstanceVariablePlus() {
             dg.getType().ordinal();
     }
 
-    private final IonDatagram realWorld;
+    private final IonDatagram container;
     private Blackhole bh;
 
     public IonValueGetTypeBenchmark() {
         try {
-            realWorld = system.getLoader().load(Paths.get("/Users/greggt/Documents/StructuredLogging/kinesis/service_log_legacy.ion").toFile());
+            container = SYSTEM.getLoader().load(Paths.get("ion-tests/iontestdata/good/message2.ion").toFile());
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -81,8 +78,8 @@ public void setup(Blackhole bh) {
     }
 
     @Benchmark
-    public void getTypeReadWorld() {
-        getTypeRecursive(realWorld);
+    public void getTypeContainer() {
+        getTypeRecursive(container);
     }
 
     public void getTypeRecursive(IonContainer container) {
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonBlobLite.java b/src/main/java/com/amazon/ion/impl/lite/IonBlobLite.java
index baffccb7ef..bcab70da3c 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonBlobLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonBlobLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.IonBlob;
@@ -67,7 +54,7 @@ int scalarHashCode() {
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.BLOB;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonBoolLite.java b/src/main/java/com/amazon/ion/impl/lite/IonBoolLite.java
index 2ceab4391e..2429a72f79 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonBoolLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonBoolLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.IonBool;
@@ -68,7 +55,7 @@ public IonBoolLite clone()
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.BOOL;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonClobLite.java b/src/main/java/com/amazon/ion/impl/lite/IonClobLite.java
index aa55dd7735..702d29f88b 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonClobLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonClobLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.IonClob;
@@ -70,7 +57,7 @@ int scalarHashCode() {
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.CLOB;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java b/src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java
index 4f37ec801c..6edf35a668 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import static com.amazon.ion.SystemSymbols.ION_1_0;
@@ -386,7 +373,7 @@ public IonSystemLite getSystem()
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.DATAGRAM;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonDecimalLite.java b/src/main/java/com/amazon/ion/impl/lite/IonDecimalLite.java
index 395c016a5a..0358a0f069 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonDecimalLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonDecimalLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.Decimal;
@@ -105,7 +92,7 @@ int scalarHashCode()
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.DECIMAL;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonFloatLite.java b/src/main/java/com/amazon/ion/impl/lite/IonFloatLite.java
index 829a0c3a67..61a98b97ff 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonFloatLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonFloatLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.Decimal;
@@ -76,7 +63,7 @@ int scalarHashCode()
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.FLOAT;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonIntLite.java b/src/main/java/com/amazon/ion/impl/lite/IonIntLite.java
index 37b290074d..ec3cdc93de 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonIntLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonIntLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.IntegerSize;
@@ -107,7 +94,7 @@ int scalarHashCode()
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.INT;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonListLite.java b/src/main/java/com/amazon/ion/impl/lite/IonListLite.java
index 0a1dc088a7..c14b64474e 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonListLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonListLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.ContainedValueException;
@@ -81,7 +68,7 @@ int hashSignature() {
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.LIST;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonNullLite.java b/src/main/java/com/amazon/ion/impl/lite/IonNullLite.java
index bb959b4f78..0d92116696 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonNullLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonNullLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.IonNull;
@@ -58,7 +45,7 @@ public IonNullLite clone()
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.NULL;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonSexpLite.java b/src/main/java/com/amazon/ion/impl/lite/IonSexpLite.java
index e9d61233a5..4da7c77d33 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonSexpLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonSexpLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.ContainedValueException;
@@ -75,7 +62,7 @@ int hashSignature() {
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.SEXP;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonStringLite.java b/src/main/java/com/amazon/ion/impl/lite/IonStringLite.java
index 99d3d227a1..199eb18726 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonStringLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonStringLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.IonString;
@@ -70,7 +57,7 @@ int scalarHashCode()
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.STRING;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonStructLite.java b/src/main/java/com/amazon/ion/impl/lite/IonStructLite.java
index 2bd4f1715a..f72b734344 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonStructLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonStructLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import com.amazon.ion.ContainedValueException;
@@ -345,7 +332,7 @@ else if (_children == null) {
 
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.STRUCT;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonSymbolLite.java b/src/main/java/com/amazon/ion/impl/lite/IonSymbolLite.java
index 15bbd3e68b..b9d38554e2 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonSymbolLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonSymbolLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
@@ -124,7 +111,7 @@ int scalarHashCode()
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.SYMBOL;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonTimestampLite.java b/src/main/java/com/amazon/ion/impl/lite/IonTimestampLite.java
index 2eb8b4d791..b6c286e462 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonTimestampLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonTimestampLite.java
@@ -64,7 +64,7 @@ int scalarHashCode() {
     }
 
     @Override
-    public IonType getType()
+    public IonType getTypeSlow()
     {
         return IonType.TIMESTAMP;
     }
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java b/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java
index e80b54833c..08fd6661fa 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl.lite;
 
 import static com.amazon.ion.SymbolTable.UNKNOWN_SYMBOL_ID;
@@ -842,11 +829,27 @@ public IonSystemLite getSystem()
         return _context.getSystem();
     }
 
-    public IonType getType()
+    public final IonType getType()
     {
-        throw new UnsupportedOperationException("this type "+this.getClass().getSimpleName()+" should not be instantiated, there is not IonType associated with it");
+        Class<?> clazz = this.getClass();
+        // IonStructLite is chosen for the fast path because it is the most commonly used container type as well as
+        // one of the most common of all types. This is important because internal usages of IonValue.getType() occur
+        // on container values much more often than on scalars. Do not remove or add special case branches here without
+        // a thorough study of the performance implications.
+        if (clazz == IonStructLite.class) {
+            return IonType.STRUCT;
+        }
+        return getTypeSlow();
     }
 
+    /**
+     * @see #getType()
+     * This variant is considered "slow" because it is an abstract method with 14 implementations, meaning that it
+     * is invoked using a vtable lookup.
+     * @return the value's type.
+     */
+    abstract IonType getTypeSlow();
+
     public SymbolToken[] getTypeAnnotationSymbols()
     {
         return getTypeAnnotationSymbols(new LazySymbolTableProvider(this));

From efe350023d01226268de2c7c05ff9b2e5376d7f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Sep 2024 11:59:53 -0700
Subject: [PATCH 415/490] Bump the github-action-dependencies group across 1
 directory with 2 updates (#931)

Bumps the github-action-dependencies group with 2 updates in the / directory: [github/codeql-action](https://github.com/github/codeql-action) and [gradle/actions](https://github.com/gradle/actions).


Updates `github/codeql-action` from 3.26.2 to 3.26.6
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/429e1977040da7a23b6822b13c129cd1ba93dbb2...4dd16135b69a43b6c8efb853346f8437d92d3c93)

Updates `gradle/actions` from 4.0.0 to 4.0.1
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/af1da67850ed9a4cedd57bfd976089dd991e2582...16bf8bc8fe830fa669c3c9f914d3eb147c629707)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml           | 6 +++---
 .github/workflows/main.yml                      | 4 ++--
 .github/workflows/publish-release-artifacts.yml | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b723b4970a..1a4595d79a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
+        uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
+        uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
+        uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d395cbed81..2e7088d885 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
           distribution: 'corretto'
           java-version: 8
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
+        uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
         with:
           validate-wrappers: true
       - run: ./gradlew build
@@ -53,7 +53,7 @@ jobs:
             8
             ${{matrix.java}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
+        uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 18df129251..be5ec04b59 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
+      - uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 12baeed6d0..66d060b26e 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
+        uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
         with:
           sarif_file: results.sarif

From 9e6c570561b81a253bda301379c0a521db165604 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Sep 2024 16:09:25 +0000
Subject: [PATCH 416/490] Bump actions/setup-java in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [actions/setup-java](https://github.com/actions/setup-java).


Updates `actions/setup-java` from 4.2.2 to 4.3.0
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4.2.2...v4.3.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .../workflows/ion-java-performance-regression-detector.yml    | 2 +-
 .github/workflows/main.yml                                    | 4 ++--
 .github/workflows/publish-release-artifacts.yml               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 41cea5a59e..6dbd8c51c3 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -78,7 +78,7 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.2.2
+        uses: actions/setup-java@v4.3.0
         with:
           distribution: 'corretto'
           java-version: 17
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2e7088d885..1aa614a33f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+        uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: 8
@@ -46,7 +46,7 @@ jobs:
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+        uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index be5ec04b59..acb0d86fe2 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -42,7 +42,7 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-      - uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+      - uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |

From 8886b900219bd0bdf07343bbe77e993b2a950a97 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Sep 2024 16:13:53 +0000
Subject: [PATCH 417/490] Bump the github-action-dependencies group across 1
 directory with 4 updates

Bumps the github-action-dependencies group with 4 updates in the / directory: [actions/checkout](https://github.com/actions/checkout), [github/codeql-action](https://github.com/github/codeql-action), [actions/setup-java](https://github.com/actions/setup-java) and [gradle/actions](https://github.com/gradle/actions).


Updates `actions/checkout` from 4.1.7 to 4.2.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938)

Updates `github/codeql-action` from 3.26.6 to 3.26.10
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4dd16135b69a43b6c8efb853346f8437d92d3c93...e2b3eafc8d227b0241d48be5f425d47c2d750a13)

Updates `actions/setup-java` from 4.3.0 to 4.4.0
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4.3.0...v4.4.0)

Updates `gradle/actions` from 4.0.1 to 4.1.0
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/16bf8bc8fe830fa669c3c9f914d3eb147c629707...d156388eb19639ec20ade50009f3d199ce1e2808)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml              |  8 ++++----
 .../ion-java-performance-regression-detector.yml   | 10 +++++-----
 .github/workflows/ion-test-driver.yml              |  6 +++---
 .github/workflows/main.yml                         | 14 +++++++-------
 .github/workflows/prepare-release.yml              |  4 ++--
 .github/workflows/publish-release-artifacts.yml    |  6 +++---
 .github/workflows/scorecard.yml                    |  4 ++--
 .github/workflows/test-inspect-version-action.yml  |  2 +-
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1a4595d79a..85e2d9545b 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/autobuild@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 6dbd8c51c3..ccaf91e354 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -78,27 +78,27 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.3.0
+        uses: actions/setup-java@v4.4.0
         with:
           distribution: 'corretto'
           java-version: 17
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           ref: ${{ github.base_ref }}
           submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 89f1efa877..8e03c7a55a 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # master
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # master
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -85,7 +85,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # master
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1aa614a33f..9477e79b1b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,16 +12,16 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
+        uses: actions/setup-java@292cc14be88d32cccdd768342b8aa1296a4d8d46 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: 8
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
+        uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
         with:
           validate-wrappers: true
       - run: ./gradlew build
@@ -42,18 +42,18 @@ jobs:
         java: [8, 11, 17, 21]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
+        uses: actions/setup-java@292cc14be88d32cccdd768342b8aa1296a4d8d46 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |
             8
             ${{matrix.java}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
+        uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
         with:
           cache-read-only: true
           validate-wrappers: true
@@ -66,7 +66,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.6.0
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 53a57864d7..6ac9beceb1 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.6.0
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.6.0
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index acb0d86fe2..5aa2df204f 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.6.0
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.6.0
         with:
           submodules: recursive
       - name: Validate project version matches tag
@@ -42,7 +42,7 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-      - uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
+      - uses: actions/setup-java@292cc14be88d32cccdd768342b8aa1296a4d8d46 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@16bf8bc8fe830fa669c3c9f914d3eb147c629707
+      - uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 66d060b26e..23e0752f04 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.1.0
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.1.0
         with:
           persist-credentials: false
 
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index 1fd82fce01..46fed2f31e 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.6.0
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From 52c1e166f6c59bcd4f77ba74ff09e4bd4da301e0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 17:01:13 +0000
Subject: [PATCH 418/490] Bump the github-action-dependencies group with 3
 updates

Bumps the github-action-dependencies group with 3 updates: [actions/checkout](https://github.com/actions/checkout), [github/codeql-action](https://github.com/github/codeql-action) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `actions/checkout` from 4.2.0 to 4.2.1
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/d632683dd7b4114ad314bca15554477dd762a938...eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871)

Updates `github/codeql-action` from 3.26.10 to 3.26.11
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/e2b3eafc8d227b0241d48be5f425d47c2d750a13...6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea)

Updates `codecov/codecov-action` from 4.5.0 to 4.6.0
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/e28ff129e5465c2c0dcc6f003fc735cb6ae0c673...b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml                     | 8 ++++----
 .../ion-java-performance-regression-detector.yml          | 8 ++++----
 .github/workflows/ion-test-driver.yml                     | 6 +++---
 .github/workflows/main.yml                                | 8 ++++----
 .github/workflows/prepare-release.yml                     | 4 ++--
 .github/workflows/publish-release-artifacts.yml           | 2 +-
 .github/workflows/scorecard.yml                           | 4 ++--
 .github/workflows/test-inspect-version-action.yml         | 2 +-
 8 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 85e2d9545b..63efa27cee 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
+        uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
+        uses: github/codeql-action/autobuild@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
+        uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index ccaf91e354..bfe4be52fb 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -84,21 +84,21 @@ jobs:
           java-version: 17
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           ref: ${{ github.base_ref }}
           submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 8e03c7a55a..c1f677b9f9 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # master
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # master
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -85,7 +85,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # master
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9477e79b1b..f9453d751c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           submodules: recursive
       - name: Setup Java
@@ -25,7 +25,7 @@ jobs:
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
@@ -42,7 +42,7 @@ jobs:
         java: [8, 11, 17, 21]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           submodules: recursive
       - name: Setup Java
@@ -66,7 +66,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.6.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 6ac9beceb1..49fa9f3417 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.6.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.6.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 5aa2df204f..0c966852dc 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.6.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.6.0
         with:
           submodules: recursive
       - name: Validate project version matches tag
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 23e0752f04..a9b49fe5b9 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.1.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.1.0
         with:
           persist-credentials: false
 
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
+        uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index 46fed2f31e..04550c7922 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v3.6.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From 8df4b676202ae5a46ca3d54493fd8fe0db9d5c76 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 17:00:35 +0000
Subject: [PATCH 419/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.26.11 to 3.26.13
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea...f779452ac5af1c261dce0346a8f964149f49322b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 63efa27cee..1d9b8b5cb9 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
+        uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
+        uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
+        uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a9b49fe5b9..d0271d4e84 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
+        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
         with:
           sarif_file: results.sarif

From 333e4fea96d9bd1a2244d32e9558548e39fa2461 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Oct 2024 16:50:12 +0000
Subject: [PATCH 420/490] Bump the github-action-dependencies group with 3
 updates

Bumps the github-action-dependencies group with 3 updates: [actions/checkout](https://github.com/actions/checkout), [github/codeql-action](https://github.com/github/codeql-action) and [actions/setup-java](https://github.com/actions/setup-java).


Updates `actions/checkout` from 4.2.1 to 4.2.2
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871...11bd71901bbe5b1630ceea73d27597364c9af683)

Updates `github/codeql-action` from 3.26.13 to 3.27.0
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f779452ac5af1c261dce0346a8f964149f49322b...662472033e021d55d94146f66f6058822b0b39fd)

Updates `actions/setup-java` from 4.4.0 to 4.5.0
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4.4.0...v4.5.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml                  |  8 ++++----
 .../ion-java-performance-regression-detector.yml       | 10 +++++-----
 .github/workflows/ion-test-driver.yml                  |  6 +++---
 .github/workflows/main.yml                             | 10 +++++-----
 .github/workflows/prepare-release.yml                  |  4 ++--
 .github/workflows/publish-release-artifacts.yml        |  4 ++--
 .github/workflows/scorecard.yml                        |  4 ++--
 .github/workflows/test-inspect-version-action.yml      |  2 +-
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1d9b8b5cb9..302e3d991c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index bfe4be52fb..99f860ec62 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -78,27 +78,27 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.4.0
+        uses: actions/setup-java@v4.5.0
         with:
           distribution: 'corretto'
           java-version: 17
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           ref: ${{ github.base_ref }}
           submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index c1f677b9f9..1232e7a763 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # master
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # master
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -85,7 +85,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # master
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f9453d751c..883bf22d08 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,11 +12,11 @@ jobs:
   build-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@292cc14be88d32cccdd768342b8aa1296a4d8d46 # v4.3.0
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.3.0
         with:
           distribution: 'corretto'
           java-version: 8
@@ -42,11 +42,11 @@ jobs:
         java: [8, 11, 17, 21]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@292cc14be88d32cccdd768342b8aa1296a4d8d46 # v4.3.0
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |
@@ -66,7 +66,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 49fa9f3417..b30eab9761 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 0c966852dc..63d8726eb2 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
         with:
           submodules: recursive
       - name: Validate project version matches tag
@@ -42,7 +42,7 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-      - uses: actions/setup-java@292cc14be88d32cccdd768342b8aa1296a4d8d46 # v4.3.0
+      - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index d0271d4e84..a7ea4ad1f3 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.1.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.1.0
         with:
           persist-credentials: false
 
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index 04550c7922..e53e2df6df 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v3.6.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From f6ff4a5ac87b8d764476d5600f49d7c573226e09 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Nov 2024 08:56:38 -0800
Subject: [PATCH 421/490] Bump github/codeql-action in the
 github-action-dependencies group (#989)

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.27.0 to 3.27.1
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/662472033e021d55d94146f66f6058822b0b39fd...4f3212b61783c3c68e8309a0f18a699764811cda)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 302e3d991c..8fb56fd6f8 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/autobuild@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a7ea4ad1f3..31d8f03212 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
         with:
           sarif_file: results.sarif

From b07e90db02e2724588d54a9be2d0947c7339ba01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Nov 2024 16:47:26 +0000
Subject: [PATCH 422/490] Bump the github-action-dependencies group with 3
 updates

Bumps the github-action-dependencies group with 3 updates: [github/codeql-action](https://github.com/github/codeql-action), [gradle/actions](https://github.com/gradle/actions) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `github/codeql-action` from 3.27.1 to 3.27.4
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4f3212b61783c3c68e8309a0f18a699764811cda...ea9e4e37992a54ee68a9622e985e60c8e8f12d9f)

Updates `gradle/actions` from 4.1.0 to 4.2.0
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/d156388eb19639ec20ade50009f3d199ce1e2808...473878a77f1b98e2b5ac4af93489d1656a80a5ed)

Updates `codecov/codecov-action` from 4.6.0 to 5.0.2
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238...5c47607acb93fed5485fdbf7232e8a31425f672a)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml           | 6 +++---
 .github/workflows/main.yml                      | 6 +++---
 .github/workflows/publish-release-artifacts.yml | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 8fb56fd6f8..d35739acca 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
+        uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
+        uses: github/codeql-action/autobuild@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
+        uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 883bf22d08..9e29f7d574 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,11 +21,11 @@ jobs:
           distribution: 'corretto'
           java-version: 8
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
+        uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
+      - uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a # v5.0.2
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
@@ -53,7 +53,7 @@ jobs:
             8
             ${{matrix.java}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
+        uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 63d8726eb2..9c83ea5e00 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@d156388eb19639ec20ade50009f3d199ce1e2808
+      - uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 31d8f03212..7c8106174a 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
+        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           sarif_file: results.sarif

From fbb3fbf350e76bcf5bb6812a40cf23cd84c2ff1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 18:22:21 +0000
Subject: [PATCH 423/490] Bump the github-action-dependencies group with 3
 updates

Bumps the github-action-dependencies group with 3 updates: [github/codeql-action](https://github.com/github/codeql-action), [gradle/actions](https://github.com/gradle/actions) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `github/codeql-action` from 3.27.4 to 3.27.5
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/ea9e4e37992a54ee68a9622e985e60c8e8f12d9f...f09c1c0a94de965c15400f5634aa42fac8fb8f88)

Updates `gradle/actions` from 4.2.0 to 4.2.1
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/473878a77f1b98e2b5ac4af93489d1656a80a5ed...cc4fc85e6b35bafd578d5ffbc76a5518407e1af0)

Updates `codecov/codecov-action` from 5.0.2 to 5.0.7
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/5c47607acb93fed5485fdbf7232e8a31425f672a...015f24e6818733317a2da2edd6290ab26238649a)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml           | 6 +++---
 .github/workflows/main.yml                      | 6 +++---
 .github/workflows/publish-release-artifacts.yml | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index d35739acca..8d9b9b65ec 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+        uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+        uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+        uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9e29f7d574..4e3ea868e1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,11 +21,11 @@ jobs:
           distribution: 'corretto'
           java-version: 8
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed
+        uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@5c47607acb93fed5485fdbf7232e8a31425f672a # v5.0.2
+      - uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
@@ -53,7 +53,7 @@ jobs:
             8
             ${{matrix.java}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed
+        uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 9c83ea5e00..f8ddde066a 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@473878a77f1b98e2b5ac4af93489d1656a80a5ed
+      - uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 7c8106174a..ffd510e58c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
         with:
           sarif_file: results.sarif

From 0f11e0de5f6bf0ddf8625f25e1d6effea845389d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Dec 2024 16:40:24 +0000
Subject: [PATCH 424/490] Bump the github-action-dependencies group with 2
 updates

Bumps the github-action-dependencies group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `github/codeql-action` from 3.27.5 to 3.27.6
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f09c1c0a94de965c15400f5634aa42fac8fb8f88...aa578102511db1f4524ed59b8cc2bae4f6e88195)

Updates `codecov/codecov-action` from 5.0.7 to 5.1.1
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/015f24e6818733317a2da2edd6290ab26238649a...7f8b4b4bde536c465e797be725718b88c5d95e0e)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/main.yml            | 2 +-
 .github/workflows/scorecard.yml       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 8d9b9b65ec..1ba0f54ad3 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4e3ea868e1..3e2c83cd2f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@015f24e6818733317a2da2edd6290ab26238649a # v5.0.7
+      - uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ffd510e58c..d59976ce48 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: results.sarif

From 5ad0e30a82d80deabd2fbc1906cf1920b31c3161 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Dec 2024 16:49:37 +0000
Subject: [PATCH 425/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.27.6 to 3.27.9
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/aa578102511db1f4524ed59b8cc2bae4f6e88195...df409f7d9260372bd5f19e5b04e83cb3c43714ae)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1ba0f54ad3..c26acc23f9 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/autobuild@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index d59976ce48..1a27afa804 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
         with:
           sarif_file: results.sarif

From 9e8a7364d0077ae8226b842cfc2e66c61bddfd7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 16:13:22 +0000
Subject: [PATCH 426/490] Bump the github-action-dependencies group with 4
 updates

Bumps the github-action-dependencies group with 4 updates: [github/codeql-action](https://github.com/github/codeql-action), [actions/setup-java](https://github.com/actions/setup-java), [gradle/actions](https://github.com/gradle/actions) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `github/codeql-action` from 3.27.9 to 3.28.0
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/df409f7d9260372bd5f19e5b04e83cb3c43714ae...48ab28a6f5dbc2a99bf1e0131198dd8f1df78169)

Updates `actions/setup-java` from 4.5.0 to 4.6.0
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4.5.0...v4.6.0)

Updates `gradle/actions` from 4.2.1 to 4.2.2
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/cc4fc85e6b35bafd578d5ffbc76a5518407e1af0...0bdd871935719febd78681f197cd39af5b6e16a6)

Updates `codecov/codecov-action` from 5.1.1 to 5.1.2
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/7f8b4b4bde536c465e797be725718b88c5d95e0e...1e68e06f1dbfde0e4cefc87efeba9e4643565303)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml                  |  6 +++---
 .../ion-java-performance-regression-detector.yml       |  2 +-
 .github/workflows/main.yml                             | 10 +++++-----
 .github/workflows/publish-release-artifacts.yml        |  4 ++--
 .github/workflows/scorecard.yml                        |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c26acc23f9..5d587f29a4 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
+        uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
+        uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
+        uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 99f860ec62..881f6a5d47 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -78,7 +78,7 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.5.0
+        uses: actions/setup-java@v4.6.0
         with:
           distribution: 'corretto'
           java-version: 17
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3e2c83cd2f..6773bc909c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,16 +16,16 @@ jobs:
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.3.0
+        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.3.0
         with:
           distribution: 'corretto'
           java-version: 8
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0
+        uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@7f8b4b4bde536c465e797be725718b88c5d95e0e # v5.1.1
+      - uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
@@ -46,14 +46,14 @@ jobs:
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.3.0
+        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |
             8
             ${{matrix.java}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0
+        uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index f8ddde066a..77352e99f2 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -42,7 +42,7 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-      - uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.3.0
+      - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@cc4fc85e6b35bafd578d5ffbc76a5518407e1af0
+      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 1a27afa804..eeda3b43aa 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
+        uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
         with:
           sarif_file: results.sarif

From 66acb7a26e448300495f655f542eef3323654525 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 13:00:05 -0800
Subject: [PATCH 427/490] Bump github/codeql-action in the
 github-action-dependencies group (#1029)

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.28.0 to 3.28.1
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/48ab28a6f5dbc2a99bf1e0131198dd8f1df78169...b6a472f63d85b9c78a3ac5e89422239fc15e9b3c)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 5d587f29a4..2cb17ac6b2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
+        uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
+        uses: github/codeql-action/autobuild@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
+        uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index eeda3b43aa..c99d2ba098 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
+        uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
         with:
           sarif_file: results.sarif

From 4ccee4d9af359d5993afc2f5030a18a873f7de12 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 21 Jan 2025 16:21:34 -0800
Subject: [PATCH 428/490] Adds the InputStreamInterceptor interface to allow
 users to plug in custom interceptors for formats like Zstd. (#930)

* Adds a StreamInterceptor interface to allow users to plug in custom interceptors for formats like Zstd.

* Adds support for detection of interceptors on the classpath; renames StreamInterceptor to InputStreamInterceptor.

* Addresses PR feedback on the addition of InputStreamInterceptor.

* Adds support for detecting format headers from InputStreams that require multiple read() calls to produce enough bytes to fill a header.

* Addresses more PR feedback.

* Uses static initialization of stream interceptors instead of caching.

* Makes manually added stream interceptors follow detected stream interceptors, rather than replacing them.

* Renames InputStreamInterceptor methods to avoid referring to 'headers'.

* Minor cleanups.
---
 build.gradle.kts                              |   1 +
 config/spotbugs/baseline.xml                  | 946 +++++++++---------
 .../ion/impl/_Private_IonReaderBuilder.java   | 142 ++-
 .../ion/impl/_Private_IonReaderFactory.java   |  23 +-
 .../amazon/ion/system/IonReaderBuilder.java   | 107 +-
 .../ion/util/GzipStreamInterceptor.java       |  46 +
 .../ion/util/InputStreamInterceptor.java      |  53 +
 .../ion/system/IonReaderBuilderTest.java      |  30 +-
 .../ion/util/ZstdStreamInterceptorTest.java   | 439 ++++++++
 9 files changed, 1204 insertions(+), 583 deletions(-)
 create mode 100644 src/main/java/com/amazon/ion/util/GzipStreamInterceptor.java
 create mode 100644 src/main/java/com/amazon/ion/util/InputStreamInterceptor.java
 create mode 100644 src/test/java/com/amazon/ion/util/ZstdStreamInterceptorTest.java

diff --git a/build.gradle.kts b/build.gradle.kts
index 9df5b7f987..9451d2550c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -79,6 +79,7 @@ dependencies {
     testImplementation("org.hamcrest:hamcrest:2.2")
     testImplementation("pl.pragmatists:JUnitParams:1.1.1")
     testImplementation("com.google.code.tempus-fugit:tempus-fugit:1.1")
+    testImplementation("com.github.luben:zstd-jni:1.5.6-5")
 }
 
 group = "com.amazon.ion"
diff --git a/config/spotbugs/baseline.xml b/config/spotbugs/baseline.xml
index 656a32390c..b5121577fc 100644
--- a/config/spotbugs/baseline.xml
+++ b/config/spotbugs/baseline.xml
@@ -1,15 +1,15 @@
-<BugCollection version="4.7.3" sequence="0" timestamp="1712606556088" analysisTimestamp="1712606556119" release="1.11.5-SNAPSHOT">
+<BugCollection version="4.7.3" sequence="0" timestamp="1736547976201" analysisTimestamp="1736547976211" release="1.11.10-SNAPSHOT">
   <BugInstance type="NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE" priority="2" rank="13" abbrev="NP" category="STYLE" instanceHash="dfc0f20e980ed41b0fb16167cccef563" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
     <ShortMessage>Possible null pointer dereference on branch that might be infeasible</ShortMessage>
     <LongMessage>Possible null pointer dereference of Timestamp._fraction on branch that might be infeasible in com.amazon.ion.Timestamp.equals(Timestamp)</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2884]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="75" end="2962" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 75-2962]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="equals" signature="(Lcom/amazon/ion/Timestamp;)Z" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="2766" end="2808" startBytecode="0" endBytecode="450" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2844" end="2886" startBytecode="0" endBytecode="450" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.equals(Timestamp)</Message>
     </Method>
     <Field classname="com.amazon.ion.Timestamp" name="_fraction" signature="Ljava/math/BigDecimal;" isStatic="false" primary="true" role="FIELD_CONTAINS_VALUE">
@@ -18,29 +18,29 @@
       </SourceLine>
       <Message>Value contained in com.amazon.ion.Timestamp._fraction</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2808" end="2808" startBytecode="251" endBytecode="251" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_DEREF">
-      <Message>Dereferenced at Timestamp.java:[line 2808]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2886" end="2886" startBytecode="251" endBytecode="251" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_DEREF">
+      <Message>Dereferenced at Timestamp.java:[line 2886]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2804" end="2804" startBytecode="238" endBytecode="238" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_KNOWN_NULL">
-      <Message>Known null at Timestamp.java:[line 2804]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2882" end="2882" startBytecode="238" endBytecode="238" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_KNOWN_NULL">
+      <Message>Known null at Timestamp.java:[line 2882]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RC_REF_COMPARISON" priority="1" rank="1" abbrev="RC" category="CORRECTNESS" instanceHash="37701f2731e243676fa1126c1a454fea" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Comparaison de références suspecte</ShortMessage>
-    <LongMessage>Comparaison suspecte des références com.amazon.ion.Timestamp._offset dans com.amazon.ion.Timestamp.make_localtime()</LongMessage>
+    <ShortMessage>Suspicious reference comparison</ShortMessage>
+    <LongMessage>Suspicious comparison of Integer references in com.amazon.ion.Timestamp.make_localtime()</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2884]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="75" end="2962" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 75-2962]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="make_localtime" signature="()Lcom/amazon/ion/Timestamp;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="1225" end="1251" startBytecode="0" endBytecode="49" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="1238" end="1264" startBytecode="0" endBytecode="49" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.make_localtime()</Message>
     </Method>
     <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.Integer" start="71" end="1872" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
-        <Message>At Integer.java:[lines 71-1872]</Message>
+      <SourceLine classname="java.lang.Integer" start="52" end="1590" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
+        <Message>At Integer.java:[lines 52-1590]</Message>
       </SourceLine>
       <Message>Actual type Integer</Message>
     </Type>
@@ -50,64 +50,26 @@
       </SourceLine>
       <Message>Value loaded from field com.amazon.ion.Timestamp._offset</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="1249" end="1249" startBytecode="85" endBytecode="85" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[line 1249]</Message>
-    </SourceLine>
-  </BugInstance>
-  <BugInstance type="RC_REF_COMPARISON_BAD_PRACTICE" priority="2" rank="16" abbrev="RC" category="BAD_PRACTICE" instanceHash="ba9366bac044ba2194b3cae4093c18c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Suspicious reference comparison to constant</ShortMessage>
-    <LongMessage>Suspicious comparison of a Integer reference to constant in com.amazon.ion.Timestamp.print(Appendable, Timestamp)</LongMessage>
-    <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2884]</Message>
-      </SourceLine>
-      <Message>In class com.amazon.ion.Timestamp</Message>
-    </Class>
-    <Method classname="com.amazon.ion.Timestamp" name="print" signature="(Ljava/lang/Appendable;Lcom/amazon/ion/Timestamp;)V" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="2162" end="2229" startBytecode="0" endBytecode="177" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
-      <Message>In method com.amazon.ion.Timestamp.print(Appendable, Timestamp)</Message>
-    </Method>
-    <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.Integer" start="71" end="1872" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
-        <Message>At Integer.java:[lines 71-1872]</Message>
-      </SourceLine>
-      <Message>Actual type Integer</Message>
-    </Type>
-    <Field classname="com.amazon.ion.Timestamp" name="UNKNOWN_OFFSET" signature="Ljava/lang/Integer;" isStatic="true" primary="true" role="FIELD_VALUE_OF">
-      <SourceLine classname="com.amazon.ion.Timestamp" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-        <Message>In Timestamp.java</Message>
-      </SourceLine>
-      <Message>Value loaded from field com.amazon.ion.Timestamp.UNKNOWN_OFFSET</Message>
-    </Field>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2171" end="2171" startBytecode="47" endBytecode="47" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[line 2171]</Message>
-    </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2179" end="2179" startBytecode="111" endBytecode="111" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[line 2179]</Message>
-    </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2187" end="2187" startBytecode="175" endBytecode="175" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[line 2187]</Message>
-    </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2205" end="2205" startBytecode="276" endBytecode="276" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[line 2205]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="1262" end="1262" startBytecode="85" endBytecode="85" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[line 1262]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RC_REF_COMPARISON_BAD_PRACTICE" priority="2" rank="16" abbrev="RC" category="BAD_PRACTICE" instanceHash="937b7d8f7325c30807c0d31b0d3bdba7" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Suspicious reference comparison to constant</ShortMessage>
     <LongMessage>Suspicious comparison of a Integer reference to constant in com.amazon.ion.Timestamp.printZ(Appendable)</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2884]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="75" end="2962" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 75-2962]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="printZ" signature="(Ljava/lang/Appendable;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="2125" end="2146" startBytecode="0" endBytecode="30" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2183" end="2204" startBytecode="0" endBytecode="30" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.printZ(Appendable)</Message>
     </Method>
     <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.Integer" start="71" end="1872" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
-        <Message>At Integer.java:[lines 71-1872]</Message>
+      <SourceLine classname="java.lang.Integer" start="52" end="1590" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
+        <Message>At Integer.java:[lines 52-1590]</Message>
       </SourceLine>
       <Message>Actual type Integer</Message>
     </Type>
@@ -117,26 +79,26 @@
       </SourceLine>
       <Message>Value loaded from field com.amazon.ion.Timestamp.UNKNOWN_OFFSET</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2131" end="2131" startBytecode="61" endBytecode="61" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[line 2131]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2189" end="2189" startBytecode="61" endBytecode="61" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[line 2189]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RC_REF_COMPARISON_BAD_PRACTICE" priority="2" rank="16" abbrev="RC" category="BAD_PRACTICE" instanceHash="c185acf6bba0feadecfdd3085f6dc93b" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Suspicious reference comparison to constant</ShortMessage>
     <LongMessage>Suspicious comparison of a Integer reference to constant in com.amazon.ion.Timestamp.set_fields_from_calendar(Calendar, Timestamp$Precision, boolean)</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2884]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="75" end="2962" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 75-2962]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="set_fields_from_calendar" signature="(Ljava/util/Calendar;Lcom/amazon/ion/Timestamp$Precision;Z)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="382" end="440" startBytecode="0" endBytecode="130" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="395" end="453" startBytecode="0" endBytecode="130" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.set_fields_from_calendar(Calendar, Timestamp$Precision, boolean)</Message>
     </Method>
     <Type descriptor="Ljava/lang/Integer;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.Integer" start="71" end="1872" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
-        <Message>At Integer.java:[lines 71-1872]</Message>
+      <SourceLine classname="java.lang.Integer" start="52" end="1590" sourcefile="Integer.java" sourcepath="java/lang/Integer.java">
+        <Message>At Integer.java:[lines 52-1590]</Message>
       </SourceLine>
       <Message>Actual type Integer</Message>
     </Type>
@@ -146,105 +108,105 @@
       </SourceLine>
       <Message>Value loaded from field com.amazon.ion.Timestamp.UNKNOWN_OFFSET</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="436" end="436" startBytecode="285" endBytecode="285" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[line 436]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="449" end="449" startBytecode="285" endBytecode="285" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[line 449]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="c2029a51b12e7834b0f8742d886d38c3" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer) comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer) where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2884]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="75" end="2962" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 75-2962]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="&lt;init&gt;" signature="(Ljava/math/BigDecimal;Lcom/amazon/ion/Timestamp$Precision;Ljava/lang/Integer;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="743" end="782" startBytecode="0" endBytecode="434" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="756" end="795" startBytecode="0" endBytecode="434" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="757" end="759" startBytecode="110" endBytecode="113" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[lines 757-759]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="770" end="772" startBytecode="110" endBytecode="113" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 770-772]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="759" end="761" startBytecode="115" endBytecode="118" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[lines 759-761]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="772" end="774" startBytecode="115" endBytecode="118" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 772-774]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="762" end="764" startBytecode="125" endBytecode="128" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[lines 762-764]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="775" end="777" startBytecode="125" endBytecode="128" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 775-777]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="74f8353cfe942e522c8de66a81285331" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.Timestamp.clearUnusedPrecision() comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.Timestamp.clearUnusedPrecision() where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2884]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="75" end="2962" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 75-2962]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="clearUnusedPrecision" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="2365" end="2378" startBytecode="0" endBytecode="157" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2443" end="2456" startBytecode="0" endBytecode="157" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.clearUnusedPrecision()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2367" end="2369" startBytecode="46" endBytecode="49" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[lines 2367-2369]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2445" end="2447" startBytecode="46" endBytecode="49" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 2445-2447]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2369" end="2371" startBytecode="51" endBytecode="54" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[lines 2369-2371]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2447" end="2449" startBytecode="51" endBytecode="54" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 2447-2449]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.Timestamp" start="2372" end="2374" startBytecode="61" endBytecode="64" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at Timestamp.java:[lines 2372-2374]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" start="2450" end="2452" startBytecode="61" endBytecode="64" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at Timestamp.java:[lines 2450-2452]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="83ced4ac6513fc3047dd1da75d409bd2" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2884]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="75" end="2962" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 75-2962]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="&lt;init&gt;" signature="(Ljava/math/BigDecimal;Lcom/amazon/ion/Timestamp$Precision;Ljava/lang/Integer;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="743" end="782" startBytecode="0" endBytecode="434" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="756" end="795" startBytecode="0" endBytecode="434" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method new com.amazon.ion.Timestamp(BigDecimal, Timestamp$Precision, Integer)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="754" end="764" startBytecode="70" endBytecode="132" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[lines 754-764]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="767" end="777" startBytecode="70" endBytecode="132" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 767-777]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="96331491fb00e3addee611d915a03efe" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.Timestamp.calendarValue() where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2884]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="75" end="2962" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 75-2962]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="calendarValue" signature="()Ljava/util/Calendar;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="1578" end="1611" startBytecode="0" endBytecode="351" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="1591" end="1624" startBytecode="0" endBytecode="351" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.calendarValue()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="1594" end="1607" startBytecode="87" endBytecode="166" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[lines 1594-1607]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="1607" end="1620" startBytecode="87" endBytecode="166" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 1607-1620]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="6da020549cddfb25863236aec8fd75ec" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.Timestamp.clearUnusedPrecision() where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.Timestamp" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="74" end="2884" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-        <Message>At Timestamp.java:[lines 74-2884]</Message>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="75" end="2962" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+        <Message>At Timestamp.java:[lines 75-2962]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.Timestamp</Message>
     </Class>
     <Method classname="com.amazon.ion.Timestamp" name="clearUnusedPrecision" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="2365" end="2378" startBytecode="0" endBytecode="157" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="2443" end="2456" startBytecode="0" endBytecode="157" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>In method com.amazon.ion.Timestamp.clearUnusedPrecision()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2365" end="2375" startBytecode="11" endBytecode="73" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
-      <Message>At Timestamp.java:[lines 2365-2375]</Message>
+    <SourceLine classname="com.amazon.ion.Timestamp" primary="true" start="2443" end="2453" startBytecode="11" endBytecode="73" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java">
+      <Message>At Timestamp.java:[lines 2443-2453]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE" priority="1" rank="14" abbrev="CN" category="BAD_PRACTICE" instanceHash="48115647b6b96b3a00651b8a0648e649" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="580">
@@ -265,8 +227,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="OS_OPEN_STREAM" priority="2" rank="16" abbrev="OS" category="BAD_PRACTICE" instanceHash="2beb630b98529c2ec849305b3b9385cd" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>La méthode peut ne pas fermer un flux</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl.BlockedBuffer(InputStream) peut ne pas fermer un flux</LongMessage>
+    <ShortMessage>Method may fail to close stream</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.BlockedBuffer(InputStream) may fail to close stream</LongMessage>
     <Class classname="com.amazon.ion.impl.BlockedBuffer" primary="true">
       <SourceLine classname="com.amazon.ion.impl.BlockedBuffer" start="38" end="1041" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>At BlockedBuffer.java:[lines 38-1041]</Message>
@@ -278,8 +240,8 @@
       <Message>In method new com.amazon.ion.impl.BlockedBuffer(InputStream)</Message>
     </Method>
     <Type descriptor="Ljava/io/OutputStream;" role="TYPE_CLOSEIT">
-      <SourceLine classname="java.io.OutputStream" start="52" end="198" sourcefile="OutputStream.java" sourcepath="java/io/OutputStream.java">
-        <Message>At OutputStream.java:[lines 52-198]</Message>
+      <SourceLine classname="java.io.OutputStream" start="46" end="152" sourcefile="OutputStream.java" sourcepath="java/io/OutputStream.java">
+        <Message>At OutputStream.java:[lines 46-152]</Message>
       </SourceLine>
       <Message>Need to close java.io.OutputStream </Message>
     </Type>
@@ -288,8 +250,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="49ae3f2aff89fca77ece8f5b6b1d8e1d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream._buf</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer) may expose internal representation by storing an externally mutable object into BlockedBuffer$BlockedByteOutputStream._buf</LongMessage>
     <Class classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true">
       <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1310" end="1656" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>At BlockedBuffer.java:[lines 1310-1656]</Message>
@@ -314,8 +276,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="d862968857053de2e52f028d75db8af3" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer, int) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream._buf</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream(BlockedBuffer, int) may expose internal representation by storing an externally mutable object into BlockedBuffer$BlockedByteOutputStream._buf</LongMessage>
     <Class classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" primary="true">
       <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BlockedByteOutputStream" start="1310" end="1656" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>At BlockedBuffer.java:[lines 1310-1656]</Message>
@@ -340,8 +302,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="7df0b5cbb977df79b8ff3750bbd5a37d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream(BlockedBuffer) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream._buffer</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream(BlockedBuffer) may expose internal representation by storing an externally mutable object into BlockedBuffer$BufferedOutputStream._buffer</LongMessage>
     <Class classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" primary="true">
       <SourceLine classname="com.amazon.ion.impl.BlockedBuffer$BufferedOutputStream" start="1674" end="1776" sourcefile="BlockedBuffer.java" sourcepath="com/amazon/ion/impl/BlockedBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/BlockedBuffer.java">
         <Message>At BlockedBuffer.java:[lines 1674-1776]</Message>
@@ -472,8 +434,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="7a2dfc422120143b681c7f39bd32798c" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.buffer() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._buf</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.buffer() may expose internal representation by returning IonBinary$BufferManager._buf</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
@@ -495,8 +457,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="bb5993199b143728b278261ec17b72f2" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.openReader() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._reader</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.openReader() may expose internal representation by returning IonBinary$BufferManager._reader</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
@@ -518,8 +480,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="13a1cd7af738123e4c2e7d41e42da55f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.openWriter() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._writer</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.openWriter() may expose internal representation by returning IonBinary$BufferManager._writer</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
@@ -541,8 +503,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="e23a2c4995e81e2f50e116d22b11817" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.reader() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._reader</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.reader() may expose internal representation by returning IonBinary$BufferManager._reader</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
@@ -564,8 +526,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="33ce07038be68a0b32e72494c0b0779d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.reader(int) risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._reader</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.reader(int) may expose internal representation by returning IonBinary$BufferManager._reader</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
@@ -587,8 +549,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="ce9dc2b4001e503cbc79f5cd18a70d87" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.writer() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._writer</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.writer() may expose internal representation by returning IonBinary$BufferManager._writer</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
@@ -610,8 +572,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="3f96230ef763752c8cd65017112683aa" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.IonBinary$BufferManager.writer(int) risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.IonBinary$BufferManager._writer</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonBinary$BufferManager.writer(int) may expose internal representation by returning IonBinary$BufferManager._writer</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
@@ -633,8 +595,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="cb558f16e9df13958572ae691116db56" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl.IonBinary$BufferManager(BlockedBuffer) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.IonBinary$BufferManager._buf</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.IonBinary$BufferManager(BlockedBuffer) may expose internal representation by storing an externally mutable object into IonBinary$BufferManager._buf</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$BufferManager" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonBinary$BufferManager" start="322" end="437" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 322-437]</Message>
@@ -659,8 +621,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="9748c6aaf34a4d74620a1ec326f0f096" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.IonBinary$Reader.readIntAsInt(int) comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonBinary$Reader.readIntAsInt(int) where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$Reader" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonBinary$Reader" start="942" end="1815" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 942-1815]</Message>
@@ -710,8 +672,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="BIT_AND" priority="1" rank="5" abbrev="BIT" category="CORRECTNESS" instanceHash="489579953b9cb45b99949c6c8254098f" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Masques binaires incompatibles</ShortMessage>
-    <LongMessage>Des masques binaires incompatibles renvoient un résultat constant dans com.amazon.ion.impl.IonBinary$Writer.writeIntValue(long)</LongMessage>
+    <ShortMessage>Incompatible bit masks</ShortMessage>
+    <LongMessage>Incompatible bit masks in (e &amp; 0x80 == 0x40) yields a constant result in com.amazon.ion.impl.IonBinary$Writer.writeIntValue(long)</LongMessage>
     <Class classname="com.amazon.ion.impl.IonBinary$Writer" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonBinary$Writer" start="1819" end="2917" sourcefile="IonBinary.java" sourcepath="com/amazon/ion/impl/IonBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonBinary.java">
         <Message>At IonBinary.java:[lines 1819-2917]</Message>
@@ -733,327 +695,327 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="SBSC_USE_STRINGBUFFER_CONCATENATION" priority="2" rank="18" abbrev="SBSC" category="PERFORMANCE" instanceHash="1983f5982865e6bca7fcbab80f84c0eb" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>La méthode concatène des chaînes au moyen de + en boucle</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.IonReaderTextRawTokensX.peekNullTypeSymbolUndo(int[], int) concatène des chaînes au moyen de + en boucle</LongMessage>
+    <ShortMessage>Method concatenates strings using + in a loop</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.IonReaderTextRawTokensX.peekNullTypeSymbolUndo(int[], int) concatenates strings using + in a loop</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="peekNullTypeSymbolUndo" signature="([II)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="426" end="434" startBytecode="0" endBytecode="186" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="413" end="421" startBytecode="0" endBytecode="186" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.peekNullTypeSymbolUndo(int[], int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="429" end="429" startBytecode="12" endBytecode="12" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[line 429]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="416" end="416" startBytecode="12" endBytecode="12" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 416]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="7ac13daf00bed04a0dc687024ba3a5c3" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.load_double_quoted_string(StringBuilder, boolean) comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.load_double_quoted_string(StringBuilder, boolean) where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="load_double_quoted_string" signature="(Ljava/lang/StringBuilder;Z)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2038" end="2079" startBytecode="0" endBytecode="388" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2025" end="2066" startBytecode="0" endBytecode="388" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.load_double_quoted_string(StringBuilder, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2057" end="2059" startBytecode="115" endBytecode="118" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2057-2059]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2044" end="2046" startBytecode="115" endBytecode="118" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2044-2046]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="e71ff3699310d9d02654e42aa19f1ea7" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.load_fixed_digits(StringBuilder, int) comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.load_fixed_digits(StringBuilder, int) where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="load_fixed_digits" signature="(Ljava/lang/StringBuilder;I)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1713" end="1744" startBytecode="0" endBytecode="388" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1700" end="1731" startBytecode="0" endBytecode="388" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.load_fixed_digits(StringBuilder, int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1725" end="1728" startBytecode="90" endBytecode="91" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 1725-1728]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1712" end="1715" startBytecode="90" endBytecode="91" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1712-1715]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1730" end="1733" startBytecode="114" endBytecode="115" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 1730-1733]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1717" end="1720" startBytecode="114" endBytecode="115" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 1717-1720]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1735" end="1738" startBytecode="138" endBytecode="139" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 1735-1738]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1722" end="1725" startBytecode="138" endBytecode="139" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 1722-1725]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="aa3a0c04d8e812b2cc9b8e968316999c" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.load_single_quoted_string(StringBuilder, boolean) comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.load_single_quoted_string(StringBuilder, boolean) where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="load_single_quoted_string" signature="(Ljava/lang/StringBuilder;Z)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1954" end="2000" startBytecode="0" endBytecode="421" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1941" end="1987" startBytecode="0" endBytecode="421" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.load_single_quoted_string(StringBuilder, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1973" end="1977" startBytecode="115" endBytecode="118" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 1973-1977]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1960" end="1964" startBytecode="115" endBytecode="118" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1960-1964]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="52a2b4795d02a2af4518de7c8fc46346" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_byte_helper() comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_byte_helper() where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_base64_byte_helper" signature="()I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2557" end="2589" startBytecode="0" endBytecode="441" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2544" end="2576" startBytecode="0" endBytecode="439" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_byte_helper()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2579" end="2582" startBytecode="148" endBytecode="151" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2579-2582]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2566" end="2569" startBytecode="146" endBytecode="149" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2566-2569]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2583" end="2586" startBytecode="174" endBytecode="177" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 2583-2586]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2570" end="2573" startBytecode="172" endBytecode="175" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 2570-2573]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="a8ea82c1e5d992dab6cd75d14f2a8a05" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper() comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper() where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_double_quoted_string_helper" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2016" end="2029" startBytecode="0" endBytecode="178" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2003" end="2016" startBytecode="0" endBytecode="178" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2019" end="2024" startBytecode="69" endBytecode="72" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2019-2024]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2006" end="2011" startBytecode="69" endBytecode="72" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2006-2011]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2024" end="2026" startBytecode="74" endBytecode="77" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
-      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 2024-2026]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2011" end="2013" startBytecode="74" endBytecode="77" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+      <Message>Another occurrence at IonReaderTextRawTokensX.java:[lines 2011-2013]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="d1e587d656a8337e9067d0cf2b73a976" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.skip_over_container(int) comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_over_container(int) where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_over_container" signature="(I)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1213" end="1298" startBytecode="0" endBytecode="637" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1200" end="1285" startBytecode="0" endBytecode="636" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_over_container(int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1225" end="1229" startBytecode="129" endBytecode="132" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 1225-1229]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1212" end="1216" startBytecode="129" endBytecode="132" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1212-1216]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="a4a066a68adf31d418a174990aefe0b1" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint) comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint) where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_single_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1935" end="1945" startBytecode="0" endBytecode="176" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1922" end="1932" startBytecode="0" endBytecode="176" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1937" end="1939" startBytecode="45" endBytecode="48" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 1937-1939]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1924" end="1926" startBytecode="45" endBytecode="48" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1924-1926]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="ee5b2dc71707fd11c5c55336b3872f2a" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy) comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy) where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_triple_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;Lcom/amazon/ion/impl/IonReaderTextRawTokensX$CommentStrategy;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2152" end="2177" startBytecode="0" endBytecode="261" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2139" end="2164" startBytecode="0" endBytecode="261" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2155" end="2157" startBytecode="41" endBytecode="44" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2155-2157]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2142" end="2144" startBytecode="41" endBytecode="44" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2142-2144]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="75b268bc0bf180f5e16e86d8d89d390d" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.read_escaped_char_content_helper(int, boolean) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_escaped_char_content_helper" signature="(IZ)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2473" end="2512" startBytecode="0" endBytecode="365" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2460" end="2499" startBytecode="0" endBytecode="363" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_escaped_char_content_helper(int, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2490" end="2509" startBytecode="64" endBytecode="187" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2490-2509]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2477" end="2496" startBytecode="64" endBytecode="185" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2477-2496]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="fca794c841dd591a8aa91960632076fc" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_block_comment() where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_block_comment" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="939" end="955" startBytecode="0" endBytecode="152" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="926" end="942" startBytecode="0" endBytecode="152" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_block_comment()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="940" end="953" startBytecode="6" endBytecode="57" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 940-953]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="927" end="940" startBytecode="6" endBytecode="57" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 927-940]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="567161b456e11f066d8b9bfff637442b" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper() where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_double_quoted_string_helper" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2016" end="2029" startBytecode="0" endBytecode="178" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2003" end="2016" startBytecode="0" endBytecode="178" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_double_quoted_string_helper()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2017" end="2028" startBytecode="9" endBytecode="82" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2017-2028]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2004" end="2015" startBytecode="9" endBytecode="82" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2004-2015]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="4cf1c4e0aa4e006bf568be9fbda9762b" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_single_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1935" end="1945" startBytecode="0" endBytecode="176" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="1922" end="1932" startBytecode="0" endBytecode="176" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_single_quoted_string(UnifiedSavePointManagerX$SavePoint)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1936" end="1944" startBytecode="9" endBytecode="66" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 1936-1944]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="1923" end="1931" startBytecode="9" endBytecode="66" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 1923-1931]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_NO_DEFAULT" priority="2" rank="19" abbrev="SF" category="STYLE" instanceHash="d014b15325fcb8575d20785aba624041" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Switch statement found where default case is missing</ShortMessage>
     <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy) where default case is missing</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="skip_triple_quoted_string" signature="(Lcom/amazon/ion/impl/UnifiedSavePointManagerX$SavePoint;Lcom/amazon/ion/impl/IonReaderTextRawTokensX$CommentStrategy;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2152" end="2177" startBytecode="0" endBytecode="261" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2139" end="2164" startBytecode="0" endBytecode="261" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.skip_triple_quoted_string(UnifiedSavePointManagerX$SavePoint, IonReaderTextRawTokensX$CommentStrategy)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2153" end="2176" startBytecode="6" endBytecode="108" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[lines 2153-2176]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2140" end="2163" startBytecode="6" endBytecode="108" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[lines 2140-2163]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="8e9d13a407c4f6bac4e762a72e9ba7b3" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Condition has no effect</ShortMessage>
     <LongMessage>Useless condition: it's known that c != -1 at this point</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_base64_getchar_helper" signature="(I)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2592" end="2600" startBytecode="0" endBytecode="142" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2579" end="2587" startBytecode="0" endBytecode="141" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_getchar_helper(int)</Message>
     </Method>
     <String value="c != -1">
       <Message>Value c != -1</Message>
     </String>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2595" end="2595" startBytecode="36" endBytecode="36" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
-      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2595]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2582" end="2582" startBytecode="36" endBytecode="36" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2582]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2594" end="2594" startBytecode="27" endBytecode="27" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[line 2594]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2581" end="2581" startBytecode="27" endBytecode="27" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 2581]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="60de97d50a6ac53097856cdc7425614c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Condition has no effect</ShortMessage>
     <LongMessage>Useless condition: it's known that c != 125 ('}') at this point</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_base64_getchar_helper" signature="(I)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2592" end="2600" startBytecode="0" endBytecode="142" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2579" end="2587" startBytecode="0" endBytecode="141" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_base64_getchar_helper(int)</Message>
     </Method>
     <String value="c != 125 ('}')">
       <Message>Value c != 125 ('}')</Message>
     </String>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2595" end="2595" startBytecode="36" endBytecode="36" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
-      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2595]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2582" end="2582" startBytecode="36" endBytecode="36" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2582]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2594" end="2594" startBytecode="33" endBytecode="33" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[line 2594]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2581" end="2581" startBytecode="33" endBytecode="33" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 2581]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="UC_USELESS_CONDITION" priority="1" rank="14" abbrev="UC" category="STYLE" instanceHash="ac257771a68961d6170b90e54af30e64" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
     <ShortMessage>Condition has no effect</ShortMessage>
     <LongMessage>Useless condition: it's known that len &lt;= 0 at this point</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="66" end="2915" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-        <Message>At IonReaderTextRawTokensX.java:[lines 66-2915]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="53" end="2902" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+        <Message>At IonReaderTextRawTokensX.java:[lines 53-2902]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonReaderTextRawTokensX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawTokensX" name="read_hex_escape_sequence_value" signature="(I)I" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2516" end="2533" startBytecode="0" endBytecode="257" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2503" end="2520" startBytecode="0" endBytecode="255" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawTokensX.read_hex_escape_sequence_value(int)</Message>
     </Method>
     <String value="len &lt;= 0">
       <Message>Value len &lt;= 0</Message>
     </String>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2528" end="2528" startBytecode="49" endBytecode="49" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
-      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2528]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" start="2515" end="2515" startBytecode="49" endBytecode="49" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java" role="SOURCE_UNREACHABLE_CODE">
+      <Message>Unreachable code at IonReaderTextRawTokensX.java:[line 2515]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2527" end="2527" startBytecode="46" endBytecode="46" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
-      <Message>At IonReaderTextRawTokensX.java:[line 2527]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawTokensX" primary="true" start="2514" end="2514" startBytecode="46" endBytecode="46" sourcefile="IonReaderTextRawTokensX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawTokensX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawTokensX.java">
+      <Message>At IonReaderTextRawTokensX.java:[line 2514]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="63520ea30e12c2314c00f268931e030a" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.IonReaderTextRawX.parseSymbolToken(String, StringBuilder, int) comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonReaderTextRawX.parseSymbolToken(String, StringBuilder, int) where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.IonReaderTextRawX" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" start="72" end="1446" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java">
         <Message>At IonReaderTextRawX.java:[lines 72-1446]</Message>
@@ -1061,10 +1023,10 @@
       <Message>In class com.amazon.ion.impl.IonReaderTextRawX</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonReaderTextRawX" name="parseSymbolToken" signature="(Ljava/lang/String;Ljava/lang/StringBuilder;I)Lcom/amazon/ion/SymbolToken;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" start="745" end="772" startBytecode="0" endBytecode="408" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" start="745" end="772" startBytecode="0" endBytecode="406" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java"/>
       <Message>In method com.amazon.ion.impl.IonReaderTextRawX.parseSymbolToken(String, StringBuilder, int)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" primary="true" start="756" end="758" startBytecode="106" endBytecode="109" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java">
+    <SourceLine classname="com.amazon.ion.impl.IonReaderTextRawX" primary="true" start="756" end="758" startBytecode="104" endBytecode="107" sourcefile="IonReaderTextRawX.java" sourcepath="com/amazon/ion/impl/IonReaderTextRawX.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonReaderTextRawX.java">
       <Message>At IonReaderTextRawX.java:[lines 756-758]</Message>
     </SourceLine>
   </BugInstance>
@@ -1112,8 +1074,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="2a3aa1c1ca170777e5487dcfe23af64b" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.IonTokenReader.readEscapedCharacter(PushbackReader, boolean) comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.IonTokenReader.readEscapedCharacter(PushbackReader, boolean) where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.IonTokenReader" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="41" end="1620" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
         <Message>At IonTokenReader.java:[lines 41-1620]</Message>
@@ -1121,13 +1083,13 @@
       <Message>In class com.amazon.ion.impl.IonTokenReader</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonTokenReader" name="readEscapedCharacter" signature="(Ljava/io/PushbackReader;Z)I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="1134" end="1197" startBytecode="0" endBytecode="750" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="1134" end="1197" startBytecode="0" endBytecode="745" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java"/>
       <Message>In method com.amazon.ion.impl.IonTokenReader.readEscapedCharacter(PushbackReader, boolean)</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" primary="true" start="1167" end="1171" startBytecode="308" endBytecode="309" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" primary="true" start="1167" end="1171" startBytecode="307" endBytecode="308" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
       <Message>At IonTokenReader.java:[lines 1167-1171]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="1179" end="1183" startBytecode="367" endBytecode="368" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
+    <SourceLine classname="com.amazon.ion.impl.IonTokenReader" start="1179" end="1183" startBytecode="365" endBytecode="366" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java" role="SOURCE_LINE_ANOTHER_INSTANCE">
       <Message>Another occurrence at IonTokenReader.java:[lines 1179-1183]</Message>
     </SourceLine>
   </BugInstance>
@@ -1149,8 +1111,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="ES_COMPARING_STRINGS_WITH_EQ" priority="1" rank="9" abbrev="ES" category="BAD_PRACTICE" instanceHash="9d5144bbccad95f029d2e28c030ddfc9" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="597">
-    <ShortMessage>Comparaison d'objets String utilisant == ou !=</ShortMessage>
-    <LongMessage>Comparaison d'objets String utilisant == ou != dans com.amazon.ion.impl.IonTokenReader$Type.setNumericValue(IonTokenReader, String)</LongMessage>
+    <ShortMessage>Comparison of String objects using == or !=</ShortMessage>
+    <LongMessage>Comparison of String objects using == or != in com.amazon.ion.impl.IonTokenReader$Type.setNumericValue(IonTokenReader, String)</LongMessage>
     <Class classname="com.amazon.ion.impl.IonTokenReader$Type" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type" start="54" end="209" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
         <Message>At IonTokenReader.java:[lines 54-209]</Message>
@@ -1162,8 +1124,8 @@
       <Message>In method com.amazon.ion.impl.IonTokenReader$Type.setNumericValue(IonTokenReader, String)</Message>
     </Method>
     <Type descriptor="Ljava/lang/String;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.String" start="140" end="4657" sourcefile="String.java" sourcepath="java/lang/String.java">
-        <Message>At String.java:[lines 140-4657]</Message>
+      <SourceLine classname="java.lang.String" start="111" end="3141" sourcefile="String.java" sourcepath="java/lang/String.java">
+        <Message>At String.java:[lines 111-3141]</Message>
       </SourceLine>
       <Message>Actual type String</Message>
     </Type>
@@ -1179,8 +1141,8 @@
     <Property name="edu.umd.cs.findbugs.detect.RefComparisonWarningProperty.DYNAMIC_AND_UNKNOWN" value="true"/>
   </BugInstance>
   <BugInstance type="NM_CLASS_NAMING_CONVENTION" priority="2" rank="16" abbrev="Nm" category="BAD_PRACTICE" instanceHash="2f78ac987f6763ec5762edc7af0ba831" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Nom de classe devant commencer par une majuscule</ShortMessage>
-    <LongMessage>Le nom de la classe com.amazon.ion.impl.IonTokenReader$Type$timeinfo ne commence pas par une majusucle</LongMessage>
+    <ShortMessage>Class names should start with an upper case letter</ShortMessage>
+    <LongMessage>The class name com.amazon.ion.impl.IonTokenReader$Type$timeinfo doesn't start with an upper case letter</LongMessage>
     <Class classname="com.amazon.ion.impl.IonTokenReader$Type$timeinfo" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonTokenReader$Type$timeinfo" start="132" end="143" sourcefile="IonTokenReader.java" sourcepath="com/amazon/ion/impl/IonTokenReader.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonTokenReader.java">
         <Message>At IonTokenReader.java:[lines 132-143]</Message>
@@ -1192,8 +1154,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="BIT_IOR_OF_SIGNED_BYTE" priority="2" rank="2" abbrev="BIT" category="CORRECTNESS" instanceHash="93df0fa44c6dfe9f55204cae04ba21c3" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Ou binaire d'un octet signé</ShortMessage>
-    <LongMessage>Ou binaire d'un octet signé calculé dans com.amazon.ion.impl.IonUTF8.getAs4BytesReversed(int)</LongMessage>
+    <ShortMessage>Bitwise OR of signed byte value</ShortMessage>
+    <LongMessage>Bitwise OR of signed byte value computed in com.amazon.ion.impl.IonUTF8.getAs4BytesReversed(int)</LongMessage>
     <Class classname="com.amazon.ion.impl.IonUTF8" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="35" end="406" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java">
         <Message>At IonUTF8.java:[lines 35-406]</Message>
@@ -1215,8 +1177,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="BIT_IOR_OF_SIGNED_BYTE" priority="2" rank="2" abbrev="BIT" category="CORRECTNESS" instanceHash="c7af8fe0a87cebec80f386f18d0bad53" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Ou binaire d'un octet signé</ShortMessage>
-    <LongMessage>Ou binaire d'un octet signé calculé dans com.amazon.ion.impl.IonUTF8.packBytesAfter1(int, int)</LongMessage>
+    <ShortMessage>Bitwise OR of signed byte value</ShortMessage>
+    <LongMessage>Bitwise OR of signed byte value computed in com.amazon.ion.impl.IonUTF8.packBytesAfter1(int, int)</LongMessage>
     <Class classname="com.amazon.ion.impl.IonUTF8" primary="true">
       <SourceLine classname="com.amazon.ion.impl.IonUTF8" start="35" end="406" sourcefile="IonUTF8.java" sourcepath="com/amazon/ion/impl/IonUTF8.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonUTF8.java">
         <Message>At IonUTF8.java:[lines 35-406]</Message>
@@ -1252,16 +1214,16 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" priority="2" rank="11" abbrev="RCN" category="CORRECTNESS" instanceHash="a947663772ecc40ffa3682e827dfdb04" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>Test de nullité d'une valeur préalablement déréférencée</ShortMessage>
-    <LongMessage>Test de nullité dans com.amazon.ion.impl.IonWriterSystemBinary._patch d'une valeur préalablement déréférencée dans com.amazon.ion.impl.IonWriterSystemBinary.closeValue()</LongMessage>
+    <ShortMessage>Nullcheck of value previously dereferenced</ShortMessage>
+    <LongMessage>Nullcheck of IonWriterSystemBinary._patch at line 495 of value previously dereferenced in com.amazon.ion.impl.IonWriterSystemBinary.closeValue()</LongMessage>
     <Class classname="com.amazon.ion.impl.IonWriterSystemBinary" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="40" end="1049" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java">
-        <Message>At IonWriterSystemBinary.java:[lines 40-1049]</Message>
+      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="27" end="1025" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java">
+        <Message>At IonWriterSystemBinary.java:[lines 27-1025]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.IonWriterSystemBinary</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.IonWriterSystemBinary" name="closeValue" signature="()V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="511" end="521" startBytecode="0" endBytecode="156" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java"/>
+      <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="487" end="497" startBytecode="0" endBytecode="156" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java"/>
       <Message>In method com.amazon.ion.impl.IonWriterSystemBinary.closeValue()</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.IonWriterSystemBinary" name="_patch" signature="Lcom/amazon/ion/impl/IonWriterSystemBinary$PatchedValues;" isStatic="false" primary="true" role="FIELD_VALUE_OF">
@@ -1270,16 +1232,16 @@
       </SourceLine>
       <Message>Value loaded from field com.amazon.ion.impl.IonWriterSystemBinary._patch</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" primary="true" start="518" end="518" startBytecode="51" endBytecode="51" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java">
-      <Message>At IonWriterSystemBinary.java:[line 518]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" primary="true" start="494" end="494" startBytecode="51" endBytecode="51" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java">
+      <Message>At IonWriterSystemBinary.java:[line 494]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="519" end="519" startBytecode="64" endBytecode="64" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java" role="SOURCE_REDUNDANT_NULL_CHECK">
-      <Message>Redundant null check at IonWriterSystemBinary.java:[line 519]</Message>
+    <SourceLine classname="com.amazon.ion.impl.IonWriterSystemBinary" start="495" end="495" startBytecode="64" endBytecode="64" sourcefile="IonWriterSystemBinary.java" sourcepath="com/amazon/ion/impl/IonWriterSystemBinary.java" relSourcepath="src/main/java/com/amazon/ion/impl/IonWriterSystemBinary.java" role="SOURCE_REDUNDANT_NULL_CHECK">
+      <Message>Redundant null check at IonWriterSystemBinary.java:[line 495]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="IS2_INCONSISTENT_SYNC" priority="2" rank="17" abbrev="IS" category="MT_CORRECTNESS" instanceHash="6d5e152f4ead561f66657ad28715856a" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="366">
-    <ShortMessage>Synchronisation incohérente</ShortMessage>
-    <LongMessage>Synchronisation incohérente de com.amazon.ion.impl.LocalSymbolTable.mySymbolNames; verrouillée à 58%</LongMessage>
+    <ShortMessage>Inconsistent synchronization</ShortMessage>
+    <LongMessage>Inconsistent synchronization of com.amazon.ion.impl.LocalSymbolTable.mySymbolNames; locked 58% of time</LongMessage>
     <Class classname="com.amazon.ion.impl.LocalSymbolTable" primary="true">
       <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="52" end="863" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java">
         <Message>At LocalSymbolTable.java:[lines 52-863]</Message>
@@ -1333,8 +1295,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="IS2_INCONSISTENT_SYNC" priority="2" rank="17" abbrev="IS" category="MT_CORRECTNESS" instanceHash="51a58628ea63298078b87f36b7a3416e" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="366">
-    <ShortMessage>Synchronisation incohérente</ShortMessage>
-    <LongMessage>Synchronisation incohérente de com.amazon.ion.impl.LocalSymbolTable.mySymbolsCount; verrouillée à 81%</LongMessage>
+    <ShortMessage>Inconsistent synchronization</ShortMessage>
+    <LongMessage>Inconsistent synchronization of com.amazon.ion.impl.LocalSymbolTable.mySymbolsCount; locked 81% of time</LongMessage>
     <Class classname="com.amazon.ion.impl.LocalSymbolTable" primary="true">
       <SourceLine classname="com.amazon.ion.impl.LocalSymbolTable" start="52" end="863" sourcefile="LocalSymbolTable.java" sourcepath="com/amazon/ion/impl/LocalSymbolTable.java" relSourcepath="src/main/java/com/amazon/ion/impl/LocalSymbolTable.java">
         <Message>At LocalSymbolTable.java:[lines 52-863]</Message>
@@ -1385,8 +1347,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="NP_NULL_PARAM_DEREF" priority="2" rank="8" abbrev="NP" category="CORRECTNESS" instanceHash="beb1e796c5e40b6af4fc4a6a96fabb76" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>Méthode passant null à un paramètre déréférencé inconditionnellement</ShortMessage>
-    <LongMessage>L'appel de méthode dans com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readTimestamp(int) passe null à un paramètre de com.amazon.ion.Timestamp.createFromUtcFields(Timestamp$Precision, int, int, int, int, int, int, BigDecimal, Integer) déréférencé de façon inconditionnelle</LongMessage>
+    <ShortMessage>Method call passes null for non-null parameter</ShortMessage>
+    <LongMessage>Null passed for non-null parameter of com.amazon.ion.Timestamp.createFromUtcFields(Timestamp$Precision, int, int, int, int, int, int, BigDecimal, Integer) in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readTimestamp(int)</LongMessage>
     <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" primary="true">
       <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader" start="135" end="660" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
         <Message>At SimpleByteBuffer.java:[lines 135-660]</Message>
@@ -1398,7 +1360,7 @@
       <Message>In method com.amazon.ion.impl.SimpleByteBuffer$SimpleByteReader.readTimestamp(int)</Message>
     </Method>
     <Method classname="com.amazon.ion.Timestamp" name="createFromUtcFields" signature="(Lcom/amazon/ion/Timestamp$Precision;IIIIIILjava/math/BigDecimal;Ljava/lang/Integer;)Lcom/amazon/ion/Timestamp;" isStatic="true" role="METHOD_CALLED">
-      <SourceLine classname="com.amazon.ion.Timestamp" start="674" end="674" startBytecode="0" endBytecode="145" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
+      <SourceLine classname="com.amazon.ion.Timestamp" start="687" end="687" startBytecode="0" endBytecode="145" sourcefile="Timestamp.java" sourcepath="com/amazon/ion/Timestamp.java" relSourcepath="src/main/java/com/amazon/ion/Timestamp.java"/>
       <Message>Called method com.amazon.ion.Timestamp.createFromUtcFields(Timestamp$Precision, int, int, int, int, int, int, BigDecimal, Integer)</Message>
     </Method>
     <Int value="1" role="INT_MAYBE_NULL_ARG">
@@ -1419,8 +1381,8 @@
     <Property name="edu.umd.cs.findbugs.detect.NullDerefProperty.LONG_RANGE_NULL_SOURCE" value="true"/>
   </BugInstance>
   <BugInstance type="SF_SWITCH_FALLTHROUGH" priority="2" rank="17" abbrev="SF" category="STYLE" instanceHash="9a234b1a21f1d8ba763393929cce11e4" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="484">
-    <ShortMessage>Un switch comporte un cas qui déborde sur le suivant</ShortMessage>
-    <LongMessage>Un switch de com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(int, int, boolean) comporte un cas qui déborde sur le suivant</LongMessage>
+    <ShortMessage>Switch statement found where one case falls through to the next case</ShortMessage>
+    <LongMessage>Switch statement found in com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter.writeVarInt(int, int, boolean) where one case falls through to the next case</LongMessage>
     <Class classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" primary="true">
       <SourceLine classname="com.amazon.ion.impl.SimpleByteBuffer$SimpleByteWriter" start="841" end="1383" sourcefile="SimpleByteBuffer.java" sourcepath="com/amazon/ion/impl/SimpleByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/SimpleByteBuffer.java">
         <Message>At SimpleByteBuffer.java:[lines 841-1383]</Message>
@@ -1510,8 +1472,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="d58e1592bc2a700caa5be665fe6fe77e" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl.UnifiedDataPageX$Bytes(byte[], int, int) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.UnifiedDataPageX$Bytes._bytes</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.UnifiedDataPageX$Bytes(byte[], int, int) may expose internal representation by storing an externally mutable object into UnifiedDataPageX$Bytes._bytes</LongMessage>
     <Class classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" primary="true">
       <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Bytes" start="168" end="204" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java">
         <Message>At UnifiedDataPageX.java:[lines 168-204]</Message>
@@ -1536,8 +1498,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="5631ddc5128a828436df68eb6b9359c6" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl.UnifiedDataPageX$Chars(char[], int, int) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.UnifiedDataPageX$Chars._characters</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.UnifiedDataPageX$Chars(char[], int, int) may expose internal representation by storing an externally mutable object into UnifiedDataPageX$Chars._characters</LongMessage>
     <Class classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" primary="true">
       <SourceLine classname="com.amazon.ion.impl.UnifiedDataPageX$Chars" start="210" end="251" sourcefile="UnifiedDataPageX.java" sourcepath="com/amazon/ion/impl/UnifiedDataPageX.java" relSourcepath="src/main/java/com/amazon/ion/impl/UnifiedDataPageX.java">
         <Message>At UnifiedDataPageX.java:[lines 210-251]</Message>
@@ -1562,8 +1524,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="b694ed23a3292b72fc9a15b1055e9e87" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl._Private_FastAppendableDecorator(_Private_FastAppendable) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_FastAppendableDecorator.myOutput</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl._Private_FastAppendableDecorator(_Private_FastAppendable) may expose internal representation by storing an externally mutable object into _Private_FastAppendableDecorator.myOutput</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_FastAppendableDecorator" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_FastAppendableDecorator" start="31" end="100" sourcefile="_Private_FastAppendableDecorator.java" sourcepath="com/amazon/ion/impl/_Private_FastAppendableDecorator.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_FastAppendableDecorator.java">
         <Message>At _Private_FastAppendableDecorator.java:[lines 31-100]</Message>
@@ -1588,8 +1550,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="979e51d12a6742548549ed889fc05276" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_IonBinaryWriterBuilder.getInitialSymbolTable() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl._Private_IonBinaryWriterBuilder.myInitialSymbolTable</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonBinaryWriterBuilder.getInitialSymbolTable() may expose internal representation by returning _Private_IonBinaryWriterBuilder.myInitialSymbolTable</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="39" end="414" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
         <Message>At _Private_IonBinaryWriterBuilder.java:[lines 39-414]</Message>
@@ -1611,8 +1573,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="c0ea811377595a8421959f727e278998" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_IonBinaryWriterBuilder.setInitialSymbolTable(SymbolTable) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_IonBinaryWriterBuilder.myInitialSymbolTable</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonBinaryWriterBuilder.setInitialSymbolTable(SymbolTable) may expose internal representation by storing an externally mutable object into _Private_IonBinaryWriterBuilder.myInitialSymbolTable</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_IonBinaryWriterBuilder" start="39" end="414" sourcefile="_Private_IonBinaryWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonBinaryWriterBuilder.java">
         <Message>At _Private_IonBinaryWriterBuilder.java:[lines 39-414]</Message>
@@ -1637,8 +1599,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_MUTABLE_ARRAY" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="aca2d4624c416fb2d215e8f3628836ee" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Un champ est un tableau modifiable</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0 est un tableau modifiable</LongMessage>
+    <ShortMessage>Field is a mutable array</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0 is a mutable array</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonConstants" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_IonConstants" start="23" end="282" sourcefile="_Private_IonConstants.java" sourcepath="com/amazon/ion/impl/_Private_IonConstants.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonConstants.java">
         <Message>At _Private_IonConstants.java:[lines 23-282]</Message>
@@ -1656,8 +1618,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_MUTABLE_ARRAY" priority="1" rank="16" abbrev="MS" category="MALICIOUS_CODE" instanceHash="a4efef007b82cbeb6ba15e77ec77047f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Un champ est un tableau modifiable</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_IonTextAppender.ZERO_PADDING est un tableau modifiable</LongMessage>
+    <ShortMessage>Field is a mutable array</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonTextAppender.ZERO_PADDING is a mutable array</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="43" end="1032" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
         <Message>At _Private_IonTextAppender.java:[lines 43-1032]</Message>
@@ -1670,13 +1632,13 @@
       </SourceLine>
       <Message>Field com.amazon.ion.impl._Private_IonTextAppender.ZERO_PADDING</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true" start="111" end="111" startBytecode="335" endBytecode="335" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
+    <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true" start="111" end="111" startBytecode="327" endBytecode="327" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
       <Message>At _Private_IonTextAppender.java:[line 111]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_PKGPROTECT" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="d0ab04bc1ad42d1fad533b0b48ddfb6d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Un champ devrait être package protected</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_IonTextAppender.OPERATOR_CHAR_FLAGS devrait être package protected</LongMessage>
+    <ShortMessage>Field should be package protected</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonTextAppender.OPERATOR_CHAR_FLAGS should be package protected</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonTextAppender" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_IonTextAppender" start="43" end="1032" sourcefile="_Private_IonTextAppender.java" sourcepath="com/amazon/ion/impl/_Private_IonTextAppender.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java">
         <Message>At _Private_IonTextAppender.java:[lines 43-1032]</Message>
@@ -1711,11 +1673,11 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_SHOULD_BE_FINAL" priority="1" rank="16" abbrev="MS" category="MALICIOUS_CODE" instanceHash="5b00fde4435120c6dcd09015babd6015" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Un champ n'est pas final alors qu'il devrait l'être</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_IonTextWriterBuilder.STANDARD n'est pas final mais devrait l'être</LongMessage>
+    <ShortMessage>Field isn't final but should be</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_IonTextWriterBuilder.STANDARD isn't final but should be</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" start="33" end="329" sourcefile="_Private_IonTextWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonTextWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java">
-        <Message>At _Private_IonTextWriterBuilder.java:[lines 33-329]</Message>
+      <SourceLine classname="com.amazon.ion.impl._Private_IonTextWriterBuilder" start="33" end="336" sourcefile="_Private_IonTextWriterBuilder.java" sourcepath="com/amazon/ion/impl/_Private_IonTextWriterBuilder.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_IonTextWriterBuilder.java">
+        <Message>At _Private_IonTextWriterBuilder.java:[lines 33-336]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl._Private_IonTextWriterBuilder</Message>
     </Class>
@@ -1730,8 +1692,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="6da378526fc82201e6b54f920bd795" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_MarkupCallback.getAppendable() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl._Private_MarkupCallback.myAppendable</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_MarkupCallback.getAppendable() may expose internal representation by returning _Private_MarkupCallback.myAppendable</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="190" end="351" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java">
         <Message>At _Private_MarkupCallback.java:[lines 190-351]</Message>
@@ -1753,8 +1715,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="1bc20b2396d805db0503a8cfe3a4ac01" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl._Private_MarkupCallback(_Private_FastAppendable) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_MarkupCallback.myAppendable</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl._Private_MarkupCallback(_Private_FastAppendable) may expose internal representation by storing an externally mutable object into _Private_MarkupCallback.myAppendable</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_MarkupCallback" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_MarkupCallback" start="190" end="351" sourcefile="_Private_MarkupCallback.java" sourcepath="com/amazon/ion/impl/_Private_MarkupCallback.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_MarkupCallback.java">
         <Message>At _Private_MarkupCallback.java:[lines 190-351]</Message>
@@ -1779,8 +1741,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_SHOULD_BE_FINAL" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="652384d5d2378bce4067c28205a4ab59" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Un champ n'est pas final alors qu'il devrait l'être</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions.FNID_identity n'est pas final mais devrait l'être</LongMessage>
+    <ShortMessage>Field isn't final but should be</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions.FNID_identity isn't final but should be</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" start="30" end="333" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 30-333]</Message>
@@ -1798,8 +1760,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_SHOULD_BE_FINAL" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="7466384ad6d6901614632524bf856c4f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Un champ n'est pas final alors qu'il devrait l'être</ShortMessage>
-    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions.FNID_no_conversion n'est pas final mais devrait l'être</LongMessage>
+    <ShortMessage>Field isn't final but should be</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions.FNID_no_conversion isn't final but should be</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions" start="30" end="333" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 30-333]</Message>
@@ -1817,8 +1779,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="BC_UNCONFIRMED_CAST" priority="2" rank="17" abbrev="BC" category="STYLE" instanceHash="2dbcb25375fc771b3962e53d90af7ee8" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Transtypage non vérifié/non confirmé</ShortMessage>
-    <LongMessage>Transtypage non vérifié/non confirmé de com.amazon.ion.Decimal vers value dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal)</LongMessage>
+    <ShortMessage>Unchecked/unconfirmed cast</ShortMessage>
+    <LongMessage>Unchecked/unconfirmed cast from java.math.BigDecimal to com.amazon.ion.Decimal in com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal)</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
@@ -1830,8 +1792,8 @@
       <Message>In method com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal)</Message>
     </Method>
     <Type descriptor="Ljava/math/BigDecimal;" role="TYPE_FOUND">
-      <SourceLine classname="java.math.BigDecimal" start="305" end="5815" sourcefile="BigDecimal.java" sourcepath="java/math/BigDecimal.java">
-        <Message>At BigDecimal.java:[lines 305-5815]</Message>
+      <SourceLine classname="java.math.BigDecimal" start="224" end="5315" sourcefile="BigDecimal.java" sourcepath="java/math/BigDecimal.java">
+        <Message>At BigDecimal.java:[lines 224-5315]</Message>
       </SourceLine>
       <Message>Actual type java.math.BigDecimal</Message>
     </Type>
@@ -1849,8 +1811,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="c2797b12d401329b15b33d898826132e" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDate() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDate() may expose internal representation by returning _Private_ScalarConversions$ValueVariant._date_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
@@ -1872,8 +1834,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="2f740c4ec56c82773af0108950b50244" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDecimal() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getDecimal() may expose internal representation by returning _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
@@ -1895,8 +1857,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="3445b251f5b9b22a9b7c11eb0f8f9b18" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getTimestamp() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.getTimestamp() may expose internal representation by returning _Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
@@ -1918,8 +1880,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="112e0051b0813f283c398373d0802d4d" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Decimal) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Decimal) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
@@ -1944,8 +1906,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="6583b1eb19f73cdc461bc4116b37d243" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Timestamp) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Timestamp) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
@@ -1970,8 +1932,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="589da41cf438e747d7ed7167f383fec1" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(BigDecimal) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
@@ -1996,8 +1958,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="ef493d618a888e73be4c0bf250e37110" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Date) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.addValue(Date) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._date_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
@@ -2022,8 +1984,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="9aed0612674cf9959c8fc7c8704b6c3f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Decimal) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Decimal) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._decimal_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
@@ -2048,8 +2010,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="d0ff0229be9c1c1b891b6496d34e5ca1" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Timestamp) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Timestamp) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._timestamp_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
@@ -2074,8 +2036,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="9b0573d22a4daf2279fcc1e811a682c2" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Date) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_ScalarConversions$ValueVariant._date_value</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_ScalarConversions$ValueVariant.setValue(Date) may expose internal representation by storing an externally mutable object into _Private_ScalarConversions$ValueVariant._date_value</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_ScalarConversions$ValueVariant" start="373" end="873" sourcefile="_Private_ScalarConversions.java" sourcepath="com/amazon/ion/impl/_Private_ScalarConversions.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_ScalarConversions.java">
         <Message>At _Private_ScalarConversions.java:[lines 373-873]</Message>
@@ -2100,8 +2062,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="3292330b87d18c82fcfd8345b0cc7d63" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_SymtabExtendsCache.myReaderSymtab</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable) may expose internal representation by storing an externally mutable object into _Private_SymtabExtendsCache.myReaderSymtab</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="27" end="64" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
         <Message>At _Private_SymtabExtendsCache.java:[lines 27-64]</Message>
@@ -2126,8 +2088,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="eecd0e4d8408e77ef05ad3b3b1c6f801" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl._Private_SymtabExtendsCache.myWriterSymtab</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl._Private_SymtabExtendsCache.symtabsCompat(SymbolTable, SymbolTable) may expose internal representation by storing an externally mutable object into _Private_SymtabExtendsCache.myWriterSymtab</LongMessage>
     <Class classname="com.amazon.ion.impl._Private_SymtabExtendsCache" primary="true">
       <SourceLine classname="com.amazon.ion.impl._Private_SymtabExtendsCache" start="27" end="64" sourcefile="_Private_SymtabExtendsCache.java" sourcepath="com/amazon/ion/impl/_Private_SymtabExtendsCache.java" relSourcepath="src/main/java/com/amazon/ion/impl/_Private_SymtabExtendsCache.java">
         <Message>At _Private_SymtabExtendsCache.java:[lines 27-64]</Message>
@@ -2202,32 +2164,9 @@
       <Message>At IonManagedBinaryWriter.java:[lines 499-505]</Message>
     </SourceLine>
   </BugInstance>
-  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="e531b8f0ec0bd6a1fdfe3969f045a568" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.getBuffer() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.buffer</LongMessage>
-    <Class classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" start="12" end="31" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
-        <Message>At PoolableByteBuffer.java:[lines 12-31]</Message>
-      </SourceLine>
-      <Message>In class com.amazon.ion.impl.bin.utf8.PoolableByteBuffer</Message>
-    </Class>
-    <Method classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" name="getBuffer" signature="()Ljava/nio/ByteBuffer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" start="31" end="31" startBytecode="0" endBytecode="46" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java"/>
-      <Message>In method com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.getBuffer()</Message>
-    </Method>
-    <Field classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" name="buffer" signature="Ljava/nio/ByteBuffer;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
-        <Message>In PoolableByteBuffer.java</Message>
-      </SourceLine>
-      <Message>Field com.amazon.ion.impl.bin.utf8.PoolableByteBuffer.buffer</Message>
-    </Field>
-    <SourceLine classname="com.amazon.ion.impl.bin.utf8.PoolableByteBuffer" primary="true" start="31" end="31" startBytecode="4" endBytecode="4" sourcefile="PoolableByteBuffer.java" sourcepath="com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/PoolableByteBuffer.java">
-      <Message>At PoolableByteBuffer.java:[line 31]</Message>
-    </SourceLine>
-  </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="dd12a2fa0c1d9ca7e991926a3dbcfc33" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.getBuffer() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.buffer</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.getBuffer() may expose internal representation by returning Utf8StringEncoder$Result.buffer</LongMessage>
     <Class classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true">
       <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="128" end="148" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
         <Message>At Utf8StringEncoder.java:[lines 128-148]</Message>
@@ -2249,8 +2188,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="37090090b85d969f582bf784a80bac99" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result(int, byte[]) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result.buffer</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result(int, byte[]) may expose internal representation by storing an externally mutable object into Utf8StringEncoder$Result.buffer</LongMessage>
     <Class classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" primary="true">
       <SourceLine classname="com.amazon.ion.impl.bin.utf8.Utf8StringEncoder$Result" start="128" end="148" sourcefile="Utf8StringEncoder.java" sourcepath="com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/bin/utf8/Utf8StringEncoder.java">
         <Message>At Utf8StringEncoder.java:[lines 128-148]</Message>
@@ -2298,8 +2237,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="b7e63818cc4fb7d7cacbaf6e3670ee33" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.next() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__current</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.next() may expose internal representation by returning IonContainerLite$SequenceContentIterator.__current</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
       <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="275" end="463" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
         <Message>At IonContainerLite.java:[lines 275-463]</Message>
@@ -2321,8 +2260,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="684c779584e3e2b9fcb83562f66693c5" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.previous() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__current</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.previous() may expose internal representation by returning IonContainerLite$SequenceContentIterator.__current</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
       <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="275" end="463" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
         <Message>At IonContainerLite.java:[lines 275-463]</Message>
@@ -2344,8 +2283,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="75d6b0614d6a1619bd6e44699b8b9706" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator(IonContainerLite, int, boolean) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.this$0</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator(IonContainerLite, int, boolean) may expose internal representation by storing an externally mutable object into IonContainerLite$SequenceContentIterator.this$0</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
       <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="275" end="463" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
         <Message>At IonContainerLite.java:[lines 275-463]</Message>
@@ -2370,8 +2309,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="SA_FIELD_SELF_ASSIGNMENT" priority="1" rank="1" abbrev="SA" category="CORRECTNESS" instanceHash="e157432d9915932567d32bd045df9794" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Auto-alimentation d'un champs</ShortMessage>
-    <LongMessage>Auto-alimentation du champs com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.__pos dans com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.force_position_sync_helper()</LongMessage>
+    <ShortMessage>Self assignment of field</ShortMessage>
+    <LongMessage>Self assignment of field IonContainerLite$SequenceContentIterator.__pos in com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator.force_position_sync_helper()</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" primary="true">
       <SourceLine classname="com.amazon.ion.impl.lite.IonContainerLite$SequenceContentIterator" start="275" end="463" sourcefile="IonContainerLite.java" sourcepath="com/amazon/ion/impl/lite/IonContainerLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonContainerLite.java">
         <Message>At IonContainerLite.java:[lines 275-463]</Message>
@@ -2393,16 +2332,16 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="79891fc74efbc99a58252ed737deca1f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator(IonDatagramLite, boolean) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator.this$0</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator(IonDatagramLite, boolean) may expose internal representation by storing an externally mutable object into IonDatagramLite$SystemContentIterator.this$0</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" start="585" end="834" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
-        <Message>At IonDatagramLite.java:[lines 585-834]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" start="572" end="821" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+        <Message>At IonDatagramLite.java:[lines 572-821]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" name="&lt;init&gt;" signature="(Lcom/amazon/ion/impl/lite/IonDatagramLite;Z)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" start="595" end="604" startBytecode="0" endBytecode="178" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" start="582" end="591" startBytecode="0" endBytecode="178" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
       <Message>In method new com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator(IonDatagramLite, boolean)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" name="this$0" signature="Lcom/amazon/ion/impl/lite/IonDatagramLite;" isStatic="false" primary="true">
@@ -2414,21 +2353,21 @@
     <LocalVariable name="this$0" register="1" pc="2" role="LOCAL_VARIABLE_NAMED">
       <Message>Local variable named this$0</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" primary="true" start="595" end="595" startBytecode="2" endBytecode="2" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
-      <Message>At IonDatagramLite.java:[line 595]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemContentIterator" primary="true" start="582" end="582" startBytecode="2" endBytecode="2" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+      <Message>At IonDatagramLite.java:[line 582]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" priority="1" rank="9" abbrev="RCN" category="CORRECTNESS" instanceHash="db2225a597140cf69dffc0ffe5dcc0a0" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>Test de nullité d'une valeur préalablement déréférencée</ShortMessage>
-    <LongMessage>Test de nullité dans com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.__local_values d'une valeur préalablement déréférencée dans com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.push_system_value(IonValueLite)</LongMessage>
+    <ShortMessage>Nullcheck of value previously dereferenced</ShortMessage>
+    <LongMessage>Nullcheck of IonDatagramLite$SystemIteratorPosition.__local_values at line 1062 of value previously dereferenced in com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.push_system_value(IonValueLite)</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="837" end="1138" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
-        <Message>At IonDatagramLite.java:[lines 837-1138]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="824" end="1125" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+        <Message>At IonDatagramLite.java:[lines 824-1125]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" name="push_system_value" signature="(Lcom/amazon/ion/impl/lite/IonValueLite;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1074" end="1084" startBytecode="0" endBytecode="229" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1061" end="1071" startBytecode="0" endBytecode="229" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.push_system_value(IonValueLite)</Message>
     </Method>
     <Field classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" name="__local_values" signature="[Lcom/amazon/ion/impl/lite/IonValueLite;" isStatic="false" primary="true" role="FIELD_VALUE_OF">
@@ -2437,52 +2376,52 @@
       </SourceLine>
       <Message>Value loaded from field com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.__local_values</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true" start="1074" end="1074" startBytecode="8" endBytecode="8" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
-      <Message>At IonDatagramLite.java:[line 1074]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true" start="1061" end="1061" startBytecode="8" endBytecode="8" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+      <Message>At IonDatagramLite.java:[line 1061]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1075" end="1075" startBytecode="16" endBytecode="16" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java" role="SOURCE_REDUNDANT_NULL_CHECK">
-      <Message>Redundant null check at IonDatagramLite.java:[line 1075]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1062" end="1062" startBytecode="16" endBytecode="16" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java" role="SOURCE_REDUNDANT_NULL_CHECK">
+      <Message>Redundant null check at IonDatagramLite.java:[line 1062]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" priority="2" rank="11" abbrev="RCN" category="CORRECTNESS" instanceHash="7b7d1cc56b68e53eb5a551bbf5bc7fe0" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>Test de nullité d'une valeur préalablement déréférencée</ShortMessage>
-    <LongMessage>Test de nullité dans curr d'une valeur préalablement déréférencée dans com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.count_system_values(IonSystem, SymbolTable, SymbolTable)</LongMessage>
+    <ShortMessage>Nullcheck of value previously dereferenced</ShortMessage>
+    <LongMessage>Nullcheck of curr at line 1121 of value previously dereferenced in com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.count_system_values(IonSystem, SymbolTable, SymbolTable)</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="837" end="1138" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
-        <Message>At IonDatagramLite.java:[lines 837-1138]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="824" end="1125" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+        <Message>At IonDatagramLite.java:[lines 824-1125]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" name="count_system_values" signature="(Lcom/amazon/ion/IonSystem;Lcom/amazon/ion/SymbolTable;Lcom/amazon/ion/SymbolTable;)I" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1128" end="1138" startBytecode="0" endBytecode="188" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1115" end="1125" startBytecode="0" endBytecode="188" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition.count_system_values(IonSystem, SymbolTable, SymbolTable)</Message>
     </Method>
     <LocalVariable name="curr" register="2" pc="34" role="LOCAL_VARIABLE_VALUE_OF">
       <Message>Value loaded from curr</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true" start="1129" end="1129" startBytecode="3" endBytecode="3" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
-      <Message>At IonDatagramLite.java:[line 1129]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" primary="true" start="1116" end="1116" startBytecode="3" endBytecode="3" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java">
+      <Message>At IonDatagramLite.java:[line 1116]</Message>
     </SourceLine>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1134" end="1134" startBytecode="35" endBytecode="35" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java" role="SOURCE_REDUNDANT_NULL_CHECK">
-      <Message>Redundant null check at IonDatagramLite.java:[line 1134]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonDatagramLite$SystemIteratorPosition" start="1121" end="1121" startBytecode="35" endBytecode="35" sourcefile="IonDatagramLite.java" sourcepath="com/amazon/ion/impl/lite/IonDatagramLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonDatagramLite.java" role="SOURCE_REDUNDANT_NULL_CHECK">
+      <Message>Redundant null check at IonDatagramLite.java:[line 1121]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="ES_COMPARING_STRINGS_WITH_EQ" priority="2" rank="11" abbrev="ES" category="BAD_PRACTICE" instanceHash="8c2c628526908e5f999348173832bbb7" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="597">
-    <ShortMessage>Comparaison d'objets String utilisant == ou !=</ShortMessage>
-    <LongMessage>Comparaison d'objets String utilisant == ou != dans com.amazon.ion.impl.lite.IonStructLite.validate()</LongMessage>
+    <ShortMessage>Comparison of String objects using == or !=</ShortMessage>
+    <LongMessage>Comparison of String objects using == or != in com.amazon.ion.impl.lite.IonStructLite.validate()</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonStructLite" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="38" end="753" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
-        <Message>At IonStructLite.java:[lines 38-753]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="25" end="740" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+        <Message>At IonStructLite.java:[lines 25-740]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonStructLite</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonStructLite" name="validate" signature="()Ljava/lang/String;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="216" end="230" startBytecode="0" endBytecode="73" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="203" end="217" startBytecode="0" endBytecode="73" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonStructLite.validate()</Message>
     </Method>
     <Type descriptor="Ljava/lang/String;" role="TYPE_FOUND">
-      <SourceLine classname="java.lang.String" start="140" end="4657" sourcefile="String.java" sourcepath="java/lang/String.java">
-        <Message>At String.java:[lines 140-4657]</Message>
+      <SourceLine classname="java.lang.String" start="111" end="3141" sourcefile="String.java" sourcepath="java/lang/String.java">
+        <Message>At String.java:[lines 111-3141]</Message>
       </SourceLine>
       <Message>Actual type String</Message>
     </Type>
@@ -2492,51 +2431,51 @@
     <LocalVariable name="error" register="1" pc="164" role="LOCAL_VARIABLE_VALUE_OF">
       <Message>Value loaded from error</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="230" end="230" startBytecode="166" endBytecode="166" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
-      <Message>At IonStructLite.java:[line 230]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="217" end="217" startBytecode="166" endBytecode="166" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+      <Message>At IonStructLite.java:[line 217]</Message>
     </SourceLine>
     <Property name="edu.umd.cs.findbugs.detect.RefComparisonWarningProperty.COMPARE_STATIC_STRINGS" value="true"/>
   </BugInstance>
   <BugInstance type="NP_LOAD_OF_KNOWN_NULL_VALUE" priority="2" rank="16" abbrev="NP" category="STYLE" instanceHash="398a2e584fed81324bd20bd97797f3b0" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>Chargement d'une valeur connue pour être à null</ShortMessage>
-    <LongMessage>Chargement d'une valeur connue pour être à null dans com.amazon.ion.impl.lite.IonStructLite.add(SymbolToken, IonValue)</LongMessage>
+    <ShortMessage>Load of known null value</ShortMessage>
+    <LongMessage>Load of known null value in com.amazon.ion.impl.lite.IonStructLite.add(SymbolToken, IonValue)</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonStructLite" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="38" end="753" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
-        <Message>At IonStructLite.java:[lines 38-753]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="25" end="740" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+        <Message>At IonStructLite.java:[lines 25-740]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonStructLite</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonStructLite" name="add" signature="(Lcom/amazon/ion/SymbolToken;Lcom/amazon/ion/IonValue;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="481" end="501" startBytecode="0" endBytecode="33" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="468" end="488" startBytecode="0" endBytecode="33" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonStructLite.add(SymbolToken, IonValue)</Message>
     </Method>
-    <LocalVariable name="text" register="3" pc="59" role="LOCAL_VARIABLE_VALUE_OF">
+    <LocalVariable name="text" register="3" pc="58" role="LOCAL_VARIABLE_VALUE_OF">
       <Message>Value loaded from text</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="500" end="500" startBytecode="60" endBytecode="60" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
-      <Message>At IonStructLite.java:[line 500]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="487" end="487" startBytecode="59" endBytecode="59" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+      <Message>At IonStructLite.java:[line 487]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="SBSC_USE_STRINGBUFFER_CONCATENATION" priority="2" rank="18" abbrev="SBSC" category="PERFORMANCE" instanceHash="e29cf5bfde55497ab095a8a75b41d74" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>La méthode concatène des chaînes au moyen de + en boucle</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.impl.lite.IonStructLite.validate() concatène des chaînes au moyen de + en boucle</LongMessage>
+    <ShortMessage>Method concatenates strings using + in a loop</ShortMessage>
+    <LongMessage>com.amazon.ion.impl.lite.IonStructLite.validate() concatenates strings using + in a loop</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.IonStructLite" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="38" end="753" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
-        <Message>At IonStructLite.java:[lines 38-753]</Message>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="25" end="740" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+        <Message>At IonStructLite.java:[lines 25-740]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.impl.lite.IonStructLite</Message>
     </Class>
     <Method classname="com.amazon.ion.impl.lite.IonStructLite" name="validate" signature="()Ljava/lang/String;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="216" end="230" startBytecode="0" endBytecode="382" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java"/>
+      <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" start="203" end="217" startBytecode="0" endBytecode="382" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java"/>
       <Message>In method com.amazon.ion.impl.lite.IonStructLite.validate()</Message>
     </Method>
-    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="226" end="226" startBytecode="121" endBytecode="121" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
-      <Message>At IonStructLite.java:[line 226]</Message>
+    <SourceLine classname="com.amazon.ion.impl.lite.IonStructLite" primary="true" start="213" end="213" startBytecode="121" endBytecode="121" sourcefile="IonStructLite.java" sourcepath="com/amazon/ion/impl/lite/IonStructLite.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/IonStructLite.java">
+      <Message>At IonStructLite.java:[line 213]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT" priority="2" rank="17" abbrev="BSHIFT" category="STYLE" instanceHash="2fcf6ca181f8ad96d590e312b49a642c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Décalage à droite non signé et transtypage short/byte</ShortMessage>
-    <LongMessage>Décalage à droite non signé et transtypage vers un short/byte dans com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarInt(int)</LongMessage>
+    <ShortMessage>Unsigned right shift cast to short/byte</ShortMessage>
+    <LongMessage>Unsigned right shift cast to short/byte in com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarInt(int)</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true">
       <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="90" end="1464" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
         <Message>At ReverseBinaryEncoder.java:[lines 90-1464]</Message>
@@ -2558,8 +2497,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT" priority="2" rank="17" abbrev="BSHIFT" category="STYLE" instanceHash="fd4898df5b4dfc93069b54d16ee4ef7c" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Décalage à droite non signé et transtypage short/byte</ShortMessage>
-    <LongMessage>Décalage à droite non signé et transtypage vers un short/byte dans com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarUInt(int)</LongMessage>
+    <ShortMessage>Unsigned right shift cast to short/byte</ShortMessage>
+    <LongMessage>Unsigned right shift cast to short/byte in com.amazon.ion.impl.lite.ReverseBinaryEncoder.writeVarUInt(int)</LongMessage>
     <Class classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" primary="true">
       <SourceLine classname="com.amazon.ion.impl.lite.ReverseBinaryEncoder" start="90" end="1464" sourcefile="ReverseBinaryEncoder.java" sourcepath="com/amazon/ion/impl/lite/ReverseBinaryEncoder.java" relSourcepath="src/main/java/com/amazon/ion/impl/lite/ReverseBinaryEncoder.java">
         <Message>At ReverseBinaryEncoder.java:[lines 90-1464]</Message>
@@ -2583,17 +2522,40 @@
       <Message>Another occurrence at ReverseBinaryEncoder.java:[line 513]</Message>
     </SourceLine>
   </BugInstance>
+  <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="171f92c1a275521e03e321d0d1e9d55a" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.system.IonReaderBuilder.getInputStreamInterceptors() may expose internal representation by returning IonReaderBuilder.DETECTED_STREAM_INTERCEPTORS</LongMessage>
+    <Class classname="com.amazon.ion.system.IonReaderBuilder" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonReaderBuilder" start="40" end="361" sourcefile="IonReaderBuilder.java" sourcepath="com/amazon/ion/system/IonReaderBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonReaderBuilder.java">
+        <Message>At IonReaderBuilder.java:[lines 40-361]</Message>
+      </SourceLine>
+      <Message>In class com.amazon.ion.system.IonReaderBuilder</Message>
+    </Class>
+    <Method classname="com.amazon.ion.system.IonReaderBuilder" name="getInputStreamInterceptors" signature="()Ljava/util/List;" isStatic="false" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonReaderBuilder" start="337" end="340" startBytecode="0" endBytecode="77" sourcefile="IonReaderBuilder.java" sourcepath="com/amazon/ion/system/IonReaderBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonReaderBuilder.java"/>
+      <Message>In method com.amazon.ion.system.IonReaderBuilder.getInputStreamInterceptors()</Message>
+    </Method>
+    <Field classname="com.amazon.ion.system.IonReaderBuilder" name="DETECTED_STREAM_INTERCEPTORS" signature="Ljava/util/List;" isStatic="true" primary="true">
+      <SourceLine classname="com.amazon.ion.system.IonReaderBuilder" sourcefile="IonReaderBuilder.java" sourcepath="com/amazon/ion/system/IonReaderBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonReaderBuilder.java">
+        <Message>In IonReaderBuilder.java</Message>
+      </SourceLine>
+      <Message>Field com.amazon.ion.system.IonReaderBuilder.DETECTED_STREAM_INTERCEPTORS</Message>
+    </Field>
+    <SourceLine classname="com.amazon.ion.system.IonReaderBuilder" primary="true" start="338" end="338" startBytecode="10" endBytecode="10" sourcefile="IonReaderBuilder.java" sourcepath="com/amazon/ion/system/IonReaderBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonReaderBuilder.java">
+      <Message>At IonReaderBuilder.java:[line 338]</Message>
+    </SourceLine>
+  </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="c44e2a3d646df3e5542a6dadd8c623f" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.getIonBinaryWriterBuilder() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.system.IonSystemBuilder.binaryWriterBuilder</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.system.IonSystemBuilder.getIonBinaryWriterBuilder() may expose internal representation by returning IonSystemBuilder.binaryWriterBuilder</LongMessage>
     <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="73" end="452" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 73-452]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.system.IonSystemBuilder" name="getIonBinaryWriterBuilder" signature="()Lcom/amazon/ion/system/IonBinaryWriterBuilder;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="345" end="345" startBytecode="0" endBytecode="46" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="332" end="332" startBytecode="0" endBytecode="46" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
       <Message>In method com.amazon.ion.system.IonSystemBuilder.getIonBinaryWriterBuilder()</Message>
     </Method>
     <Field classname="com.amazon.ion.system.IonSystemBuilder" name="binaryWriterBuilder" signature="Lcom/amazon/ion/system/IonBinaryWriterBuilder;" isStatic="false" primary="true">
@@ -2602,21 +2564,21 @@
       </SourceLine>
       <Message>Field com.amazon.ion.system.IonSystemBuilder.binaryWriterBuilder</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="345" end="345" startBytecode="4" endBytecode="4" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-      <Message>At IonSystemBuilder.java:[line 345]</Message>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="332" end="332" startBytecode="4" endBytecode="4" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 332]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="4a97b7ce8f9d4ea446f9b0a8a853f3ea" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.getIonTextWriterBuilder() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.system.IonSystemBuilder.textWriterBuilder</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.system.IonSystemBuilder.getIonTextWriterBuilder() may expose internal representation by returning IonSystemBuilder.textWriterBuilder</LongMessage>
     <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="73" end="452" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 73-452]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.system.IonSystemBuilder" name="getIonTextWriterBuilder" signature="()Lcom/amazon/ion/system/IonTextWriterBuilder;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="292" end="292" startBytecode="0" endBytecode="46" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="279" end="279" startBytecode="0" endBytecode="46" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
       <Message>In method com.amazon.ion.system.IonSystemBuilder.getIonTextWriterBuilder()</Message>
     </Method>
     <Field classname="com.amazon.ion.system.IonSystemBuilder" name="textWriterBuilder" signature="Lcom/amazon/ion/system/IonTextWriterBuilder;" isStatic="false" primary="true">
@@ -2625,21 +2587,21 @@
       </SourceLine>
       <Message>Field com.amazon.ion.system.IonSystemBuilder.textWriterBuilder</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="292" end="292" startBytecode="4" endBytecode="4" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-      <Message>At IonSystemBuilder.java:[line 292]</Message>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="279" end="279" startBytecode="4" endBytecode="4" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 279]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="238ea94b9fbc4d991e904f39656925e4" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.getReaderBuilder() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.system.IonSystemBuilder.readerBuilder</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.system.IonSystemBuilder.getReaderBuilder() may expose internal representation by returning IonSystemBuilder.readerBuilder</LongMessage>
     <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="73" end="452" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 73-452]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.system.IonSystemBuilder" name="getReaderBuilder" signature="()Lcom/amazon/ion/system/IonReaderBuilder;" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="398" end="398" startBytecode="0" endBytecode="46" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="385" end="385" startBytecode="0" endBytecode="46" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
       <Message>In method com.amazon.ion.system.IonSystemBuilder.getReaderBuilder()</Message>
     </Method>
     <Field classname="com.amazon.ion.system.IonSystemBuilder" name="readerBuilder" signature="Lcom/amazon/ion/system/IonReaderBuilder;" isStatic="false" primary="true">
@@ -2648,21 +2610,21 @@
       </SourceLine>
       <Message>Field com.amazon.ion.system.IonSystemBuilder.readerBuilder</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="398" end="398" startBytecode="4" endBytecode="4" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-      <Message>At IonSystemBuilder.java:[line 398]</Message>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="385" end="385" startBytecode="4" endBytecode="4" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 385]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="9351307308fc1a50b5c24fb76646cac6" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.setIonBinaryWriterBuilder(IonBinaryWriterBuilder) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.system.IonSystemBuilder.binaryWriterBuilder</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.system.IonSystemBuilder.setIonBinaryWriterBuilder(IonBinaryWriterBuilder) may expose internal representation by storing an externally mutable object into IonSystemBuilder.binaryWriterBuilder</LongMessage>
     <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="73" end="452" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 73-452]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.system.IonSystemBuilder" name="setIonBinaryWriterBuilder" signature="(Lcom/amazon/ion/system/IonBinaryWriterBuilder;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="363" end="365" startBytecode="0" endBytecode="75" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="350" end="352" startBytecode="0" endBytecode="75" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
       <Message>In method com.amazon.ion.system.IonSystemBuilder.setIonBinaryWriterBuilder(IonBinaryWriterBuilder)</Message>
     </Method>
     <Field classname="com.amazon.ion.system.IonSystemBuilder" name="binaryWriterBuilder" signature="Lcom/amazon/ion/system/IonBinaryWriterBuilder;" isStatic="false" primary="true">
@@ -2674,21 +2636,21 @@
     <LocalVariable name="?" register="-1" pc="11" role="LOCAL_VARIABLE_UNKNOWN">
       <Message>Local variable stored in JVM register ?</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="364" end="364" startBytecode="12" endBytecode="12" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-      <Message>At IonSystemBuilder.java:[line 364]</Message>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="351" end="351" startBytecode="12" endBytecode="12" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 351]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="7f5d5be9a0962a786a4878b30c8a8774" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.setIonTextWriterBuilder(IonTextWriterBuilder) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.system.IonSystemBuilder.textWriterBuilder</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.system.IonSystemBuilder.setIonTextWriterBuilder(IonTextWriterBuilder) may expose internal representation by storing an externally mutable object into IonSystemBuilder.textWriterBuilder</LongMessage>
     <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="73" end="452" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 73-452]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.system.IonSystemBuilder" name="setIonTextWriterBuilder" signature="(Lcom/amazon/ion/system/IonTextWriterBuilder;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="310" end="312" startBytecode="0" endBytecode="75" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="296" end="298" startBytecode="0" endBytecode="75" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
       <Message>In method com.amazon.ion.system.IonSystemBuilder.setIonTextWriterBuilder(IonTextWriterBuilder)</Message>
     </Method>
     <Field classname="com.amazon.ion.system.IonSystemBuilder" name="textWriterBuilder" signature="Lcom/amazon/ion/system/IonTextWriterBuilder;" isStatic="false" primary="true">
@@ -2700,21 +2662,21 @@
     <LocalVariable name="?" register="-1" pc="11" role="LOCAL_VARIABLE_UNKNOWN">
       <Message>Local variable stored in JVM register ?</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="311" end="311" startBytecode="12" endBytecode="12" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-      <Message>At IonSystemBuilder.java:[line 311]</Message>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="297" end="297" startBytecode="12" endBytecode="12" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 297]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="624bf93bedc7b88bdd39ad55bb6888b6" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.system.IonSystemBuilder.setReaderBuilder(IonReaderBuilder) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.system.IonSystemBuilder.readerBuilder</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.system.IonSystemBuilder.setReaderBuilder(IonReaderBuilder) may expose internal representation by storing an externally mutable object into IonSystemBuilder.readerBuilder</LongMessage>
     <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="73" end="452" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 73-452]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.system.IonSystemBuilder" name="setReaderBuilder" signature="(Lcom/amazon/ion/system/IonReaderBuilder;)V" isStatic="false" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="416" end="418" startBytecode="0" endBytecode="75" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="403" end="405" startBytecode="0" endBytecode="75" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
       <Message>In method com.amazon.ion.system.IonSystemBuilder.setReaderBuilder(IonReaderBuilder)</Message>
     </Method>
     <Field classname="com.amazon.ion.system.IonSystemBuilder" name="readerBuilder" signature="Lcom/amazon/ion/system/IonReaderBuilder;" isStatic="false" primary="true">
@@ -2726,21 +2688,21 @@
     <LocalVariable name="?" register="-1" pc="11" role="LOCAL_VARIABLE_UNKNOWN">
       <Message>Local variable stored in JVM register ?</Message>
     </LocalVariable>
-    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="417" end="417" startBytecode="12" endBytecode="12" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-      <Message>At IonSystemBuilder.java:[line 417]</Message>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="404" end="404" startBytecode="12" endBytecode="12" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 404]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="MS_EXPOSE_REP" priority="2" rank="18" abbrev="MS" category="MALICIOUS_CODE" instanceHash="309257473ba90ad1ae51e692ce2020b4" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="218">
-    <ShortMessage>Une méthode statique publique risque d'exposer une représentation interne en renvoyant un tableau</ShortMessage>
-    <LongMessage>La méthode statique publique com.amazon.ion.system.IonSystemBuilder.standard() peut exposer une représentation interne en renvoyant com.amazon.ion.system.IonSystemBuilder.STANDARD</LongMessage>
+    <ShortMessage>Public static method may expose internal representation by returning array</ShortMessage>
+    <LongMessage>Public static com.amazon.ion.system.IonSystemBuilder.standard() may expose internal representation by returning IonSystemBuilder.STANDARD</LongMessage>
     <Class classname="com.amazon.ion.system.IonSystemBuilder" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="86" end="465" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-        <Message>At IonSystemBuilder.java:[lines 86-465]</Message>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="73" end="452" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+        <Message>At IonSystemBuilder.java:[lines 73-452]</Message>
       </SourceLine>
       <Message>In class com.amazon.ion.system.IonSystemBuilder</Message>
     </Class>
     <Method classname="com.amazon.ion.system.IonSystemBuilder" name="standard" signature="()Lcom/amazon/ion/system/IonSystemBuilder;" isStatic="true" primary="true">
-      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="98" end="98" startBytecode="0" endBytecode="27" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
+      <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" start="85" end="85" startBytecode="0" endBytecode="27" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java"/>
       <Message>In method com.amazon.ion.system.IonSystemBuilder.standard()</Message>
     </Method>
     <Field classname="com.amazon.ion.system.IonSystemBuilder" name="STANDARD" signature="Lcom/amazon/ion/system/IonSystemBuilder;" isStatic="true" primary="true">
@@ -2749,8 +2711,8 @@
       </SourceLine>
       <Message>Field com.amazon.ion.system.IonSystemBuilder.STANDARD</Message>
     </Field>
-    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="98" end="98" startBytecode="3" endBytecode="3" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
-      <Message>At IonSystemBuilder.java:[line 98]</Message>
+    <SourceLine classname="com.amazon.ion.system.IonSystemBuilder" primary="true" start="85" end="85" startBytecode="3" endBytecode="3" sourcefile="IonSystemBuilder.java" sourcepath="com/amazon/ion/system/IonSystemBuilder.java" relSourcepath="src/main/java/com/amazon/ion/system/IonSystemBuilder.java">
+      <Message>At IonSystemBuilder.java:[line 85]</Message>
     </SourceLine>
   </BugInstance>
   <BugInstance type="BC_EQUALS_METHOD_SHOULD_WORK_FOR_ALL_OBJECTS" priority="2" rank="16" abbrev="BC" category="BAD_PRACTICE" instanceHash="b1501ead4d1f31655c61d7d81eb69329" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
@@ -2771,8 +2733,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT" priority="2" rank="11" abbrev="NP" category="BAD_PRACTICE" instanceHash="6ac3d35c70d5495ccdd6381542086821" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="476">
-    <ShortMessage>Méthode equals() ne vérifiant pas la nullité</ShortMessage>
-    <LongMessage>com.amazon.ion.util.Equivalence$Field.equals(Object) ne vérifie pas la nullité d'un paramètre</LongMessage>
+    <ShortMessage>equals() method does not check for null argument</ShortMessage>
+    <LongMessage>com.amazon.ion.util.Equivalence$Field.equals(Object) does not check for null argument</LongMessage>
     <Class classname="com.amazon.ion.util.Equivalence$Field" primary="true">
       <SourceLine classname="com.amazon.ion.util.Equivalence$Field" start="444" end="496" sourcefile="Equivalence.java" sourcepath="com/amazon/ion/util/Equivalence.java" relSourcepath="src/main/java/com/amazon/ion/util/Equivalence.java">
         <Message>At Equivalence.java:[lines 444-496]</Message>
@@ -2791,8 +2753,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP" priority="2" rank="18" abbrev="EI" category="MALICIOUS_CODE" instanceHash="e557838e54f12add1769c485479329bb" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode peut exposer sa représentation interne en renvoyant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode com.amazon.ion.util.JarInfo.getBuildTime() risque d'exposer sa représentation interne en renvoyant com.amazon.ion.util.JarInfo.ourBuildTime</LongMessage>
+    <ShortMessage>May expose internal representation by returning reference to mutable object</ShortMessage>
+    <LongMessage>com.amazon.ion.util.JarInfo.getBuildTime() may expose internal representation by returning JarInfo.ourBuildTime</LongMessage>
     <Class classname="com.amazon.ion.util.JarInfo" primary="true">
       <SourceLine classname="com.amazon.ion.util.JarInfo" start="43" end="120" sourcefile="JarInfo.java" sourcepath="com/amazon/ion/util/JarInfo.java" relSourcepath="src/main/java/com/amazon/ion/util/JarInfo.java">
         <Message>At JarInfo.java:[lines 43-120]</Message>
@@ -2814,8 +2776,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="EI_EXPOSE_REP2" priority="2" rank="18" abbrev="EI2" category="MALICIOUS_CODE" instanceHash="90d966275cb56b8eb2c12e2e886d9799" instanceOccurrenceNum="0" instanceOccurrenceMax="0" cweid="374">
-    <ShortMessage>Une méthode expose sa représentation interne en incorporant une référence à un objet modifiable</ShortMessage>
-    <LongMessage>La méthode new com.amazon.ion.util.Printer$Options(Printer) risque d'exposer sa représentation interne en stockant un objet externe modifiable dans com.amazon.ion.util.Printer$Options.this$0</LongMessage>
+    <ShortMessage>May expose internal representation by incorporating reference to mutable object</ShortMessage>
+    <LongMessage>new com.amazon.ion.util.Printer$Options(Printer) may expose internal representation by storing an externally mutable object into Printer$Options.this$0</LongMessage>
     <Class classname="com.amazon.ion.util.Printer$Options" primary="true">
       <SourceLine classname="com.amazon.ion.util.Printer$Options" start="88" end="115" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/main/java/com/amazon/ion/util/Printer.java">
         <Message>At Printer.java:[lines 88-115]</Message>
@@ -2840,8 +2802,8 @@
     </SourceLine>
   </BugInstance>
   <BugInstance type="SIC_INNER_SHOULD_BE_STATIC" priority="2" rank="18" abbrev="SIC" category="PERFORMANCE" instanceHash="f1c9859bc3808074f14801216c655fa8" instanceOccurrenceNum="0" instanceOccurrenceMax="0">
-    <ShortMessage>Devrait être une classe interne statique</ShortMessage>
-    <LongMessage>La classe com.amazon.ion.util.Printer$Options devrait-elle être une classe interne static ?</LongMessage>
+    <ShortMessage>Should be a static inner class</ShortMessage>
+    <LongMessage>Should com.amazon.ion.util.Printer$Options be a _static_ inner class?</LongMessage>
     <Class classname="com.amazon.ion.util.Printer$Options" primary="true">
       <SourceLine classname="com.amazon.ion.util.Printer$Options" start="88" end="115" sourcefile="Printer.java" sourcepath="com/amazon/ion/util/Printer.java" relSourcepath="src/main/java/com/amazon/ion/util/Printer.java">
         <Message>At Printer.java:[lines 88-115]</Message>
diff --git a/src/main/java/com/amazon/ion/impl/_Private_IonReaderBuilder.java b/src/main/java/com/amazon/ion/impl/_Private_IonReaderBuilder.java
index c7e56f8abd..a7c50db90b 100644
--- a/src/main/java/com/amazon/ion/impl/_Private_IonReaderBuilder.java
+++ b/src/main/java/com/amazon/ion/impl/_Private_IonReaderBuilder.java
@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonCatalog;
@@ -8,6 +7,7 @@
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonTextReader;
 import com.amazon.ion.IonValue;
+import com.amazon.ion.util.InputStreamInterceptor;
 import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.util.IonStreamUtils;
 
@@ -16,7 +16,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import java.util.zip.GZIPInputStream;
+import java.util.Collections;
+import java.util.List;
 
 import static com.amazon.ion.impl.LocalSymbolTable.DEFAULT_LST_FACTORY;
 import static com.amazon.ion.impl._Private_IonReaderFactory.makeReader;
@@ -99,7 +100,7 @@ protected void mutationCheck() {
      * The TwoElementSequenceInputStream allows the second delegate InputStream to return valid data if it subsequently
      * receives more data, which is common when performing continuable reads.
      */
-    private static final class TwoElementSequenceInputStream extends InputStream {
+    private static final class TwoElementInputStream extends InputStream {
 
         /**
          * The first InputStream in the sequence.
@@ -121,7 +122,7 @@ private static final class TwoElementSequenceInputStream extends InputStream {
          * @param first first InputStream in the sequence.
          * @param last last InputStream in the sequence.
          */
-        private TwoElementSequenceInputStream(final InputStream first, final InputStream last) {
+        private TwoElementInputStream(final InputStream first, final InputStream last) {
             this.first = first;
             this.last = last;
             this.in = first;
@@ -192,6 +193,18 @@ interface IonReaderFromBytesFactoryBinary {
         IonReader makeReader(_Private_IonReaderBuilder builder, byte[] ionData, int offset, int length);
     }
 
+    private static void validateHeaderLength(int maxHeaderLength) {
+        if (maxHeaderLength > _Private_IonConstants.ARRAY_MAXIMUM_SIZE) {
+            // Note: we could choose an arbitrary limit lower than this. The purpose at this point is to avoid OOM
+            // in the case where Java cannot allocate an array of the requested size.
+            throw new IonException(String.format(
+                "The maximum header length %d exceeds the maximum array size %d.",
+                maxHeaderLength,
+                _Private_IonConstants.ARRAY_MAXIMUM_SIZE
+            ));
+        }
+    }
+
     static IonReader buildReader(
         _Private_IonReaderBuilder builder,
         byte[] ionData,
@@ -200,16 +213,29 @@ static IonReader buildReader(
         IonReaderFromBytesFactoryBinary binary,
         IonReaderFromBytesFactoryText text
     ) {
-        if (IonStreamUtils.isGzip(ionData, offset, length)) {
-            try {
-                return buildReader(
-                    builder,
-                    new GZIPInputStream(new ByteArrayInputStream(ionData, offset, length)),
-                    _Private_IonReaderFactory::makeReaderBinary,
-                    _Private_IonReaderFactory::makeReaderText
-                );
-            } catch (IOException e) {
-                throw new IonException(e);
+        List<InputStreamInterceptor> streamInterceptors = builder.getInputStreamInterceptors();
+        for (InputStreamInterceptor streamInterceptor : streamInterceptors) {
+            int headerLength = streamInterceptor.numberOfBytesNeededToDetermineMatch();
+            validateHeaderLength(headerLength);
+            if (length < headerLength) {
+                continue;
+            }
+            if (streamInterceptor.isMatch(ionData, offset, length)) {
+                try {
+                    return buildReader(
+                        builder,
+                        streamInterceptor.newInputStream(new ByteArrayInputStream(ionData, offset, length)),
+                        _Private_IonReaderFactory::makeReaderBinary,
+                        _Private_IonReaderFactory::makeReaderText,
+                        // The builder provides only one level of detection, e.g. GZIP-compressed binary Ion *or*
+                        // zstd-compressed binary Ion; *not* GZIP-compressed zstd-compressed binary Ion. Users that
+                        // need to intercept multiple format layers can provide a custom InputStreamInterceptor to
+                        // achieve this.
+                        /*inputStreamInterceptors=*/ Collections.emptyList()
+                    );
+                } catch (IOException e) {
+                    throw new IonException(e);
+                }
             }
         }
         if (IonStreamUtils.isIonBinary(ionData, offset, length)) {
@@ -247,15 +273,6 @@ private static boolean startsWithIvm(byte[] buffer, int length) {
         return true;
     }
 
-    static final byte[] GZIP_HEADER = {0x1F, (byte) 0x8B};
-
-    private static boolean startsWithGzipHeader(byte[] buffer, int length) {
-        if (length >= GZIP_HEADER.length) {
-            return buffer[0] == GZIP_HEADER[0] && buffer[1] == GZIP_HEADER[1];
-        }
-        return false;
-    }
-
     @FunctionalInterface
     interface IonReaderFromInputStreamFactoryText {
         IonReader makeReader(IonCatalog catalog, InputStream source, _Private_LocalSymbolTableFactory lstFactory);
@@ -266,27 +283,62 @@ interface IonReaderFromInputStreamFactoryBinary {
         IonReader makeReader(_Private_IonReaderBuilder builder, InputStream source, byte[] alreadyRead, int alreadyReadOff, int alreadyReadLen);
     }
 
+    /**
+     * Reads from the given source into the given byte array, stopping once either
+     * <ol>
+     *     <li>`length` bytes have been read, or</li>
+     *     <li>the end of the source stream has been reached, or</li>
+     *     <li>the source stream throws an exception.</li>
+     * </ol>
+     * @param source the source of the bytes to read.
+     * @param destination the destination for the bytes read.
+     * @param length the number of bytes to attempt to read.
+     * @return the number of bytes read into `destination`.
+     */
+    private static int fillToLengthOrStreamEnd(InputStream source, byte[] destination, int length) {
+        int bytesRead = 0;
+        while (bytesRead < length) {
+            int bytesToRead = length - bytesRead;
+            int bytesReadThisIteration;
+            try {
+                bytesReadThisIteration = source.read(destination, bytesRead, bytesToRead);
+            } catch (EOFException e) {
+                // Some InputStream implementations throw EOFException in certain cases to convey
+                // that the end of the stream has been reached.
+                break;
+            } catch (IOException e) {
+                throw new IonException(e);
+            }
+            if (bytesReadThisIteration < 0) { // This indicates the end of the stream.
+                break;
+            }
+            bytesRead += bytesReadThisIteration;
+        }
+        return bytesRead;
+    }
+
     static IonReader buildReader(
         _Private_IonReaderBuilder builder,
         InputStream source,
         IonReaderFromInputStreamFactoryBinary binary,
-        IonReaderFromInputStreamFactoryText text
+        IonReaderFromInputStreamFactoryText text,
+        List<InputStreamInterceptor> inputStreamInterceptors
     ) {
         if (source == null) {
             throw new NullPointerException("Cannot build a reader from a null InputStream.");
         }
+        int maxHeaderLength = Math.max(
+            _Private_IonConstants.BINARY_VERSION_MARKER_SIZE,
+            inputStreamInterceptors.stream().mapToInt(InputStreamInterceptor::numberOfBytesNeededToDetermineMatch).max().orElse(0)
+        );
+        validateHeaderLength(maxHeaderLength);
         // Note: this can create a lot of layers of InputStream wrappers. For example, if this method is called
         // from build(byte[]) and the bytes contain GZIP, the chain will be SequenceInputStream(ByteArrayInputStream,
         // GZIPInputStream -> PushbackInputStream -> ByteArrayInputStream). If this creates a drag on efficiency,
         // alternatives should be evaluated.
-        byte[] possibleIVM = new byte[_Private_IonConstants.BINARY_VERSION_MARKER_SIZE];
+        byte[] possibleIVM = new byte[maxHeaderLength];
         InputStream ionData = source;
-        int bytesRead;
-        try {
-            bytesRead = ionData.read(possibleIVM);
-        } catch (IOException e) {
-            throw new IonException(e);
-        }
+        int bytesRead = fillToLengthOrStreamEnd(ionData, possibleIVM, maxHeaderLength);
         // If the input stream is growing, it is possible that fewer than BINARY_VERSION_MARKER_SIZE bytes are
         // available yet. Simply check whether the stream *could* contain binary Ion based on the available bytes.
         // If it can't, fall back to text.
@@ -296,19 +348,20 @@ static IonReader buildReader(
         // stream will always be empty (in which case it doesn't matter whether a text or binary reader is used)
         // or it's a binary stream (in which case the correct reader was created) or it's a growing text stream
         // (which has always been unsupported).
-        if (startsWithGzipHeader(possibleIVM, bytesRead)) {
-            try {
-                ionData = new GZIPInputStream(
-                    new TwoElementSequenceInputStream(new ByteArrayInputStream(possibleIVM, 0, bytesRead), ionData)
-                );
+        for (InputStreamInterceptor streamInterceptor : inputStreamInterceptors) {
+            if (bytesRead < streamInterceptor.numberOfBytesNeededToDetermineMatch()) {
+                continue;
+            }
+            if (streamInterceptor.isMatch(possibleIVM, 0, bytesRead)) {
                 try {
-                    bytesRead = ionData.read(possibleIVM);
-                } catch (EOFException e) {
-                    // Only a GZIP header was available, so this may be a binary Ion stream.
-                    bytesRead = 0;
+                    ionData = streamInterceptor.newInputStream(
+                        new TwoElementInputStream(new ByteArrayInputStream(possibleIVM, 0, bytesRead), ionData)
+                    );
+                } catch (IOException e) {
+                    throw new IonException(e);
                 }
-            } catch (IOException e) {
-                throw new IonException(e);
+                bytesRead = fillToLengthOrStreamEnd(ionData, possibleIVM, _Private_IonConstants.BINARY_VERSION_MARKER_SIZE);
+                break;
             }
         }
         if (startsWithIvm(possibleIVM, bytesRead)) {
@@ -316,7 +369,7 @@ static IonReader buildReader(
         }
         InputStream wrapper;
         if (bytesRead > 0) {
-            wrapper = new TwoElementSequenceInputStream(
+            wrapper = new TwoElementInputStream(
                 new ByteArrayInputStream(possibleIVM, 0, bytesRead),
                 ionData
             );
@@ -333,7 +386,8 @@ public IonReader build(InputStream source)
             this,
             source,
             _Private_IonReaderFactory::makeReaderBinary,
-            _Private_IonReaderFactory::makeReaderText
+            _Private_IonReaderFactory::makeReaderText,
+            getInputStreamInterceptors()
         );
     }
 
diff --git a/src/main/java/com/amazon/ion/impl/_Private_IonReaderFactory.java b/src/main/java/com/amazon/ion/impl/_Private_IonReaderFactory.java
index 1f0e83ce57..735ac4a408 100644
--- a/src/main/java/com/amazon/ion/impl/_Private_IonReaderFactory.java
+++ b/src/main/java/com/amazon/ion/impl/_Private_IonReaderFactory.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl;
 
 import static com.amazon.ion.impl.UnifiedInputStreamX.makeStream;
@@ -105,11 +92,13 @@ public static final IonReader makeReaderText(IonCatalog catalog,
 
     public static IonReader makeSystemReaderText(InputStream is)
     {
+        _Private_IonReaderBuilder builder = (_Private_IonReaderBuilder) _Private_IonReaderBuilder.standard();
         return _Private_IonReaderBuilder.buildReader(
-            (_Private_IonReaderBuilder) _Private_IonReaderBuilder.standard(),
+            builder,
             is,
             _Private_IonReaderFactory::makeSystemReaderBinary,
-            _Private_IonReaderFactory::makeSystemReaderText
+            _Private_IonReaderFactory::makeSystemReaderText,
+            builder.getInputStreamInterceptors()
         );
     }
 
diff --git a/src/main/java/com/amazon/ion/system/IonReaderBuilder.java b/src/main/java/com/amazon/ion/system/IonReaderBuilder.java
index 0c0771749b..76725c9a78 100644
--- a/src/main/java/com/amazon/ion/system/IonReaderBuilder.java
+++ b/src/main/java/com/amazon/ion/system/IonReaderBuilder.java
@@ -1,20 +1,8 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.system;
 
+import com.amazon.ion.util.GzipStreamInterceptor;
 import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
@@ -23,11 +11,17 @@
 import com.amazon.ion.IonSystem;
 import com.amazon.ion.IonTextReader;
 import com.amazon.ion.IonValue;
+import com.amazon.ion.util.InputStreamInterceptor;
 import com.amazon.ion.impl._Private_IonReaderBuilder;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ServiceLoader;
 
 /**
  * Build a new {@link IonReader} from the given {@link IonCatalog} and data
@@ -42,9 +36,20 @@
 public abstract class IonReaderBuilder
 {
 
+    // Default stream interceptors, which always begin with the GZIP interceptor.
+    private static final List<InputStreamInterceptor> DEFAULT_STREAM_INTERCEPTORS = Collections.singletonList(GzipStreamInterceptor.INSTANCE);
+
+    // Stream interceptors detected by the ClassLoader.
+    // Note: each ClassLoader may have access to a different list of detected interceptors, but static initialization
+    // is performed once per load of the class, and is guaranteed thread-safe. Therefore, there is no need to manually
+    // maintain a thread-safe cache of detected interceptors.
+    private static final List<InputStreamInterceptor> DETECTED_STREAM_INTERCEPTORS = Collections.unmodifiableList(detectStreamInterceptorsOnClasspath());
+
+
     private IonCatalog catalog = null;
     private boolean isIncrementalReadingEnabled = false;
     private IonBufferConfiguration bufferConfiguration = IonBufferConfiguration.DEFAULT;
+    private List<InputStreamInterceptor> streamInterceptors = null;
 
     protected IonReaderBuilder()
     {
@@ -55,6 +60,7 @@ protected IonReaderBuilder(IonReaderBuilder that)
         this.catalog = that.catalog;
         this.isIncrementalReadingEnabled = that.isIncrementalReadingEnabled;
         this.bufferConfiguration = that.bufferConfiguration;
+        this.streamInterceptors = that.streamInterceptors == null ? null : new ArrayList<>(that.streamInterceptors);
     }
 
     /**
@@ -263,6 +269,77 @@ public IonBufferConfiguration getBufferConfiguration() {
         return bufferConfiguration;
     }
 
+    /**
+     * Adds an {@link InputStreamInterceptor} to the end of the list that the builder will attempt
+     * to apply to a stream before creating {@link IonReader} instances over that stream.
+     * {@link GzipStreamInterceptor} is always consulted first, and need not be added. The first
+     * interceptor in the list that matches the stream will be used; if any chaining of interceptors
+     * is required, it is up to the caller to provide a custom interceptor implementation to
+     * achieve this.
+     * <p>
+     * Users may also or instead register implementations as service providers on the classpath.
+     * See {@link ServiceLoader} for details about how to do this.
+     * <p>
+     * The list of stream interceptors available to the reader always begins with
+     * {@link GzipStreamInterceptor} and is followed by:
+     * <ol>
+     *     <li>any stream interceptors detected on the classpath using
+     *     {@link ServiceLoader#load(Class)}, then</li>
+     *     <li>any stream interceptor(s) added by calling this method.</li>
+     * </ol>
+     *
+     * @param streamInterceptor the stream interceptor to add.
+     *
+     * @return this builder instance, if mutable;
+     * otherwise a mutable copy of this builder.
+     */
+    public IonReaderBuilder addInputStreamInterceptor(InputStreamInterceptor streamInterceptor) {
+        IonReaderBuilder b = mutable();
+        if (b.streamInterceptors == null) {
+            // 4 is arbitrary, but more would be very rare.
+            b.streamInterceptors = new ArrayList<>(DETECTED_STREAM_INTERCEPTORS.size() + 4);
+            b.streamInterceptors.addAll(DETECTED_STREAM_INTERCEPTORS);
+        }
+        b.streamInterceptors.add(streamInterceptor);
+        return b;
+    }
+
+    /**
+     * Detects implementations of {@link InputStreamInterceptor} available to the {@link ClassLoader} that loaded
+     * this class, appending any implementations found to the list of stream interceptors enabled by default.
+     * @return the stream interceptors.
+     */
+    private static List<InputStreamInterceptor> detectStreamInterceptorsOnClasspath() {
+        ServiceLoader<InputStreamInterceptor> loader = ServiceLoader.load(
+            InputStreamInterceptor.class,
+            // The ClassLoader used to load this class. Each ClassLoader may have access to different resources.
+            IonReaderBuilder.class.getClassLoader()
+        );
+        Iterator<InputStreamInterceptor> interceptorIterator = loader.iterator();
+        if (!interceptorIterator.hasNext()) {
+            // Avoid allocating a new list in the common case: no custom interceptors detected.
+            return DEFAULT_STREAM_INTERCEPTORS;
+        }
+        List<InputStreamInterceptor> interceptorsOnClasspath = new ArrayList<>(4); // 4 is arbitrary, but more would be very rare.
+        interceptorsOnClasspath.addAll(DEFAULT_STREAM_INTERCEPTORS);
+        interceptorIterator.forEachRemaining(interceptorsOnClasspath::add);
+        return interceptorsOnClasspath;
+    }
+
+    /**
+     * Gets the {@link InputStreamInterceptor} instances available to this builder. The returned list will always begin
+     * with the default stream interceptor, which detects GZIP. Any stream interceptor(s) detected on the classpath
+     * by {@link ServiceLoader#load(Class)} will immediately follow. Any stream interceptor(s) manually added using
+     * {@link #addInputStreamInterceptor(InputStreamInterceptor)} will occur at the end of the list.
+     * @return an unmodifiable view of the stream interceptors currently configured.
+     */
+    public List<InputStreamInterceptor> getInputStreamInterceptors() {
+        if (streamInterceptors == null) {
+            return DETECTED_STREAM_INTERCEPTORS;
+        }
+        return Collections.unmodifiableList(streamInterceptors);
+    }
+
     /**
      * Based on the builder's configuration properties, creates a new IonReader
      * instance over the given block of Ion data, detecting whether it's text or
diff --git a/src/main/java/com/amazon/ion/util/GzipStreamInterceptor.java b/src/main/java/com/amazon/ion/util/GzipStreamInterceptor.java
new file mode 100644
index 0000000000..0de575cede
--- /dev/null
+++ b/src/main/java/com/amazon/ion/util/GzipStreamInterceptor.java
@@ -0,0 +1,46 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+package com.amazon.ion.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * The interceptor for GZIP streams. This is a singleton that may be accessed using {@link #INSTANCE}.
+ */
+public enum GzipStreamInterceptor implements InputStreamInterceptor {
+
+    INSTANCE;
+
+    private static final byte[] GZIP_HEADER = {0x1F, (byte) 0x8B};
+
+    @Override
+    public String formatName() {
+        return "gzip";
+    }
+
+    @Override
+    public int numberOfBytesNeededToDetermineMatch() {
+        return GZIP_HEADER.length;
+    }
+
+    @Override
+    public boolean isMatch(byte[] candidate, int offset, int length) {
+        if (candidate == null || length < GZIP_HEADER.length) {
+            return false;
+        }
+
+        for (int i = 0; i < GZIP_HEADER.length; i++) {
+            if (GZIP_HEADER[i] != candidate[offset + i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public InputStream newInputStream(InputStream interceptedStream) throws IOException {
+        return new GZIPInputStream(interceptedStream);
+    }
+}
diff --git a/src/main/java/com/amazon/ion/util/InputStreamInterceptor.java b/src/main/java/com/amazon/ion/util/InputStreamInterceptor.java
new file mode 100644
index 0000000000..11ef43750c
--- /dev/null
+++ b/src/main/java/com/amazon/ion/util/InputStreamInterceptor.java
@@ -0,0 +1,53 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+package com.amazon.ion.util;
+
+import com.amazon.ion.IonReader;
+import com.amazon.ion.system.IonReaderBuilder;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * An interceptor to be consulted by the {@link com.amazon.ion.system.IonReaderBuilder} when creating an
+ * {@link IonReader} over a user-provided stream. This allows users to transform a stream's raw bytes into
+ * valid text or binary Ion.
+ *
+ * @see com.amazon.ion.system.IonReaderBuilder#addInputStreamInterceptor(InputStreamInterceptor)
+ * @see com.amazon.ion.system.IonSystemBuilder#withReaderBuilder(IonReaderBuilder)
+ */
+public interface InputStreamInterceptor {
+
+    /**
+     * The name of the format the interceptor recognizes.
+     * @return a constant String.
+     */
+    String formatName();
+
+    /**
+     * The number of bytes required to be read from the beginning of the stream in order to determine whether
+     * it matches the format relevant to this interceptor. If a stream contains fewer than the number of bytes
+     * returned by this method, then this interceptor will not be considered a match and
+     * {@link #isMatch(byte[], int, int)} will not be called.
+     * @return the length in bytes.
+     */
+    int numberOfBytesNeededToDetermineMatch();
+
+    /**
+     * Determines whether the given candidate byte sequence matches this format.
+     * @param candidate the candidate byte sequence.
+     * @param offset the offset into the candidate bytes to begin matching.
+     * @param length the number of bytes (beginning at 'offset') in `candidate`. Must be greater than or equal to
+     *               {@link #numberOfBytesNeededToDetermineMatch()}.
+     * @return true if the candidate byte sequence matches; otherwise, false.
+     */
+    boolean isMatch(byte[] candidate, int offset, int length);
+
+    /**
+     * Creates a new InputStream that transforms the bytes in the given InputStream into valid text or binary Ion.
+     * @param interceptedStream the stream containing bytes in this format.
+     * @return a new InputStream.
+     * @throws IOException if thrown when constructing the new InputStream.
+     */
+    InputStream newInputStream(InputStream interceptedStream) throws IOException;
+}
diff --git a/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java b/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java
index b7d379922e..c1aaab02f4 100644
--- a/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java
+++ b/src/test/java/com/amazon/ion/system/IonReaderBuilderTest.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.system;
 
 import static com.amazon.ion.TestUtils.gzippedBytes;
@@ -26,18 +13,21 @@
 import static org.junit.Assert.fail;
 
 import com.amazon.ion.BitUtils;
+import com.amazon.ion.util.GzipStreamInterceptor;
 import com.amazon.ion.IonBufferConfiguration;
 import com.amazon.ion.IonCatalog;
 import com.amazon.ion.IonException;
 import com.amazon.ion.IonReader;
 import com.amazon.ion.IonType;
 import com.amazon.ion.IonWriter;
+import com.amazon.ion.util.InputStreamInterceptor;
 import com.amazon.ion.impl.ResizingPipedInputStream;
 import com.amazon.ion.impl._Private_IonBinaryWriterBuilder;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.util.List;
 import java.util.zip.GZIPOutputStream;
 
 import com.amazon.ion.impl._Private_IonConstants;
@@ -234,4 +224,14 @@ public void incompleteIvmFailsCleanly(boolean isIncremental) throws Exception {
         reader.close();
     }
 
+    @Test
+    public void gzipInterceptorEnabledByDefault() {
+        IonReaderBuilder builder = IonReaderBuilder.standard();
+        List<InputStreamInterceptor> interceptors = builder.getInputStreamInterceptors();
+        assertEquals(1, interceptors.size());
+        assertEquals(GzipStreamInterceptor.INSTANCE.formatName(), interceptors.get(0).formatName());
+        // The list returned from IonReaderBuilder.getStreamInterceptors() is unmodifiable.
+        assertThrows(UnsupportedOperationException.class, () -> interceptors.add(GzipStreamInterceptor.INSTANCE));
+    }
+
 }
diff --git a/src/test/java/com/amazon/ion/util/ZstdStreamInterceptorTest.java b/src/test/java/com/amazon/ion/util/ZstdStreamInterceptorTest.java
new file mode 100644
index 0000000000..89caa971cf
--- /dev/null
+++ b/src/test/java/com/amazon/ion/util/ZstdStreamInterceptorTest.java
@@ -0,0 +1,439 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+package com.amazon.ion.util;
+
+import com.amazon.ion.IonException;
+import com.amazon.ion.IonSystem;
+import com.amazon.ion.system.IonBinaryWriterBuilder;
+import com.amazon.ion.system.IonReaderBuilder;
+import com.amazon.ion.system.IonSystemBuilder;
+import com.amazon.ion.system.IonTextWriterBuilder;
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.IonWriter;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.URLConnection;
+import java.net.URLStreamHandler;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+import com.github.luben.zstd.ZstdInputStream;
+import com.github.luben.zstd.ZstdOutputStream;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+/**
+ * Demonstrates how a StreamInterceptor that recognizes Zstd streams can be plugged into the IonReaderBuilder and
+ * IonSystem.
+ */
+public class ZstdStreamInterceptorTest {
+
+    private static final byte[] ZSTD_HEADER = {(byte) 0x28, (byte) 0xB5, (byte) 0x2F, (byte) 0xFD};
+
+    public static class ZstdStreamInterceptor implements InputStreamInterceptor {
+
+        @Override
+        public String formatName() {
+            return "zstd";
+        }
+
+        @Override
+        public int numberOfBytesNeededToDetermineMatch() {
+            return ZSTD_HEADER.length;
+        }
+
+        @Override
+        public boolean isMatch(byte[] candidate, int offset, int length) {
+            if (candidate == null || length < ZSTD_HEADER.length) {
+                return false;
+            }
+
+            for (int i = 0; i < ZSTD_HEADER.length; i++) {
+                if (ZSTD_HEADER[i] != candidate[offset + i]) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        @Override
+        public InputStream newInputStream(InputStream interceptedStream) throws IOException {
+            return new ZstdInputStream(interceptedStream).setContinuous(true);
+        }
+    }
+
+    public enum ZstdStream {
+        BINARY_STREAM_READER(builder -> builder.build(stream(binaryBytes()))),
+        TEXT_STREAM_READER(builder -> builder.build(stream(textBytes()))),
+        BINARY_BYTES_READER(builder -> builder.build(binaryBytes())),
+        TEXT_BYTES_READER(builder -> builder.build(textBytes())),
+        BINARY_STREAM_SYSTEM(builder -> system(builder).newReader((stream(binaryBytes())))),
+        TEXT_STREAM_SYSTEM(builder -> system(builder).newReader((stream(textBytes())))),
+        BINARY_BYTES_SYSTEM(builder -> system(builder).newReader(binaryBytes())),
+        TEXT_BYTES_SYSTEM(builder -> system(builder).newReader(textBytes()));
+
+        private final Function<IonReaderBuilder, IonReader> readerFactory;
+
+        ZstdStream(Function<IonReaderBuilder, IonReader> readerFactory) {
+            this.readerFactory = readerFactory;
+        }
+
+        IonReader newReader(IonReaderBuilder builder) {
+            return readerFactory.apply(builder);
+        }
+
+        static IonSystem system(IonReaderBuilder builder) {
+            return IonSystemBuilder.standard().withReaderBuilder(builder).build();
+        }
+
+        static byte[] textBytes() {
+            return writeCompressedStream(IonTextWriterBuilder.standard()::build);
+        }
+
+        static byte[] binaryBytes() {
+            return writeCompressedStream(IonBinaryWriterBuilder.standard()::build);
+        }
+
+        static InputStream stream(byte[] bytes) {
+            return new ByteArrayInputStream(bytes);
+        }
+
+        private static byte[] writeCompressedStream(Function<OutputStream, IonWriter> writerBuilder) {
+            ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+            try (IonWriter writer = writerBuilder.apply(new ZstdOutputStream(bytes))) {
+                writer.writeInt(123);
+            } catch (IOException e) {
+                throw new IllegalStateException(e);
+            }
+            return bytes.toByteArray();
+        }
+    }
+
+    @ParameterizedTest
+    @EnumSource(ZstdStream.class)
+    public void interceptorsFunctionProperly(ZstdStream stream) throws IOException {
+        IonReaderBuilder builder = IonReaderBuilder.standard().addInputStreamInterceptor(new ZstdStreamInterceptor());
+        try (IonReader reader = stream.newReader(builder)) {
+            assertEquals(IonType.INT, reader.next());
+            assertEquals(123, reader.intValue());
+        }
+    }
+
+    public static class CustomInterceptorClassLoader extends URLClassLoader {
+
+        public CustomInterceptorClassLoader() {
+            // Allow this ClassLoader to load all classes relevant to the builder and custom InputStreamInterceptor
+            // implementations being tested.
+            super(
+                new URL[] {
+                    IonReaderBuilder.class.getProtectionDomain().getCodeSource().getLocation(),
+                    ZstdStreamInterceptor.class.getProtectionDomain().getCodeSource().getLocation(),
+                    ZstdInputStream.class.getProtectionDomain().getCodeSource().getLocation()
+                },
+                IonReaderBuilder.class.getClassLoader().getParent()
+            );
+        }
+
+        @Override
+        public Enumeration<URL> getResources(String name) throws IOException {
+            if (name.equals("META-INF/services/" + InputStreamInterceptor.class.getName())) {
+                URL dummyUrl = new URL("unused", "unused", 42, "unused", new URLStreamHandler() {
+                    @Override
+                    protected URLConnection openConnection(URL url) {
+                        return new URLConnection(url) {
+                            @Override
+                            public void connect() {
+                                // Nothing to do.
+                            }
+
+                            @Override
+                            public InputStream getInputStream() {
+                                return new ByteArrayInputStream(ZstdStreamInterceptor.class.getName().getBytes(StandardCharsets.UTF_8));
+                            }
+                        };
+                    }
+                });
+                return Collections.enumeration(Collections.singletonList(dummyUrl));
+            }
+            return super.getResources(name);
+        }
+    }
+
+    /**
+     * Asserts that the given IonReaderBuilder has a GzipStreamInterceptor followed an InputStreamInterceptor of the
+     * given type.
+     * @param readerBuilder the builder.
+     * @param interceptorType the type of the InputStreamInterceptor to follow GzipStreamInterceptor.
+     */
+    private static void assertGzipThen(IonReaderBuilder readerBuilder, Class<? extends InputStreamInterceptor> interceptorType) {
+        List<InputStreamInterceptor> streamInterceptors = readerBuilder.getInputStreamInterceptors();
+        assertEquals(2, streamInterceptors.size());
+        assertSame(GzipStreamInterceptor.INSTANCE, streamInterceptors.get(0));
+        assertTrue(streamInterceptors.get(1).getClass().isAssignableFrom(interceptorType));
+    }
+
+    /**
+     * Asserts that the given IonReaderBuilder has a GzipStreamInterceptor followed an InputStreamInterceptor of the
+     * given type, performing all accesses via reflection. This must be used when an instance has been manually
+     * loaded by a custom ClassLoader, as such instances are not compatible with vanilla Java written in this context
+     * (for example, a manually loaded `IonReaderBuilder` would throw a `ClassCastException` if assigned to
+     * `IonReaderBuilder` in this test).
+     * @param builderClass the Class that represents the custom-loaded IonReaderBuilder.
+     * @param builderInstance the builder instance.
+     * @param interceptorTypes the type of the InputStreamInterceptor(s) to follow GzipStreamInterceptor.
+     */
+    private static List<?> assertGzipThen(Class<?> builderClass, Object builderInstance, Class<?>... interceptorTypes) {
+        try {
+            Method getInputStreamInterceptorsMethod = builderClass.getMethod("getInputStreamInterceptors");
+            List<?> streamInterceptors = (List<?>) getInputStreamInterceptorsMethod.invoke(builderInstance);
+            assertEquals(interceptorTypes.length + 1, streamInterceptors.size());
+            assertEquals(GzipStreamInterceptor.class.getName(), streamInterceptors.get(0).getClass().getName());
+            for (int i = 0; i < interceptorTypes.length; i++) {
+                Class<?> interceptorType = interceptorTypes[i];
+                assertEquals(interceptorType.getName(), streamInterceptors.get(i + 1).getClass().getName());
+            }
+            return streamInterceptors;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Executes the given target using an IonReaderBuilder instance loaded from the given custom ClassLoader.
+     * @param classLoader the custom ClassLoader to use.
+     * @param target the code to execute.
+     */
+    private void executeWithCustomClassLoader(ClassLoader classLoader, BiConsumer<Class<?>, Object> target) {
+        Class<?> ionReaderBuilderClass;
+        Object ionReaderBuilderInstance;
+        try {
+            // Note: below, 'true' forces static initialization.
+            ionReaderBuilderClass = Class.forName(IonReaderBuilder.class.getName(), true, classLoader);
+            Method factoryMethod = ionReaderBuilderClass.getMethod("standard");
+            ionReaderBuilderInstance = factoryMethod.invoke(null);
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        target.accept(ionReaderBuilderClass, ionReaderBuilderInstance);
+    }
+
+    @Test
+    public void gzipAlwaysAvailableWhenZstdAddedManually() {
+        IonReaderBuilder builder = IonReaderBuilder.standard().addInputStreamInterceptor(new ZstdStreamInterceptor());
+        assertGzipThen(builder, ZstdStreamInterceptor.class);
+    }
+
+    @Test
+    public void gzipAlwaysAvailableWhenZstdDetectedOnClasspath() {
+        executeWithCustomClassLoader(
+            new CustomInterceptorClassLoader(),
+            (builderClass, builder) -> assertGzipThen(builderClass, builder, ZstdStreamInterceptor.class)
+        );
+    }
+
+    @Test
+    public void manuallyAddedInterceptorsComeAfterDetectedInterceptors() {
+        executeWithCustomClassLoader(
+            new CustomInterceptorClassLoader(),
+            (builderClass, builder) -> {
+                // The custom ClassLoader adds Zstd. This should occur after GZIP (the default) but before the one
+                // added manually.
+                try {
+                    Class<?> zstdInterceptorClass = builderClass.getClassLoader().loadClass(ZstdStreamInterceptor.class.getName());
+                    Class<?> dummyInterceptorClass = builderClass.getClassLoader().loadClass(LengthTooLongInterceptor.class.getName());
+                    Object dummyInterceptorInstance = dummyInterceptorClass.getConstructor(int.class).newInstance(0);
+                    // Manually load the interface with the same ClassLoader so that it's compatible with the instance.
+                    Class<?> inputStreamInterceptorInterface = builderClass.getClassLoader().loadClass(InputStreamInterceptor.class.getName());
+                    Method addInterceptor = builderClass.getMethod("addInputStreamInterceptor", inputStreamInterceptorInterface);
+                    assertGzipThen(
+                        builderClass,
+                        addInterceptor.invoke(builder, dummyInterceptorInstance),
+                        zstdInterceptorClass, // Zstd is the first to follow GZIP because it was detected on the classpath.
+                        dummyInterceptorClass // Manually added interceptors come last.
+                    );
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            });
+    }
+
+    /**
+     * Configures the given thread to capture any uncaught exceptions thrown during execution of the thread.
+     * @param thread the thread to configure.
+     * @return a reference to the exception thrown (if any) during execution of the thread.
+     */
+    private AtomicReference<Throwable> registerExceptionHandler(Thread thread) {
+        AtomicReference<Throwable> error = new AtomicReference<>();
+        thread.setUncaughtExceptionHandler((t, e) -> error.set(e));
+        return error;
+    }
+
+    /**
+     * Fails the test if the given reference points to any exception.
+     * @param error an error reference.
+     */
+    private void failOnAnyError(AtomicReference<Throwable> error) {
+        Throwable t = error.get();
+        if (t != null) {
+            Assertions.fail(t);
+        }
+    }
+
+    // This is a multithreaded test; execute multiple times to increase the chances of triggering a race condition if
+    // one exists.
+    @RepeatedTest(100)
+    public void differentClassLoadersInEachThread() throws Exception {
+        Thread withDefaultClassLoader = new Thread(() -> {
+            IonReaderBuilder readerBuilder = IonReaderBuilder.standard();
+            List<InputStreamInterceptor> streamInterceptors = readerBuilder.getInputStreamInterceptors();
+            assertEquals(1, streamInterceptors.size());
+            assertSame(GzipStreamInterceptor.INSTANCE, streamInterceptors.get(0));
+        });
+
+        AtomicReference<Throwable> withDefaultClassLoaderError = registerExceptionHandler(withDefaultClassLoader);
+
+        Thread withCustomClassLoader = new Thread(() -> {
+            AtomicReference<List<?>> streamInterceptors = new AtomicReference<>();
+            executeWithCustomClassLoader(
+                Thread.currentThread().getContextClassLoader(), // This will be our custom ClassLoader (set below)
+                (builderClass, builder) -> {
+                    streamInterceptors.set(assertGzipThen(builderClass, builder, ZstdStreamInterceptor.class));
+                }
+            );
+            // Verify that a new IonReaderBuilder instance does not re-detect the interceptors applicable to this
+            // ClassLoader.
+            executeWithCustomClassLoader(
+                Thread.currentThread().getContextClassLoader(), // This will be our custom ClassLoader (set below)
+                (builderClass, builder) -> {
+                    assertSame(
+                        streamInterceptors.get(),
+                        assertGzipThen(builderClass, builder, ZstdStreamInterceptor.class)
+                    );
+                }
+            );
+        });
+
+        AtomicReference<Throwable> withCustomClassLoaderError = registerExceptionHandler(withCustomClassLoader);
+        withCustomClassLoader.setContextClassLoader(new CustomInterceptorClassLoader());
+
+        withDefaultClassLoader.start();
+        withCustomClassLoader.start();
+
+        // While the spawned threads are working, verify they do not affect the parent thread.
+        IonReaderBuilder builder = IonReaderBuilder.standard().addInputStreamInterceptor(new LengthTooLongInterceptor(0));
+        assertGzipThen(builder, LengthTooLongInterceptor.class);
+
+        withDefaultClassLoader.join();
+        withCustomClassLoader.join();
+
+        failOnAnyError(withDefaultClassLoaderError);
+        failOnAnyError(withCustomClassLoaderError);
+    }
+
+    public static class LengthTooLongInterceptor implements InputStreamInterceptor {
+
+        private final int length;
+
+        public LengthTooLongInterceptor(int length) {
+            this.length = length;
+        }
+
+        @Override
+        public String formatName() {
+            return null;
+        }
+
+        @Override
+        public int numberOfBytesNeededToDetermineMatch() {
+            return length;
+        }
+
+        @Override
+        public boolean isMatch(byte[] candidate, int offset, int length) {
+            return Assertions.fail("This method should be unreachable.");
+        }
+
+        @Override
+        public InputStream newInputStream(InputStream interceptedStream) {
+            return Assertions.fail("This method should be unreachable.");
+        }
+    }
+
+    @ParameterizedTest
+    @EnumSource(ZstdStream.class)
+    public void notInterceptedWhenStreamLengthIsLessThanHeaderLength(ZstdStream stream) throws IOException {
+        IonReaderBuilder builder = IonReaderBuilder.standard()
+            // The LengthTooLongInterceptor should be skipped, then the ZstdStreamInterceptor matched.
+            .addInputStreamInterceptor(new LengthTooLongInterceptor(1000)) // None of the test data is this long.
+            .addInputStreamInterceptor(new ZstdStreamInterceptor());
+        try (IonReader reader = stream.newReader(builder)) {
+            assertEquals(IonType.INT, reader.next());
+            assertEquals(123, reader.intValue());
+        }
+    }
+
+    @ParameterizedTest
+    @EnumSource(ZstdStream.class)
+    public void expectFailureWhenHeaderLengthIsInvalid(ZstdStream stream) {
+        IonReaderBuilder builder = IonReaderBuilder.standard()
+            // This header length is invalid because an array of that size cannot be allocated.
+            .addInputStreamInterceptor(new LengthTooLongInterceptor(Integer.MAX_VALUE))
+            .addInputStreamInterceptor(new ZstdStreamInterceptor());
+        assertThrows(IonException.class, () -> stream.newReader(builder));
+    }
+
+    private static class OneBytePerReadInputStream extends InputStream {
+
+        private final InputStream delegate;
+
+        OneBytePerReadInputStream(InputStream delegate) {
+            this.delegate = delegate;
+        }
+
+        @Override
+        public int read() throws IOException {
+            return delegate.read();
+        }
+
+        @Override
+        public int read(byte[] bytes, int off, int len) throws IOException {
+            int b = delegate.read();
+            if (b < 0) {
+                return -1;
+            }
+            bytes[off] = (byte) b;
+            return 1;
+        }
+    }
+
+    @Test
+    public void headerRequiresMultipleInputStreamReads() throws IOException {
+        IonReaderBuilder builder = IonReaderBuilder.standard()
+            .addInputStreamInterceptor(new ZstdStreamInterceptor());
+        try (IonReader reader = builder.build(new OneBytePerReadInputStream(new ByteArrayInputStream(ZstdStream.binaryBytes())))) {
+            assertEquals(IonType.INT, reader.next());
+            assertEquals(123, reader.intValue());
+        }
+    }
+}

From 079e6e057a8f977dea9560663d67454b72be6afc Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 23 Jan 2025 11:23:37 -0800
Subject: [PATCH 429/490] Bumps version to 1.11.11-SNAPSHOT

---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index f64fc5d4c7..2d6981806b 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.10-SNAPSHOT
+1.11.11-SNAPSHOT

From 7a89a8521c90c974930a3b1a20e3c4fd1b251823 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 16:51:43 +0000
Subject: [PATCH 430/490] Bump the github-action-dependencies group with 2
 updates

Bumps the github-action-dependencies group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `github/codeql-action` from 3.28.1 to 3.28.5
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/b6a472f63d85b9c78a3ac5e89422239fc15e9b3c...f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4)

Updates `codecov/codecov-action` from 5.1.2 to 5.3.1
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/1e68e06f1dbfde0e4cefc87efeba9e4643565303...13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/main.yml            | 2 +-
 .github/workflows/scorecard.yml       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2cb17ac6b2..64b668c9e7 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+        uses: github/codeql-action/init@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+        uses: github/codeql-action/autobuild@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+        uses: github/codeql-action/analyze@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6773bc909c..c01f1b2134 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@1e68e06f1dbfde0e4cefc87efeba9e4643565303 # v5.1.2
+      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c99d2ba098..9489cd9331 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+        uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
         with:
           sarif_file: results.sarif

From a5ba511584f52550c7ce2d5ae15e72c1fc5769fa Mon Sep 17 00:00:00 2001
From: Rob Marrowstone <99764876+rmarrowstone@users.noreply.github.com>
Date: Tue, 28 Jan 2025 14:06:02 -0800
Subject: [PATCH 431/490] Fix Hoisted Text Span Symbol Table Bug (#1043)

Fixes #1042
---
 .../amazon/ion/impl/IonReaderTextUserX.java   | 20 ++------
 .../com/amazon/ion/TextSpanHoistingTest.java  | 48 +++++++++++++++++++
 2 files changed, 53 insertions(+), 15 deletions(-)
 create mode 100644 src/test/java/com/amazon/ion/TextSpanHoistingTest.java

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderTextUserX.java b/src/main/java/com/amazon/ion/impl/IonReaderTextUserX.java
index 61e09041ef..de2cfb9cef 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderTextUserX.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderTextUserX.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl;
 
 import static com.amazon.ion.SystemSymbols.ION_1_0;
@@ -267,6 +254,7 @@ private static final class IonReaderTextSpan
         implements Span, TextSpan, OffsetSpan
     {
         private final UnifiedDataPageX _data_page;
+        private final SymbolTable      _symbols;
         private final IonType          _container_type;
 
         private final long             _start_offset;
@@ -284,6 +272,7 @@ private static final class IonReaderTextSpan
             //       page of buffered input Which is the case for the time
             //       being.  Later, when this is stream aware, this needs to change.
             _data_page = current_stream._buffer.getCurrentPage();
+            _symbols = reader.getSymbolTable();
             _container_type = reader.getContainerType();
 
             _start_offset = reader._value_start_offset - reader._physical_start_offset;
@@ -391,6 +380,7 @@ private void hoistImpl(Span span)
         }
         IonType container = text_span.getContainerType();
         re_init(iis, container, text_span._start_line, text_span._start_column);
+        _symbols = text_span._symbols;
     }
 
 
diff --git a/src/test/java/com/amazon/ion/TextSpanHoistingTest.java b/src/test/java/com/amazon/ion/TextSpanHoistingTest.java
new file mode 100644
index 0000000000..d560f930b4
--- /dev/null
+++ b/src/test/java/com/amazon/ion/TextSpanHoistingTest.java
@@ -0,0 +1,48 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+package com.amazon.ion;
+
+import com.amazon.ion.facet.Facets;
+import com.amazon.ion.system.IonReaderBuilder;
+import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+
+import java.io.IOException;
+
+public class TextSpanHoistingTest
+{
+    @Test
+    public void hoistingTextSpanAlsoHoistsSymbolTable() throws IOException {
+        String textWithSymbolTables =
+                "$ion_1_0 $ion_symbol_table::{ symbols:[\"bar\"] } { foo1: $10 }" +
+                "$ion_1_0 $ion_symbol_table::{ symbols:[\"baz\"] } { foo2: $10 }";
+
+        IonReader reader = IonReaderBuilder.standard().build(textWithSymbolTables);
+        SeekableReader seekableReader = Facets.asFacet(SeekableReader.class, reader);
+
+        Assertions.assertEquals(IonType.STRUCT, reader.next());
+        Span span = seekableReader.currentSpan();
+        reader.stepIn();
+        Assertions.assertEquals(IonType.SYMBOL, reader.next());
+        Assertions.assertEquals("foo1", reader.getFieldName());
+        Assertions.assertEquals("bar", reader.stringValue());
+        reader.stepOut();
+
+        Assertions.assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        Assertions.assertEquals(IonType.SYMBOL, reader.next());
+        Assertions.assertEquals("foo2", reader.getFieldName());
+        Assertions.assertEquals("baz", reader.stringValue());
+        reader.stepOut();
+
+        // now re-seek to the first value
+        seekableReader.hoist(span);
+
+        Assertions.assertEquals(IonType.STRUCT, reader.next());
+        reader.stepIn();
+        Assertions.assertEquals(IonType.SYMBOL, reader.next());
+        Assertions.assertEquals("foo1", reader.getFieldName());
+        Assertions.assertEquals("bar", reader.stringValue());
+        reader.stepOut();
+    }
+}

From e8bfb803233736555d9e3692778c47ab319f565a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 16:19:05 +0000
Subject: [PATCH 432/490] Bump the github-action-dependencies group across 1
 directory with 3 updates

Bumps the github-action-dependencies group with 3 updates in the / directory: [github/codeql-action](https://github.com/github/codeql-action), [actions/setup-java](https://github.com/actions/setup-java) and [gradle/actions](https://github.com/gradle/actions).


Updates `github/codeql-action` from 3.28.5 to 3.28.9
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4...9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0)

Updates `actions/setup-java` from 4.6.0 to 4.7.0
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4.6.0...v4.7.0)

Updates `gradle/actions` from 4.2.2 to 4.3.0
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/0bdd871935719febd78681f197cd39af5b6e16a6...94baf225fe0a508e581a564467443d0e2379123b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml                     | 6 +++---
 .../ion-java-performance-regression-detector.yml          | 2 +-
 .github/workflows/main.yml                                | 8 ++++----
 .github/workflows/publish-release-artifacts.yml           | 4 ++--
 .github/workflows/scorecard.yml                           | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 64b668c9e7..7afbb041a2 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
+        uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
+        uses: github/codeql-action/autobuild@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
+        uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 881f6a5d47..5676ebb7e6 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -78,7 +78,7 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.6.0
+        uses: actions/setup-java@v4.7.0
         with:
           distribution: 'corretto'
           java-version: 17
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c01f1b2134..bb9a0c3404 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,12 +16,12 @@ jobs:
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.3.0
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: 8
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6
+        uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b
         with:
           validate-wrappers: true
       - run: ./gradlew build
@@ -46,14 +46,14 @@ jobs:
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.3.0
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |
             8
             ${{matrix.java}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6
+        uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 77352e99f2..22394556e1 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -42,7 +42,7 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-      - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.3.0
+      - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@0bdd871935719febd78681f197cd39af5b6e16a6
+      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 9489cd9331..6d2d73f118 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           sarif_file: results.sarif

From 28f37951bdb2176262ca1189d0c4bcd9c7a06ec3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 17:43:16 +0000
Subject: [PATCH 433/490] Bump the github-action-dependencies group with 2
 updates

Bumps the github-action-dependencies group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [ossf/scorecard-action](https://github.com/ossf/scorecard-action).


Updates `github/codeql-action` from 3.28.9 to 3.28.10
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0...b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d)

Updates `ossf/scorecard-action` from 2.4.0 to 2.4.1
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/62b2cac7ed8198b15735ed49ab1e5cf35480ba46...f49aabe0b5af0936a0987cfb85d86b75731b0186)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 7afbb041a2..23b93bd335 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
+        uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
+        uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
+        uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6d2d73f118..6eb24d0cc0 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -37,7 +37,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
+        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
         with:
           sarif_file: results.sarif

From 912d84ae1f53ace46d3b3cf0c3a786fc16aa98f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Mar 2025 16:25:49 +0000
Subject: [PATCH 434/490] Bump codecov/codecov-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `codecov/codecov-action` from 5.3.1 to 5.4.0
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3...0565863a31f2c772f9f0395002a31e3f06189574)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bb9a0c3404..76b40437f3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0

From 0ee4895e79b4e9e0b47a8a0dc6297e6e7b37b510 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 17:08:21 +0000
Subject: [PATCH 435/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.28.10 to 3.28.11
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d...6bb031afdd8eb862ea3fc1848194185e076637e5)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 23b93bd335..07e72aeec9 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/autobuild@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6eb24d0cc0..6f60b6a56a 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           sarif_file: results.sarif

From 06b689983d48e70638dd2d69fc9b04aab7559eb9 Mon Sep 17 00:00:00 2001
From: Khushboo <68757952+desaikd@users.noreply.github.com>
Date: Wed, 19 Mar 2025 15:53:20 -0700
Subject: [PATCH 436/490] Fixes `IonReader.getIntegerSize()` calculation
 (#1055)

---
 .../amazon/ion/impl/IonReaderTextSystemX.java | 27 ++++-------
 src/test/java/com/amazon/ion/IntTest.java     | 46 +++++++++++++------
 .../ion/streaming/ReaderIntegerSizeTest.java  | 27 +++++------
 3 files changed, 51 insertions(+), 49 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java b/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
index c187682d53..10b82ef715 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderTextSystemX.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.impl;
 
 import static com.amazon.ion.impl._Private_ScalarConversions.getValueTypeName;
@@ -42,7 +29,6 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Date;
-import java.lang.Character;
 
 /**
  * This reader calls the {@link IonReaderTextRawX} for low level events.
@@ -191,9 +177,14 @@ private static boolean valueWithinBounds(String value, int len, char[] minImage,
         private static boolean magnitudeLessThanOrEqualTo(String lhs, int lhsLen, char[] rhs)
         {
             assert lhsLen == rhs.length;
-            for (int i = lhsLen - 1; i >= 0; i--)
+            for (int i = 0; i < lhsLen; i++)
             {
-                if (lhs.charAt(i) > rhs[i])
+                char lhc = lhs.charAt(i);
+                char rhc = rhs[i];
+                if (lhc < rhc) {
+                    return true;
+                }
+                if (lhc > rhc)
                 {
                     return false;
                 }
diff --git a/src/test/java/com/amazon/ion/IntTest.java b/src/test/java/com/amazon/ion/IntTest.java
index 7401a3eaa6..d5d218a1ae 100644
--- a/src/test/java/com/amazon/ion/IntTest.java
+++ b/src/test/java/com/amazon/ion/IntTest.java
@@ -1,22 +1,11 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+
+import com.amazon.ion.system.IonSystemBuilder;
 import org.junit.Test;
 
 
@@ -507,6 +496,23 @@ public void testBigDecimalValue()
         assertNull(nullValue.bigDecimalValue());
     }
 
+    @Test
+    public void testGetIntegerSizeNearBoundariesUsingReader() {
+        assertIntegerSizeForValue(IntegerSize.INT, Integer.toString(Integer.MAX_VALUE - 10));
+        assertIntegerSizeForValue(IntegerSize.INT, Integer.toString(Integer.MIN_VALUE + 10));
+        assertIntegerSizeForValue(IntegerSize.LONG, Long.toString(Long.MAX_VALUE - 10));
+        assertIntegerSizeForValue(IntegerSize.LONG, Long.toString(Long.MIN_VALUE + 10));
+        assertIntegerSizeForValue(IntegerSize.LONG, (BigInteger.valueOf(Long.MAX_VALUE - 10).toString()));
+        assertIntegerSizeForValue(IntegerSize.LONG, (BigInteger.valueOf(Long.MIN_VALUE + 10).toString()));
+    }
+
+    private void assertIntegerSizeForValue(IntegerSize expected, String ionData) {
+        IonReader reader = IonSystemBuilder.standard().build().newReader(ionData);
+        reader.next();
+        IntegerSize size = reader.getIntegerSize();
+        assertEquals(expected, size);
+    }
+
     private void testGetIntegerSizeLongBoundary(long boundaryValue) {
         BigInteger boundary = BigInteger.valueOf(boundaryValue);
         IonInt boundaryIon = (IonInt)oneValue(boundary.toString());
@@ -517,6 +523,11 @@ private void testGetIntegerSizeLongBoundary(long boundaryValue) {
         IonInt pastBoundaryIon = (IonInt)oneValue(pastBoundary.toString());
         assertEquals(IntegerSize.BIG_INTEGER, pastBoundaryIon.getIntegerSize());
         assertEquals(pastBoundary, pastBoundaryIon.bigIntegerValue());
+
+        long withinBoundary =  boundaryValue  - 10L * Long.signum(boundaryValue);
+        IonInt withinBoundaryIon = (IonInt)oneValue(Long.toString(withinBoundary));
+        assertEquals(IntegerSize.LONG, withinBoundaryIon.getIntegerSize());
+        assertEquals(withinBoundary, withinBoundaryIon.longValue());
     }
 
     private void testGetIntegerSizeIntBoundary(int boundaryValue) {
@@ -529,6 +540,11 @@ private void testGetIntegerSizeIntBoundary(int boundaryValue) {
         IonInt pastBoundaryIon = (IonInt)oneValue(pastBoundary.toString());
         assertEquals(IntegerSize.LONG, pastBoundaryIon.getIntegerSize());
         assertEquals(pastBoundary.longValue(), pastBoundaryIon.longValue());
+
+        int withinBoundary =  boundaryValue  - 10 * Integer.signum(boundaryValue);
+        IonInt withinBoundaryIon = (IonInt)oneValue(Integer.toString(withinBoundary));
+        assertEquals(IntegerSize.INT, withinBoundaryIon.getIntegerSize());
+        assertEquals(withinBoundary, withinBoundaryIon.intValue());
     }
 
 }
diff --git a/src/test/java/com/amazon/ion/streaming/ReaderIntegerSizeTest.java b/src/test/java/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
index ed5802b054..958ba4a8a0 100644
--- a/src/test/java/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
+++ b/src/test/java/com/amazon/ion/streaming/ReaderIntegerSizeTest.java
@@ -1,18 +1,5 @@
-/*
- * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * A copy of the License is located at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * or in the "license" file accompanying this file. This file is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
 package com.amazon.ion.streaming;
 
 import com.amazon.ion.IntegerSize;
@@ -142,6 +129,9 @@ public void testGetIntegerSizeNegativeIntBoundary()
 
     private void testGetIntegerSizeIntBoundary(int boundaryValue, long pastBoundary)
     {
+        in.next();
+        assertEquals(IntegerSize.INT, in.getIntegerSize());
+        assertEquals(boundaryValue + ((boundaryValue < 0) ? 9 : -9), in.intValue());
         in.next();
         assertEquals(IntegerSize.INT, in.getIntegerSize());
         assertEquals(boundaryValue, in.intValue());
@@ -155,6 +145,9 @@ private void testGetIntegerSizeIntBoundary(int boundaryValue, long pastBoundary)
 
     private void testGetIntegerSizeLongBoundary(long boundaryValue, BigInteger pastBoundary)
     {
+        in.next();
+        assertEquals(IntegerSize.LONG, in.getIntegerSize());
+        assertEquals(boundaryValue + ((boundaryValue < 0) ? 9 : -9), in.longValue());
         in.next();
         assertEquals(IntegerSize.LONG, in.getIntegerSize());
         assertEquals(boundaryValue, in.longValue());
@@ -169,7 +162,9 @@ private BigInteger loadBoundaries(long boundaryValue, IntRadix intRadix)
     {
         BigInteger boundary = BigInteger.valueOf(boundaryValue);
         BigInteger pastBoundary = (boundaryValue < 0) ? boundary.subtract(BigInteger.ONE) : boundary.add(BigInteger.ONE);
-        String ionText = intRadix.getString(boundary) + " " + intRadix.getString(pastBoundary);
+        BigInteger nine = BigInteger.valueOf(9);
+        BigInteger withinBoundary = (boundaryValue < 0) ? boundary.add(nine) : boundary.subtract(nine);
+        String ionText = intRadix.getString(withinBoundary) + " " + intRadix.getString(boundary) + " " + intRadix.getString(pastBoundary);
         read(ionText);
         return pastBoundary;
     }

From a319f894d6a0a41d762423dede56c1c1bd3c3e1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Mar 2025 17:35:35 +0000
Subject: [PATCH 437/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.28.11 to 3.28.13
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/6bb031afdd8eb862ea3fc1848194185e076637e5...1b549b9259bda1cb5ddde3b41741a82a2d15a841)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 07e72aeec9..98fb0b3a05 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -52,7 +52,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+        uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -66,4 +66,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6f60b6a56a..c737c3475d 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
         with:
           sarif_file: results.sarif

From 15cce93910f7847d3e05e79f218b0f5151c4b5b6 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Thu, 3 Apr 2025 11:23:25 -0700
Subject: [PATCH 438/490] Build cherry picks (#1060)

* Fix Spotless rachetFrom to use the closest ancestor commit that is part of `master` (#848)

* Fix use of layout.buildDirectory (#949)

This is a DirectoryProperty, which in a few places was used or carried
forward as a String without being appropriately converted first.

That resulted in the use and creation of a project-root directory called
`gradle.api.file.Directory, fixed(class org.gradle.api.internal.file.DefaultFilePropertyFactory$FixedDirectory, `
which was then used by the `generateJarInfo` and `generateLicenseReport`
tasks.

This fixes it.

* Update .gitignore (#1027)

We don't use these anymore:
- Eclipse
- Perforce
- Maven

---------

Co-authored-by: Matthew Pope <81593196+popematt@users.noreply.github.com>
---
 .github/workflows/main.yml |   1 -
 .gitignore                 | 180 ++++++++++++++++---------------------
 build.gradle.kts           |  67 ++++++++++----
 3 files changed, 124 insertions(+), 124 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 76b40437f3..111d9fb3ff 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -3,7 +3,6 @@ permissions: read-all
 
 on:
   push:
-    branches: [ master ]
   pull_request:
     branches: [ master ]
 
diff --git a/.gitignore b/.gitignore
index b47ba47a34..3f9dc83b29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,83 +1,16 @@
-.eclipseout
-.p4config
-/build
-/*.iml
-junit*.properties
-tmp*
-/target
-/resources
-*~
-
-# Created by https://www.gitignore.io/api/vim,emacs,maven,gradle,eclipse,intellij
-# Edit at https://www.gitignore.io/?templates=vim,emacs,maven,gradle,eclipse,intellij
-
-### Eclipse ###
-
-.metadata
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.settings/
-.loadpath
-.recommenders
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
-# CDT- autotools
-.autotools
-
-# Java annotation processor (APT)
-.factorypath
-
-# PDT-specific (PHP Development Tools)
-.buildpath
+## Manually Maintained ##
 
-# sbteclipse plugin
-.target
+### JetBrains ###
+# jetbrains+all still doesn't quite go far enough
+/.idea/
 
-# Tern plugin
-.tern-project
+### SDKMan ###
+/.sdkmanrc
 
-# TeXlipse plugin
-.texlipse
 
-# STS (Spring Tool Suite)
-.springBeans
 
-# Code Recommenders
-.recommenders/
-
-# Annotation Processing
-.apt_generated/
-
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
-### Eclipse Patch ###
-# Eclipse Core
-.project
-
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
-
-# Annotation Processing
-.apt_generated
-
-.sts4-cache/
+# Created by https://www.toptal.com/developers/gitignore/api/vim,emacs,macos,gradle,jetbrains+all
+# Edit at https://www.toptal.com/developers/gitignore?templates=vim,emacs,macos,gradle,jetbrains+all
 
 ### Emacs ###
 # -*- mode: gitignore; -*-
@@ -130,12 +63,10 @@ flycheck_*.el
 /network-security.data
 
 
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+### JetBrains+all ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-.idea
-
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
@@ -143,6 +74,9 @@ flycheck_*.el
 .idea/**/dictionaries
 .idea/**/shelf
 
+# AWS User-specific
+.idea/**/aws.xml
+
 # Generated files
 .idea/**/contentModel.xml
 
@@ -163,9 +97,14 @@ flycheck_*.el
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
+# .idea/artifacts
+# .idea/compiler.xml
+# .idea/jarRepositories.xml
 # .idea/modules.xml
 # .idea/*.iml
 # .idea/modules
+# *.iml
+# *.ipr
 
 # CMake
 cmake-build-*/
@@ -188,6 +127,9 @@ atlassian-ide-plugin.xml
 # Cursive Clojure plugin
 .idea/replstate.xml
 
+# SonarLint plugin
+.idea/sonarlint/
+
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
@@ -200,32 +142,52 @@ fabric.properties
 # Android studio 3.1+ serialized cache file
 .idea/caches/build_file_checksums.ser
 
-### Intellij Patch ###
-# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
+### JetBrains+all Patch ###
+# Ignore everything but code style settings and run configurations
+# that are supposed to be shared within teams.
 
-# *.iml
-# modules.xml
-# .idea/misc.xml
-# *.ipr
+.idea/*
+
+!.idea/codeStyles
+!.idea/runConfigurations
+
+### macOS ###
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
 
-# Sonarlint plugin
-.idea/sonarlint
-
-### Maven ###
-target/
-pom.xml.tag
-pom.xml.releaseBackup
-pom.xml.versionsBackup
-pom.xml.next
-release.properties
-dependency-reduced-pom.xml
-buildNumber.properties
-.mvn/timing.properties
-.mvn/wrapper/maven-wrapper.jar
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### macOS Patch ###
+# iCloud generated files
+*.icloud
 
 ### Vim ###
 # Swap
 [._]*.s[a-v][a-z]
+!*.svg  # comment out if you don't need vector files
 [._]*.sw[a-p]
 [._]s[a-rt-v][a-z]
 [._]ss[a-gi-z]
@@ -233,6 +195,7 @@ buildNumber.properties
 
 # Session
 Session.vim
+Sessionx.vim
 
 # Temporary
 .netrwhist
@@ -243,7 +206,8 @@ tags
 
 ### Gradle ###
 .gradle
-/build/
+**/build/
+!src/**/build/
 
 # Ignore Gradle GUI config
 gradle-app.setting
@@ -251,13 +215,21 @@ gradle-app.setting
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
 
+# Avoid ignore Gradle wrappper properties
+!gradle-wrapper.properties
+
 # Cache of project
 .gradletasknamecache
 
-# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
-# gradle/wrapper/gradle-wrapper.properties
+# Eclipse Gradle plugin generated files
+# Eclipse Core
+.project
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
 
 ### Gradle Patch ###
-**/build/
+# Java heap dump
+*.hprof
+
+# End of https://www.toptal.com/developers/gitignore/api/vim,emacs,macos,gradle,jetbrains+all
 
-# End of https://www.gitignore.io/api/vim,emacs,maven,gradle,eclipse,intellij
diff --git a/build.gradle.kts b/build.gradle.kts
index 9451d2550c..d0ad32bd54 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,4 @@
+import com.diffplug.gradle.spotless.SpotlessTask
 import com.github.jk1.license.filter.LicenseBundleNormalizer
 import com.github.jk1.license.render.InventoryMarkdownReportRenderer
 import com.github.jk1.license.render.TextReportRenderer
@@ -91,9 +92,9 @@ description = "A Java implementation of the Amazon Ion data notation."
 val isCI: Boolean = System.getenv("CI") == "true"
 val githubRepositoryUrl = "https://github.com/amazon-ion/ion-java/"
 val isReleaseVersion: Boolean = !version.toString().endsWith("SNAPSHOT")
-// The name we're checking for corresponds to the name that is set in the `publish-release-artifacts.yml` file.
-val isReleaseWorkflow: Boolean = System.getenv("GITHUB_WORKFLOW") == "Publish Release Artifacts"
-val generatedResourcesDir = "${layout.buildDirectory}/generated/main/resources"
+// Workflows triggered by a new release always have a tag ref.
+val isReleaseWorkflow: Boolean = (System.getenv("GITHUB_REF") ?: "").startsWith("refs/tags/")
+val generatedResourcesDir = layout.buildDirectory.dir("generated/main/resources")
 
 sourceSets {
     main {
@@ -106,7 +107,7 @@ licenseReport {
     // though ion-java does not depend on ion-java-cli. By default, the license report generator includes
     // the current project (ion-java) and all its subprojects.
     projects = arrayOf(project)
-    outputDir = "${layout.buildDirectory}/reports/licenses"
+    outputDir = layout.buildDirectory.dir("reports/licenses").get().asFile.path
     renderers = arrayOf(InventoryMarkdownReportRenderer(), TextReportRenderer())
     // Dependencies use inconsistent titles for Apache-2.0, so we need to specify mappings
     filters = arrayOf(
@@ -119,41 +120,52 @@ licenseReport {
     )
 }
 
+// Spotless eagerly checks for the `rachetFrom` git ref even if there are no spotless tasks in the task
+// graph, so we're going to use a git tag to create our own lazy evaluation and setting of `rachetFrom`.
+// See https://github.com/diffplug/spotless/issues/1902
+val SPOTLESS_TAG = "spotless-check-${Instant.now().epochSecond}-DELETE-ME"
+
 /**
- * This is the `git remote` name that corresponds to amazon-ion/ion-java.
- * It is used for applying the "spotless" checks only to things that are changed
- * compared to the master branch of the source repo.
+ * This is the commit where the current branch most recently forked from master. We use this as
+ * our "rachetFrom" base so that changes in master don't cause unexpected formatting failures in
+ * feature branches.
  */
-val sourceRepoRemoteName: String by lazy {
+val sourceRepoRachetFromCommit: String by lazy {
     val git = System.getenv("GIT_CLI") ?: "git"
 
     fun String.isSourceRepo(): Boolean {
-        val url = "$git remote get-url ${this@isSourceRepo}".runCommand()
+        val url = "$git remote get-url ${this@isSourceRepo}".trim().runCommand()
         return "amazon-ion/ion-java" in url || "amzn/ion-java" in url
     }
 
-    var name = "$git remote".runCommand().lines().firstOrNull { it.isSourceRepo() }
+    var remoteName = "$git remote".runCommand().trim().lines().firstOrNull { it.isSourceRepo() }
 
     if (isCI) {
         // When running on a CI environment e.g. GitHub Actions, we might need to automatically add the remote
-        if (name == null) {
-            name = "ci_source_repository"
-            "$git remote add $name $githubRepositoryUrl".runCommand()
+        if (remoteName == null) {
+            remoteName = "ci_source_repository"
+            "$git remote add $remoteName $githubRepositoryUrl".runCommand(log = logger::quiet)
+            logger.quiet("Added remote repository ")
         }
         // ...and make sure that we have indeed fetched that remote
-        "$git fetch $name".runCommand()
+        "$git fetch --unshallow --no-tags --no-recurse-submodules $remoteName master".runCommand()
     }
 
-    name ?: throw Exception(
+    remoteName ?: throw Exception(
         """
             |No git remote found for amazon-ion/ion-java. Try again after running:
             |
             |    git remote add -f <name> $githubRepositoryUrl
             """.trimMargin()
     )
+
+    // TODO: We might need to use the PR base ref when this is running as part of a CI check for a PR.
+    logger.quiet("Finding spotless ratchetFrom base...")
+    "$git merge-base $remoteName/master HEAD".runCommand(log = logger::quiet).trim()
 }
 
-fun String.runCommand(workingDir: File = rootProject.projectDir): String {
+fun String.runCommand(workingDir: File = rootProject.projectDir, log: (String) -> Unit = logger::info): String {
+    log("$ $this")
     val parts = this.split("\\s".toRegex())
     val proc = ProcessBuilder(*parts.toTypedArray())
         .directory(workingDir)
@@ -161,7 +173,14 @@ fun String.runCommand(workingDir: File = rootProject.projectDir): String {
         .redirectError(ProcessBuilder.Redirect.PIPE)
         .start()
     proc.waitFor(30, TimeUnit.SECONDS)
-    return proc.inputStream.bufferedReader().readText()
+    val stdOut = proc.inputStream.bufferedReader().readText()
+    val stdErr = proc.errorStream.bufferedReader().readText()
+    if (stdOut.isNotBlank()) log(stdOut)
+    if (stdErr.isNotBlank()) logger.warn(stdErr)
+    if (proc.exitValue() != 0) {
+        throw Exception("Failed to run command: $this")
+    }
+    return stdOut
 }
 
 spotless {
@@ -172,7 +191,10 @@ spotless {
     // release branch.
     if (isReleaseWorkflow) return@spotless
 
-    ratchetFrom("$sourceRepoRemoteName/master")
+    "git tag -f $SPOTLESS_TAG".runCommand()
+    ratchetFrom(SPOTLESS_TAG)
+    // Make sure this always gets cleaned up. We can't do it inline here, so we'll do it once the task graph is created.
+    gradle.taskGraph.addTaskExecutionGraphListener { "git tag -d $SPOTLESS_TAG".runCommand() }
 
     val shortFormLicenseHeader = """
         // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -180,6 +202,8 @@ spotless {
     """.trimIndent()
 
     java {
+        // Note that the order of these is important. Each of these is an individual formatter
+        // that is applied sequentially.
         licenseHeader(shortFormLicenseHeader)
         removeUnusedImports()
     }
@@ -442,7 +466,7 @@ tasks {
      * for why this is done with a properties file rather than the Jar manifest.
      */
     val generateJarInfo by creating<Task> {
-        val propertiesFile = File("$generatedResourcesDir/${project.name}.properties")
+        val propertiesFile = generatedResourcesDir.get().file("${project.name}.properties").asFile
         doLast {
             propertiesFile.parentFile.mkdirs()
             val properties = Properties()
@@ -529,6 +553,11 @@ tasks {
         dependsOn(jar)
         includeConfigs.set(listOf("runtimeClasspath"))
     }
+
+    withType<SpotlessTask> {
+        doFirst { "git tag -f $SPOTLESS_TAG $sourceRepoRachetFromCommit".runCommand() }
+        doLast { "git tag -d $SPOTLESS_TAG".runCommand() }
+    }
 }
 
 publishing {

From b08cb98fa7542c93e258b3205969db0e1fe78685 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Fri, 4 Apr 2025 11:29:44 -0700
Subject: [PATCH 439/490] Upgrade plugins and JDKs for build stability (#1061)

* Upgrade JMH and Spotless plugins

Additionally, disable :spotbugsJmh. These combined changes are necessary
to get our release build to work while building with modern JDKs.

* Remove JDK 8 builds, still targeting Java 8

* Specify Java 11 for CodeQL
---
 .github/workflows/codeql-analysis.yml |  6 ++++++
 .github/workflows/main.yml            |  5 ++---
 build.gradle.kts                      | 14 ++++++++++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 98fb0b3a05..93d56b1ea6 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -49,6 +49,12 @@ jobs:
           # Prefix the list here with "+" to use these queries and those in the config file.
           # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
+      - name: Setup Java
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.3.0
+        with:
+          distribution: 'corretto'
+          java-version: 11
+
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 111d9fb3ff..f1a3489920 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.3.0
         with:
           distribution: 'corretto'
-          java-version: 8
+          java-version: 11
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b
         with:
@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11, 17, 21]
+        java: [11, 17, 21]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -49,7 +49,6 @@ jobs:
         with:
           distribution: 'corretto'
           java-version: |
-            8
             ${{matrix.java}}
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b
diff --git a/build.gradle.kts b/build.gradle.kts
index d0ad32bd54..3510029c3a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -35,7 +35,7 @@ plugins {
     id("com.github.spotbugs") version "5.0.13"
     id("org.jlleitschuh.gradle.ktlint") version "11.3.2"
 
-    id("com.diffplug.spotless") version "6.11.0"
+    id("com.diffplug.spotless") version "7.0.2"
 
     // Used for generating the third party attribution document
     id("com.github.jk1.dependency-license-report") version "2.5"
@@ -46,7 +46,7 @@ plugins {
     // the "spotbugsMain" task, causing it to fail. Instead, we will create a separate task to generate the bundle info.
     id("biz.aQute.bnd.builder") version "6.4.0" apply false
 
-    id("me.champeau.jmh") version "0.7.2"
+    id("me.champeau.jmh") version "0.7.3"
 }
 
 jacoco {
@@ -217,10 +217,17 @@ lateinit var sourcesJar: AbstractArchiveTask
 lateinit var javadocJar: AbstractArchiveTask
 lateinit var minifyJar: ProGuardTask
 
+tasks.withType<JavaCompile>().configureEach {
+    javaCompiler = javaToolchains.compilerFor {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}
+
 tasks {
     withType<JavaCompile> {
         options.encoding = "UTF-8"
     }
+
     withType<KotlinCompile<KotlinJvmOptions>> {
         kotlinOptions {
             // Kotlin jvmTarget must match the JavaCompile release version
@@ -400,6 +407,9 @@ tasks {
     // spotbugs-gradle-plugin creates a :spotbugsTest task by default, but we don't want it
     // see: https://github.com/spotbugs/spotbugs-gradle-plugin/issues/391
     project.gradle.startParameter.excludedTaskNames.add(":spotbugsTest")
+    // same for :spotbugsJmh, we don't need to run Spotbugs on our JMH code
+    // Alternatively we *could* set the toolchain for this task as we do for :spotBugsMain, but this is easier.
+    project.gradle.startParameter.excludedTaskNames.add(":spotbugsJmh")
 
     spotbugsMain {
         launcher.set(

From bf9c368c1b7c30930b4a82b2b028e845e9617251 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 09:21:25 -0700
Subject: [PATCH 440/490] Bump gradle/actions in the github-action-dependencies
 group (#1058)

Bumps the github-action-dependencies group with 1 update: [gradle/actions](https://github.com/gradle/actions).


Updates `gradle/actions` from 4.3.0 to 4.3.1
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/94baf225fe0a508e581a564467443d0e2379123b...06832c7b30a0129d7fb559bcc6e43d26f6374244)

---
updated-dependencies:
- dependency-name: gradle/actions
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/main.yml                      | 4 ++--
 .github/workflows/publish-release-artifacts.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f1a3489920..908a7fca77 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
           distribution: 'corretto'
           java-version: 11
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b
+        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
         with:
           validate-wrappers: true
       - run: ./gradlew build
@@ -51,7 +51,7 @@ jobs:
           java-version: |
             ${{matrix.java}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b
+        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 22394556e1..3944a717df 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b
+      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
         with:
           validate-wrappers: true
       - name: Build Release Artifacts

From 8fa8cf6f2eda32f942d1b183bbf344c959a762f1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 17:05:46 +0000
Subject: [PATCH 441/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.28.13 to 3.28.14
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/1b549b9259bda1cb5ddde3b41741a82a2d15a841...fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.28.14
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 93d56b1ea6..00453c59d8 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/init@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/autobuild@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/analyze@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c737c3475d..984f372b61 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/upload-sarif@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
         with:
           sarif_file: results.sarif

From e5a83bab6034b605dae7b4210f38799846a9bd74 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Tue, 8 Apr 2025 16:58:37 -0700
Subject: [PATCH 442/490] Use '--release' flag to target Java 8 (#1063)

* Use '--release' flag to target Java 8

* Restore java 8 in verify-jre-compatibility

Run gradle with only a single JDK version, rely on Gradle toolchains for
JVM diversity.
---
 .github/workflows/main.yml | 17 ++++++++++-------
 build.gradle.kts           | 15 ++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 908a7fca77..1b45174830 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,11 +1,15 @@
 name: build
 permissions: read-all
 
+env:
+  JAVA_VERSION: 21
+  JAVA_DISTRIBUTION: corretto
+
 on:
   push:
   pull_request:
     branches: [ master ]
-
+    types: [ opened, reopened ]
 
 jobs:
   build-and-test:
@@ -17,8 +21,8 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.3.0
         with:
-          distribution: 'corretto'
-          java-version: 11
+          distribution: ${{ env.JAVA_DISTRIBUTION}}
+          java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
         with:
@@ -38,7 +42,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [11, 17, 21]
+        java: [8, 11, 17, 21]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -47,9 +51,8 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.3.0
         with:
-          distribution: 'corretto'
-          java-version: |
-            ${{matrix.java}}
+          distribution: ${{ env.JAVA_DISTRIBUTION}}
+          java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
         with:
diff --git a/build.gradle.kts b/build.gradle.kts
index 3510029c3a..dfaed013bd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -64,9 +64,10 @@ val SUPPORTED_JRE_VERSIONS = listOf(8, 11, 17, 21)
 
 java {
     toolchain {
-        // Always build with the minimum supported Java version so that builds are reproducible,
-        // and so it automatically targets the min supported version.
-        languageVersion.set(JavaLanguageVersion.of(SUPPORTED_JRE_VERSIONS.min()))
+        // Build with a consistent Java version so that builds are reproducible. We use the max version because the min
+        // is more likely to run into deprecation or compatibility issues with Gradle plugins.
+        // We still target the minimum supported Java version in compilation with the `--release` flag.
+        languageVersion.set(JavaLanguageVersion.of(SUPPORTED_JRE_VERSIONS.max()))
         vendor.set(JvmVendorSpec.AMAZON)
     }
 }
@@ -217,15 +218,11 @@ lateinit var sourcesJar: AbstractArchiveTask
 lateinit var javadocJar: AbstractArchiveTask
 lateinit var minifyJar: ProGuardTask
 
-tasks.withType<JavaCompile>().configureEach {
-    javaCompiler = javaToolchains.compilerFor {
-        languageVersion = JavaLanguageVersion.of(8)
-    }
-}
-
 tasks {
     withType<JavaCompile> {
         options.encoding = "UTF-8"
+        // https://docs.gradle.org/current/userguide/building_java_projects.html#sec:compiling_with_release
+        options.release = SUPPORTED_JRE_VERSIONS.min()
     }
 
     withType<KotlinCompile<KotlinJvmOptions>> {

From aeb1792e2db95340f1ef8a83de377f2e5839fac3 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Wed, 9 Apr 2025 08:21:10 -0700
Subject: [PATCH 443/490] We still want to run on 'synchronize' from forks
 (#1064)

---
 .github/workflows/main.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 1b45174830..3c53e19141 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -9,11 +9,13 @@ on:
   push:
   pull_request:
     branches: [ master ]
-    types: [ opened, reopened ]
 
 jobs:
   build-and-test:
     runs-on: ubuntu-latest
+    # We want to run on external PRs, but not on internal ones as push automatically builds
+    # H/T: https://github.com/Dart-Code/Dart-Code/commit/612732d5879730608baa9622bf7f5e5b7b51ae65
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'amazon-ion/ion-java'
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -44,6 +46,7 @@ jobs:
       matrix:
         java: [8, 11, 17, 21]
     runs-on: ubuntu-latest
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'amazon-ion/ion-java'
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:

From 6e40cf54b578a0fb2e120e84cd2aec4092bd861a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Apr 2025 17:08:00 +0000
Subject: [PATCH 444/490] Bump the github-action-dependencies group with 2
 updates

Bumps the github-action-dependencies group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [actions/setup-java](https://github.com/actions/setup-java).


Updates `github/codeql-action` from 3.28.14 to 3.28.15
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2...45775bd8235c68ba998cffa5171334d58593da47)

Updates `actions/setup-java` from 4.7.0 to 4.7.1
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4.7.0...v4.7.1)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.28.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: actions/setup-java
  dependency-version: 4.7.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml                     | 8 ++++----
 .../ion-java-performance-regression-detector.yml          | 2 +-
 .github/workflows/main.yml                                | 4 ++--
 .github/workflows/publish-release-artifacts.yml           | 2 +-
 .github/workflows/scorecard.yml                           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 00453c59d8..2a0deb69db 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
+        uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
           # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
       - name: Setup Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.3.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: 11
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
+        uses: github/codeql-action/autobuild@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
+        uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 5676ebb7e6..3540d54233 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -78,7 +78,7 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.7.0
+        uses: actions/setup-java@v4.7.1
         with:
           distribution: 'corretto'
           java-version: 17
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3c53e19141..2cd01ca1b5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.3.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.3.0
         with:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
@@ -52,7 +52,7 @@ jobs:
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.3.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.3.0
         with:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 3944a717df..647c8fb4fc 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -42,7 +42,7 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-      - uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.3.0
+      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 984f372b61..6b6bd2b83c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@fc7e4a0fa01c3cca5fd6a1fddec5c0740c977aa2 # v3.28.14
+        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
         with:
           sarif_file: results.sarif

From 68df258e7b21d730e2ee53d0c0f0d66a2a245915 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Apr 2025 16:38:31 +0000
Subject: [PATCH 445/490] Bump codecov/codecov-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `codecov/codecov-action` from 5.4.0 to 5.4.2
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/0565863a31f2c772f9f0395002a31e3f06189574...ad3126e916f78f00edff4ed0317cf185271ccc2d)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-version: 5.4.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2cd01ca1b5..d07e8911f4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # v5.4.0
+      - uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0

From 14fcb3f6d4a7b8c141c065cfc4950bd165a9f592 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Fri, 2 May 2025 13:28:26 -0700
Subject: [PATCH 446/490] Improve performance regression detector workflow
 (#1073)

---
 .../ion-java-performance-regression-detector.yml    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 3540d54233..fa6866a3bc 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -14,6 +14,7 @@ permissions:
 env:
   data_size: '50000'
   test_data_id: 'generated-test-data'
+  benchmark_config: '--mode AverageTime --forks 5 --warmups 2 --iterations 3 --io-type buffer'
 
 jobs:
   generate-test-data:
@@ -73,7 +74,13 @@ jobs:
     strategy:
       matrix:
         test-data: ['nestedStruct', 'nestedList', 'sexp', 'realWorldDataSchema01', 'realWorldDataSchema02', 'realWorldDataSchema03']
-        usage-patterns: [' read --mode AverageTime --forks 3 --warmups 2 --iterations 10 --api streaming ',' read --mode AverageTime --forks 3 --warmups 2 --iterations 10 --api dom ', ' write --mode AverageTime --forks 3 --warmups 2 --iterations 10 --api streaming --io-type buffer --ion-length-preallocation 1 ', ' write --mode AverageTime --forks 3 --warmups 2 --iterations 10 --api dom --io-type buffer --ion-length-preallocation 1 ']
+        usage-patterns: [
+          'read  --api streaming',
+          'write --api streaming --ion-length-preallocation 1',
+          'read  --api dom',
+          'write --api dom --ion-length-preallocation 1',
+        ]
+
       fail-fast: false
 
     steps:
@@ -122,7 +129,7 @@ jobs:
         run: |
           mvn clean install
           mkdir /home/runner/work/ion-java/ion-java/benchmarkresults
-          java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar ${{matrix.usage-patterns}} -r ion -o /home/runner/work/ion-java/ion-java/benchmarkresults/before.ion /home/runner/work/ion-java/ion-java/testData/${{matrix.test-data}}.10n 
+          java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar ${{matrix.usage-patterns}} ${{env.benchmark_config}} -r ion -o /home/runner/work/ion-java/ion-java/benchmarkresults/before.ion /home/runner/work/ion-java/ion-java/testData/${{matrix.test-data}}.10n
 
       - name: Build ion-java from the new commit
         working-directory: new
@@ -133,7 +140,7 @@ jobs:
         working-directory: ion-java-benchmark-cli
         run: |
           mvn clean install
-          java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar ${{matrix.usage-patterns}} -r ion -o /home/runner/work/ion-java/ion-java/benchmarkresults/after.ion /home/runner/work/ion-java/ion-java/testData/${{matrix.test-data}}.10n
+          java -jar target/ion-java-benchmark-cli-0.0.1-SNAPSHOT-jar-with-dependencies.jar ${{matrix.usage-patterns}} ${{env.benchmark_config}} -r ion -o /home/runner/work/ion-java/ion-java/benchmarkresults/after.ion /home/runner/work/ion-java/ion-java/testData/${{matrix.test-data}}.10n
 
       #Detect regression
       - name: Detect regression

From 6bd3f06f3fb902a09930696fa457fce07dd41943 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 May 2025 20:30:03 +0000
Subject: [PATCH 447/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.28.15 to 3.28.16
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/45775bd8235c68ba998cffa5171334d58593da47...28deaeda66b76a05916b6923827895f2b14ab387)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.28.16
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 2a0deb69db..172994c416 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        uses: github/codeql-action/autobuild@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6b6bd2b83c..e479407e01 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
         with:
           sarif_file: results.sarif

From 1f0c67ce6667ec7e262cd20599be7833f6af4f98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 May 2025 16:30:33 +0000
Subject: [PATCH 448/490] Bump the github-action-dependencies group with 3
 updates

Bumps the github-action-dependencies group with 3 updates: [github/codeql-action](https://github.com/github/codeql-action), [gradle/actions](https://github.com/gradle/actions) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `github/codeql-action` from 3.28.17 to 3.28.18
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/60168efe1c415ce0f5521ea06d5c2062adbeed1b...ff0a06e83cb2de871e5a09832bc6a81e7276941f)

Updates `gradle/actions` from 4.3.1 to 4.4.0
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/06832c7b30a0129d7fb559bcc6e43d26f6374244...8379f6a1328ee0e06e2bb424dadb7b159856a326)

Updates `codecov/codecov-action` from 5.4.2 to 5.4.3
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/ad3126e916f78f00edff4ed0317cf185271ccc2d...18283e04ce6e62d37312384ff67231eb8fd56d24)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.28.18
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-version: 4.4.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-version: 5.4.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml           | 6 +++---
 .github/workflows/main.yml                      | 6 +++---
 .github/workflows/publish-release-artifacts.yml | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 172994c416..901038c660 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d07e8911f4..56e86cb0e2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,11 +26,11 @@ jobs:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5.4.2
+      - uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
@@ -57,7 +57,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
+        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 647c8fb4fc..b1ba7b2b28 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244
+      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index e479407e01..46c2bd4902 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
         with:
           sarif_file: results.sarif

From 04f217d4f243802c97ea9c535f516aa47871c2b1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jun 2025 17:08:21 +0000
Subject: [PATCH 449/490] Bump ossf/scorecard-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [ossf/scorecard-action](https://github.com/ossf/scorecard-action).


Updates `ossf/scorecard-action` from 2.4.1 to 2.4.2
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/f49aabe0b5af0936a0987cfb85d86b75731b0186...05b42c624433fc40578a4040d5cf5e36ddca8cde)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-version: 2.4.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 46c2bd4902..6fa797ff3b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -37,7 +37,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif

From 29e8efe900a8a9d5b8f08f598acb4ddf4a06d83a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Jun 2025 10:56:43 -0700
Subject: [PATCH 450/490] Bump github/codeql-action in the
 github-action-dependencies group (#1076)

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.28.18 to 3.28.19
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/ff0a06e83cb2de871e5a09832bc6a81e7276941f...fca7ace96b7d713c7035871441bd52efbe39e27e)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.28.19
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 901038c660..a65a1dcd04 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/autobuild@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6fa797ff3b..2160ef38c8 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
         with:
           sarif_file: results.sarif

From 20cecd92c508f92de423b59a511d2ab1733d5f25 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Jun 2025 18:10:09 +0000
Subject: [PATCH 451/490] Bump the github-action-dependencies group with 2
 updates

Bumps the github-action-dependencies group with 2 updates: [github/codeql-action](https://github.com/github/codeql-action) and [gradle/actions](https://github.com/gradle/actions).


Updates `github/codeql-action` from 3.28.19 to 3.29.0
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/fca7ace96b7d713c7035871441bd52efbe39e27e...ce28f5bb42b7a9f2c824e633a3f6ee835bab6858)

Updates `gradle/actions` from 4.4.0 to 4.4.1
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/8379f6a1328ee0e06e2bb424dadb7b159856a326...ac638b010cf58a27ee6c972d7336334ccaf61c96)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-version: 4.4.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml           | 6 +++---
 .github/workflows/main.yml                      | 4 ++--
 .github/workflows/publish-release-artifacts.yml | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a65a1dcd04..84bad9bf83 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
+        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
+        uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
+        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 56e86cb0e2..cc1d8be6f3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
         with:
           validate-wrappers: true
       - run: ./gradlew build
@@ -57,7 +57,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
+        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index b1ba7b2b28..85da88de01 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@8379f6a1328ee0e06e2bb424dadb7b159856a326
+      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 2160ef38c8..830afa441a 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           sarif_file: results.sarif

From f732e970a2ae6b79406fdbbf1d89cca7650b426e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Jul 2025 10:32:16 -0700
Subject: [PATCH 452/490] Bump github/codeql-action in the
 github-action-dependencies group (#1080)

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.29.0 to 3.29.2
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/ce28f5bb42b7a9f2c824e633a3f6ee835bab6858...181d5eefc20863364f96762470ba6f862bdef56b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 84bad9bf83..b128fc6518 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 830afa441a..cf64f5a35b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           sarif_file: results.sarif

From 893e7ff9282168a87652f5f53ef2b74d85f0b8b4 Mon Sep 17 00:00:00 2001
From: Snehangshu Chakraborty <chakraborty.snehangshu@gmail.com>
Date: Mon, 14 Jul 2025 21:51:33 +0530
Subject: [PATCH 453/490] Add documentation for IonReader.close() method
 (#1081)

Fixes #1059: Make IonReader extend AutoCloseable for proper resource management

This change enhances the IonReader interface with comprehensive documentation for the
close() method to clarify resource management behavior and enable proper
try-with-resources usage. The interface already extended Closeable (which
extends AutoCloseable), but lacked explicit documentation about the close()
method contract.
---
 src/main/java/com/amazon/ion/IonReader.java   |  27 +++-
 .../amazon/ion/IonReaderCloseableTest.java    | 130 ++++++++++++++++++
 2 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/com/amazon/ion/IonReaderCloseableTest.java

diff --git a/src/main/java/com/amazon/ion/IonReader.java b/src/main/java/com/amazon/ion/IonReader.java
index 233e58cc0f..c29f2625ab 100644
--- a/src/main/java/com/amazon/ion/IonReader.java
+++ b/src/main/java/com/amazon/ion/IonReader.java
@@ -447,6 +447,31 @@ public interface IonReader
     // In particular, does this move the cursor beyond the current value?
     // Also, this could be problematic to use since other value-extraction
     // methods are read-once, so one can't look at the value before calling this.
-//    public String valueToString();
+    // public String valueToString();
+
+    /**
+     * Closes this reader and releases any system resources associated with it.
+     * <p>
+     * For readers created from an {@link java.io.InputStream}, this method will
+     * close the underlying stream. For readers created from byte arrays or strings,
+     * this method will release internal resources such as UTF-8 decoders.
+     * <p>
+     * After calling this method, the reader should not be used for any further
+     * operations. Attempting to use a closed reader may result in undefined behavior.
+     * <p>
+     * This method makes {@code IonReader} compatible with try-with-resources statements:
+     * <pre>{@code
+     * try (IonReader reader = IonReaderBuilder.standard().build(inputStream)) {
+     *     // Use the reader
+     *     while (reader.next() != null) {
+     *         // Process values
+     *     }
+     * } // Reader is automatically closed here
+     * }</pre>
+     *
+     * @throws IOException if an I/O error occurs while closing the underlying stream
+     */
+    @Override
+    void close() throws IOException;
 
 }
diff --git a/src/test/java/com/amazon/ion/IonReaderCloseableTest.java b/src/test/java/com/amazon/ion/IonReaderCloseableTest.java
new file mode 100644
index 0000000000..7328f0fa98
--- /dev/null
+++ b/src/test/java/com/amazon/ion/IonReaderCloseableTest.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2007-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazon.ion;
+
+import com.amazon.ion.system.IonReaderBuilder;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import static org.junit.Assert.*;
+
+/**
+ * Tests that IonReader properly implements Closeable and can be used with try-with-resources.
+ */
+public class IonReaderCloseableTest {
+
+    @Test
+    public void testIonReaderIsCloseable() {
+        // Verify that IonReader extends Closeable
+        assertTrue("IonReader should extend Closeable", 
+                   java.io.Closeable.class.isAssignableFrom(IonReader.class));
+    }
+
+    @Test
+    public void testIonReaderIsAutoCloseable() {
+        // Verify that IonReader extends AutoCloseable (through Closeable)
+        assertTrue("IonReader should extend AutoCloseable", 
+                   AutoCloseable.class.isAssignableFrom(IonReader.class));
+    }
+
+    @Test
+    public void testTryWithResourcesWithByteArray() throws IOException {
+        byte[] ionData = "hello".getBytes();
+        
+        // Test that IonReader can be used in try-with-resources
+        try (IonReader reader = IonReaderBuilder.standard().build(ionData)) {
+            assertNotNull("Reader should not be null", reader);
+            // Use the reader
+            IonType type = reader.next();
+            assertEquals("Should read a symbol", IonType.SYMBOL, type);
+            assertEquals("Should read 'hello'", "hello", reader.stringValue());
+        } // Reader should be automatically closed here
+        
+        // Test passes if no exception is thrown
+    }
+
+    @Test
+    public void testTryWithResourcesWithInputStream() throws IOException {
+        byte[] ionData = "world".getBytes();
+        InputStream inputStream = new ByteArrayInputStream(ionData);
+        
+        // Test that IonReader can be used in try-with-resources with InputStream
+        try (IonReader reader = IonReaderBuilder.standard().build(inputStream)) {
+            assertNotNull("Reader should not be null", reader);
+            // Use the reader
+            IonType type = reader.next();
+            assertEquals("Should read a symbol", IonType.SYMBOL, type);
+            assertEquals("Should read 'world'", "world", reader.stringValue());
+        } // Reader should be automatically closed here
+        
+        // Test passes if no exception is thrown
+    }
+
+    @Test
+    public void testManualClose() throws IOException {
+        byte[] ionData = "test".getBytes();
+        IonReader reader = IonReaderBuilder.standard().build(ionData);
+        
+        try {
+            assertNotNull("Reader should not be null", reader);
+            // Use the reader
+            IonType type = reader.next();
+            assertEquals("Should read a symbol", IonType.SYMBOL, type);
+            assertEquals("Should read 'test'", "test", reader.stringValue());
+        } finally {
+            // Manually close the reader
+            reader.close();
+        }
+        
+        // Test passes if no exception is thrown
+    }
+
+    @Test
+    public void testCloseWithInputStream() throws IOException {
+        byte[] ionData = "closetest".getBytes();
+        
+        // Create a custom InputStream that tracks if it was closed
+        class TrackingInputStream extends ByteArrayInputStream {
+            private boolean closed = false;
+            
+            public TrackingInputStream(byte[] buf) {
+                super(buf);
+            }
+            
+            @Override
+            public void close() throws IOException {
+                super.close();
+                closed = true;
+            }
+            
+            public boolean isClosed() {
+                return closed;
+            }
+        }
+        
+        TrackingInputStream trackingStream = new TrackingInputStream(ionData);
+        
+        try (IonReader reader = IonReaderBuilder.standard().build(trackingStream)) {
+            // Use the reader
+            reader.next();
+        } // Reader and underlying stream should be closed here
+        
+        assertTrue("Underlying InputStream should be closed", trackingStream.isClosed());
+    }
+}

From 27087af40ca89fd33b9ef6a1194bee94b01fe23d Mon Sep 17 00:00:00 2001
From: "Laurie Z. Wang" <96194843+zihaowang678@users.noreply.github.com>
Date: Mon, 21 Jul 2025 13:21:42 -0700
Subject: [PATCH 454/490] Use Schubfach algorithm for rendering floats in Ion
 text (#1079)

---
 .../ion/impl/_Private_IonTextAppender.java    |  19 +-
 .../ion/impl/schubfach/DoubleToDecimal.java   | 673 ++++++++++++++
 .../amazon/ion/impl/schubfach/MathUtils.java  | 835 ++++++++++++++++++
 3 files changed, 1511 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/com/amazon/ion/impl/schubfach/DoubleToDecimal.java
 create mode 100644 src/main/java/com/amazon/ion/impl/schubfach/MathUtils.java

diff --git a/src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java b/src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java
index c5fd6e0564..e74b503bf5 100644
--- a/src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java
+++ b/src/main/java/com/amazon/ion/impl/_Private_IonTextAppender.java
@@ -22,6 +22,7 @@
 
 import com.amazon.ion.Decimal;
 import com.amazon.ion.impl.Base64Encoder.TextStream;
+import com.amazon.ion.impl.schubfach.DoubleToDecimal;
 import com.amazon.ion.system.IonTextWriterBuilder;
 import com.amazon.ion.util._Private_FastAppendable;
 import java.io.ByteArrayInputStream;
@@ -839,22 +840,8 @@ else if (value == Double.NEGATIVE_INFINITY)
         }
         else
         {
-            // Double.toString() forces a digit after the decimal point.
-            // Remove it when it's not meaningful.
-            String str = Double.toString(value);
-            if (str.endsWith(".0"))
-            {
-                appendAscii(str, 0, str.length() - 2);
-                appendAscii("e0");
-            }
-            else
-            {
-                appendAscii(str);
-                if (str.indexOf('E') == -1)
-                {
-                    appendAscii("e0");
-                }
-            }
+            String str = DoubleToDecimal.toString(value);
+            appendAscii(str);
         }
     }
 
diff --git a/src/main/java/com/amazon/ion/impl/schubfach/DoubleToDecimal.java b/src/main/java/com/amazon/ion/impl/schubfach/DoubleToDecimal.java
new file mode 100644
index 0000000000..c006a91b4c
--- /dev/null
+++ b/src/main/java/com/amazon/ion/impl/schubfach/DoubleToDecimal.java
@@ -0,0 +1,673 @@
+/*
+ * Copyright 2018-2020 Raffaello Giulietti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.amazon.ion.impl.schubfach;
+
+import java.io.IOException;
+
+import static java.lang.Double.*;
+import static java.lang.Long.*;
+import static com.amazon.ion.impl.schubfach.MathUtils.*;
+
+/**
+ * This class exposes a method to render a {@code double} as a string.
+ *
+ * @author Raffaello Giulietti
+ */
+final public class DoubleToDecimal {
+    /*
+    For full details about this code see the following references:
+
+    [1] Giulietti, "The Schubfach way to render doubles",
+        https://drive.google.com/open?id=1luHhyQF9zKlM8yJ1nebU0OgVYhfC6CBN
+
+    [2] IEEE Computer Society, "IEEE Standard for Floating-Point Arithmetic"
+
+    [3] Bouvier & Zimmermann, "Division-Free Binary-to-Decimal Conversion"
+
+    Divisions are avoided altogether for the benefit of those architectures
+    that do not provide specific machine instructions or where they are slow.
+    This is discussed in section 10 of [1].
+     */
+
+    // The precision in bits.
+    static final int P = 53;
+
+    // Exponent width in bits.
+    private static final int W = (Double.SIZE - 1) - (P - 1);
+
+    // Minimum value of the exponent: -(2^(W-1)) - P + 3.
+    static final int Q_MIN = (-1 << W - 1) - P + 3;
+
+    // Maximum value of the exponent: 2^(W-1) - P.
+    static final int Q_MAX = (1 << W - 1) - P;
+
+    // 10^(E_MIN - 1) <= MIN_VALUE < 10^E_MIN
+    static final int E_MIN = -323;
+
+    // 10^(E_MAX - 1) <= MAX_VALUE < 10^E_MAX
+    static final int E_MAX = 309;
+
+    // Threshold to detect tiny values, as in section 8.1.1 of [1]
+    static final long C_TINY = 3;
+
+    // The minimum and maximum k, as in section 8 of [1]
+    static final int K_MIN = -324;
+    static final int K_MAX = 292;
+
+    // H is as in section 8 of [1].
+    static final int H = 17;
+
+    // Minimum value of the significand of a normal value: 2^(P-1).
+    private static final long C_MIN = 1L << P - 1;
+
+    // Mask to extract the biased exponent.
+    private static final int BQ_MASK = (1 << W) - 1;
+
+    // Mask to extract the fraction bits.
+    private static final long T_MASK = (1L << P - 1) - 1;
+
+    // Used in rop().
+    private static final long MASK_63 = (1L << 63) - 1;
+
+    // Used for left-to-tight digit extraction.
+    private static final int MASK_28 = (1 << 28) - 1;
+
+    private static final int NON_SPECIAL = 0;
+    private static final int PLUS_ZERO = 1;
+    private static final int MINUS_ZERO = 2;
+    private static final int PLUS_INF = 3;
+    private static final int MINUS_INF = 4;
+    private static final int NAN = 5;
+
+    // For thread-safety, each thread gets its own instance of this class.
+    private static final ThreadLocal<DoubleToDecimal> threadLocal =
+            ThreadLocal.withInitial(DoubleToDecimal::new);
+
+    /*
+    Room for the longer of the forms
+        -ddddd.dddddddddddd         H + 2 characters
+        -0.00ddddddddddddddddd      H + 5 characters
+        -d.ddddddddddddddddE-eee    H + 7 characters
+    where there are H digits d
+     */
+    public static final int MAX_CHARS = H + 7;
+
+    // Numerical results are created here...
+    private final byte[] bytes = new byte[MAX_CHARS];
+
+    // ... and copied here in appendTo()
+    private final char[] chars = new char[MAX_CHARS];
+
+    // Index into bytes of rightmost valid character.
+    private int index;
+
+    private DoubleToDecimal() {
+    }
+
+    /**
+     * Returns a string rendering of the {@code double} argument.
+     *
+     * <p>The characters of the result are all drawn from the ASCII set.
+     * <ul>
+     * <li> Any NaN, whether quiet or signaling, is rendered as
+     * {@code "NaN"}, regardless of the sign bit.
+     * <li> The infinities +&infin; and -&infin; are rendered as
+     * {@code "Infinity"} and {@code "-Infinity"}, respectively.
+     * <li> The positive and negative zeroes are rendered as
+     * {@code "0.0"} and {@code "-0.0"}, respectively.
+     * <li> A finite negative {@code v} is rendered as the sign
+     * '{@code -}' followed by the rendering of the magnitude -{@code v}.
+     * <li> A finite positive {@code v} is rendered in two stages:
+     * <ul>
+     * <li> <em>Selection of a decimal</em>: A well-defined
+     * decimal <i>d</i><sub><code>v</code></sub> is selected
+     * to represent {@code v}.
+     * <li> <em>Formatting as a string</em>: The decimal
+     * <i>d</i><sub><code>v</code></sub> is formatted as a string,
+     * either in plain or in computerized scientific notation,
+     * depending on its value.
+     * </ul>
+     * </ul>
+     *
+     * <p>A <em>decimal</em> is a number of the form
+     * <i>d</i>&times;10<sup><i>i</i></sup>
+     * for some (unique) integers <i>d</i> &gt; 0 and <i>i</i> such that
+     * <i>d</i> is not a multiple of 10.
+     * These integers are the <em>significand</em> and
+     * the <em>exponent</em>, respectively, of the decimal.
+     * The <em>length</em> of the decimal is the (unique)
+     * integer <i>n</i> meeting
+     * 10<sup><i>n</i>-1</sup> &le; <i>d</i> &lt; 10<sup><i>n</i></sup>.
+     *
+     * <p>The decimal <i>d</i><sub><code>v</code></sub>
+     * for a finite positive {@code v} is defined as follows:
+     * <ul>
+     * <li>Let <i>R</i> be the set of all decimals that round to {@code v}
+     * according to the usual round-to-closest rule of
+     * IEEE 754 floating-point arithmetic.
+     * <li>Let <i>m</i> be the minimal length over all decimals in <i>R</i>.
+     * <li>When <i>m</i> &ge; 2, let <i>T</i> be the set of all decimals
+     * in <i>R</i> with length <i>m</i>.
+     * Otherwise, let <i>T</i> be the set of all decimals
+     * in <i>R</i> with length 1 or 2.
+     * <li>Define <i>d</i><sub><code>v</code></sub> as
+     * the decimal in <i>T</i> that is closest to {@code v}.
+     * Or if there are two such decimals in <i>T</i>,
+     * select the one with the even significand (there is exactly one).
+     * </ul>
+     *
+     * <p>The (uniquely) selected decimal <i>d</i><sub><code>v</code></sub>
+     * is then formatted.
+     *
+     * <p>Let <i>d</i>, <i>i</i> and <i>n</i> be the significand, exponent and
+     * length of <i>d</i><sub><code>v</code></sub>, respectively.
+     * Further, let <i>e</i> = <i>n</i> + <i>i</i> - 1 and let
+     * <i>d</i><sub>1</sub>&hellip;<i>d</i><sub><i>n</i></sub>
+     * be the usual decimal expansion of the significand.
+     * Note that <i>d</i><sub>1</sub> &ne; 0 &ne; <i>d</i><sub><i>n</i></sub>.
+     * <ul>
+     * <li>Case -3 &le; <i>e</i> &lt; 0:
+     * <i>d</i><sub><code>v</code></sub> is formatted as
+     * <code>0.0</code>&hellip;<code>0</code><!--
+     * --><i>d</i><sub>1</sub>&hellip;<i>d</i><sub><i>n</i></sub>,
+     * where there are exactly -(<i>n</i> + <i>i</i>) zeroes between
+     * the decimal point and <i>d</i><sub>1</sub>.
+     * For example, 123 &times; 10<sup>-4</sup> is formatted as
+     * {@code 0.0123}.
+     * <li>Case 0 &le; <i>e</i> &lt; 7:
+     * <ul>
+     * <li>Subcase <i>i</i> &ge; 0:
+     * <i>d</i><sub><code>v</code></sub> is formatted as
+     * <i>d</i><sub>1</sub>&hellip;<i>d</i><sub><i>n</i></sub><!--
+     * --><code>0</code>&hellip;<code>0.0</code>,
+     * where there are exactly <i>i</i> zeroes
+     * between <i>d</i><sub><i>n</i></sub> and the decimal point.
+     * For example, 123 &times; 10<sup>2</sup> is formatted as
+     * {@code 12300.0}.
+     * <li>Subcase <i>i</i> &lt; 0:
+     * <i>d</i><sub><code>v</code></sub> is formatted as
+     * <i>d</i><sub>1</sub>&hellip;<!--
+     * --><i>d</i><sub><i>n</i>+<i>i</i></sub>.<!--
+     * --><i>d</i><sub><i>n</i>+<i>i</i>+1</sub>&hellip;<!--
+     * --><i>d</i><sub><i>n</i></sub>.
+     * There are exactly -<i>i</i> digits to the right of
+     * the decimal point.
+     * For example, 123 &times; 10<sup>-1</sup> is formatted as
+     * {@code 12.3}.
+     * </ul>
+     * <li>Case <i>e</i> &lt; -3 or <i>e</i> &ge; 7:
+     * computerized scientific notation is used to format
+     * <i>d</i><sub><code>v</code></sub>.
+     * Here <i>e</i> is formatted as by {@link Integer#toString(int)}.
+     * <ul>
+     * <li>Subcase <i>n</i> = 1:
+     * <i>d</i><sub><code>v</code></sub> is formatted as
+     * <i>d</i><sub>1</sub><code>.0E</code><i>e</i>.
+     * For example, 1 &times; 10<sup>23</sup> is formatted as
+     * {@code 1.0E23}.
+     * <li>Subcase <i>n</i> &gt; 1:
+     * <i>d</i><sub><code>v</code></sub> is formatted as
+     * <i>d</i><sub>1</sub><code>.</code><i>d</i><sub>2</sub><!--
+     * -->&hellip;<i>d</i><sub><i>n</i></sub><code>E</code><i>e</i>.
+     * For example, 123 &times; 10<sup>-21</sup> is formatted as
+     * {@code 1.23E-19}.
+     * </ul>
+     * </ul>
+     *
+     * @param v the {@code double} to be rendered.
+     * @return a string rendering of the argument.
+     */
+    public static String toString(double v) {
+        return threadLocalInstance().toDecimalString(v);
+    }
+
+    /**
+     * Appends the rendering of the {@code v} to {@code app}.
+     *
+     * <p>The outcome is the same as if {@code v} were first
+     * {@link #toString(double) rendered} and the resulting string were then
+     * {@link Appendable#append(CharSequence) appended} to {@code app}.
+     *
+     * @param v the {@code double} whose rendering is appended.
+     * @param app the {@link Appendable} to append to.
+     * @throws IOException If an I/O error occurs
+     */
+    public static Appendable appendTo(double v, Appendable app)
+            throws IOException {
+        return threadLocalInstance().appendDecimalTo(v, app);
+    }
+
+    private static DoubleToDecimal threadLocalInstance() {
+        return threadLocal.get();
+    }
+
+    private String toDecimalString(double v) {
+        switch (toDecimal(v)) {
+            case NON_SPECIAL: return charsToString();
+            case PLUS_ZERO: return "0e0";
+            case MINUS_ZERO: return "-0e0";
+            case PLUS_INF: return "+inf";
+            case MINUS_INF: return "-inf";
+            default: return "nan";
+        }
+    }
+
+    private Appendable appendDecimalTo(double v, Appendable app)
+            throws IOException {
+        switch (toDecimal(v)) {
+            case NON_SPECIAL:
+                for (int i = 0; i <= index; ++i) {
+                    chars[i] = (char) bytes[i];
+                }
+                if (app instanceof StringBuilder) {
+                    return ((StringBuilder) app).append(chars, 0, index + 1);
+                }
+                if (app instanceof StringBuffer) {
+                    return ((StringBuffer) app).append(chars, 0, index + 1);
+                }
+                for (int i = 0; i <= index; ++i) {
+                    app.append(chars[i]);
+                }
+                return app;
+            case PLUS_ZERO: return app.append("0e0");
+            case MINUS_ZERO: return app.append("-0e0");
+            case PLUS_INF: return app.append("+inf");
+            case MINUS_INF: return app.append("-inf");
+            default: return app.append("nan");
+        }
+    }
+
+    /*
+    Returns
+        PLUS_ZERO       iff v is 0.0
+        MINUS_ZERO      iff v is -0.0
+        PLUS_INF        iff v is POSITIVE_INFINITY
+        MINUS_INF       iff v is NEGATIVE_INFINITY
+        NAN             iff v is NaN
+     */
+    private int toDecimal(double v) {
+        /*
+        For full details see references [2] and [1].
+
+        For finite v != 0, determine integers c and q such that
+            |v| = c 2^q    and
+            Q_MIN <= q <= Q_MAX    and
+                either    2^(P-1) <= c < 2^P                 (normal)
+                or        0 < c < 2^(P-1)  and  q = Q_MIN    (subnormal)
+         */
+        long bits = doubleToRawLongBits(v);
+        long t = bits & T_MASK;
+        int bq = (int) (bits >>> P - 1) & BQ_MASK;
+        if (bq < BQ_MASK) {
+            index = -1;
+            if (bits < 0) {
+                append('-');
+            }
+            if (bq != 0) {
+                // normal value. Here mq = -q
+                int mq = -Q_MIN + 1 - bq;
+                long c = C_MIN | t;
+                // The fast path discussed in section 8.2 of [1].
+                if (0 < mq & mq < P) {
+                    long f = c >> mq;
+                    if (f << mq == c) {
+                        return toChars(f, 0);
+                    }
+                }
+                return toDecimal(-mq, c, 0);
+            }
+            if (t != 0) {
+                // subnormal value
+                return t < C_TINY
+                       ? toDecimal(Q_MIN, 10 * t, -1)
+                       : toDecimal(Q_MIN, t, 0);
+            }
+            return bits == 0 ? PLUS_ZERO : MINUS_ZERO;
+        }
+        if (t != 0) {
+            return NAN;
+        }
+        return bits > 0 ? PLUS_INF : MINUS_INF;
+    }
+
+    private int toDecimal(int q, long c, int dk) {
+        /*
+        The skeleton corresponds to figure 4 of [1].
+        The efficient computations are those summarized in figure 7.
+
+        Here's a correspondence between Java names and names in [1],
+        expressed as approximate LaTeX source code and informally.
+        Other names are identical.
+        cb:     \bar{c}     "c-bar"
+        cbr:    \bar{c}_r   "c-bar-r"
+        cbl:    \bar{c}_l   "c-bar-l"
+
+        vb:     \bar{v}     "v-bar"
+        vbr:    \bar{v}_r   "v-bar-r"
+        vbl:    \bar{v}_l   "v-bar-l"
+
+        rop:    r_o'        "r-o-prime"
+         */
+        int out = (int) c & 0x1;
+        long cb = c << 2;
+        long cbr = cb + 2;
+        long cbl;
+        int k;
+        /*
+        flog10pow2(e) = floor(log_10(2^e))
+        flog10threeQuartersPow2(e) = floor(log_10(3/4 2^e))
+        flog2pow10(e) = floor(log_2(10^e))
+         */
+        if (c != C_MIN | q == Q_MIN) {
+            // regular spacing
+            cbl = cb - 2;
+            k = flog10pow2(q);
+        } else {
+            // irregular spacing
+            cbl = cb - 1;
+            k = flog10threeQuartersPow2(q);
+        }
+        int h = q + flog2pow10(-k) + 2;
+
+        // g1 and g0 are as in section 9.9.3 of [1], so g = g1 2^63 + g0
+        long g1 = g1(k);
+        long g0 = g0(k);
+
+        long vb = rop(g1, g0, cb << h);
+        long vbl = rop(g1, g0, cbl << h);
+        long vbr = rop(g1, g0, cbr << h);
+
+        long s = vb >> 2;
+        if (s >= 100) {
+            /*
+            For n = 17, m = 1 the table in section 10 of [1] shows
+                s' = floor(s / 10) = floor(s 115_292_150_460_684_698 / 2^60)
+                   = floor(s 115_292_150_460_684_698 2^4 / 2^64)
+
+            sp10 = 10 s'
+            tp10 = 10 t'
+            upin    iff    u' = sp10 10^k in Rv
+            wpin    iff    w' = tp10 10^k in Rv
+            See section 9.4 of [1].
+             */
+            long sp10 = 10 * MathUtils.multiplyHigh(s, 115_292_150_460_684_698L << 4);
+            long tp10 = sp10 + 10;
+            boolean upin = vbl + out <= sp10 << 2;
+            boolean wpin = (tp10 << 2) + out <= vbr;
+            if (upin != wpin) {
+                return toChars(upin ? sp10 : tp10, k);
+            }
+        }
+
+        /*
+        10 <= s < 100    or    s >= 100  and  u', w' not in Rv
+        uin    iff    u = s 10^k in Rv
+        win    iff    w = t 10^k in Rv
+        See section 9.4 of [1].
+         */
+        long t = s + 1;
+        boolean uin = vbl + out <= s << 2;
+        boolean win = (t << 2) + out <= vbr;
+        if (uin != win) {
+            // Exactly one of u or w lies in Rv.
+            return toChars(uin ? s : t, k + dk);
+        }
+        /*
+        Both u and w lie in Rv: determine the one closest to v.
+        See section 9.4 of [1].
+         */
+        long cmp = vb - (s + t << 1);
+        return toChars(cmp < 0 || cmp == 0 && (s & 0x1) == 0 ? s : t, k + dk);
+    }
+
+    /*
+    Computes rop(cp g 2^(-127)), where g = g1 2^63 + g0
+    See section 9.10 and figure 5 of [1].
+     */
+    private static long rop(long g1, long g0, long cp) {
+        long x1 = MathUtils.multiplyHigh(g0, cp);
+        long y0 = g1 * cp;
+        long y1 = MathUtils.multiplyHigh(g1, cp);
+        long z = (y0 >>> 1) + x1;
+        long vbp = y1 + (z >>> 63);
+        return vbp | (z & MASK_63) + MASK_63 >>> 63;
+    }
+
+    /*
+    Formats the decimal f 10^e.
+     */
+    private int toChars(long f, int e) {
+        /*
+        For details not discussed here see section 10 of [1].
+
+        Determine len such that
+            10^(len-1) <= f < 10^len
+         */
+        int len = flog10pow2(Long.SIZE - numberOfLeadingZeros(f));
+        if (f >= pow10(len)) {
+            len += 1;
+        }
+
+        /*
+        Let fp and ep be the original f and e, respectively.
+        Transform f and e to ensure
+            10^(H-1) <= f < 10^H
+            fp 10^ep = f 10^(e-H) = 0.f 10^e
+         */
+        f *= pow10(H - len);
+        e += len;
+
+        /*
+        The toChars?() methods perform left-to-right digits extraction
+        using ints, provided that the arguments are limited to 8 digits.
+        Therefore, split the H = 17 digits of f into:
+            h = the most significant digit of f
+            m = the next 8 most significant digits of f
+            l = the last 8, least significant digits of f
+
+        For n = 17, m = 8 the table in section 10 of [1] shows
+            floor(f / 10^8) = floor(193_428_131_138_340_668 f / 2^84) =
+            floor(floor(193_428_131_138_340_668 f / 2^64) / 2^20)
+        and for n = 9, m = 8
+            floor(hm / 10^8) = floor(1_441_151_881 hm / 2^57)
+         */
+        long hm = MathUtils.multiplyHigh(f, 193_428_131_138_340_668L) >>> 20;
+        int l = (int) (f - 100_000_000L * hm);
+        int h = (int) (hm * 1_441_151_881L >>> 57);
+        int m = (int) (hm - 100_000_000L * h);
+
+        if (0 < e && e <= 7) {
+            return toChars1(h, m, l, e);
+        } else if (-3 < e && e <= 0) {
+            return toChars2(h, m, l, e);
+        } else {
+            return toChars3(h, m, l, e);
+        }
+    }
+
+    private int toChars1(int h, int m, int l, int e) {
+        /*
+        0 < e <= 7: plain format without leading zeroes.
+        Left-to-right digits extraction:
+        algorithm 1 in [3], with b = 10, k = 8, n = 28.
+         */
+        appendDigit(h);
+        int y = y(m);
+        int t;
+        int i = 1;
+        for (; i < e; ++i) {
+            t = 10 * y;
+            appendDigit(t >>> 28);
+            y = t & MASK_28;
+        }
+        append('.');
+        for (; i <= 8; ++i) {
+            t = 10 * y;
+            appendDigit(t >>> 28);
+            y = t & MASK_28;
+        }
+        lowDigits(l);
+
+        applyIonFormatting();
+
+        return NON_SPECIAL;
+    }
+
+    private int toChars2(int h, int m, int l, int e) {
+        // -3 < e <= 0: plain format with leading zeroes.
+        appendDigit(0);
+        append('.');
+        for (; e < 0; ++e) {
+            appendDigit(0);
+        }
+        appendDigit(h);
+        append8Digits(m);
+        lowDigits(l);
+
+        applyIonFormatting();
+
+        return NON_SPECIAL;
+    }
+
+    private int toChars3(int h, int m, int l, int e) {
+        // -3 >= e | e > 7: computerized scientific notation
+        appendDigit(h);
+        append('.');
+        append8Digits(m);
+        lowDigits(l);
+        exponent(e - 1);
+        return NON_SPECIAL;
+    }
+
+    private void lowDigits(int l) {
+        if (l != 0) {
+            append8Digits(l);
+        }
+        removeTrailingZeroes();
+    }
+
+    private void append8Digits(int m) {
+        /*
+        Left-to-right digits extraction:
+        algorithm 1 in [3], with b = 10, k = 8, n = 28.
+         */
+        int y = y(m);
+        for (int i = 0; i < 8; ++i) {
+            int t = 10 * y;
+            appendDigit(t >>> 28);
+            y = t & MASK_28;
+        }
+    }
+
+    private void removeTrailingZeroes() {
+        while (bytes[index] == '0') {
+            --index;
+        }
+        // ... but do not remove the one directly to the right of '.'
+        if (bytes[index] == '.') {
+            ++index;
+        }
+    }
+
+    private int y(int a) {
+        /*
+        Algorithm 1 in [3] needs computation of
+            floor((a + 1) 2^n / b^k) - 1
+        with a < 10^8, b = 10, k = 8, n = 28.
+        Noting that
+            (a + 1) 2^n <= 10^8 2^28 < 10^17
+        For n = 17, m = 8 the table in section 10 of [1] leads to:
+         */
+        return (int) (MathUtils.multiplyHigh(
+                (long) (a + 1) << 28,
+                193_428_131_138_340_668L) >>> 20) - 1;
+    }
+
+    private void exponent(int e) {
+        append('e');
+        if (e < 0) {
+            append('-');
+            e = -e;
+        }
+        if (e < 10) {
+            appendDigit(e);
+            return;
+        }
+        int d;
+        if (e >= 100) {
+            /*
+            For n = 3, m = 2 the table in section 10 of [1] shows
+                floor(e / 100) = floor(1_311 e / 2^17)
+             */
+            d = e * 1_311 >>> 17;
+            appendDigit(d);
+            e -= 100 * d;
+        }
+        /*
+        For n = 2, m = 1 the table in section 10 of [1] shows
+            floor(e / 10) = floor(103 e / 2^10)
+         */
+        d = e * 103 >>> 10;
+        appendDigit(d);
+        appendDigit(e - 10 * d);
+    }
+
+    private void append(int c) {
+        bytes[++index] = (byte) c;
+    }
+
+    private void appendDigit(int d) {
+        bytes[++index] = (byte) ('0' + d);
+    }
+
+    private void applyIonFormatting(){
+        //check if the result ends with ".0"
+        if (index >=1 && bytes[index - 1] == '.' && bytes[index] == '0'){
+            //replace ".0" with "e0"
+            index -= 2;
+            append('e');
+            append('0');
+        } else {
+            //check if there's already an exponent
+            boolean hasExponent = false;
+            for (int i = 0; i < index; i++) {
+                if (bytes[i] == 'e' || bytes[i] == 'E') {
+                    hasExponent = true;
+                    break;
+                }
+            }
+
+            if (!hasExponent){
+                append('e');
+                append('0');
+            }
+        }
+    }
+
+    // Using the deprecated constructor enhances performance.
+    @SuppressWarnings("deprecation")
+    private String charsToString() {
+        return new String(bytes, 0, 0, index + 1);
+    }
+
+}
diff --git a/src/main/java/com/amazon/ion/impl/schubfach/MathUtils.java b/src/main/java/com/amazon/ion/impl/schubfach/MathUtils.java
new file mode 100644
index 0000000000..073d6f60e5
--- /dev/null
+++ b/src/main/java/com/amazon/ion/impl/schubfach/MathUtils.java
@@ -0,0 +1,835 @@
+/*
+ * Copyright 2018-2020 Raffaello Giulietti
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package com.amazon.ion.impl.schubfach;
+
+/**
+ * This class exposes package private utilities for other classes.
+ * Thus, all methods are assumed to be invoked with correct arguments,
+ * so these are not checked at all.
+ *
+ * @author Raffaello Giulietti
+ */
+final class MathUtils {
+    /*
+    For full details about this code see the following reference:
+
+        Giulietti, "The Schubfach way to render doubles",
+        https://drive.google.com/open?id=1luHhyQF9zKlM8yJ1nebU0OgVYhfC6CBN
+     */
+     
+    /**
+     * Returns the high 64 bits of the 128-bit product of two 64-bit factors.
+     * This is an implementation of the Math.multiplyHigh method introduced in Java 9,
+     * provided for compatibility with Java 8.
+     *
+     * @param x the first value
+     * @param y the second value
+     * @return the high 64 bits of the 128-bit product of the two arguments
+     */
+    static long multiplyHigh(long x, long y) {
+        // Use the "classic" long multiplication algorithm
+        long x1 = x >>> 32;
+        long x2 = x & 0xFFFFFFFFL;
+        long y1 = y >>> 32;
+        long y2 = y & 0xFFFFFFFFL;
+
+        long z2 = x2 * y2;
+        long t = x1 * y2 + (z2 >>> 32);
+        long z1 = t & 0xFFFFFFFFL;
+        long z0 = t >>> 32;
+        z1 += x2 * y1;
+        return x1 * y1 + z0 + (z1 >>> 32);
+    }
+
+    /*
+    The boundaries for k in g0(int) and g1(int).
+    K_MIN must be DoubleToDecimal.K_MIN or less.
+    K_MAX must be DoubleToDecimal.K_MAX or more.
+     */
+    static final int K_MIN = -324;
+    static final int K_MAX = 292;
+
+    // Must be DoubleToDecimal.H or more
+    static final int H = 17;
+
+    // C_10 = floor(log10(2) * 2^Q_10), A_10 = floor(log10(3/4) * 2^Q_10)
+    private static final int Q_10 = 41;
+    private static final long C_10 = 661_971_961_083L;
+    private static final long A_10 = -274_743_187_321L;
+
+    // C_2 = floor(log2(10) * 2^Q_2)
+    private static final int Q_2 = 38;
+    private static final long C_2 = 913_124_641_741L;
+
+    private MathUtils() {
+    }
+
+    // The first powers of 10. The last entry must be 10^H.
+    private static final long[] pow10 = {
+        1L,
+        10L,
+        100L,
+        1_000L,
+        10_000L,
+        100_000L,
+        1_000_000L,
+        10_000_000L,
+        100_000_000L,
+        1_000_000_000L,
+        10_000_000_000L,
+        100_000_000_000L,
+        1_000_000_000_000L,
+        10_000_000_000_000L,
+        100_000_000_000_000L,
+        1_000_000_000_000_000L,
+        10_000_000_000_000_000L,
+        100_000_000_000_000_000L,
+    };
+
+    /**
+     * Returns 10<sup>{@code e}</sup>.
+     *
+     * @param e The exponent which must meet
+     *          0 &le; {@code e} &le; {@link #H}.
+     * @return 10<sup>{@code e}</sup>.
+     */
+    static long pow10(int e) {
+        return pow10[e];
+    }
+
+    /**
+     * Returns the unique integer <i>k</i> such that
+     * 10<sup><i>k</i></sup> &le; 2<sup>{@code e}</sup>
+     * &lt; 10<sup><i>k</i>+1</sup>.
+     * <p>
+     * The result is correct when |{@code e}| &le; 5_456_721.
+     * Otherwise the result is undefined.
+     *
+     * @param e The exponent of 2, which should meet
+     *          |{@code e}| &le; 5_456_721 for safe results.
+     * @return &lfloor;log<sub>10</sub>2<sup>{@code e}</sup>&rfloor;.
+     */
+    static int flog10pow2(int e) {
+        return (int) (e * C_10 >> Q_10);
+    }
+
+    /**
+     * Returns the unique integer <i>k</i> such that
+     * 10<sup><i>k</i></sup> &le; 3/4 &middot; 2<sup>{@code e}</sup>
+     * &lt; 10<sup><i>k</i>+1</sup>.
+     * <p>
+     * The result is correct when
+     * -2_956_395 &le; {@code e} &le; 2_500_325.
+     * Otherwise the result is undefined.
+     *
+     * @param e The exponent of 2, which should meet
+     *          -2_956_395 &le; {@code e} &le; 2_500_325 for safe results.
+     * @return &lfloor;log<sub>10</sub>(3/4 &middot;
+     * 2<sup>{@code e}</sup>)&rfloor;.
+     */
+    static int flog10threeQuartersPow2(int e) {
+        return (int) (e * C_10 + A_10 >> Q_10);
+    }
+
+    /**
+     * Returns the unique integer <i>k</i> such that
+     * 2<sup><i>k</i></sup> &le; 10<sup>{@code e}</sup>
+     * &lt; 2<sup><i>k</i>+1</sup>.
+     * <p>
+     * The result is correct when |{@code e}| &le; 1_838_394.
+     * Otherwise the result is undefined.
+     *
+     * @param e The exponent of 10, which should meet
+     *          |{@code e}| &le; 1_838_394 for safe results.
+     * @return &lfloor;log<sub>2</sub>10<sup>{@code e}</sup>&rfloor;.
+     */
+    static int flog2pow10(int e) {
+        return (int) (e * C_2 >> Q_2);
+    }
+
+    /**
+     * Let 10<sup>-{@code k}</sup> = <i>&beta;</i> 2<sup><i>r</i></sup>,
+     * for the unique pair of integer <i>r</i> and real <i>&beta;</i> meeting
+     * 2<sup>125</sup> &le; <i>&beta;</i> &lt; 2<sup>126</sup>.
+     * Further, let <i>g</i> = &lfloor;<i>&beta;</i>&rfloor; + 1.
+     * Split <i>g</i> into the higher 63 bits <i>g</i><sub>1</sub> and
+     * the lower 63 bits <i>g</i><sub>0</sub>. Thus,
+     * <i>g</i><sub>1</sub> =
+     * &lfloor;<i>g</i> 2<sup>-63</sup>&rfloor;
+     * and
+     * <i>g</i><sub>0</sub> =
+     * <i>g</i> - <i>g</i><sub>1</sub> 2<sup>63</sup>.
+     * <p>
+     * This method returns <i>g</i><sub>1</sub> while
+     * {@link #g0(int)} returns <i>g</i><sub>0</sub>.
+     * <p>
+     * If needed, the exponent <i>r</i> can be computed as
+     * <i>r</i> = {@code flog2pow10(-k)} - 125 (see {@link #flog2pow10(int)}).
+     *
+     * @param k The exponent of 10, which must meet
+     *          {@link #K_MIN} &le; {@code e} &le; {@link #K_MAX}.
+     * @return <i>g</i><sub>1</sub> as described above.
+     */
+    static long g1(int k) {
+        return g[k - K_MIN << 1];
+    }
+
+    /**
+     * Returns <i>g</i><sub>0</sub> as described in
+     * {@link #g1(int)}.
+     *
+     * @param k The exponent of 10, which must meet
+     *          {@link #K_MIN} &le; {@code e} &le; {@link #K_MAX}.
+     * @return <i>g</i><sub>0</sub> as described in
+     * {@link #g1(int)}.
+     */
+    static long g0(int k) {
+        return g[k - K_MIN << 1 | 1];
+    }
+
+    /*
+    The precomputed values for g1(int) and g0(int).
+    The first entry must be for an exponent of K_MIN or less.
+    The last entry must be for an exponent of K_MAX or more.
+     */
+    private static final long[] g = {
+        /* -324 */ 0x4F0C_EDC9_5A71_8DD4L, 0x5B01_E8B0_9AA0_D1B5L,
+        /* -323 */ 0x7E7B_160E_F71C_1621L, 0x119C_A780_F767_B5EEL,
+        /* -322 */ 0x652F_44D8_C5B0_11B4L, 0x0E16_EC67_2C52_F7F2L,
+        /* -321 */ 0x50F2_9D7A_37C0_0E29L, 0x5812_56B8_F042_5FF5L,
+        /* -320 */ 0x40C2_1794_F966_71BAL, 0x79A8_4560_C035_1991L,
+        /* -319 */ 0x679C_F287_F570_B5F7L, 0x75DA_089A_CD21_C281L,
+        /* -318 */ 0x52E3_F539_9126_F7F9L, 0x44AE_6D48_A41B_0201L,
+        /* -317 */ 0x424F_F761_40EB_F994L, 0x36F1_F106_E9AF_34CDL,
+        /* -316 */ 0x6A19_8BCE_CE46_5C20L, 0x57E9_81A4_A918_547BL,
+        /* -315 */ 0x54E1_3CA5_71D1_E34DL, 0x2CBA_CE1D_5413_76C9L,
+        /* -314 */ 0x43E7_63B7_8E41_82A4L, 0x23C8_A4E4_4342_C56EL,
+        /* -313 */ 0x6CA5_6C58_E39C_043AL, 0x060D_D4A0_6B9E_08B0L,
+        /* -312 */ 0x56EA_BD13_E949_9CFBL, 0x1E71_76E6_BC7E_6D59L,
+        /* -311 */ 0x4588_9743_2107_B0C8L, 0x7EC1_2BEB_C9FE_BDE1L,
+        /* -310 */ 0x6F40_F205_01A5_E7A7L, 0x7E01_DFDF_A997_9635L,
+        /* -309 */ 0x5900_C19D_9AEB_1FB9L, 0x4B34_B319_5479_44F7L,
+        /* -308 */ 0x4733_CE17_AF22_7FC7L, 0x55C3_C27A_A9FA_9D93L,
+        /* -307 */ 0x71EC_7CF2_B1D0_CC72L, 0x5606_03F7_765D_C8EAL,
+        /* -306 */ 0x5B23_9728_8E40_A38EL, 0x7804_CFF9_2B7E_3A55L,
+        /* -305 */ 0x48E9_45BA_0B66_E93FL, 0x1337_0CC7_55FE_9511L,
+        /* -304 */ 0x74A8_6F90_123E_41FEL, 0x51F1_AE0B_BCCA_881BL,
+        /* -303 */ 0x5D53_8C73_41CB_67FEL, 0x74C1_5809_63D5_39AFL,
+        /* -302 */ 0x4AA9_3D29_016F_8665L, 0x43CD_E007_8310_FAF3L,
+        /* -301 */ 0x7775_2EA8_024C_0A3CL, 0x0616_333F_381B_2B1EL,
+        /* -300 */ 0x5F90_F220_01D6_6E96L, 0x3811_C298_F9AF_55B1L,
+        /* -299 */ 0x4C73_F4E6_67DE_BEDEL, 0x600E_3547_2E25_DE28L,
+        /* -298 */ 0x7A53_2170_A631_3164L, 0x3349_EED8_49D6_303FL,
+        /* -297 */ 0x61DC_1AC0_84F4_2783L, 0x42A1_8BE0_3B11_C033L,
+        /* -296 */ 0x4E49_AF00_6A5C_EC69L, 0x1BB4_6FE6_95A7_CCF5L,
+        /* -295 */ 0x7D42_B19A_43C7_E0A8L, 0x2C53_E63D_BC3F_AE55L,
+        /* -294 */ 0x6435_5AE1_CFD3_1A20L, 0x2376_51CA_FCFF_BEAAL,
+        /* -293 */ 0x502A_AF1B_0CA8_E1B3L, 0x35F8_416F_30CC_9888L,
+        /* -292 */ 0x4022_25AF_3D53_E7C2L, 0x5E60_3458_F3D6_E06DL,
+        /* -291 */ 0x669D_0918_621F_D937L, 0x4A33_86F4_B957_CD7BL,
+        /* -290 */ 0x5217_3A79_E819_7A92L, 0x6E8F_9F2A_2DDF_D796L,
+        /* -289 */ 0x41AC_2EC7_ECE1_2EDBL, 0x720C_7F54_F17F_DFABL,
+        /* -288 */ 0x6913_7E0C_AE35_17C6L, 0x1CE0_CBBB_1BFF_CC45L,
+        /* -287 */ 0x540F_980A_24F7_4638L, 0x171A_3C95_AFFF_D69EL,
+        /* -286 */ 0x433F_ACD4_EA5F_6B60L, 0x127B_63AA_F333_1218L,
+        /* -285 */ 0x6B99_1487_DD65_7899L, 0x6A5F_05DE_51EB_5026L,
+        /* -284 */ 0x5614_106C_B11D_FA14L, 0x5518_D17E_A7EF_7352L,
+        /* -283 */ 0x44DC_D9F0_8DB1_94DDL, 0x2A7A_4132_1FF2_C2A8L,
+        /* -282 */ 0x6E2E_2980_E2B5_BAFBL, 0x5D90_6850_331E_043FL,
+        /* -281 */ 0x5824_EE00_B55E_2F2FL, 0x6473_86A6_8F4B_3699L,
+        /* -280 */ 0x4683_F19A_2AB1_BF59L, 0x36C2_D21E_D908_F87BL,
+        /* -279 */ 0x70D3_1C29_DDE9_3228L, 0x579E_1CFE_280E_5A5DL,
+        /* -278 */ 0x5A42_7CEE_4B20_F4EDL, 0x2C7E_7D98_200B_7B7EL,
+        /* -277 */ 0x4835_30BE_A280_C3F1L, 0x09FE_CAE0_19A2_C932L,
+        /* -276 */ 0x7388_4DFD_D0CE_064EL, 0x4331_4499_C29E_0EB6L,
+        /* -275 */ 0x5C6D_0B31_73D8_050BL, 0x4F5A_9D47_CEE4_D891L,
+        /* -274 */ 0x49F0_D5C1_2979_9DA2L, 0x72AE_E439_7250_AD41L,
+        /* -273 */ 0x764E_22CE_A8C2_95D1L, 0x377E_39F5_83B4_4868L,
+        /* -272 */ 0x5EA4_E8A5_53CE_DE41L, 0x12CB_6191_3629_D387L,
+        /* -271 */ 0x4BB7_2084_430B_E500L, 0x756F_8140_F821_7605L,
+        /* -270 */ 0x7925_00D3_9E79_6E67L, 0x6F18_CECE_59CF_233CL,
+        /* -269 */ 0x60EA_670F_B1FA_BEB9L, 0x3F47_0BD8_47D8_E8FDL,
+        /* -268 */ 0x4D88_5272_F4C8_9894L, 0x329F_3CAD_0647_20CAL,
+        /* -267 */ 0x7C0D_50B7_EE0D_C0EDL, 0x3765_2DE1_A3A5_0143L,
+        /* -266 */ 0x633D_DA2C_BE71_6724L, 0x2C50_F181_4FB7_3436L,
+        /* -265 */ 0x4F64_AE8A_31F4_5283L, 0x3D0D_8E01_0C92_902BL,
+        /* -264 */ 0x7F07_7DA9_E986_EA6BL, 0x7B48_E334_E0EA_8045L,
+        /* -263 */ 0x659F_97BB_2138_BB89L, 0x4907_1C2A_4D88_669DL,
+        /* -262 */ 0x514C_7962_80FA_2FA1L, 0x20D2_7CEE_A46D_1EE4L,
+        /* -261 */ 0x4109_FAB5_33FB_594DL, 0x670E_CA58_838A_7F1DL,
+        /* -260 */ 0x680F_F788_532B_C216L, 0x0B4A_DD5A_6C10_CB62L,
+        /* -259 */ 0x533F_F939_DC23_01ABL, 0x22A2_4AAE_BCDA_3C4EL,
+        /* -258 */ 0x4299_942E_49B5_9AEFL, 0x354E_A225_63E1_C9D8L,
+        /* -257 */ 0x6A8F_537D_42BC_2B18L, 0x554A_9D08_9FCF_A95AL,
+        /* -256 */ 0x553F_75FD_CEFC_EF46L, 0x776E_E406_E63F_BAAEL,
+        /* -255 */ 0x4432_C4CB_0BFD_8C38L, 0x5F8B_E99F_1E99_6225L,
+        /* -254 */ 0x6D1E_07AB_4662_79F4L, 0x3279_75CB_6428_9D08L,
+        /* -253 */ 0x574B_3955_D1E8_6190L, 0x2861_2B09_1CED_4A6DL,
+        /* -252 */ 0x45D5_C777_DB20_4E0DL, 0x06B4_226D_B0BD_D524L,
+        /* -251 */ 0x6FBC_7259_5E9A_167BL, 0x2453_6A49_1AC9_5506L,
+        /* -250 */ 0x5963_8EAD_E548_11FCL, 0x1D0F_883A_7BD4_4405L,
+        /* -249 */ 0x4782_D88B_1DD3_4196L, 0x4A72_D361_FCA9_D004L,
+        /* -248 */ 0x726A_F411_C952_028AL, 0x43EA_EBCF_FAA9_4CD3L,
+        /* -247 */ 0x5B88_C341_6DDB_353BL, 0x4FEF_230C_C887_70A9L,
+        /* -246 */ 0x493A_35CD_F17C_2A96L, 0x0CBF_4F3D_6D39_26EEL,
+        /* -245 */ 0x7529_EFAF_E8C6_AA89L, 0x6132_1862_485B_717CL,
+        /* -244 */ 0x5DBB_2626_53D2_2207L, 0x675B_46B5_06AF_8DFDL,
+        /* -243 */ 0x4AFC_1E85_0FDB_4E6CL, 0x52AF_6BC4_0559_3E64L,
+        /* -242 */ 0x77F9_CA6E_7FC5_4A47L, 0x377F_12D3_3BC1_FD6DL,
+        /* -241 */ 0x5FFB_0858_6637_6E9FL, 0x45FF_4242_9634_CABDL,
+        /* -240 */ 0x4CC8_D379_EB5F_8BB2L, 0x6B32_9B68_782A_3BCBL,
+        /* -239 */ 0x7ADA_EBF6_4565_AC51L, 0x2B84_2BDA_59DD_2C77L,
+        /* -238 */ 0x6248_BCC5_0451_56A7L, 0x3C69_BCAE_AE4A_89F9L,
+        /* -237 */ 0x4EA0_9704_0374_4552L, 0x6387_CA25_583B_A194L,
+        /* -236 */ 0x7DCD_BE6C_D253_A21EL, 0x05A6_103B_C05F_68EDL,
+        /* -235 */ 0x64A4_9857_0EA9_4E7EL, 0x37B8_0CFC_99E5_ED8AL,
+        /* -234 */ 0x5083_AD12_7221_0B98L, 0x2C93_3D96_E184_BE08L,
+        /* -233 */ 0x4069_5741_F4E7_3C79L, 0x7075_CADF_1AD0_9807L,
+        /* -232 */ 0x670E_F203_2171_FA5CL, 0x4D89_4498_2AE7_59A4L,
+        /* -231 */ 0x5272_5B35_B45B_2EB0L, 0x3E07_6A13_5585_E150L,
+        /* -230 */ 0x41F5_15C4_9048_F226L, 0x64D2_BB42_AAD1_810DL,
+        /* -229 */ 0x6988_22D4_1A0E_503EL, 0x07B7_9204_4482_6815L,
+        /* -228 */ 0x546C_E8A9_AE71_D9CBL, 0x1FC6_0E69_D068_5344L,
+        /* -227 */ 0x438A_53BA_F1F4_AE3CL, 0x196B_3EBB_0D20_429DL,
+        /* -226 */ 0x6C10_85F7_E987_7D2DL, 0x0F11_FDF8_1500_6A94L,
+        /* -225 */ 0x5673_9E5F_EE05_FDBDL, 0x58DB_3193_4400_5543L,
+        /* -224 */ 0x4529_4B7F_F19E_6497L, 0x60AF_5ADC_3666_AA9CL,
+        /* -223 */ 0x6EA8_78CC_B5CA_3A8CL, 0x344B_C493_8A3D_DDC7L,
+        /* -222 */ 0x5886_C70A_2B08_2ED6L, 0x5D09_6A0F_A1CB_17D2L,
+        /* -221 */ 0x46D2_38D4_EF39_BF12L, 0x173A_BB3F_B4A2_7975L,
+        /* -220 */ 0x7150_5AEE_4B8F_981DL, 0x0B91_2B99_2103_F588L,
+        /* -219 */ 0x5AA6_AF25_093F_ACE4L, 0x0940_EFAD_B403_2AD3L,
+        /* -218 */ 0x4885_58EA_6DCC_8A50L, 0x0767_2624_9002_88A9L,
+        /* -217 */ 0x7408_8E43_E2E0_DD4CL, 0x723E_A36D_B337_410EL,
+        /* -216 */ 0x5CD3_A503_1BE7_1770L, 0x5B65_4F8A_F5C5_CDA5L,
+        /* -215 */ 0x4A42_EA68_E31F_45F3L, 0x62B7_72D5_916B_0AEBL,
+        /* -214 */ 0x76D1_770E_3832_0986L, 0x0458_B7BC_1BDE_77DDL,
+        /* -213 */ 0x5F0D_F8D8_2CF4_D46BL, 0x1D13_C630_164B_9318L,
+        /* -212 */ 0x4C0B_2D79_BD90_A9EFL, 0x30DC_9E8C_DEA2_DC13L,
+        /* -211 */ 0x79AB_7BF5_FC1A_A97FL, 0x0160_FDAE_3104_9351L,
+        /* -210 */ 0x6155_FCC4_C9AE_EDFFL, 0x1AB3_FE24_F403_A90EL,
+        /* -209 */ 0x4DDE_63D0_A158_BE65L, 0x6229_981D_9002_EDA5L,
+        /* -208 */ 0x7C97_061A_9BC1_30A2L, 0x69DC_2695_B337_E2A1L,
+        /* -207 */ 0x63AC_04E2_1634_26E8L, 0x54B0_1EDE_28F9_821BL,
+        /* -206 */ 0x4FBC_D0B4_DE90_1F20L, 0x43C0_18B1_BA61_34E2L,
+        /* -205 */ 0x7F94_8121_6419_CB67L, 0x1F99_C11C_5D68_549DL,
+        /* -204 */ 0x6610_674D_E9AE_3C52L, 0x4C7B_00E3_7DED_107EL,
+        /* -203 */ 0x51A6_B90B_2158_3042L, 0x09FC_00B5_FE57_4065L,
+        /* -202 */ 0x4152_2DA2_8113_59CEL, 0x3B30_0091_9845_CD1DL,
+        /* -201 */ 0x6883_7C37_34EB_C2E3L, 0x784C_CDB5_C06F_AE95L,
+        /* -200 */ 0x539C_635F_5D89_68B6L, 0x2D0A_3E2B_0059_5877L,
+        /* -199 */ 0x42E3_82B2_B13A_BA2BL, 0x3DA1_CB55_99E1_1393L,
+        /* -198 */ 0x6B05_9DEA_B52A_C378L, 0x629C_7888_F634_EC1EL,
+        /* -197 */ 0x559E_17EE_F755_692DL, 0x3549_FA07_2B5D_89B1L,
+        /* -196 */ 0x447E_798B_F911_20F1L, 0x1107_FB38_EF7E_07C1L,
+        /* -195 */ 0x6D97_28DF_F4E8_34B5L, 0x01A6_5EC1_7F30_0C68L,
+        /* -194 */ 0x57AC_20B3_2A53_5D5DL, 0x4E1E_B234_65C0_09EDL,
+        /* -193 */ 0x4623_4D5C_21DC_4AB1L, 0x24E5_5B5D_1E33_3B24L,
+        /* -192 */ 0x7038_7BC6_9C93_AAB5L, 0x216E_F894_FD1E_C506L,
+        /* -191 */ 0x59C6_C96B_B076_222AL, 0x4DF2_6077_30E5_6A6CL,
+        /* -190 */ 0x47D2_3ABC_8D2B_4E88L, 0x3E5B_805F_5A51_21F0L,
+        /* -189 */ 0x72E9_F794_1512_1740L, 0x63C5_9A32_2A1B_697FL,
+        /* -188 */ 0x5BEE_5FA9_AA74_DF67L, 0x0304_7B5B_54E2_BACCL,
+        /* -187 */ 0x498B_7FBA_EEC3_E5ECL, 0x0269_FC49_10B5_623DL,
+        /* -186 */ 0x75AB_FF91_7E06_3CACL, 0x6A43_2D41_B455_69FBL,
+        /* -185 */ 0x5E23_32DA_CB38_308AL, 0x21CF_5767_C377_87FCL,
+        /* -184 */ 0x4B4F_5BE2_3C2C_F3A1L, 0x67D9_12B9_692C_6CCAL,
+        /* -183 */ 0x787E_F969_F9E1_85CFL, 0x595B_5128_A847_1476L,
+        /* -182 */ 0x6065_9454_C7E7_9E3FL, 0x6115_DA86_ED05_A9F8L,
+        /* -181 */ 0x4D1E_1043_D31F_B1CCL, 0x4DAB_1538_BD9E_2193L,
+        /* -180 */ 0x7B63_4D39_51CC_4FADL, 0x62AB_5527_95C9_CF52L,
+        /* -179 */ 0x62B5_D761_0E3D_0C8BL, 0x0222_AA86_116E_3F75L,
+        /* -178 */ 0x4EF7_DF80_D830_D6D5L, 0x4E82_2204_DABE_992AL,
+        /* -177 */ 0x7E59_659A_F381_57BCL, 0x1736_9CD4_9130_F510L,
+        /* -176 */ 0x6514_5148_C2CD_DFC9L, 0x5F5E_E3DD_40F3_F740L,
+        /* -175 */ 0x50DD_0DD3_CF0B_196EL, 0x1918_B64A_9A5C_C5CDL,
+        /* -174 */ 0x40B0_D7DC_A5A2_7ABEL, 0x4746_F83B_AEB0_9E3EL,
+        /* -173 */ 0x6781_5961_0903_F797L, 0x253E_59F9_1780_FD2FL,
+        /* -172 */ 0x52CD_E11A_6D9C_C612L, 0x50FE_AE60_DF9A_6426L,
+        /* -171 */ 0x423E_4DAE_BE17_04DBL, 0x5A65_584D_7FAE_B685L,
+        /* -170 */ 0x69FD_4917_968B_3AF9L, 0x10A2_26E2_65E4_573BL,
+        /* -169 */ 0x54CA_A0DF_ABA2_9594L, 0x0D4E_8581_EB1D_1295L,
+        /* -168 */ 0x43D5_4D7F_BC82_1143L, 0x243E_D134_BC17_4211L,
+        /* -167 */ 0x6C88_7BFF_9403_4ED2L, 0x06CA_E854_6025_3682L,
+        /* -166 */ 0x56D3_9666_1002_A574L, 0x6BD5_86A9_E684_2B9BL,
+        /* -165 */ 0x4576_11EB_4002_1DF7L, 0x0977_9EEE_5203_5616L,
+        /* -164 */ 0x6F23_4FDE_CCD0_2FF1L, 0x5BF2_97E3_B66B_BCEFL,
+        /* -163 */ 0x58E9_0CB2_3D73_598EL, 0x165B_ACB6_2B89_63F3L,
+        /* -162 */ 0x4720_D6F4_FDF5_E13EL, 0x4516_23C4_EFA1_1CC2L,
+        /* -161 */ 0x71CE_24BB_2FEF_CECAL, 0x3B56_9FA1_7F68_2E03L,
+        /* -160 */ 0x5B0B_5095_BFF3_0BD5L, 0x15DE_E61A_CC53_5803L,
+        /* -159 */ 0x48D5_DA11_665C_0977L, 0x2B18_B815_7042_ACCFL,
+        /* -158 */ 0x7489_5CE8_A3C6_758BL, 0x5E8D_F355_806A_AE18L,
+        /* -157 */ 0x5D3A_B0BA_1C9E_C46FL, 0x653E_5C44_66BB_BE7AL,
+        /* -156 */ 0x4A95_5A2E_7D4B_D059L, 0x3765_169D_1EFC_9861L,
+        /* -155 */ 0x7755_5D17_2EDF_B3C2L, 0x256E_8A94_FE60_F3CFL,
+        /* -154 */ 0x5F77_7DAC_257F_C301L, 0x6ABE_D543_FEB3_F63FL,
+        /* -153 */ 0x4C5F_97BC_EACC_9C01L, 0x3BCB_DDCF_FEF6_5E99L,
+        /* -152 */ 0x7A32_8C61_77AD_C668L, 0x5FAC_9619_97F0_975BL,
+        /* -151 */ 0x61C2_09E7_92F1_6B86L, 0x7FBD_44E1_465A_12AFL,
+        /* -150 */ 0x4E34_D4B9_425A_BC6BL, 0x7FCA_9D81_0514_DBBFL,
+        /* -149 */ 0x7D21_545B_9D5D_FA46L, 0x32DD_C8CE_6E87_C5FFL,
+        /* -148 */ 0x641A_A9E2_E44B_2E9EL, 0x5BE4_A0A5_2539_6B32L,
+        /* -147 */ 0x5015_54B5_836F_587EL, 0x7CB6_E6EA_842D_EF5CL,
+        /* -146 */ 0x4011_1091_35F2_AD32L, 0x3092_5255_368B_25E3L,
+        /* -145 */ 0x6681_B41B_8984_4850L, 0x4DB6_EA21_F0DE_A304L,
+        /* -144 */ 0x5201_5CE2_D469_D373L, 0x57C5_881B_2718_826AL,
+        /* -143 */ 0x419A_B0B5_76BB_0F8FL, 0x5FD1_39AF_527A_01EFL,
+        /* -142 */ 0x68F7_8122_5791_B27FL, 0x4C81_F5E5_50C3_364AL,
+        /* -141 */ 0x53F9_341B_7941_5B99L, 0x239B_2B1D_DA35_C508L,
+        /* -140 */ 0x432D_C349_2DCD_E2E1L, 0x02E2_88E4_AE91_6A6DL,
+        /* -139 */ 0x6B7C_6BA8_4949_6B01L, 0x516A_74A1_174F_10AEL,
+        /* -138 */ 0x55FD_22ED_076D_EF34L, 0x4121_F6E7_45D8_DA25L,
+        /* -137 */ 0x44CA_8257_3924_BF5DL, 0x1A81_9252_9E47_14EBL,
+        /* -136 */ 0x6E10_D08B_8EA1_322EL, 0x5D9C_1D50_FD3E_87DDL,
+        /* -135 */ 0x580D_73A2_D880_F4F2L, 0x17B0_1773_FDCB_9FE4L,
+        /* -134 */ 0x4671_294F_139A_5D8EL, 0x4626_7929_97D6_1984L,
+        /* -133 */ 0x70B5_0EE4_EC2A_2F4AL, 0x3D0A_5B75_BFBC_F59FL,
+        /* -132 */ 0x5A2A_7250_BCEE_8C3BL, 0x4A6E_AF91_6630_C47FL,
+        /* -131 */ 0x4821_F50D_63F2_09C9L, 0x21F2_260D_EB5A_36CCL,
+        /* -130 */ 0x7369_8815_6CB6_760EL, 0x6983_7016_455D_247AL,
+        /* -129 */ 0x5C54_6CDD_F091_F80BL, 0x6E02_C011_D117_5062L,
+        /* -128 */ 0x49DD_23E4_C074_C66FL, 0x719B_CCDB_0DAC_404EL,
+        /* -127 */ 0x762E_9FD4_6721_3D7FL, 0x68F9_47C4_E2AD_33B0L,
+        /* -126 */ 0x5E8B_B310_5280_FDFFL, 0x6D94_396A_4EF0_F627L,
+        /* -125 */ 0x4BA2_F5A6_A867_3199L, 0x3E10_2DEE_A58D_91B9L,
+        /* -124 */ 0x7904_BC3D_DA3E_B5C2L, 0x3019_E317_6F48_E927L,
+        /* -123 */ 0x60D0_9697_E1CB_C49BL, 0x4014_B5AC_5907_20ECL,
+        /* -122 */ 0x4D73_ABAC_B4A3_03AFL, 0x4CDD_5E23_7A6C_1A57L,
+        /* -121 */ 0x7BEC_45E1_2104_D2B2L, 0x47C8_969F_2A46_908AL,
+        /* -120 */ 0x6323_6B1A_80D0_A88EL, 0x6CA0_787F_5505_406FL,
+        /* -119 */ 0x4F4F_88E2_00A6_ED3FL, 0x0A19_F9FF_7737_66BFL,
+        /* -118 */ 0x7EE5_A7D0_010B_1531L, 0x5CF6_5CCB_F1F2_3DFEL,
+        /* -117 */ 0x6584_8640_00D5_AA8EL, 0x172B_7D6F_F4C1_CB32L,
+        /* -116 */ 0x5136_D1CC_CD77_BBA4L, 0x78EF_978C_C3CE_3C28L,
+        /* -115 */ 0x40F8_A7D7_0AC6_2FB7L, 0x13F2_DFA3_CFD8_3020L,
+        /* -114 */ 0x67F4_3FBE_77A3_7F8BL, 0x3984_9906_1959_E699L,
+        /* -113 */ 0x5329_CC98_5FB5_FFA2L, 0x6136_E0D1_ADE1_8548L,
+        /* -112 */ 0x4287_D6E0_4C91_994FL, 0x00F8_B3DA_F181_376DL,
+        /* -111 */ 0x6A72_F166_E0E8_F54BL, 0x1B27_862B_1C01_F247L,
+        /* -110 */ 0x5528_C11F_1A53_F76FL, 0x2F52_D1BC_1667_F506L,
+        /* -109 */ 0x4420_9A7F_4843_2C59L, 0x0C42_4163_451F_F738L,
+        /* -108 */ 0x6D00_F732_0D38_46F4L, 0x7A03_9BD2_0833_2526L,
+        /* -107 */ 0x5733_F8F4_D760_38C3L, 0x7B36_1641_A028_EA85L,
+        /* -106 */ 0x45C3_2D90_AC4C_FA36L, 0x2F5E_7834_8020_BB9EL,
+        /* -105 */ 0x6F9E_AF4D_E07B_29F0L, 0x4BCA_59ED_99CD_F8FCL,
+        /* -104 */ 0x594B_BF71_8062_87F3L, 0x563B_7B24_7B0B_2D96L,
+        /* -103 */ 0x476F_CC5A_CD1B_9FF6L, 0x11C9_2F50_626F_57ACL,
+        /* -102 */ 0x724C_7A2A_E1C5_CCBDL, 0x02DB_7EE7_03E5_5912L,
+        /* -101 */ 0x5B70_61BB_E7D1_7097L, 0x1BE2_CBEC_031D_E0DCL,
+        /* -100 */ 0x4926_B496_530D_F3ACL, 0x164F_0989_9C17_E716L,
+        /*  -99 */ 0x750A_BA8A_1E7C_B913L, 0x3D4B_4275_C68C_A4F0L,
+        /*  -98 */ 0x5DA2_2ED4_E530_940FL, 0x4AA2_9B91_6BA3_B726L,
+        /*  -97 */ 0x4AE8_2577_1DC0_7672L, 0x6EE8_7C74_561C_9285L,
+        /*  -96 */ 0x77D9_D58B_62CD_8A51L, 0x3173_FA53_BCFA_8408L,
+        /*  -95 */ 0x5FE1_77A2_B571_3B74L, 0x278F_FB76_30C8_69A0L,
+        /*  -94 */ 0x4CB4_5FB5_5DF4_2F90L, 0x1FA6_62C4_F3D3_87B3L,
+        /*  -93 */ 0x7ABA_32BB_C986_B280L, 0x32A3_D13B_1FB8_D91FL,
+        /*  -92 */ 0x622E_8EFC_A138_8ECDL, 0x0EE9_742F_4C93_E0E6L,
+        /*  -91 */ 0x4E8B_A596_E760_723DL, 0x58BA_C359_0A0F_E71EL,
+        /*  -90 */ 0x7DAC_3C24_A567_1D2FL, 0x412A_D228_1019_71C9L,
+        /*  -89 */ 0x6489_C9B6_EAB8_E426L, 0x00EF_0E86_7347_8E3BL,
+        /*  -88 */ 0x506E_3AF8_BBC7_1CEBL, 0x1A58_D86B_8F6C_71C9L,
+        /*  -87 */ 0x4058_2F2D_6305_B0BCL, 0x1513_E056_0C56_C16EL,
+        /*  -86 */ 0x66F3_7EAF_04D5_E793L, 0x3B53_0089_AD57_9BE2L,
+        /*  -85 */ 0x525C_6558_D0AB_1FA9L, 0x15DC_006E_2446_164FL,
+        /*  -84 */ 0x41E3_8447_0D55_B2EDL, 0x5E49_99F1_B69E_783FL,
+        /*  -83 */ 0x696C_06D8_1555_EB15L, 0x7D42_8FE9_2430_C065L,
+        /*  -82 */ 0x5456_6BE0_1111_88DEL, 0x3102_0CBA_835A_3384L,
+        /*  -81 */ 0x4378_564C_DA74_6D7EL, 0x5A68_0A2E_CF7B_5C69L,
+        /*  -80 */ 0x6BF3_BD47_C3ED_7BFDL, 0x770C_DD17_B25E_FA42L,
+        /*  -79 */ 0x565C_976C_9CBD_FCCBL, 0x1270_B0DF_C1E5_9502L,
+        /*  -78 */ 0x4516_DF8A_16FE_63D5L, 0x5B8D_5A4C_9B1E_10CEL,
+        /*  -77 */ 0x6E8A_FF43_57FD_6C89L, 0x127B_C3AD_C4FC_E7B0L,
+        /*  -76 */ 0x586F_329C_4664_56D4L, 0x0EC9_6957_D0CA_52F3L,
+        /*  -75 */ 0x46BF_5BB0_3850_4576L, 0x3F07_8779_73D5_0F29L,
+        /*  -74 */ 0x7132_2C4D_26E6_D58AL, 0x31A5_A58F_1FBB_4B75L,
+        /*  -73 */ 0x5A8E_89D7_5252_446EL, 0x5AEA_EAD8_E62F_6F91L,
+        /*  -72 */ 0x4872_07DF_750E_9D25L, 0x2F22_557A_51BF_8C74L,
+        /*  -71 */ 0x73E9_A632_54E4_2EA2L, 0x1836_EF2A_1C65_AD86L,
+        /*  -70 */ 0x5CBA_EB5B_771C_F21BL, 0x2CF8_BF54_E384_8AD2L,
+        /*  -69 */ 0x4A2F_22AF_927D_8E7CL, 0x23FA_32AA_4F9D_3BDBL,
+        /*  -68 */ 0x76B1_D118_EA62_7D93L, 0x5329_EAAA_18FB_92F8L,
+        /*  -67 */ 0x5EF4_A747_21E8_6476L, 0x0F54_BBBB_472F_A8C6L,
+        /*  -66 */ 0x4BF6_EC38_E7ED_1D2BL, 0x25DD_62FC_38F2_ED6CL,
+        /*  -65 */ 0x798B_138E_3FE1_C845L, 0x22FB_D193_8E51_7BDFL,
+        /*  -64 */ 0x613C_0FA4_FFE7_D36AL, 0x4F2F_DADC_71DA_C97FL,
+        /*  -63 */ 0x4DC9_A61D_9986_42BBL, 0x58F3_157D_27E2_3ACCL,
+        /*  -62 */ 0x7C75_D695_C270_6AC5L, 0x74B8_2261_D969_F7ADL,
+        /*  -61 */ 0x6391_7877_CEC0_556BL, 0x1093_4EB4_ADEE_5FBEL,
+        /*  -60 */ 0x4FA7_9393_0BCD_1122L, 0x4075_D890_8B25_1965L,
+        /*  -59 */ 0x7F72_85B8_12E1_B504L, 0x00BC_8DB4_11D4_F56EL,
+        /*  -58 */ 0x65F5_37C6_7581_5D9CL, 0x66FD_3E29_A7DD_9125L,
+        /*  -57 */ 0x5190_F96B_9134_4AE3L, 0x6BFD_CB54_864A_DA84L,
+        /*  -56 */ 0x4140_C789_40F6_A24FL, 0x6FFE_3C43_9EA2_486AL,
+        /*  -55 */ 0x6867_A5A8_67F1_03B2L, 0x7FFD_2D38_FDD0_73DCL,
+        /*  -54 */ 0x5386_1E20_5327_3628L, 0x6664_242D_97D9_F64AL,
+        /*  -53 */ 0x42D1_B1B3_75B8_F820L, 0x51E9_B68A_DFE1_91D5L,
+        /*  -52 */ 0x6AE9_1C52_55F4_C034L, 0x1CA9_2411_6635_B621L,
+        /*  -51 */ 0x5587_49DB_77F7_0029L, 0x63BA_8341_1E91_5E81L,
+        /*  -50 */ 0x446C_3B15_F992_6687L, 0x6962_029A_7EDA_B201L,
+        /*  -49 */ 0x6D79_F823_28EA_3DA6L, 0x0F03_375D_97C4_5001L,
+        /*  -48 */ 0x5794_C682_8721_CAEBL, 0x259C_2C4A_DFD0_4001L,
+        /*  -47 */ 0x4610_9ECE_D281_6F22L, 0x5149_BD08_B30D_0001L,
+        /*  -46 */ 0x701A_97B1_50CF_1837L, 0x3542_C80D_EB48_0001L,
+        /*  -45 */ 0x59AE_DFC1_0D72_79C5L, 0x7768_A00B_22A0_0001L,
+        /*  -44 */ 0x47BF_1967_3DF5_2E37L, 0x7920_8008_E880_0001L,
+        /*  -43 */ 0x72CB_5BD8_6321_E38CL, 0x5B67_3341_7400_0001L,
+        /*  -42 */ 0x5BD5_E313_8281_82D6L, 0x7C52_8F67_9000_0001L,
+        /*  -41 */ 0x4977_E8DC_6867_9BDFL, 0x16A8_72B9_4000_0001L,
+        /*  -40 */ 0x758C_A7C7_0D72_92FEL, 0x5773_EAC2_0000_0001L,
+        /*  -39 */ 0x5E0A_1FD2_7128_7598L, 0x45F6_5568_0000_0001L,
+        /*  -38 */ 0x4B3B_4CA8_5A86_C47AL, 0x04C5_1120_0000_0001L,
+        /*  -37 */ 0x785E_E10D_5DA4_6D90L, 0x07A1_B500_0000_0001L,
+        /*  -36 */ 0x604B_E73D_E483_8AD9L, 0x52E7_C400_0000_0001L,
+        /*  -35 */ 0x4D09_85CB_1D36_08AEL, 0x0F1F_D000_0000_0001L,
+        /*  -34 */ 0x7B42_6FAB_61F0_0DE3L, 0x31CC_8000_0000_0001L,
+        /*  -33 */ 0x629B_8C89_1B26_7182L, 0x5B0A_0000_0000_0001L,
+        /*  -32 */ 0x4EE2_D6D4_15B8_5ACEL, 0x7C08_0000_0000_0001L,
+        /*  -31 */ 0x7E37_BE20_22C0_914BL, 0x1340_0000_0000_0001L,
+        /*  -30 */ 0x64F9_64E6_8233_A76FL, 0x2900_0000_0000_0001L,
+        /*  -29 */ 0x50C7_83EB_9B5C_85F2L, 0x5400_0000_0000_0001L,
+        /*  -28 */ 0x409F_9CBC_7C4A_04C2L, 0x1000_0000_0000_0001L,
+        /*  -27 */ 0x6765_C793_FA10_079DL, 0x0000_0000_0000_0001L,
+        /*  -26 */ 0x52B7_D2DC_C80C_D2E4L, 0x0000_0000_0000_0001L,
+        /*  -25 */ 0x422C_A8B0_A00A_4250L, 0x0000_0000_0000_0001L,
+        /*  -24 */ 0x69E1_0DE7_6676_D080L, 0x0000_0000_0000_0001L,
+        /*  -23 */ 0x54B4_0B1F_852B_DA00L, 0x0000_0000_0000_0001L,
+        /*  -22 */ 0x43C3_3C19_3756_4800L, 0x0000_0000_0000_0001L,
+        /*  -21 */ 0x6C6B_935B_8BBD_4000L, 0x0000_0000_0000_0001L,
+        /*  -20 */ 0x56BC_75E2_D631_0000L, 0x0000_0000_0000_0001L,
+        /*  -19 */ 0x4563_9182_44F4_0000L, 0x0000_0000_0000_0001L,
+        /*  -18 */ 0x6F05_B59D_3B20_0000L, 0x0000_0000_0000_0001L,
+        /*  -17 */ 0x58D1_5E17_6280_0000L, 0x0000_0000_0000_0001L,
+        /*  -16 */ 0x470D_E4DF_8200_0000L, 0x0000_0000_0000_0001L,
+        /*  -15 */ 0x71AF_D498_D000_0000L, 0x0000_0000_0000_0001L,
+        /*  -14 */ 0x5AF3_107A_4000_0000L, 0x0000_0000_0000_0001L,
+        /*  -13 */ 0x48C2_7395_0000_0000L, 0x0000_0000_0000_0001L,
+        /*  -12 */ 0x746A_5288_0000_0000L, 0x0000_0000_0000_0001L,
+        /*  -11 */ 0x5D21_DBA0_0000_0000L, 0x0000_0000_0000_0001L,
+        /*  -10 */ 0x4A81_7C80_0000_0000L, 0x0000_0000_0000_0001L,
+        /*   -9 */ 0x7735_9400_0000_0000L, 0x0000_0000_0000_0001L,
+        /*   -8 */ 0x5F5E_1000_0000_0000L, 0x0000_0000_0000_0001L,
+        /*   -7 */ 0x4C4B_4000_0000_0000L, 0x0000_0000_0000_0001L,
+        /*   -6 */ 0x7A12_0000_0000_0000L, 0x0000_0000_0000_0001L,
+        /*   -5 */ 0x61A8_0000_0000_0000L, 0x0000_0000_0000_0001L,
+        /*   -4 */ 0x4E20_0000_0000_0000L, 0x0000_0000_0000_0001L,
+        /*   -3 */ 0x7D00_0000_0000_0000L, 0x0000_0000_0000_0001L,
+        /*   -2 */ 0x6400_0000_0000_0000L, 0x0000_0000_0000_0001L,
+        /*   -1 */ 0x5000_0000_0000_0000L, 0x0000_0000_0000_0001L,
+        /*    0 */ 0x4000_0000_0000_0000L, 0x0000_0000_0000_0001L,
+        /*    1 */ 0x6666_6666_6666_6666L, 0x3333_3333_3333_3334L,
+        /*    2 */ 0x51EB_851E_B851_EB85L, 0x0F5C_28F5_C28F_5C29L,
+        /*    3 */ 0x4189_374B_C6A7_EF9DL, 0x5916_872B_020C_49BBL,
+        /*    4 */ 0x68DB_8BAC_710C_B295L, 0x74F0_D844_D013_A92BL,
+        /*    5 */ 0x53E2_D623_8DA3_C211L, 0x43F3_E037_0CDC_8755L,
+        /*    6 */ 0x431B_DE82_D7B6_34DAL, 0x698F_E692_70B0_6C44L,
+        /*    7 */ 0x6B5F_CA6A_F2BD_215EL, 0x0F4C_A41D_811A_46D4L,
+        /*    8 */ 0x55E6_3B88_C230_E77EL, 0x3F70_834A_CDAE_9F10L,
+        /*    9 */ 0x44B8_2FA0_9B5A_52CBL, 0x4C5A_02A2_3E25_4C0DL,
+        /*   10 */ 0x6DF3_7F67_5EF6_EADFL, 0x2D5C_D103_96A2_1347L,
+        /*   11 */ 0x57F5_FF85_E592_557FL, 0x3DE3_DA69_454E_75D3L,
+        /*   12 */ 0x465E_6604_B7A8_4465L, 0x7E4F_E1ED_D10B_9175L,
+        /*   13 */ 0x7097_09A1_25DA_0709L, 0x4A19_697C_81AC_1BEFL,
+        /*   14 */ 0x5A12_6E1A_84AE_6C07L, 0x54E1_2130_67BC_E326L,
+        /*   15 */ 0x480E_BE7B_9D58_566CL, 0x43E7_4DC0_52FD_8285L,
+        /*   16 */ 0x734A_CA5F_6226_F0ADL, 0x530B_AF9A_1E62_6A6DL,
+        /*   17 */ 0x5C3B_D519_1B52_5A24L, 0x426F_BFAE_7EB5_21F1L,
+        /*   18 */ 0x49C9_7747_490E_AE83L, 0x4EBF_CC8B_9890_E7F4L,
+        /*   19 */ 0x760F_253E_DB4A_B0D2L, 0x4ACC_7A78_F41B_0CBAL,
+        /*   20 */ 0x5E72_8432_4908_8D75L, 0x223D_2EC7_29AF_3D62L,
+        /*   21 */ 0x4B8E_D028_3A6D_3DF7L, 0x34FD_BF05_BAF2_9781L,
+        /*   22 */ 0x78E4_8040_5D7B_9658L, 0x54C9_31A2_C4B7_58CFL,
+        /*   23 */ 0x60B6_CD00_4AC9_4513L, 0x5D6D_C14F_03C5_E0A5L,
+        /*   24 */ 0x4D5F_0A66_A23A_9DA9L, 0x3124_9AA5_9C9E_4D51L,
+        /*   25 */ 0x7BCB_43D7_69F7_62A8L, 0x4EA0_F76F_60FD_4882L,
+        /*   26 */ 0x6309_0312_BB2C_4EEDL, 0x254D_92BF_80CA_A068L,
+        /*   27 */ 0x4F3A_68DB_C8F0_3F24L, 0x1DD7_A899_33D5_4D20L,
+        /*   28 */ 0x7EC3_DAF9_4180_6506L, 0x62F2_A75B_8622_1500L,
+        /*   29 */ 0x6569_7BFA_9ACD_1D9FL, 0x025B_B916_04E8_10CDL,
+        /*   30 */ 0x5121_2FFB_AF0A_7E18L, 0x6849_60DE_6A53_40A4L,
+        /*   31 */ 0x40E7_5996_25A1_FE7AL, 0x203A_B3E5_21DC_33B6L,
+        /*   32 */ 0x67D8_8F56_A29C_CA5DL, 0x19F7_863B_6960_52BDL,
+        /*   33 */ 0x5313_A5DE_E87D_6EB0L, 0x7B2C_6B62_BAB3_7564L,
+        /*   34 */ 0x4276_1E4B_ED31_255AL, 0x2F56_BC4E_FBC2_C450L,
+        /*   35 */ 0x6A56_96DF_E1E8_3BC3L, 0x6557_93B1_92D1_3A1AL,
+        /*   36 */ 0x5512_124C_B4B9_C969L, 0x3779_42F4_7574_2E7BL,
+        /*   37 */ 0x440E_750A_2A2E_3ABAL, 0x5F94_3590_5DF6_8B96L,
+        /*   38 */ 0x6CE3_EE76_A9E3_912AL, 0x65B9_EF4D_6324_1289L,
+        /*   39 */ 0x571C_BEC5_54B6_0DBBL, 0x6AFB_25D7_8283_4207L,
+        /*   40 */ 0x45B0_989D_DD5E_7163L, 0x08C8_EB12_CECF_6806L,
+        /*   41 */ 0x6F80_F42F_C897_1BD1L, 0x5ADB_11B7_B14B_D9A3L,
+        /*   42 */ 0x5933_F68C_A078_E30EL, 0x157C_0E2C_8DD6_47B5L,
+        /*   43 */ 0x475C_C53D_4D2D_8271L, 0x5DFC_D823_A4AB_6C91L,
+        /*   44 */ 0x722E_0862_1515_9D82L, 0x632E_269F_6DDF_141BL,
+        /*   45 */ 0x5B58_06B4_DDAA_E468L, 0x4F58_1EE5_F17F_4349L,
+        /*   46 */ 0x4913_3890_B155_8386L, 0x72AC_E584_C132_9C3BL,
+        /*   47 */ 0x74EB_8DB4_4EEF_38D7L, 0x6AAE_3C07_9B84_2D2AL,
+        /*   48 */ 0x5D89_3E29_D8BF_60ACL, 0x5558_3006_1603_5755L,
+        /*   49 */ 0x4AD4_31BB_13CC_4D56L, 0x7779_C004_DE69_12ABL,
+        /*   50 */ 0x77B9_E92B_52E0_7BBEL, 0x258F_99A1_63DB_5111L,
+        /*   51 */ 0x5FC7_EDBC_424D_2FCBL, 0x37A6_1481_1CAF_740DL,
+        /*   52 */ 0x4C9F_F163_683D_BFD5L, 0x7951_AA00_E3BF_900BL,
+        /*   53 */ 0x7A99_8238_A6C9_32EFL, 0x754F_7667_D2CC_19ABL,
+        /*   54 */ 0x6214_682D_523A_8F26L, 0x2AA5_F853_0F09_AE22L,
+        /*   55 */ 0x4E76_B9BD_DB62_0C1EL, 0x5551_9375_A5A1_581BL,
+        /*   56 */ 0x7D8A_C2C9_5F03_4697L, 0x3BB5_B8BC_3C35_59C5L,
+        /*   57 */ 0x646F_023A_B269_0545L, 0x7C91_6096_9691_149EL,
+        /*   58 */ 0x5058_CE95_5B87_376BL, 0x16DA_B3AB_ABA7_43B2L,
+        /*   59 */ 0x4047_0BAA_AF9F_5F88L, 0x78AE_F622_EFB9_02F5L,
+        /*   60 */ 0x66D8_12AA_B298_98DBL, 0x0DE4_BD04_B2C1_9E54L,
+        /*   61 */ 0x5246_7555_5BAD_4715L, 0x57EA_30D0_8F01_4B76L,
+        /*   62 */ 0x41D1_F777_7C8A_9F44L, 0x4654_F3DA_0C01_092CL,
+        /*   63 */ 0x694F_F258_C744_3207L, 0x23BB_1FC3_4668_0EACL,
+        /*   64 */ 0x543F_F513_D29C_F4D2L, 0x4FC8_E635_D1EC_D88AL,
+        /*   65 */ 0x4366_5DA9_754A_5D75L, 0x263A_51C4_A7F0_AD3BL,
+        /*   66 */ 0x6BD6_FC42_5543_C8BBL, 0x56C3_B607_731A_AEC4L,
+        /*   67 */ 0x5645_969B_7769_6D62L, 0x789C_919F_8F48_8BD0L,
+        /*   68 */ 0x4504_787C_5F87_8AB5L, 0x46E3_A7B2_D906_D640L,
+        /*   69 */ 0x6E6D_8D93_CC0C_1122L, 0x3E39_0C51_5B3E_239AL,
+        /*   70 */ 0x5857_A476_3CD6_741BL, 0x4B60_D6A7_7C31_B615L,
+        /*   71 */ 0x46AC_8391_CA45_29AFL, 0x55E7_121F_968E_2B44L,
+        /*   72 */ 0x7114_05B6_106E_A919L, 0x0971_B698_F0E3_786DL,
+        /*   73 */ 0x5A76_6AF8_0D25_5414L, 0x078E_2BAD_8D82_C6BDL,
+        /*   74 */ 0x485E_BBF9_A41D_DCDCL, 0x6C71_BC8A_D79B_D231L,
+        /*   75 */ 0x73CA_C65C_39C9_6161L, 0x2D82_C744_8C2C_8382L,
+        /*   76 */ 0x5CA2_3849_C7D4_4DE7L, 0x3E02_3903_A356_CF9BL,
+        /*   77 */ 0x4A1B_603B_0643_7185L, 0x7E68_2D9C_82AB_D949L,
+        /*   78 */ 0x7692_3391_A39F_1C09L, 0x4A40_48FA_6AAC_8EDBL,
+        /*   79 */ 0x5EDB_5C74_82E5_B007L, 0x5500_3A61_EEF0_7249L,
+        /*   80 */ 0x4BE2_B05D_3584_8CD2L, 0x7733_61E7_F259_F507L,
+        /*   81 */ 0x796A_B3C8_55A0_E151L, 0x3EB8_9CA6_508F_EE71L,
+        /*   82 */ 0x6122_296D_114D_810DL, 0x7EFA_16EB_73A6_585BL,
+        /*   83 */ 0x4DB4_EDF0_DAA4_673EL, 0x3261_ABEF_8FB8_46AFL,
+        /*   84 */ 0x7C54_AFE7_C43A_3ECAL, 0x1D69_1318_E5F3_A44BL,
+        /*   85 */ 0x6376_F31F_D02E_98A1L, 0x6454_0F47_1E5C_836FL,
+        /*   86 */ 0x4F92_5C19_7358_7A1BL, 0x0376_729F_4B7D_35F3L,
+        /*   87 */ 0x7F50_935B_EBC0_C35EL, 0x38BD_8432_1261_EFEBL,
+        /*   88 */ 0x65DA_0F7C_BC9A_35E5L, 0x13CA_D028_0EB4_BFEFL,
+        /*   89 */ 0x517B_3F96_FD48_2B1DL, 0x5CA2_4020_0BC3_CCBFL,
+        /*   90 */ 0x412F_6612_6439_BC17L, 0x63B5_0019_A303_0A33L,
+        /*   91 */ 0x684B_D683_D38F_9359L, 0x1F88_0029_04D1_A9EAL,
+        /*   92 */ 0x536F_DECF_DC72_DC47L, 0x32D3_3354_03DA_EE55L,
+        /*   93 */ 0x42BF_E573_16C2_49D2L, 0x5BDC_2910_0315_8B77L,
+        /*   94 */ 0x6ACC_A251_BE03_A951L, 0x12F9_DB4C_D1BC_1258L,
+        /*   95 */ 0x5570_81DA_FE69_5440L, 0x7594_AF70_A7C9_A847L,
+        /*   96 */ 0x445A_017B_FEBA_A9CDL, 0x4476_F2C0_863A_ED06L,
+        /*   97 */ 0x6D5C_CF2C_CAC4_42E2L, 0x3A57_EACD_A391_7B3CL,
+        /*   98 */ 0x577D_728A_3BD0_3581L, 0x7B79_88A4_82DA_C8FDL,
+        /*   99 */ 0x45FD_F53B_630C_F79BL, 0x15FA_D3B6_CF15_6D97L,
+        /*  100 */ 0x6FFC_BB92_3814_BF5EL, 0x565E_1F8A_E4EF_15BEL,
+        /*  101 */ 0x5996_FC74_F9AA_32B2L, 0x11E4_E608_B725_AAFFL,
+        /*  102 */ 0x47AB_FD2A_6154_F55BL, 0x27EA_51A0_9284_88CCL,
+        /*  103 */ 0x72AC_C843_CEEE_555EL, 0x7310_829A_8407_4146L,
+        /*  104 */ 0x5BBD_6D03_0BF1_DDE5L, 0x4273_9BAE_D005_CDD2L,
+        /*  105 */ 0x4964_5735_A327_E4B7L, 0x4EC2_E2F2_4004_A4A8L,
+        /*  106 */ 0x756D_5855_D1D9_6DF2L, 0x4AD1_6B1D_333A_A10CL,
+        /*  107 */ 0x5DF1_1377_DB14_57F5L, 0x2241_227D_C295_4DA3L,
+        /*  108 */ 0x4B27_42C6_48DD_132AL, 0x4E9A_81FE_3544_3E1CL,
+        /*  109 */ 0x783E_D13D_4161_B844L, 0x175D_9CC9_EED3_9694L,
+        /*  110 */ 0x6032_40FD_CDE7_C69CL, 0x7917_B0A1_8BDC_7876L,
+        /*  111 */ 0x4CF5_00CB_0B1F_D217L, 0x1412_F3B4_6FE3_9392L,
+        /*  112 */ 0x7B21_9ADE_7832_E9BEL, 0x5351_85ED_7FD2_85B6L,
+        /*  113 */ 0x6281_48B1_F9C2_5498L, 0x42A7_9E57_9975_37C5L,
+        /*  114 */ 0x4ECD_D3C1_949B_76E0L, 0x3552_E512_E12A_9304L,
+        /*  115 */ 0x7E16_1F9C_20F8_BE33L, 0x6EEB_081E_3510_EB39L,
+        /*  116 */ 0x64DE_7FB0_1A60_9829L, 0x3F22_6CE4_F740_BC2EL,
+        /*  117 */ 0x50B1_FFC0_151A_1354L, 0x3281_F0B7_2C33_C9BEL,
+        /*  118 */ 0x408E_6633_4414_DC43L, 0x4201_8D5F_568F_D498L,
+        /*  119 */ 0x674A_3D1E_D354_939FL, 0x1CCF_4898_8A7F_BA8DL,
+        /*  120 */ 0x52A1_CA7F_0F76_DC7FL, 0x30A5_D3AD_3B99_620BL,
+        /*  121 */ 0x421B_0865_A5F8_B065L, 0x73B7_DC8A_9614_4E6FL,
+        /*  122 */ 0x69C4_DA3C_3CC1_1A3CL, 0x52BF_C744_2353_B0B1L,
+        /*  123 */ 0x549D_7B63_63CD_AE96L, 0x7566_3903_4F76_26F4L,
+        /*  124 */ 0x43B1_2F82_B63E_2545L, 0x4451_C735_D92B_525DL,
+        /*  125 */ 0x6C4E_B26A_BD30_3BA2L, 0x3A1C_71EF_C1DE_EA2EL,
+        /*  126 */ 0x56A5_5B88_9759_C94EL, 0x61B0_5B26_34B2_54F2L,
+        /*  127 */ 0x4551_1606_DF7B_0772L, 0x1AF3_7C1E_908E_AA5BL,
+        /*  128 */ 0x6EE8_233E_325E_7250L, 0x2B1F_2CFD_B417_76F8L,
+        /*  129 */ 0x58B9_B5CB_5B7E_C1D9L, 0x6F4C_23FE_29AC_5F2DL,
+        /*  130 */ 0x46FA_F7D5_E2CB_CE47L, 0x72A3_4FFE_87BD_18F1L,
+        /*  131 */ 0x7191_8C89_6ADF_B073L, 0x0438_7FFD_A5FB_5B1BL,
+        /*  132 */ 0x5ADA_D6D4_557F_C05CL, 0x0360_6664_84C9_15AFL,
+        /*  133 */ 0x48AF_1243_7799_66B0L, 0x02B3_851D_3707_448CL,
+        /*  134 */ 0x744B_506B_F28F_0AB3L, 0x1DEC_082E_BE72_0746L,
+        /*  135 */ 0x5D09_0D23_2872_6EF5L, 0x64BC_D358_985B_3905L,
+        /*  136 */ 0x4A6D_A41C_205B_8BF7L, 0x6A30_A913_AD15_C738L,
+        /*  137 */ 0x7715_D360_33C5_ACBFL, 0x5D1A_A81F_7B56_0B8CL,
+        /*  138 */ 0x5F44_A919_C304_8A32L, 0x7DAE_ECE5_FC44_D609L,
+        /*  139 */ 0x4C36_EDAE_359D_3B5BL, 0x7E25_8A51_969D_7808L,
+        /*  140 */ 0x79F1_7C49_EF61_F893L, 0x16A2_76E8_F0FB_F33FL,
+        /*  141 */ 0x618D_FD07_F2B4_C6DCL, 0x121B_9253_F3FC_C299L,
+        /*  142 */ 0x4E0B_30D3_2890_9F16L, 0x41AF_A843_2997_0214L,
+        /*  143 */ 0x7CDE_B485_0DB4_31BDL, 0x4F7F_739E_A8F1_9CEDL,
+        /*  144 */ 0x63E5_5D37_3E29_C164L, 0x3F99_294B_BA5A_E3F1L,
+        /*  145 */ 0x4FEA_B0F8_FE87_CDE9L, 0x7FAD_BAA2_FB7B_E98DL,
+        /*  146 */ 0x7FDD_E7F4_CA72_E30FL, 0x7F7C_5DD1_925F_DC15L,
+        /*  147 */ 0x664B_1FF7_085B_E8D9L, 0x4C63_7E41_41E6_49ABL,
+        /*  148 */ 0x51D5_B32C_06AF_ED7AL, 0x704F_9834_34B8_3AEFL,
+        /*  149 */ 0x4177_C289_9EF3_2462L, 0x26A6_135C_F6F9_C8BFL,
+        /*  150 */ 0x68BF_9DA8_FE51_D3D0L, 0x3DD6_8561_8B29_4132L,
+        /*  151 */ 0x53CC_7E20_CB74_A973L, 0x4B12_044E_08ED_CDC2L,
+        /*  152 */ 0x4309_FE80_A2C3_BAC2L, 0x6F41_9D0B_3A57_D7CEL,
+        /*  153 */ 0x6B43_30CD_D139_2AD1L, 0x3202_94DE_C3BF_BFB0L,
+        /*  154 */ 0x55CF_5A3E_40FA_88A7L, 0x419B_AA4B_CFCC_995AL,
+        /*  155 */ 0x44A5_E1CB_672E_D3B9L, 0x1AE2_EEA3_0CA3_ADE1L,
+        /*  156 */ 0x6DD6_3612_3EB1_52C1L, 0x77D1_7DD1_ADD2_AFCFL,
+        /*  157 */ 0x57DE_91A8_3227_7567L, 0x7974_64A7_BE42_263FL,
+        /*  158 */ 0x464B_A7B9_C1B9_2AB9L, 0x4790_5086_31CE_84FFL,
+        /*  159 */ 0x7079_0C5C_6928_445CL, 0x0C1A_1A70_4FB0_D4CCL,
+        /*  160 */ 0x59FA_7049_EDB9_D049L, 0x567B_4859_D95A_43D6L,
+        /*  161 */ 0x47FB_8D07_F161_736EL, 0x11FC_39E1_7AAE_9CABL,
+        /*  162 */ 0x732C_14D9_8235_857DL, 0x032D_2968_C44A_9445L,
+        /*  163 */ 0x5C23_43E1_34F7_9DFDL, 0x4F57_5453_D03B_A9D1L,
+        /*  164 */ 0x49B5_CFE7_5D92_E4CAL, 0x72AC_4376_402F_BB0EL,
+        /*  165 */ 0x75EF_B30B_C8EB_07ABL, 0x0446_D256_CD19_2B49L,
+        /*  166 */ 0x5E59_5C09_6D88_D2EFL, 0x1D05_7512_3DAD_BC3AL,
+        /*  167 */ 0x4B7A_B007_8AD3_DBF2L, 0x4A6A_C40E_97BE_302FL,
+        /*  168 */ 0x78C4_4CD8_DE1F_C650L, 0x7711_39B0_F2C9_E6B1L,
+        /*  169 */ 0x609D_0A47_1819_6B73L, 0x78DA_948D_8F07_EBC1L,
+        /*  170 */ 0x4D4A_6E9F_467A_BC5CL, 0x60AE_DD3E_0C06_5634L,
+        /*  171 */ 0x7BAA_4A98_70C4_6094L, 0x344A_FB96_79A3_BD20L,
+        /*  172 */ 0x62EE_A213_8D69_E6DDL, 0x103B_FC78_614F_CA80L,
+        /*  173 */ 0x4F25_4E76_0ABB_1F17L, 0x2696_6393_810C_A200L,
+        /*  174 */ 0x7EA2_1723_445E_9825L, 0x2423_D285_9B47_6999L,
+        /*  175 */ 0x654E_78E9_037E_E01DL, 0x69B6_4204_7C39_2148L,
+        /*  176 */ 0x510B_93ED_9C65_8017L, 0x6E2B_6803_9694_1AA0L,
+        /*  177 */ 0x40D6_0FF1_49EA_CCDFL, 0x71BC_5336_1210_154DL,
+        /*  178 */ 0x67BC_E64E_DCAA_E166L, 0x1C60_8523_5019_BBAEL,
+        /*  179 */ 0x52FD_850B_E3BB_E784L, 0x7D1A_041C_4014_9625L,
+        /*  180 */ 0x4264_6A6F_E963_1F9DL, 0x4A7B_367D_0010_781DL,
+        /*  181 */ 0x6A3A_43E6_4238_3295L, 0x5D91_F0C8_001A_59C8L,
+        /*  182 */ 0x54FB_6985_01C6_8EDEL, 0x17A7_F3D3_3348_47D4L,
+        /*  183 */ 0x43FC_546A_67D2_0BE4L, 0x7953_2975_C2A0_3976L,
+        /*  184 */ 0x6CC6_ED77_0C83_463BL, 0x0EEB_7589_3766_C256L,
+        /*  185 */ 0x5705_8AC5_A39C_382FL, 0x2589_2AD4_2C52_3512L,
+        /*  186 */ 0x459E_089E_1C7C_F9BFL, 0x37A0_EF10_2374_F742L,
+        /*  187 */ 0x6F63_40FC_FA61_8F98L, 0x5901_7E80_38BB_2536L,
+        /*  188 */ 0x591C_33FD_951A_D946L, 0x7A67_9866_93C8_EA91L,
+        /*  189 */ 0x4749_C331_4415_7A9FL, 0x151F_AD1E_DCA0_BBA8L,
+        /*  190 */ 0x720F_9EB5_39BB_F765L, 0x0832_AE97_C767_92A5L,
+        /*  191 */ 0x5B3F_B22A_9496_5F84L, 0x068E_F213_05EC_7551L,
+        /*  192 */ 0x48FF_C1BB_AA11_E603L, 0x1ED8_C1A8_D189_F774L,
+        /*  193 */ 0x74CC_692C_434F_D66BL, 0x4AF4_690E_1C0F_F253L,
+        /*  194 */ 0x5D70_5423_690C_AB89L, 0x225D_20D8_1673_2843L,
+        /*  195 */ 0x4AC0_434F_873D_5607L, 0x3517_4D79_AB8F_5369L,
+        /*  196 */ 0x779A_054C_0B95_5672L, 0x21BE_E25C_45B2_1F0EL,
+        /*  197 */ 0x5FAE_6AA3_3C77_785BL, 0x3498_B516_9E28_18D8L,
+        /*  198 */ 0x4C8B_8882_96C5_F9E2L, 0x5D46_F745_4B53_4713L,
+        /*  199 */ 0x7A78_DA6A_8AD6_5C9DL, 0x7BA4_BED5_4552_0B52L,
+        /*  200 */ 0x61FA_4855_3BDE_B07EL, 0x2FB6_FF11_0441_A2A8L,
+        /*  201 */ 0x4E61_D377_6318_8D31L, 0x72F8_CC0D_9D01_4EEDL,
+        /*  202 */ 0x7D69_5258_9E8D_AEB6L, 0x1E5A_E015_C802_17E1L,
+        /*  203 */ 0x6454_41E0_7ED7_BEF8L, 0x1848_B344_A001_ACB4L,
+        /*  204 */ 0x5043_67E6_CBDF_CBF9L, 0x603A_2903_B334_8A2AL,
+        /*  205 */ 0x4035_ECB8_A319_6FFBL, 0x002E_8736_28F6_D4EEL,
+        /*  206 */ 0x66BC_ADF4_3828_B32BL, 0x19E4_0B89_DB24_87E3L,
+        /*  207 */ 0x5230_8B29_C686_F5BCL, 0x14B6_6FA1_7C1D_3983L,
+        /*  208 */ 0x41C0_6F54_9ED2_5E30L, 0x1091_F2E7_967D_C79CL,
+        /*  209 */ 0x6933_E554_3150_96B3L, 0x341C_B7D8_F0C9_3F5FL,
+        /*  210 */ 0x5429_8443_5AA6_DEF5L, 0x767D_5FE0_C0A0_FF80L,
+        /*  211 */ 0x4354_69CF_7BB8_B25EL, 0x2B97_7FE7_0080_CC66L,
+        /*  212 */ 0x6BBA_42E5_92C1_1D63L, 0x5F58_CCA4_CD9A_E0A3L,
+        /*  213 */ 0x562E_9BEA_DBCD_B11CL, 0x4C47_0A1D_7148_B3B6L,
+        /*  214 */ 0x44F2_1655_7CA4_8DB0L, 0x3D05_A1B1_276D_5C92L,
+        /*  215 */ 0x6E50_23BB_FAA0_E2B3L, 0x7B3C_35E8_3F15_60E9L,
+        /*  216 */ 0x5840_1C96_621A_4EF6L, 0x2F63_5E53_65AA_B3EDL,
+        /*  217 */ 0x4699_B078_4E7B_725EL, 0x591C_4B75_EAEE_F658L,
+        /*  218 */ 0x70F5_E726_E3F8_B6FDL, 0x74FA_1256_44B1_8A26L,
+        /*  219 */ 0x5A5E_5285_832D_5F31L, 0x43FB_41DE_9D5A_D4EBL,
+        /*  220 */ 0x484B_7537_9C24_4C27L, 0x4FFC_34B2_177B_DD89L,
+        /*  221 */ 0x73AB_EEBF_603A_1372L, 0x4CC6_BAB6_8BF9_6274L,
+        /*  222 */ 0x5C89_8BCC_4CFB_42C2L, 0x0A38_955E_D661_1B90L,
+        /*  223 */ 0x4A07_A309_D72F_689BL, 0x21C6_DDE5_784D_AFA7L,
+        /*  224 */ 0x7672_9E76_2518_A75EL, 0x693E_2FD5_8D49_190BL,
+        /*  225 */ 0x5EC2_185E_8413_B918L, 0x5431_BFDE_0AA0_E0D5L,
+        /*  226 */ 0x4BCE_79E5_3676_2DADL, 0x29C1_664B_3BB3_E711L,
+        /*  227 */ 0x794A_5CA1_F0BD_15E2L, 0x0F9B_D6DE_C5EC_A4E8L,
+        /*  228 */ 0x6108_4A1B_26FD_AB1BL, 0x2616_457F_04BD_50BAL,
+        /*  229 */ 0x4DA0_3B48_EBFE_227CL, 0x1E78_3798_D097_73C8L,
+        /*  230 */ 0x7C33_920E_4663_6A60L, 0x30C0_58F4_80F2_52D9L,
+        /*  231 */ 0x635C_74D8_384F_884DL, 0x0D66_AD90_6728_4247L,
+        /*  232 */ 0x4F7D_2A46_9372_D370L, 0x711E_F140_5286_9B6CL,
+        /*  233 */ 0x7F2E_AA0A_8584_8581L, 0x34FE_4ECD_50D7_5F14L,
+        /*  234 */ 0x65BE_EE6E_D136_D134L, 0x2A65_0BD7_73DF_7F43L,
+        /*  235 */ 0x5165_8B8B_DA92_40F6L, 0x551D_A312_C319_329CL,
+        /*  236 */ 0x411E_093C_AEDB_672BL, 0x5DB1_4F42_35AD_C217L,
+        /*  237 */ 0x6830_0EC7_7E2B_D845L, 0x7C4E_E536_BC49_368AL,
+        /*  238 */ 0x5359_A56C_64EF_E037L, 0x7D0B_EA92_303A_9208L,
+        /*  239 */ 0x42AE_1DF0_50BF_E693L, 0x173C_BBA8_2695_41A0L,
+        /*  240 */ 0x6AB0_2FE6_E799_70EBL, 0x3EC7_92A6_A422_029AL,
+        /*  241 */ 0x5559_BFEB_EC7A_C0BCL, 0x3239_421E_E9B4_CEE1L,
+        /*  242 */ 0x4447_CCBC_BD2F_0096L, 0x5B61_01B2_5490_A581L,
+        /*  243 */ 0x6D3F_ADFA_C84B_3424L, 0x2BCE_691D_541A_A268L,
+        /*  244 */ 0x5766_24C8_A03C_29B6L, 0x563E_BA7D_DCE2_1B87L,
+        /*  245 */ 0x45EB_50A0_8030_215EL, 0x7832_2ECB_171B_4939L,
+        /*  246 */ 0x6FDE_E767_3380_3564L, 0x59E9_E478_24F8_7527L,
+        /*  247 */ 0x597F_1F85_C2CC_F783L, 0x6187_E9F9_B72D_2A86L,
+        /*  248 */ 0x4798_E604_9BD7_2C69L, 0x346C_BB2E_2C24_2205L,
+        /*  249 */ 0x728E_3CD4_2C8B_7A42L, 0x20AD_F849_E039_D007L,
+        /*  250 */ 0x5BA4_FD76_8A09_2E9BL, 0x33BE_603B_19C7_D99FL,
+        /*  251 */ 0x4950_CAC5_3B3A_8BAFL, 0x42FE_B362_7B06_47B3L,
+        /*  252 */ 0x754E_113B_91F7_45E5L, 0x5197_856A_5E70_72B8L,
+        /*  253 */ 0x5DD8_0DC9_4192_9E51L, 0x27AC_6ABB_7EC0_5BC6L,
+        /*  254 */ 0x4B13_3E3A_9ADB_B1DAL, 0x52F0_5562_CBCD_1638L,
+        /*  255 */ 0x781E_C9F7_5E2C_4FC4L, 0x1E4D_556A_DFAE_89F3L,
+        /*  256 */ 0x6018_A192_B1BD_0C9CL, 0x7EA4_4455_7FBE_D4C3L,
+        /*  257 */ 0x4CE0_8142_27CA_707DL, 0x4BB6_9D11_32FF_109CL,
+        /*  258 */ 0x7B00_CED0_3FAA_4D95L, 0x5F8A_94E8_5198_1A93L,
+        /*  259 */ 0x6267_0BD9_CC88_3E11L, 0x32D5_43ED_0E13_4875L,
+        /*  260 */ 0x4EB8_D647_D6D3_64DAL, 0x5BDD_CFF0_D80F_6D2BL,
+        /*  261 */ 0x7DF4_8A0C_8AEB_D491L, 0x12FC_7FE7_C018_AEABL,
+        /*  262 */ 0x64C3_A1A3_A256_43A7L, 0x28C9_FFEC_99AD_5889L,
+        /*  263 */ 0x509C_814F_B511_CFB9L, 0x0707_FFF0_7AF1_13A1L,
+        /*  264 */ 0x407D_343F_C40E_3FC7L, 0x1F39_998D_2F27_42E7L,
+        /*  265 */ 0x672E_B9FF_A016_CC71L, 0x7EC2_8F48_4B72_04A4L,
+        /*  266 */ 0x528B_C7FF_B345_705BL, 0x189B_A5D3_6F8E_6A1DL,
+        /*  267 */ 0x4209_6CCC_8F6A_C048L, 0x7A16_1E42_BFA5_21B1L,
+        /*  268 */ 0x69A8_AE14_18AA_CD41L, 0x4356_96D1_32A1_CF81L,
+        /*  269 */ 0x5486_F1A9_AD55_7101L, 0x1C45_4574_2881_72CEL,
+        /*  270 */ 0x439F_27BA_F111_2734L, 0x169D_D129_BA01_28A5L,
+        /*  271 */ 0x6C31_D92B_1B4E_A520L, 0x242F_B50F_9001_DAA1L,
+        /*  272 */ 0x568E_4755_AF72_1DB3L, 0x368C_90D9_4001_7BB4L,
+        /*  273 */ 0x453E_9F77_BF8E_7E29L, 0x120A_0D7A_999A_C95DL,
+        /*  274 */ 0x6ECA_98BF_98E3_FD0EL, 0x5010_1590_F5C4_7561L,
+        /*  275 */ 0x58A2_13CC_7A4F_FDA5L, 0x2673_4473_F7D0_5DE8L,
+        /*  276 */ 0x46E8_0FD6_C83F_FE1DL, 0x6B8F_69F6_5FD9_E4B9L,
+        /*  277 */ 0x7173_4C8A_D9FF_FCFCL, 0x45B2_4323_CC8F_D45CL,
+        /*  278 */ 0x5AC2_A3A2_47FF_FD96L, 0x6AF5_0283_0A0C_A9E3L,
+        /*  279 */ 0x489B_B61B_6CCC_CADFL, 0x08C4_0202_6E70_87E9L,
+        /*  280 */ 0x742C_5692_47AE_1164L, 0x746C_D003_E3E7_3FDBL,
+        /*  281 */ 0x5CF0_4541_D2F1_A783L, 0x76BD_7336_4FEC_3315L,
+        /*  282 */ 0x4A59_D101_758E_1F9CL, 0x5EFD_F5C5_0CBC_F5ABL,
+        /*  283 */ 0x76F6_1B35_88E3_65C7L, 0x4B2F_EFA1_ADFB_22ABL,
+        /*  284 */ 0x5F2B_48F7_A0B5_EB06L, 0x08F3_261A_F195_B555L,
+        /*  285 */ 0x4C22_A0C6_1A2B_226BL, 0x20C2_84E2_5ADE_2AABL,
+        /*  286 */ 0x79D1_013C_F6AB_6A45L, 0x1AD0_D49D_5E30_4444L,
+        /*  287 */ 0x6174_00FD_9222_BB6AL, 0x48A7_107D_E4F3_69D0L,
+        /*  288 */ 0x4DF6_6731_41B5_62BBL, 0x53B8_D9FE_50C2_BB0DL,
+        /*  289 */ 0x7CBD_71E8_6922_3792L, 0x52C1_5CCA_1AD1_2B48L,
+        /*  290 */ 0x63CA_C186_BA81_C60EL, 0x7567_7D6E_7BDA_8906L,
+        /*  291 */ 0x4FD5_679E_FB9B_04D8L, 0x5DEC_6458_6315_3A6CL,
+        /*  292 */ 0x7FBB_D8FE_5F5E_6E27L, 0x497A_3A27_04EE_C3DFL,
+    };
+
+}

From 38ebab4cb289975d4476f258b58336d20d853edc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Jul 2025 17:36:51 +0000
Subject: [PATCH 455/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.29.2 to 3.29.4
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/181d5eefc20863364f96762470ba6f862bdef56b...4e828ff8d448a8a6e532957b1811f387a63867e8)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index b128fc6518..999853f67c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/autobuild@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index cf64f5a35b..6e552bb803 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         with:
           sarif_file: results.sarif

From d2b94c96af30fe06fb940773787ff7139caaae0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Aug 2025 22:57:04 +0000
Subject: [PATCH 456/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.29.4 to 3.29.5
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4e828ff8d448a8a6e532957b1811f387a63867e8...51f77329afa6477de8c49fc9c7046c15b9a4e79d)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 999853f67c..a0786ef745 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+        uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+        uses: github/codeql-action/autobuild@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+        uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6e552bb803..16459c9232 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
         with:
           sarif_file: results.sarif

From a2c624ae4282382c3d4cf3d9ffa089a7b542429e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Aug 2025 06:50:15 +0000
Subject: [PATCH 457/490] Bump the github-action-dependencies group across 1
 directory with 6 updates

Bumps the github-action-dependencies group with 6 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [actions/checkout](https://github.com/actions/checkout) | `4.2.2` | `5.0.0` |
| [github/codeql-action](https://github.com/github/codeql-action) | `3.29.7` | `3.29.11` |
| [actions/setup-java](https://github.com/actions/setup-java) | `4.7.1` | `5.0.0` |
| [actions/download-artifact](https://github.com/actions/download-artifact) | `4` | `5` |
| [gradle/actions](https://github.com/gradle/actions) | `4.4.1` | `4.4.2` |
| [codecov/codecov-action](https://github.com/codecov/codecov-action) | `5.4.3` | `5.5.0` |



Updates `actions/checkout` from 4.2.2 to 5.0.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/11bd71901bbe5b1630ceea73d27597364c9af683...08c6903cd8c0fde910a37f88322edcfb5dd907a8)

Updates `github/codeql-action` from 3.29.7 to 3.29.11
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/51f77329afa6477de8c49fc9c7046c15b9a4e79d...3c3833e0f8c1c83d449a7478aa59c036a9165498)

Updates `actions/setup-java` from 4.7.1 to 5.0.0
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v4.7.1...v5)

Updates `actions/download-artifact` from 4 to 5
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v4...v5)

Updates `gradle/actions` from 4.4.1 to 4.4.2
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/ac638b010cf58a27ee6c972d7336334ccaf61c96...017a9effdb900e5b5b2fddfb590a105619dca3c3)

Updates `codecov/codecov-action` from 5.4.3 to 5.5.0
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/18283e04ce6e62d37312384ff67231eb8fd56d24...fdcc8476540edceab3de004e990f80d881c6cc00)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
- dependency-name: github/codeql-action
  dependency-version: 3.29.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: actions/setup-java
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
- dependency-name: actions/download-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-version: 4.4.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-version: 5.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml            | 10 +++++-----
 .../ion-java-performance-regression-detector.yml | 12 ++++++------
 .github/workflows/ion-test-driver.yml            |  6 +++---
 .github/workflows/main.yml                       | 16 ++++++++--------
 .github/workflows/prepare-release.yml            |  4 ++--
 .github/workflows/publish-release-artifacts.yml  |  6 +++---
 .github/workflows/scorecard.yml                  |  4 ++--
 .../workflows/test-inspect-version-action.yml    |  2 +-
 8 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index a0786ef745..104d179a54 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
           # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
       - name: Setup Java
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.3.0
+        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: 11
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/autobuild@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index fa6866a3bc..8d6a394a29 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -85,27 +85,27 @@ jobs:
 
     steps:
       - name: Set up JDK 17
-        uses: actions/setup-java@v4.7.1
+        uses: actions/setup-java@v5.0.0
         with:
           distribution: 'corretto'
           java-version: 17
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           ref: ${{ github.base_ref }}
           submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
@@ -113,7 +113,7 @@ jobs:
           path: new
 
       - name: Download test Ion Data from artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: generated-test-data
           path: testData
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 1232e7a763..a3cf47a779 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # master
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # master
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -85,7 +85,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # master
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cc1d8be6f3..a180fe9f01 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,20 +17,20 @@ jobs:
     # H/T: https://github.com/Dart-Code/Dart-Code/commit/612732d5879730608baa9622bf7f5e5b7b51ae65
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'amazon-ion/ion-java'
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.3.0
+        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v4.3.0
         with:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+      - uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
@@ -48,16 +48,16 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'amazon-ion/ion-java'
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           submodules: recursive
       - name: Setup Java
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.3.0
+        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v4.3.0
         with:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
+        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3
         with:
           cache-read-only: true
           validate-wrappers: true
@@ -70,7 +70,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index b30eab9761..3a7c891c63 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 85da88de01..fbe4dd0c50 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0
         with:
           submodules: recursive
       - name: Validate project version matches tag
@@ -42,7 +42,7 @@ jobs:
           echo "Project Version: $PROJECT_VERSION"
           echo "Release Tag: $RELEASE_TAG"
           [ "$PROJECT_VERSION" = "$RELEASE_TAG" ] || exit 1
-      - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.3.0
+      - uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v4.3.0
         with:
           distribution: 'corretto'
           java-version: |
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@ac638b010cf58a27ee6c972d7336334ccaf61c96
+      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 16459c9232..8ab49495ae 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.1.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.1.0
         with:
           persist-credentials: false
 
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index e53e2df6df..9a271054d9 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.6.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From ee2c97c53662d13b2fbf56e0f00999020bce88dd Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 3 Sep 2025 16:59:03 -0700
Subject: [PATCH 458/490] Follows best practices for mitigating script
 injection attacks in GitHub Actions workflows.

---
 .github/workflows/ion-test-driver.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index a3cf47a779..ea46407718 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -41,12 +41,17 @@ jobs:
         run: cd ion-java && echo `git rev-parse --short=7 HEAD` && echo "main=`git rev-parse --short=7 HEAD`" >> $GITHUB_ENV
 
       - name: Get current commit sha
-        run: cd ion-java && echo `git rev-parse --short=7 ${{ github.event.pull_request.head.sha }}`
-          && echo "cur=`git rev-parse --short=7 ${{ github.event.pull_request.head.sha }}`" >> $GITHUB_ENV
+        env:
+          PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        run: cd ion-java && echo `git rev-parse --short=7 $PR_HEAD_SHA`
+          && echo "cur=`git rev-parse --short=7 $PR_HEAD_SHA`" >> $GITHUB_ENV
 
       - name: Run ion-test-driver
+        env:
+          PR_HEAD_REPO_URL: ${{ github.event.pull_request.head.repo.html_url }}
+          PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: python3 ion-test-driver/amazon/iontest/ion_test_driver.py -o output
-          -i ion-java,${{ github.event.pull_request.head.repo.html_url }},${{ github.event.pull_request.head.sha }}
+          -i ion-java,$PR_HEAD_REPO_URL,$PR_HEAD_SHA
           --replace ion-java,https://github.com/amazon-ion/ion-java.git,$main
 
       - name: Upload result

From 900a0b1996059eddcea7b8da848cb0f8b231c5b9 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 12 Sep 2025 18:35:19 -0700
Subject: [PATCH 459/490] Updates publishing from Nexus to Central Portal.

---
 build.gradle.kts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index dfaed013bd..5e161c1ff1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -605,9 +605,11 @@ publishing {
 
 nexusPublishing {
     // Documentation for this plugin, see https://github.com/gradle-nexus/publish-plugin/blob/v1.3.0/README.md
+    // Updated for Central Portal migration
     this.repositories {
         sonatype {
-            nexusUrl.set(uri("https://aws.oss.sonatype.org/service/local/"))
+            nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
             // For CI environments, the username and password should be stored in
             // ORG_GRADLE_PROJECT_sonatypeUsername and ORG_GRADLE_PROJECT_sonatypePassword respectively.
             if (!isCI) {

From 1b5c6b1b6356ceb86a9d328b360b91fd439172e3 Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Thu, 12 Dec 2024 11:31:29 -0800
Subject: [PATCH 460/490] Simplify ion-java-cli OutputFormat (#1014)

* Simplify ion-java-cli OutputFormat

* Clarify unreachable statement message

* Private static factories instead of functions
---
 .../com/amazon/tools/cli/OutputFormat.java    | 109 ++++++------------
 1 file changed, 35 insertions(+), 74 deletions(-)

diff --git a/ion-java-cli/src/main/java/com/amazon/tools/cli/OutputFormat.java b/ion-java-cli/src/main/java/com/amazon/tools/cli/OutputFormat.java
index 15a658fcd3..ab1882934c 100644
--- a/ion-java-cli/src/main/java/com/amazon/tools/cli/OutputFormat.java
+++ b/ion-java-cli/src/main/java/com/amazon/tools/cli/OutputFormat.java
@@ -11,78 +11,39 @@
  * Represents the different Ion output formats supported by the command line com.amazon.tools in this package.
  */
 public enum OutputFormat {
-    /**
-     * Nicely spaced, 'prettified' text Ion.
-     */
-    PRETTY {
-        @Override
-        public IonWriter createIonWriter(OutputStream outputStream) {
-            return IonTextWriterBuilder.pretty().build(outputStream);
-        }
-
-        @Override
-        public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
-            return IonTextWriterBuilder.pretty().withImports(imports).build(outputStream);
-        }
-    },
-    /**
-     * Minimally spaced text Ion.
-     */
-    TEXT {
-        @Override
-        public IonWriter createIonWriter(OutputStream outputStream) {
-            return IonTextWriterBuilder.standard().build(outputStream);
-        }
-
-        @Override
-        public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
-            return IonTextWriterBuilder.standard().withImports(imports).build(outputStream);
-        }
-    },
-    /**
-     * Compact, read-optimized binary Ion.
-     */
-    BINARY {
-        @Override
-        public IonWriter createIonWriter(OutputStream outputStream) {
-            return IonBinaryWriterBuilder.standard().build(outputStream);
-        }
-
-        @Override
-        public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
-            return IonBinaryWriterBuilder.standard().withImports(imports).build(outputStream);
-        }
-    },
-    /**
-     * Event Stream
-     */
-    EVENTS {
-        @Override
-        public IonWriter createIonWriter(OutputStream outputStream) {
-            return IonTextWriterBuilder.pretty().build(outputStream);
-        }
-
-        @Override
-        public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
-            return IonTextWriterBuilder.pretty().withImports(imports).build(outputStream);
-        }
-    },
-    /**
-     * None
-     */
-    NONE {
-        @Override
-        public IonWriter createIonWriter(OutputStream outputStream) {
-            NoOpOutputStream out = new NoOpOutputStream();
-            return IonTextWriterBuilder.pretty().build(out);
-        }
-
-        @Override
-        public IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] imports) {
-            return IonTextWriterBuilder.pretty().withImports(imports).build(outputStream);
-        }
-    };
-
-    abstract IonWriter createIonWriter(OutputStream outputStream);
-    abstract IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] symbolTable);
+    /** Nicely spaced, 'prettified' text Ion */ PRETTY,
+    /** Minimally spaced text Ion */            TEXT,
+    /** Compact, read-optimized binary Ion */   BINARY,
+    /** Event Stream */                         EVENTS,
+    /** No output, /dev/null */                 NONE;
+
+    IonWriter createIonWriter(OutputStream outputStream) {
+        return createIonWriter(this, outputStream);
+    }
+
+    IonWriter createIonWriterWithImports(OutputStream outputStream, SymbolTable[] symbolTable) {
+        return createIonWriter(this, outputStream, symbolTable);
+    }
+
+    private static IonWriter createIonWriter(OutputFormat format, OutputStream outputStream) {
+        switch (format) {
+            case TEXT: return IonTextWriterBuilder.standard().build(outputStream);
+            case PRETTY: return IonTextWriterBuilder.pretty().build(outputStream);
+            case EVENTS: return IonTextWriterBuilder.pretty().build(outputStream);
+            case BINARY: return IonBinaryWriterBuilder.standard().build(outputStream);
+            case NONE: return IonTextWriterBuilder.standard().build(new NoOpOutputStream());
+            default: throw new IllegalStateException("Unsupported output format: " + format);
+        }
+    }
+
+    private static IonWriter createIonWriter(OutputFormat format, OutputStream out, SymbolTable... symbols) {
+        switch (format) {
+            case TEXT: return IonTextWriterBuilder.standard().withImports(symbols).build(out);
+            case PRETTY: return IonTextWriterBuilder.pretty().withImports(symbols).build(out);
+            case EVENTS: return IonTextWriterBuilder.pretty().withImports(symbols).build(out);
+            case BINARY: return IonBinaryWriterBuilder.standard().withImports(symbols).build(out);
+            case NONE: return IonTextWriterBuilder.standard().withImports(symbols).build(new NoOpOutputStream());
+            default: throw new IllegalStateException("Unsupported output format: " + format);
+        }
+    }
 }

From 2dba0f258cfd2c1780d55b77174dd1493d27b076 Mon Sep 17 00:00:00 2001
From: Matthew Pope <81593196+popematt@users.noreply.github.com>
Date: Fri, 31 May 2024 14:23:36 -0700
Subject: [PATCH 461/490] Skips IonReaderBinaryLargeStreamTest unless running
 on CI server (#870)

---
 .../impl/IonReaderBinaryLargeStreamTest.java  | 42 +++++++++----------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/test/java/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java b/src/test/java/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java
index 50123ac277..0feeb76db2 100644
--- a/src/test/java/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java
+++ b/src/test/java/com/amazon/ion/impl/IonReaderBinaryLargeStreamTest.java
@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-
 package com.amazon.ion.impl;
 
 import com.amazon.ion.BufferConfiguration;
@@ -13,9 +12,8 @@
 import com.amazon.ion.system.IonBinaryWriterBuilder;
 import com.amazon.ion.system.IonReaderBuilder;
 import com.amazon.ion.util.RepeatInputStream;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -23,12 +21,18 @@
 import java.io.InputStream;
 import java.io.SequenceInputStream;
 import java.math.BigDecimal;
+import java.nio.charset.StandardCharsets;
 
 import static com.amazon.ion.impl._Private_IonConstants.BINARY_VERSION_MARKER_1_0;
-import static junit.framework.TestCase.assertNull;
-import static org.junit.Assert.assertEquals;
-
-// NOTE: these tests each take several seconds to complete.
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+@EnabledIfEnvironmentVariable(
+    // GitHub actions and other CI systems will set CI=true
+    named = "CI", matches = "true",
+    disabledReason = "It regularly takes about 1 minute to run all the tests in this class."
+)
 public class IonReaderBinaryLargeStreamTest {
 
     private byte[] testData(Timestamp timestamp) throws IOException {
@@ -295,11 +299,8 @@ public void skipLargeAnnotatedContainer() throws Exception {
     // when they *do* fail due to limitations of the current implementation, they fail by throwing an IonException
     // and not something unexpected and ugly.
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     private void cleanlyFailsOnLargeScalar(IonReaderBuilder readerBuilder) throws Exception {
-        byte[] data = "foobarbaz".getBytes("UTF-8");
+        byte[] data = "foobarbaz".getBytes(StandardCharsets.UTF_8);
         final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 123; // 123 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
         ByteArrayOutputStream header = new ByteArrayOutputStream();
         header.write(BINARY_VERSION_MARKER_1_0);
@@ -313,12 +314,10 @@ private void cleanlyFailsOnLargeScalar(IonReaderBuilder readerBuilder) throws Ex
         // If support for large scalars is added, the following will be deleted and the rest of the test
         // completed to assert the correctness of the value.
         if (readerBuilder.isIncrementalReadingEnabled()) {
-            thrown.expect(IonException.class);
-            reader.next();
+            assertThrows(IonException.class, reader::next);
         } else {
             assertEquals(IonType.STRING, reader.next());
-            thrown.expect(IonException.class);
-            reader.stringValue();
+            assertThrows(IonException.class, reader::stringValue);
         }
     }
 
@@ -333,7 +332,7 @@ public void cleanlyFailsOnLargeScalarIncremental() throws Exception {
     }
 
     private void cleanlyFailsOnLargeAnnotatedScalar(IonReaderBuilder readerBuilder) throws Exception {
-        byte[] data = "foobarbaz".getBytes("UTF-8");
+        byte[] data = "foobarbaz".getBytes(StandardCharsets.UTF_8);
         final int totalNumberOfBatches = (Integer.MAX_VALUE / data.length) + 9999; // 9999 makes the value exceed Integer.MAX_VALUE by an arbitrary amount.
         final long stringLength = (long) totalNumberOfBatches * data.length;
         ByteArrayOutputStream header = new ByteArrayOutputStream();
@@ -352,12 +351,10 @@ private void cleanlyFailsOnLargeAnnotatedScalar(IonReaderBuilder readerBuilder)
         // If support for large scalars is added, the following will be deleted and the rest of the test
         // completed to assert the correctness of the value.
         if (readerBuilder.isIncrementalReadingEnabled()) {
-            thrown.expect(IonException.class);
-            reader.next();
+            assertThrows(IonException.class, reader::next);
         } else {
             assertEquals(IonType.STRING, reader.next());
-            thrown.expect(IonException.class);
-            reader.stringValue();
+            assertThrows(IonException.class, reader::stringValue);
         }
     }
 
@@ -388,8 +385,7 @@ public void cleanlyFailsOnLargeContainerIncremental() throws Exception {
         );
 
         IonReader reader = newReaderBuilderThatThrowsOnOversizedValues(true).build(inputStream);
-        thrown.expect(IonException.class);
-        reader.next();
+        assertThrows(IonException.class, reader::next);
     }
 
 }

From 1b68d1e227b7c7db6d985c4d9415758f4a33f411 Mon Sep 17 00:00:00 2001
From: Matthew Pope <popematt@amazon.com>
Date: Wed, 24 Sep 2025 19:00:16 -0700
Subject: [PATCH 462/490] Run CI for all pull requests (#663)

---
 .github/workflows/main.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a180fe9f01..3bd8937c63 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -8,7 +8,6 @@ env:
 on:
   push:
   pull_request:
-    branches: [ master ]
 
 jobs:
   build-and-test:

From aba292d31f75973f4b91a6d7482d958dfc954e33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Sep 2025 09:18:06 -0700
Subject: [PATCH 463/490] Bump the github-action-dependencies group with 4
 updates (#1092)

Bumps the github-action-dependencies group with 4 updates: [github/codeql-action](https://github.com/github/codeql-action), [actions/setup-python](https://github.com/actions/setup-python), [gradle/actions](https://github.com/gradle/actions) and [codecov/codecov-action](https://github.com/codecov/codecov-action).


Updates `github/codeql-action` from 3.29.11 to 3.30.3
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/3c3833e0f8c1c83d449a7478aa59c036a9165498...192325c86100d080feab897ff886c34abd4c83a3)

Updates `actions/setup-python` from 5 to 6
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5...v6)

Updates `gradle/actions` from 4.4.2 to 4.4.3
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/017a9effdb900e5b5b2fddfb590a105619dca3c3...ed408507eac070d1f99cc633dbcf757c94c7933a)

Updates `codecov/codecov-action` from 5.5.0 to 5.5.1
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/fdcc8476540edceab3de004e990f80d881c6cc00...5a1091511ad55cbe89839c7260b706298ca349f7)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.30.3
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: actions/setup-python
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-version: 4.4.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: codecov/codecov-action
  dependency-version: 5.5.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml           | 6 +++---
 .github/workflows/ion-test-driver.yml           | 2 +-
 .github/workflows/main.yml                      | 6 +++---
 .github/workflows/publish-release-artifacts.yml | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 104d179a54..27c1510729 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
+        uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
+        uses: github/codeql-action/autobuild@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
+        uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index ea46407718..444038ef6a 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -27,7 +27,7 @@ jobs:
           path: ion-test-driver
 
       - name: Setup Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.11'
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3bd8937c63..e6bac7aa3c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,11 +25,11 @@ jobs:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3
+        uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a
         with:
           validate-wrappers: true
       - run: ./gradlew build
-      - uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+      - uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
       - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
@@ -56,7 +56,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3
+        uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index fbe4dd0c50..9a7efc19df 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@017a9effdb900e5b5b2fddfb590a105619dca3c3
+      - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 8ab49495ae..74248d9811 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
+        uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
         with:
           sarif_file: results.sarif

From 50fc92943bdb55ad7ceec99435a42c8c0a555a60 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 16 Sep 2025 12:01:18 -0700
Subject: [PATCH 464/490] Resurrects the stream copy optimization feature that
 was dropped in v1.11.0.

---
 .../IonReaderContinuableTopLevelBinary.java   | 14 +++
 .../OptimizedBinaryWriterSymbolTableTest.java | 92 +++++++++++++++++++
 .../impl/OptimizedBinaryWriterTestCase.java   |  5 +-
 3 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index e46118bc0f..92557cded8 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -17,6 +17,7 @@
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.system.IonReaderBuilder;
 
+import java.io.IOException;
 import java.io.InputStream;
 
 /**
@@ -315,6 +316,14 @@ public void hoist(Span span) {
         }
     }
 
+    private class ByteTransferReaderFacet implements _Private_ByteTransferReader {
+
+        @Override
+        public void transferCurrentValue(_Private_ByteTransferSink writer) throws IOException {
+            writer.writeBytes(buffer, (int) valuePreHeaderIndex, (int) (valueMarker.endIndex - valuePreHeaderIndex));
+        }
+    }
+
     @Override
     public <T> T asFacet(Class<T> facetType) {
         if (facetType == SpanProvider.class) {
@@ -334,6 +343,11 @@ public <T> T asFacet(Class<T> facetType) {
             if (facetType == RawValueSpanProvider.class) {
                 return facetType.cast(new RawValueSpanProviderFacet());
             }
+            if (facetType == _Private_ByteTransferReader.class) {
+                if (!hasAnnotations && !isInStruct()) {
+                    return facetType.cast(new ByteTransferReaderFacet());
+                }
+            }
         }
         return null;
     }
diff --git a/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java b/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
index ec2c379fe3..bc590ca292 100644
--- a/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
+++ b/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterSymbolTableTest.java
@@ -22,6 +22,7 @@
 import static com.amazon.ion.junit.IonAssert.assertIonIteratorEquals;
 
 import com.amazon.ion.IonDatagram;
+import com.amazon.ion.IonReader;
 import com.amazon.ion.IonType;
 import com.amazon.ion.SymbolTable;
 import org.junit.Test;
@@ -318,4 +319,95 @@ public void testOptimizedWriteValue_InterspersedReaderLSTs()
         assertIonEquals(expected, actual);
     }
 
+    @Test
+    public void testWriteValuesInStructWithSetFieldName()
+        throws Exception
+    {
+        // Multiple top-level values
+        byte[] multiValueDataBinary = encode("1 2 3 \"hello\" true");
+        IonReader reader = system().newReader(multiValueDataBinary);
+
+        iw = makeWriter();
+
+        // Start writing a struct
+        iw.stepIn(IonType.STRUCT);
+
+        // Set field name for the struct's first child value
+        iw.setFieldName("values");
+
+        // The following fails on the second nested call to writeValue because no field name is set.
+        // The same field name is not applied to all values provided by the reader.
+        assertThrows(IllegalStateException.class, () -> iw.writeValues(reader));
+    }
+
+    @Test
+    public void testWriteValuesInStructWithoutSetFieldName()
+        throws Exception
+    {
+        // Struct with multiple values
+        byte[] multiValueDataBinary = encode("{foo: 1, bar: 2}");
+        IonReader reader = system().newReader(multiValueDataBinary);
+        reader.next(); // Position the reader on the struct
+
+        iw = makeWriter();
+
+        // Start writing a struct
+        iw.stepIn(IonType.STRUCT);
+        reader.stepIn(); // Enter the reader's struct
+
+        // The field names from the reader's struct should be applied.
+        iw.writeValues(reader);
+
+        // End the struct.
+        iw.stepOut();
+
+        IonDatagram expected = loader().load("{foo: 1, bar: 2}");
+        IonDatagram actual   = loader().load(outputByteArray());
+        assertIonEquals(expected, actual);
+    }
+
+    @Test
+    public void testWriteValuesToTopLevelFromStruct()
+        throws Exception
+    {
+        // Struct with multiple values
+        byte[] multiValueDataBinary = encode("{foo: 1, bar: 2}");
+        IonReader reader = system().newReader(multiValueDataBinary);
+        reader.next(); // Position the reader on the struct
+
+        iw = makeWriter();
+
+        reader.stepIn(); // Enter the reader's struct
+
+        // The field names from the reader's struct should be dropped.
+        iw.writeValues(reader);
+
+        IonDatagram expected = loader().load("1 2");
+        IonDatagram actual   = loader().load(outputByteArray());
+        assertIonEquals(expected, actual);
+    }
+
+
+    @Test
+    public void testWriteValuesWithAnnotationSet()
+        throws Exception
+    {
+        // Multiple top-level annotated values
+        byte[] multiValueDataBinary = encode("b::1 c::2");
+        IonReader reader = system().newReader(multiValueDataBinary);
+        reader.next(); // Position the reader on the struct
+
+        iw = makeWriter();
+
+        // Set an annotation on the writer. This is expected to be clobbered.
+        iw.setTypeAnnotations("a");
+
+        // The annotations from the reader's struct should overwrite any set on the writer.
+        iw.writeValues(reader);
+
+        IonDatagram expected = loader().load("b::1 c::2");
+        IonDatagram actual   = loader().load(outputByteArray());
+        assertIonEquals(expected, actual);
+    }
+
 }
diff --git a/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java b/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
index c96fdbf25b..7ce4716eb5 100644
--- a/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
+++ b/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
@@ -180,10 +180,7 @@ protected void checkWriteValue(boolean expectedTransferInvoked)
 
         // TODO amazon-ion/ion-java/issues/16 - Currently, doesn't copy annotations or field names,
         //      so we always expect no transfer of raw bytes
-        // TODO amazon-ion/ion-java/issues/381 - IonReaderBinaryIncremental currently doesn't support the byte transfer
-        //      facet. Once this is fixed, remove the `asFacet` check below.
-        if (ir.isInStruct() || ir.getTypeAnnotationSymbols().length > 0
-            || ir.asFacet(_Private_ByteTransferReader.class) == null)
+        if (ir.isInStruct() || ir.getTypeAnnotationSymbols().length > 0)
         {
             expectedTransferInvoked = false;
         }

From ea68d2b428264c5380c476896d3a35590b2b0ca3 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Tue, 16 Sep 2025 13:14:31 -0700
Subject: [PATCH 465/490] Don't implement byte transfer as a facet.

---
 .../IonReaderContinuableTopLevelBinary.java   | 18 +++----
 .../ion/impl/_Private_ByteTransferReader.java |  8 +++-
 .../ion/impl/bin/AbstractIonWriter.java       | 15 +++---
 .../impl/OptimizedBinaryWriterTestCase.java   | 48 ++++---------------
 4 files changed, 28 insertions(+), 61 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index 92557cded8..e2ee3165a3 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -45,7 +45,7 @@
  * stream's values risk exceeding the available memory, then continuable reading must not be used.
  * </p>
  */
-final class IonReaderContinuableTopLevelBinary extends IonReaderContinuableApplicationBinary implements IonReader, _Private_ReaderWriter {
+final class IonReaderContinuableTopLevelBinary extends IonReaderContinuableApplicationBinary implements IonReader, _Private_ReaderWriter, _Private_ByteTransferReader {
 
     // True if continuable reading is disabled.
     private final boolean isNonContinuable;
@@ -316,12 +316,13 @@ public void hoist(Span span) {
         }
     }
 
-    private class ByteTransferReaderFacet implements _Private_ByteTransferReader {
-
-        @Override
-        public void transferCurrentValue(_Private_ByteTransferSink writer) throws IOException {
-            writer.writeBytes(buffer, (int) valuePreHeaderIndex, (int) (valueMarker.endIndex - valuePreHeaderIndex));
+    @Override
+    public boolean transferCurrentValue(_Private_ByteTransferSink writer) throws IOException {
+        if (hasAnnotations || !isByteBacked() || isInStruct()) {
+            return false;
         }
+        writer.writeBytes(buffer, (int) valuePreHeaderIndex, (int) (valueMarker.endIndex - valuePreHeaderIndex));
+        return true;
     }
 
     @Override
@@ -343,11 +344,6 @@ public <T> T asFacet(Class<T> facetType) {
             if (facetType == RawValueSpanProvider.class) {
                 return facetType.cast(new RawValueSpanProviderFacet());
             }
-            if (facetType == _Private_ByteTransferReader.class) {
-                if (!hasAnnotations && !isInStruct()) {
-                    return facetType.cast(new ByteTransferReaderFacet());
-                }
-            }
         }
         return null;
     }
diff --git a/src/main/java/com/amazon/ion/impl/_Private_ByteTransferReader.java b/src/main/java/com/amazon/ion/impl/_Private_ByteTransferReader.java
index b1b9d95d35..df600751f9 100644
--- a/src/main/java/com/amazon/ion/impl/_Private_ByteTransferReader.java
+++ b/src/main/java/com/amazon/ion/impl/_Private_ByteTransferReader.java
@@ -24,6 +24,12 @@
  */
 public interface _Private_ByteTransferReader
 {
-    public void transferCurrentValue(_Private_ByteTransferSink writer)
+    /**
+     * Copies the raw bytes representing the current value, excluding any field name or annotations, if possible.
+     * @param writer the sink for the bytes
+     * @return true if the byte transfer occurred; false if it was not possible.
+     * @throws IOException if thrown by the sink during transfer.
+     */
+    public boolean transferCurrentValue(_Private_ByteTransferSink writer)
         throws IOException;
 }
diff --git a/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java b/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
index f8e1591163..ad0932b492 100644
--- a/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
+++ b/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
@@ -54,18 +54,15 @@ public final void writeValue(final IonReader reader) throws IOException
     {
         final IonType type = reader.getType();
 
-        if (isStreamCopyOptimized())
+        if (isStreamCopyOptimized() && reader instanceof _Private_ByteTransferReader)
         {
-            final _Private_ByteTransferReader transferReader =
-                reader.asFacet(_Private_ByteTransferReader.class);
-
-            if (transferReader != null
-                && (_Private_Utils.isNonSymbolScalar(type)
-                 || symtabExtendsCache.symtabsCompat(getSymbolTable(), reader.getSymbolTable())))
+            if (_Private_Utils.isNonSymbolScalar(type)
+                || symtabExtendsCache.symtabsCompat(getSymbolTable(), reader.getSymbolTable()))
             {
                 // we have something we can pipe over
-                transferReader.transferCurrentValue(this);
-                return;
+                if (((_Private_ByteTransferReader) reader).transferCurrentValue(this)) {
+                    return;
+                }
             }
         }
 
diff --git a/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java b/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
index 7ce4716eb5..faec85e6e1 100644
--- a/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
+++ b/src/test/java/com/amazon/ion/impl/OptimizedBinaryWriterTestCase.java
@@ -46,7 +46,7 @@ public abstract class OptimizedBinaryWriterTestCase
 
     /**
      * Denotes whether the
-     * {@link _Private_ByteTransferReader#transferCurrentValue(IonWriterSystemBinary)}
+     * {@link _Private_ByteTransferReader#transferCurrentValue(_Private_ByteTransferSink)}
      * has been called after an {@link IonWriter#writeValue(IonReader)}.
      */
     private boolean isTransferCurrentValueInvoked = false;
@@ -107,60 +107,28 @@ protected byte[] outputByteArray()
         return bytes;
     }
 
-    private class TransferCurrentValueWatchingReader
-        implements _Private_ByteTransferReader
-    {
-        private final _Private_ByteTransferReader myDelegate;
-
-        TransferCurrentValueWatchingReader(_Private_ByteTransferReader byteTransferReader)
-        {
-            myDelegate = byteTransferReader;
-        }
-
-        public void transferCurrentValue(_Private_ByteTransferSink sink)
-            throws IOException
-        {
-            OptimizedBinaryWriterTestCase.this.isTransferCurrentValueInvoked = true;
-            myDelegate.transferCurrentValue(sink);
-        }
-    }
-
     /**
      * Obtains a dynamic proxy of {@link IonReader} over the passed in byte[],
      * with an invocation handler hook over {@link _Private_ByteTransferReader} facet,
-     * so as to verify whether the transferCurrentValue() method is actually
+     * to verify whether the transferCurrentValue() method is actually
      * being called.
-     *
-     * @see TransferCurrentValueWatchingReader
      */
     protected IonReader makeReaderProxy(byte[] bytes)
     {
         final IonReader reader = system().newReader(bytes);
 
-        InvocationHandler handler = new InvocationHandler()
-        {
-            public Object invoke(Object proxy, Method method, Object[] args)
-                throws Throwable
+        InvocationHandler handler = (proxy, method, args) -> {
+            if (method.getName().equals("transferCurrentValue"))
             {
-                if (method.getName().equals("asFacet") &&
-                    args.length == 1 &&
-                    args[0] == _Private_ByteTransferReader.class)
-                {
-                    _Private_ByteTransferReader transferReader =
-                        (_Private_ByteTransferReader) method.invoke(reader, args);
-
-                    if (transferReader == null)
-                        return null;
-
-                    return new TransferCurrentValueWatchingReader(transferReader);
-                }
-
+                OptimizedBinaryWriterTestCase.this.isTransferCurrentValueInvoked = (boolean) method.invoke(reader, args);
+                return isTransferCurrentValueInvoked;
+            } else {
                 return method.invoke(reader, args);
             }
         };
 
         return (IonReader) newProxyInstance(reader.getClass().getClassLoader(),
-                                            new Class[] { IonReader.class },
+                                            new Class[] { IonReader.class, _Private_ByteTransferReader.class },
                                             handler);
     }
 

From 6d406b19b1dd3c50c63e2a005f9da3ef02faba1c Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Wed, 17 Sep 2025 17:01:03 -0700
Subject: [PATCH 466/490] Improves performance when stream copy optimization is
 enabled by not requiring symbol table copies.

---
 ...IonReaderContinuableApplicationBinary.java | 132 ++++++++++++++++++
 .../IonReaderContinuableTopLevelBinary.java   |   5 +
 .../com/amazon/ion/impl/LocalSymbolTable.java |  16 +++
 .../ion/impl/_Private_ByteTransferReader.java |  10 ++
 .../ion/impl/_Private_LocalSymbolTable.java   |  26 +++-
 .../ion/impl/bin/AbstractIonWriter.java       |  14 +-
 .../ion/impl/bin/IonManagedBinaryWriter.java  |  31 +++-
 7 files changed, 224 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
index 213c300415..332a9efd46 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableApplicationBinary.java
@@ -23,6 +23,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -36,6 +37,7 @@
 import static com.amazon.ion.SystemSymbols.NAME_SID;
 import static com.amazon.ion.SystemSymbols.SYMBOLS_SID;
 import static com.amazon.ion.SystemSymbols.VERSION_SID;
+import static com.amazon.ion.impl._Private_Utils.safeEquals;
 
 /**
  * An IonCursor capable of application-level parsing of binary Ion streams.
@@ -82,6 +84,12 @@ class IonReaderContinuableApplicationBinary extends IonReaderContinuableCoreBina
     // symbol table is encountered in the stream.
     private SymbolTable cachedReadOnlySymbolTable = null;
 
+    // The cached SymbolTable that was determined to be a superset of the reader's current symbol table during a call
+    // to 'isSymbolTableSubsetOf'. This is set to null whenever the reader encounters a new symbol table. Therefore,
+    // when non-null, determining whether the reader's symbol table is a subset of a given table is as simple as
+    // checking whether that table is the same as 'lastSupersetSymbolTable'.
+    private SymbolTable lastSupersetSymbolTable = null;
+
     // The reusable annotation iterator.
     private final AnnotationSequenceIterator annotationIterator = new AnnotationSequenceIterator();
 
@@ -206,6 +214,110 @@ private SymbolTable getSystemSymbolTable() {
         return SharedSymbolTable.getSystemSymbolTable(getIonMajorVersion());
     }
 
+    boolean compareSymbolTableImportsArrayToList(SymbolTable[] arr, int arrayLength, List<SymbolTable> list) {
+        // Note: the array variant must begin with a system symbol table, while the list variant must not.
+        if (arrayLength - 1 != list.size()) {
+            return false;
+        }
+        for (int i = 1; i < arrayLength; i++) {
+            // TODO amazon-ion/ion-java/issues/18 Currently, we check imports by their references, which
+            //  is overly strict; imports that have different references but the same symbols should pass the check.
+            //  However, this is a cheaper check and is compatible with how common Catalog implementations handle
+            //  shared tables.
+            if (list.get(i - 1) != arr[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    boolean compareSymbolsArrayToCollection(String[] arr, int arrayLength, Collection<String> collection) {
+        // Precondition: the collection contains at least as many elements as the array.
+        Iterator<String> collectionIterator = collection.iterator();
+        for (int i = 0; i < arrayLength; i++) {
+            if (!safeEquals(arr[i], collectionIterator.next())) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Determines whether the symbol table active at the reader's current position is a subset of another symbol table,
+     * meaning that every symbol in the reader's symbol table is present and has the same symbol ID in the other
+     * table.
+     * @param other another symbol table.
+     * @return true if the reader's symbol table is a subset of the other table; otherwise, false.
+     */
+    boolean isSymbolTableSubsetOf(SymbolTable other)
+    {
+        if (lastSupersetSymbolTable != null) {
+            // lastSupersetSymbolTable is reset when the reader's symbol table changes, so we know the reader's symbol
+            // table is the same as it was when last compared. This is an optimization that avoids the more expensive
+            // comparisons when this method is called repetitively within the same symbol table contexts. This
+            // commonly happens during repetitive calls to IonWriter.writeValue(IonReader), which is used directly
+            // by users and by the looping wrapper IonWriter.writeValues(IonReader).
+            return other == lastSupersetSymbolTable && other.getMaxId() == lastSupersetSymbolTable.getMaxId();
+        }
+
+        int numberOfLocalSymbols = localSymbolMaxOffset + 1;
+        int maxId = imports.getMaxId() + numberOfLocalSymbols;
+
+        // Note: the first imported table is always the system symbol table.
+        boolean isSystemSymbolTable = numberOfLocalSymbols == 0 && imports.getImportedTablesNoCopy().length == 1;
+        boolean otherHasPrivateAttributes = other instanceof _Private_LocalSymbolTable;
+        _Private_LocalSymbolTable otherLocal = otherHasPrivateAttributes ? (_Private_LocalSymbolTable) other : null;
+        if (isSystemSymbolTable) {
+            if (other.isSystemTable() && maxId == other.getMaxId()) {
+                // Both represent the same system table.
+                lastSupersetSymbolTable = other;
+                return true;
+            }
+            // The other symbol table might not literally be the system symbol table, but if it's a local symbol table
+            // with zero local symbols and zero imports, that counts.
+            if (otherHasPrivateAttributes && otherLocal.getNumberOfLocalSymbols() == 0 && otherLocal.getImportedTablesAsList().isEmpty()) {
+                lastSupersetSymbolTable = other;
+                return true;
+            }
+            return false;
+        }
+        if (!otherHasPrivateAttributes) {
+            // The reader's symbol table is not a system symbol table, but the other is. Other cannot be a superset.
+            return false;
+        }
+        if (maxId > otherLocal.getMaxId()) return false;
+
+        // NOTE: the following uses of _Private_LocalSymbolTable utilize knowledge of the implementation used by
+        // the binary writer, which has the only known use case for this method. Specifically, we call the interface
+        // method variants that return lists instead of arrays because we know this matches the binary writer's symbol
+        // table's internal representation and therefore does not require copying. If this method ends up being used
+        // for other symbol table implementations, which is unlikely, we should add logic to choose the most efficient
+        // variant to call for the particular implementation (such as by adding something like a `boolean usesArrays()`
+        // method to the interface).
+
+        SymbolTable[] readerImports = imports.getImportedTablesNoCopy();
+        if (!compareSymbolTableImportsArrayToList(readerImports, readerImports.length, otherLocal.getImportedTablesAsList())) {
+            return false;
+        }
+
+        // Superset extends subset if subset doesn't have any declared symbols.
+        if (numberOfLocalSymbols == 0) {
+            lastSupersetSymbolTable = other;
+            return true;
+        }
+
+        // Superset must have same/more declared (local) symbols than subset.
+        if (numberOfLocalSymbols > otherLocal.getNumberOfLocalSymbols()) return false;
+
+        Collection<String> otherSymbols = otherLocal.getLocalSymbolsNoCopy();
+        if (!compareSymbolsArrayToCollection(symbols, numberOfLocalSymbols, otherSymbols)) {
+            return false;
+        }
+
+        lastSupersetSymbolTable = other;
+        return true;
+    }
+
     /**
      * Read-only snapshot of the local symbol table at the reader's current position.
      */
@@ -431,6 +543,21 @@ public _Private_LocalSymbolTable makeCopy() {
         public SymbolTable[] getImportedTablesNoCopy() {
             return importedTables.getImportedTablesNoCopy();
         }
+
+        @Override
+        public List<SymbolTable> getImportedTablesAsList() {
+            throw new UnsupportedOperationException("Call getImportedTablesNoCopy() instead.");
+        }
+
+        @Override
+        public List<String> getLocalSymbolsNoCopy() {
+            throw new UnsupportedOperationException("If this is needed, add a no-copy variant that returns an array.");
+        }
+
+        @Override
+        public int getNumberOfLocalSymbols() {
+            return idToText.length;
+        }
     }
 
     /**
@@ -442,6 +569,7 @@ private void resetSymbolTable() {
         Arrays.fill(symbols, 0, localSymbolMaxOffset + 1, null);
         localSymbolMaxOffset = -1;
         cachedReadOnlySymbolTable = null;
+        lastSupersetSymbolTable = null;
     }
 
     /**
@@ -474,6 +602,7 @@ protected void restoreSymbolTable(SymbolTable symbolTable) {
             }
             localSymbolMaxOffset = snapshot.maxId - firstLocalSymbolId;
             System.arraycopy(snapshot.idToText, 0, symbols, 0, snapshot.idToText.length);
+            lastSupersetSymbolTable = null;
         } else {
             // Note: this will only happen when `symbolTable` is the system symbol table.
             resetSymbolTable();
@@ -626,6 +755,9 @@ private void finishReadingSymbolTableStruct() {
                 }
                 localSymbolMaxOffset += newSymbols.size();
             }
+            // Note: last superset table is reset even if new symbols were simply appended because there's no
+            // guarantee those symbols are reflected in the superset table.
+            lastSupersetSymbolTable = null;
             state = State.READING_VALUE;
         }
 
diff --git a/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java b/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
index e2ee3165a3..fd17cb1738 100644
--- a/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
+++ b/src/main/java/com/amazon/ion/impl/IonReaderContinuableTopLevelBinary.java
@@ -325,6 +325,11 @@ public boolean transferCurrentValue(_Private_ByteTransferSink writer) throws IOE
         return true;
     }
 
+    @Override
+    public boolean isSymbolTableCompatible(SymbolTable symbolTable) {
+        return isSymbolTableSubsetOf(symbolTable);
+    }
+
     @Override
     public <T> T asFacet(Class<T> facetType) {
         if (facetType == SpanProvider.class) {
diff --git a/src/main/java/com/amazon/ion/impl/LocalSymbolTable.java b/src/main/java/com/amazon/ion/impl/LocalSymbolTable.java
index 713d8998ae..22ac71689a 100644
--- a/src/main/java/com/amazon/ion/impl/LocalSymbolTable.java
+++ b/src/main/java/com/amazon/ion/impl/LocalSymbolTable.java
@@ -38,6 +38,7 @@
 import com.amazon.ion.util.IonTextUtils;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -610,6 +611,21 @@ public SymbolTable[] getImportedTablesNoCopy()
         return myImportsList.getImportedTablesNoCopy();
     }
 
+    @Override
+    public List<SymbolTable> getImportedTablesAsList() {
+        throw new UnsupportedOperationException("Call getImportedTablesNoCopy() instead.");
+    }
+
+    @Override
+    public Collection<String> getLocalSymbolsNoCopy() {
+        throw new UnsupportedOperationException("If this is needed, add a no-copy variant that returns an array.");
+    }
+
+    @Override
+    public int getNumberOfLocalSymbols() {
+        return mySymbolsCount;
+    }
+
     public void writeTo(IonWriter writer) throws IOException
     {
         IonReader reader = new SymbolTableReader(this);
diff --git a/src/main/java/com/amazon/ion/impl/_Private_ByteTransferReader.java b/src/main/java/com/amazon/ion/impl/_Private_ByteTransferReader.java
index df600751f9..62e7dd4841 100644
--- a/src/main/java/com/amazon/ion/impl/_Private_ByteTransferReader.java
+++ b/src/main/java/com/amazon/ion/impl/_Private_ByteTransferReader.java
@@ -16,6 +16,8 @@
 package com.amazon.ion.impl;
 
 import com.amazon.ion.IonReader;
+import com.amazon.ion.SymbolTable;
+
 import java.io.IOException;
 
 /**
@@ -32,4 +34,12 @@ public interface _Private_ByteTransferReader
      */
     public boolean transferCurrentValue(_Private_ByteTransferSink writer)
         throws IOException;
+
+    /**
+     * Determines whether the reader's symbol table is compatible (i.e., a subset of) the given symbol table. When
+     * true, values can be transferred from the reader to the writer verbatim.
+     * @param symbolTable the symbol table active in the writer.
+     * @return true if the reader's symbol table is compatible; otherwise, false.
+     */
+    public boolean isSymbolTableCompatible(SymbolTable symbolTable);
 }
diff --git a/src/main/java/com/amazon/ion/impl/_Private_LocalSymbolTable.java b/src/main/java/com/amazon/ion/impl/_Private_LocalSymbolTable.java
index f900fd0c83..fef4372360 100644
--- a/src/main/java/com/amazon/ion/impl/_Private_LocalSymbolTable.java
+++ b/src/main/java/com/amazon/ion/impl/_Private_LocalSymbolTable.java
@@ -2,7 +2,10 @@
 
 import com.amazon.ion.SymbolTable;
 
-interface _Private_LocalSymbolTable extends SymbolTable {
+import java.util.Collection;
+import java.util.List;
+
+public interface _Private_LocalSymbolTable extends SymbolTable {
 
     /**
      * @return a mutable copy of the symbol table.
@@ -22,4 +25,25 @@ interface _Private_LocalSymbolTable extends SymbolTable {
      * @see SymbolTable#getImportedTables()
      */
     SymbolTable[] getImportedTablesNoCopy();
+
+    /**
+     * Returns the imported symbol tables as a List without making a copy (if possible).
+     * Like {@link #getImportedTables()}, the list does not include the system symbol table.
+     *
+     * @return the imported symbol tables. Does not include the system symbol table.
+     *
+     * @see SymbolTable#getImportedTables()
+     */
+    List<SymbolTable> getImportedTablesAsList();
+
+    /**
+     * Returns a collection containing the local symbols, without making a copy.
+     * @return the local symbols.
+     */
+    Collection<String> getLocalSymbolsNoCopy();
+
+    /**
+     * @return the number of local symbols, which do not include the imported or system symbols.
+     */
+    int getNumberOfLocalSymbols();
 }
diff --git a/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java b/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
index ad0932b492..f8d2b1fe61 100644
--- a/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
+++ b/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
@@ -29,12 +29,11 @@
     }
 
     /** The cache for copy optimization checks--null if not copy optimized. */
-    private final _Private_SymtabExtendsCache symtabExtendsCache;
+    private final boolean isStreamCopyOptimized;
 
     /*package*/ AbstractIonWriter(final WriteValueOptimization optimization)
     {
-        this.symtabExtendsCache = optimization == WriteValueOptimization.COPY_OPTIMIZED
-            ? new _Private_SymtabExtendsCache() : null;
+        this.isStreamCopyOptimized = optimization == WriteValueOptimization.COPY_OPTIMIZED;
     }
 
     public final void writeValue(final IonValue value) throws IOException
@@ -56,11 +55,10 @@ public final void writeValue(final IonReader reader) throws IOException
 
         if (isStreamCopyOptimized() && reader instanceof _Private_ByteTransferReader)
         {
-            if (_Private_Utils.isNonSymbolScalar(type)
-                || symtabExtendsCache.symtabsCompat(getSymbolTable(), reader.getSymbolTable()))
+            _Private_ByteTransferReader byteTransferReader = (_Private_ByteTransferReader) reader;
+            if (_Private_Utils.isNonSymbolScalar(type) || byteTransferReader.isSymbolTableCompatible(getSymbolTable()))
             {
-                // we have something we can pipe over
-                if (((_Private_ByteTransferReader) reader).transferCurrentValue(this)) {
+                if (byteTransferReader.transferCurrentValue(this)) {
                     return;
                 }
             }
@@ -220,7 +218,7 @@ public final void writeTimestampUTC(final Date value) throws IOException
 
     public final boolean isStreamCopyOptimized()
     {
-        return symtabExtendsCache != null;
+        return isStreamCopyOptimized;
     }
 
     @SuppressWarnings("deprecation")
diff --git a/src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java b/src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
index 61f5cbc170..5301aea327 100644
--- a/src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
+++ b/src/main/java/com/amazon/ion/impl/bin/IonManagedBinaryWriter.java
@@ -37,6 +37,7 @@
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.Timestamp;
 import com.amazon.ion.UnknownSymbolException;
+import com.amazon.ion.impl._Private_LocalSymbolTable;
 import com.amazon.ion.impl.bin.IonRawBinaryWriter.StreamCloseMode;
 import com.amazon.ion.impl.bin.IonRawBinaryWriter.StreamFlushMode;
 import java.io.IOException;
@@ -45,6 +46,7 @@
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -548,7 +550,7 @@ public void writeInt(IonManagedBinaryWriter self, BigInteger value) throws IOExc
     private static final SymbolTable[] EMPTY_SYMBOL_TABLE_ARRAY = new SymbolTable[0];
 
     /** View over the internal local symbol table state as a symbol table. */
-    private class LocalSymbolTableView extends AbstractSymbolTable
+    private class LocalSymbolTableView extends AbstractSymbolTable implements _Private_LocalSymbolTable
     {
         public LocalSymbolTableView()
         {
@@ -637,6 +639,33 @@ public void makeReadOnly()
         {
             localsLocked = true;
         }
+
+        @Override
+        public _Private_LocalSymbolTable makeCopy() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public SymbolTable[] getImportedTablesNoCopy() {
+            throw new UnsupportedOperationException("Call getImportedTablesAsList() instead.");
+        }
+
+        @Override
+        public List<SymbolTable> getImportedTablesAsList() {
+            return imports.parents;
+        }
+
+        @Override
+        public Collection<String> getLocalSymbolsNoCopy() {
+            // Note: this is correct because `locals` is a LinkedHashMap, which orders keys in order of insertion.
+            // Therefore, the returned collection will return symbols in symbol ID order.
+            return locals.keySet();
+        }
+
+        @Override
+        public int getNumberOfLocalSymbols() {
+            return locals.size();
+        }
     }
 
     private final IonCatalog                    catalog;

From 12ef2842ceefd0d20b6e7fd098a836339604111a Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Thu, 18 Sep 2025 17:44:16 -0700
Subject: [PATCH 467/490] Shortens AbstractIonWriter.writeValues, allowing the
 JIT to optimize it more efficiently, improving performance by up to 12%.

---
 .../ion/impl/bin/AbstractIonWriter.java       | 144 +++++++++---------
 1 file changed, 75 insertions(+), 69 deletions(-)

diff --git a/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java b/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
index f8d2b1fe61..9b681e7222 100644
--- a/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
+++ b/src/main/java/com/amazon/ion/impl/bin/AbstractIonWriter.java
@@ -122,80 +122,86 @@ public final void writeValueRecursive(final IonReader reader) throws IOException
                 stepOut();
                 continue;
             }
-
-            final SymbolToken fieldName = reader.getFieldNameSymbol();
-            if (fieldName != null && !isFieldNameSet() && isInStruct()) {
-                setFieldNameSymbol(fieldName);
-            }
-            final SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
-            if (annotations.length > 0) {
-                setTypeAnnotationSymbols(annotations);
-            }
+            transferFieldNameAndAnnotations(reader);
             if (reader.isNullValue()) {
                 writeNull(type);
                 continue;
             }
+            writeCurrentValue(type, reader);
+        }
+    }
 
-            switch (type) {
-                case BOOL:
-                    final boolean booleanValue = reader.booleanValue();
-                    writeBool(booleanValue);
-                    break;
-                case INT:
-                    switch (reader.getIntegerSize()) {
-                        case INT:
-                            final int intValue = reader.intValue();
-                            writeInt(intValue);
-                            break;
-                        case LONG:
-                            final long longValue = reader.longValue();
-                            writeInt(longValue);
-                            break;
-                        case BIG_INTEGER:
-                            final BigInteger bigIntegerValue = reader.bigIntegerValue();
-                            writeInt(bigIntegerValue);
-                            break;
-                        default:
-                            throw new IllegalStateException();
-                    }
-                    break;
-                case FLOAT:
-                    final double doubleValue = reader.doubleValue();
-                    writeFloat(doubleValue);
-                    break;
-                case DECIMAL:
-                    final Decimal decimalValue = reader.decimalValue();
-                    writeDecimal(decimalValue);
-                    break;
-                case TIMESTAMP:
-                    final Timestamp timestampValue = reader.timestampValue();
-                    writeTimestamp(timestampValue);
-                    break;
-                case SYMBOL:
-                    final SymbolToken symbolToken = reader.symbolValue();
-                    writeSymbolToken(symbolToken);
-                    break;
-                case STRING:
-                    final String stringValue = reader.stringValue();
-                    writeString(stringValue);
-                    break;
-                case CLOB:
-                    final byte[] clobValue = reader.newBytes();
-                    writeClob(clobValue);
-                    break;
-                case BLOB:
-                    final byte[] blobValue = reader.newBytes();
-                    writeBlob(blobValue);
-                    break;
-                case LIST:
-                case SEXP:
-                case STRUCT:
-                    reader.stepIn();
-                    stepIn(type);
-                    break;
-                default:
-                    throw new IllegalStateException("Unexpected type: " + type);
-            }
+    private void transferFieldNameAndAnnotations(IonReader reader) {
+        final SymbolToken fieldName = reader.getFieldNameSymbol();
+        if (fieldName != null && !isFieldNameSet() && isInStruct()) {
+            setFieldNameSymbol(fieldName);
+        }
+        final SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
+        if (annotations.length > 0) {
+            setTypeAnnotationSymbols(annotations);
+        }
+    }
+
+    private void writeCurrentValue(IonType type, IonReader reader) throws IOException {
+        switch (type) {
+            case BOOL:
+                final boolean booleanValue = reader.booleanValue();
+                writeBool(booleanValue);
+                break;
+            case INT:
+                switch (reader.getIntegerSize()) {
+                    case INT:
+                        final int intValue = reader.intValue();
+                        writeInt(intValue);
+                        break;
+                    case LONG:
+                        final long longValue = reader.longValue();
+                        writeInt(longValue);
+                        break;
+                    case BIG_INTEGER:
+                        final BigInteger bigIntegerValue = reader.bigIntegerValue();
+                        writeInt(bigIntegerValue);
+                        break;
+                    default:
+                        throw new IllegalStateException();
+                }
+                break;
+            case FLOAT:
+                final double doubleValue = reader.doubleValue();
+                writeFloat(doubleValue);
+                break;
+            case DECIMAL:
+                final Decimal decimalValue = reader.decimalValue();
+                writeDecimal(decimalValue);
+                break;
+            case TIMESTAMP:
+                final Timestamp timestampValue = reader.timestampValue();
+                writeTimestamp(timestampValue);
+                break;
+            case SYMBOL:
+                final SymbolToken symbolToken = reader.symbolValue();
+                writeSymbolToken(symbolToken);
+                break;
+            case STRING:
+                final String stringValue = reader.stringValue();
+                writeString(stringValue);
+                break;
+            case CLOB:
+                final byte[] clobValue = reader.newBytes();
+                writeClob(clobValue);
+                break;
+            case BLOB:
+                final byte[] blobValue = reader.newBytes();
+                writeBlob(blobValue);
+                break;
+            case LIST:
+            case SEXP:
+            case STRUCT:
+                reader.stepIn();
+                stepIn(type);
+                break;
+            default:
+                throw new IllegalStateException("Unexpected type: " + type);
         }
     }
 

From 0100402a3c6e88fc6ace1342fbde6afe3db14379 Mon Sep 17 00:00:00 2001
From: Austin Williams <austnwil@amazon.com>
Date: Tue, 30 Sep 2025 17:14:40 -0700
Subject: [PATCH 468/490] Specify that OversizedSymbolTableHandler is required
 for limited buffers (#1098)

* Specify that OversizedSymbolTableHandler is required in addition to OversizedValueHandler if an IonBufferConfiguration has a maximum buffer size set in errors emitted from IonBufferConfiguration.build()
---
 .../java/com/amazon/ion/BufferConfiguration.java    |  2 +-
 .../java/com/amazon/ion/IonBufferConfiguration.java | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/amazon/ion/BufferConfiguration.java b/src/main/java/com/amazon/ion/BufferConfiguration.java
index 69c6f795a8..53bad70974 100644
--- a/src/main/java/com/amazon/ion/BufferConfiguration.java
+++ b/src/main/java/com/amazon/ion/BufferConfiguration.java
@@ -231,7 +231,7 @@ protected BufferConfiguration(Builder<Configuration, ?> builder) {
     /**
      * Requires that the maximum buffer size not be limited.
      */
-    protected void requireMaximumBufferSize() {
+    private void requireMaximumBufferSize() {
         if (maximumBufferSize < _Private_IonConstants.ARRAY_MAXIMUM_SIZE) {
             throw new IllegalArgumentException(
                 "Must specify an OversizedValueHandler when a custom maximum buffer size is specified."
diff --git a/src/main/java/com/amazon/ion/IonBufferConfiguration.java b/src/main/java/com/amazon/ion/IonBufferConfiguration.java
index 12256bcfa8..efcfa49f63 100644
--- a/src/main/java/com/amazon/ion/IonBufferConfiguration.java
+++ b/src/main/java/com/amazon/ion/IonBufferConfiguration.java
@@ -3,6 +3,8 @@
 
 package com.amazon.ion;
 
+import com.amazon.ion.impl._Private_IonConstants;
+
 /**
  * Configures buffers that hold Ion data.
  */
@@ -185,6 +187,17 @@ private IonBufferConfiguration(Builder builder) {
         }
     }
 
+    /**
+     * Requires that the maximum buffer size not be limited.
+     */
+    private void requireMaximumBufferSize() {
+        if (getMaximumBufferSize() < _Private_IonConstants.ARRAY_MAXIMUM_SIZE) {
+            throw new IllegalArgumentException(
+                "Must specify both an OversizedValueHandler and OversizedSymbolTableHandler when a custom maximum buffer size is specified."
+            );
+        }
+    }
+
     /**
      * @return the handler that will be notified when oversized symbol tables are encountered.
      */

From 1991e5b8544fd20c46f4e4ff9c6dec4d6e34e19f Mon Sep 17 00:00:00 2001
From: Austin Williams <austnwil@amazon.com>
Date: Wed, 1 Oct 2025 12:46:40 -0700
Subject: [PATCH 469/490] Update IonReader/IonReaderBuilder docs w/ details on
 obtaining instances (#1099)

---
 src/main/java/com/amazon/ion/IonReader.java   | 38 ++++++++++++++
 .../amazon/ion/system/IonReaderBuilder.java   | 51 +++++++++++++++++++
 2 files changed, 89 insertions(+)

diff --git a/src/main/java/com/amazon/ion/IonReader.java b/src/main/java/com/amazon/ion/IonReader.java
index c29f2625ab..fb572fadc8 100644
--- a/src/main/java/com/amazon/ion/IonReader.java
+++ b/src/main/java/com/amazon/ion/IonReader.java
@@ -63,6 +63,44 @@
  * {@link IonValue} hierarchy.  For example, to get the text of a symbol one
  * would use {@link #stringValue()}, mirroring {@link IonSymbol#stringValue()}.
  *
+ * <h2>Obtaining and Usage</h2>
+ * Instances of {@code IonReader} may be constructed through builders, which
+ * implement {@code IonReaderBuilder}. An {@code IonReaderBuilder} with the
+ * default configuration may be constructed as follows. This builder will
+ * construct {@code IonReader} instances which can read both text and binary
+ * Ion data.
+ * {@snippet :
+ * IonReaderBuilder readerBuilder = IonReaderBuilder.standard();
+ * }
+ * See {@link com.amazon.ion.system.IonReaderBuilder} for more information
+ * on configuring {@code IonReaderBuilder}.
+ * <p>
+ * An {@code IonReader} may be obtained from this builder by calling
+ * {@code build} over the appropriate data source. Below is an example of
+ * a reader being constructed over a string containing Ion text.
+ * {@snippet :
+ * final String helloWorld = "{hello: \"world\"}";
+ * try (final IonReader reader = readerBuilder.build(helloWorld)) {
+ *     reader.next();
+ *     reader.stepIn();
+ *     reader.next();
+ *     System.out.println(reader.getFieldName() + " " + reader.stringValue());  // prints "hello world"
+ * }
+ * }
+ * Below is an example of a reader being constructed over a byte array
+ * containing the same data in Ion binary.
+ * {@snippet :
+ * final byte[] helloWorld = new byte[] { (byte) 0xe0, 0x01, /* ... *​/, 0x6c, 0x64 };
+ * try (final IonReader reader = readerBuilder.build(helloWorld)) {
+ *     reader.next();
+ *     reader.stepIn();
+ *     reader.next();
+ *     System.out.println(reader.getFieldName() + " " + reader.stringValue());  // prints "hello world"
+ * }
+ * }
+ * See {@link com.amazon.ion.system.IonReaderBuilder} to obtain a reader
+ * over other data sources.
+ * 
  * <h2>Exception Handling</h2>
  * {@code IonReader} is a generic interface for traversing Ion data, and it's
  * not possible to fully specify the set of exceptions that could be thrown
diff --git a/src/main/java/com/amazon/ion/system/IonReaderBuilder.java b/src/main/java/com/amazon/ion/system/IonReaderBuilder.java
index 76725c9a78..a3927705ca 100644
--- a/src/main/java/com/amazon/ion/system/IonReaderBuilder.java
+++ b/src/main/java/com/amazon/ion/system/IonReaderBuilder.java
@@ -31,6 +31,57 @@
  * {@link IonReader}s parse incrementally, so syntax errors in the input data
  * will not be detected as side effects of any of the {@code build} methods
  * in this class.
+ * 
+ * <h2>Obtaining and Usage</h2>
+ * An {@code IonReaderBuilder} with the default configuration may be constructed
+ * as follows. This builder will construct {@code IonReader} instances which
+ * can read both text and binary Ion data and is appropriate for simple use
+ * cases or when no IonCatalog is in use.
+ * {@snippet :
+ * IonReaderBuilder readerBuilder = IonReaderBuilder.standard();
+ * }
+ * {@code IonReaderBuilder}s can be configured by chaining calls to {@code with*()}
+ * configuration methods. Below is an example of a builder configured to
+ * incrementally read Ion binary data, use a custom initial buffer size, throw
+ * on inputs that would require a buffer over a specified size, and use a
+ * user-provided IonCatalog.
+ * {@snippet :
+ * // Create an IonCatalog and IonBufferConfiguration to use with IonReaderBuilder
+ * final IonCatalog catalog = new SimpleCatalog();
+ * final IonBufferConfiguration bufferConfiguration = IonBufferConfiguration.Builder.standard()
+ *       .onOversizedSymbolTable(() -> { throw new IllegalStateException("Oversized system table encountered"); })
+ *       .onOversizedValue(() -> { throw new IllegalStateException("Oversized value encountered"); })
+ *       .withInitialBufferSize(1024)
+ *       .withMaximumBufferSize(1024 * 1024)
+ *       .build();
+ *
+ * IonReaderBuilder readerBuilder = IonReaderBuilder.standard()
+ *     .withIncrementalReadingEnabled(true)
+ *     .withBufferConfiguration(bufferConfiguration)
+ *     .withCatalog(catalog);
+ * }
+ * 
+ * <h3>Building a Reader over a Data Source</h3>
+ * An {@code IonReader} may be obtained from a builder by calling {@code build}
+ * over the appropriate data source. Below is an example of a reader being constructed
+ * over a string containing Ion text from a builder with the default configuration.
+ * {@snippet :
+ * IonReaderBuilder readerBuilder = IonReaderBuilder.standard();
+ * final String helloWorld = "{hello: \"world\"}";
+ * try (final IonReader reader = readerBuilder.build(helloWorld)) {
+ *     reader.next();
+ *     reader.stepIn();
+ *     reader.next();
+ *     System.out.println(reader.getFieldName() + " " + reader.stringValue());  // prints "hello world"
+ * }
+ * }
+ * Builders can build an IonReader over a string, {@code byte[]} array,
+ * {@link java.io.InputStream}, {@link java.io.Reader}, or existing {@link com.amazon.ion.IonValue}
+ * data model. Building a reader over a byte array allows specifying the start
+ * index and length of the data to be read. Readers built over {@code byte[]}
+ * arrays or {@code InputStream}s are capable of reading both binary and text
+ * Ion; readers built over strings and {@code Reader} instances are only capable of
+ * reading text Ion.
  */
 @SuppressWarnings("deprecation")
 public abstract class IonReaderBuilder

From 2e7808a76252723dee0f4c8a5ec9fa4d1f11e8e1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Oct 2025 10:49:11 -0700
Subject: [PATCH 470/490] Bump the github-action-dependencies group with 3
 updates (#1103)

Bumps the github-action-dependencies group with 3 updates: [github/codeql-action](https://github.com/github/codeql-action), [gradle/actions](https://github.com/gradle/actions) and [ossf/scorecard-action](https://github.com/ossf/scorecard-action).


Updates `github/codeql-action` from 3.30.3 to 3.30.6
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/192325c86100d080feab897ff886c34abd4c83a3...64d10c13136e1c5bce3e5fbde8d4906eeaafc885)

Updates `gradle/actions` from 4.4.3 to 5.0.0
- [Release notes](https://github.com/gradle/actions/releases)
- [Commits](https://github.com/gradle/actions/compare/ed408507eac070d1f99cc633dbcf757c94c7933a...4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2)

Updates `ossf/scorecard-action` from 2.4.2 to 2.4.3
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/05b42c624433fc40578a4040d5cf5e36ddca8cde...4eaacf0543bb3f2c246792bd56e8cdeffafb205a)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.30.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
- dependency-name: gradle/actions
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
- dependency-name: ossf/scorecard-action
  dependency-version: 2.4.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml           | 6 +++---
 .github/workflows/main.yml                      | 4 ++--
 .github/workflows/publish-release-artifacts.yml | 2 +-
 .github/workflows/scorecard.yml                 | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 27c1510729..fe107e5731 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
+        uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
+        uses: github/codeql-action/autobuild@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
+        uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e6bac7aa3c..2260d73bf8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
         with:
           validate-wrappers: true
       - run: ./gradlew build
@@ -56,7 +56,7 @@ jobs:
           distribution: ${{ env.JAVA_DISTRIBUTION}}
           java-version: ${{ env.JAVA_VERSION}}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a
+        uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
         with:
           cache-read-only: true
           validate-wrappers: true
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 9a7efc19df..7b3c154a2a 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -50,7 +50,7 @@ jobs:
             11
             17
             21
-      - uses: gradle/actions/setup-gradle@ed408507eac070d1f99cc633dbcf757c94c7933a
+      - uses: gradle/actions/setup-gradle@4d9f0ba0025fe599b4ebab900eb7f3a1d93ef4c2
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 74248d9811..bb749db42e 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -37,7 +37,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
+        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
         with:
           sarif_file: results.sarif

From 221d2820712074019e867d04c3cff04edc00719d Mon Sep 17 00:00:00 2001
From: Austin Williams <austnwil@amazon.com>
Date: Wed, 8 Oct 2025 16:01:49 -0700
Subject: [PATCH 471/490] Improve write performance in some cases by managing
 PatchPoints and containers directly in writer (#1101)

* Remove RecyclingStack - manage container stack directly in writer

* Remove RecyclingQueue - manage PatchPoint list directly in writer

* Set version for local testing

* Delete unused data structures and imports

* Code cleanup

* Add code documentation

* Fix version

* Whitespace consistency fixes

* Simplify container push logic

* Delete unused function

* Apply suggestions from code review

Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>

* Comment adjustments

* Remove duplicate function call, unnecessary else

---------

Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
---
 .../ion/impl/_Private_RecyclingQueue.java     | 122 ------------
 .../ion/impl/_Private_RecyclingStack.java     | 174 ------------------
 .../ion/impl/bin/IonRawBinaryWriter.java      | 157 ++++++++++------
 3 files changed, 101 insertions(+), 352 deletions(-)
 delete mode 100644 src/main/java/com/amazon/ion/impl/_Private_RecyclingQueue.java
 delete mode 100644 src/main/java/com/amazon/ion/impl/_Private_RecyclingStack.java

diff --git a/src/main/java/com/amazon/ion/impl/_Private_RecyclingQueue.java b/src/main/java/com/amazon/ion/impl/_Private_RecyclingQueue.java
deleted file mode 100644
index a52ccd7a35..0000000000
--- a/src/main/java/com/amazon/ion/impl/_Private_RecyclingQueue.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package com.amazon.ion.impl;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-/**
- * A queue whose elements are recycled. This queue will be extended and iterated frequently.
- * @param <T> the type of elements stored.
- */
-public class _Private_RecyclingQueue<T> {
-
-    /**
-     * Factory for new queue elements.
-     * @param <T> the type of element.
-     */
-    public interface ElementFactory<T> {
-        /**
-         * @return a new instance.
-         */
-        T newElement();
-    }
-
-    @FunctionalInterface
-    public interface Recycler<T> {
-        /**
-         * Re-initialize an element
-         */
-        void recycle(T t);
-    }
-
-    /**
-     * Iterator for the queue.
-     */
-    private class ElementIterator implements Iterator<T> {
-        int i = 0;
-        @Override
-        public boolean hasNext() {
-            return i <= currentIndex;
-        }
-
-        @Override
-        public T next() {
-            return elements.get(i++);
-        }
-    }
-
-    private final ElementIterator iterator;
-    private final List<T> elements;
-    private final ElementFactory<T> elementFactory;
-    private int currentIndex;
-    private T top;
-
-    /**
-     * @param initialCapacity the initial capacity of the underlying collection.
-     * @param elementFactory the factory used to create a new element on {@link #push()} when the queue has
-     *                       not previously grown to the new depth.
-     */
-    public _Private_RecyclingQueue(int initialCapacity, ElementFactory<T> elementFactory) {
-        elements = new ArrayList<T>(initialCapacity);
-        this.elementFactory = elementFactory;
-        currentIndex = -1;
-        iterator = new ElementIterator();
-    }
-
-    public void truncate(int index) {
-        currentIndex = index;
-    }
-
-    public T get(int index) {
-        return elements.get(index);
-    }
-
-    /**
-     * Pushes an element onto the top of the queue, instantiating a new element only if the queue has not
-     * previously grown to the new depth.
-     * @return the element at the top of the queue after the push. This element must be initialized by the caller.
-     */
-    public int push(Recycler<T> recycler) {
-        currentIndex++;
-        if (currentIndex >= elements.size()) {
-            top = elementFactory.newElement();
-            elements.add(top);
-        }  else {
-            top = elements.get(currentIndex);
-        }
-        recycler.recycle(top);
-        return currentIndex;
-    }
-
-    /**
-     * Reclaim the current element.
-     */
-    public void remove() {
-        currentIndex = Math.max(-1, currentIndex - 1);
-    }
-
-    public Iterator<T> iterate() {
-        iterator.i = 0;
-        return iterator;
-    }
-
-    /**
-     * @return true if the queue is empty; otherwise, false.
-     */
-    public boolean isEmpty() {
-        return currentIndex < 0;
-    }
-
-    /**
-     * Reset the index and make the queue reusable.
-     */
-    public void clear() {
-        currentIndex = -1;
-    }
-
-    /**
-     * @return the number of elements within the queue.
-     */
-    public int size() {
-        return currentIndex + 1;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/amazon/ion/impl/_Private_RecyclingStack.java b/src/main/java/com/amazon/ion/impl/_Private_RecyclingStack.java
deleted file mode 100644
index d88ac040ff..0000000000
--- a/src/main/java/com/amazon/ion/impl/_Private_RecyclingStack.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package com.amazon.ion.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.NoSuchElementException;
-
-/**
- * A stack whose elements are recycled. This can be useful when the stack needs to grow and shrink
- * frequently and has a predictable maximum depth.
- * @param <T> the type of elements stored.
- */
-public final class _Private_RecyclingStack<T> implements Iterable<T> {
-    public  $Iterator stackIterator;
-    @Override
-    public ListIterator<T> iterator() {
-        if (stackIterator != null) {
-            stackIterator.cursor = _Private_RecyclingStack.this.currentIndex;
-        } else {
-            stackIterator = new $Iterator();
-        }
-        return stackIterator;
-    }
-
-    /**
-     * Factory for new stack elements.
-     * @param <T> the type of element.
-     */
-    public interface ElementFactory<T> {
-
-        /**
-         * @return a new instance.
-         */
-        T newElement();
-    }
-
-    @FunctionalInterface
-    public interface Recycler<T> {
-        /**
-         * Re-initialize an element
-         */
-        void recycle(T t);
-    }
-
-    private final List<T> elements;
-    private final ElementFactory<T> elementFactory;
-    private int currentIndex;
-    private T top;
-
-    /**
-     * @param initialCapacity the initial capacity of the underlying collection.
-     * @param elementFactory the factory used to create a new element on {@link #push(Recycler)} when the stack has
-     *                       not previously grown to the new depth.
-     */
-    public _Private_RecyclingStack(int initialCapacity, ElementFactory<T> elementFactory) {
-        elements = new ArrayList<>(initialCapacity);
-        this.elementFactory = elementFactory;
-        currentIndex = -1;
-        top = null;
-    }
-
-    /**
-     * Pushes an element onto the top of the stack, instantiating a new element only if the stack has not
-     * previously grown to the new depth.
-     * @return the element at the top of the stack after the push. This element must be initialized by the caller.
-     */
-    public T push(Recycler<T> recycler) {
-        currentIndex++;
-        if (currentIndex >= elements.size()) {
-            top = elementFactory.newElement();
-            elements.add(top);
-        }  else {
-            top = elements.get(currentIndex);
-        }
-        recycler.recycle(top);
-        return top;
-    }
-
-    /**
-     * @return the element at the top of the stack, or null if the stack is empty.
-     */
-    public T peek() {
-        return top;
-    }
-
-    /**
-     * Pops an element from the stack, retaining a reference to the element so that it can be reused the
-     * next time the stack grows to the element's depth.
-     * @return the element that was at the top of the stack before the pop, or null if the stack was empty.
-     */
-    public T pop() {
-        T popped = top;
-        currentIndex--;
-        if (currentIndex >= 0) {
-            top = elements.get(currentIndex);
-        } else {
-            top = null;
-            currentIndex = -1;
-        }
-        return popped;
-    }
-
-    /**
-     * @return true if the stack is empty; otherwise, false.
-     */
-    public boolean isEmpty() {
-        return top == null;
-    }
-
-    /**
-     * @return the number of elements on the stack.
-     */
-    public int size() {
-        return currentIndex + 1;
-    }
-
-    private class $Iterator implements ListIterator<T> {
-        private int cursor;
-
-        @Override
-        public boolean hasNext() {
-            return cursor >= 0;
-        }
-
-        @Override
-        public T next() {
-            if (!hasNext()) {
-                throw new NoSuchElementException();
-            }
-            // post-decrement because "next" is where the cursor is
-            return _Private_RecyclingStack.this.elements.get(cursor--);
-        }
-
-        @Override
-        public boolean hasPrevious() {
-            return cursor + 1 <= _Private_RecyclingStack.this.currentIndex;
-        }
-
-        @Override
-        public T previous() {
-            if (!hasPrevious()) {
-                throw new NoSuchElementException();
-            }
-            // pre-increment: "next" is where the cursor is, so "previous" is upward in stack
-            return _Private_RecyclingStack.this.elements.get(++cursor);
-        }
-
-        @Override
-        public int nextIndex() {
-            return cursor;
-        }
-
-        @Override
-        public int previousIndex() {
-            return cursor + 1;
-        }
-
-        @Override
-        public void remove() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void set(T t) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void add(T t) {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-}
diff --git a/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index e2073126c0..f75a624d53 100644
--- a/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -33,8 +33,6 @@
 import com.amazon.ion.SymbolTable;
 import com.amazon.ion.SymbolToken;
 import com.amazon.ion.Timestamp;
-import com.amazon.ion.impl._Private_RecyclingQueue;
-import com.amazon.ion.impl._Private_RecyclingStack;
 import com.amazon.ion.impl.bin.utf8.Utf8StringEncoder;
 import com.amazon.ion.impl.bin.utf8.Utf8StringEncoderPool;
 
@@ -42,8 +40,7 @@
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.Iterator;
-import java.util.ListIterator;
+import java.util.ArrayList;
 
 /**
  * Low-level binary {@link IonWriter} that understands encoding concerns but doesn't operate with any sense of symbol table management.
@@ -251,15 +248,45 @@ public ContainerInfo()
             patchIndex = -1;
         }
 
+        /**
+         * Set the data in the patch point assigned to this container.
+         * 
+         * PatchPoint instances in {@link #patchPoints} are reused across the lifecycle of the writer, so
+         * there is a chance that a patch point already exists at {@link #patchIndex} with stale data
+         * that needs to be replaced. However, PatchPoints are not constructed until their first use,
+         * meaning the slot pointed to by {@link #patchIndex} may be null, in which case we have to
+         * create our own. This can occur if a child container ends up needing a patch point and some
+         * of its ancestors are missing patch points; the parents are assigned indices into {@link #patchPoints}
+         * but the patch point object itself was not constructed until now.
+         */
+        private void setPatchPointData(final long oldPosition, final int oldLength, final long length)
+        {
+            final PatchPoint existingPatchPoint = patchPoints.get(patchIndex);
+            if (existingPatchPoint != null) {
+                existingPatchPoint.initialize(oldPosition, oldLength, length);
+            } else {
+                patchPoints.set(patchIndex, new PatchPoint().initialize(oldPosition, oldLength, length));
+            }
+        }
+
         public void appendPatch(final long oldPosition, final int oldLength, final long length)
         {
             if (patchIndex == -1) {
                 // We have no assigned patch point, we need to make our own
-                patchIndex = patchPoints.push(p -> p.initialize(oldPosition, oldLength, length));
-            } else {
-                // We have an assigned patch point already, but we need to overwrite it with the correct data
-                patchPoints.get(patchIndex).initialize(oldPosition, oldLength, length);
+                patchIndex = patchPointsLength++;
+                if (patchIndex >= patchPoints.size()) {
+                    // The patch point ArrayList is not large enough.
+                    // It needs to grow to accomodate this patch point.
+                    patchPoints.ensureCapacity(patchPointsLength);
+                    for (int i = patchPoints.size(); i < patchPointsLength; i++) {
+                        patchPoints.add(null);
+                    }
+                }
             }
+
+            // A stale reusable patch point instance may be waiting for us here that we need to overwrite with 
+            // the correct data, or this may be a null slot. If we just extended the ArrayList, then it is definitely null.
+            setPatchPointData(oldPosition, oldLength, length);
         }
 
         public ContainerInfo initialize(final ContainerType type, final long offset) {
@@ -305,10 +332,6 @@ public PatchPoint initialize(final long oldPosition, final int oldLength, final
             this.length = length;
             return this;
         }
-
-        public PatchPoint clear() {
-            return initialize(-1, -1, -1);
-        }
     }
 
     /*package*/ enum StreamCloseMode
@@ -332,8 +355,16 @@ public PatchPoint clear() {
     private final PreallocationMode             preallocationMode;
     private final boolean                       isFloatBinary32Enabled;
     private final WriteBuffer                   buffer;
-    private final _Private_RecyclingQueue<PatchPoint> patchPoints;
-    private final _Private_RecyclingStack<ContainerInfo> containers;
+    private final ArrayList<PatchPoint>         patchPoints;
+    /** The length of the patch point queue. Some elements in the queue may be null or not yet have the correct data. */
+    private int                                 patchPointsLength;
+    private final ArrayList<ContainerInfo>      containers;
+    /**
+     * The index in {@link #containers} of the element at the top of the stack, or -1 if the stack is empty.
+     * Always one less than the length of the stack itself. */
+    private int                                 containerIndex;
+    /** The container at the top of the container stack, or null if the container stack is empty */
+    private ContainerInfo                       topContainer;
     private int                                 depth;
     private boolean                             hasWrittenValuesSinceFinished;
     private boolean                             hasWrittenValuesSinceConstructed;
@@ -380,15 +411,17 @@ interface ThrowingRunnable {
         this.preallocationMode = preallocationMode;
         this.isFloatBinary32Enabled = isFloatBinary32Enabled;
         this.buffer            = new WriteBuffer(allocator, this::endOfBlockSizeReached);
-        this.patchPoints       = new _Private_RecyclingQueue<>(512, PatchPoint::new);
-        this.containers        = new _Private_RecyclingStack<ContainerInfo>(
-            10,
-            new _Private_RecyclingStack.ElementFactory<ContainerInfo>() {
-                public ContainerInfo newElement() {
-                    return new ContainerInfo();
-                }
-            }
-        );
+        // Patch point list initial capacity of 512 is fairly arbitrary and subject to tuning.
+        // When patch points are required, they are often required in bulk, since all ancestors of
+        // containers with large content require one.
+        // Some tuning has shown performance impacts - see https://github.com/amazon-ion/ion-java/issues/1095
+        this.patchPoints       = new ArrayList<>(512);
+        this.patchPointsLength = 0;
+        // Container stack initial capacity of 10 is fairly arbitrary. A max depth of
+        // 10 containers seems reasonable for common data. Subject to tuning.
+        this.containers        = new ArrayList<>(10);
+        this.containerIndex    = -1;
+        this.topContainer      = null;
         this.depth                            = 0;
         this.hasWrittenValuesSinceFinished    = false;
         this.hasWrittenValuesSinceConstructed = false;
@@ -545,35 +578,49 @@ public int getDepth()
 
     private void updateLength(long length)
     {
-        if (containers.isEmpty())
+        if (containerIndex < 0)
         {
             return;
         }
 
-        containers.peek().length += length;
+        topContainer.length += length;
     }
 
     private void pushContainer(final ContainerType type)
     {
         // XXX we push before writing the type of container
-        containers.push(c -> c.initialize(type, buffer.position() + 1));
+        containerIndex++;
+        if (containerIndex < containers.size()) {
+            // The container stack array is large enough, the index of this container is in bounds.
+            // A stale reusable container instance is waiting for us here to recycle.
+            // Note: the element at this container cannot be null. The only way for the container stack
+            // to grow is to push a container, and this always happens in order. Unlike patch points, we
+            // will never push a container at an index without its ancestors already being in the stack.
+            final ContainerInfo existingElement = containers.get(containerIndex);
+            existingElement.initialize(type, buffer.position() + 1);
+            topContainer = existingElement;
+        } else {
+            // The container stack is not large enough. It needs to grow to accomodate this container.
+            topContainer = new ContainerInfo().initialize(type, buffer.position() + 1);
+            containers.add(topContainer);
+        }
     }
 
     private void addPatchPoint(final ContainerInfo container, final long position, final int oldLength, final long value)
     {
         // If we're adding a patch point we first need to ensure that all of our ancestors (containing values) already
         // have a patch point. No container can be smaller than the contents, so all outer layers also require patches.
-        // Instead of allocating iterator, we share one iterator instance within the scope of the container stack and reset the cursor every time we track back to the ancestors.
-        ListIterator<ContainerInfo> stackIterator = containers.iterator();
-        // Walk down the stack until we find an ancestor which already has a patch point
-        while (stackIterator.hasNext() && stackIterator.next().patchIndex == -1);
-
-        // The iterator cursor is now positioned on an ancestor container that has a patch point
-        // Ascend back up the stack, fixing the ancestors which need a patch point assigned before us
-        while (stackIterator.hasPrevious()) {
-            ContainerInfo ancestor = stackIterator.previous();
-            if (ancestor.patchIndex == -1) {
-                ancestor.patchIndex = patchPoints.push(PatchPoint::clear);
+        if (containerIndex >= 0) {
+            int index;
+            // Walk down the stack until we find an ancestor which already has a patch point
+            for (index = containerIndex; index >= 0; index--) {
+                if (containers.get(index).patchIndex != -1) {
+                    break;
+                }
+            }
+            // index is now positioned on an ancestor container that has a patch point
+            for (int i = index + 1; i <= containerIndex; i++) {
+                containers.get(i).patchIndex = patchPointsLength++;
             }
         }
 
@@ -585,7 +632,9 @@ private void addPatchPoint(final ContainerInfo container, final long position, f
 
     private ContainerInfo popContainer()
     {
-        final ContainerInfo currentContainer = containers.pop();
+        final ContainerInfo currentContainer = topContainer;
+        containerIndex--;
+        topContainer = containerIndex > -1 ? containers.get(containerIndex) : null;
         if (currentContainer == null)
         {
             throw new IllegalStateException("Tried to pop container state without said container");
@@ -718,7 +767,7 @@ private void prepareValue()
     /** Closes out annotations. */
     private void finishValue() throws IOException
     {
-        if (!containers.isEmpty() && containers.peek().type == ContainerType.ANNOTATION)
+        if (containerIndex > -1 && topContainer.type == ContainerType.ANNOTATION)
         {
             // close out and patch the length
             popContainer();
@@ -756,7 +805,7 @@ public void stepOut() throws IOException
         {
             throw new IonException("Cannot step out with field name set");
         }
-        if (containers.isEmpty() || !containers.peek().type.allowedInStepOut)
+        if (containerIndex < 0 || !topContainer.type.allowedInStepOut)
         {
             throw new IonException("Cannot step out when not in container");
         }
@@ -769,7 +818,7 @@ public void stepOut() throws IOException
 
     public boolean isInStruct()
     {
-        return !containers.isEmpty() && containers.peek().type == ContainerType.STRUCT;
+        return containerIndex > -1 && topContainer.type == ContainerType.STRUCT;
     }
 
     // Write Value Methods
@@ -946,7 +995,7 @@ public void writeInt(BigInteger value) throws IOException
         prepareValue();
 
         int type = POS_INT_TYPE;
-        if(value.signum() < 0)
+        if (value.signum() < 0)
         {
             type = NEG_INT_TYPE;
             value = value.negate();
@@ -1337,17 +1386,14 @@ public void writeBytes(byte[] data, int offset, int length) throws IOException
     {
         buffer.truncate(position);
         // TODO decide if it is worth making this faster than O(N)
-        Iterator<PatchPoint> patchIterator = patchPoints.iterate();
-        int i = 0;
-        while (patchIterator.hasNext()) {
-            PatchPoint patchPoint = patchIterator.next();
-            if (patchPoint.length > -1) {
+        for (int i = 0; i < patchPointsLength; i++) {
+            final PatchPoint patchPoint = patchPoints.get(i);
+            if (patchPoint != null && patchPoint.length > -1) {
                 if (patchPoint.oldPosition >= position) {
-                    patchPoints.truncate(i - 1);
+                    patchPointsLength = i;
                     break;
                 }
             }
-            i++;
         }
     }
 
@@ -1359,11 +1405,11 @@ public void finish() throws IOException
         {
             return;
         }
-        if (!containers.isEmpty() || depth > 0)
+        if (containerIndex > -1 || depth > 0)
         {
             throw new IllegalStateException("Cannot finish within container: " + containers);
         }
-        if (patchPoints.isEmpty())
+        if (patchPointsLength == 0)
         {
             // nothing to patch--write 'em out!
             buffer.writeTo(out);
@@ -1371,11 +1417,10 @@ public void finish() throws IOException
         else
         {
             long bufferPosition = 0;
-            Iterator<PatchPoint> iterator = patchPoints.iterate();
-            while (iterator.hasNext())
+            for (int i = 0; i < patchPointsLength; i++)
             {
-                PatchPoint patch = iterator.next();
-                if (patch.length < 0) {
+                final PatchPoint patch = patchPoints.get(i);
+                if (patch == null || patch.length < 0) {
                     continue;
                 }
                 // write up to the thing to be patched
@@ -1391,7 +1436,7 @@ public void finish() throws IOException
             }
             buffer.writeTo(out, bufferPosition, buffer.position() - bufferPosition);
         }
-        patchPoints.clear();
+        patchPointsLength = 0;
         buffer.reset();
 
         if (streamFlushMode == StreamFlushMode.FLUSH)

From 135c0eb25596581740a5c03d8ce33a70a62fc69b Mon Sep 17 00:00:00 2001
From: Shaurya Dwivedi <67282772+Shaurya0108@users.noreply.github.com>
Date: Fri, 10 Oct 2025 10:22:11 -0700
Subject: [PATCH 472/490] v1.11.11 release (#1106)

Co-authored-by: Shaurya Dwivedi <shauvy@amazon.com>
---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 2d6981806b..319bf4dcee 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.11-SNAPSHOT
+1.11.11

From 205c99776a3fa75d91dec22d43ead9117aa966a6 Mon Sep 17 00:00:00 2001
From: Shaurya Dwivedi <67282772+Shaurya0108@users.noreply.github.com>
Date: Fri, 10 Oct 2025 12:08:35 -0700
Subject: [PATCH 473/490] Bumps version to 1.11.12-SNAPSHOT (#1107)

Co-authored-by: Shaurya Dwivedi <shauvy@amazon.com>
---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 319bf4dcee..04cba99cc1 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.11
+1.11.12-SNAPSHOT

From c3b60fb59d4d6c67aa01a0bb119919fdd6ec406a Mon Sep 17 00:00:00 2001
From: Austin Williams <austnwil@amazon.com>
Date: Fri, 10 Oct 2025 13:35:14 -0700
Subject: [PATCH 474/490] Remove unnecessary SymbolToken copies from
 IonSystemLite (#1104)

* Remove unnecessary array scans when cloning symbols into IonValueLite

* Document that IonReader.getTypeAnnotationSymbols() returns fresh array
---
 src/main/java/com/amazon/ion/IonReader.java   |  2 ++
 src/main/java/com/amazon/ion/IonValue.java    |  2 ++
 .../amazon/ion/impl/lite/IonSystemLite.java   | 17 +------------
 .../amazon/ion/impl/lite/IonValueLite.java    | 24 +++++++++++++++++++
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/amazon/ion/IonReader.java b/src/main/java/com/amazon/ion/IonReader.java
index fb572fadc8..ae0a0eb44e 100644
--- a/src/main/java/com/amazon/ion/IonReader.java
+++ b/src/main/java/com/amazon/ion/IonReader.java
@@ -252,6 +252,8 @@ public interface IonReader
 
     /**
      * Gets the current value's annotations as symbol tokens (text + ID).
+     * Implementations are guaranteed to return a new array that is safe
+     * for the caller to modify.
      *
      * @return the (ordered) annotations on the current value, or an empty
      * array (not {@code null}) if there are none.
diff --git a/src/main/java/com/amazon/ion/IonValue.java b/src/main/java/com/amazon/ion/IonValue.java
index db65ffd687..8e738d5e97 100644
--- a/src/main/java/com/amazon/ion/IonValue.java
+++ b/src/main/java/com/amazon/ion/IonValue.java
@@ -310,6 +310,8 @@ public interface IonValue
 
     /**
      * Gets this value's user type annotations as interned symbols (text + ID).
+     * Implementations are guaranteed to return a new array that is safe for
+     * the caller to modify.
      *
      * @return the (ordered) annotations on the current value, or an empty
      * array (not {@code null}) if there are none.
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonSystemLite.java b/src/main/java/com/amazon/ion/impl/lite/IonSystemLite.java
index 3eeeba1973..c694813120 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonSystemLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonSystemLite.java
@@ -749,11 +749,6 @@ private boolean cloneFieldNameIfAny(IonValueLite value) {
                 return false;
             }
             SymbolToken token = reader.getFieldNameSymbol();
-            String text = token.getText();
-            if (text != null && token.getSid() != UNKNOWN_SYMBOL_ID)
-            {
-                token = newSymbolToken(text, UNKNOWN_SYMBOL_ID);
-            }
             value.setFieldNameSymbol(token);
             return true;
         }
@@ -767,17 +762,7 @@ private boolean cloneAnnotationsIfAny(IonValueLite value) {
             if (annotations.length == 0) {
                 return false;
             }
-
-            for (int i = 0; i < annotations.length; i++)
-            {
-                SymbolToken token = annotations[i];
-                String text = token.getText();
-                if (text != null && token.getSid() != UNKNOWN_SYMBOL_ID )
-                {
-                    annotations[i] = newSymbolToken(text, UNKNOWN_SYMBOL_ID);
-                }
-            }
-            value.setTypeAnnotationSymbols(annotations);
+            value.setTypeAnnotationSymbolsNoCopy(annotations);
             return true;
         }
 
diff --git a/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java b/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java
index 08fd6661fa..622a3622cf 100644
--- a/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java
+++ b/src/main/java/com/amazon/ion/impl/lite/IonValueLite.java
@@ -864,6 +864,10 @@ public final SymbolToken[] getTypeAnnotationSymbols(SymbolTableProvider symbolTa
             for (int i = 0; i < _annotations.length; i++) {
                 if (_annotations[i] != null) {
                     count++;
+                } else {
+                    // null indicates the end of the array.
+                    // This assumption is also present in IonValueLite(IonValueLite existing, IonContext context) constructor.
+                    break;
                 }
             }
         }
@@ -925,6 +929,26 @@ public void setTypeAnnotationSymbols(SymbolToken... annotations)
         }
     }
 
+    // Sets type annotations for this value, assuming modifications to passed array
+    // are safe and the array will not be modified after call to this method.
+    // Prevents an unnecessary array copy if the array being passed in is newly-created
+    // for the call to this method.
+    protected void setTypeAnnotationSymbolsNoCopy(SymbolToken... annotations)
+    {
+        checkForLock();
+
+        if (annotations == null || annotations.length == 0)
+        {
+            // Normalize all empty lists to the same instance.
+            _annotations = SymbolToken.EMPTY_ARRAY;
+        }
+        else
+        {
+            _annotations = annotations;
+            checkAnnotationsForSids();
+        }
+    }
+
     public final String[] getTypeAnnotations()
     {
         // first we have to count the number of non-null

From ac7cc952155807a6ffcd3f18f946611a0c1ca434 Mon Sep 17 00:00:00 2001
From: Shaurya Dwivedi <67282772+Shaurya0108@users.noreply.github.com>
Date: Mon, 13 Oct 2025 09:43:48 -0700
Subject: [PATCH 475/490] Fix for v1.11.11 release (#1108)

Co-authored-by: Shaurya Dwivedi <shauvy@amazon.com>
---
 build.gradle.kts | 2 +-
 project.version  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5e161c1ff1..ad511cf372 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -285,7 +285,7 @@ tasks {
     shadowJar {
         val newLocation = "com.amazon.ion.shaded_.do_not_use"
         archiveClassifier.set("shaded")
-        dependsOn(generateManifest, generateLicenseReport)
+        dependsOn(generateManifest, generateLicenseReport, cyclonedxBom)
         from(generateLicenseReport.get().outputFolder)
         relocate("kotlin", "$newLocation.kotlin")
         relocate("org.jetbrains", "$newLocation.org.jetbrains")
diff --git a/project.version b/project.version
index 04cba99cc1..319bf4dcee 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.12-SNAPSHOT
+1.11.11

From ba03a62da9484eebb47097c76fb2ada72867d66f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Oct 2025 10:08:18 -0700
Subject: [PATCH 476/490] Bump github/codeql-action from 3.30.6 to 4.30.8 in
 the github-action-dependencies group (#1109)

* Bump github/codeql-action in the github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 3.30.6 to 4.30.8
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/64d10c13136e1c5bce3e5fbde8d4906eeaafc885...f443b600d91635bebf5b0d9ebc620189c0d6fba5)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.30.8
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>

* Fix version comment for workflow

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index fe107e5731..9e31b170d1 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
+        uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
+        uses: github/codeql-action/autobuild@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
+        uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index bb749db42e..33e845f616 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
+        uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
         with:
           sarif_file: results.sarif

From 78846c960fecabaa3d49daa09da55ec72e825b7f Mon Sep 17 00:00:00 2001
From: Shaurya Dwivedi <67282772+Shaurya0108@users.noreply.github.com>
Date: Mon, 13 Oct 2025 10:21:24 -0700
Subject: [PATCH 477/490] Fix 1.11.11 release (#1110)

* Fix for v1.11.11 release

* Fix for v1.11.11 release

---------

Co-authored-by: Shaurya Dwivedi <shauvy@amazon.com>
---
 .github/workflows/publish-release-artifacts.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 7b3c154a2a..23fb407d42 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -54,7 +54,7 @@ jobs:
         with:
           validate-wrappers: true
       - name: Build Release Artifacts
-        run: ./gradlew build cyclonedxBom
+        run: ./gradlew cyclonedxBom build
       - name: Publish to Sonatype
         run: ./gradlew publishToSonatype
       - name: Close and Release Sonatype Staging Repository

From 6df7c4e02eaeeac99836ab3cd56a45290666ef3d Mon Sep 17 00:00:00 2001
From: Shaurya Dwivedi <67282772+Shaurya0108@users.noreply.github.com>
Date: Mon, 13 Oct 2025 16:02:11 -0700
Subject: [PATCH 478/490] Fix 1.11.11 release (#1113)

* Fix for v1.11.11 release

* Fix for v1.11.11 release

* Using Nexus 2.0 and renamed cred variables

* update sonatype close step

* update credentails to old names

---------

Co-authored-by: Shaurya Dwivedi <shauvy@amazon.com>
---
 .github/workflows/publish-release-artifacts.yml | 4 +---
 build.gradle.kts                                | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 23fb407d42..320dc083df 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -56,9 +56,7 @@ jobs:
       - name: Build Release Artifacts
         run: ./gradlew cyclonedxBom build
       - name: Publish to Sonatype
-        run: ./gradlew publishToSonatype
-      - name: Close and Release Sonatype Staging Repository
-        run: ./gradlew closeAndReleaseSonatypeStagingRepository
+        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
       - name: Upload Artifacts to GitHub Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/build.gradle.kts b/build.gradle.kts
index ad511cf372..994cd6e89a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -25,7 +25,7 @@ plugins {
     `maven-publish`
 
     // There are newer versions available, but they are not guaranteed to support Java 8.
-    id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 
     jacoco
     signing
@@ -604,7 +604,7 @@ publishing {
 }
 
 nexusPublishing {
-    // Documentation for this plugin, see https://github.com/gradle-nexus/publish-plugin/blob/v1.3.0/README.md
+    // Documentation for this plugin, see https://github.com/gradle-nexus/publish-plugin/blob/v2.0.0/README.md
     // Updated for Central Portal migration
     this.repositories {
         sonatype {

From e7e707dbc3eb3f8eb19c54fc01b6f83438ca2b6d Mon Sep 17 00:00:00 2001
From: Shaurya Dwivedi <67282772+Shaurya0108@users.noreply.github.com>
Date: Tue, 14 Oct 2025 11:12:59 -0700
Subject: [PATCH 479/490] Added debug logs for signing tokens (#1115)

* Fix for v1.11.11 release

* Fix for v1.11.11 release

* Using Nexus 2.0 and renamed cred variables

* update sonatype close step

* update credentails to old names

* Debug signing values

* Update build.gradle.kts

Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>

* added debug logs

* ktlintKotlinScriptCheck fix removing extra space

---------

Co-authored-by: Shaurya Dwivedi <shauvy@amazon.com>
Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
---
 build.gradle.kts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build.gradle.kts b/build.gradle.kts
index 994cd6e89a..6cfb2e2a92 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -631,6 +631,12 @@ signing {
         val signingKeyId: String? by project
         val signingKey: String? by project
         val signingPassword: String? by project
+
+        logger.lifecycle("DEBUG: isCI = $isCI")
+        logger.lifecycle("DEBUG: signingKeyId = ${if (signingKeyId.isNullOrEmpty()) "NULL/EMPTY" else "SET"}")
+        logger.lifecycle("DEBUG: signingKey = ${if (signingKey.isNullOrEmpty()) "NULL/EMPTY" else "SET (${signingKey?.length} chars)"}")
+        logger.lifecycle("DEBUG: signingPassword = ${if (signingPassword.isNullOrEmpty()) "NULL/EMPTY" else "SET"}")
+
         useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
     }
 

From 336a28ba7dadd0eede648225d56014d3d594c701 Mon Sep 17 00:00:00 2001
From: Shaurya Dwivedi <67282772+Shaurya0108@users.noreply.github.com>
Date: Tue, 14 Oct 2025 12:17:38 -0700
Subject: [PATCH 480/490] Added logs for `useInMemoryPgpKeys` and `sign` steps
 (#1117)

---
 build.gradle.kts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 6cfb2e2a92..cb10f88b88 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -637,8 +637,19 @@ signing {
         logger.lifecycle("DEBUG: signingKey = ${if (signingKey.isNullOrEmpty()) "NULL/EMPTY" else "SET (${signingKey?.length} chars)"}")
         logger.lifecycle("DEBUG: signingPassword = ${if (signingPassword.isNullOrEmpty()) "NULL/EMPTY" else "SET"}")
 
-        useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+        try {
+            useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+            logger.lifecycle("DEBUG: useInMemoryPgpKeys() succeeded")
+        } catch (e: Exception) {
+            logger.lifecycle("DEBUG: useInMemoryPgpKeys() failed: ${e.message}")
+        }
     }
 
-    sign(publishing.publications["IonJava"])
+    try {
+        logger.lifecycle("DEBUG: Attempting to sign publication 'IonJava'")
+        sign(publishing.publications["IonJava"])
+        logger.lifecycle("DEBUG: sign() call succeeded")
+    } catch (e: Exception) {
+        logger.lifecycle("DEBUG: sign() call failed: ${e.message}")
+    }
 }

From d8f430c8cb338ec971337bf1b85b18f37088077d Mon Sep 17 00:00:00 2001
From: Shaurya Dwivedi <67282772+Shaurya0108@users.noreply.github.com>
Date: Tue, 14 Oct 2025 13:51:24 -0700
Subject: [PATCH 481/490] Add `publishToSonatype` to set sign in gradle build
 (#1118)

* Fix for v1.11.11 release

* Fix for v1.11.11 release

* Using Nexus 2.0 and renamed cred variables

* update sonatype close step

* update credentails to old names

* Debug signing values

* Update build.gradle.kts

Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>

* added debug logs

* ktlintKotlinScriptCheck fix removing extra space

* added detailed debug logs

* added publishToSonatype to signIonJavaPublication, which was being skipped

---------

Co-authored-by: Shaurya Dwivedi <shauvy@amazon.com>
Co-authored-by: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index cb10f88b88..0b6c00e42e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -553,7 +553,7 @@ tasks {
     publish { dependsOn(minifyTest) }
 
     withType<Sign> {
-        setOnlyIf { isReleaseVersion && gradle.taskGraph.hasTask(":publish") }
+        setOnlyIf { isReleaseVersion && (gradle.taskGraph.hasTask(":publish") || gradle.taskGraph.hasTask(":publishToSonatype")) }
     }
 
     cyclonedxBom {

From b7208ad3edbb04d8e729e92c6344a62183a2aaea Mon Sep 17 00:00:00 2001
From: Shaurya Dwivedi <67282772+Shaurya0108@users.noreply.github.com>
Date: Wed, 15 Oct 2025 11:40:20 -0700
Subject: [PATCH 482/490] Added additional check for empty values to track if
 they are being lost in between steps (#1120)

* added credential assignment using gradle -p flag

* added additonal check to sign in credential and removed additional fetch from workflow

* changed logging level and maintain previous if check

---------

Co-authored-by: Shaurya Dwivedi <shauvy@amazon.com>
---
 build.gradle.kts | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 0b6c00e42e..38afe13e4a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -637,19 +637,14 @@ signing {
         logger.lifecycle("DEBUG: signingKey = ${if (signingKey.isNullOrEmpty()) "NULL/EMPTY" else "SET (${signingKey?.length} chars)"}")
         logger.lifecycle("DEBUG: signingPassword = ${if (signingPassword.isNullOrEmpty()) "NULL/EMPTY" else "SET"}")
 
-        try {
+        if (signingKeyId.isNullOrEmpty() || signingKey.isNullOrEmpty() || signingPassword.isNullOrEmpty()) {
+            logger.info("Skipping useInMemoryPgpKeys() due to missing credentials")
+        } else {
             useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
-            logger.lifecycle("DEBUG: useInMemoryPgpKeys() succeeded")
-        } catch (e: Exception) {
-            logger.lifecycle("DEBUG: useInMemoryPgpKeys() failed: ${e.message}")
+            logger.info("useInMemoryPgpKeys() called successfully")
         }
     }
 
-    try {
-        logger.lifecycle("DEBUG: Attempting to sign publication 'IonJava'")
-        sign(publishing.publications["IonJava"])
-        logger.lifecycle("DEBUG: sign() call succeeded")
-    } catch (e: Exception) {
-        logger.lifecycle("DEBUG: sign() call failed: ${e.message}")
-    }
+    sign(publishing.publications["IonJava"])
+    logger.lifecycle("DEBUG: sign() called")
 }

From 5ea40ff367ad0024c70c871570d7044a58c92247 Mon Sep 17 00:00:00 2001
From: Shaurya Dwivedi <67282772+Shaurya0108@users.noreply.github.com>
Date: Wed, 15 Oct 2025 16:07:59 -0700
Subject: [PATCH 483/490] Cleaned up signing logic and changed key formatting
 (#1125)

* added credential assignment using gradle -p flag

* added additonal check to sign in credential and removed additional fetch from workflow

* changed logging level and maintain previous if check

* gradle.taskGraph.whenReady runs after the configuration phase but before task execution, ensuring the signatory is available when the signing task actually
runs

* Simplified code, need to change key

* Added back logs for missing credentials to build.gradle.kts

Co-authored-by: Matthew Pope <81593196+popematt@users.noreply.github.com>

---------

Co-authored-by: Shaurya Dwivedi <shauvy@amazon.com>
Co-authored-by: Matthew Pope <81593196+popematt@users.noreply.github.com>
---
 build.gradle.kts | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 38afe13e4a..9dfbe9001b 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -626,25 +626,19 @@ signing {
     // if signing.keyId, signing.password, signing.secretKeyRingFile, etc are
     // not present in gradle.properties.
     isRequired = isReleaseVersion
+    sign(publishing.publications["IonJava"])
+}
 
+afterEvaluate {
     if (isCI) {
         val signingKeyId: String? by project
         val signingKey: String? by project
         val signingPassword: String? by project
 
-        logger.lifecycle("DEBUG: isCI = $isCI")
-        logger.lifecycle("DEBUG: signingKeyId = ${if (signingKeyId.isNullOrEmpty()) "NULL/EMPTY" else "SET"}")
-        logger.lifecycle("DEBUG: signingKey = ${if (signingKey.isNullOrEmpty()) "NULL/EMPTY" else "SET (${signingKey?.length} chars)"}")
-        logger.lifecycle("DEBUG: signingPassword = ${if (signingPassword.isNullOrEmpty()) "NULL/EMPTY" else "SET"}")
-
         if (signingKeyId.isNullOrEmpty() || signingKey.isNullOrEmpty() || signingPassword.isNullOrEmpty()) {
-            logger.info("Skipping useInMemoryPgpKeys() due to missing credentials")
+            logger.lifecycle("signing credentials unavailable; build artifacts will not be signed")
         } else {
-            useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
-            logger.info("useInMemoryPgpKeys() called successfully")
+            signing.useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
         }
     }
-
-    sign(publishing.publications["IonJava"])
-    logger.lifecycle("DEBUG: sign() called")
 }

From 0d2057ce3cb3c524ad97cc390e5bebbf804c42cf Mon Sep 17 00:00:00 2001
From: Joshua Barr <70981087+jobarr-amzn@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:34:33 -0700
Subject: [PATCH 484/490] Document symmetry-breaking equals in IonSequence
 (#1122)

* Document symmetry-breaking equals in IonSequence

Fixes #1121

* Update src/main/java/com/amazon/ion/IonSequence.java

Co-authored-by: Austin Williams <austnwil@amazon.com>

* Further copypasta fixes

* Update src/main/java/com/amazon/ion/IonSequence.java

Co-authored-by: Austin Williams <austnwil@amazon.com>

---------

Co-authored-by: Austin Williams <austnwil@amazon.com>
---
 src/main/java/com/amazon/ion/IonSequence.java | 79 ++++++++++++++++---
 1 file changed, 68 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/amazon/ion/IonSequence.java b/src/main/java/com/amazon/ion/IonSequence.java
index 63995fcaea..a2fc70d400 100644
--- a/src/main/java/com/amazon/ion/IonSequence.java
+++ b/src/main/java/com/amazon/ion/IonSequence.java
@@ -426,25 +426,25 @@ public void add(int index, IonValue child)
      * </p>
      *
      * The implementation of {@link List<IonValue>} returned by this method
-     * implements {@link List#equals(Object)} and
-     * {@link List#equals(Object)} ()} per the specification of these methods.
+     * implements {@link List#equals} and {@link List#hashCode()}
+     * per the specification of these methods.
      * However, the existing implementation of {@link IonSequence} does not
      * provide a specification compliant {@link List#equals} and
-     * {@link List#hashCode()}} which results to the following caveats:
+     * {@link List#hashCode()} which results to the following caveats:
      *
      * Given:
      *
-     * <code>
+     * <pre> {@code
      * int[] ints = new int[] {1, 2, 3, 4};
      * IonList list = SYSTEM.newList(ints);
      * IonSexp sexp = SYSTEM.newSexp(ints)
-     * IonSexp dgrm = SYSTEM.newDatagram(ints)
+     * IonDatagram dgrm = SYSTEM.newDatagram(ints)
      * List<IonValue> listSubList = list.subList(0, ints.size())
      * List<IonValue> sexpSubList = sexp.subList(0, ints.size())
-     * List<IonValue> dgrmSubList = sexp.subList(0, ints.size())
+     * List<IonValue> dgrmSubList = dgrm.subList(0, ints.size())
      * List<IonValue> arrayList = new ArrayList<IonValue>();
      * for(int i : ints) { arrayList.add(SYSTEM.newInt(i)); }
-     * </code>
+     * } </pre>
      *
      * {@link IonSequence#equals(Object)} always returns false when presented
      * with a non {@link IonSequence} instance of {@link List<IonValue>}.
@@ -457,7 +457,7 @@ public void add(int index, IonValue child)
      * library we maintain backwards compatibility and support this behaviour
      * as-is.
      *
-     * <code>
+     * <pre> {@code
      * list.equals(listSubList)     // false
      * list.equals(sexpSubList)     // false
      * list.equals(dgrm)            // false
@@ -472,7 +472,7 @@ public void add(int index, IonValue child)
      * dgrm.equals(sexpSubList)     // false
      * dgrm.equals(dgrmSubList)     // false
      * dgrm.equals(arrayList)       // false
-     *</code>
+     * } </pre>
      *
      * However, {@link IonSequence#subList(int, int)} was implemented much
      * later and faithfully implements {@link List#equals(Object)} meaning
@@ -483,7 +483,7 @@ public void add(int index, IonValue child)
      * no notion of an {@link IonType}, annotations or nullability which
      * allows for compliance with the {@link List} specification.
      *
-     * <code>
+     * <pre> {@code
      * listSubList.equals(listSubList); // true
      * listSubList.equals(sexpSubList); // true
      * listSubList.equals(dgrmSubList); // true
@@ -504,7 +504,7 @@ public void add(int index, IonValue child)
      * dgrmSubList.equals(list);        // true
      * dgrmSubList.equals(sexp);        // true
      * dgrmSubList.equals(arrayList);   // true
-     * </code>
+     * } </pre>
      *
      * @see List#subList(int, int)
      */
@@ -566,4 +566,61 @@ public void add(int index, IonValue child)
 
     public IonSequence clone()
         throws UnknownSymbolException;
+
+    /**
+     * The existing implementation of {@link IonSequence} does not
+     * provide a specification-compliant {@link List#equals} and
+     * {@link List#hashCode()}. If you want a symmetric {@code equals} then
+     * use a {@link IonSequence#subList(int, int)} view of the sequence.
+     * <p>
+     * The non-compliant {@code equals} implementation of {@link IonSequence}
+     * results to the following caveats:
+     * <p>
+     * Given:
+     *
+     * <pre> {@code
+     * int[] ints = new int[] {1, 2, 3, 4};
+     * IonList list = SYSTEM.newList(ints);
+     * IonSexp sexp = SYSTEM.newSexp(ints);
+     * IonDatagram dgrm = SYSTEM.newDatagram();
+     * for(int i : ints) { dgrm.add(SYSTEM.newInt(i)); };
+     * List<IonValue> listSubList = list.subList(0, ints.length);
+     * List<IonValue> sexpSubList = sexp.subList(0, ints.length);
+     * List<IonValue> dgrmSubList = dgrm.subList(0, ints.length);
+     * List<IonValue> arrayList = new ArrayList<IonValue>();
+     * for(int i : ints) { arrayList.add(SYSTEM.newInt(i)); }
+     * } </pre>
+     *
+     * {@link IonSequence#equals(Object)} always returns false when presented
+     * with a non {@link IonSequence} instance of {@link List<IonValue>}.
+     * Hence, the following invocations of {@link Object#equals(Object)}
+     * return false even if the contained elements are equivalent.  This
+     * means that {@link Object#equals(Object)} is not symmetric in these
+     * cases.  The reason for the asymmetry is historical:
+     * {@link IonSequence} has long violated the contract outlined by the
+     * {@link List} documentation.  For the current major version of this
+     * library we maintain backwards compatibility and support this behaviour
+     * as-is.
+     *
+     * <pre> {@code
+     * list.equals(listSubList);     // false
+     * list.equals(sexpSubList);     // false
+     * list.equals(dgrmSubList);     // false
+     * list.equals(arrayList);       // false
+     *
+     * sexp.equals(listSubList);     // false
+     * sexp.equals(sexpSubList);     // false
+     * sexp.equals(dgrmSubList);     // false
+     * sexp.equals(arrayList);       // false
+     *
+     * dgrm.equals(listSubList);     // false
+     * dgrm.equals(sexpSubList);     // false
+     * dgrm.equals(dgrmSubList);     // false
+     * dgrm.equals(arrayList);       // false
+     * } </pre>
+     *
+     * @param other the object to be compared for equality with this list
+     * @return {@code true} if the specified object is equal to this list
+     */
+    boolean equals(Object other);
 }

From b14b1d996196fc86452bd99f4ae47813ef6c154e Mon Sep 17 00:00:00 2001
From: Shaurya Dwivedi <67282772+Shaurya0108@users.noreply.github.com>
Date: Fri, 17 Oct 2025 09:16:17 -0700
Subject: [PATCH 485/490] upgrade to 1.11.12-SNAPSHOT (#1128)

Co-authored-by: Shaurya Dwivedi <shauvy@amazon.com>
---
 project.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.version b/project.version
index 319bf4dcee..04cba99cc1 100644
--- a/project.version
+++ b/project.version
@@ -1 +1 @@
-1.11.11
+1.11.12-SNAPSHOT

From 812d15485e3a7135843644275beac4e0b316924d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 16:16:37 +0000
Subject: [PATCH 486/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 4.30.8 to 4.30.9
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f443b600d91635bebf5b0d9ebc620189c0d6fba5...16140ae1a102900babc80a33c44059580f687047)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.30.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9e31b170d1..1723c02462 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
+        uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
+        uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
+        uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 33e845f616..81f8fb2caa 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
+        uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
         with:
           sarif_file: results.sarif

From 7729d3d6320bb0f11ce8c56aea17663a3bf21046 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 16:48:22 +0000
Subject: [PATCH 487/490] Bump the github-action-dependencies group with 3
 updates

Bumps the github-action-dependencies group with 3 updates: [github/codeql-action](https://github.com/github/codeql-action), [actions/upload-artifact](https://github.com/actions/upload-artifact) and [actions/download-artifact](https://github.com/actions/download-artifact).


Updates `github/codeql-action` from 4.30.9 to 4.31.0
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/16140ae1a102900babc80a33c44059580f687047...4e94bd11f71e507f7f87df81788dff88d1dacbfb)

Updates `actions/upload-artifact` from 4 to 5
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v4...v5)

Updates `actions/download-artifact` from 5 to 6
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v5...v6)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-action-dependencies
- dependency-name: actions/upload-artifact
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
- dependency-name: actions/download-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml                       | 6 +++---
 .../workflows/ion-java-performance-regression-detector.yml  | 4 ++--
 .github/workflows/ion-test-driver.yml                       | 4 ++--
 .github/workflows/main.yml                                  | 2 +-
 .github/workflows/scorecard.yml                             | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 1723c02462..16bb2e392c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
+        uses: github/codeql-action/autobuild@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 8d6a394a29..0039ee321c 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -42,7 +42,7 @@ jobs:
           done
 
       - name: Upload test Ion Data to artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{env.test_data_id}}
           path: testData
@@ -113,7 +113,7 @@ jobs:
           path: new
 
       - name: Download test Ion Data from artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: generated-test-data
           path: testData
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index 444038ef6a..c63dad3d19 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -55,7 +55,7 @@ jobs:
           --replace ion-java,https://github.com/amazon-ion/ion-java.git,$main
 
       - name: Upload result
-        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ion-test-driver-result.ion
           path: output/results/ion-test-driver-results.ion
@@ -70,7 +70,7 @@ jobs:
           ion-java,$main ion-java,$cur output/results/ion-test-driver-results.ion
 
       - name: Upload analysis report
-        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: analysis-report.ion
           path: result.ion
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2260d73bf8..cf22046e95 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
         with:
           files: build/reports/jacoco/test/jacocoTestReport.xml
-      - uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
+      - uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: spotbugs-report
           path: build/reports/spotbugs/
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 81f8fb2caa..f0177673db 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v3.1.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v3.1.0
         with:
           name: SARIF file
           path: results.sarif
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
+        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
         with:
           sarif_file: results.sarif

From 0c0722f4871de3fc191068f976892d80c346b65a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Nov 2025 16:26:24 +0000
Subject: [PATCH 488/490] Bump github/codeql-action in the
 github-action-dependencies group

Bumps the github-action-dependencies group with 1 update: [github/codeql-action](https://github.com/github/codeql-action).


Updates `github/codeql-action` from 4.31.0 to 4.31.2
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4e94bd11f71e507f7f87df81788dff88d1dacbfb...0499de31b99561a6d14a36a5f662c2a54f91beee)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 6 +++---
 .github/workflows/scorecard.yml       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 16bb2e392c..4c5ab23fc3 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
+        uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f0177673db..cf54717eec 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v4.31.0
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           sarif_file: results.sarif

From ba2328e827430254ab70d1b6f2342fbc8499eb3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Nov 2025 09:54:05 -0800
Subject: [PATCH 489/490] Bump the github-action-dependencies group with 2
 updates (#1144)

Bumps the github-action-dependencies group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [github/codeql-action](https://github.com/github/codeql-action).


Updates `actions/checkout` from 5.0.0 to 6.0.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/08c6903cd8c0fde910a37f88322edcfb5dd907a8...1af3b93b6815bc44a9784bd300feb67ff0d1eeb3)

Updates `github/codeql-action` from 4.31.2 to 4.31.5
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/0499de31b99561a6d14a36a5f662c2a54f91beee...fdbfb4d2750291e159f0156def62b853c2798ca2)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-action-dependencies
- dependency-name: github/codeql-action
  dependency-version: 4.31.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-action-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/codeql-analysis.yml                     | 8 ++++----
 .../ion-java-performance-regression-detector.yml          | 8 ++++----
 .github/workflows/ion-test-driver.yml                     | 6 +++---
 .github/workflows/main.yml                                | 6 +++---
 .github/workflows/prepare-release.yml                     | 4 ++--
 .github/workflows/publish-release-artifacts.yml           | 2 +-
 .github/workflows/scorecard.yml                           | 4 ++--
 .github/workflows/test-inspect-version-action.yml         | 2 +-
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4c5ab23fc3..91b0e82a69 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,11 +37,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
+        uses: github/codeql-action/autobuild@fdbfb4d2750291e159f0156def62b853c2798ca2 # v3.29.5
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
diff --git a/.github/workflows/ion-java-performance-regression-detector.yml b/.github/workflows/ion-java-performance-regression-detector.yml
index 0039ee321c..c16b3841ca 100644
--- a/.github/workflows/ion-java-performance-regression-detector.yml
+++ b/.github/workflows/ion-java-performance-regression-detector.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-data-generator
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: amazon-ion/ion-data-generator
           ref: main
@@ -91,21 +91,21 @@ jobs:
           java-version: 17
 
       - name: Checkout ion-java-benchmark-cli
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: amazon-ion/ion-java-benchmark-cli
           ref: master
           path: ion-java-benchmark-cli
 
       - name: Checkout ion-java from the previous commit
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           ref: ${{ github.base_ref }}
           submodules: recursive
           path: baseline
 
       - name: Checkout ion-java from the new commit.
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           repository: ${{ github.event.pull_request.head.repo.full_name }}
           ref: ${{ github.head_ref }}
diff --git a/.github/workflows/ion-test-driver.yml b/.github/workflows/ion-test-driver.yml
index c63dad3d19..118e4c2919 100644
--- a/.github/workflows/ion-test-driver.yml
+++ b/.github/workflows/ion-test-driver.yml
@@ -13,14 +13,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout ion-java
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # master
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # master
         with:
           repository: amazon-ion/ion-java
           ref: master
           path: ion-java
 
       - name: Checkout ion-test-driver
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # master
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # master
         with:
           repository: amazon-ion/ion-test-driver
           ref: master
@@ -90,7 +90,7 @@ jobs:
     needs: ion-test-driver
     if: ${{ failure() }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # master
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # master
       - name: Open an issue
         uses: JasonEtco/create-an-issue@1b14a70e4d8dc185e5cc76d3bec9eab20257b2c5 # v2.9.2
         env:
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cf22046e95..8e11a815b0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
     # H/T: https://github.com/Dart-Code/Dart-Code/commit/612732d5879730608baa9622bf7f5e5b7b51ae65
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'amazon-ion/ion-java'
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           submodules: recursive
       - name: Setup Java
@@ -47,7 +47,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'amazon-ion/ion-java'
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           submodules: recursive
       - name: Setup Java
@@ -69,7 +69,7 @@ jobs:
     # https://github.com/amazon-ion/ion-java/blob/master/.github/actions/inspect-version/action.yml
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v3.6.0
       - name: Get Project Version
         run: |
           echo "PROJECT_VERSION=v$(<project.version)" >> $GITHUB_ENV
diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
index 3a7c891c63..c9024473d4 100644
--- a/.github/workflows/prepare-release.yml
+++ b/.github/workflows/prepare-release.yml
@@ -44,7 +44,7 @@ jobs:
     outputs:
       should_create_draft: ${{ steps.inspect.outputs.is_valid_to_release }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v3.6.0
       - name: Get project version
         run: |
           echo "PROJECT_VERSION=$(<project.version)" >> $GITHUB_ENV
@@ -65,7 +65,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v3.6.0
       - name: Create a draft release
         shell: bash
         env:
diff --git a/.github/workflows/publish-release-artifacts.yml b/.github/workflows/publish-release-artifacts.yml
index 320dc083df..23dbf62e38 100644
--- a/.github/workflows/publish-release-artifacts.yml
+++ b/.github/workflows/publish-release-artifacts.yml
@@ -30,7 +30,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v3.6.0
         with:
           submodules: recursive
       - name: Validate project version matches tag
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index cf54717eec..2643ed36f5 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,7 +32,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.1.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v3.1.0
         with:
           persist-credentials: false
 
@@ -67,6 +67,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
+        uses: github/codeql-action/upload-sarif@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/test-inspect-version-action.yml b/.github/workflows/test-inspect-version-action.yml
index 9a271054d9..38928ebf87 100644
--- a/.github/workflows/test-inspect-version-action.yml
+++ b/.github/workflows/test-inspect-version-action.yml
@@ -53,7 +53,7 @@ jobs:
             expected: action_failure
 
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v3.6.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v3.6.0
       - name: Invoke Action
         id: inspect
         continue-on-error: ${{ matrix.expected == 'action_failure' }}

From a12920330333c4923e4a14b1996b9fe614384ad7 Mon Sep 17 00:00:00 2001
From: Tyler Gregg <greggt@amazon.com>
Date: Fri, 1 May 2026 14:52:17 -0700
Subject: [PATCH 490/490] Fixes a binary write corruption bug introduced in
 1.11.11.

---
 .../ion/impl/bin/IonRawBinaryWriter.java      |  13 +-
 ...IonRawBinaryWriterStalePatchPointTest.java | 186 ++++++++++++++++++
 2 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/com/amazon/ion/impl/bin/IonRawBinaryWriterStalePatchPointTest.java

diff --git a/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java b/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
index f75a624d53..8cf6fc9865 100644
--- a/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
+++ b/src/main/java/com/amazon/ion/impl/bin/IonRawBinaryWriter.java
@@ -620,7 +620,18 @@ private void addPatchPoint(final ContainerInfo container, final long position, f
             }
             // index is now positioned on an ancestor container that has a patch point
             for (int i = index + 1; i <= containerIndex; i++) {
-                containers.get(i).patchIndex = patchPointsLength++;
+                int patchIndex = patchPointsLength++;
+                containers.get(i).patchIndex = patchIndex;
+                // Invalidate any stale patch point data from a previous segment.
+                // If the ancestor's content ultimately fits in preallocated space, this slot
+                // will never be overwritten, so we must ensure stale data with a positive length
+                // is not mistakenly applied during finish().
+                if (patchIndex < patchPoints.size()) {
+                    PatchPoint existing = patchPoints.get(patchIndex);
+                    if (existing != null) {
+                        existing.initialize(-1, -1, -1);
+                    }
+                }
             }
         }
 
diff --git a/src/test/java/com/amazon/ion/impl/bin/IonRawBinaryWriterStalePatchPointTest.java b/src/test/java/com/amazon/ion/impl/bin/IonRawBinaryWriterStalePatchPointTest.java
new file mode 100644
index 0000000000..db15c966ba
--- /dev/null
+++ b/src/test/java/com/amazon/ion/impl/bin/IonRawBinaryWriterStalePatchPointTest.java
@@ -0,0 +1,186 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+package com.amazon.ion.impl.bin;
+
+import com.amazon.ion.IonReader;
+import com.amazon.ion.IonType;
+import com.amazon.ion.SymbolToken;
+import com.amazon.ion.SystemSymbols;
+import com.amazon.ion.Timestamp;
+import com.amazon.ion.impl.bin.AbstractIonWriter.WriteValueOptimization;
+import com.amazon.ion.impl.bin.IonRawBinaryWriter.PreallocationMode;
+import com.amazon.ion.impl.bin.IonRawBinaryWriter.StreamCloseMode;
+import com.amazon.ion.impl.bin.IonRawBinaryWriter.StreamFlushMode;
+import com.amazon.ion.system.IonReaderBuilder;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.EnumSource;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+/**
+ * Regression test for a bug where stale PatchPoint data from a previous stream segment
+ * could corrupt output in subsequent segments when the writer is reused.
+ */
+class IonRawBinaryWriterStalePatchPointTest {
+
+    /**
+     * Creates a raw binary writer with the given preallocation mode.
+     */
+    private IonRawBinaryWriter createWriter(ByteArrayOutputStream out, PreallocationMode mode) throws IOException {
+        return new IonRawBinaryWriter(
+            BlockAllocatorProviders.basicProvider(),
+            11, // Arbitrary (does not affect the test)
+            out,
+            WriteValueOptimization.NONE,
+            StreamCloseMode.NO_CLOSE,
+            StreamFlushMode.NO_FLUSH,
+            mode,
+            true,
+            false,
+            null
+        );
+    }
+
+    @ParameterizedTest
+    @EnumSource(PreallocationMode.class)
+    void stalePatchPointFromLargeContainerCorruptsContainerInNextSegment(PreallocationMode mode) throws IOException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonRawBinaryWriter writer = createWriter(out, mode);
+
+        // Segment 1: list with large list content
+        // The inner list content exceeds contentMaxLength, causing addPatchPoint to be called.
+        // The outer list also exceeds contentMaxLength (since it contains the inner list), so it
+        // calls addPatchPoint in its own popContainer, constructing a PatchPoint at index 0.
+        writer.writeIonVersionMarker();
+        writer.stepIn(IonType.LIST);
+        {
+            writer.stepIn(IonType.LIST);
+            {
+                // Force the list to exceed patch thresholds for both PREALLOCATE_2 (16K) and PREALLOCATE_1 (127)
+                for (int i = 0; i < (17_000 / 26); i++) {
+                    writer.writeString("abcdefghijklmnopqrstuvwxyz");
+                }
+            }
+            writer.stepOut();
+        }
+        writer.stepOut();
+        writer.finish();
+
+        // Segment 2: list with a decimal that has >13 bytes content
+        // The decimal's encoding exceeds 13 bytes, triggering patchSingleByteTypedOptimisticValue's addPatchPoint path.
+        // The list's total content fits within preallocated space and does not call addPatchPoint itself. The list's
+        // patchIndex (assigned by the decimal's ancestor loop) points to the stale PatchPoint from segment 1. Without
+        // the fix, finish() applies the stale data and corrupts the output.
+        out.reset();
+        writer.writeIonVersionMarker();
+        writer.stepIn(IonType.LIST);
+        {
+            writer.writeDecimal(new BigDecimal(new BigInteger("123456789012345678901234567890"), 20));
+        }
+        writer.stepOut();
+        writer.writeInt(123);
+        writer.finish();
+
+        byte[] cycle2Bytes = out.toByteArray();
+
+        // Verify we can read the correct data from segment 2
+        IonReader reader = IonReaderBuilder.standard().build(cycle2Bytes);
+        assertEquals(IonType.LIST, reader.next());
+        reader.stepIn();
+        assertEquals(IonType.DECIMAL, reader.next());
+        assertNotNull(reader.bigDecimalValue());
+        assertNull(reader.next());
+        reader.stepOut();
+        assertEquals(IonType.INT, reader.next());
+        assertEquals(123, reader.intValue());
+        assertNull(reader.next());
+
+        reader.close();
+        writer.close();
+    }
+
+    private void writeLocalSymbolTable(IonRawBinaryWriter writer) throws IOException {
+        writer.setTypeAnnotationSymbols(SystemSymbols.ION_SYMBOL_TABLE_SID);
+        writer.stepIn(IonType.STRUCT);
+        {
+            writer.setFieldNameSymbol(SystemSymbols.SYMBOLS_SID);
+            writer.stepIn(IonType.LIST);
+            {
+                writer.writeString("sym10");
+                writer.writeString("sym11");
+                writer.writeString("sym12");
+            }
+            writer.stepOut();
+        }
+        writer.stepOut();
+    }
+
+    @ParameterizedTest
+    @EnumSource(PreallocationMode.class)
+    void stalePatchPointFromLargeContainerCorruptsAnnotatedContainerInNextSegment(PreallocationMode mode) throws IOException {
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        IonRawBinaryWriter writer = createWriter(out, mode);
+
+        // Segment 1: Large annotated nested structure
+        writer.writeIonVersionMarker();
+        writeLocalSymbolTable(writer);
+        writer.setTypeAnnotationSymbols(10);
+        writer.stepIn(IonType.STRUCT);
+        {
+            writer.setFieldNameSymbol(11);
+            writer.setTypeAnnotationSymbols(12);
+            writer.stepIn(IonType.LIST);
+            {
+                // Force the list to exceed patch thresholds for both PREALLOCATE_2 (16K) and PREALLOCATE_1 (127)
+                for (int i = 0; i < (17_000 / 26); i++) {
+                    writer.writeString("abcdefghijklmnopqrstuvwxyz");
+                }
+            }
+            writer.stepOut();
+        }
+        writer.stepOut();
+        writer.finish();
+
+        // Segment 2: Small annotated struct with timestamp >13 bytes
+        out.reset();
+        writer.writeIonVersionMarker();
+        writeLocalSymbolTable(writer);
+        writer.setTypeAnnotationSymbols(10);
+        writer.stepIn(IonType.STRUCT);
+        {
+            writer.setFieldNameSymbol(11);
+            writer.setTypeAnnotationSymbols(12);
+            writer.writeTimestamp(Timestamp.valueOf("2026-01-01T00:00:00.123456789012345678901234567890Z"));
+        }
+        writer.stepOut();
+        writer.finish();
+
+        byte[] cycle2Bytes = out.toByteArray();
+
+        // Verify segment 2
+        IonReader reader = IonReaderBuilder.standard().build(cycle2Bytes);
+        assertEquals(IonType.STRUCT, reader.next());
+        SymbolToken[] annotations = reader.getTypeAnnotationSymbols();
+        assertNotNull(annotations);
+        assertEquals(1, annotations.length);
+        assertEquals("sym10", annotations[0].getText());
+        reader.stepIn();
+        assertEquals(IonType.TIMESTAMP, reader.next());
+        assertEquals("sym11", reader.getFieldName());
+        SymbolToken[] fieldAnnotations = reader.getTypeAnnotationSymbols();
+        assertEquals(1, fieldAnnotations.length);
+        assertEquals("sym12", fieldAnnotations[0].getText());
+        assertNotNull(reader.timestampValue());
+        reader.stepOut();
+
+        reader.close();
+        writer.close();
+    }
+}